This is an automated email from the ASF dual-hosted git repository.
jianglongtao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/shardingsphere.git
The following commit(s) were added to refs/heads/master by this push:
new 9dc3a0c2d8b remove useless constructor for `TableRuleSegment` (#23445)
9dc3a0c2d8b is described below
commit 9dc3a0c2d8b2b91d7f92079691b330defd09d180
Author: Zichao <[email protected]>
AuthorDate: Tue Jan 10 05:10:21 2023 +1300
remove useless constructor for `TableRuleSegment` (#23445)
* remove useless constructor for `TableRuleSegment`
* remove useless constructor for `TableRuleSegment`
* remove useless constructor for `TableRuleSegment`
---
.../checker/ShardingRuleStatementCheckerTest.java | 32 ++++++++++++++--------
.../ShardingRuleStatementConverterTest.java | 10 +++----
...AlterShardingTableRuleStatementUpdaterTest.java | 4 +--
...reateShardingTableRuleStatementUpdaterTest.java | 8 +++---
.../parser/segment/table/TableRuleSegment.java | 12 --------
.../loader/dialect/OracleSchemaMetaDataLoader.java | 2 +-
.../dialect/OracleSchemaMetaDataLoaderTest.java | 8 +++---
7 files changed, 36 insertions(+), 40 deletions(-)
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
index 24ece07795a..796302cb94b 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/checker/ShardingRuleStatementCheckerTest.java
@@ -170,7 +170,8 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = UnsupportedSQLOperationException.class)
public void assertCheckTableWithInvalidShardingStrategyType() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("invalid", "product_id", null));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
@@ -178,7 +179,8 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = InvalidAlgorithmConfigurationException.class)
public void assertCheckTableWithUnmatchedShardingStrategyType1() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("complex", "product_id", null));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
@@ -186,7 +188,8 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = InvalidAlgorithmConfigurationException.class)
public void assertCheckTableWithUnmatchedShardingStrategyType2() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("standard", "product_id,user_id", null));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
@@ -194,8 +197,9 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = InvalidAlgorithmConfigurationException.class)
public void assertCheckTableWithUnmatchedShardingStrategyType3() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("CORE.AUTO.FIXTURE", PropertiesBuilder.build(new
Property("sharding-count", "4")));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("standard", "user_id", databaseAlgorithmSegment));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
@@ -203,7 +207,8 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = InvalidAlgorithmConfigurationException.class)
public void assertCheckTableWithInvalidAlgorithmName() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("hint", "product_id", null));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
@@ -211,7 +216,8 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = InvalidAlgorithmConfigurationException.class)
public void
assertCheckTableWithInvalidAlgorithmNameWhenCurrentRuleConfigIsNull() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("hint", "product_id", null));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, null);
@@ -219,8 +225,9 @@ public final class ShardingRuleStatementCheckerTest {
@Test
public void assertCheckNullAlgorithmNameAndAlgorithmSegment() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("inline", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${product_id % 2}")));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("standard", "product_id", databaseAlgorithmSegment));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
@@ -228,14 +235,15 @@ public final class ShardingRuleStatementCheckerTest {
@Test(expected = InvalidAlgorithmConfigurationException.class)
public void assertCheckNullAlgorithmNameAndNullAlgorithmSegment() {
- TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"));
+ KeyGenerateStrategySegment keyGenerateStrategy = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment tableRuleSegment = new TableRuleSegment("t_product",
Arrays.asList("ds_0", "ds_1"), keyGenerateStrategy, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("standard", "product_id", null));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(tableRuleSegment);
ShardingTableRuleStatementChecker.checkCreation(database, rules,
false, shardingRuleConfig);
}
@Test(expected = InvalidAlgorithmConfigurationException.class)
- public void assertCheckAutoTableRuleWithStandardShardingAlgoithm() {
+ public void assertCheckAutoTableRuleWithStandardShardingAlgorithm() {
AutoTableRuleSegment autoTableRuleSegment = new
AutoTableRuleSegment("t_product", Arrays.asList("ds_0", "ds_1"));
autoTableRuleSegment.setShardingAlgorithmSegment(new
AlgorithmSegment("INLINE", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${product_id % 2}"))));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(autoTableRuleSegment);
@@ -243,7 +251,7 @@ public final class ShardingRuleStatementCheckerTest {
}
@Test
- public void assertCheckAutoTableRuleWithAutoShardingAlgoithm() {
+ public void assertCheckAutoTableRuleWithAutoShardingAlgorithm() {
AutoTableRuleSegment autoTableRuleSegment = new
AutoTableRuleSegment("t_product", Arrays.asList("ds_0", "ds_1"));
autoTableRuleSegment.setShardingAlgorithmSegment(new
AlgorithmSegment("CORE.AUTO.FIXTURE", PropertiesBuilder.build(new
Property("sharding-count", "4"))));
List<AbstractTableRuleSegment> rules =
Collections.singletonList(autoTableRuleSegment);
@@ -289,11 +297,11 @@ public final class ShardingRuleStatementCheckerTest {
}
private TableRuleSegment createCompleteTableRule() {
- TableRuleSegment result = new TableRuleSegment("t_product_1",
Collections.singletonList("ds_${0..1}.t_order${0..1}"));
Properties props = new Properties();
+ KeyGenerateStrategySegment keyGenerator = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", props));
+ TableRuleSegment result = new TableRuleSegment("t_product_1",
Collections.singletonList("ds_${0..1}.t_order${0..1}"), keyGenerator, null);
result.setTableStrategySegment(new ShardingStrategySegment("hint",
"product_id", new AlgorithmSegment("CORE.HINT.FIXTURE", props)));
result.setDatabaseStrategySegment(new ShardingStrategySegment("hint",
"product_id", new AlgorithmSegment("CORE.HINT.FIXTURE", props)));
- result.setKeyGenerateStrategySegment(new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", props)));
return result;
}
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java
index 8ae011c901b..3bc467cee8d 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/converter/ShardingRuleStatementConverterTest.java
@@ -79,20 +79,20 @@ public final class ShardingRuleStatementConverterTest {
Collection<AbstractTableRuleSegment> result = new LinkedList<>();
AutoTableRuleSegment autoTableRuleSegment1 = new
AutoTableRuleSegment("t_order", Arrays.asList("ds0", "ds1"), "order_id",
new AlgorithmSegment("MOD", PropertiesBuilder.build(new
Property("sharding_count", "2"))), null, null);
- AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("inline", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${product_id % 2}")));
+ result.add(autoTableRuleSegment1);
AutoTableRuleSegment autoTableRuleSegment2 = new
AutoTableRuleSegment("t_order_2", Arrays.asList("ds0", "ds1"), "order_id",
new AlgorithmSegment("MOD", PropertiesBuilder.build(new
Property("sharding_count", "2"))),
new KeyGenerateStrategySegment("order_id",
"snowflake_algorithm"),
new AuditStrategySegment(Collections.singleton(new
ShardingAuditorSegment("sharding_key_required_auditor",
new AlgorithmSegment("DML_SHARDING_CONDITIONS", new
Properties()))), true));
+ result.add(autoTableRuleSegment2);
TableRuleSegment tableRuleSegment = new TableRuleSegment("t_order",
Arrays.asList("ds0", "ds1"),
- new ShardingStrategySegment("standard", "order_id",
databaseAlgorithmSegment),
- new ShardingStrategySegment("standard", "order_id", new
AlgorithmSegment("order_id_algorithm", new Properties())),
new KeyGenerateStrategySegment("order_id", new
AlgorithmSegment("snowflake", PropertiesBuilder.build(new Property("", "")))),
new AuditStrategySegment(Collections.singleton(new
ShardingAuditorSegment("sharding_key_required_auditor",
new AlgorithmSegment("DML_SHARDING_CONDITIONS", new
Properties()))), true));
- result.add(autoTableRuleSegment1);
- result.add(autoTableRuleSegment2);
+ AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("inline", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${product_id % 2}")));
+ tableRuleSegment.setDatabaseStrategySegment(new
ShardingStrategySegment("standard", "order_id", databaseAlgorithmSegment));
+ tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("standard", "order_id", new
AlgorithmSegment("order_id_algorithm", new Properties())));
result.add(tableRuleSegment);
return result;
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
index 1d5f9b6d603..30341b1316c 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/AlterShardingTableRuleStatementUpdaterTest.java
@@ -162,11 +162,11 @@ public final class
AlterShardingTableRuleStatementUpdaterTest {
}
private TableRuleSegment createCompleteTableRule(final String
logicTableName) {
- TableRuleSegment result = new TableRuleSegment(logicTableName,
Collections.singletonList("ds_${0..1}.t_order${0..1}"));
+ KeyGenerateStrategySegment keyGenerator = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment result = new TableRuleSegment(logicTableName,
Collections.singletonList("ds_${0..1}.t_order${0..1}"), keyGenerator, null);
result.setTableStrategySegment(new ShardingStrategySegment("standard",
"product_id", new AlgorithmSegment("CORE.STANDARD.FIXTURE", new Properties())));
AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("inline", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${user_id % 2}")));
result.setDatabaseStrategySegment(new
ShardingStrategySegment("standard", "product_id", databaseAlgorithmSegment));
- result.setKeyGenerateStrategySegment(new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties())));
return result;
}
diff --git
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
index 7d09ca1e9a8..8bb7fd4d4a8 100644
---
a/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
+++
b/features/sharding/distsql/handler/src/test/java/org/apache/shardingsphere/sharding/distsql/update/CreateShardingTableRuleStatementUpdaterTest.java
@@ -165,11 +165,11 @@ public final class
CreateShardingTableRuleStatementUpdaterTest {
autoTableRuleSegment.setKeyGenerateStrategySegment(new
KeyGenerateStrategySegment("test_product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties())));
autoTableRuleSegment.setShardingColumn("custom_id");
autoTableRuleSegment.setShardingAlgorithmSegment(new
AlgorithmSegment("FOO.DISTSQL.FIXTURE", PropertiesBuilder.build(new
Property("", ""))));
- TableRuleSegment tableRuleSegment = new
TableRuleSegment("t_order_input",
Collections.singletonList("ds_${0..1}.t_order_${0..5}"));
+ KeyGenerateStrategySegment keyGenerator = new
KeyGenerateStrategySegment("order_id", new AlgorithmSegment("DISTSQL.FIXTURE",
new Properties()));
+ TableRuleSegment tableRuleSegment = new
TableRuleSegment("t_order_input",
Collections.singletonList("ds_${0..1}.t_order_${0..5}"), keyGenerator, null);
tableRuleSegment.setTableStrategySegment(new
ShardingStrategySegment("standard", "user_id", new
AlgorithmSegment("CORE.STANDARD.FIXTURE", new Properties())));
AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("inline", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${user_id % 2}")));
tableRuleSegment.setDatabaseStrategySegment(new
ShardingStrategySegment("standard", "order_id", databaseAlgorithmSegment));
- tableRuleSegment.setKeyGenerateStrategySegment(new
KeyGenerateStrategySegment("order_id", new AlgorithmSegment("DISTSQL.FIXTURE",
new Properties())));
CreateShardingTableRuleStatement statementWithIfNotExists = new
CreateShardingTableRuleStatement(true, Arrays.asList(autoTableRuleSegment,
tableRuleSegment));
updater.checkSQLStatement(database, statementWithIfNotExists,
currentRuleConfig);
ShardingRuleConfiguration toBeCreatedRuleConfigWithIfNotExists =
updater.buildToBeCreatedRuleConfiguration(currentRuleConfig, statement);
@@ -217,11 +217,11 @@ public final class
CreateShardingTableRuleStatementUpdaterTest {
}
private TableRuleSegment createCompleteTableRule() {
- TableRuleSegment result = new TableRuleSegment("t_order_input",
Collections.singletonList("ds_${0..1}.t_order_${0..1}"));
+ KeyGenerateStrategySegment keyGenerator = new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties()));
+ TableRuleSegment result = new TableRuleSegment("t_order_input",
Collections.singletonList("ds_${0..1}.t_order_${0..1}"), keyGenerator, null);
result.setTableStrategySegment(new ShardingStrategySegment("standard",
"product_id", new AlgorithmSegment("CORE.STANDARD.FIXTURE", new Properties())));
AlgorithmSegment databaseAlgorithmSegment = new
AlgorithmSegment("inline", PropertiesBuilder.build(new
Property("algorithm-expression", "ds_${user_id % 2}")));
result.setDatabaseStrategySegment(new
ShardingStrategySegment("standard", "product_id", databaseAlgorithmSegment));
- result.setKeyGenerateStrategySegment(new
KeyGenerateStrategySegment("product_id", new
AlgorithmSegment("DISTSQL.FIXTURE", new Properties())));
return result;
}
diff --git
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java
index ce6c31124d1..da7a88198f4 100644
---
a/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java
+++
b/features/sharding/distsql/statement/src/main/java/org/apache/shardingsphere/sharding/distsql/parser/segment/table/TableRuleSegment.java
@@ -36,18 +36,6 @@ public final class TableRuleSegment extends
AbstractTableRuleSegment {
private ShardingStrategySegment databaseStrategySegment;
- public TableRuleSegment(final String logicTable, final Collection<String>
dataSourcesNote) {
- super(logicTable, dataSourcesNote);
- }
-
- public TableRuleSegment(final String logicTable, final Collection<String>
dataSourcesNote, final ShardingStrategySegment databaseStrategy,
- final ShardingStrategySegment tableStrategy, final
KeyGenerateStrategySegment keyGenerateStrategySegment,
- final AuditStrategySegment auditStrategySegment) {
- super(logicTable, dataSourcesNote, keyGenerateStrategySegment,
auditStrategySegment);
- this.tableStrategySegment = tableStrategy;
- this.databaseStrategySegment = databaseStrategy;
- }
-
public TableRuleSegment(final String logicTable, final Collection<String>
dataSourcesNote,
final KeyGenerateStrategySegment
keyGenerateStrategySegment, final AuditStrategySegment auditStrategySegment) {
super(logicTable, dataSourcesNote, keyGenerateStrategySegment,
auditStrategySegment);
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoader.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoader.java
index 27d710b20e9..17b212555b1 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoader.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoader.java
@@ -126,7 +126,7 @@ public final class OracleSchemaMetaDataLoader implements
DialectSchemaMetaDataLo
boolean isVisible = "NO".equals(resultSet.getString("HIDDEN_COLUMN"));
return new ColumnMetaData(columnName, dataTypeMap.get(dataType),
primaryKey, generated, caseSensitive, isVisible, false);
}
-
+
private String getOriginalDataType(final String dataType) {
int index = dataType.indexOf("(");
if (index > 0) {
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoaderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoaderTest.java
index 0d63c5ba899..b893a68f6bc 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoaderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/loader/dialect/OracleSchemaMetaDataLoaderTest.java
@@ -69,7 +69,7 @@ public final class OracleSchemaMetaDataLoaderTest {
private static final String ALL_TAB_COLUMNS_SQL_CONDITION6 = "SELECT OWNER
AS TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME, DATA_TYPE, COLUMN_ID, HIDDEN_COLUMN
FROM ALL_TAB_COLS"
+ " WHERE OWNER = ? AND TABLE_NAME IN ('tbl') ORDER BY COLUMN_ID";
-
+
private static final String ALL_TAB_COLUMNS_SQL_CONDITION7 = "SELECT OWNER
AS TABLE_SCHEMA, TABLE_NAME, COLUMN_NAME, DATA_TYPE, COLUMN_ID, HIDDEN_COLUMN ,
IDENTITY_COLUMN, COLLATION"
+ " FROM ALL_TAB_COLS WHERE OWNER = ? AND TABLE_NAME IN ('tbl')
ORDER BY COLUMN_ID";
@@ -186,7 +186,7 @@ public final class OracleSchemaMetaDataLoaderTest {
assertThat(columnsIterator.next(), is(new ColumnMetaData("id",
Types.INTEGER, true, false, false, true, false)));
assertThat(columnsIterator.next(), is(new ColumnMetaData("name",
Types.VARCHAR, false, false, false, false, false)));
}
-
+
@Test
public void assertLoadCondition7() throws SQLException {
DataSource dataSource = mockDataSource();
@@ -233,7 +233,7 @@ public final class OracleSchemaMetaDataLoaderTest {
when(result.getString("COLLATION")).thenReturn("BINARY_CS",
"BINARY_CI", "BINARY_CI");
return result;
}
-
+
private ResultSet mockTableMetaDataResultSetWithNullValue() throws
SQLException {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, true, true, false);
@@ -245,7 +245,7 @@ public final class OracleSchemaMetaDataLoaderTest {
when(result.getString("COLLATION")).thenReturn("BINARY_CS",
"BINARY_CI", null);
return result;
}
-
+
private ResultSet mockIndexMetaDataResultSet() throws SQLException {
ResultSet result = mock(ResultSet.class);
when(result.next()).thenReturn(true, false);
