Commit bbc78c6b authored by terrymanu's avatar terrymanu
Browse files

remove JDBCBackendHandler.isHasMoreResultValueFlag &&... 

remove JDBCBackendHandler.isHasMoreResultValueFlag && SQLPacketsBackendHandler.isHasMoreResultValueFlag
parent 4546124a

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/SQLPacketsBackendHandler.java

+1 −11
Original line number Diff line number Diff line
@@ -40,7 +40,6 @@ import io.shardingsphere.proxy.transport.common.packet.CommandPacketRebuilder; 
import io.shardingsphere.proxy.transport.common.packet.DatabasePacket;

import io.shardingsphere.proxy.transport.mysql.packet.command.reponse.CommandResponsePackets;

import io.shardingsphere.proxy.transport.mysql.packet.command.text.query.TextResultSetRowPacket;

import io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket;

import io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket;

import io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket;

import io.shardingsphere.proxy.util.MySQLResultCache;
@@ -73,8 +72,6 @@ public final class SQLPacketsBackendHandler implements BackendHandler { 
    

    private final DatabaseType databaseType;

    

    private boolean hasMoreResultValueFlag;

    

    private final Map<String, List<Channel>> channelsMap = Maps.newHashMap();

    

    private SynchronizedFuture<List<QueryResult>> synchronizedFuture;
@@ -90,7 +87,6 @@ public final class SQLPacketsBackendHandler implements BackendHandler { 
    public SQLPacketsBackendHandler(final CommandPacketRebuilder rebuilder, final DatabaseType databaseType) {

        this.rebuilder = rebuilder;

        this.databaseType = databaseType;

        hasMoreResultValueFlag = true;

        ruleRegistry = RuleRegistry.getInstance();

    }
@@ -203,7 +199,7 @@ public final class SQLPacketsBackendHandler implements BackendHandler { 
    

    @Override

    public boolean hasMoreResultValue() throws SQLException {

        if (null == mergedResult || !hasMoreResultValueFlag) {

        if (null == mergedResult || !mergedResult.next()) {

            for (Entry<String, List<Channel>> entry : channelsMap.entrySet()) {

                for (Channel each : entry.getValue()) {

                    ShardingProxyClient.getInstance().getPoolMap().get(entry.getKey()).release(each);
@@ -211,17 +207,11 @@ public final class SQLPacketsBackendHandler implements BackendHandler { 
            }

            return false;

        }

        if (!mergedResult.next()) {

            hasMoreResultValueFlag = false;

        }

        return true;

    }

    

    @Override

    public DatabasePacket getResultValue() {

        if (!hasMoreResultValueFlag) {

            return new EofPacket(++currentSequenceId);

        }

        try {

            List<Object> data = new ArrayList<>(columnCount);

            for (int i = 1; i <= columnCount; i++) {

sharding-proxy/src/main/java/io/shardingsphere/proxy/backend/common/jdbc/JDBCBackendHandler.java

+0 −5
Original line number Diff line number Diff line
@@ -41,7 +41,6 @@ import io.shardingsphere.proxy.transport.mysql.packet.command.reponse.QueryRespo 
import io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket;

import io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket;

import io.shardingsphere.transaction.xa.AtomikosUserTransaction;

import lombok.Getter;



import javax.transaction.Status;

import javax.transaction.SystemException;
@@ -71,15 +70,11 @@ public final class JDBCBackendHandler implements BackendHandler { 
    

    private int currentSequenceId;

    

    @Getter

    private boolean hasMoreResultValueFlag;

    

    public JDBCBackendHandler(final String sql, final JDBCExecuteEngine executeEngine) {

        this.sql = sql;

        this.executeEngine = executeEngine;

        ruleRegistry = RuleRegistry.getInstance();

        backendConnection = executeEngine.getBackendConnection();

        hasMoreResultValueFlag = true;

    }

    

    @Override