This is an automated email from the ASF dual-hosted git repository.
zhaojinchao 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 2b2d3287283 Rename system-schema-metadata-enabled to
system-schema-metadata-assembly-enabled (#32476)
2b2d3287283 is described below
commit 2b2d3287283fefab4258f114ca7bfda6926c7328
Author: Liang Zhang <[email protected]>
AuthorDate: Mon Aug 12 23:24:38 2024 +0800
Rename system-schema-metadata-enabled to
system-schema-metadata-assembly-enabled (#32476)
---
.../config/props/temporary/TemporaryConfigurationPropertyKey.java | 4 ++--
.../infra/metadata/database/schema/builder/SystemSchemaBuilder.java | 2 +-
.../datasource/creator/ShardingSpherePipelineDataSourceCreator.java | 2 +-
.../e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml | 2 +-
test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml | 2 +-
.../operation/pipeline/src/test/resources/env/opengauss/global.yaml | 2 +-
.../operation/pipeline/src/test/resources/env/postgresql/global.yaml | 2 +-
.../resources/cases/ral/dataset/empty_rules/show_dist_variables.xml | 2 +-
.../src/test/resources/config_sharding_sphere_jdbc_source.yaml | 2 +-
.../src/test/resources/config_sharding_sphere_jdbc_target.yaml | 2 +-
.../src/test/resources/migration_sharding_sphere_jdbc_target.yaml | 2 +-
11 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/temporary/TemporaryConfigurationPropertyKey.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/temporary/TemporaryConfigurationPropertyKey.java
index fdd63ddaf33..477b5dd1462 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/temporary/TemporaryConfigurationPropertyKey.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/config/props/temporary/TemporaryConfigurationPropertyKey.java
@@ -38,9 +38,9 @@ public enum TemporaryConfigurationPropertyKey implements
TypedPropertyKey {
PROXY_META_DATA_COLLECTOR_ENABLED("proxy-meta-data-collector-enabled",
String.valueOf(Boolean.FALSE), boolean.class, false),
/**
- * System schema metadata enabled.
+ * System schema metadata assembly enabled.
*/
- SYSTEM_SCHEMA_METADATA_ENABLED("system-schema-metadata-enabled",
String.valueOf(Boolean.TRUE), boolean.class, true);
+
SYSTEM_SCHEMA_METADATA_ASSEMBLY_ENABLED("system-schema-metadata-assembly-enabled",
String.valueOf(Boolean.TRUE), boolean.class, true);
private final String key;
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
index cd40cd88a4c..c8addf96ab0 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/database/schema/builder/SystemSchemaBuilder.java
@@ -65,7 +65,7 @@ public final class SystemSchemaBuilder {
}
private static boolean isSystemSchemaMetaDataEnabled(final Properties
props) {
- TemporaryConfigurationPropertyKey configKey =
TemporaryConfigurationPropertyKey.SYSTEM_SCHEMA_METADATA_ENABLED;
+ TemporaryConfigurationPropertyKey configKey =
TemporaryConfigurationPropertyKey.SYSTEM_SCHEMA_METADATA_ASSEMBLY_ENABLED;
return Boolean.parseBoolean(props.getOrDefault(configKey.getKey(),
configKey.getDefaultValue()).toString());
}
diff --git
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
index 9b72133cd61..a7aa5f5a69c 100644
---
a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
+++
b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/datasource/creator/ShardingSpherePipelineDataSourceCreator.java
@@ -79,7 +79,7 @@ public final class ShardingSpherePipelineDataSourceCreator
implements PipelineDa
}
private void disableSystemSchemaMetadata(final YamlRootConfiguration
yamlRootConfig) {
-
yamlRootConfig.getProps().put(TemporaryConfigurationPropertyKey.SYSTEM_SCHEMA_METADATA_ENABLED.getKey(),
String.valueOf(Boolean.FALSE));
+
yamlRootConfig.getProps().put(TemporaryConfigurationPropertyKey.SYSTEM_SCHEMA_METADATA_ASSEMBLY_ENABLED.getKey(),
String.valueOf(Boolean.FALSE));
}
// TODO Another way is improving ExecuteQueryCallback.executeSQL to enable
streaming query, then remove it
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
index a0715313452..58be9050c07 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mariadb/global.yaml
@@ -37,7 +37,7 @@ sqlFederation:
maximumSize: 65535
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
max-connections-size-per-query: 1
kernel-executor-size: 16 # Infinite by default.
proxy-frontend-flush-threshold: 128 # The default value is 128.
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
index f37cc14ee69..f4b7c3d23eb 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/global.yaml
@@ -41,7 +41,7 @@ sqlFederation:
maximumSize: 65535
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
max-connections-size-per-query: 1
kernel-executor-size: 16 # Infinite by default.
proxy-frontend-flush-threshold: 128 # The default value is 128.
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
index f929d043cfe..03843b82781 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/global.yaml
@@ -35,7 +35,7 @@ authority:
type: ALL_PERMITTED
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
max-connections-size-per-query: 1
kernel-executor-size: 16 # Infinite by default.
proxy-frontend-flush-threshold: 128 # The default value is 128.
diff --git
a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
index bc53930ae8a..59d03eba60a 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/global.yaml
@@ -35,7 +35,7 @@ authority:
type: ALL_PERMITTED
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
max-connections-size-per-query: 1
kernel-executor-size: 16 # Infinite by default.
proxy-frontend-flush-threshold: 128 # The default value is 128.
diff --git
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
index c02a5b027e2..1e331d5c4b2 100644
---
a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
+++
b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_dist_variables.xml
@@ -40,5 +40,5 @@
<row values="sql_show| false" />
<row values="sql_simple| false" />
<row values="system_log_level| INFO" />
- <row values="system_schema_metadata_enabled| true" />
+ <row values="system_schema_metadata_assembly_enabled| true" />
</dataset>
diff --git
a/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
b/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
index c48220f058a..50d2a9bd541 100644
---
a/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
+++
b/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_source.yaml
@@ -30,7 +30,7 @@ mode:
operationTimeoutMilliseconds: 500
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
dataSources:
ds_0:
diff --git
a/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_target.yaml
b/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_target.yaml
index d67dcd4f35a..5a5412af2e5 100644
---
a/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_target.yaml
+++
b/test/it/pipeline/src/test/resources/config_sharding_sphere_jdbc_target.yaml
@@ -18,7 +18,7 @@
databaseName: logic_db
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
dataSources:
ds_1:
diff --git
a/test/it/pipeline/src/test/resources/migration_sharding_sphere_jdbc_target.yaml
b/test/it/pipeline/src/test/resources/migration_sharding_sphere_jdbc_target.yaml
index 47ecc64f6c0..c5681a5e43d 100644
---
a/test/it/pipeline/src/test/resources/migration_sharding_sphere_jdbc_target.yaml
+++
b/test/it/pipeline/src/test/resources/migration_sharding_sphere_jdbc_target.yaml
@@ -16,7 +16,7 @@
#
props:
- system-schema-metadata-enabled: false
+ system-schema-metadata-assembly-enabled: false
dataSources:
ds_1:
