You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by zh...@apache.org on 2026/03/14 04:59:58 UTC
(shardingsphere) branch master updated: Fix @Disabled test cases on ClusterMetaDataManagerPersistServiceTest (#38424)
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 dbc53b7d9c9 Fix @Disabled test cases on ClusterMetaDataManagerPersistServiceTest (#38424)
dbc53b7d9c9 is described below
commit dbc53b7d9c97d5699663aa777207a82bf7ebba6d
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Mar 14 12:59:53 2026 +0800
Fix @Disabled test cases on ClusterMetaDataManagerPersistServiceTest (#38424)
* Fix @Disabled test cases on ClusterMetaDataManagerPersistServiceTest
* Fix @Disabled test cases on ClusterMetaDataManagerPersistServiceTest
---
.../sql/PipelineInventoryCalculateSQLBuilder.java | 9 ++++---
.../ClusterMetaDataManagerPersistServiceTest.java | 29 ++++++++++++----------
2 files changed, 21 insertions(+), 17 deletions(-)
diff --git a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineInventoryCalculateSQLBuilder.java b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineInventoryCalculateSQLBuilder.java
index 11d72db6be8..1321ce8c997 100644
--- a/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineInventoryCalculateSQLBuilder.java
+++ b/kernel/data-pipeline/core/src/main/java/org/apache/shardingsphere/data/pipeline/core/sqlbuilder/sql/PipelineInventoryCalculateSQLBuilder.java
@@ -70,15 +70,16 @@ public final class PipelineInventoryCalculateSQLBuilder {
return String.format("SELECT %s FROM %s WHERE %s AND %s ORDER BY %s", queryColumns, qualifiedTableName,
buildRangeQueryLowerCondition(range.isLowerInclusive(), firstUniqueKey),
buildRangeQueryUpperCondition(firstUniqueKey), orderByColumns);
- } else if (null != range.getLowerBound()) {
+ }
+ if (null != range.getLowerBound()) {
return String.format("SELECT %s FROM %s WHERE %s ORDER BY %s", queryColumns, qualifiedTableName,
buildRangeQueryLowerCondition(range.isLowerInclusive(), firstUniqueKey), orderByColumns);
- } else if (null != range.getUpperBound()) {
+ }
+ if (null != range.getUpperBound()) {
return String.format("SELECT %s FROM %s WHERE %s ORDER BY %s", queryColumns, qualifiedTableName,
buildRangeQueryUpperCondition(firstUniqueKey), orderByColumns);
- } else {
- return String.format("SELECT %s FROM %s ORDER BY %s", queryColumns, qualifiedTableName, orderByColumns);
}
+ return String.format("SELECT %s FROM %s ORDER BY %s", queryColumns, qualifiedTableName, orderByColumns);
}
private String buildRangeQueryLowerCondition(final boolean inclusive, final String firstUniqueKey) {
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
index 61aa7e004da..8ff1d2a73a1 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/persist/service/ClusterMetaDataManagerPersistServiceTest.java
@@ -18,13 +18,11 @@
package org.apache.shardingsphere.mode.manager.cluster.persist.service;
import lombok.SneakyThrows;
-import org.apache.shardingsphere.database.connector.core.type.DatabaseType;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereSchema;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereTable;
-import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerCoordinatorType;
import org.apache.shardingsphere.mode.manager.cluster.persist.coordinator.database.ClusterDatabaseListenerPersistCoordinator;
import org.apache.shardingsphere.mode.metadata.manager.MetaDataContextManager;
@@ -33,7 +31,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.single.config.SingleRuleConfiguration;
import org.apache.shardingsphere.single.rule.SingleRule;
import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.mockito.Answers;
@@ -46,6 +43,7 @@ import java.util.Properties;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.ArgumentMatchers.anyCollection;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
@@ -55,8 +53,6 @@ import static org.mockito.Mockito.when;
@ExtendWith(MockitoExtension.class)
class ClusterMetaDataManagerPersistServiceTest {
- private final DatabaseType databaseType = TypedSPILoader.getService(DatabaseType.class, "FIXTURE");
-
private ClusterMetaDataManagerPersistService metaDataManagerPersistService;
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
@@ -129,12 +125,14 @@ class ClusterMetaDataManagerPersistServiceTest {
}
@Test
- @Disabled
void assertAlterRuleConfiguration() {
RuleConfiguration ruleConfig = new SingleRuleConfiguration();
- when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db").getProtocolType()).thenReturn(databaseType);
- metaDataManagerPersistService.alterRuleConfiguration(new ShardingSphereDatabase("foo_db", databaseType, mock(), mock(), Collections.emptyList()), ruleConfig);
+ ShardingSphereDatabase database = mock(ShardingSphereDatabase.class, Answers.RETURNS_DEEP_STUBS);
+ when(database.getName()).thenReturn("foo_db");
+ when(metaDataContextManager.getMetaDataContexts().getMetaData().getDatabase("foo_db")).thenReturn(database);
+ metaDataManagerPersistService.alterRuleConfiguration(database, ruleConfig);
verify(metaDataPersistFacade.getDatabaseRuleService()).persist("foo_db", Collections.singleton(ruleConfig));
+ verify(metaDataPersistFacade.getDatabaseMetaDataFacade()).persistReloadDatabase(eq("foo_db"), any(), any());
}
@Test
@@ -144,17 +142,22 @@ class ClusterMetaDataManagerPersistServiceTest {
}
@Test
- @Disabled
void assertRemoveRuleConfigurationItem() {
- RuleConfiguration ruleConfig = new SingleRuleConfiguration();
- metaDataManagerPersistService.removeRuleConfigurationItem(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), ruleConfig);
+ SingleRuleConfiguration ruleConfig = new SingleRuleConfiguration();
+ ruleConfig.setTables(Collections.singleton("ds_0.t_order"));
+ ShardingSphereDatabase database = mock(ShardingSphereDatabase.class);
+ when(database.getName()).thenReturn("foo_db");
+ SingleRule singleRule = mock(SingleRule.class);
+ when(singleRule.getConfiguration()).thenReturn(new SingleRuleConfiguration());
+ when(database.getRuleMetaData()).thenReturn(new RuleMetaData(Collections.singleton(singleRule)));
+ metaDataManagerPersistService.removeRuleConfigurationItem(database, ruleConfig);
verify(metaDataPersistFacade.getDatabaseRuleService()).delete("foo_db", Collections.singleton(ruleConfig));
+ verify(metaDataPersistFacade.getDatabaseMetaDataFacade()).persistAlteredTables(eq("foo_db"), any(), argThat(actual -> 1 == actual.size() && actual.contains("t_order")));
}
@Test
void assertRemoveRuleConfiguration() {
- metaDataManagerPersistService.removeRuleConfiguration(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()),
- mock(RuleConfiguration.class), "fixtureRule");
+ metaDataManagerPersistService.removeRuleConfiguration(new ShardingSphereDatabase("foo_db", mock(), mock(), mock(), Collections.emptyList()), mock(RuleConfiguration.class), "fixtureRule");
verify(metaDataPersistFacade.getDatabaseRuleService()).delete("foo_db", "fixtureRule");
}