Author: ivank
Date: Wed Nov 7 10:57:45 2012
New Revision: 1406541
URL: http://svn.apache.org/viewvc?rev=1406541&view=rev
Log:
BOOKKEEPER-452: Rename ClientConfiguration multiplexing_enabled to
subscription_connection_sharing_enabled (sijie via ivank)
Modified:
zookeeper/bookkeeper/trunk/CHANGES.txt
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/clientimpl.cpp
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/multiplextest.cpp
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigHub.java
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
Modified: zookeeper/bookkeeper/trunk/CHANGES.txt
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/CHANGES.txt?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/CHANGES.txt (original)
+++ zookeeper/bookkeeper/trunk/CHANGES.txt Wed Nov 7 10:57:45 2012
@@ -122,6 +122,8 @@ Trunk (unreleased changes)
BOOKKEEPER-434: [Hedwig CPP Client] Delay resolving default host until
necessary. (sijie via ivank)
+ BOOKKEEPER-452: Rename ClientConfiguration multiplexing_enabled to
subscription_connection_sharing_enabled (sijie via ivank)
+
hedwig-server:
BOOKKEEPER-302: No more messages delivered when hub server scans
messages over two ledgers. (sijie via ivank)
Modified:
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h
(original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/inc/hedwig/client.h
Wed Nov 7 10:57:45 2012
@@ -49,7 +49,7 @@ namespace Hedwig {
static const std::string NUM_DISPATCH_THREADS;
static const std::string SSL_ENABLED;
static const std::string SSL_PEM_FILE;
- static const std::string ENABLE_MULTIPLEXING;
+ static const std::string SUBSCRIPTION_CHANNEL_SHARING_ENABLED;
/**
* The maximum number of messages the hub will queue for subscriptions
* created using this configuration. The hub will always queue the most
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp
(original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/client.cpp Wed
Nov 7 10:57:45 2012
@@ -41,7 +41,7 @@ const std::string Configuration::NUM_DIS
const std::string Configuration::SUBSCRIPTION_MESSAGE_BOUND =
"hedwig.cpp.subscription_message_bound";
const std::string Configuration::SSL_ENABLED = "hedwig.cpp.ssl_enabled";
const std::string Configuration::SSL_PEM_FILE = "hedwig.cpp.ssl_pem";
-const std::string Configuration::ENABLE_MULTIPLEXING =
"hedwig.cpp.enable_multiplexing";
+const std::string Configuration::SUBSCRIPTION_CHANNEL_SHARING_ENABLED =
"hedwig.cpp.subscription_channel_sharing_enabled";
Client::Client(const Configuration& conf) {
LOG4CXX_DEBUG(logger, "Client::Client (" << this << ")");
Modified:
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/clientimpl.cpp
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/clientimpl.cpp?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/clientimpl.cpp
(original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/lib/clientimpl.cpp
Wed Nov 7 10:57:45 2012
@@ -333,7 +333,7 @@ void SubscriptionEventEmitter::emitSubsc
DuplexChannelManagerPtr DuplexChannelManager::create(const Configuration&
conf) {
DuplexChannelManager * managerPtr;
- if (conf.getBool(Configuration::ENABLE_MULTIPLEXING, false)) {
+ if (conf.getBool(Configuration::SUBSCRIPTION_CHANNEL_SHARING_ENABLED,
false)) {
managerPtr = new MultiplexDuplexChannelManager(conf);
} else {
managerPtr = new SimpleDuplexChannelManager(conf);
Modified:
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/multiplextest.cpp
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/multiplextest.cpp?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/multiplextest.cpp
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/multiplextest.cpp
Wed Nov 7 10:57:45 2012
@@ -40,7 +40,7 @@ public:
virtual bool getBool(const std::string& key, bool defaultVal) const {
if (key == Configuration::SUBSCRIBER_AUTOCONSUME) {
return false;
- } else if (key == Configuration::ENABLE_MULTIPLEXING) {
+ } else if (key == Configuration::SUBSCRIPTION_CHANNEL_SHARING_ENABLED) {
return true;
} else {
return TestServerConfiguration::getBool(key, defaultVal);
Modified: zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
--- zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h (original)
+++ zookeeper/bookkeeper/trunk/hedwig-client/src/main/cpp/test/util.h Wed Nov
7 10:57:45 2012
@@ -183,7 +183,7 @@ public:
virtual bool getBool(const std::string& key, bool defaultVal) const {
if (key == Configuration::SSL_ENABLED) {
return isSSL;
- } else if (key == Configuration::ENABLE_MULTIPLEXING) {
+ } else if (key == Configuration::SUBSCRIPTION_CHANNEL_SHARING_ENABLED) {
return multiplexing;
}
return defaultVal;
Modified:
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/conf/ClientConfiguration.java
Wed Nov 7 10:57:45 2012
@@ -42,7 +42,7 @@ public class ClientConfiguration extends
protected static final String TIMEOUT_THREAD_RUN_INTERVAL =
"timeout_thread_run_interval";
protected static final String SSL_ENABLED = "ssl_enabled";
protected static final String SUBSCRIPTION_MESSAGE_BOUND =
"subscription_message_bound";
- protected static final String MULTIPLEXING_ENABLED =
"multiplexing_enabled";
+ protected static final String SUBSCRIPTION_CHANNEL_SHARING_ENABLED =
"subscription_channel_sharing_enabled";
// Singletons we want to instantiate only once per ClientConfiguration
protected HedwigSocketAddress myDefaultServerAddress = null;
@@ -144,8 +144,8 @@ public class ClientConfiguration extends
* This parameter is a boolean flag indicating if multiplexing subscription
* channels.
*/
- public boolean isMultiplexingEnabled() {
- return conf.getBoolean(MULTIPLEXING_ENABLED, false);
+ public boolean isSubscriptionChannelSharingEnabled() {
+ return conf.getBoolean(SUBSCRIPTION_CHANNEL_SHARING_ENABLED, false);
}
/**
Modified:
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-client/src/main/java/org/apache/hedwig/client/netty/HedwigClientImpl.java
Wed Nov 7 10:57:45 2012
@@ -74,7 +74,7 @@ public class HedwigClientImpl implements
protected HedwigClientImpl(ClientConfiguration cfg, ChannelFactory
socketFactory) {
this.cfg = cfg;
this.socketFactory = socketFactory;
- if (cfg.isMultiplexingEnabled()) {
+ if (cfg.isSubscriptionChannelSharingEnabled()) {
channelManager = new MultiplexHChannelManager(cfg, socketFactory);
} else {
channelManager = new SimpleHChannelManager(cfg, socketFactory);
Modified:
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/TestPubSubClient.java
Wed Nov 7 10:57:45 2012
@@ -161,10 +161,10 @@ public class TestPubSubClient extends Pu
return Arrays.asList(new Object[][] { { true }, { false } });
}
- protected boolean isMultiplexingEnabled;
+ protected boolean isSubscriptionChannelSharingEnabled;
- public TestPubSubClient(boolean isMultiplexingEnabled) {
- this.isMultiplexingEnabled = isMultiplexingEnabled;
+ public TestPubSubClient(boolean isSubscriptionChannelSharingEnabled) {
+ this.isSubscriptionChannelSharingEnabled =
isSubscriptionChannelSharingEnabled;
}
@Override
@@ -173,8 +173,8 @@ public class TestPubSubClient extends Pu
super.setUp();
client = new HedwigClient(new ClientConfiguration() {
@Override
- public boolean isMultiplexingEnabled() {
- return TestPubSubClient.this.isMultiplexingEnabled;
+ public boolean isSubscriptionChannelSharingEnabled() {
+ return
TestPubSubClient.this.isSubscriptionChannelSharingEnabled;
}
});
publisher = client.getPublisher();
Modified:
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/client/netty/TestMultiplexing.java
Wed Nov 7 10:57:45 2012
@@ -229,7 +229,7 @@ public class TestMultiplexing extends He
super.setUp();
client = new HedwigClient(new ClientConfiguration() {
@Override
- public boolean isMultiplexingEnabled() {
+ public boolean isSubscriptionChannelSharingEnabled() {
return true;
}
@Override
Modified:
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/delivery/TestThrottlingDelivery.java
Wed Nov 7 10:57:45 2012
@@ -93,8 +93,8 @@ public class TestThrottlingDelivery exte
}
@Override
- public boolean isMultiplexingEnabled() {
- return isMultiplexingEnabled;
+ public boolean isSubscriptionChannelSharingEnabled() {
+ return isSubscriptionChannelSharingEnabled;
}
}
@@ -170,10 +170,10 @@ public class TestThrottlingDelivery exte
return Arrays.asList(new Object[][] { { false }, { true } });
}
- protected boolean isMultiplexingEnabled;
+ protected boolean isSubscriptionChannelSharingEnabled;
- public TestThrottlingDelivery(boolean isMultiplexingEnabled) {
- this.isMultiplexingEnabled = isMultiplexingEnabled;
+ public TestThrottlingDelivery(boolean isSubscriptionChannelSharingEnabled)
{
+ this.isSubscriptionChannelSharingEnabled =
isSubscriptionChannelSharingEnabled;
}
@Override
Modified:
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigHub.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigHub.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigHub.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigHub.java
Wed Nov 7 10:57:45 2012
@@ -91,11 +91,11 @@ public class TestHedwigHub extends Hedwi
}
protected Mode mode;
- protected boolean isMultiplexingEnabled;
+ protected boolean isSubscriptionChannelSharingEnabled;
- public TestHedwigHub(Mode mode, boolean isMultiplexingEnabled) {
+ public TestHedwigHub(Mode mode, boolean
isSubscriptionChannelSharingEnabled) {
this.mode = mode;
- this.isMultiplexingEnabled = isMultiplexingEnabled;
+ this.isSubscriptionChannelSharingEnabled =
isSubscriptionChannelSharingEnabled;
}
protected HedwigProxy proxy;
@@ -210,8 +210,8 @@ public class TestHedwigHub extends Hedwi
}
@Override
- public boolean isMultiplexingEnabled() {
- return isMultiplexingEnabled;
+ public boolean isSubscriptionChannelSharingEnabled() {
+ return isSubscriptionChannelSharingEnabled;
}
}
Modified:
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
URL:
http://svn.apache.org/viewvc/zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java?rev=1406541&r1=1406540&r2=1406541&view=diff
==============================================================================
---
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
(original)
+++
zookeeper/bookkeeper/trunk/hedwig-server/src/test/java/org/apache/hedwig/server/integration/TestHedwigRegion.java
Wed Nov 7 10:57:45 2012
@@ -66,8 +66,8 @@ public class TestHedwigRegion extends He
protected class NewRegionClientConfiguration extends ClientConfiguration {
@Override
- public boolean isMultiplexingEnabled() {
- return isMultiplexingEnabled;
+ public boolean isSubscriptionChannelSharingEnabled() {
+ return isSubscriptionChannelSharingEnabled;
}
}
@@ -84,10 +84,10 @@ public class TestHedwigRegion extends He
return Arrays.asList(new Object[][] { { false }, { true } });
}
- protected boolean isMultiplexingEnabled;
+ protected boolean isSubscriptionChannelSharingEnabled;
- public TestHedwigRegion(boolean isMultiplexingEnabled) {
- this.isMultiplexingEnabled = isMultiplexingEnabled;
+ public TestHedwigRegion(boolean isSubscriptionChannelSharingEnabled) {
+ this.isSubscriptionChannelSharingEnabled =
isSubscriptionChannelSharingEnabled;
}
@Override
