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 fad2495e98a Remove useless AlterRuleItem.getActiveVersionKey() (#34851)
fad2495e98a is described below
commit fad2495e98ad39364b4c8bd81536543a23d82e7f
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Mon Mar 3 19:23:44 2025 +0800
Remove useless AlterRuleItem.getActiveVersionKey() (#34851)
* Remove useless AlterRuleItem.getActiveVersionKey()
* Remove useless AlterRuleItem.getActiveVersionKey()
---
.../changed/executor/type/RuleItemAlteredBuildExecutor.java | 4 ++--
.../mode/metadata/manager/rule/DatabaseRuleItemManager.java | 12 +++++++++---
.../mode/spi/rule/item/alter/AlterNamedRuleItem.java | 4 +---
.../mode/spi/rule/item/alter/AlterRuleItem.java | 13 +++----------
.../mode/spi/rule/item/alter/AlterUniqueRuleItem.java | 4 +---
5 files changed, 16 insertions(+), 21 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
index 0bbe52cc8d9..11411e97eab 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/changed/executor/type/RuleItemAlteredBuildExecutor.java
@@ -41,13 +41,13 @@ public final class RuleItemAlteredBuildExecutor implements
RuleItemChangedBuildE
DatabaseRuleNodePath databaseRuleNodePath = new
DatabaseRuleNodePath(databaseName, databaseRuleNode.getRuleType(), new
DatabaseRuleItem(each, NodePathPattern.QUALIFIED_IDENTIFIER));
Optional<String> itemName = new
VersionNodePathParser(databaseRuleNodePath).findIdentifierByActiveVersionPath(path,
1);
if (itemName.isPresent()) {
- return Optional.of(new AlterNamedRuleItem(databaseName,
itemName.get(), path, activeVersion, new
RuleChangedItemType(databaseRuleNode.getRuleType(), each)));
+ return Optional.of(new AlterNamedRuleItem(databaseName,
itemName.get(), activeVersion, new
RuleChangedItemType(databaseRuleNode.getRuleType(), each)));
}
}
for (String each : databaseRuleNode.getUniqueItems()) {
DatabaseRuleNodePath databaseRuleNodePath = new
DatabaseRuleNodePath(databaseName, databaseRuleNode.getRuleType(), new
DatabaseRuleItem(each));
if (new
VersionNodePathParser(databaseRuleNodePath).isActiveVersionPath(path)) {
- return Optional.of(new AlterUniqueRuleItem(databaseName, path,
activeVersion, new RuleChangedItemType(databaseRuleNode.getRuleType(), each)));
+ return Optional.of(new AlterUniqueRuleItem(databaseName,
activeVersion, new RuleChangedItemType(databaseRuleNode.getRuleType(), each)));
}
}
return Optional.empty();
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
index 9de6e8991a4..7d602acf478 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/rule/DatabaseRuleItemManager.java
@@ -58,9 +58,7 @@ public final class DatabaseRuleItemManager {
@SuppressWarnings({"rawtypes", "unchecked"})
public void alter(final AlterRuleItem alterRuleItem) throws SQLException {
VersionNodePath versionNodePath = new
VersionNodePath(getDatabaseRuleNodePath(alterRuleItem));
- String activeVersionPath = versionNodePath.getActiveVersionPath();
- if
(!String.valueOf(alterRuleItem.getActiveVersion()).equals(metaDataPersistFacade.getRepository().query(activeVersionPath)))
{
- log.warn("Invalid active version: {} of key: {}",
alterRuleItem.getActiveVersion(), activeVersionPath);
+ if (!checkActiveVersion(versionNodePath,
alterRuleItem.getCurrentVersion())) {
return;
}
RuleItemConfigurationChangedProcessor processor =
TypedSPILoader.getService(RuleItemConfigurationChangedProcessor.class,
alterRuleItem.getType());
@@ -73,6 +71,14 @@ public final class DatabaseRuleItemManager {
}
}
+ private boolean checkActiveVersion(final VersionNodePath versionNodePath,
final int currentVersion) {
+ if
(String.valueOf(currentVersion).equals(metaDataPersistFacade.getRepository().query(versionNodePath.getActiveVersionPath())))
{
+ return true;
+ }
+ log.warn("Invalid active version `{}` of key `{}`", currentVersion,
versionNodePath.getActiveVersionPath());
+ return false;
+ }
+
private DatabaseRuleNodePath getDatabaseRuleNodePath(final AlterRuleItem
alterRuleItem) {
String ruleType = alterRuleItem.getType().getRuleType();
String itemType = alterRuleItem.getType().getRuleItemType();
diff --git
a/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterNamedRuleItem.java
b/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterNamedRuleItem.java
index 2331611e490..e6004061946 100644
---
a/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterNamedRuleItem.java
+++
b/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterNamedRuleItem.java
@@ -32,9 +32,7 @@ public final class AlterNamedRuleItem implements
AlterRuleItem {
private final String itemName;
- private final String activeVersionKey;
-
- private final int activeVersion;
+ private final int currentVersion;
private final RuleChangedItemType type;
}
diff --git
a/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterRuleItem.java
b/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterRuleItem.java
index e3caa307f49..abaa63ed1a5 100644
---
a/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterRuleItem.java
+++
b/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterRuleItem.java
@@ -32,16 +32,9 @@ public interface AlterRuleItem extends RuleChangedItem {
String getDatabaseName();
/**
- * Get active version key.
+ * Get current version.
*
- * @return active version key
+ * @return current version
*/
- String getActiveVersionKey();
-
- /**
- * Get active version.
- *
- * @return active version
- */
- int getActiveVersion();
+ int getCurrentVersion();
}
diff --git
a/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterUniqueRuleItem.java
b/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterUniqueRuleItem.java
index 1914e56321c..855373da1e4 100644
---
a/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterUniqueRuleItem.java
+++
b/mode/spi/src/main/java/org/apache/shardingsphere/mode/spi/rule/item/alter/AlterUniqueRuleItem.java
@@ -30,9 +30,7 @@ public final class AlterUniqueRuleItem implements
AlterRuleItem {
private final String databaseName;
- private final String activeVersionKey;
-
- private final int activeVersion;
+ private final int currentVersion;
private final RuleChangedItemType type;
}
