This is an automated email from the ASF dual-hosted git repository.
chengzhang 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 822dd55ca65 Move MetaDataContextManager from service to mode metadata
package (#31777)
822dd55ca65 is described below
commit 822dd55ca656201ee1a1a6f4e560cd9d771bd871
Author: Haoran Meng <[email protected]>
AuthorDate: Thu Jun 20 17:33:54 2024 +0800
Move MetaDataContextManager from service to mode metadata package (#31777)
---
.../apache/shardingsphere/mode/manager/ContextManager.java | 4 ++--
.../mode/{service => metadata}/MetaDataContextManager.java | 12 ++++++------
.../{service => metadata}/manager/ConfigurationManager.java | 2 +-
.../manager/ResourceMetaDataManager.java | 2 +-
.../mode/{service => metadata}/manager/RuleItemManager.java | 2 +-
.../manager/ShardingSphereDatabaseManager.java | 2 +-
.../service/StandaloneMetaDataManagerPersistService.java | 2 +-
7 files changed, 13 insertions(+), 13 deletions(-)
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
index 95b841c2dc4..31696171b14 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/manager/ContextManager.java
@@ -46,9 +46,9 @@ import
org.apache.shardingsphere.mode.manager.switcher.ResourceSwitchManager;
import org.apache.shardingsphere.mode.manager.switcher.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
-import org.apache.shardingsphere.mode.service.MetaDataContextManager;
+import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.service.PersistServiceFacade;
-import org.apache.shardingsphere.mode.service.manager.ConfigurationManager;
+import org.apache.shardingsphere.mode.metadata.manager.ConfigurationManager;
import org.apache.shardingsphere.mode.spi.PersistRepository;
import org.apache.shardingsphere.mode.state.StateContext;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/MetaDataContextManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
similarity index 82%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/service/MetaDataContextManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
index 8451bc82891..4760a2f8361 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/MetaDataContextManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/MetaDataContextManager.java
@@ -15,15 +15,15 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.service;
+package org.apache.shardingsphere.mode.metadata;
import lombok.Getter;
import org.apache.shardingsphere.infra.instance.ComputeNodeInstanceContext;
-import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
-import org.apache.shardingsphere.mode.service.manager.ConfigurationManager;
-import org.apache.shardingsphere.mode.service.manager.ResourceMetaDataManager;
-import org.apache.shardingsphere.mode.service.manager.RuleItemManager;
-import
org.apache.shardingsphere.mode.service.manager.ShardingSphereDatabaseManager;
+import org.apache.shardingsphere.mode.metadata.manager.ConfigurationManager;
+import org.apache.shardingsphere.mode.metadata.manager.ResourceMetaDataManager;
+import org.apache.shardingsphere.mode.metadata.manager.RuleItemManager;
+import
org.apache.shardingsphere.mode.metadata.manager.ShardingSphereDatabaseManager;
+import org.apache.shardingsphere.mode.service.PersistServiceFacade;
import java.util.concurrent.atomic.AtomicReference;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ConfigurationManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ConfigurationManager.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ConfigurationManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ConfigurationManager.java
index 7210969eaaa..db6ae218f66 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ConfigurationManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ConfigurationManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.service.manager;
+package org.apache.shardingsphere.mode.metadata.manager;
import lombok.RequiredArgsConstructor;
import lombok.SneakyThrows;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ResourceMetaDataManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceMetaDataManager.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ResourceMetaDataManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceMetaDataManager.java
index 5cd635ec582..59f4eb8066b 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ResourceMetaDataManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ResourceMetaDataManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.service.manager;
+package org.apache.shardingsphere.mode.metadata.manager;
import com.google.common.base.Strings;
import lombok.RequiredArgsConstructor;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/RuleItemManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
similarity index 98%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/RuleItemManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
index 69b17a9da94..0ca59ecb096 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/RuleItemManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/RuleItemManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.service.manager;
+package org.apache.shardingsphere.mode.metadata.manager;
import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
diff --git
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ShardingSphereDatabaseManager.java
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseManager.java
similarity index 99%
rename from
mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ShardingSphereDatabaseManager.java
rename to
mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseManager.java
index 88839913a57..e00e7769a5c 100644
---
a/mode/core/src/main/java/org/apache/shardingsphere/mode/service/manager/ShardingSphereDatabaseManager.java
+++
b/mode/core/src/main/java/org/apache/shardingsphere/mode/metadata/manager/ShardingSphereDatabaseManager.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.shardingsphere.mode.service.manager;
+package org.apache.shardingsphere.mode.metadata.manager;
import lombok.RequiredArgsConstructor;
import
org.apache.shardingsphere.infra.metadata.database.schema.model.ShardingSphereColumn;
diff --git
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandaloneMetaDataManagerPersistService.java
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandaloneMetaDataManagerPersistService.java
index 0edcdfbc62c..619157a8ad1 100644
---
a/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandaloneMetaDataManagerPersistService.java
+++
b/mode/type/standalone/core/src/main/java/org/apache/shardingsphere/mode/manager/standalone/service/StandaloneMetaDataManagerPersistService.java
@@ -45,7 +45,7 @@ import
org.apache.shardingsphere.mode.manager.switcher.SwitchingResource;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import
org.apache.shardingsphere.mode.metadata.builder.RuleConfigurationEventBuilder;
import
org.apache.shardingsphere.mode.metadata.refresher.util.TableRefreshUtils;
-import org.apache.shardingsphere.mode.service.manager.ConfigurationManager;
+import org.apache.shardingsphere.mode.metadata.manager.ConfigurationManager;
import
org.apache.shardingsphere.mode.service.persist.MetaDataManagerPersistService;
import org.apache.shardingsphere.single.api.config.SingleRuleConfiguration;
