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 1dc9214e556 Refactor ShardingSphereTable (#33803)
1dc9214e556 is described below
commit 1dc9214e556f946a177ffcb94b0be4681aa5caf4
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Nov 25 21:31:44 2024 +0800
Refactor ShardingSphereTable (#33803)
---
.../dal/show/ShowCreateTableMergedResult.java | 4 ++--
.../database/schema/model/ShardingSphereTable.java | 28 +++++++++++-----------
.../yaml/schema/swapper/YamlTableSwapper.java | 4 ++--
.../schema/model/ShardingSphereTableTest.java | 12 +++++-----
.../index/AlterIndexStatementSchemaRefresher.java | 2 +-
.../index/CreateIndexStatementSchemaRefresher.java | 2 +-
.../index/DropIndexStatementSchemaRefresher.java | 2 +-
.../ral/queryable/ShowTableMetaDataExecutor.java | 2 +-
8 files changed, 28 insertions(+), 28 deletions(-)
diff --git
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
index f8ab351d839..afffefe0e59 100644
---
a/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
+++
b/features/sharding/core/src/main/java/org/apache/shardingsphere/sharding/merge/dal/show/ShowCreateTableMergedResult.java
@@ -80,14 +80,14 @@ public final class ShowCreateTableMergedResult extends
LogicTablesMergedResult {
}
private void replaceIndexes(final MemoryQueryResultRow memoryResultSetRow,
final String actualTableName, final ShardingSphereTable table) {
- for (ShardingSphereIndex each : table.getIndexValues()) {
+ for (ShardingSphereIndex each : table.getAllIndexes()) {
String actualIndexName =
IndexMetaDataUtils.getActualIndexName(each.getName(), actualTableName);
memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(actualIndexName,
each.getName()));
}
}
private void replaceConstraints(final MemoryQueryResultRow
memoryResultSetRow, final String actualTableName, final ShardingSphereTable
table, final ShardingRule rule) {
- for (ShardingSphereConstraint each : table.getConstraintValues()) {
+ for (ShardingSphereConstraint each : table.getAllConstraints()) {
String actualIndexName =
IndexMetaDataUtils.getActualIndexName(each.getName(), actualTableName);
memoryResultSetRow.setCell(2,
memoryResultSetRow.getCell(2).toString().replace(actualIndexName,
each.getName()));
Optional<ShardingTable> shardingTable =
rule.findShardingTable(each.getReferencedTableName());
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
index 5db71fd7ce1..aca141e097c 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereTable.java
@@ -156,6 +156,16 @@ public final class ShardingSphereTable {
indexes.remove(indexName);
}
+ /**
+ * Judge whether contains index.
+ *
+ * @param indexName index name
+ * @return contains index or not
+ */
+ public boolean containsIndex(final String indexName) {
+ return null != indexName && indexes.containsKey(indexName);
+ }
+
/**
* Get index.
*
@@ -167,30 +177,20 @@ public final class ShardingSphereTable {
}
/**
- * Get indexes.
+ * Get all indexes.
*
* @return indexes
*/
- public Collection<ShardingSphereIndex> getIndexValues() {
+ public Collection<ShardingSphereIndex> getAllIndexes() {
return indexes.values();
}
/**
- * Judge whether contains index.
- *
- * @param indexName index name
- * @return contains index or not
- */
- public boolean containsIndex(final String indexName) {
- return null != indexName && indexes.containsKey(indexName);
- }
-
- /**
- * Get constraint.
+ * Get all constraint.
*
* @return constraint
*/
- public Collection<ShardingSphereConstraint> getConstraintValues() {
+ public Collection<ShardingSphereConstraint> getAllConstraints() {
return constraints.values();
}
}
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapper.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapper.java
index c8f00fb4e2f..25211c8aabc 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapper.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/yaml/schema/swapper/YamlTableSwapper.java
@@ -49,8 +49,8 @@ public final class YamlTableSwapper implements
YamlConfigurationSwapper<YamlShar
YamlShardingSphereTable result = new YamlShardingSphereTable();
result.setName(table.getName());
result.setColumns(swapToYamlColumns(table.getAllColumns()));
- result.setIndexes(swapToYamlIndexes(table.getIndexValues()));
-
result.setConstraints(swapToYamlConstraints(table.getConstraintValues()));
+ result.setIndexes(swapToYamlIndexes(table.getAllIndexes()));
+
result.setConstraints(swapToYamlConstraints(table.getAllConstraints()));
result.setType(table.getType());
return result;
}
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 d6a50d339c5..da91208ccd8 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
@@ -67,7 +67,7 @@ class ShardingSphereTableTest {
assertThat(shardingSphereTable.getIndex("foo_idx_1"), is(index1));
assertThat(shardingSphereTable.getIndex("foo_idx_2"), is(index2));
assertNull(shardingSphereTable.getIndex("invalid"));
- assertThat(shardingSphereTable.getIndexValues(), hasSize(2));
+ assertThat(shardingSphereTable.getAllIndexes(), hasSize(2));
}
@Test
@@ -88,7 +88,7 @@ class ShardingSphereTableTest {
assertNull(shardingSphereTable.getIndex("foo_idx_1"));
shardingSphereTable.removeIndex("invalid");
assertThat(shardingSphereTable.getIndex("foo_idx_2"), is(index2));
- assertThat(shardingSphereTable.getIndexValues(), hasSize(1));
+ assertThat(shardingSphereTable.getAllIndexes(), hasSize(1));
}
@Test
@@ -96,8 +96,8 @@ class ShardingSphereTableTest {
ShardingSphereIndex index1 = new ShardingSphereIndex("foo_idx_1");
ShardingSphereIndex index2 = new ShardingSphereIndex("foo_idx_2");
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Collections.emptyList(), Arrays.asList(index1,
index2), Collections.emptyList());
- assertThat(shardingSphereTable.getIndexValues(), hasItems(index1,
index2));
- assertThat(shardingSphereTable.getIndexValues(), hasSize(2));
+ assertThat(shardingSphereTable.getAllIndexes(), hasItems(index1,
index2));
+ assertThat(shardingSphereTable.getAllIndexes(), hasSize(2));
}
@Test
@@ -114,8 +114,8 @@ class ShardingSphereTableTest {
void assertGetConstraints() {
ShardingSphereConstraint constraint = new
ShardingSphereConstraint("foo_tbl_foreign_key", "foo_tbl");
ShardingSphereTable table = new ShardingSphereTable("foo_tbl",
Collections.emptyList(), Collections.emptyList(),
Collections.singletonList(constraint));
- assertThat(table.getConstraintValues(), hasItems(constraint));
- assertThat(table.getConstraintValues(), hasSize(1));
+ assertThat(table.getAllConstraints(), hasItems(constraint));
+ assertThat(table.getAllConstraints(), hasSize(1));
}
@Test
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 579b1bdfc9d..be05b2a2d44 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
@@ -65,7 +65,7 @@ public final class AlterIndexStatementSchemaRefresher
implements MetaDataRefresh
}
private ShardingSphereTable newShardingSphereTable(final
ShardingSphereTable table) {
- ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
+ ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getAllIndexes(), table.getAllConstraints(),
table.getType());
result.getColumnNames().addAll(table.getColumnNames());
result.getVisibleColumns().addAll(table.getVisibleColumns());
result.getPrimaryKeyColumns().addAll(table.getPrimaryKeyColumns());
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 3b0e7ebb1cb..49d5e38207d 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
@@ -53,7 +53,7 @@ public final class CreateIndexStatementSchemaRefresher
implements MetaDataRefres
}
private ShardingSphereTable newShardingSphereTable(final
ShardingSphereTable table) {
- ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
+ ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getAllIndexes(), table.getAllConstraints(),
table.getType());
result.getColumnNames().addAll(table.getColumnNames());
result.getVisibleColumns().addAll(table.getVisibleColumns());
result.getPrimaryKeyColumns().addAll(table.getPrimaryKeyColumns());
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/DropIndexStatementSchemaRefresher.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/DropIndexStatementSchemaRefresher.java
index b16f83e6fcb..b43444aa9bb 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/DropIndexStatementSchemaRefresher.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/type/index/DropIndexStatementSchemaRefresher.java
@@ -66,7 +66,7 @@ public final class DropIndexStatementSchemaRefresher
implements MetaDataRefreshe
}
private ShardingSphereTable newShardingSphereTable(final
ShardingSphereTable table) {
- ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
+ ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getAllIndexes(), table.getAllConstraints(),
table.getType());
result.getColumnNames().addAll(table.getColumnNames());
result.getVisibleColumns().addAll(table.getVisibleColumns());
result.getPrimaryKeyColumns().addAll(table.getPrimaryKeyColumns());
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
index fda5bd7fefc..69f6cf61c7b 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowTableMetaDataExecutor.java
@@ -60,7 +60,7 @@ public final class ShowTableMetaDataExecutor implements
DistSQLQueryExecutor<Sho
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
ShardingSphereTable table = schema.getTable(tableName);
result.addAll(table.getAllColumns().stream().map(each ->
buildColumnRow(databaseName, tableName, each)).collect(Collectors.toList()));
- result.addAll(table.getIndexValues().stream().map(each ->
buildIndexRow(databaseName, tableName, each)).collect(Collectors.toList()));
+ result.addAll(table.getAllIndexes().stream().map(each ->
buildIndexRow(databaseName, tableName, each)).collect(Collectors.toList()));
return result;
}
