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/02/08 11:27:18 UTC
(shardingsphere) branch master updated: Refactor ViewMetaDataPersistService (#34612)
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 3b2e5ef958d Refactor ViewMetaDataPersistService (#34612)
3b2e5ef958d is described below
commit 3b2e5ef958da50d81ac4b13402286ce7f1a425e3
Author: Liang Zhang <zh...@apache.org>
AuthorDate: Sat Feb 8 19:27:11 2025 +0800
Refactor ViewMetaDataPersistService (#34612)
* Refactor ViewMetaDataPersistService
* Refactor ViewMetaDataPersistService
---
.../service/ViewMetaDataPersistService.java | 28 ++++++----------------
.../metadata/ViewMetaDataPersistServiceTest.java | 2 --
2 files changed, 7 insertions(+), 23 deletions(-)
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 4226adb47b7..c7e404007dd 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
@@ -17,19 +17,17 @@
package org.apache.shardingsphere.mode.metadata.persist.metadata.service;
-import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereView;
-import org.apache.shardingsphere.infra.metadata.version.MetaDataVersion;
import org.apache.shardingsphere.infra.util.yaml.YamlEngine;
import org.apache.shardingsphere.infra.yaml.schema.pojo.YamlShardingSphereView;
import org.apache.shardingsphere.infra.yaml.schema.swapper.YamlViewSwapper;
import org.apache.shardingsphere.mode.metadata.persist.version.MetaDataVersionPersistService;
import org.apache.shardingsphere.mode.node.path.metadata.ViewMetaDataNodePath;
+import org.apache.shardingsphere.mode.node.path.version.VersionNodePathGenerator;
import org.apache.shardingsphere.mode.spi.repository.PersistRepository;
import java.util.Collection;
-import java.util.LinkedList;
import java.util.stream.Collectors;
/**
@@ -64,10 +62,8 @@ public final class ViewMetaDataPersistService {
* @return loaded view
*/
public ShardingSphereView load(final String databaseName, final String schemaName, final String viewName) {
- Integer activeVersion = getActiveVersion(databaseName, schemaName, viewName);
- String view =
- repository.query(
- ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName, viewName).getVersionPath(null == activeVersion ? MetaDataVersion.INIT_VERSION : activeVersion));
+ int activeVersion = Integer.parseInt(repository.query(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName, viewName).getActiveVersionPath()));
+ String view = repository.query(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName, viewName).getVersionPath(activeVersion));
return swapper.swapToObject(YamlEngine.unmarshal(view, YamlShardingSphereView.class));
}
@@ -79,23 +75,13 @@ public final class ViewMetaDataPersistService {
* @param views views
*/
public void persist(final String databaseName, final String schemaName, final Collection<ShardingSphereView> views) {
- Collection<MetaDataVersion> metaDataVersions = new LinkedList<>();
for (ShardingSphereView each : views) {
String viewName = each.getName().toLowerCase();
- int nextActiveVersion = metaDataVersionPersistService.getNextVersion(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName, viewName).getVersionsPath());
- 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.INIT_VERSION));
- }
- metaDataVersions.add(new MetaDataVersion(ViewMetaDataNodePath.getViewPath(databaseName, schemaName, viewName), getActiveVersion(databaseName, schemaName, viewName), nextActiveVersion));
+ VersionNodePathGenerator versionNodePathGenerator = ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName, viewName);
+ int nextVersion = metaDataVersionPersistService.getNextVersion(versionNodePathGenerator.getVersionsPath());
+ repository.persist(versionNodePathGenerator.getVersionPath(nextVersion), YamlEngine.marshal(swapper.swapToYamlConfiguration(each)));
+ metaDataVersionPersistService.switchActiveVersion(ViewMetaDataNodePath.getViewPath(databaseName, schemaName, viewName), nextVersion);
}
- metaDataVersionPersistService.switchActiveVersion(metaDataVersions);
- }
-
- private Integer getActiveVersion(final String databaseName, final String schemaName, final String viewName) {
- String value = repository.query(ViewMetaDataNodePath.getVersionNodePathGenerator(databaseName, schemaName, viewName).getActiveVersionPath());
- return Strings.isNullOrEmpty(value) ? null : Integer.parseInt(value);
}
/**
diff --git a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/ViewMetaDataPersistServiceTest.java b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/ViewMetaDataPersistServiceTest.java
index 5e6fc31ed25..de0ce404936 100644
--- a/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/ViewMetaDataPersistServiceTest.java
+++ b/mode/core/src/test/java/org/apache/shardingsphere/mode/metadata/persist/metadata/ViewMetaDataPersistServiceTest.java
@@ -62,7 +62,6 @@ class ViewMetaDataPersistServiceTest {
@Test
void assertPersistWithoutVersion() {
- when(repository.query("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version")).thenReturn("", "0");
ShardingSphereView view = mock(ShardingSphereView.class);
when(view.getName()).thenReturn("foo_view");
persistService.persist("foo_db", "foo_schema", Collections.singleton(view));
@@ -73,7 +72,6 @@ class ViewMetaDataPersistServiceTest {
@Test
void assertPersistWithVersion() {
when(repository.getChildrenKeys("/metadata/foo_db/schemas/foo_schema/views/foo_view/versions")).thenReturn(Collections.singletonList("10"));
- when(repository.query("/metadata/foo_db/schemas/foo_schema/views/foo_view/active_version")).thenReturn("10");
ShardingSphereView view = mock(ShardingSphereView.class);
when(view.getName()).thenReturn("foo_view");
persistService.persist("foo_db", "foo_schema", Collections.singleton(view));