This is an automated email from the ASF dual-hosted git repository.
zhangliang 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 e8a8a63ea16 Refactor ShardingSphereIndex's constructor (#33809)
e8a8a63ea16 is described below
commit e8a8a63ea16096afbe7eba98e8f296d38a9bf90c
Author: Liang Zhang <[email protected]>
AuthorDate: Tue Nov 26 11:42:45 2024 +0800
Refactor ShardingSphereIndex's constructor (#33809)
---
.../schema/builder/GenericSchemaBuilder.java | 4 +---
.../database/schema/model/ShardingSphereIndex.java | 7 ++-----
.../yaml/schema/swapper/YamlIndexSwapper.java | 5 +----
.../schema/model/ShardingSphereSchemaTest.java | 3 ++-
.../schema/model/ShardingSphereTableTest.java | 22 +++++++++++-----------
.../schema/util/IndexMetaDataUtilsTest.java | 3 ++-
.../yaml/schema/swapper/YamlTableSwapperTest.java | 2 +-
.../index/AlterIndexStatementSchemaRefresher.java | 3 ++-
.../index/CreateIndexStatementSchemaRefresher.java | 3 ++-
.../connector/StandardDatabaseConnectorTest.java | 4 ++--
.../distsql/DistSQLQueryBackendHandlerTest.java | 2 +-
.../queryable/ShowTableMetaDataExecutorTest.java | 2 +-
.../ral/updatable/ImportMetaDataExecutorTest.java | 2 +-
.../header/query/MySQLQueryHeaderBuilderTest.java | 4 ++--
.../rewrite/engine/scenario/MixSQLRewriterIT.java | 2 +-
.../engine/scenario/ShardingSQLRewriterIT.java | 9 ++++++---
16 files changed, 38 insertions(+), 39 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
index a34f732c7ea..f0e93e12550 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilder.java
@@ -152,9 +152,7 @@ public final class GenericSchemaBuilder {
private static Collection<ShardingSphereIndex> convertToIndexes(final
Collection<IndexMetaData> indexMetaDataList) {
Collection<ShardingSphereIndex> result = new LinkedList<>();
for (IndexMetaData each : indexMetaDataList) {
- ShardingSphereIndex index = new
ShardingSphereIndex(each.getName());
- index.getColumns().addAll(each.getColumns());
- index.setUnique(each.isUnique());
+ ShardingSphereIndex index = new
ShardingSphereIndex(each.getName(), each.getColumns(), each.isUnique());
result.add(index);
}
return result;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereIndex.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereIndex.java
index 0ffee4f4200..e0e0f40e269 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereIndex.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereIndex.java
@@ -20,11 +20,9 @@ package
org.apache.shardingsphere.infra.metadata.database.schema.model;
import lombok.EqualsAndHashCode;
import lombok.Getter;
import lombok.RequiredArgsConstructor;
-import lombok.Setter;
import lombok.ToString;
import java.util.Collection;
-import java.util.LinkedList;
/**
* ShardingSphere index.
@@ -37,8 +35,7 @@ public final class ShardingSphereIndex {
private final String name;
- private final Collection<String> columns = new LinkedList<>();
+ private final Collection<String> columns;
- @Setter
- private boolean unique;
+ private final boolean unique;
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlIndexSwapper.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlIndexSwapper.java
index 0f1aaf0cdeb..3f634b3f9d8 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlIndexSwapper.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlIndexSwapper.java
@@ -37,9 +37,6 @@ public final class YamlIndexSwapper implements
YamlConfigurationSwapper<YamlShar
@Override
public ShardingSphereIndex swapToObject(final YamlShardingSphereIndex
yamlConfig) {
- ShardingSphereIndex result = new
ShardingSphereIndex(yamlConfig.getName());
- result.getColumns().addAll(yamlConfig.getColumns());
- result.setUnique(yamlConfig.isUnique());
- return result;
+ return new ShardingSphereIndex(yamlConfig.getName(),
yamlConfig.getColumns(), yamlConfig.isUnique());
}
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
index a91a5d7f766..69ff0295163 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchemaTest.java
@@ -94,7 +94,8 @@ class ShardingSphereSchemaTest {
@Test
void assertContainsIndex() {
- ShardingSphereTable table = new ShardingSphereTable("tbl",
Collections.emptyList(), Collections.singletonList(new
ShardingSphereIndex("col_idx")), Collections.emptyList());
+ ShardingSphereTable table = new ShardingSphereTable(
+ "tbl", Collections.emptyList(), Collections.singletonList(new
ShardingSphereIndex("col_idx", Collections.emptyList(), false)),
Collections.emptyList());
assertTrue(new ShardingSphereSchema(DefaultDatabase.LOGIC_NAME,
Collections.singletonMap("tbl", table),
Collections.emptyMap()).containsIndex("tbl", "col_idx"));
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
index 093eff87432..084c63bf1b6 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTableTest.java
@@ -61,8 +61,8 @@ class ShardingSphereTableTest {
@Test
void assertPutIndex() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1",
Collections.emptyList(), false);
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2",
Collections.emptyList(), false);
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
assertTrue(shardingSphereTable.containsIndex("foo_idx_1"));
assertTrue(shardingSphereTable.containsIndex("foo_idx_2"));
@@ -72,7 +72,7 @@ class ShardingSphereTableTest {
@Test
void assertGetIndex() {
- ShardingSphereIndex index = new ShardingSphereIndex("foo_idx");
+ ShardingSphereIndex index = new ShardingSphereIndex("foo_idx",
Collections.emptyList(), false);
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(),
Collections.singleton(index), Collections.emptyList());
assertTrue(shardingSphereTable.containsIndex("foo_idx"));
assertTrue(shardingSphereTable.containsIndex("FOO_IDX"));
@@ -81,8 +81,8 @@ class ShardingSphereTableTest {
@Test
void assertRemoveIndex() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1",
Collections.emptyList(), false);
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2",
Collections.emptyList(), false);
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
shardingSphereTable.removeIndex("foo_idx_1");
assertFalse(shardingSphereTable.containsIndex("foo_idx_1"));
@@ -93,8 +93,8 @@ class ShardingSphereTableTest {
@Test
void assertGetIndexes() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1",
Collections.emptyList(), false);
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2",
Collections.emptyList(), false);
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
assertThat(shardingSphereTable.getAllIndexes(), hasItems(index1,
index2));
assertThat(shardingSphereTable.getAllIndexes(), hasSize(2));
@@ -102,8 +102,8 @@ class ShardingSphereTableTest {
@Test
void assertContainsIndex() {
- ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
- ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
+ ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1",
Collections.emptyList(), false);
+ ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2",
Collections.emptyList(), false);
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
assertTrue(shardingSphereTable.containsIndex("foo_idx_1"));
assertTrue(shardingSphereTable.containsIndex("foo_idx_2"));
@@ -122,10 +122,10 @@ class ShardingSphereTableTest {
void assertEquals() {
ShardingSphereTable table1 = new ShardingSphereTable("foo_tbl",
Collections.singleton(new ShardingSphereColumn("foo_col",
Types.INTEGER, true, true, false, true, false, false)),
- Collections.singleton(new ShardingSphereIndex("foo_idx")),
Collections.emptyList());
+ Collections.singleton(new ShardingSphereIndex("foo_idx",
Collections.emptyList(), false)), Collections.emptyList());
ShardingSphereTable table2 = new ShardingSphereTable("foo_tbl",
Collections.singleton(new ShardingSphereColumn("foo_col",
Types.INTEGER, true, true, false, true, false, false)),
- Collections.singleton(new ShardingSphereIndex("foo_idx")),
Collections.emptyList());
+ Collections.singleton(new ShardingSphereIndex("foo_idx",
Collections.emptyList(), false)), Collections.emptyList());
assertThat(table1, is(table2));
}
}
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
index 6ca840133e0..d75cdbacf0b 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/util/IndexMetaDataUtilsTest.java
@@ -90,7 +90,8 @@ class IndexMetaDataUtilsTest {
}
private ShardingSphereDatabase buildDatabase() {
- ShardingSphereTable table = new ShardingSphereTable(TABLE_NAME,
Collections.emptyList(), Collections.singleton(new
ShardingSphereIndex(INDEX_NAME)), Collections.emptyList());
+ ShardingSphereTable table = new ShardingSphereTable(
+ TABLE_NAME, Collections.emptyList(), Collections.singleton(new
ShardingSphereIndex(INDEX_NAME, Collections.emptyList(), false)),
Collections.emptyList());
Map<String, ShardingSphereTable> tables =
Collections.singletonMap(TABLE_NAME, table);
Map<String, ShardingSphereSchema> schemas =
Collections.singletonMap(DefaultDatabase.LOGIC_NAME, new
ShardingSphereSchema(DefaultDatabase.LOGIC_NAME, tables,
Collections.emptyMap()));
return new ShardingSphereDatabase(DefaultDatabase.LOGIC_NAME,
mock(DatabaseType.class), mock(ResourceMetaData.class),
mock(RuleMetaData.class), schemas);
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapperTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapperTest.java
index 959e31b0920..c5867def0ca 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapperTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapperTest.java
@@ -65,7 +65,7 @@ class YamlTableSwapperTest {
private ShardingSphereTable createShardingSphereTable() {
return new ShardingSphereTable("foo_tbl",
Collections.singleton(new ShardingSphereColumn("foo_col", 0,
true, false, false, true, false, false)),
- Collections.singleton(new ShardingSphereIndex("PRIMARY")),
+ Collections.singleton(new ShardingSphereIndex("PRIMARY",
Collections.emptyList(), false)),
Collections.singleton(new
ShardingSphereConstraint("foo_constraint", "foo_tbl")), null);
}
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/AlterIndexStatementSchemaRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/AlterIndexStatementSchemaRefresher.java
index be05b2a2d44..9f6cc68119c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/AlterIndexStatementSchemaRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/AlterIndexStatementSchemaRefresher.java
@@ -31,6 +31,7 @@ import
org.apache.shardingsphere.sql.parser.statement.core.segment.ddl.index.Ind
import
org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.AlterIndexStatement;
import java.util.Collection;
+import java.util.LinkedList;
import java.util.Optional;
/**
@@ -54,7 +55,7 @@ public final class AlterIndexStatementSchemaRefresher
implements MetaDataRefresh
ShardingSphereTable newTable = newShardingSphereTable(table);
newTable.removeIndex(indexName);
String renameIndexName =
renameIndex.get().getIndexName().getIdentifier().getValue();
- newTable.putIndex(new ShardingSphereIndex(renameIndexName));
+ newTable.putIndex(new ShardingSphereIndex(renameIndexName, new
LinkedList<>(), false));
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), actualSchemaName);
alterSchemaMetaDataPOJO.getAlteredTables().add(newTable);
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/CreateIndexStatementSchemaRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/CreateIndexStatementSchemaRefresher.java
index 49d5e38207d..aa1cfbfbe89 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/CreateIndexStatementSchemaRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/CreateIndexStatementSchemaRefresher.java
@@ -31,6 +31,7 @@ import
org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistServ
import
org.apache.shardingsphere.sql.parser.statement.core.statement.ddl.CreateIndexStatement;
import java.util.Collection;
+import java.util.LinkedList;
/**
* Schema refresher for create index statement.
@@ -46,7 +47,7 @@ public final class CreateIndexStatementSchemaRefresher
implements MetaDataRefres
Preconditions.checkArgument(!Strings.isNullOrEmpty(indexName), "Index
name is not exist.");
String tableName =
sqlStatement.getTable().getTableName().getIdentifier().getValue();
ShardingSphereTable table =
newShardingSphereTable(database.getSchema(schemaName).getTable(tableName));
- table.putIndex(new ShardingSphereIndex(indexName));
+ table.putIndex(new ShardingSphereIndex(indexName, new LinkedList<>(),
false));
AlterSchemaMetaDataPOJO alterSchemaMetaDataPOJO = new
AlterSchemaMetaDataPOJO(database.getName(), schemaName);
alterSchemaMetaDataPOJO.getAlteredTables().add(table);
metaDataManagerPersistService.alterSchemaMetaData(alterSchemaMetaDataPOJO);
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
index 8d0fa0e40d0..575f66be770 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/connector/StandardDatabaseConnectorTest.java
@@ -192,8 +192,8 @@ class StandardDatabaseConnectorTest {
private ShardingSphereDatabase createDatabaseMetaData() {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
ShardingSphereColumn column = new ShardingSphereColumn("order_id",
Types.INTEGER, true, false, false, true, false, false);
-
when(result.getSchema(DefaultDatabase.LOGIC_NAME).getTable("t_logic_order")).thenReturn(
- new ShardingSphereTable("t_logic_order",
Collections.singleton(column), Collections.singleton(new
ShardingSphereIndex("order_id")), Collections.emptyList()));
+
when(result.getSchema(DefaultDatabase.LOGIC_NAME).getTable("t_logic_order")).thenReturn(new
ShardingSphereTable(
+ "t_logic_order", Collections.singleton(column),
Collections.singleton(new ShardingSphereIndex("order_id",
Collections.emptyList(), false)), Collections.emptyList()));
when(result.getRuleMetaData().getRules()).thenReturn(Collections.singleton(mock(ShardingRule.class)));
return result;
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
index 846aff29f59..ee923a390f4 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/DistSQLQueryBackendHandlerTest.java
@@ -98,7 +98,7 @@ class DistSQLQueryBackendHandlerTest {
private Map<String, ShardingSphereTable> createTableMap() {
Collection<ShardingSphereColumn> columns =
Collections.singletonList(new ShardingSphereColumn("order_id", 0, false, false,
false, true, false, false));
- Collection<ShardingSphereIndex> indexes =
Collections.singletonList(new ShardingSphereIndex("primary"));
+ Collection<ShardingSphereIndex> indexes =
Collections.singletonList(new ShardingSphereIndex("primary",
Collections.emptyList(), false));
return Collections.singletonMap("t_order", new
ShardingSphereTable("t_order", columns, indexes, Collections.emptyList()));
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
index ced5cdbd5f7..57a50b9087e 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutorTest.java
@@ -84,7 +84,7 @@ class ShowTableMetaDataExecutorTest {
private Map<String, ShardingSphereTable> createTableMap() {
Collection<ShardingSphereColumn> columns =
Collections.singletonList(new ShardingSphereColumn("order_id", 0, false, false,
false, true, false, false));
- Collection<ShardingSphereIndex> indexes =
Collections.singletonList(new ShardingSphereIndex("primary"));
+ Collection<ShardingSphereIndex> indexes =
Collections.singletonList(new ShardingSphereIndex("primary",
Collections.emptyList(), false));
return Collections.singletonMap("t_order", new
ShardingSphereTable("t_order", columns, indexes, Collections.emptyList()));
}
diff --git
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutorTest.java
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutorTest.java
index 58b0e953b0e..fb70225ba8a 100644
---
a/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutorTest.java
+++
b/proxy/backend/core/src/test/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/updatable/ImportMetaDataExecutorTest.java
@@ -151,7 +151,7 @@ class ImportMetaDataExecutorTest {
private Map<String, ShardingSphereTable> createTables() {
Collection<ShardingSphereColumn> columns = Collections.singleton(new
ShardingSphereColumn("order_id", 0, false, false, false, true, false, false));
- Collection<ShardingSphereIndex> indexes = Collections.singleton(new
ShardingSphereIndex("primary"));
+ Collection<ShardingSphereIndex> indexes = Collections.singleton(new
ShardingSphereIndex("primary", Collections.emptyList(), false));
return Collections.singletonMap("t_order", new
ShardingSphereTable("t_order", columns, indexes, Collections.emptyList()));
}
}
diff --git
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/response/header/query/MySQLQueryHeaderBuilderTest.java
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/response/header/query/MySQLQueryHeaderBuilderTest.java
index dc900fde73a..668269e53d0 100644
---
a/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/response/header/query/MySQLQueryHeaderBuilderTest.java
+++
b/proxy/backend/type/mysql/src/test/java/org/apache/shardingsphere/proxy/backend/mysql/response/header/query/MySQLQueryHeaderBuilderTest.java
@@ -100,8 +100,8 @@ class MySQLQueryHeaderBuilderTest {
ShardingSphereDatabase result = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
ShardingSphereColumn column = new ShardingSphereColumn("order_id",
Types.INTEGER, true, false, false, true, false, false);
ShardingSphereSchema schema = mock(ShardingSphereSchema.class);
- when(schema.getTable("t_logic_order")).thenReturn(
- new ShardingSphereTable("t_logic_order",
Collections.singleton(column), Collections.singleton(new
ShardingSphereIndex("order_id")), Collections.emptyList()));
+ when(schema.getTable("t_logic_order")).thenReturn(new
ShardingSphereTable(
+ "t_logic_order", Collections.singleton(column),
Collections.singleton(new ShardingSphereIndex("order_id",
Collections.emptyList(), false)), Collections.emptyList()));
when(result.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(schema);
DataNodeRuleAttribute ruleAttribute =
mock(DataNodeRuleAttribute.class);
when(ruleAttribute.findLogicTableByActualTable("t_order")).thenReturn(Optional.of("t_logic_order"));
diff --git
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/MixSQLRewriterIT.java
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/MixSQLRewriterIT.java
index c44576a0980..4323f002423 100644
---
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/MixSQLRewriterIT.java
+++
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/MixSQLRewriterIT.java
@@ -59,7 +59,7 @@ class MixSQLRewriterIT extends SQLRewriterIT {
new ShardingSphereColumn("password", Types.VARCHAR, false,
false, false, true, false, false),
new ShardingSphereColumn("amount", Types.DECIMAL, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.TINYINT, false,
false, false, false, false, false)),
- Collections.singletonList(new
ShardingSphereIndex("index_name")), Collections.emptyList()));
+ Collections.singletonList(new
ShardingSphereIndex("index_name", Collections.emptyList(), false)),
Collections.emptyList()));
tables.put("t_account_bak", new ShardingSphereTable("t_account_bak",
Arrays.asList(
new ShardingSphereColumn("account_id", Types.INTEGER, true,
true, false, true, false, false),
new ShardingSphereColumn("password", Types.VARCHAR, false,
false, false, true, false, false),
diff --git
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/ShardingSQLRewriterIT.java
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/ShardingSQLRewriterIT.java
index f37d27596a9..7a573f87942 100644
---
a/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/ShardingSQLRewriterIT.java
+++
b/test/it/rewriter/src/test/java/org/apache/shardingsphere/test/it/rewrite/engine/scenario/ShardingSQLRewriterIT.java
@@ -70,7 +70,8 @@ class ShardingSQLRewriterIT extends SQLRewriterIT {
tables.put("t_account", new ShardingSphereTable("t_account",
Arrays.asList(
new ShardingSphereColumn("account_id", Types.INTEGER, true,
true, false, true, false, false),
new ShardingSphereColumn("amount", Types.DECIMAL, false,
false, false, true, false, false),
- new ShardingSphereColumn("status", Types.TINYINT, false,
false, false, false, false, false)), Collections.singletonList(new
ShardingSphereIndex("status_idx_exist")),
+ new ShardingSphereColumn("status", Types.TINYINT, false,
false, false, false, false, false)),
+ Collections.singletonList(new
ShardingSphereIndex("status_idx_exist", Collections.emptyList(), false)),
Collections.emptyList()));
tables.put("t_account_detail", new
ShardingSphereTable("t_account_detail", Arrays.asList(
new ShardingSphereColumn("account_id", Types.INTEGER, false,
false, false, true, false, false),
@@ -84,13 +85,15 @@ class ShardingSQLRewriterIT extends SQLRewriterIT {
new ShardingSphereColumn("content", Types.VARCHAR, false,
false, false, true, false, false)), Collections.emptyList(),
Collections.emptyList()));
tables.put("t_single", new ShardingSphereTable("t_single",
Arrays.asList(
new ShardingSphereColumn("id", Types.INTEGER, false, false,
false, true, false, false),
- new ShardingSphereColumn("account_id", Types.INTEGER, false,
false, false, true, false, false)), Collections.singletonList(new
ShardingSphereIndex("single_id_idx")),
+ new ShardingSphereColumn("account_id", Types.INTEGER, false,
false, false, true, false, false)),
+ Collections.singletonList(new
ShardingSphereIndex("single_id_idx", Collections.emptyList(), false)),
Collections.emptyList()));
tables.put("t_single_extend", new
ShardingSphereTable("t_single_extend", Collections.singletonList(
new ShardingSphereColumn("id", Types.INTEGER, false, false,
false, true, false, false)), Collections.emptyList(), Collections.emptyList()));
tables.put("t_config", new ShardingSphereTable("t_config",
Arrays.asList(
new ShardingSphereColumn("id", Types.INTEGER, false, false,
false, true, false, false),
- new ShardingSphereColumn("account_id", Types.INTEGER, false,
false, false, true, false, false)), Collections.singletonList(new
ShardingSphereIndex("broadcast_id_idx")),
+ new ShardingSphereColumn("account_id", Types.INTEGER, false,
false, false, true, false, false)),
+ Collections.singletonList(new
ShardingSphereIndex("broadcast_id_idx", Collections.emptyList(), false)),
Collections.emptyList()));
tables.put("T_ROLE", new ShardingSphereTable("T_ROLE", Arrays.asList(
new ShardingSphereColumn("id", Types.INTEGER, false, false,
false, true, false, false),
