refactoring

pull/395/head
Nikita 9 years ago
parent f05299dc1e
commit 87f5746706

@ -74,8 +74,10 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
/**
* Redis 'slave' servers connection pool size for <b>each</b> slave node.
*
* Default is 100
* <p/>
* Default is <code>100</code>
* <p/>
* @see #setSlaveConnectionMinimumIdleSize(int)
*
* @param slaveConnectionPoolSize
* @return
@ -90,8 +92,10 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
/**
* Redis 'master' server connection pool size.
* <p/>
* Default is <code>100</code>
*
* Default is 100
* @see #setMasterConnectionMinimumIdleSize(int)
*
*/
public T setMasterConnectionPoolSize(int masterConnectionPoolSize) {
@ -122,8 +126,10 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
/**
* Redis 'slave' node maximum subscription (pub/sub) connection pool size for <b>each</b> slave node
*
* Default is 25
* <p/>
* Default is <code>25</code>
* <p/>
* @see #setSlaveSubscriptionConnectionMinimumIdleSize(int)
*
*/
public T setSlaveSubscriptionConnectionPoolSize(int slaveSubscriptionConnectionPoolSize) {
@ -136,8 +142,10 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
/**
* Redis 'slave' node minimum idle connection amount for <b>each</b> slave node
*
* Default is 5
* <p/>
* Default is <code>5</code>
* <p/>
* @see #setSlaveConnectionPoolSize(int)
*
*/
public T setSlaveConnectionMinimumIdleSize(int slaveConnectionMinimumIdleSize) {
@ -150,8 +158,10 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
/**
* Redis 'master' node minimum idle connection amount for <b>each</b> slave node
*
* Default is 5
* <p/>
* Default is <code>5</code>
* <p/>
* @see #setMasterConnectionPoolSize(int)
*
*/
public T setMasterConnectionMinimumIdleSize(int masterConnectionMinimumIdleSize) {
@ -163,8 +173,11 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
}
/**
* Redis 'slave' node minimum idle subscription (pub/sub) connection amount for <b>each</b> slave node
* Default is 1
* Redis 'slave' node minimum idle subscription (pub/sub) connection amount for <b>each</b> slave node.
* <p/>
* Default is <code>1</code>
* <p/>
* @see #setSlaveSubscriptionConnectionPoolSize(int)
*
*/
public T setSlaveSubscriptionConnectionMinimumIdleSize(int slaveSubscriptionConnectionMinimumIdleSize) {
@ -177,6 +190,8 @@ public class BaseMasterSlaveServersConfig<T extends BaseMasterSlaveServersConfig
/**
* Set node type used for read operation.
* <p/>
* Default is <code>SLAVE</code>
*
* @param readMode
* @return

@ -282,6 +282,16 @@ public class Config {
return threads;
}
/**
* Threads amount shared between all redis node clients.
* <p/>
* Default is <code>0</code>.
* <p/>
* <code>0</code> means <code>current_processors_amount * 2</code>
*
* @param threads
* @return
*/
public Config setThreads(int threads) {
this.threads = threads;
return this;

@ -26,6 +26,7 @@ import org.redisson.client.RedisPubSubConnection;
import org.redisson.cluster.ClusterSlotRange;
import org.redisson.connection.ClientConnectionsEntry.NodeType;
import org.redisson.connection.pool.PubSubConnectionPool;
import org.redisson.connection.pool.SinglePubSubConnectionPool;
import io.netty.util.concurrent.Future;
import io.netty.util.concurrent.FutureListener;
@ -37,11 +38,7 @@ public class SingleEntry extends MasterSlaveEntry {
public SingleEntry(Set<ClusterSlotRange> slotRanges, ConnectionManager connectionManager, MasterSlaveServersConfig config) {
super(slotRanges, connectionManager, config);
pubSubConnectionHolder = new PubSubConnectionPool(config, connectionManager, this) {
protected ClientConnectionsEntry getEntry() {
return entries.get(0);
}
};
pubSubConnectionHolder = new SinglePubSubConnectionPool(config, connectionManager, this);
}
@Override

@ -0,0 +1,34 @@
/**
* Copyright 2014 Nikita Koksharov, Nickolay Borbit
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.redisson.connection.pool;
import org.redisson.MasterSlaveServersConfig;
import org.redisson.connection.ClientConnectionsEntry;
import org.redisson.connection.ConnectionManager;
import org.redisson.connection.MasterSlaveEntry;
public class SinglePubSubConnectionPool extends PubSubConnectionPool {
public SinglePubSubConnectionPool(MasterSlaveServersConfig config, ConnectionManager connectionManager,
MasterSlaveEntry masterSlaveEntry) {
super(config, connectionManager, masterSlaveEntry);
}
protected ClientConnectionsEntry getEntry() {
return entries.get(0);
}
}
Loading…
Cancel
Save