提交 69f9db47 编写于 作者: T tuohai666

for #675 isDQL => isMerged

上级 c0000244
......@@ -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()) {
......
......@@ -79,7 +79,7 @@ public final class StatementExecuteBackendHandler implements BackendHandler {
private final List<ColumnType> 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()) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册