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 2025/08/17 21:19:19 UTC
(shardingsphere) branch master updated: Rename UnregisterStorageUnitRuleAttribute (#36327)
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 fcf40d687dd Rename UnregisterStorageUnitRuleAttribute (#36327)
fcf40d687dd is described below
commit fcf40d687dd2dbeb38ff11cd349120d8634196c1
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Mon Aug 18 05:19:13 2025 +0800
Rename UnregisterStorageUnitRuleAttribute (#36327)
---
.../org/apache/shardingsphere/broadcast/rule/BroadcastRule.java | 4 ++--
...bute.java => BroadcastUnregisterStorageUnitRuleAttribute.java} | 8 ++++----
...RuleAttribute.java => UnregisterStorageUnitRuleAttribute.java} | 6 +++---
.../executor/rdl/resource/UnregisterStorageUnitExecutor.java | 6 +++---
.../distsql/handler/fixture/DistSQLHandlerFixtureRule.java | 8 ++++----
.../java/org/apache/shardingsphere/single/rule/SingleRule.java | 4 ++--
...tribute.java => SingleUnregisterStorageUnitRuleAttribute.java} | 8 ++++----
7 files changed, 22 insertions(+), 22 deletions(-)
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
index 883160608b6..b21ecdf5981 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/BroadcastRule.java
@@ -22,8 +22,8 @@ import lombok.Getter;
import org.apache.shardingsphere.broadcast.config.BroadcastRuleConfiguration;
import org.apache.shardingsphere.broadcast.constant.BroadcastOrder;
import org.apache.shardingsphere.broadcast.rule.attribute.BroadcastDataNodeRuleAttribute;
-import org.apache.shardingsphere.broadcast.rule.attribute.BroadcastStorageUnitDefinitionProcessorRuleAttribute;
import org.apache.shardingsphere.broadcast.rule.attribute.BroadcastTableNamesRuleAttribute;
+import org.apache.shardingsphere.broadcast.rule.attribute.BroadcastUnregisterStorageUnitRuleAttribute;
import org.apache.shardingsphere.infra.annotation.HighFrequencyInvocation;
import org.apache.shardingsphere.infra.metadata.database.resource.PhysicalDataSourceAggregator;
import org.apache.shardingsphere.infra.metadata.database.rule.RuleMetaData;
@@ -57,7 +57,7 @@ public final class BroadcastRule implements DatabaseRule {
dataSourceNames = new CaseInsensitiveSet<>(aggregatedDataSources.keySet());
tables = new CaseInsensitiveSet<>(ruleConfig.getTables());
attributes = new RuleAttributes(new BroadcastDataNodeRuleAttribute(dataSourceNames, tables),
- new BroadcastTableNamesRuleAttribute(tables), new AggregatedDataSourceRuleAttribute(aggregatedDataSources), new BroadcastStorageUnitDefinitionProcessorRuleAttribute());
+ new BroadcastTableNamesRuleAttribute(tables), new AggregatedDataSourceRuleAttribute(aggregatedDataSources), new BroadcastUnregisterStorageUnitRuleAttribute());
}
/**
diff --git a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastStorageUnitDefinitionProcessorRuleAttribute.java b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastUnregisterStorageUnitRuleAttribute.java
similarity index 69%
rename from features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastStorageUnitDefinitionProcessorRuleAttribute.java
rename to features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastUnregisterStorageUnitRuleAttribute.java
index 6d27dec9ac2..b8db205ca66 100644
--- a/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastStorageUnitDefinitionProcessorRuleAttribute.java
+++ b/features/broadcast/core/src/main/java/org/apache/shardingsphere/broadcast/rule/attribute/BroadcastUnregisterStorageUnitRuleAttribute.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.broadcast.rule.attribute;
-import org.apache.shardingsphere.infra.rule.attribute.resoure.StorageUnitDefinitionProcessorRuleAttribute;
+import org.apache.shardingsphere.infra.rule.attribute.resoure.UnregisterStorageUnitRuleAttribute;
/**
- * Broadcast storage unit definition processor rule attribute.
+ * Broadcast unregister storage unit rule attribute.
*/
-public final class BroadcastStorageUnitDefinitionProcessorRuleAttribute implements StorageUnitDefinitionProcessorRuleAttribute {
+public final class BroadcastUnregisterStorageUnitRuleAttribute implements UnregisterStorageUnitRuleAttribute {
@Override
- public boolean ignoreUsageCheckOnUnregister(final boolean ignoreSingleTables, final boolean ignoreBroadcastTables) {
+ public boolean ignoreUsageCheck(final boolean ignoreSingleTables, final boolean ignoreBroadcastTables) {
return ignoreBroadcastTables;
}
}
diff --git a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/attribute/resoure/StorageUnitDefinitionProcessorRuleAttribute.java b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/attribute/resoure/UnregisterStorageUnitRuleAttribute.java
similarity index 83%
rename from infra/common/src/main/java/org/apache/shardingsphere/infra/rule/attribute/resoure/StorageUnitDefinitionProcessorRuleAttribute.java
rename to infra/common/src/main/java/org/apache/shardingsphere/infra/rule/attribute/resoure/UnregisterStorageUnitRuleAttribute.java
index 068f9a2eb31..90239d8aecd 100644
--- a/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/attribute/resoure/StorageUnitDefinitionProcessorRuleAttribute.java
+++ b/infra/common/src/main/java/org/apache/shardingsphere/infra/rule/attribute/resoure/UnregisterStorageUnitRuleAttribute.java
@@ -20,9 +20,9 @@ package org.apache.shardingsphere.infra.rule.attribute.resoure;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttribute;
/**
- * Storage unit definition processor rule attribute.
+ * Unregister storage unit rule attribute.
*/
-public interface StorageUnitDefinitionProcessorRuleAttribute extends RuleAttribute {
+public interface UnregisterStorageUnitRuleAttribute extends RuleAttribute {
/**
* Whether to ignore rule usage checking when unregister storage unit.
@@ -31,5 +31,5 @@ public interface StorageUnitDefinitionProcessorRuleAttribute extends RuleAttribu
* @param ignoreBroadcastTables ignore broadcast tables
* @return ignored or not
*/
- boolean ignoreUsageCheckOnUnregister(boolean ignoreSingleTables, boolean ignoreBroadcastTables);
+ boolean ignoreUsageCheck(boolean ignoreSingleTables, boolean ignoreBroadcastTables);
}
diff --git a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
index 55a40d2ec51..bc981e80df5 100644
--- a/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
+++ b/infra/distsql-handler/src/main/java/org/apache/shardingsphere/distsql/handler/executor/rdl/resource/UnregisterStorageUnitExecutor.java
@@ -29,7 +29,7 @@ import org.apache.shardingsphere.infra.exception.kernel.metadata.resource.storag
import org.apache.shardingsphere.infra.metadata.database.ShardingSphereDatabase;
import org.apache.shardingsphere.infra.metadata.database.resource.unit.StorageUnit;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
-import org.apache.shardingsphere.infra.rule.attribute.resoure.StorageUnitDefinitionProcessorRuleAttribute;
+import org.apache.shardingsphere.infra.rule.attribute.resoure.UnregisterStorageUnitRuleAttribute;
import org.apache.shardingsphere.mode.manager.ContextManager;
import java.util.Collection;
@@ -82,8 +82,8 @@ public final class UnregisterStorageUnitExecutor implements DistSQLUpdateExecuto
private Collection<Class<? extends ShardingSphereRule>> getIgnoreUsageCheckRules(final UnregisterStorageUnitStatement sqlStatement) {
Collection<Class<? extends ShardingSphereRule>> result = new LinkedList<>();
for (ShardingSphereRule each : database.getRuleMetaData().getRules()) {
- Optional<StorageUnitDefinitionProcessorRuleAttribute> ruleAttribute = each.getAttributes().findAttribute(StorageUnitDefinitionProcessorRuleAttribute.class);
- if (ruleAttribute.isPresent() && ruleAttribute.get().ignoreUsageCheckOnUnregister(sqlStatement.isIgnoreSingleTables(), sqlStatement.isIgnoreBroadcastTables())) {
+ Optional<UnregisterStorageUnitRuleAttribute> ruleAttribute = each.getAttributes().findAttribute(UnregisterStorageUnitRuleAttribute.class);
+ if (ruleAttribute.isPresent() && ruleAttribute.get().ignoreUsageCheck(sqlStatement.isIgnoreSingleTables(), sqlStatement.isIgnoreBroadcastTables())) {
result.add(each.getClass());
}
}
diff --git a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/fixture/DistSQLHandlerFixtureRule.java b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/fixture/DistSQLHandlerFixtureRule.java
index a00f3ed4f41..a1caa1b8c88 100644
--- a/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/fixture/DistSQLHandlerFixtureRule.java
+++ b/infra/distsql-handler/src/test/java/org/apache/shardingsphere/distsql/handler/fixture/DistSQLHandlerFixtureRule.java
@@ -22,7 +22,7 @@ import org.apache.shardingsphere.infra.datanode.DataNode;
import org.apache.shardingsphere.infra.rule.ShardingSphereRule;
import org.apache.shardingsphere.infra.rule.attribute.RuleAttributes;
import org.apache.shardingsphere.infra.rule.attribute.datanode.DataNodeRuleAttribute;
-import org.apache.shardingsphere.infra.rule.attribute.resoure.StorageUnitDefinitionProcessorRuleAttribute;
+import org.apache.shardingsphere.infra.rule.attribute.resoure.UnregisterStorageUnitRuleAttribute;
import java.util.Collections;
import java.util.Optional;
@@ -54,9 +54,9 @@ public final class DistSQLHandlerFixtureRule implements ShardingSphereRule {
return result;
}
- private StorageUnitDefinitionProcessorRuleAttribute mockStorageUnitDefinitionProcessorRuleAttribute() {
- StorageUnitDefinitionProcessorRuleAttribute result = mock(StorageUnitDefinitionProcessorRuleAttribute.class);
- when(result.ignoreUsageCheckOnUnregister(true, false)).thenReturn(true);
+ private UnregisterStorageUnitRuleAttribute mockStorageUnitDefinitionProcessorRuleAttribute() {
+ UnregisterStorageUnitRuleAttribute result = mock(UnregisterStorageUnitRuleAttribute.class);
+ when(result.ignoreUsageCheck(true, false)).thenReturn(true);
return result;
}
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
index 2460524666f..275e2ce2bb0 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/SingleRule.java
@@ -38,8 +38,8 @@ import org.apache.shardingsphere.single.datanode.SingleTableDataNodeLoader;
import org.apache.shardingsphere.single.rule.attribute.SingleDataNodeRuleAttribute;
import org.apache.shardingsphere.single.rule.attribute.SingleExportableRuleAttribute;
import org.apache.shardingsphere.single.rule.attribute.SingleMutableDataNodeRuleAttribute;
-import org.apache.shardingsphere.single.rule.attribute.SingleStorageUnitDefinitionProcessorRuleAttribute;
import org.apache.shardingsphere.single.rule.attribute.SingleTableMapperRuleAttribute;
+import org.apache.shardingsphere.single.rule.attribute.SingleUnregisterStorageUnitRuleAttribute;
import org.apache.shardingsphere.sql.parser.statement.core.segment.generic.table.SimpleTableSegment;
import org.apache.shardingsphere.sql.parser.statement.core.statement.attribute.type.IndexSQLStatementAttribute;
@@ -86,7 +86,7 @@ public final class SingleRule implements DatabaseRule {
mutableDataNodeRuleAttribute = new SingleMutableDataNodeRuleAttribute(configuration, dataSourceNames, singleTableDataNodes, protocolType, tableMapperRuleAttribute);
attributes = new RuleAttributes(new SingleDataNodeRuleAttribute(singleTableDataNodes), tableMapperRuleAttribute,
new SingleExportableRuleAttribute(tableMapperRuleAttribute), mutableDataNodeRuleAttribute, new AggregatedDataSourceRuleAttribute(aggregatedDataSources),
- new SingleStorageUnitDefinitionProcessorRuleAttribute());
+ new SingleUnregisterStorageUnitRuleAttribute());
}
/**
diff --git a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleStorageUnitDefinitionProcessorRuleAttribute.java b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleUnregisterStorageUnitRuleAttribute.java
similarity index 69%
rename from kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleStorageUnitDefinitionProcessorRuleAttribute.java
rename to kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleUnregisterStorageUnitRuleAttribute.java
index 4d0472db612..42070d7eb44 100644
--- a/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleStorageUnitDefinitionProcessorRuleAttribute.java
+++ b/kernel/single/core/src/main/java/org/apache/shardingsphere/single/rule/attribute/SingleUnregisterStorageUnitRuleAttribute.java
@@ -17,15 +17,15 @@
package org.apache.shardingsphere.single.rule.attribute;
-import org.apache.shardingsphere.infra.rule.attribute.resoure.StorageUnitDefinitionProcessorRuleAttribute;
+import org.apache.shardingsphere.infra.rule.attribute.resoure.UnregisterStorageUnitRuleAttribute;
/**
- * Single storage unit definition processor rule attribute.
+ * Single unregister storage unit rule attribute.
*/
-public final class SingleStorageUnitDefinitionProcessorRuleAttribute implements StorageUnitDefinitionProcessorRuleAttribute {
+public final class SingleUnregisterStorageUnitRuleAttribute implements UnregisterStorageUnitRuleAttribute {
@Override
- public boolean ignoreUsageCheckOnUnregister(final boolean ignoreSingleTables, final boolean ignoreBroadcastTables) {
+ public boolean ignoreUsageCheck(final boolean ignoreSingleTables, final boolean ignoreBroadcastTables) {
return ignoreSingleTables;
}
}