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 efb1d11f495 Rename MetaDataVersion.INIT_VERSION (#34609)
efb1d11f495 is described below
commit efb1d11f49568afdb7cf362d1e20d28cf92a2f45
Author: Liang Zhang <zhangli...@apache.org>
AuthorDate: Sat Feb 8 17:49:50 2025 +0800
Rename MetaDataVersion.INIT_VERSION (#34609)
---
.../apache/shardingsphere/infra/metadata/version/MetaDataVersion.java | 2 +-
.../persist/config/database/DataSourceUnitPersistService.java | 4 ++--
.../metadata/persist/config/database/DatabaseRulePersistService.java | 2 +-
.../mode/metadata/persist/config/global/GlobalRulePersistService.java | 4 ++--
.../mode/metadata/persist/config/global/PropertiesPersistService.java | 2 +-
.../persist/metadata/service/TableMetaDataPersistService.java | 4 ++--
.../metadata/persist/metadata/service/ViewMetaDataPersistService.java | 4 ++--
.../mode/metadata/persist/version/MetaDataVersionPersistService.java | 2 +-
8 files changed, 12 insertions(+), 12 deletions(-)
diff --git
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
index fe6190a0d0b..960266ce5ec 100644
---
a/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
+++
b/infra/common/src/main/java/org/apache/shardingsphere/infra/metadata/version/MetaDataVersion.java
@@ -27,7 +27,7 @@ import lombok.RequiredArgsConstructor;
@Getter
public final class MetaDataVersion {
- public static final int DEFAULT_VERSION = 0;
+ public static final int INIT_VERSION = 0;
private final String path;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
index bf174610db6..3313e7aa42c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DataSourceUnitPersistService.java
@@ -72,7 +72,7 @@ public final class DataSourceUnitPersistService {
public DataSourcePoolProperties load(final String databaseName, final
String dataSourceName) {
Integer dataSourceActiveVersion =
getDataSourceActiveVersion(databaseName, dataSourceName);
String dataSourceValue =
repository.query(DataSourceMetaDataNodePath.getStorageUnitVersionNodePathGenerator(databaseName,
dataSourceName)
- .getVersionPath(null == dataSourceActiveVersion ?
MetaDataVersion.DEFAULT_VERSION : dataSourceActiveVersion));
+ .getVersionPath(null == dataSourceActiveVersion ?
MetaDataVersion.INIT_VERSION : dataSourceActiveVersion));
return
yamlDataSourceConfigurationSwapper.swapToDataSourcePoolProperties(YamlEngine.unmarshal(dataSourceValue,
Map.class));
}
@@ -92,7 +92,7 @@ public final class DataSourceUnitPersistService {
YamlEngine.marshal(yamlDataSourceConfigurationSwapper.swapToMap(entry.getValue())));
if (null == activeVersion) {
repository.persist(DataSourceMetaDataNodePath.getStorageUnitVersionNodePathGenerator(databaseName,
entry.getKey()).getActiveVersionPath(),
- String.valueOf(MetaDataVersion.DEFAULT_VERSION));
+ String.valueOf(MetaDataVersion.INIT_VERSION));
}
result.add(new
MetaDataVersion(DataSourceMetaDataNodePath.getStorageUnitPath(databaseName,
entry.getKey()), activeVersion, nextActiveVersion));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
index e47f123448b..39dfc9c043e 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/database/DatabaseRulePersistService.java
@@ -94,7 +94,7 @@ public final class DatabaseRulePersistService {
repository.persist(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator(databaseName,
ruleName, each.getKey()).getVersionPath(nextVersion), each.getValue());
if (null == getActiveVersion(databaseName, ruleName,
each.getKey())) {
repository.persist(DatabaseRuleMetaDataNodePath.getVersionNodePathGenerator(databaseName,
ruleName, each.getKey()).getActiveVersionPath(),
- String.valueOf(MetaDataVersion.DEFAULT_VERSION));
+ String.valueOf(MetaDataVersion.INIT_VERSION));
}
result.add(new
MetaDataVersion(DatabaseRuleMetaDataNodePath.getRulePath(databaseName,
ruleName, each.getKey()), getActiveVersion(databaseName, ruleName,
each.getKey()), nextVersion));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
index baa6acf15ee..5b2200335a7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/GlobalRulePersistService.java
@@ -95,10 +95,10 @@ public final class GlobalRulePersistService {
repository.persist(GlobalRuleNodePath.getVersionNodePathGenerator(each.getKey()).getVersionPath(nextActiveVersion),
each.getValue());
String ruleActiveVersionPath =
GlobalRuleNodePath.getVersionNodePathGenerator(each.getKey()).getActiveVersionPath();
if (null == getRuleActiveVersion(ruleActiveVersionPath)) {
- repository.persist(ruleActiveVersionPath,
String.valueOf(MetaDataVersion.DEFAULT_VERSION));
+ repository.persist(ruleActiveVersionPath,
String.valueOf(MetaDataVersion.INIT_VERSION));
}
Integer ruleActiveVersion =
getRuleActiveVersion(ruleActiveVersionPath);
- result.add(new
MetaDataVersion(GlobalRuleNodePath.getRulePath(each.getKey()), null ==
ruleActiveVersion ? MetaDataVersion.DEFAULT_VERSION : ruleActiveVersion,
nextActiveVersion));
+ result.add(new
MetaDataVersion(GlobalRuleNodePath.getRulePath(each.getKey()), null ==
ruleActiveVersion ? MetaDataVersion.INIT_VERSION : ruleActiveVersion,
nextActiveVersion));
}
return result;
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
index 11c20ae8492..56fafd4dde7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/config/global/PropertiesPersistService.java
@@ -58,7 +58,7 @@ public final class PropertiesPersistService {
int nextActiveVersion =
metaDataVersionPersistService.getNextVersion(GlobalPropertiesNodePath.getVersionNodePathGenerator().getVersionsPath());
repository.persist(GlobalPropertiesNodePath.getVersionNodePathGenerator().getVersionPath(nextActiveVersion),
YamlEngine.marshal(props));
if (null == getActiveVersion()) {
-
repository.persist(GlobalPropertiesNodePath.getVersionNodePathGenerator().getActiveVersionPath(),
String.valueOf(MetaDataVersion.DEFAULT_VERSION));
+
repository.persist(GlobalPropertiesNodePath.getVersionNodePathGenerator().getActiveVersionPath(),
String.valueOf(MetaDataVersion.INIT_VERSION));
}
metaDataVersionPersistService.switchActiveVersion(Collections.singleton(new
MetaDataVersion(GlobalPropertiesNodePath.getRootPath(), getActiveVersion(),
nextActiveVersion)));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
index bf71cc300e1..e8f6dac730d 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/TableMetaDataPersistService.java
@@ -67,7 +67,7 @@ public final class TableMetaDataPersistService {
public ShardingSphereTable load(final String databaseName, final String
schemaName, final String tableName) {
Integer activeVersion = getActiveVersion(databaseName, schemaName,
tableName);
String tableContent = repository.query(
-
TableMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName,
tableName).getVersionPath(null == activeVersion ?
MetaDataVersion.DEFAULT_VERSION : activeVersion));
+
TableMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName,
tableName).getVersionPath(null == activeVersion ? MetaDataVersion.INIT_VERSION
: activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(tableContent,
YamlShardingSphereTable.class));
}
@@ -87,7 +87,7 @@ public final class TableMetaDataPersistService {
TableMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName,
tableName).getVersionPath(nextActiveVersion),
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
if (null == getActiveVersion(databaseName, schemaName, tableName))
{
-
repository.persist(TableMetaDataNodePath.getVersionNodePathGenerator(databaseName,
schemaName, tableName).getActiveVersionPath(),
String.valueOf(MetaDataVersion.DEFAULT_VERSION));
+
repository.persist(TableMetaDataNodePath.getVersionNodePathGenerator(databaseName,
schemaName, tableName).getActiveVersionPath(),
String.valueOf(MetaDataVersion.INIT_VERSION));
}
metaDataVersions.add(
new
MetaDataVersion(TableMetaDataNodePath.getTablePath(databaseName, schemaName,
tableName), getActiveVersion(databaseName, schemaName, tableName),
nextActiveVersion));
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
index 54eee67306c..4226adb47b7 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/metadata/service/ViewMetaDataPersistService.java
@@ -67,7 +67,7 @@ public final class ViewMetaDataPersistService {
Integer activeVersion = getActiveVersion(databaseName, schemaName,
viewName);
String view =
repository.query(
-
ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName,
viewName).getVersionPath(null == activeVersion ?
MetaDataVersion.DEFAULT_VERSION : activeVersion));
+
ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName,
viewName).getVersionPath(null == activeVersion ? MetaDataVersion.INIT_VERSION :
activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(view,
YamlShardingSphereView.class));
}
@@ -86,7 +86,7 @@ public final class ViewMetaDataPersistService {
repository.persist(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName,
schemaName, viewName).getVersionPath(nextActiveVersion),
YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
if (null == getActiveVersion(databaseName, schemaName, viewName)) {
-
repository.persist(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName,
schemaName, viewName).getActiveVersionPath(),
String.valueOf(MetaDataVersion.DEFAULT_VERSION));
+
repository.persist(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName,
schemaName, viewName).getActiveVersionPath(),
String.valueOf(MetaDataVersion.INIT_VERSION));
}
metaDataVersions.add(new
MetaDataVersion(ViewMetaDataNodePath.getViewPath(databaseName, schemaName,
viewName), getActiveVersion(databaseName, schemaName, viewName),
nextActiveVersion));
}
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
index a6bf11dd97f..f65bdfeacc1 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/persist/version/MetaDataVersionPersistService.java
@@ -63,7 +63,7 @@ public final class MetaDataVersionPersistService {
*/
public int getNextVersion(final String path) {
List<Integer> versions = getVersions(path);
- return versions.isEmpty() ? MetaDataVersion.DEFAULT_VERSION :
versions.get(0) + 1;
+ return versions.isEmpty() ? MetaDataVersion.INIT_VERSION :
versions.get(0) + 1;
}
private List<Integer> getVersions(final String path) {
