From bef359cb6c9e3096b6211302e229af4015c304b7 Mon Sep 17 00:00:00 2001 From: terrymanu Date: Fri, 8 Apr 2016 11:55:05 +0800 Subject: [PATCH] refactor --- .../sharding/executor/StatementExecutor.java | 8 +-- .../AbstractPreparedStatementAdapter.java | 2 +- ...electGroupByShardingDataBasesOnlyTest.java | 12 ++-- ...pByShardingBothDataBasesAndTablesTest.java | 12 ++-- .../SelectGroupByShardingTablesOnlyTest.java | 12 ++-- .../merger/fixture/MockResultSet.java | 1 + ...LPreparedStatementForOneParameterTest.java | 2 +- ...PreparedStatementForTowParametersTest.java | 2 +- .../sharding/parser/mysql/OrParseTest.java | 2 +- .../sharding/parser/mysql/or/select_or.xml | 60 +++++++++---------- .../one_param/delete.xml | 0 .../one_param/insert.xml | 0 .../one_param/select.xml | 0 .../one_param/select_limit.xml | 0 .../one_param/update.xml | 2 +- .../two_params/select.xml | 0 .../two_params/select_limit.xml | 0 .../parser/mysql/statement/update.xml | 2 +- .../SelectAvg.xml | 0 .../SelectCount.xml | 0 .../SelectMax.xml | 0 .../SelectMin.xml | 0 .../SelectOrderByDesc.xml | 0 .../SelectSum.xml | 0 .../SelectAvg.xml | 0 .../SelectCount.xml | 0 .../SelectMax.xml | 0 .../SelectMin.xml | 0 .../SelectOrderByDesc.xml | 0 .../SelectSum.xml | 0 .../SelectAvg.xml | 0 .../SelectCount.xml | 0 .../SelectMax.xml | 0 .../SelectMin.xml | 0 .../SelectOrderByDesc.xml | 0 .../SelectSum.xml | 0 sharding-jdbc-doc/content/data/chart.js | 4 +- 37 files changed, 61 insertions(+), 60 deletions(-) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/one_param/delete.xml (100%) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/one_param/insert.xml (100%) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/one_param/select.xml (100%) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/one_param/select_limit.xml (100%) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/one_param/update.xml (80%) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/two_params/select.xml (100%) rename sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/{preparedstatement => prepared_statement}/two_params/select_limit.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/{select_groupby => select_group_by}/SelectAvg.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/{select_groupby => select_group_by}/SelectCount.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/{select_groupby => select_group_by}/SelectMax.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/{select_groupby => select_group_by}/SelectMin.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/{select_groupby => select_group_by}/SelectOrderByDesc.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/{select_groupby => select_group_by}/SelectSum.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/{select_groupby => select_group_by}/SelectAvg.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/{select_groupby => select_group_by}/SelectCount.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/{select_groupby => select_group_by}/SelectMax.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/{select_groupby => select_group_by}/SelectMin.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/{select_groupby => select_group_by}/SelectOrderByDesc.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/{select_groupby => select_group_by}/SelectSum.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/{select_groupby => select_group_by}/SelectAvg.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/{select_groupby => select_group_by}/SelectCount.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/{select_groupby => select_group_by}/SelectMax.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/{select_groupby => select_group_by}/SelectMin.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/{select_groupby => select_group_by}/SelectOrderByDesc.xml (100%) rename sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/{select_groupby => select_group_by}/SelectSum.xml (100%) diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/executor/StatementExecutor.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/executor/StatementExecutor.java index b60c350f57..4e22c003ab 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/executor/StatementExecutor.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/executor/StatementExecutor.java @@ -226,13 +226,13 @@ public final class StatementExecutor { postDMLExecutionEvents(); if (1 == statementExecutorWrappers.size()) { StatementExecutorWrapper StatementExecutorWrapper = statementExecutorWrappers.iterator().next(); - boolean result = false; + boolean result; try { result = executor.execute(StatementExecutorWrapper.getStatement(), StatementExecutorWrapper.getSqlExecutionUnit().getSql()); } catch (final SQLException ex) { postDMLExecutionEventsAfterExecution(StatementExecutorWrapper, EventExecutionType.EXECUTE_FAILURE); ExecutorExceptionHandler.handleException(ex); - return result; + return false; } finally { MetricsContext.stop(context); } @@ -243,13 +243,13 @@ public final class StatementExecutor { @Override public Boolean execute(final StatementExecutorWrapper input) throws Exception { - boolean result = false; + boolean result; try { result = executor.execute(input.getStatement(), input.getSqlExecutionUnit().getSql()); } catch (final SQLException ex) { postDMLExecutionEventsAfterExecution(input, EventExecutionType.EXECUTE_FAILURE); ExecutorExceptionHandler.handleException(ex); - return result; + return false; } postDMLExecutionEventsAfterExecution(input, EventExecutionType.EXECUTE_SUCCESS); return result; diff --git a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractPreparedStatementAdapter.java b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractPreparedStatementAdapter.java index 8625769ffb..f53643124c 100644 --- a/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractPreparedStatementAdapter.java +++ b/sharding-jdbc-core/src/main/java/com/dangdang/ddframe/rdb/sharding/jdbc/adapter/AbstractPreparedStatementAdapter.java @@ -51,7 +51,7 @@ public abstract class AbstractPreparedStatementAdapter extends AbstractUnsupport @Getter private final List parameters = new ArrayList<>(); - protected AbstractPreparedStatementAdapter(final ShardingConnection shardingConnection, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) throws SQLException { + protected AbstractPreparedStatementAdapter(final ShardingConnection shardingConnection, final int resultSetType, final int resultSetConcurrency, final int resultSetHoldability) { super(shardingConnection, resultSetType, resultSetConcurrency, resultSetHoldability); } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/db/SelectGroupByShardingDataBasesOnlyTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/db/SelectGroupByShardingDataBasesOnlyTest.java index 02e97b375f..7a96f093fd 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/db/SelectGroupByShardingDataBasesOnlyTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/db/SelectGroupByShardingDataBasesOnlyTest.java @@ -37,36 +37,36 @@ public final class SelectGroupByShardingDataBasesOnlyTest extends AbstractShardi @Test public void assertSelectSum() throws SQLException, DatabaseUnitException { String sql = "SELECT SUM(order_id) AS `orders_sum`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/db/expect/select_groupby/SelectSum.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/db/expect/select_group_by/SelectSum.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectCount() throws SQLException, DatabaseUnitException { String sql = "SELECT COUNT(order_id) AS `orders_count`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/db/expect/select_groupby/SelectCount.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/db/expect/select_group_by/SelectCount.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectMax() throws SQLException, DatabaseUnitException { String sql = "SELECT MAX(order_id) AS `max_order_id`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/db/expect/select_groupby/SelectMax.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/db/expect/select_group_by/SelectMax.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectMin() throws SQLException, DatabaseUnitException { String sql = "SELECT MIN(order_id) AS `min_order_id`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/db/expect/select_groupby/SelectMin.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/db/expect/select_group_by/SelectMin.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectAvg() throws SQLException, DatabaseUnitException { String sql = "SELECT AVG(order_id) AS `orders_avg`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/db/expect/select_groupby/SelectAvg.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/db/expect/select_group_by/SelectAvg.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectOrderByDesc() throws SQLException, DatabaseUnitException { String sql = "SELECT SUM(order_id) AS `orders_sum`, `user_id` FROM `t_order` GROUP BY `user_id` ORDER BY orders_sum DESC"; - assertDataSet("integrate/dataset/db/expect/select_groupby/SelectOrderByDesc.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/db/expect/select_group_by/SelectOrderByDesc.xml", shardingDataSource.getConnection(), "t_order", sql); } } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/dbtbl/SelectGroupByShardingBothDataBasesAndTablesTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/dbtbl/SelectGroupByShardingBothDataBasesAndTablesTest.java index aa79094d25..f08503973a 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/dbtbl/SelectGroupByShardingBothDataBasesAndTablesTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/dbtbl/SelectGroupByShardingBothDataBasesAndTablesTest.java @@ -37,36 +37,36 @@ public final class SelectGroupByShardingBothDataBasesAndTablesTest extends Abstr @Test public void assertSelectSum() throws SQLException, DatabaseUnitException { String sql = "SELECT SUM(order_id) AS `orders_sum`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/dbtbl/expect/select_groupby/SelectSum.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/dbtbl/expect/select_group_by/SelectSum.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectCount() throws SQLException, DatabaseUnitException { String sql = "SELECT COUNT(order_id) AS `orders_count`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/dbtbl/expect/select_groupby/SelectCount.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/dbtbl/expect/select_group_by/SelectCount.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectMax() throws SQLException, DatabaseUnitException { String sql = "SELECT MAX(order_id) AS `max_order_id`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/dbtbl/expect/select_groupby/SelectMax.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/dbtbl/expect/select_group_by/SelectMax.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectMin() throws SQLException, DatabaseUnitException { String sql = "SELECT MIN(order_id) AS `min_order_id`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/dbtbl/expect/select_groupby/SelectMin.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/dbtbl/expect/select_group_by/SelectMin.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectAvg() throws SQLException, DatabaseUnitException { String sql = "SELECT AVG(order_id) AS `orders_avg`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/dbtbl/expect/select_groupby/SelectAvg.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/dbtbl/expect/select_group_by/SelectAvg.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectOrderByDesc() throws SQLException, DatabaseUnitException { String sql = "SELECT SUM(order_id) AS `orders_sum`, `user_id` FROM `t_order` GROUP BY `user_id` ORDER BY orders_sum DESC"; - assertDataSet("integrate/dataset/dbtbl/expect/select_groupby/SelectOrderByDesc.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/dbtbl/expect/select_group_by/SelectOrderByDesc.xml", shardingDataSource.getConnection(), "t_order", sql); } } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/tbl/SelectGroupByShardingTablesOnlyTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/tbl/SelectGroupByShardingTablesOnlyTest.java index c5b1709dfe..3d2a44bbc0 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/tbl/SelectGroupByShardingTablesOnlyTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/integrate/tbl/SelectGroupByShardingTablesOnlyTest.java @@ -37,36 +37,36 @@ public final class SelectGroupByShardingTablesOnlyTest extends AbstractShardingT @Test public void assertSelectSum() throws SQLException, DatabaseUnitException { String sql = "SELECT SUM(order_id) AS `orders_sum`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/tbl/expect/select_groupby/SelectSum.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/tbl/expect/select_group_by/SelectSum.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectCount() throws SQLException, DatabaseUnitException { String sql = "SELECT COUNT(order_id) AS `orders_count`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/tbl/expect/select_groupby/SelectCount.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/tbl/expect/select_group_by/SelectCount.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectMax() throws SQLException, DatabaseUnitException { String sql = "SELECT MAX(order_id) AS `max_order_id`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/tbl/expect/select_groupby/SelectMax.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/tbl/expect/select_group_by/SelectMax.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectMin() throws SQLException, DatabaseUnitException { String sql = "SELECT MIN(order_id) AS `min_order_id`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/tbl/expect/select_groupby/SelectMin.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/tbl/expect/select_group_by/SelectMin.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectAvg() throws SQLException, DatabaseUnitException { String sql = "SELECT AVG(order_id) AS `orders_avg`, `user_id` FROM `t_order` GROUP BY `user_id`"; - assertDataSet("integrate/dataset/tbl/expect/select_groupby/SelectAvg.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/tbl/expect/select_group_by/SelectAvg.xml", shardingDataSource.getConnection(), "t_order", sql); } @Test public void assertSelectOrderByDesc() throws SQLException, DatabaseUnitException { String sql = "SELECT SUM(order_id) AS `orders_sum`, `user_id` FROM `t_order` GROUP BY `user_id` ORDER BY orders_sum DESC"; - assertDataSet("integrate/dataset/tbl/expect/select_groupby/SelectOrderByDesc.xml", shardingDataSource.getConnection(), "t_order", sql); + assertDataSet("integrate/dataset/tbl/expect/select_group_by/SelectOrderByDesc.xml", shardingDataSource.getConnection(), "t_order", sql); } } diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/fixture/MockResultSet.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/fixture/MockResultSet.java index 27f30864c3..c38c5f72e6 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/fixture/MockResultSet.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/merger/fixture/MockResultSet.java @@ -34,6 +34,7 @@ public final class MockResultSet extends AbstractUnsupportedOperationMockResu private Map currentValue; + @SafeVarargs public MockResultSet(@SuppressWarnings("unchecked") final T... data) { columnNamesMetaData = new ArrayList<>(1); List> list = new ArrayList<>(data.length); diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForOneParameterTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForOneParameterTest.java index aa9e8c28f3..c7013ab5da 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForOneParameterTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForOneParameterTest.java @@ -44,7 +44,7 @@ public final class MySQLPreparedStatementForOneParameterTest extends AbstractBas @Parameters(name = "{0}") public static Collection dataParameters() { - return AbstractBaseParseTest.dataParameters("com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/"); + return AbstractBaseParseTest.dataParameters("com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/"); } @Test diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForTowParametersTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForTowParametersTest.java index e52115eb50..0b87ff2381 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForTowParametersTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/MySQLPreparedStatementForTowParametersTest.java @@ -42,7 +42,7 @@ public final class MySQLPreparedStatementForTowParametersTest extends AbstractBa @Parameters(name = "{0}") public static Collection dataParameters() { - return AbstractBaseParseTest.dataParameters("com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/two_params/"); + return AbstractBaseParseTest.dataParameters("com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/two_params/"); } @Test diff --git a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/OrParseTest.java b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/OrParseTest.java index 06613ca4bf..80042016a9 100644 --- a/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/OrParseTest.java +++ b/sharding-jdbc-core/src/test/java/com/dangdang/ddframe/rdb/sharding/parser/mysql/OrParseTest.java @@ -50,6 +50,6 @@ public final class OrParseTest extends AbstractBaseParseTest { @Test public void assertParse() { assertSQLParsedResult(SQLParserFactory.create(DatabaseType.MySQL, getSql(), Collections.emptyList(), - Arrays.asList("id", "user_id", "name", "age", "days", "fee", "traveldate", "long")).parse()); + Arrays.asList("id", "user_id", "name", "age", "days", "fee", "travel_date", "long")).parse()); } } diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml index 15be1c405f..ff830d2435 100644 --- a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml +++ b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/or/select_or.xml @@ -1,113 +1,113 @@ - + - +
- + - + - + - + -
+
- + - + - + - + - + - + - + -
+
- + - + - + - + - + - + - + - + - + - + - + - + - + @@ -115,9 +115,9 @@ - + -
+
diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/delete.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/delete.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/delete.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/delete.xml diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/insert.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/insert.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/insert.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/insert.xml diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/select.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/select.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/select.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/select.xml diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/select_limit.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/select_limit.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/select_limit.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/select_limit.xml diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/update.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/update.xml similarity index 80% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/update.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/update.xml index af707e5991..b6f92cd1ba 100644 --- a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/one_param/update.xml +++ b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/one_param/update.xml @@ -1,6 +1,6 @@ - +
diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/two_params/select.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/two_params/select.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/two_params/select.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/two_params/select.xml diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/two_params/select_limit.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/two_params/select_limit.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/preparedstatement/two_params/select_limit.xml rename to sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/prepared_statement/two_params/select_limit.xml diff --git a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/statement/update.xml b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/statement/update.xml index 60108296b6..95a3e45749 100644 --- a/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/statement/update.xml +++ b/sharding-jdbc-core/src/test/resources/com/dangdang/ddframe/rdb/sharding/parser/mysql/statement/update.xml @@ -1,6 +1,6 @@ - +
diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectAvg.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectAvg.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectAvg.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectAvg.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectCount.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectCount.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectCount.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectCount.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectMax.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectMax.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectMax.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectMax.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectMin.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectMin.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectMin.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectMin.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectOrderByDesc.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectOrderByDesc.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectOrderByDesc.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectOrderByDesc.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectSum.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectSum.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_groupby/SelectSum.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/db/expect/select_group_by/SelectSum.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectAvg.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectAvg.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectAvg.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectAvg.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectCount.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectCount.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectCount.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectCount.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectMax.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectMax.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectMax.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectMax.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectMin.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectMin.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectMin.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectMin.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectOrderByDesc.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectOrderByDesc.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectOrderByDesc.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectOrderByDesc.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectSum.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectSum.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_groupby/SelectSum.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/dbtbl/expect/select_group_by/SelectSum.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectAvg.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectAvg.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectAvg.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectAvg.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectCount.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectCount.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectCount.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectCount.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectMax.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectMax.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectMax.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectMax.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectMin.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectMin.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectMin.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectMin.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectOrderByDesc.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectOrderByDesc.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectOrderByDesc.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectOrderByDesc.xml diff --git a/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectSum.xml b/sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectSum.xml similarity index 100% rename from sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_groupby/SelectSum.xml rename to sharding-jdbc-core/src/test/resources/integrate/dataset/tbl/expect/select_group_by/SelectSum.xml diff --git a/sharding-jdbc-doc/content/data/chart.js b/sharding-jdbc-doc/content/data/chart.js index 95369b4e81..ed39cef825 100644 --- a/sharding-jdbc-doc/content/data/chart.js +++ b/sharding-jdbc-doc/content/data/chart.js @@ -92,7 +92,7 @@ var charStyle = [ pointHoverRadius: 5, pointHoverBackgroundColor: "rgba(246,179,107,1)", pointHoverBorderColor: "rgba(246,179,107,1)", - pointHoverBorderWidth: 2, + pointHoverBorderWidth: 2 }, { backgroundColor: "rgba(61,134,198,0.2)", @@ -103,6 +103,6 @@ var charStyle = [ pointHoverRadius: 5, pointHoverBackgroundColor: "rgba(61,134,198,1)", pointHoverBorderColor: "rgba(61,134,198,1)", - pointHoverBorderWidth: 2, + pointHoverBorderWidth: 2 } ]; \ No newline at end of file -- GitLab