mirror/dble
1
0
Fork 0
mirror of https://github.com/actiontech/dble.git synced 2026-01-05 20:30:40 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3681 from actiontech/inner-2213/22.01

Browse Source 
[inner-2213] adjust the basis of whether the 'readInstance' judgment
This commit is contained in:
wenyh
2023-05-08 15:04:06 +08:00
committed by GitHub
parent ff972bd79b 2ee722ae1f
commit 4f1326d91b
4 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/com/actiontech/dble/backend/pool/ConnectionPool.java
View File

@@ -302,10 +302,6 @@ public class ConnectionPool extends PoolBase implements PooledConnectionListener
return allConnections.size();
}
public boolean isFromSlave() {
return !config.isPrimary();
}
public void close(final PooledConnection conn) {
if (remove(conn)) {
final int tc = totalConnections.decrementAndGet();

4
src/main/java/com/actiontech/dble/net/connection/BackendConnection.java
View File

@@ -229,6 +229,10 @@ public class BackendConnection extends PooledConnection {
return instance;
}
public boolean isFromSlaveDB() {
return instance.isReadInstance();
}
public long getConnectionTimeout() {
return getPoolRelated() != null ? getPoolRelated().getConnectionTimeout() : connectionTimeout;
}

4
src/main/java/com/actiontech/dble/net/connection/PooledConnection.java
View File

@@ -111,10 +111,6 @@ public abstract class PooledConnection extends AbstractConnection {
this.poolRelated = poolRelated;
}
public boolean isFromSlaveDB() {
return poolRelated.isFromSlave();
}
public String getOldSchema() {
return oldSchema;
}

4
src/main/java/com/actiontech/dble/route/handler/HintDbInstanceHandler.java
View File

@@ -56,11 +56,11 @@ public final class HintDbInstanceHandler {
getDbInstances(true).stream().
filter(dbInstance -> StringUtil.equals(dbInstance.getConfig().getUrl().trim(), dbInstanceUrl.trim())).
collect(Collectors.toSet());
Optional<PhysicalDbInstance> slaveInstance = dbInstanceSet.stream().filter(instance -> !instance.getConfig().isPrimary()).findFirst();
Optional<PhysicalDbInstance> slaveInstance = dbInstanceSet.stream().filter(instance -> instance.isReadInstance()).findFirst();
if (slaveInstance.isPresent()) {
return slaveInstance.get();
} else {
Optional<PhysicalDbInstance> masterInstance = dbInstanceSet.stream().filter(instance -> instance.getConfig().isPrimary()).findFirst();
Optional<PhysicalDbInstance> masterInstance = dbInstanceSet.stream().filter(instance -> !instance.isReadInstance()).findFirst();
return masterInstance.orElse(null);
}
}