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 538373b8020 Add SQLStatement parameter on
DistSQLQueryExecutor.getColumnNames() (#30088)
538373b8020 is described below
commit 538373b8020c7e0304c2fc52845319ec24b2bbbe
Author: Liang Zhang <[email protected]>
AuthorDate: Sun Feb 11 15:40:39 2024 +0800
Add SQLStatement parameter on DistSQLQueryExecutor.getColumnNames() (#30088)
---
.../handler/query/ShowBroadcastTableRuleExecutor.java | 2 +-
.../distsql/handler/query/ShowEncryptRuleExecutor.java | 14 +++++---------
.../mask/distsql/handler/query/ShowMaskRuleExecutor.java | 2 +-
.../handler/query/ShowReadwriteSplittingRuleExecutor.java | 2 +-
.../ShowStatusFromReadwriteSplittingRulesExecutor.java | 2 +-
.../handler/query/ShowDefaultShadowAlgorithmExecutor.java | 2 +-
.../handler/query/ShowShadowAlgorithmsExecutor.java | 2 +-
.../distsql/handler/query/ShowShadowRuleExecutor.java | 2 +-
.../handler/query/ShowShadowTableRulesExecutor.java | 2 +-
.../handler/query/ShowDefaultShardingStrategyExecutor.java | 2 +-
.../handler/query/ShowShardingAlgorithmExecutor.java | 2 +-
.../handler/query/ShowShardingAuditorsExecutor.java | 2 +-
.../handler/query/ShowShardingKeyGeneratorExecutor.java | 2 +-
.../handler/query/ShowShardingTableNodesExecutor.java | 2 +-
.../query/ShowShardingTableReferenceRuleExecutor.java | 2 +-
.../handler/query/ShowShardingTableRuleExecutor.java | 2 +-
.../query/ShowShardingTableRulesUsedAlgorithmExecutor.java | 2 +-
.../query/ShowShardingTableRulesUsedAuditorExecutor.java | 2 +-
.../ShowShardingTableRulesUsedKeyGeneratorExecutor.java | 2 +-
.../query/ShowUnusedShardingAlgorithmsExecutor.java | 2 +-
.../handler/query/ShowUnusedShardingAuditorsExecutor.java | 2 +-
.../query/ShowUnusedShardingKeyGeneratorExecutor.java | 2 +-
.../handler/engine/query/DistSQLQueryExecuteEngine.java | 3 +--
.../distsql/handler/engine/query/DistSQLQueryExecutor.java | 3 ++-
.../handler/executor/ral/plugin/ShowPluginsExecutor.java | 2 +-
.../executor/rql/resource/ShowLogicalTableExecutor.java | 2 +-
.../rql/resource/ShowRulesUsedStorageUnitExecutor.java | 2 +-
.../executor/rql/resource/ShowStorageUnitExecutor.java | 2 +-
.../handler/executor/rql/rule/RuleCountExecutor.java | 2 +-
.../distsql/handler/query/ShowAuthorityRuleExecutor.java | 2 +-
.../handler/query/ShowStreamingJobStatusExecutor.java | 2 +-
.../distsql/handler/query/ShowStreamingListExecutor.java | 2 +-
.../distsql/handler/query/ShowStreamingRuleExecutor.java | 2 +-
.../query/ShowMigrationCheckAlgorithmsExecutor.java | 2 +-
.../handler/query/ShowMigrationCheckStatusExecutor.java | 2 +-
.../handler/query/ShowMigrationJobStatusExecutor.java | 2 +-
.../distsql/handler/query/ShowMigrationListExecutor.java | 2 +-
.../query/ShowMigrationSourceStorageUnitsExecutor.java | 2 +-
.../distsql/handler/query/ShowGlobalClockRuleExecutor.java | 2 +-
.../query/ShowDefaultSingleTableStorageUnitExecutor.java | 2 +-
.../distsql/handler/query/ShowSingleTableExecutor.java | 2 +-
.../handler/query/ShowUnloadedSingleTableExecutor.java | 2 +-
.../handler/query/ShowSQLFederationRuleExecutor.java | 2 +-
.../distsql/handler/query/ShowSQLParserRuleExecutor.java | 2 +-
.../handler/query/ShowSQLTranslatorRuleExecutor.java | 2 +-
.../distsql/handler/query/ShowTrafficRuleExecutor.java | 2 +-
.../distsql/handler/query/ShowTransactionRuleExecutor.java | 2 +-
.../ral/queryable/ConvertYamlConfigurationExecutor.java | 2 +-
.../ral/queryable/ExportDatabaseConfigurationExecutor.java | 2 +-
.../distsql/ral/queryable/ExportMetaDataExecutor.java | 2 +-
.../distsql/ral/queryable/ExportStorageNodesExecutor.java | 2 +-
.../distsql/ral/queryable/ShowComputeNodeInfoExecutor.java | 2 +-
.../distsql/ral/queryable/ShowComputeNodeModeExecutor.java | 2 +-
.../distsql/ral/queryable/ShowComputeNodesExecutor.java | 2 +-
.../distsql/ral/queryable/ShowDistVariableExecutor.java | 2 +-
.../distsql/ral/queryable/ShowDistVariablesExecutor.java | 2 +-
.../distsql/ral/queryable/ShowMigrationRuleExecutor.java | 2 +-
.../distsql/ral/queryable/ShowTableMetaDataExecutor.java | 2 +-
.../backend/handler/distsql/rul/FormatSQLExecutor.java | 2 +-
.../backend/handler/distsql/rul/ParseDistSQLExecutor.java | 2 +-
.../proxy/backend/handler/distsql/rul/PreviewExecutor.java | 2 +-
61 files changed, 66 insertions(+), 70 deletions(-)
diff --git
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
index dcd057dfa34..ec4a689e75a 100644
---
a/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
+++
b/features/broadcast/distsql/handler/src/main/java/org/apache/shardingsphere/broadcast/distsql/handler/query/ShowBroadcastTableRuleExecutor.java
@@ -38,7 +38,7 @@ public final class ShowBroadcastTableRuleExecutor implements
DistSQLQueryExecuto
private BroadcastRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowBroadcastTableRulesStatement sqlStatement) {
return Collections.singleton("broadcast_table");
}
diff --git
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
index bcf9a4a44a7..2be2e6b161c 100644
---
a/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
+++
b/features/encrypt/distsql/handler/src/main/java/org/apache/shardingsphere/encrypt/distsql/handler/query/ShowEncryptRuleExecutor.java
@@ -46,7 +46,7 @@ public final class ShowEncryptRuleExecutor implements
DistSQLQueryExecutor<ShowE
private EncryptRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowEncryptRulesStatement
sqlStatement) {
return Arrays.asList("table", "logic_column", "cipher_column",
"assisted_query_column", "like_query_column",
"encryptor_type", "encryptor_props", "assisted_query_type",
"assisted_query_props", "like_query_type", "like_query_props");
}
@@ -76,18 +76,14 @@ public final class ShowEncryptRuleExecutor implements
DistSQLQueryExecutor<ShowE
each.getLikeQuery().map(EncryptColumnItemRuleConfiguration::getName).orElse(""),
encryptorAlgorithmConfig.getType(),
PropertiesConverter.convert(encryptorAlgorithmConfig.getProps()),
- null == assistedQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) : assistedQueryEncryptorAlgorithmConfig.getType(),
- null == assistedQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) :
PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
- null == likeQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) : likeQueryEncryptorAlgorithmConfig.getType(),
- null == likeQueryEncryptorAlgorithmConfig ?
nullToEmptyString(null) :
PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps()))));
+ null == assistedQueryEncryptorAlgorithmConfig ? "" :
assistedQueryEncryptorAlgorithmConfig.getType(),
+ null == assistedQueryEncryptorAlgorithmConfig ? "" :
PropertiesConverter.convert(assistedQueryEncryptorAlgorithmConfig.getProps()),
+ null == likeQueryEncryptorAlgorithmConfig ? "" :
likeQueryEncryptorAlgorithmConfig.getType(),
+ null == likeQueryEncryptorAlgorithmConfig ? "" :
PropertiesConverter.convert(likeQueryEncryptorAlgorithmConfig.getProps()))));
}
return result;
}
- private Object nullToEmptyString(final Object obj) {
- return null == obj ? "" : obj;
- }
-
@Override
public Class<EncryptRule> getRuleClass() {
return EncryptRule.class;
diff --git
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
index 791119bb424..4d67ed9d6d2 100644
---
a/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
+++
b/features/mask/distsql/handler/src/main/java/org/apache/shardingsphere/mask/distsql/handler/query/ShowMaskRuleExecutor.java
@@ -43,7 +43,7 @@ public final class ShowMaskRuleExecutor implements
DistSQLQueryExecutor<ShowMask
private MaskRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowMaskRulesStatement
sqlStatement) {
return Arrays.asList("table", "column", "algorithm_type",
"algorithm_props");
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
index 88165ab543b..17936eb1b78 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowReadwriteSplittingRuleExecutor.java
@@ -48,7 +48,7 @@ public final class ShowReadwriteSplittingRuleExecutor
implements DistSQLQueryExe
private ReadwriteSplittingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowReadwriteSplittingRulesStatement sqlStatement) {
return Arrays.asList("name", "write_storage_unit_name",
"read_storage_unit_names", "transactional_read_query_strategy",
"load_balancer_type", "load_balancer_props");
}
diff --git
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
index 6092231b2d5..54f9074410a 100644
---
a/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
+++
b/features/readwrite-splitting/distsql/handler/src/main/java/org/apache/shardingsphere/readwritesplitting/distsql/handler/query/ShowStatusFromReadwriteSplittingRulesExecutor.java
@@ -56,7 +56,7 @@ public final class
ShowStatusFromReadwriteSplittingRulesExecutor implements Dist
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowStatusFromReadwriteSplittingRulesStatement sqlStatement) {
return Arrays.asList("storage_unit", "status");
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
index 09cf73cdead..b9b8b2a698c 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowDefaultShadowAlgorithmExecutor.java
@@ -43,7 +43,7 @@ public final class ShowDefaultShadowAlgorithmExecutor
implements DistSQLQueryExe
private ShadowRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowDefaultShadowAlgorithmStatement sqlStatement) {
return Arrays.asList("shadow_algorithm_name", "type", "props");
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
index 53b44016845..bcf54dd25dd 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowAlgorithmsExecutor.java
@@ -40,7 +40,7 @@ public final class ShowShadowAlgorithmsExecutor implements
DistSQLQueryExecutor<
private ShadowRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShadowAlgorithmsStatement sqlStatement) {
return Arrays.asList("shadow_algorithm_name", "type", "props",
"is_default");
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
index ab4e4cd793e..74cfce2f324 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowRuleExecutor.java
@@ -46,7 +46,7 @@ public final class ShowShadowRuleExecutor implements
DistSQLQueryExecutor<ShowSh
private ShadowRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowShadowRulesStatement
sqlStatement) {
return Arrays.asList("shadow_table", "rule_name", "source_name",
"shadow_name", "algorithm_type", "algorithm_props");
}
diff --git
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
index 94e5beb7b19..403ed342158 100644
---
a/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
+++
b/features/shadow/distsql/handler/src/main/java/org/apache/shardingsphere/shadow/distsql/handler/query/ShowShadowTableRulesExecutor.java
@@ -46,7 +46,7 @@ public final class ShowShadowTableRulesExecutor implements
DistSQLQueryExecutor<
private ShadowRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShadowTableRulesStatement sqlStatement) {
return Arrays.asList(SHADOW_TABLE, SHADOW_ALGORITHM_NAME);
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
index a79012fa7a1..84f319a5b41 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowDefaultShardingStrategyExecutor.java
@@ -43,7 +43,7 @@ public final class ShowDefaultShardingStrategyExecutor
implements DistSQLQueryEx
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowDefaultShardingStrategyStatement sqlStatement) {
return Arrays.asList("name", "type", "sharding_column",
"sharding_algorithm_name", "sharding_algorithm_type",
"sharding_algorithm_props");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
index 77e7fb11d9b..549d7a8ee02 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAlgorithmExecutor.java
@@ -40,7 +40,7 @@ public final class ShowShardingAlgorithmExecutor implements
DistSQLQueryExecutor
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingAlgorithmsStatement sqlStatement) {
return Arrays.asList("name", "type", "props");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
index 97f50c6a658..a5b2fcec184 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingAuditorsExecutor.java
@@ -39,7 +39,7 @@ public final class ShowShardingAuditorsExecutor implements
DistSQLQueryExecutor<
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingAuditorsStatement sqlStatement) {
return Arrays.asList("name", "type", "props");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
index 19a73355c43..daeda4c0f54 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingKeyGeneratorExecutor.java
@@ -39,7 +39,7 @@ public final class ShowShardingKeyGeneratorExecutor
implements DistSQLQueryExecu
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingKeyGeneratorsStatement sqlStatement) {
return Arrays.asList("name", "type", "props");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
index e6aefc7ae5d..574a9c0e966 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableNodesExecutor.java
@@ -41,7 +41,7 @@ public final class ShowShardingTableNodesExecutor implements
DistSQLQueryExecuto
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingTableNodesStatement sqlStatement) {
return Arrays.asList("name", "nodes");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
index b6ab3c6f277..aebeea76e2c 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableReferenceRuleExecutor.java
@@ -38,7 +38,7 @@ public final class ShowShardingTableReferenceRuleExecutor
implements DistSQLQuer
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingTableReferenceRulesStatement sqlStatement) {
return Arrays.asList("name", "sharding_table_reference");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
index 5fa117bfc62..87d4f505811 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRuleExecutor.java
@@ -51,7 +51,7 @@ public final class ShowShardingTableRuleExecutor implements
DistSQLQueryExecutor
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingTableRulesStatement sqlStatement) {
return Arrays.asList("table", "actual_data_nodes",
"actual_data_sources", "database_strategy_type", "database_sharding_column",
"database_sharding_algorithm_type",
"database_sharding_algorithm_props", "table_strategy_type",
"table_sharding_column", "table_sharding_algorithm_type",
"table_sharding_algorithm_props",
"key_generate_column", "key_generator_type",
"key_generator_props", "auditor_types", "allow_hint_disable");
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
index ba1600f1223..f8b9f2dc2b3 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAlgorithmExecutor.java
@@ -41,7 +41,7 @@ public final class
ShowShardingTableRulesUsedAlgorithmExecutor implements DistSQ
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingTableRulesUsedAlgorithmStatement sqlStatement) {
return Arrays.asList("type", "name");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
index 70a11bce278..fdbbf3fa48d 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedAuditorExecutor.java
@@ -39,7 +39,7 @@ public final class ShowShardingTableRulesUsedAuditorExecutor
implements DistSQLQ
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingTableRulesUsedAuditorStatement sqlStatement) {
return Arrays.asList("type", "name");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
index 02ac8893aae..7f29031fb35 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowShardingTableRulesUsedKeyGeneratorExecutor.java
@@ -39,7 +39,7 @@ public final class
ShowShardingTableRulesUsedKeyGeneratorExecutor implements Dis
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowShardingTableRulesUsedKeyGeneratorStatement sqlStatement) {
return Arrays.asList("type", "name");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
index f97e4ffb853..b30f7567a0f 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAlgorithmsExecutor.java
@@ -46,7 +46,7 @@ public final class ShowUnusedShardingAlgorithmsExecutor
implements DistSQLQueryE
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowUnusedShardingAlgorithmsStatement sqlStatement) {
return Arrays.asList("name", "type", "props");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
index 800eab93648..69573a84761 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingAuditorsExecutor.java
@@ -42,7 +42,7 @@ public final class ShowUnusedShardingAuditorsExecutor
implements DistSQLQueryExe
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowUnusedShardingAuditorsStatement sqlStatement) {
return Arrays.asList("name", "type", "props");
}
diff --git
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
index 4b486fc36dc..39142de021b 100644
---
a/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
+++
b/features/sharding/distsql/handler/src/main/java/org/apache/shardingsphere/sharding/distsql/handler/query/ShowUnusedShardingKeyGeneratorExecutor.java
@@ -44,7 +44,7 @@ public final class ShowUnusedShardingKeyGeneratorExecutor
implements DistSQLQuer
private ShardingRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowUnusedShardingKeyGeneratorsStatement sqlStatement) {
return Arrays.asList("name", "type", "props");
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
index bce23b60655..8cce66e2746 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecuteEngine.java
@@ -66,14 +66,13 @@ public final class DistSQLQueryExecuteEngine {
@SuppressWarnings("unchecked")
public void executeQuery() throws SQLException {
DistSQLQueryExecutor<DistSQLStatement> executor =
TypedSPILoader.getService(DistSQLQueryExecutor.class, sqlStatement.getClass());
+ columnNames = executor.getColumnNames(sqlStatement);
try {
new DistSQLExecutorAwareSetter(executor).set(contextManager, null
== databaseName ? null : contextManager.getDatabase(databaseName),
distsqlConnectionContext);
} catch (final UnsupportedSQLOperationException ignored) {
rows = Collections.emptyList();
- columnNames = executor.getColumnNames();
return;
}
rows = executor.getRows(sqlStatement, contextManager);
- columnNames = executor.getColumnNames();
}
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecutor.java
index 1ee26a10921..ebf5df0875d 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/engine/query/DistSQLQueryExecutor.java
@@ -37,9 +37,10 @@ public interface DistSQLQueryExecutor<T extends
DistSQLStatement> extends TypedS
/**
* Get column names.
*
+ * @param sqlStatement DistSQL statement
* @return column names
*/
- Collection<String> getColumnNames();
+ Collection<String> getColumnNames(T sqlStatement);
/**
* Get query result rows.
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java
index f9bec2a12b4..a64f86194c5 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/ral/plugin/ShowPluginsExecutor.java
@@ -33,7 +33,7 @@ import java.util.Collections;
public final class ShowPluginsExecutor implements
DistSQLQueryExecutor<ShowPluginsStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowPluginsStatement
sqlStatement) {
return Arrays.asList("type", "type_aliases", "description");
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
index 5bfadebb549..82ad9857245 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowLogicalTableExecutor.java
@@ -42,7 +42,7 @@ public final class ShowLogicalTableExecutor implements
DistSQLQueryExecutor<Show
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowLogicalTablesStatement
sqlStatement) {
return Collections.singleton("table_name");
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
index 9b275ed46cc..ecaab9b2cee 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowRulesUsedStorageUnitExecutor.java
@@ -43,7 +43,7 @@ public final class ShowRulesUsedStorageUnitExecutor
implements DistSQLQueryExecu
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowRulesUsedStorageUnitStatement sqlStatement) {
return Arrays.asList("type", "name");
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
index 67fb6c23d87..df1862bf467 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/resource/ShowStorageUnitExecutor.java
@@ -52,7 +52,7 @@ public final class ShowStorageUnitExecutor implements
DistSQLQueryExecutor<ShowS
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowStorageUnitsStatement
sqlStatement) {
return Arrays.asList("name", "type", "host", "port", "db",
"connection_timeout_milliseconds", "idle_timeout_milliseconds",
"max_lifetime_milliseconds", "max_pool_size", "min_pool_size",
"read_only", "other_attributes");
}
diff --git
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java
index 03ec23b3a9b..9b68d6d9b69 100644
---
a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java
+++
b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rql/rule/RuleCountExecutor.java
@@ -41,7 +41,7 @@ public final class RuleCountExecutor implements
DistSQLQueryExecutor<CountRuleSt
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final CountRuleStatement
sqlStatement) {
return Arrays.asList("rule_name", "database", "count");
}
diff --git
a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
index 220c5331fa4..37b7cc2b579 100644
---
a/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
+++
b/kernel/authority/distsql/handler/src/main/java/org/apache/shardingsphere/authority/distsql/handler/query/ShowAuthorityRuleExecutor.java
@@ -40,7 +40,7 @@ public final class ShowAuthorityRuleExecutor implements
DistSQLQueryExecutor<Sho
private AuthorityRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowAuthorityRuleStatement
sqlStatement) {
return Arrays.asList("users", "provider", "props");
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
index 5670bebfc62..eaadf377c27 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingJobStatusExecutor.java
@@ -41,7 +41,7 @@ public final class ShowStreamingJobStatusExecutor implements
DistSQLQueryExecuto
private final CDCJobAPI jobAPI = (CDCJobAPI)
TypedSPILoader.getService(TransmissionJobAPI.class, "STREAMING");
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowStreamingStatusStatement sqlStatement) {
return Arrays.asList("item", "data_source", "status", "active",
"processed_records_count", "inventory_finished_percentage",
"incremental_idle_seconds", "confirmed_position",
"current_position", "error_message");
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
index c49490748a1..ef03fbc8b4b 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingListExecutor.java
@@ -39,7 +39,7 @@ public final class ShowStreamingListExecutor implements
DistSQLQueryExecutor<Sho
private final PipelineJobManager pipelineJobManager = new
PipelineJobManager(new CDCJobType());
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowStreamingListStatement
sqlStatement) {
return Arrays.asList("id", "database", "tables", "job_item_count",
"active", "create_time", "stop_time");
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
index f9f7c6d0e79..d17fe3f510a 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/cdc/distsql/handler/query/ShowStreamingRuleExecutor.java
@@ -33,7 +33,7 @@ public final class ShowStreamingRuleExecutor implements
DistSQLQueryExecutor<Sho
private final ShowTransmissionRuleQueryResult queryResult = new
ShowTransmissionRuleQueryResult("STREAMING");
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowStreamingRuleStatement
sqlStatement) {
return queryResult.getColumnNames();
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
index 3402632edfb..5b54afcad3d 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckAlgorithmsExecutor.java
@@ -32,7 +32,7 @@ import java.util.Collection;
public final class ShowMigrationCheckAlgorithmsExecutor implements
DistSQLQueryExecutor<ShowMigrationCheckAlgorithmsStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowMigrationCheckAlgorithmsStatement sqlStatement) {
return new
PluginMetaDataQueryResultRows(TableDataConsistencyChecker.class).getColumnNames();
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
index eaf4013129a..234d7877220 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationCheckStatusExecutor.java
@@ -39,7 +39,7 @@ public final class ShowMigrationCheckStatusExecutor
implements DistSQLQueryExecu
private final ConsistencyCheckJobAPI jobAPI = new
ConsistencyCheckJobAPI(new ConsistencyCheckJobType());
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowMigrationCheckStatusStatement sqlStatement) {
return Arrays.asList("tables", "result", "check_failed_tables",
"active", "inventory_finished_percentage", "inventory_remaining_seconds",
"incremental_idle_seconds",
"check_begin_time", "check_end_time", "duration_seconds",
"algorithm_type", "algorithm_props", "error_message");
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
index 0dfd96d631d..662faa03444 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationJobStatusExecutor.java
@@ -37,7 +37,7 @@ import java.util.stream.Collectors;
public final class ShowMigrationJobStatusExecutor implements
DistSQLQueryExecutor<ShowMigrationStatusStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowMigrationStatusStatement sqlStatement) {
return Arrays.asList("item", "data_source", "tables", "status",
"active", "processed_records_count", "inventory_finished_percentage",
"incremental_idle_seconds", "error_message");
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationListExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationListExecutor.java
index 3c14b2d8ee1..0a9ca3a1711 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationListExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationListExecutor.java
@@ -38,7 +38,7 @@ public final class ShowMigrationListExecutor implements
DistSQLQueryExecutor<Sho
private final PipelineJobManager pipelineJobManager = new
PipelineJobManager(new MigrationJobType());
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowMigrationListStatement
sqlStatement) {
return Arrays.asList("id", "tables", "job_item_count", "active",
"create_time", "stop_time");
}
diff --git
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
index ec6ec4bc27a..7c4b4ae8188 100644
---
a/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
+++
b/kernel/data-pipeline/distsql/handler/src/main/java/org/apache/shardingsphere/data/pipeline/migration/distsql/handler/query/ShowMigrationSourceStorageUnitsExecutor.java
@@ -41,7 +41,7 @@ public final class ShowMigrationSourceStorageUnitsExecutor
implements DistSQLQue
private final MigrationJobAPI jobAPI = (MigrationJobAPI)
TypedSPILoader.getService(TransmissionJobAPI.class, "MIGRATION");
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowMigrationSourceStorageUnitsStatement sqlStatement) {
return Arrays.asList("name", "type", "host", "port", "db",
"connection_timeout_milliseconds", "idle_timeout_milliseconds",
"max_lifetime_milliseconds", "max_pool_size", "min_pool_size",
"read_only", "other_attributes");
}
diff --git
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
index ec41f434b1e..6ad3d01ae4a 100644
---
a/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
+++
b/kernel/global-clock/distsql/handler/src/main/java/org/apache/shardingsphere/globalclock/distsql/handler/query/ShowGlobalClockRuleExecutor.java
@@ -40,7 +40,7 @@ public final class ShowGlobalClockRuleExecutor implements
DistSQLQueryExecutor<S
private GlobalClockRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowGlobalClockRuleStatement sqlStatement) {
return Arrays.asList("type", "provider", "enable", "props");
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
index a741d117750..1fd2096f61c 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowDefaultSingleTableStorageUnitExecutor.java
@@ -37,7 +37,7 @@ public final class ShowDefaultSingleTableStorageUnitExecutor
implements DistSQLQ
private SingleRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowDefaultSingleTableStorageUnitStatement sqlStatement) {
return Collections.singleton("storage_unit_name");
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
index 2ac465f9f12..4c3675def05 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowSingleTableExecutor.java
@@ -44,7 +44,7 @@ public final class ShowSingleTableExecutor implements
DistSQLQueryExecutor<ShowS
private SingleRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowSingleTableStatement
sqlStatement) {
return Arrays.asList("table_name", "storage_unit_name");
}
diff --git
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
index 1d9f4476349..b3916182e2c 100644
---
a/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
+++
b/kernel/single/distsql/handler/src/main/java/org/apache/shardingsphere/single/distsql/handler/query/ShowUnloadedSingleTableExecutor.java
@@ -50,7 +50,7 @@ public final class ShowUnloadedSingleTableExecutor implements
DistSQLQueryExecut
private SingleRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowUnloadedSingleTableStatement sqlStatement) {
return Arrays.asList("table_name", "storage_unit_name");
}
diff --git
a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
index a7bf8b129a3..486e060d66f 100644
---
a/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
+++
b/kernel/sql-federation/distsql/handler/src/main/java/org/apache/shardingsphere/sqlfederation/distsql/handler/query/ShowSQLFederationRuleExecutor.java
@@ -39,7 +39,7 @@ public final class ShowSQLFederationRuleExecutor implements
DistSQLQueryExecutor
private SQLFederationRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowSQLFederationRuleStatement sqlStatement) {
return Arrays.asList("sql_federation_enabled",
"all_query_use_sql_federation", "execution_plan_cache");
}
diff --git
a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
index 45dcf78b473..c8a43ecf738 100644
---
a/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
+++
b/kernel/sql-parser/distsql/handler/src/main/java/org/apache/shardingsphere/parser/distsql/handler/query/ShowSQLParserRuleExecutor.java
@@ -39,7 +39,7 @@ public final class ShowSQLParserRuleExecutor implements
DistSQLQueryExecutor<Sho
private SQLParserRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowSQLParserRuleStatement
sqlStatement) {
return Arrays.asList("parse_tree_cache", "sql_statement_cache");
}
diff --git
a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
index 4770d96fe44..2ab55e89d28 100644
---
a/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
+++
b/kernel/sql-translator/distsql/handler/src/main/java/org/apache/shardingsphere/sqltranslator/distsql/handler/query/ShowSQLTranslatorRuleExecutor.java
@@ -40,7 +40,7 @@ public final class ShowSQLTranslatorRuleExecutor implements
DistSQLQueryExecutor
private SQLTranslatorRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowSQLTranslatorRuleStatement sqlStatement) {
return Arrays.asList("type", "props",
"use_original_sql_when_translating_failed");
}
diff --git
a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java
b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java
index ac74595be09..c0a5f97e25f 100644
---
a/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java
+++
b/kernel/traffic/distsql/handler/src/main/java/org/apache/shardingsphere/traffic/distsql/handler/query/ShowTrafficRuleExecutor.java
@@ -42,7 +42,7 @@ public final class ShowTrafficRuleExecutor implements
DistSQLQueryExecutor<ShowT
private TrafficRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowTrafficRulesStatement
sqlStatement) {
return Arrays.asList("name", "labels", "algorithm_type",
"algorithm_props", "load_balancer_type", "load_balancer_props");
}
diff --git
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
index 1897a59994c..aeca748ca8e 100644
---
a/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
+++
b/kernel/transaction/distsql/handler/src/main/java/org/apache/shardingsphere/transaction/distsql/handler/query/ShowTransactionRuleExecutor.java
@@ -39,7 +39,7 @@ public final class ShowTransactionRuleExecutor implements
DistSQLQueryExecutor<S
private TransactionRule rule;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowTransactionRuleStatement sqlStatement) {
return Arrays.asList("default_type", "provider_type", "props");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
index ccf99827efa..9b68b1370bd 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ConvertYamlConfigurationExecutor.java
@@ -59,7 +59,7 @@ public final class ConvertYamlConfigurationExecutor
implements DistSQLQueryExecu
private final YamlProxyDataSourceConfigurationSwapper
dataSourceConfigSwapper = new YamlProxyDataSourceConfigurationSwapper();
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ConvertYamlConfigurationStatement statement) {
return Collections.singleton("dist_sql");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java
index bbb54104ff8..b4c4de6434e 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportDatabaseConfigurationExecutor.java
@@ -38,7 +38,7 @@ public final class ExportDatabaseConfigurationExecutor
implements DistSQLQueryEx
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ExportDatabaseConfigurationStatement sqlStatement) {
return Collections.singleton("result");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
index 1b6da4269ba..259856b2819 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportMetaDataExecutor.java
@@ -53,7 +53,7 @@ import java.util.Properties;
public final class ExportMetaDataExecutor implements
DistSQLQueryExecutor<ExportMetaDataStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ExportMetaDataStatement
sqlStatement) {
return Arrays.asList("id", "create_time", "cluster_info");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
index 4c33b0b4d5d..673bb369ced 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ExportStorageNodesExecutor.java
@@ -46,7 +46,7 @@ import java.util.Map.Entry;
public final class ExportStorageNodesExecutor implements
DistSQLQueryExecutor<ExportStorageNodesStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ExportStorageNodesStatement
sqlStatement) {
return Arrays.asList("id", "create_time", "storage_nodes");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java
index 256da655555..ebc3a2a6cda 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeInfoExecutor.java
@@ -35,7 +35,7 @@ import java.util.Collections;
public final class ShowComputeNodeInfoExecutor implements
DistSQLQueryExecutor<ShowComputeNodeInfoStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowComputeNodeInfoStatement sqlStatement) {
return Arrays.asList("instance_id", "host", "port", "status",
"mode_type", "worker_id", "labels", "version");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
index 662e57dddd5..9acd043288d 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodeModeExecutor.java
@@ -34,7 +34,7 @@ import java.util.Collections;
public final class ShowComputeNodeModeExecutor implements
DistSQLQueryExecutor<ShowComputeNodeModeStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final
ShowComputeNodeModeStatement sqlStatement) {
return Arrays.asList("type", "repository", "props");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java
index 0902c55c795..4e176a6eb82 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowComputeNodesExecutor.java
@@ -36,7 +36,7 @@ import java.util.stream.Collectors;
public final class ShowComputeNodesExecutor implements
DistSQLQueryExecutor<ShowComputeNodesStatement> {
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowComputeNodesStatement
sqlStatement) {
return Arrays.asList("instance_id", "instance_type", "host", "port",
"status", "mode_type", "worker_id", "labels", "version");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java
index c18d89a3788..87214fadf05 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariableExecutor.java
@@ -50,7 +50,7 @@ public final class ShowDistVariableExecutor implements
DistSQLQueryExecutor<Show
private DistSQLConnectionContext connectionContext;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowDistVariableStatement
sqlStatement) {
return Arrays.asList("variable_name", "variable_value");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java
index c3d232e4bd2..5376d792b8c 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowDistVariablesExecutor.java
@@ -51,7 +51,7 @@ public final class ShowDistVariablesExecutor implements
DistSQLQueryExecutor<Sho
private DistSQLConnectionContext connectionContext;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowDistVariablesStatement
sqlStatement) {
return Arrays.asList("variable_name", "variable_value");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java
index ff45c7815b3..39504cb4e9f 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/queryable/ShowMigrationRuleExecutor.java
@@ -33,7 +33,7 @@ public final class ShowMigrationRuleExecutor implements
DistSQLQueryExecutor<Sho
private final ShowTransmissionRuleQueryResult queryResult = new
ShowTransmissionRuleQueryResult("MIGRATION");
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowMigrationRuleStatement
sqlStatement) {
return queryResult.getColumnNames();
}
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 a8a7ac258ae..d9ea9342efd 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
@@ -45,7 +45,7 @@ public final class ShowTableMetaDataExecutor implements
DistSQLQueryExecutor<Sho
private ShardingSphereDatabase database;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ShowTableMetaDataStatement
sqlStatement) {
return Arrays.asList("database_name", "table_name", "type", "name",
"value");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/FormatSQLExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/FormatSQLExecutor.java
index 54c89821834..ca21dbf9030 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/FormatSQLExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/FormatSQLExecutor.java
@@ -41,7 +41,7 @@ public final class FormatSQLExecutor implements
DistSQLQueryExecutor<FormatState
private DistSQLConnectionContext connectionContext;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final FormatStatement
sqlStatement) {
return Collections.singleton("formatted_result");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutor.java
index 0c676fc1dd9..5d39b6e32d9 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/ParseDistSQLExecutor.java
@@ -42,7 +42,7 @@ public final class ParseDistSQLExecutor implements
DistSQLQueryExecutor<ParseSta
private DistSQLConnectionContext connectionContext;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final ParseStatement
sqlStatement) {
return Arrays.asList("parsed_statement", "parsed_statement_detail");
}
diff --git
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
index 9668c84013c..8f450a881ea 100644
---
a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
+++
b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rul/PreviewExecutor.java
@@ -81,7 +81,7 @@ public final class PreviewExecutor implements
DistSQLQueryExecutor<PreviewStatem
private DistSQLConnectionContext connectionContext;
@Override
- public Collection<String> getColumnNames() {
+ public Collection<String> getColumnNames(final PreviewStatement
sqlStatement) {
return Arrays.asList("data_source_name", "actual_sql");
}