Commit 943f994b authored by terrymanu's avatar terrymanu
Browse files

extract LOGIC_SCHEMA_NAME

parent 472c7e83

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/constant/ShardingConstant.java

0 → 100644
+36 −0
Original line number Diff line number Diff line 
/*

 * Copyright 1999-2015 dangdang.com.

 * <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.shardingjdbc.core.constant;



/**

 * Sharding constant.

 * 

 * @author zhangliang

 */

public interface ShardingConstant {

    

    /**

     * Logic database schema name.

     * 

     * <p>

     * Sharding-JDBC just have one logic database schema. 

     * Default: sharding_db

     * </p>

     */

    String LOGIC_SCHEMA_NAME = "sharding_db";

}

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/jdbc/core/datasource/ShardingDataSource.java

+2 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import io.shardingjdbc.core.jdbc.adapter.AbstractDataSourceAdapter; 
import io.shardingjdbc.core.jdbc.core.ShardingContext;

import io.shardingjdbc.core.jdbc.core.connection.ShardingConnection;

import io.shardingjdbc.core.rule.ShardingRule;

import lombok.Getter;



import java.sql.SQLException;

import java.util.Map;
@@ -38,6 +39,7 @@ import java.util.concurrent.ConcurrentHashMap; 
 */

public class ShardingDataSource extends AbstractDataSourceAdapter implements AutoCloseable {

    

    @Getter

    private ShardingProperties shardingProperties;

    

    private ExecutorEngine executorEngine;

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/merger/show/ShowDatabasesResultSetMerger.java

+3 −4
Original line number Diff line number Diff line 
package io.shardingjdbc.core.merger.show;



import io.shardingjdbc.core.constant.ShardingConstant;

import io.shardingjdbc.core.merger.ResultSetMerger;



import java.io.InputStream;
@@ -14,8 +15,6 @@ import java.util.Calendar; 
 */

public final class ShowDatabasesResultSetMerger implements ResultSetMerger {

    

    private static final String LOGIC_DATABASE_NAME = "sharding_db";

    

    private boolean firstNext = true;

    

    @Override
@@ -29,12 +28,12 @@ public final class ShowDatabasesResultSetMerger implements ResultSetMerger { 
    

    @Override

    public Object getValue(final int columnIndex, final Class<?> type) throws SQLException {

        return LOGIC_DATABASE_NAME;

        return ShardingConstant.LOGIC_SCHEMA_NAME;

    }

    

    @Override

    public Object getValue(final String columnLabel, final Class<?> type) throws SQLException {

        return LOGIC_DATABASE_NAME;

        return ShardingConstant.LOGIC_SCHEMA_NAME;

    }

    

    @Override

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/merger/show/ShowTablesResultSetMerger.java

+2 −1
Original line number Diff line number Diff line 
package io.shardingjdbc.core.merger.show;



import com.google.common.base.Optional;

import io.shardingjdbc.core.constant.ShardingConstant;

import io.shardingjdbc.core.merger.common.AbstractMemoryResultSetMerger;

import io.shardingjdbc.core.merger.common.MemoryResultSetRow;

import io.shardingjdbc.core.rule.ShardingRule;
@@ -32,7 +33,7 @@ public final class ShowTablesResultSetMerger extends AbstractMemoryResultSetMerg 
    private final Set<String> tableNames = new HashSet<>();

    

    static {

        LABEL_AND_INDEX_MAP.put("Tables_in_sharding_db", 1); 

        LABEL_AND_INDEX_MAP.put("Tables_in_" + ShardingConstant.LOGIC_SCHEMA_NAME, 1); 

    }

    

    public ShowTablesResultSetMerger(final ShardingRule shardingRule, final List<ResultSet> resultSets) throws SQLException {

sharding-jdbc-server/src/main/java/io/shardingjdbc/server/packet/command/ComFieldListPacket.java

+3 −2
Original line number Diff line number Diff line 
package io.shardingjdbc.server.packet.command;



import io.shardingjdbc.core.constant.ShardingConstant;

import io.shardingjdbc.server.DataSourceManager;

import io.shardingjdbc.server.constant.ColumnType;

import io.shardingjdbc.server.constant.StatusFlag;
@@ -40,7 +41,7 @@ public final class ComFieldListPacket extends AbstractCommandPacket { 
    

    @Override

    public List<AbstractMySQLSentPacket> execute() {

        String sql = String.format("SHOW COLUMNS FROM %s FROM sharding_db", table);

        String sql = String.format("SHOW COLUMNS FROM %s FROM %s", table, ShardingConstant.LOGIC_SCHEMA_NAME);

        List<AbstractMySQLSentPacket> result = new LinkedList<>();

        int currentSequenceId = getSequenceId();

        try (
@@ -52,7 +53,7 @@ public final class ComFieldListPacket extends AbstractCommandPacket { 
                String type = resultSet.getString(2);

                int columnLength = Integer.parseInt(type.substring(type.indexOf('(', type.indexOf(')'))));

                ColumnType columnType = ColumnType.valueOfDescription(type.substring(0, type.indexOf('(')));

                result.add(new ColumnDefinition41Packet(++currentSequenceId, "sharding_db", table, table, field, field, columnLength, columnType, 0));

                result.add(new ColumnDefinition41Packet(++currentSequenceId, ShardingConstant.LOGIC_SCHEMA_NAME, table, table, field, field, columnLength, columnType, 0));

            }

            result.add(new EofPacket(++currentSequenceId, 0, StatusFlag.SERVER_STATUS_AUTOCOMMIT.getValue()));

            return result;