Commit 1cb198d7 authored by terrymanu's avatar terrymanu
Browse files

rename indexPlaceholder => IndexPlaceholder (case sensitive)

parent 5d535b45

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rewrite/SQLBuilder.java

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ package io.shardingjdbc.core.rewrite; 
import com.google.common.base.Optional;

import com.google.common.base.Strings;

import io.shardingjdbc.core.exception.ShardingJdbcException;

import io.shardingjdbc.core.rewrite.placeholder.IndexPlaceholder;

import io.shardingjdbc.core.rewrite.placeholder.IndexPlaceholderRefactor;

import io.shardingjdbc.core.rewrite.placeholder.SchemaPlaceholder;

import io.shardingjdbc.core.rewrite.placeholder.ShardingPlaceholder;

import io.shardingjdbc.core.rewrite.placeholder.TablePlaceholder;
@@ -96,8 +96,8 @@ public final class SQLBuilder { 
                // TODO 目前只能找到真实数据源名称. 未来需要在初始化sharding rule时创建connnection,并验证连接是否正确,并获取出真实的schema的名字, 然后在这里替换actualDataSourceName为actualSchemaName

                // TODO 目前actualDataSourceName必须actualSchemaName一样,才能保证替换schema的场景不出错, 如: show columns xxx

                result.append(tableRule.get().getActualDatasourceNames().iterator().next());

            } else if (each instanceof IndexPlaceholder) {

                IndexPlaceholder indexPlaceholder = (IndexPlaceholder) each;

            } else if (each instanceof IndexPlaceholderRefactor) {

                IndexPlaceholderRefactor indexPlaceholder = (IndexPlaceholderRefactor) each;

                result.append(indexPlaceholder.getLogicIndexName());

                if (!Strings.isNullOrEmpty(actualTableName)) {

                    result.append("_");

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rewrite/SQLRewriteEngine.java

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ import io.shardingjdbc.core.parsing.parser.token.RowCountToken; 
import io.shardingjdbc.core.parsing.parser.token.SQLToken;

import io.shardingjdbc.core.parsing.parser.token.SchemaToken;

import io.shardingjdbc.core.parsing.parser.token.TableToken;

import io.shardingjdbc.core.rewrite.placeholder.IndexPlaceholder;

import io.shardingjdbc.core.rewrite.placeholder.IndexPlaceholderRefactor;

import io.shardingjdbc.core.rewrite.placeholder.SchemaPlaceholder;

import io.shardingjdbc.core.rewrite.placeholder.TablePlaceholder;

import io.shardingjdbc.core.routing.type.TableUnit;
@@ -150,7 +150,7 @@ public final class SQLRewriteEngine { 
        if (Strings.isNullOrEmpty(logicTableName)) {

            logicTableName = shardingRule.getLogicTableName(indexName);

        }

        sqlBuilder.appendPlaceholder(new IndexPlaceholder(indexName, logicTableName));

        sqlBuilder.appendPlaceholder(new IndexPlaceholderRefactor(indexName, logicTableName));

        int beginPosition = indexToken.getBeginPosition() + indexToken.getOriginalLiterals().length();

        appendRest(sqlBuilder, count, sqlTokens, beginPosition);

    }

sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rewrite/placeholder/indexPlaceholder.java→sharding-jdbc-core/src/main/java/io/shardingjdbc/core/rewrite/placeholder/IndexPlaceholderRefactor.java

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ import lombok.RequiredArgsConstructor; 
 */

@RequiredArgsConstructor

@Getter

public final class IndexPlaceholder implements ShardingPlaceholder {

public final class IndexPlaceholderRefactor implements ShardingPlaceholder {

    

    private final String logicIndexName;