diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java index 98efe9100d947a3e44c1ae1e4fe85c2359306c17..d62cfeae2251e1a7e161d19ad46fbc04997e2001 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/SQLExecuteBackendHandler.java @@ -75,7 +75,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { private int columnCount; - private boolean isDQL; + private boolean isMerged; private boolean hasMoreResultValueFlag; @@ -84,7 +84,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { routingEngine = new StatementRoutingEngine(ShardingRuleRegistry.getInstance().getShardingRule(), ShardingRuleRegistry.getInstance().getShardingMetaData(), databaseType, showSQL); connections = new ArrayList<>(1024); resultSets = new ArrayList<>(1024); - isDQL = false; + isMerged = false; hasMoreResultValueFlag = true; } @@ -254,7 +254,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { } try { mergedResult = MergeEngineFactory.newInstance(ShardingRuleRegistry.getInstance().getShardingRule(), queryResults, sqlStatement).merge(); - isDQL = true; + isMerged = true; } catch (final SQLException ex) { return new CommandResponsePackets(new ErrPacket(1, ex.getErrorCode(), "", ex.getSQLState(), ex.getMessage())); } @@ -283,7 +283,7 @@ public final class SQLExecuteBackendHandler implements BackendHandler { * @throws SQLException sql exception */ public boolean hasMoreResultValue() throws SQLException { - if (!isDQL || !hasMoreResultValueFlag) { + if (!isMerged || !hasMoreResultValueFlag) { return false; } if (!mergedResult.next()) { diff --git a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java index f29d861b317a00ac6a71ec0c190f801070184807..2facba4f97c62ce4ed22b6c6a8308767134812d3 100644 --- a/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java +++ b/sharding-proxy/src/main/java/io/shardingjdbc/proxy/backend/common/StatementExecuteBackendHandler.java @@ -79,7 +79,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { private final List columnTypes; - private boolean isDQL; + private boolean isMerged; private boolean hasMoreResultValueFlag; @@ -89,7 +89,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { connections = new ArrayList<>(1024); resultSets = new ArrayList<>(1024); columnTypes = new ArrayList<>(32); - isDQL = false; + isMerged = false; hasMoreResultValueFlag = true; } @@ -291,7 +291,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { } try { mergedResult = MergeEngineFactory.newInstance(ShardingRuleRegistry.getInstance().getShardingRule(), queryResults, sqlStatement).merge(); - isDQL = true; + isMerged = true; } catch (final SQLException ex) { return new CommandResponsePackets(new ErrPacket(1, ex.getErrorCode(), "", ex.getSQLState(), ex.getMessage())); } @@ -320,7 +320,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler { * @throws SQLException sql exception */ public boolean hasMoreResultValue() throws SQLException { - if (!isDQL || !hasMoreResultValueFlag) { + if (!isMerged || !hasMoreResultValueFlag) { return false; } if (!mergedResult.next()) {