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 9a46cb5be69 Rename
ShardingSphereSchema.getVisibleColumnNamesAndIndexes() (#33788)
9a46cb5be69 is described below
commit 9a46cb5be69d1abdff1f7f88c8376304f3a6ced0
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Nov 25 01:26:59 2024 +0800
Rename ShardingSphereSchema.getVisibleColumnNamesAndIndexes() (#33788)
* Remove useless ShardingSphereTable.putColumn
* Rename ShardingSphereSchema.getVisibleColumnNamesAndIndexes()
* Rename ShardingSphereSchema.getVisibleColumnNamesAndIndexes()
---
.../dql/groupby/GroupByMemoryMergedResultTest.java | 2 +-
.../keygen/engine/GeneratedKeyContextEngine.java | 5 +--
.../from/type/SimpleTableSegmentBinder.java | 2 +-
.../expression/type/SubquerySegmentBinderTest.java | 2 +-
.../from/type/JoinTableSegmentBinderTest.java | 4 +-
.../from/type/SimpleTableSegmentBinderTest.java | 4 +-
.../from/type/SubqueryTableSegmentBinderTest.java | 2 +-
.../statement/dml/DeleteStatementBinderTest.java | 2 +-
.../statement/dml/InsertStatementBinderTest.java | 2 +-
.../statement/dml/SelectStatementBinderTest.java | 2 +-
.../statement/dml/UpdateStatementBinderTest.java | 2 +-
.../schema/model/ShardingSphereSchema.java | 8 ++--
.../database/schema/model/ShardingSphereTable.java | 46 +++++++++++-----------
.../ShardingSphereTableDataCollectorUtils.java | 2 +-
.../yaml/schema/swapper/YamlTableSwapper.java | 2 +-
.../schema/builder/GenericSchemaBuilderTest.java | 4 +-
.../schema/model/ShardingSphereTableTest.java | 6 +--
.../data/ShardingSphereDataPersistService.java | 2 +-
.../metadata/table/TableRowDataPersistService.java | 2 +-
.../data/ShardingSphereDataPersistServiceTest.java | 4 +-
.../enumerable/EnumerableScanExecutor.java | 2 +-
.../enumerable/EnumerableScanExecutorTest.java | 2 +-
.../metadata/util/SQLFederationDataTypeUtils.java | 2 +-
.../manager/ShardingSphereDatabaseDataManager.java | 2 +-
.../ShardingSphereStatisticsRefreshEngine.java | 2 +-
.../index/AlterIndexStatementSchemaRefresher.java | 2 +-
.../index/CreateIndexStatementSchemaRefresher.java | 2 +-
.../index/DropIndexStatementSchemaRefresher.java | 2 +-
.../manager/SchemaMetaDataManagerTest.java | 2 +-
.../ShardingSphereStatisticsRefreshEngineTest.java | 2 +-
.../ral/queryable/ShowTableMetaDataExecutor.java | 2 +-
.../bind/OpenGaussComBatchBindExecutorTest.java | 2 +-
.../describe/PostgreSQLComDescribeExecutor.java | 2 +-
...egatedBatchedStatementsCommandExecutorTest.java | 2 +-
.../PostgreSQLBatchedStatementsExecutorTest.java | 2 +-
35 files changed, 67 insertions(+), 68 deletions(-)
diff --git
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
index 06dccc263e4..d454786ee9f 100644
---
a/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
+++
b/features/sharding/core/src/test/java/org/apache/shardingsphere/sharding/merge/dql/groupby/GroupByMemoryMergedResultTest.java
@@ -204,7 +204,7 @@ class GroupByMemoryMergedResultTest {
ShardingSphereTable table = mock(ShardingSphereTable.class);
when(schema.getTable("t_order")).thenReturn(table);
when(schema.containsTable("t_order")).thenReturn(true);
- when(table.getColumnValues()).thenReturn(Collections.emptyList());
+ when(table.getAllColumns()).thenReturn(Collections.emptyList());
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getSchema(DefaultDatabase.LOGIC_NAME)).thenReturn(schema);
when(database.getSchemas()).thenReturn(Collections.singletonMap(DefaultDatabase.LOGIC_NAME,
schema));
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
index 0bb6f85e5de..0e8563b39e6 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/context/segment/insert/keygen/engine/GeneratedKeyContextEngine.java
@@ -62,7 +62,7 @@ public final class GeneratedKeyContextEngine {
if (!schema.containsTable(tableName)) {
return Optional.empty();
}
- for (ShardingSphereColumn each :
schema.getTable(tableName).getColumnValues()) {
+ for (ShardingSphereColumn each :
schema.getTable(tableName).getAllColumns()) {
if (each.isGenerated()) {
return Optional.of(each.getName());
}
@@ -111,7 +111,6 @@ public final class GeneratedKeyContextEngine {
private int findGenerateKeyIndex(final Map<String, Integer>
insertColumnNamesAndIndexes, final String generateKeyColumnName) {
String tableName = insertStatement.getTable().map(optional ->
optional.getTableName().getIdentifier().getValue()).orElse("");
- return insertColumnNamesAndIndexes.isEmpty() ?
schema.getVisibleColumnNamesAndIndexes(tableName).get(generateKeyColumnName)
- : insertColumnNamesAndIndexes.get(generateKeyColumnName);
+ return insertColumnNamesAndIndexes.isEmpty() ?
schema.getVisibleColumnAndIndexMap(tableName).get(generateKeyColumnName) :
insertColumnNamesAndIndexes.get(generateKeyColumnName);
}
}
diff --git
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinder.java
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinder.java
index 11efe589743..8c74c0dd5b4 100644
---
a/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinder.java
+++
b/infra/binder/src/main/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinder.java
@@ -146,7 +146,7 @@ public final class SimpleTableSegmentBinder {
final SQLStatementBinderContext binderContext, final
IdentifierValue tableName) {
Collection<ProjectionSegment> projectionSegments = new LinkedList<>();
QuoteCharacter quoteCharacter = new
DatabaseTypeRegistry(binderContext.getDatabaseType()).getDialectDatabaseMetaData().getQuoteCharacter();
- for (ShardingSphereColumn each :
schema.getTable(tableName.getValue()).getColumnValues()) {
+ for (ShardingSphereColumn each :
schema.getTable(tableName.getValue()).getAllColumns()) {
ColumnProjectionSegment columnProjectionSegment = new
ColumnProjectionSegment(createColumnSegment(segment, databaseName, schemaName,
each, quoteCharacter, tableName));
columnProjectionSegment.setVisible(each.isVisible());
projectionSegments.add(columnProjectionSegment);
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/expression/type/SubquerySegmentBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/expression/type/SubquerySegmentBinderTest.java
index 1dd245111b0..7418e027d75 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/expression/type/SubquerySegmentBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/expression/type/SubquerySegmentBinderTest.java
@@ -104,7 +104,7 @@ class SubquerySegmentBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/JoinTableSegmentBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/JoinTableSegmentBinderTest.java
index b8fbed79a2d..bea6206b01a 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/JoinTableSegmentBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/JoinTableSegmentBinderTest.java
@@ -225,11 +225,11 @@ class JoinTableSegmentBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
-
when(schema.getTable("t_order_item").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order_item").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("item_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("order_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinderTest.java
index 84c7b7fd20b..737db247145 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SimpleTableSegmentBinderTest.java
@@ -58,11 +58,11 @@ class SimpleTableSegmentBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
-
when(schema.getTable("pg_database").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("pg_database").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("datname", Types.VARCHAR, false,
false, false, true, false, false),
new ShardingSphereColumn("datdba", Types.VARCHAR, false,
false, false, true, false, false)));
ShardingSphereMetaData result = mock(ShardingSphereMetaData.class,
RETURNS_DEEP_STUBS);
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SubqueryTableSegmentBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SubqueryTableSegmentBinderTest.java
index d09954cc63e..ab9c5c9818f 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SubqueryTableSegmentBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/segment/from/type/SubqueryTableSegmentBinderTest.java
@@ -139,7 +139,7 @@ class SubqueryTableSegmentBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinderTest.java
index b61e882ca4a..b0f0d9a50fe 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/DeleteStatementBinderTest.java
@@ -70,7 +70,7 @@ class DeleteStatementBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
index 80d23167e50..73369254b2c 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/InsertStatementBinderTest.java
@@ -167,7 +167,7 @@ class InsertStatementBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
index 7fa395f698e..f3c684d3c03 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/SelectStatementBinderTest.java
@@ -106,7 +106,7 @@ class SelectStatementBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
diff --git
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinderTest.java
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinderTest.java
index c22d17d5927..0507f621dce 100644
---
a/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinderTest.java
+++
b/infra/binder/src/test/java/org/apache/shardingsphere/infra/binder/engine/statement/dml/UpdateStatementBinderTest.java
@@ -70,7 +70,7 @@ class UpdateStatementBinderTest {
private ShardingSphereMetaData createMetaData() {
ShardingSphereSchema schema = mock(ShardingSphereSchema.class,
RETURNS_DEEP_STUBS);
-
when(schema.getTable("t_order").getColumnValues()).thenReturn(Arrays.asList(
+
when(schema.getTable("t_order").getAllColumns()).thenReturn(Arrays.asList(
new ShardingSphereColumn("order_id", Types.INTEGER, true,
false, false, true, false, false),
new ShardingSphereColumn("user_id", Types.INTEGER, false,
false, false, true, false, false),
new ShardingSphereColumn("status", Types.INTEGER, false,
false, false, true, false, false)));
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
index 247aa8c5371..5fcf2008660 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/model/ShardingSphereSchema.java
@@ -203,13 +203,13 @@ public final class ShardingSphereSchema {
}
/**
- * Get visible column names and indexes via table.
+ * Get visible column name and indexe map.
*
* @param tableName table name
- * @return visible column names and indexes
+ * @return visible column name and index map
*/
- public Map<String, Integer> getVisibleColumnNamesAndIndexes(final String
tableName) {
- return containsTable(tableName) ?
getTable(tableName).getVisibleColumnsAndIndexMap() : Collections.emptyMap();
+ public Map<String, Integer> getVisibleColumnAndIndexMap(final String
tableName) {
+ return containsTable(tableName) ?
getTable(tableName).getVisibleColumnAndIndexMap() : Collections.emptyMap();
}
/**
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 31d6a3a6f76..b1816709f15 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
@@ -44,17 +44,17 @@ public final class ShardingSphereTable {
@Getter(AccessLevel.NONE)
private final Map<ShardingSphereMetaDataIdentifier, ShardingSphereColumn>
columns;
- private final Map<String, ShardingSphereIndex> indexes;
-
- private final Map<String, ShardingSphereConstraint> constraints;
-
private final List<String> columnNames = new ArrayList<>();
+ private final List<String> primaryKeyColumns = new ArrayList<>();
+
private final List<String> visibleColumns = new ArrayList<>();
- private final Map<String, Integer> visibleColumnsAndIndexMap = new
CaseInsensitiveMap<>();
+ private final Map<String, Integer> visibleColumnAndIndexMap = new
CaseInsensitiveMap<>();
- private final List<String> primaryKeyColumns = new ArrayList<>();
+ private final Map<String, ShardingSphereIndex> indexes;
+
+ private final Map<String, ShardingSphereConstraint> constraints;
private final TableType type;
@@ -87,7 +87,7 @@ public final class ShardingSphereTable {
}
if (each.isVisible()) {
visibleColumns.add(each.getName());
- visibleColumnsAndIndexMap.put(each.getName(), index++);
+ visibleColumnAndIndexMap.put(each.getName(), index++);
}
}
return result;
@@ -110,21 +110,21 @@ public final class ShardingSphereTable {
}
/**
- * Get column meta data via column name.
+ * Get column.
*
* @param columnName column name
- * @return column meta data
+ * @return column
*/
public ShardingSphereColumn getColumn(final String columnName) {
return columns.get(new ShardingSphereMetaDataIdentifier(columnName));
}
/**
- * Get column meta data list.
+ * Get all columns.
*
- * @return column meta data list
+ * @return columns
*/
- public Collection<ShardingSphereColumn> getColumnValues() {
+ public Collection<ShardingSphereColumn> getAllColumns() {
return columns.values();
}
@@ -139,16 +139,16 @@ public final class ShardingSphereTable {
}
/**
- * Put index meta data.
+ * Put index.
*
- * @param index index meta data
+ * @param index index
*/
public void putIndex(final ShardingSphereIndex index) {
indexes.put(index.getName(), index);
}
/**
- * Remove index meta data via index name.
+ * Remove index.
*
* @param indexName index name
*/
@@ -157,38 +157,38 @@ public final class ShardingSphereTable {
}
/**
- * Get index meta data via index name.
+ * Get index.
*
* @param indexName index name
- * @return index meta data
+ * @return index
*/
public ShardingSphereIndex getIndex(final String indexName) {
return indexes.get(indexName);
}
/**
- * Get index meta data collection.
+ * Get indexes.
*
- * @return index meta data collection
+ * @return indexes
*/
public Collection<ShardingSphereIndex> getIndexValues() {
return indexes.values();
}
/**
- * Judge whether contains index or not.
+ * Judge whether contains index.
*
* @param indexName index name
- * @return whether contains index or not
+ * @return contains index or not
*/
public boolean containsIndex(final String indexName) {
return null != indexName && indexes.containsKey(indexName);
}
/**
- * Get constraint meta data collection.
+ * Get constraint.
*
- * @return constraint meta data collection
+ * @return constraint
*/
public Collection<ShardingSphereConstraint> getConstraintValues() {
return constraints.values();
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/ShardingSphereTableDataCollectorUtils.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/ShardingSphereTableDataCollectorUtils.java
index 25033b786ac..3fda8561dd4 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/ShardingSphereTableDataCollectorUtils.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/statistics/collector/ShardingSphereTableDataCollectorUtils.java
@@ -42,7 +42,7 @@ public final class ShardingSphereTableDataCollectorUtils {
*/
public static List<Object> createRowValue(final Map<String, Object>
columnValues, final ShardingSphereTable table) {
List<Object> result = new LinkedList<>();
- for (ShardingSphereColumn each : table.getColumnValues()) {
+ for (ShardingSphereColumn each : table.getAllColumns()) {
result.add(columnValues.getOrDefault(each.getName(),
mockValue(each.getDataType())));
}
return result;
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 d35726d4fcf..c8f00fb4e2f 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
@@ -48,7 +48,7 @@ public final class YamlTableSwapper implements
YamlConfigurationSwapper<YamlShar
public YamlShardingSphereTable swapToYamlConfiguration(final
ShardingSphereTable table) {
YamlShardingSphereTable result = new YamlShardingSphereTable();
result.setName(table.getName());
- result.setColumns(swapToYamlColumns(table.getColumnValues()));
+ result.setColumns(swapToYamlColumns(table.getAllColumns()));
result.setIndexes(swapToYamlIndexes(table.getIndexValues()));
result.setConstraints(swapToYamlConstraints(table.getConstraintValues()));
result.setType(table.getType());
diff --git
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
index de6f97a7ad0..8fe0dbfa8f2 100644
---
a/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
+++
b/infra/common/src/test/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/GenericSchemaBuilderTest.java
@@ -105,7 +105,7 @@ class GenericSchemaBuilderTest {
private void assertTables(final Map<String, ShardingSphereTable> actual) {
assertThat(actual.size(), is(2));
-
assertTrue(actual.get("data_node_routed_table1").getColumnValues().isEmpty());
-
assertTrue(actual.get("data_node_routed_table2").getColumnValues().isEmpty());
+
assertTrue(actual.get("data_node_routed_table1").getAllColumns().isEmpty());
+
assertTrue(actual.get("data_node_routed_table2").getAllColumns().isEmpty());
}
}
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 7b70b3f6113..d6a50d339c5 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
@@ -43,12 +43,12 @@ class ShardingSphereTableTest {
}
@Test
- void assertGetColumnValues() {
+ void assertGetAllColumns() {
ShardingSphereColumn column1 = new ShardingSphereColumn("foo_col_1",
Types.INTEGER, true, true, false, true, false, false);
ShardingSphereColumn column2 = new ShardingSphereColumn("foo_col_2",
Types.INTEGER, false, true, false, true, false, false);
ShardingSphereTable shardingSphereTable = new
ShardingSphereTable("foo_tbl", Arrays.asList(column1, column2),
Collections.emptyList(), Collections.emptyList());
- assertThat(shardingSphereTable.getColumnValues(), hasItems(column1,
column2));
- assertThat(shardingSphereTable.getColumnValues(), hasSize(2));
+ assertThat(shardingSphereTable.getAllColumns(), hasItems(column1,
column2));
+ assertThat(shardingSphereTable.getAllColumns(), hasSize(2));
}
@Test
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
index c8a09ba052f..a09d909e553 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistService.java
@@ -104,7 +104,7 @@ public final class ShardingSphereDataPersistService {
private void persistTableData(final ShardingSphereDatabase database, final
String schemaName, final ShardingSphereSchemaData schemaData) {
schemaData.getTableData().values().forEach(each -> {
YamlShardingSphereRowDataSwapper swapper =
- new YamlShardingSphereRowDataSwapper(new
ArrayList<>(database.getSchema(schemaName).getTable(each.getName()).getColumnValues()));
+ new YamlShardingSphereRowDataSwapper(new
ArrayList<>(database.getSchema(schemaName).getTable(each.getName()).getAllColumns()));
persistTableData(database.getName(), schemaName, each.getName(),
each.getRows().stream().map(swapper::swapToYamlConfiguration).collect(Collectors.toList()));
});
}
diff --git
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableRowDataPersistService.java
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableRowDataPersistService.java
index e7a56ffd478..71380e1d7d5 100644
---
a/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableRowDataPersistService.java
+++
b/kernel/metadata/core/src/main/java/org/apache/shardingsphere/metadata/persist/service/metadata/table/TableRowDataPersistService.java
@@ -77,7 +77,7 @@ public final class TableRowDataPersistService {
*/
public ShardingSphereTableData load(final String databaseName, final
String schemaName, final String tableName, final ShardingSphereTable table) {
ShardingSphereTableData result = new
ShardingSphereTableData(tableName);
- YamlShardingSphereRowDataSwapper swapper = new
YamlShardingSphereRowDataSwapper(new ArrayList<>(table.getColumnValues()));
+ YamlShardingSphereRowDataSwapper swapper = new
YamlShardingSphereRowDataSwapper(new ArrayList<>(table.getAllColumns()));
for (String each :
repository.getChildrenKeys(ShardingSphereDataNode.getTablePath(databaseName,
schemaName, tableName))) {
String yamlRow =
repository.query(ShardingSphereDataNode.getTableRowPath(databaseName,
schemaName, tableName, each));
if (!Strings.isNullOrEmpty(yamlRow)) {
diff --git
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistServiceTest.java
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistServiceTest.java
index 83ae6736c64..76c513ed2d9 100644
---
a/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistServiceTest.java
+++
b/kernel/metadata/core/src/test/java/org/apache/shardingsphere/metadata/persist/data/ShardingSphereDataPersistServiceTest.java
@@ -78,7 +78,7 @@ class ShardingSphereDataPersistServiceTest {
when(result.containsDatabase("foo_db")).thenReturn(true);
when(result.getDatabase("foo_db").containsSchema("foo_schema")).thenReturn(true);
when(result.getDatabase("foo_db").getSchema("foo_schema").containsTable("foo_tbl")).thenReturn(true);
-
when(result.getDatabase("foo_db").getSchema("foo_schema").getTable("foo_tbl").getColumnValues()).thenReturn(Collections.emptyList());
+
when(result.getDatabase("foo_db").getSchema("foo_schema").getTable("foo_tbl").getAllColumns()).thenReturn(Collections.emptyList());
when(result.containsDatabase("bar_db")).thenReturn(true);
when(result.getDatabase("bar_db")).thenReturn(mock(ShardingSphereDatabase.class));
return result;
@@ -101,7 +101,7 @@ class ShardingSphereDataPersistServiceTest {
when(schemaData.getTableData().values()).thenReturn(Collections.singleton(tableData));
ShardingSphereDatabase database = mock(ShardingSphereDatabase.class,
RETURNS_DEEP_STUBS);
when(database.getName()).thenReturn("foo_db");
-
when(database.getSchema("foo_schema").getTable("foo_tbl").getColumnValues()).thenReturn(Collections.singleton(mock(ShardingSphereColumn.class)));
+
when(database.getSchema("foo_schema").getTable("foo_tbl").getAllColumns()).thenReturn(Collections.singleton(mock(ShardingSphereColumn.class)));
persistService.persist(database, "foo_schema", schemaData);
verify(tableRowDataPersistService).persist("foo_db", "foo_schema",
"foo_tbl", Collections.emptyList());
}
diff --git
a/kernel/sql-federation/executor/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
b/kernel/sql-federation/executor/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
index bac00682528..2a365874dcb 100644
---
a/kernel/sql-federation/executor/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
+++
b/kernel/sql-federation/executor/src/main/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutor.java
@@ -168,7 +168,7 @@ public final class EnumerableScanExecutor implements
ScanExecutor {
@Override
public Enumerator<Object> enumerator() {
- return new MemoryRowEnumerator(tableData.getRows(),
table.getColumnValues(), databaseType);
+ return new MemoryRowEnumerator(tableData.getRows(),
table.getAllColumns(), databaseType);
}
};
}
diff --git
a/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutorTest.java
b/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutorTest.java
index 4843954603f..47c57ef397f 100644
---
a/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutorTest.java
+++
b/kernel/sql-federation/executor/src/test/java/org/apache/shardingsphere/sqlfederation/executor/enumerable/EnumerableScanExecutorTest.java
@@ -63,7 +63,7 @@ class EnumerableScanExecutorTest {
when(schemaData.getTable("test")).thenReturn(tableData);
ShardingSphereTable table = mock(ShardingSphereTable.class,
RETURNS_DEEP_STUBS);
when(table.getName()).thenReturn("test");
- when(table.getColumnValues()).thenReturn(Collections.singleton(new
ShardingSphereColumn("id", Types.INTEGER, true, false, false, false, true,
false)));
+ when(table.getAllColumns()).thenReturn(Collections.singleton(new
ShardingSphereColumn("id", Types.INTEGER, true, false, false, false, true,
false)));
Enumerable<Object> enumerable = new EnumerableScanExecutor(null, null,
null, optimizerContext, executorContext, null, null, statistics)
.execute(table, mock(ScanExecutorContext.class));
try (Enumerator<Object> actual = enumerable.enumerator()) {
diff --git
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/util/SQLFederationDataTypeUtils.java
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/util/SQLFederationDataTypeUtils.java
index 3d47a15c517..cbf200d12c2 100644
---
a/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/util/SQLFederationDataTypeUtils.java
+++
b/kernel/sql-federation/optimizer/src/main/java/org/apache/shardingsphere/sqlfederation/optimizer/metadata/util/SQLFederationDataTypeUtils.java
@@ -50,7 +50,7 @@ public final class SQLFederationDataTypeUtils {
*/
public static RelDataType createRelDataType(final ShardingSphereTable
table, final DatabaseType protocolType, final RelDataTypeFactory typeFactory) {
Builder fieldInfoBuilder = typeFactory.builder();
- for (ShardingSphereColumn each : table.getColumnValues()) {
+ for (ShardingSphereColumn each : table.getAllColumns()) {
fieldInfoBuilder.add(each.getName(), getRelDataType(protocolType,
each, typeFactory));
}
return fieldInfoBuilder.build();
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
index d779b57e396..773e72b0593 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseDataManager.java
@@ -138,7 +138,7 @@ public final class ShardingSphereDatabaseDataManager {
return;
}
ShardingSphereTableData tableData =
metaDataContexts.get().getStatistics().getDatabase(databaseName).getSchema(schemaName).getTable(tableName);
- List<ShardingSphereColumn> columns = new
ArrayList<>(metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getColumnValues());
+ List<ShardingSphereColumn> columns = new
ArrayList<>(metaDataContexts.get().getMetaData().getDatabase(databaseName).getSchema(schemaName).getTable(tableName).getAllColumns());
tableData.getRows().add(new
YamlShardingSphereRowDataSwapper(columns).swapToObject(yamlRowData));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
index faf62f67ff6..58058101150 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngine.java
@@ -182,7 +182,7 @@ public final class ShardingSphereStatisticsRefreshEngine {
AlteredShardingSphereDatabaseData result = new
AlteredShardingSphereDatabaseData(databaseName, schemaName,
tableData.getName());
Map<String, ShardingSphereRowData> tableDataMap =
tableData.getRows().stream().collect(Collectors.toMap(ShardingSphereRowData::getUniqueKey,
Function.identity()));
Map<String, ShardingSphereRowData> changedTableDataMap =
changedTableData.getRows().stream().collect(Collectors.toMap(ShardingSphereRowData::getUniqueKey,
Function.identity()));
- YamlShardingSphereRowDataSwapper swapper = new
YamlShardingSphereRowDataSwapper(new ArrayList<>(table.getColumnValues()));
+ YamlShardingSphereRowDataSwapper swapper = new
YamlShardingSphereRowDataSwapper(new ArrayList<>(table.getAllColumns()));
for (Entry<String, ShardingSphereRowData> entry :
changedTableDataMap.entrySet()) {
if (!tableDataMap.containsKey(entry.getKey())) {
result.getAddedRows().add(swapper.swapToYamlConfiguration(entry.getValue()));
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 33d891d0301..579b1bdfc9d 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.getColumnValues(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
+ ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getIndexValues(), table.getConstraintValues(),
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 7e79573c7dc..3b0e7ebb1cb 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.getColumnValues(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
+ ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getIndexValues(), table.getConstraintValues(),
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 94980f70319..b16f83e6fcb 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.getColumnValues(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
+ ShardingSphereTable result = new ShardingSphereTable(table.getName(),
table.getAllColumns(), table.getIndexValues(), table.getConstraintValues(),
table.getType());
result.getColumnNames().addAll(table.getColumnNames());
result.getVisibleColumns().addAll(table.getVisibleColumns());
result.getPrimaryKeyColumns().addAll(table.getPrimaryKeyColumns());
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
index cd3eb5c1e76..11a304d6974 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/manager/SchemaMetaDataManagerTest.java
@@ -159,7 +159,7 @@ class SchemaMetaDataManagerTest {
ShardingSphereTable toBeChangedTable = new
ShardingSphereTable("foo_tbl", Collections.singleton(toBeChangedColumn),
Collections.emptyList(), Collections.emptyList());
schemaMetaDataManager.alterSchema("foo_db", "foo_schema",
toBeChangedTable, null);
ShardingSphereTable table =
metaDataContexts.getMetaData().getDatabase("foo_db").getSchema("foo_schema").getTables().get("foo_tbl");
- assertThat(table.getColumnValues().size(), is(1));
+ assertThat(table.getAllColumns().size(), is(1));
assertTrue(table.containsColumn("foo_col"));
}
diff --git
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngineTest.java
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngineTest.java
index a4e194bd7b2..b6512f67dff 100644
---
a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngineTest.java
+++
b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/refresher/ShardingSphereStatisticsRefreshEngineTest.java
@@ -96,7 +96,7 @@ class ShardingSphereStatisticsRefreshEngineTest {
Collection<ShardingSphereColumn> columns = new LinkedList<>();
columns.add(new ShardingSphereColumn("column1", Types.INTEGER, false,
false, false, true, false, false));
columns.add(new ShardingSphereColumn("column2", Types.INTEGER, false,
false, false, true, false, false));
- when(table.getColumnValues()).thenReturn(columns);
+ when(table.getAllColumns()).thenReturn(columns);
return result;
}
}
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 fcf55c1a054..fda5bd7fefc 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
@@ -59,7 +59,7 @@ public final class ShowTableMetaDataExecutor implements
DistSQLQueryExecutor<Sho
private Collection<LocalDataQueryResultRow> buildTableRows(final String
databaseName, final ShardingSphereSchema schema, final String tableName) {
Collection<LocalDataQueryResultRow> result = new LinkedList<>();
ShardingSphereTable table = schema.getTable(tableName);
- result.addAll(table.getColumnValues().stream().map(each ->
buildColumnRow(databaseName, tableName, each)).collect(Collectors.toList()));
+ 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()));
return result;
}
diff --git
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
index cf82c72eaef..9fb696ed647 100644
---
a/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
+++
b/proxy/frontend/type/opengauss/src/test/java/org/apache/shardingsphere/proxy/frontend/opengauss/command/query/extended/bind/OpenGaussComBatchBindExecutorTest.java
@@ -157,7 +157,7 @@ class OpenGaussComBatchBindExecutorTest {
when(result.getRuleMetaData()).thenReturn(new
RuleMetaData(Collections.emptyList()));
when(result.containsSchema("public")).thenReturn(true);
when(result.getSchema("public").containsTable("bmsql")).thenReturn(true);
-
when(result.getSchema("public").getTable("bmsql").getColumnValues()).thenReturn(Collections.singleton(new
ShardingSphereColumn("id", Types.VARCHAR, false, false, false, true, false,
false)));
+
when(result.getSchema("public").getTable("bmsql").getAllColumns()).thenReturn(Collections.singleton(new
ShardingSphereColumn("id", Types.VARCHAR, false, false, false, true, false,
false)));
return result;
}
}
diff --git
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
index 9e1eb1d2f71..7d9d64607cb 100644
---
a/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
+++
b/proxy/frontend/type/postgresql/src/main/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/describe/PostgreSQLComDescribeExecutor.java
@@ -180,7 +180,7 @@ public final class PostgreSQLComDescribeExecutor implements
CommandExecutor {
Collection<PostgreSQLColumnDescription> result = new LinkedList<>();
for (ProjectionSegment each :
returningSegment.getProjections().getProjections()) {
if (each instanceof ShorthandProjectionSegment) {
- table.getColumnValues().stream().map(column -> new
PostgreSQLColumnDescription(column.getName(), 0, column.getDataType(),
estimateColumnLength(column.getDataType()), ""))
+ table.getAllColumns().stream().map(column -> new
PostgreSQLColumnDescription(column.getName(), 0, column.getDataType(),
estimateColumnLength(column.getDataType()), ""))
.forEach(result::add);
}
if (each instanceof ColumnProjectionSegment) {
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
index beb9728bff2..2bc45f28365 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLAggregatedBatchedStatementsCommandExecutorTest.java
@@ -168,7 +168,7 @@ class
PostgreSQLAggregatedBatchedStatementsCommandExecutorTest {
when(database.getSchema("public").containsTable("t_order")).thenReturn(true);
when(result.getMetaDataContexts().getMetaData().getDatabase("foo_db")).thenReturn(database);
when(result.getMetaDataContexts().getMetaData().containsDatabase("foo_db")).thenReturn(true);
-
when(database.getSchema("public").getTable("t_order").getColumnValues())
+ when(database.getSchema("public").getTable("t_order").getAllColumns())
.thenReturn(Collections.singleton(new
ShardingSphereColumn("id", Types.VARCHAR, false, false, false, true, false,
false)));
return result;
}
diff --git
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
index cfdcb4dd5f6..41c0b317820 100644
---
a/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
+++
b/proxy/frontend/type/postgresql/src/test/java/org/apache/shardingsphere/proxy/frontend/postgresql/command/query/extended/PostgreSQLBatchedStatementsExecutorTest.java
@@ -141,7 +141,7 @@ class PostgreSQLBatchedStatementsExecutorTest {
when(database.getRuleMetaData()).thenReturn(new
RuleMetaData(Collections.emptyList()));
when(database.containsSchema("public")).thenReturn(true);
when(database.getSchema("public").containsTable("t")).thenReturn(true);
-
when(database.getSchema("public").getTable("t").getColumnValues()).thenReturn(Arrays.asList(new
ShardingSphereColumn("id", Types.VARCHAR, false, false, false, true, false,
false),
+
when(database.getSchema("public").getTable("t").getAllColumns()).thenReturn(Arrays.asList(new
ShardingSphereColumn("id", Types.VARCHAR, false, false, false, true, false,
false),
new ShardingSphereColumn("col", Types.VARCHAR, false, false,
false, true, false, false)));
when(result.getMetaDataContexts().getMetaData().containsDatabase("db")).thenReturn(true);
when(result.getMetaDataContexts().getMetaData().getDatabase("db")).thenReturn(database);
