You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by tu...@apache.org on 2023/06/29 03:48:16 UTC
[shardingsphere] branch master updated: Run CI for new metadata structure (#26575)
This is an automated email from the ASF dual-hosted git repository.
tuichenchuxin 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 f761d4513d9 Run CI for new metadata structure (#26575)
f761d4513d9 is described below
commit f761d4513d9cd8d6cddafc2a8db4071b2015f971
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Thu Jun 29 11:48:05 2023 +0800
Run CI for new metadata structure (#26575)
* Run CI
* Rename cluster
* Update
* Adjustment sleep time
* Update
* Fix it
* Update
* Fix CI
* Disable system-schema-metadata-enabled switch
* add system-schema-metadata-enabled
* Adjustment timeout for workflow
---
.github/workflows/e2e-sql.yml | 2 +-
.../java/org/apache/shardingsphere/infra/instance/InstanceContext.java | 2 +-
.../mode/manager/cluster/ClusterContextManagerBuilder.java | 2 +-
.../mode/manager/cluster/NewClusterContextManagerBuilder.java | 2 +-
.../cluster/yaml/ClusterYamlPersistRepositoryConfigurationSwapper.java | 2 +-
.../yaml/NewClusterYamlPersistRepositoryConfigurationSwapper.java | 2 +-
.../proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java | 2 +-
.../proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java | 2 +-
test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml | 1 +
test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml | 1 +
.../e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml | 1 +
.../operation/pipeline/src/test/resources/env/postgresql/server.yaml | 1 +
.../cases/ral/dataset/empty_rules/show_sharding_table_rule.xml | 2 +-
.../test/it/data/pipeline/core/util/PipelineContextUtils.java | 2 +-
14 files changed, 14 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/e2e-sql.yml b/.github/workflows/e2e-sql.yml
index c00b8515d11..1532caab365 100644
--- a/.github/workflows/e2e-sql.yml
+++ b/.github/workflows/e2e-sql.yml
@@ -176,7 +176,7 @@ jobs:
name: mixture rule
needs: e2e-single-rule
runs-on: ubuntu-latest
- timeout-minutes: 15
+ timeout-minutes: 20
strategy:
matrix:
adapter: [ proxy, jdbc ]
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
index 73214596b40..331ae5b3b53 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/instance/InstanceContext.java
@@ -178,6 +178,6 @@ public final class InstanceContext {
* @return true if is cluster, else false
*/
public boolean isCluster() {
- return "Cluster".equals(modeConfiguration.getType());
+ return "Cluster".equals(modeConfiguration.getType()) || "Compatible_Cluster".equals(modeConfiguration.getType());
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
index c976350520a..6d4681b0a53 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
@@ -91,6 +91,6 @@ public final class ClusterContextManagerBuilder implements ContextManagerBuilder
@Override
public String getType() {
- return "Cluster";
+ return "Compatible_Cluster";
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java
index 99b0675ce98..4572444fb76 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/NewClusterContextManagerBuilder.java
@@ -103,6 +103,6 @@ public final class NewClusterContextManagerBuilder implements ContextManagerBuil
@Override
public String getType() {
- return "New_Cluster";
+ return "Cluster";
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/ClusterYamlPersistRepositoryConfigurationSwapper.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/ClusterYamlPersistRepositoryConfigurationSwapper.java
index 287751e93f4..b9f53ce60e1 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/ClusterYamlPersistRepositoryConfigurationSwapper.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/ClusterYamlPersistRepositoryConfigurationSwapper.java
@@ -44,6 +44,6 @@ public final class ClusterYamlPersistRepositoryConfigurationSwapper implements Y
@Override
public String getType() {
- return "Cluster";
+ return "Compatible_Cluster";
}
}
diff --git a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/NewClusterYamlPersistRepositoryConfigurationSwapper.java b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/NewClusterYamlPersistRepositoryConfigurationSwapper.java
index 1ef2a91a899..c0203fc79c2 100644
--- a/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/NewClusterYamlPersistRepositoryConfigurationSwapper.java
+++ b/mode/type/cluster/core/src/main/java/org/apache/shardingsphere/mode/manager/cluster/yaml/NewClusterYamlPersistRepositoryConfigurationSwapper.java
@@ -45,6 +45,6 @@ public final class NewClusterYamlPersistRepositoryConfigurationSwapper implement
@Override
public String getType() {
- return "New_Cluster";
+ return "Cluster";
}
}
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
index 428e3b63901..5ee976e81bb 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/ral/RALBackendHandlerFactory.java
@@ -45,7 +45,7 @@ public final class RALBackendHandlerFactory {
return new QueryableRALBackendHandler<>((QueryableRALStatement) sqlStatement, connectionSession);
}
if (sqlStatement instanceof UpdatableGlobalRuleRALStatement) {
- if ("New_Cluster".equals(ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType())) {
+ if ("Cluster".equals(ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType())) {
return new NewUpdatableGlobalRuleRALBackendHandler((UpdatableGlobalRuleRALStatement) sqlStatement);
}
return new UpdatableGlobalRuleRALBackendHandler((UpdatableGlobalRuleRALStatement) sqlStatement);
diff --git a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
index c359ccd9e60..07be027b282 100644
--- a/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
+++ b/proxy/backend/core/src/main/java/org/apache/shardingsphere/proxy/backend/handler/distsql/rdl/RDLBackendHandlerFactory.java
@@ -52,7 +52,7 @@ public final class RDLBackendHandlerFactory {
return getStorageUnitBackendHandler((StorageUnitDefinitionStatement) sqlStatement, connectionSession);
}
// TODO Remove when metadata structure adjustment completed. #25485
- if ("New_Cluster".equals(ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType())) {
+ if ("Cluster".equals(ProxyContext.getInstance().getContextManager().getInstanceContext().getModeConfiguration().getType())) {
return new NewRuleDefinitionBackendHandler<>((RuleDefinitionStatement) sqlStatement, connectionSession);
}
return new RuleDefinitionBackendHandler<>((RuleDefinitionStatement) sqlStatement, connectionSession);
diff --git a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
index 6bc76b7af71..f37cc14ee69 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-5.yaml
@@ -41,6 +41,7 @@ sqlFederation:
maximumSize: 65535
props:
+ system-schema-metadata-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/server-8.yaml b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
index 6bc76b7af71..f37cc14ee69 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/mysql/server-8.yaml
@@ -41,6 +41,7 @@ sqlFederation:
maximumSize: 65535
props:
+ system-schema-metadata-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/server.yaml b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
index f88604d80b6..f34d2ed6efc 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/opengauss/server.yaml
@@ -35,6 +35,7 @@ authority:
type: ALL_PERMITTED
props:
+ system-schema-metadata-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/server.yaml b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
index d31879dbfd5..9f857166cb7 100644
--- a/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
+++ b/test/e2e/operation/pipeline/src/test/resources/env/postgresql/server.yaml
@@ -35,6 +35,7 @@ authority:
type: ALL_PERMITTED
props:
+ system-schema-metadata-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_sharding_table_rule.xml b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
index 1e916cfe462..d3002c8f057 100644
--- a/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
+++ b/test/e2e/sql/src/test/resources/cases/ral/dataset/empty_rules/show_sharding_table_rule.xml
@@ -34,6 +34,6 @@
<column name="auditor_types" />
<column name="allow_hint_disable" />
</metadata>
- <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD| sharding-count=40| user_id| IT.FIXTURE| worker-id=1 | IT.AUDITOR.FIXTURE| true" />
<row values="t_user_item| | write_ds_${0..9}| | | | |STANDARD| user_id| MOD| sharding-count=40| user_id| IT.FIXTURE| worker-id=1 | |" />
+ <row values="t_user| | write_ds_${0..9}| | | | | STANDARD| user_id| MOD| sharding-count=40| user_id| IT.FIXTURE| worker-id=1 | IT.AUDITOR.FIXTURE| true" />
</dataset>
diff --git a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
index ecf69186cc1..1ed17586e66 100644
--- a/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
+++ b/test/it/pipeline/src/test/java/org/apache/shardingsphere/test/it/data/pipeline/core/util/PipelineContextUtils.java
@@ -89,7 +89,7 @@ public final class PipelineContextUtils {
ShardingSphereDataSource dataSource = (ShardingSphereDataSource) PipelineDataSourceFactory.newInstance(pipelineDataSourceConfig).getDataSource();
ContextManager contextManager = getContextManager(dataSource);
ClusterPersistRepository persistRepository = getClusterPersistRepository((ClusterPersistRepositoryConfiguration) modeConfig.getRepository());
- MetaDataBasedPersistService persistService = "New_Cluster".equals(modeConfig.getType()) ? new NewMetaDataPersistService(persistRepository) : new MetaDataPersistService(persistRepository);
+ MetaDataBasedPersistService persistService = "Cluster".equals(modeConfig.getType()) ? new NewMetaDataPersistService(persistRepository) : new MetaDataPersistService(persistRepository);
MetaDataContexts metaDataContexts = renewMetaDataContexts(contextManager.getMetaDataContexts(), persistService);
PipelineContext pipelineContext = new PipelineContext(modeConfig, new ContextManager(metaDataContexts, contextManager.getInstanceContext()));
PipelineContextManager.putContext(contextKey, pipelineContext);