Commit 177b5013 authored by haocao's avatar haocao
Browse files

Fixed #274.

parent 0780d9b8

RELEASE-NOTES.md

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ next = "/00-overview/contribution/" 


1. [ISSUE #239](https://github.com/dangdangdotcom/sharding-jdbc/issues/239) LIMIT路由至多查询结果集，若只有一个不为空的结果集，分页结果不正确

1. [ISSUE #263](https://github.com/dangdangdotcom/sharding-jdbc/issues/263) 分片列和逻辑表配置可忽略大小写

1. [ISSUE #274](https://github.com/dangdangdotcom/sharding-jdbc/issues/274) 去除pom文件中多余的依赖



## 1.5.0.M1

pom.xml

+3 −11
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 
        

        <lombok.version>1.16.4</lombok.version>

        <guava.version>18.0</guava.version>

        <commons-collections4.version>4.1</commons-collections4.version>

        <commons-pool.version>1.6</commons-pool.version>

        <commons-dbcp.version>1.4</commons-dbcp.version>

        <gson.version>2.6.1</gson.version>
@@ -79,21 +78,11 @@ 
                <artifactId>guava</artifactId>

                <version>${guava.version}</version>

            </dependency>

            <dependency>

                <groupId>org.apache.commons</groupId>

                <artifactId>commons-collections4</artifactId>

                <version>${commons-collections4.version}</version>

            </dependency>

            <dependency>

                <groupId>org.slf4j</groupId>

                <artifactId>slf4j-api</artifactId>

                <version>${slf4j.version}</version>

            </dependency>

            <dependency>

                <groupId>org.slf4j</groupId>

                <artifactId>jcl-over-slf4j</artifactId>

                <version>${slf4j.version}</version>

            </dependency>

            <dependency>

                <groupId>io.dropwizard.metrics</groupId>

                <artifactId>metrics-core</artifactId>
@@ -155,6 +144,7 @@ 
                <groupId>commons-pool</groupId>

                <artifactId>commons-pool</artifactId>

                <version>${commons-pool.version}</version>

                <scope>test</scope>

            </dependency>

            <dependency>

                <groupId>commons-dbcp</groupId>
@@ -166,6 +156,7 @@ 
                        <artifactId>commons-pool</artifactId>

                    </exclusion>

                </exclusions>

                <scope>test</scope>

            </dependency>

            <dependency>

                <groupId>com.h2database</groupId>
@@ -213,6 +204,7 @@ 
                        <artifactId>slf4j-api</artifactId>

                    </exclusion>

                </exclusions>

                <scope>test</scope>

            </dependency>

            <dependency>

                <groupId>com.google.code.gson</groupId>

sharding-jdbc-config-parent/sharding-jdbc-config-common/src/main/java/com/dangdang/ddframe/rdb/sharding/config/common/api/ShardingRuleBuilder.java

+9 −14
Original line number Diff line number Diff line
@@ -27,11 +27,7 @@ import com.dangdang.ddframe.rdb.sharding.api.strategy.database.SingleKeyDatabase 
import com.dangdang.ddframe.rdb.sharding.api.strategy.table.MultipleKeysTableShardingAlgorithm;

import com.dangdang.ddframe.rdb.sharding.api.strategy.table.SingleKeyTableShardingAlgorithm;

import com.dangdang.ddframe.rdb.sharding.api.strategy.table.TableShardingStrategy;

import com.dangdang.ddframe.rdb.sharding.config.common.api.config.GenerateKeyColumnConfig;

import com.dangdang.ddframe.rdb.sharding.config.common.api.config.BindingTableRuleConfig;

import com.dangdang.ddframe.rdb.sharding.config.common.api.config.ShardingRuleConfig;

import com.dangdang.ddframe.rdb.sharding.config.common.api.config.StrategyConfig;

import com.dangdang.ddframe.rdb.sharding.config.common.api.config.TableRuleConfig;

import com.dangdang.ddframe.rdb.sharding.config.common.api.config.*;

import com.dangdang.ddframe.rdb.sharding.config.common.internal.algorithm.ClosureDatabaseShardingAlgorithm;

import com.dangdang.ddframe.rdb.sharding.config.common.internal.algorithm.ClosureTableShardingAlgorithm;

import com.dangdang.ddframe.rdb.sharding.config.common.internal.parser.InlineParser;
@@ -44,15 +40,9 @@ import com.google.common.base.Function; 
import com.google.common.base.Preconditions;

import com.google.common.base.Strings;

import com.google.common.collect.Lists;

import lombok.AllArgsConstructor;

import org.apache.commons.collections4.MapUtils;



import javax.sql.DataSource;

import java.util.ArrayList;

import java.util.Collection;

import java.util.Collections;

import java.util.List;

import java.util.Map;

import java.util.*;

import java.util.Map.Entry;



/**
@@ -60,7 +50,6 @@ import java.util.Map.Entry; 
 * 

 * @author gaohongtao

 */

@AllArgsConstructor

public final class ShardingRuleBuilder {

    

    private final String logRoot;
@@ -77,6 +66,12 @@ public final class ShardingRuleBuilder { 
        this(logRoot, Collections.<String, DataSource>emptyMap(), shardingRuleConfig);

    }

    

    public ShardingRuleBuilder(final String logRoot, final Map<String, DataSource> externalDataSourceMap, final ShardingRuleConfig shardingRuleConfig) {

        this.logRoot = logRoot;

        this.externalDataSourceMap = (null ==  externalDataSourceMap) ? Collections.<String, DataSource>emptyMap() : externalDataSourceMap;

        this.shardingRuleConfig = shardingRuleConfig;

    }

    

    /**

     * 构建分片规则.

     *
@@ -95,7 +90,7 @@ public final class ShardingRuleBuilder { 
    }

    

    private DataSourceRule buildDataSourceRule() {

        Preconditions.checkArgument(!shardingRuleConfig.getDataSource().isEmpty() || MapUtils.isNotEmpty(externalDataSourceMap), "Sharding JDBC: No data source config");

        Preconditions.checkArgument(!shardingRuleConfig.getDataSource().isEmpty() || !externalDataSourceMap.isEmpty(), "Sharding JDBC: No data source config");

        return shardingRuleConfig.getDataSource().isEmpty() ? new DataSourceRule(externalDataSourceMap, shardingRuleConfig.getDefaultDataSourceName())

                : new DataSourceRule(shardingRuleConfig.getDataSource(), shardingRuleConfig.getDefaultDataSourceName());

    }

sharding-jdbc-core/pom.xml

+0 −9
Original line number Diff line number Diff line
@@ -17,10 +17,6 @@ 
            <groupId>com.google.guava</groupId>

            <artifactId>guava</artifactId>

        </dependency>

        <dependency>

            <groupId>org.apache.commons</groupId>

            <artifactId>commons-collections4</artifactId>

        </dependency>

        <dependency>

            <groupId>io.dropwizard.metrics</groupId>

            <artifactId>metrics-core</artifactId>
@@ -74,10 +70,5 @@ 
            <groupId>ch.qos.logback</groupId>

            <artifactId>logback-classic</artifactId>

        </dependency>

        <dependency>

            <groupId>org.slf4j</groupId>

            <artifactId>jcl-over-slf4j</artifactId>

            <scope>test</scope>

        </dependency>

    </dependencies>

</project>
 
 No newline at end of file

sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractResultSetAdapter.java

+2 −2
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ import com.dangdang.ddframe.rdb.sharding.jdbc.unsupported.AbstractUnsupportedOpe 
import com.google.common.base.Preconditions;

import lombok.Getter;

import lombok.extern.slf4j.Slf4j;

import org.apache.commons.collections4.map.CaseInsensitiveMap;



import java.sql.ResultSet;

import java.sql.ResultSetMetaData;
@@ -30,6 +29,7 @@ import java.util.Collection; 
import java.util.LinkedList;

import java.util.List;

import java.util.Map;

import java.util.TreeMap;



/**

 * 代理结果集适配器.
@@ -55,7 +55,7 @@ public abstract class AbstractResultSetAdapter extends AbstractUnsupportedOperat 
    

    private Map<String, Integer> generateColumnLabelIndexMap() throws SQLException {

        ResultSetMetaData resultSetMetaData = resultSets.get(0).getMetaData();

        Map<String, Integer> result = new CaseInsensitiveMap<>(resultSetMetaData.getColumnCount());

        Map<String, Integer> result = new TreeMap<>(String.CASE_INSENSITIVE_ORDER);

        for (int i = 1; i <= resultSetMetaData.getColumnCount(); i++) {

            result.put(resultSetMetaData.getColumnLabel(i), i);

        }