Commit 87bb38f8 authored by terrymanu's avatar terrymanu
Browse files

remove CommandPacketRebuilder

parent b3ee2bd3
Loading
Loading
Loading
Loading
+4 −7
Original line number Diff line number Diff line
@@ -23,7 +23,6 @@ import io.shardingsphere.proxy.backend.jdbc.JDBCBackendHandler;
import io.shardingsphere.proxy.backend.jdbc.execute.JDBCExecuteEngineFactory;
import io.shardingsphere.proxy.backend.netty.NettyBackendHandler;
import io.shardingsphere.proxy.config.RuleRegistry;
import io.shardingsphere.proxy.transport.common.packet.CommandPacketRebuilder;
import lombok.AccessLevel;
import lombok.NoArgsConstructor;

@@ -47,13 +46,12 @@ public final class BackendHandlerFactory {
     * @param sql SQL to be executed
     * @param backendConnection backend connection
     * @param databaseType database type
     * @param rebuilder rebuilder
     * @return instance of text protocol backend handler
     */
    public static BackendHandler newTextProtocolInstance(final int connectionId, final int sequenceId, final String sql, 
                                                         final BackendConnection backendConnection, final DatabaseType databaseType, final CommandPacketRebuilder rebuilder) {
                                                         final BackendConnection backendConnection, final DatabaseType databaseType) {
        return RULE_REGISTRY.getBackendNIOConfig().isUseNIO()
                ? new NettyBackendHandler(connectionId, sequenceId, sql, rebuilder, databaseType) : new JDBCBackendHandler(sql, JDBCExecuteEngineFactory.createTextProtocolInstance(backendConnection));
                ? new NettyBackendHandler(connectionId, sequenceId, sql, databaseType) : new JDBCBackendHandler(sql, JDBCExecuteEngineFactory.createTextProtocolInstance(backendConnection));
    }
    
    /**
@@ -65,12 +63,11 @@ public final class BackendHandlerFactory {
     * @param parameters SQL parameters
     * @param backendConnection backend connection
     * @param databaseType database type
     * @param rebuilder rebuilder
     * @return instance of text protocol backend handler
     */
    public static BackendHandler newBinaryProtocolInstance(final int connectionId, final int sequenceId, final String sql, final List<Object> parameters, 
                                                           final BackendConnection backendConnection, final DatabaseType databaseType, final CommandPacketRebuilder rebuilder) {
        return RULE_REGISTRY.getBackendNIOConfig().isUseNIO() ? new NettyBackendHandler(connectionId, sequenceId, sql, rebuilder, databaseType)
                                                           final BackendConnection backendConnection, final DatabaseType databaseType) {
        return RULE_REGISTRY.getBackendNIOConfig().isUseNIO() ? new NettyBackendHandler(connectionId, sequenceId, sql, databaseType)
                : new JDBCBackendHandler(sql, JDBCExecuteEngineFactory.createBinaryProtocolInstance(parameters, backendConnection));
    }
}
+2 −4
Original line number Diff line number Diff line
@@ -38,10 +38,10 @@ import io.shardingsphere.proxy.backend.netty.mysql.MySQLQueryResult;
import io.shardingsphere.proxy.config.ProxyTableMetaDataConnectionManager;
import io.shardingsphere.proxy.config.RuleRegistry;
import io.shardingsphere.proxy.runtime.ChannelRegistry;
import io.shardingsphere.proxy.transport.common.packet.CommandPacketRebuilder;
import io.shardingsphere.proxy.transport.common.packet.DatabasePacket;
import io.shardingsphere.proxy.transport.mysql.constant.ColumnType;
import io.shardingsphere.proxy.transport.mysql.packet.command.CommandResponsePackets;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.text.query.ComQueryPacket;
import io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket;
import io.shardingsphere.proxy.transport.mysql.packet.generic.OKPacket;
import io.shardingsphere.proxy.util.BackendExecutorContext;
@@ -81,8 +81,6 @@ public final class NettyBackendHandler extends AbstractBackendHandler {
    
    private final String sql;
    
    private final CommandPacketRebuilder rebuilder;
    
    private final DatabaseType databaseType;
    
    private final Map<String, List<Channel>> channelMap = new HashMap<>();
@@ -159,7 +157,7 @@ public final class NettyBackendHandler extends AbstractBackendHandler {
        Channel channel = pool.acquire().get(RULE_REGISTRY.getBackendNIOConfig().getConnectionTimeoutSeconds(), TimeUnit.SECONDS);
        channelMap.get(dataSourceName).add(channel);
        ChannelRegistry.getInstance().putConnectionId(channel.id().asShortText(), connectionId);
        channel.writeAndFlush(rebuilder.rebuild(sequenceId, connectionId, sql));
        channel.writeAndFlush(new ComQueryPacket(sequenceId, connectionId, sql));
    }
    
    private CommandResponsePackets merge(final SQLStatement sqlStatement, final List<CommandResponsePackets> packets, final List<QueryResult> queryResults) {
+0 −36
Original line number Diff line number Diff line
/*
 * Copyright 2016-2018 shardingsphere.io.
 * <p>
 * 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.
 * </p>
 */

package io.shardingsphere.proxy.transport.common.packet;

import io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacket;

/**
 * Command packet rebuilder.
 *
 * @author linjiaqi
 */
public interface CommandPacketRebuilder {
    
    /**
     * CommandPacket rebuild by params.
     * 
     * @param params rebuild params
     * @return rebuild command packet
     */
    CommandPacket rebuild(Object... params);
}
+2 −10
Original line number Diff line number Diff line
@@ -24,18 +24,15 @@ import io.shardingsphere.proxy.backend.BackendHandler;
import io.shardingsphere.proxy.backend.BackendHandlerFactory;
import io.shardingsphere.proxy.backend.ResultPacket;
import io.shardingsphere.proxy.backend.jdbc.connection.BackendConnection;
import io.shardingsphere.proxy.transport.common.packet.CommandPacketRebuilder;
import io.shardingsphere.proxy.transport.common.packet.DatabasePacket;
import io.shardingsphere.proxy.transport.mysql.constant.ColumnType;
import io.shardingsphere.proxy.transport.mysql.constant.NewParametersBoundFlag;
import io.shardingsphere.proxy.transport.mysql.packet.MySQLPacketPayload;
import io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacket;
import io.shardingsphere.proxy.transport.mysql.packet.command.CommandResponsePackets;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.QueryCommandPacket;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.binary.BinaryStatement;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.binary.BinaryStatementParameterType;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.binary.BinaryStatementRegistry;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.text.query.ComQueryPacket;
import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

@@ -51,7 +48,7 @@ import java.util.List;
 * @author zhangyonglun
 */
@Slf4j
public final class ComStmtExecutePacket implements QueryCommandPacket, CommandPacketRebuilder {
public final class ComStmtExecutePacket implements QueryCommandPacket {
    
    private static final int ITERATION_COUNT = 1;
    
@@ -90,7 +87,7 @@ public final class ComStmtExecutePacket implements QueryCommandPacket, CommandPa
            binaryStatement.setParameterTypes(getParameterTypes(payload, parametersCount));
        }
        parameters = getParameters(payload, parametersCount);
        backendHandler = BackendHandlerFactory.newBinaryProtocolInstance(connectionId, sequenceId, binaryStatement.getSql(), parameters, backendConnection, DatabaseType.MySQL, this);
        backendHandler = BackendHandlerFactory.newBinaryProtocolInstance(connectionId, sequenceId, binaryStatement.getSql(), parameters, backendConnection, DatabaseType.MySQL);
    }
    
    private List<BinaryStatementParameterType> getParameterTypes(final MySQLPacketPayload payload, final int parametersCount) {
@@ -146,9 +143,4 @@ public final class ComStmtExecutePacket implements QueryCommandPacket, CommandPa
        ResultPacket resultPacket = backendHandler.getResultValue();
        return new BinaryResultSetRowPacket(resultPacket.getSequenceId(), resultPacket.getColumnCount(), resultPacket.getData(), resultPacket.getColumnTypes());
    }
    
    @Override
    public CommandPacket rebuild(final Object... params) {
        return new ComQueryPacket((int) params[0], (int) params[1], (String) params[2]);
    }
}
+2 −10
Original line number Diff line number Diff line
@@ -23,14 +23,12 @@ import io.shardingsphere.core.constant.ShardingConstant;
import io.shardingsphere.proxy.backend.BackendHandler;
import io.shardingsphere.proxy.backend.BackendHandlerFactory;
import io.shardingsphere.proxy.backend.jdbc.connection.BackendConnection;
import io.shardingsphere.proxy.transport.common.packet.CommandPacketRebuilder;
import io.shardingsphere.proxy.transport.mysql.constant.ColumnType;
import io.shardingsphere.proxy.transport.mysql.packet.MySQLPacketPayload;
import io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacket;
import io.shardingsphere.proxy.transport.mysql.packet.command.CommandPacketType;
import io.shardingsphere.proxy.transport.mysql.packet.command.CommandResponsePackets;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.ColumnDefinition41Packet;
import io.shardingsphere.proxy.transport.mysql.packet.command.query.text.query.ComQueryPacket;
import io.shardingsphere.proxy.transport.mysql.packet.generic.EofPacket;
import io.shardingsphere.proxy.transport.mysql.packet.generic.ErrPacket;
import lombok.Getter;
@@ -47,7 +45,7 @@ import java.sql.SQLException;
 * @author wangkai
 */
@Slf4j
public final class ComFieldListPacket implements CommandPacket, CommandPacketRebuilder {
public final class ComFieldListPacket implements CommandPacket {
    
    private static final String SQL = "SHOW COLUMNS FROM %s FROM %s";
    
@@ -64,8 +62,7 @@ public final class ComFieldListPacket implements CommandPacket, CommandPacketReb
        this.sequenceId = sequenceId;
        table = payload.readStringNul();
        fieldWildcard = payload.readStringEOF();
        backendHandler = BackendHandlerFactory.newTextProtocolInstance(
                connectionId, sequenceId, String.format(SQL, table, ShardingConstant.LOGIC_SCHEMA_NAME), backendConnection, DatabaseType.MySQL, this);
        backendHandler = BackendHandlerFactory.newTextProtocolInstance(connectionId, sequenceId, String.format(SQL, table, ShardingConstant.LOGIC_SCHEMA_NAME), backendConnection, DatabaseType.MySQL);
    }
    
    @Override
@@ -94,9 +91,4 @@ public final class ComFieldListPacket implements CommandPacket, CommandPacketReb
        result.getPackets().add(new EofPacket(++currentSequenceId));
        return result;
    }
    
    @Override
    public CommandPacket rebuild(final Object... params) {
        return new ComQueryPacket((int) params[0], (int) params[1], (String) params[2]);
    }
}
Loading