Skip to content

Commit

Permalink
Refactor mode persist package (#34033)
Browse files Browse the repository at this point in the history
  • Loading branch information
@terrymanu
terrymanu authored Dec 12, 2024
1 parent ec5925c commit 2e2e400
Show file tree
Hide file tree
Showing 24 changed files with 32 additions and 24 deletions.
2 changes: 1 addition & 1 deletion .../org/apache/shardingsphere/schedule/core/job/statistics/collect/StatisticsCollectJob.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.shardingsphere.elasticjob.simple.job.SimpleJob;
import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.GlobalLockPersistService;
import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.spi.PersistRepository;
Expand Down
2 changes: 1 addition & 1 deletion ...ain/java/org/apache/shardingsphere/mode/manager/cluster/ClusterContextManagerBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.subscriber.ClusterDispatchEventSubscriberRegistry;
import org.apache.shardingsphere.mode.manager.cluster.exception.MissingRequiredClusterRepositoryConfigurationException;
import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener.DataChangedEventListenerRegistry;
import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.GlobalLockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.workerid.ClusterWorkerIdGenerator;
import org.apache.shardingsphere.mode.metadata.MetaDataContexts;
import org.apache.shardingsphere.mode.metadata.MetaDataContextsFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...dingsphere/mode/manager/cluster/event/dispatch/subscriber/ListenerAssistedSubscriber.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.event.dispatch.listener.DatabaseMetaDataChangedListener;
import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.GlobalLockPersistService;
import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;

Expand Down
2 changes: 1 addition & 1 deletion ...rdingsphere/mode/manager/cluster/event/dispatch/subscriber/MetaDataChangedSubscriber.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
import org.apache.shardingsphere.mode.event.dispatch.metadata.schema.view.DropViewEvent;
import org.apache.shardingsphere.mode.lock.GlobalLockContext;
import org.apache.shardingsphere.mode.manager.ContextManager;
import org.apache.shardingsphere.mode.manager.cluster.persist.GlobalLockPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.GlobalLockPersistService;
import org.apache.shardingsphere.mode.metadata.refresher.ShardingSphereStatisticsRefreshEngine;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;

Expand Down
4 changes: 3 additions & 1 deletion ...persist/ClusterPersistServiceBuilder.java → ...builder/ClusterPersistServiceBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.builder;

import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterMetaDataManagerPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterProcessPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ClusterMetaDataManagerPersistService.java → ...ClusterMetaDataManagerPersistService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
import org.apache.shardingsphere.infra.datasource.pool.destroyer.DataSourcePoolDestroyer;
Expand Down
2 changes: 1 addition & 1 deletion ...persist/ClusterProcessPersistService.java → ...service/ClusterProcessPersistService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.infra.executor.sql.process.Process;
Expand Down
2 changes: 1 addition & 1 deletion ...ter/persist/GlobalLockPersistService.java → ...ist/service/GlobalLockPersistService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.mode.lock.GlobalLockDefinition;
Expand Down
2 changes: 1 addition & 1 deletion ...er/persist/ReservationPersistService.java → ...st/service/ReservationPersistService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import lombok.RequiredArgsConstructor;
import org.apache.shardingsphere.metadata.persist.node.ReservationNode;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGenerator.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
import org.apache.shardingsphere.infra.exception.core.ShardingSpherePreconditions;
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdAssignedException;
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
import org.apache.shardingsphere.mode.manager.cluster.persist.ReservationPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.ReservationPersistService;
import org.apache.shardingsphere.mode.persist.service.ComputeNodePersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;

Expand Down
2 changes: 1 addition & 1 deletion ...es/META-INF/services/org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.
#

org.apache.shardingsphere.mode.manager.cluster.persist.ClusterPersistServiceBuilder
org.apache.shardingsphere.mode.manager.cluster.persist.builder.ClusterPersistServiceBuilder
4 changes: 3 additions & 1 deletion ...ist/ClusterPersistServiceBuilderTest.java → ...der/ClusterPersistServiceBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.builder;

import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterMetaDataManagerPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.ClusterProcessPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
import org.apache.shardingsphere.mode.spi.PersistRepository;
Expand Down
2 changes: 1 addition & 1 deletion ...terMetaDataManagerPersistServiceTest.java → ...terMetaDataManagerPersistServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...ist/ClusterProcessPersistServiceTest.java → ...ice/ClusterProcessPersistServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.lock.ProcessOperationLockRegistry;
Expand Down
2 changes: 1 addition & 1 deletion ...persist/GlobalLockPersistServiceTest.java → ...service/GlobalLockPersistServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import org.apache.shardingsphere.mode.lock.GlobalLockDefinition;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
Expand Down
2 changes: 1 addition & 1 deletion ...ersist/ReservationPersistServiceTest.java → ...ervice/ReservationPersistServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.cluster.persist;
package org.apache.shardingsphere.mode.manager.cluster.persist.service;

import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterRepositoryPersistException;
Expand Down
2 changes: 1 addition & 1 deletion ...org/apache/shardingsphere/mode/manager/cluster/workerid/ClusterWorkerIdGeneratorTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdAssignedException;
import org.apache.shardingsphere.infra.instance.workerid.WorkerIdGenerator;
import org.apache.shardingsphere.mode.manager.cluster.persist.ReservationPersistService;
import org.apache.shardingsphere.mode.manager.cluster.persist.service.ReservationPersistService;
import org.apache.shardingsphere.mode.persist.service.ComputeNodePersistService;
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepository;
import org.apache.shardingsphere.test.util.PropertiesBuilder;
Expand Down
4 changes: 3 additions & 1 deletion ...sist/StandalonePersistServiceBuilder.java → ...lder/StandalonePersistServiceBuilder.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,10 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.standalone.persist;
package org.apache.shardingsphere.mode.manager.standalone.persist.builder;

import org.apache.shardingsphere.mode.manager.standalone.persist.service.StandaloneMetaDataManagerPersistService;
import org.apache.shardingsphere.mode.manager.standalone.persist.service.StandaloneProcessPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.persist.service.MetaDataManagerPersistService;
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
Expand Down
2 changes: 1 addition & 1 deletion ...ndaloneMetaDataManagerPersistService.java → ...ndaloneMetaDataManagerPersistService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.standalone.persist;
package org.apache.shardingsphere.mode.manager.standalone.persist.service;

import com.google.common.base.Strings;
import org.apache.shardingsphere.infra.config.rule.RuleConfiguration;
Expand Down
2 changes: 1 addition & 1 deletion ...sist/StandaloneProcessPersistService.java → ...vice/StandaloneProcessPersistService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.standalone.persist;
package org.apache.shardingsphere.mode.manager.standalone.persist.service;

import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
Expand Down
2 changes: 1 addition & 1 deletion ...es/META-INF/services/org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# limitations under the License.
#

org.apache.shardingsphere.mode.manager.standalone.persist.StandalonePersistServiceBuilder
org.apache.shardingsphere.mode.manager.standalone.persist.builder.StandalonePersistServiceBuilder
4 changes: 3 additions & 1 deletion .../StandalonePersistServiceBuilderTest.java → .../StandalonePersistServiceBuilderTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.standalone.persist;
package org.apache.shardingsphere.mode.manager.standalone.persist.builder;

import org.apache.shardingsphere.infra.spi.type.typed.TypedSPILoader;
import org.apache.shardingsphere.mode.manager.standalone.persist.service.StandaloneMetaDataManagerPersistService;
import org.apache.shardingsphere.mode.manager.standalone.persist.service.StandaloneProcessPersistService;
import org.apache.shardingsphere.mode.metadata.MetaDataContextManager;
import org.apache.shardingsphere.mode.persist.service.PersistServiceBuilder;
import org.apache.shardingsphere.mode.spi.PersistRepository;
Expand Down
2 changes: 1 addition & 1 deletion ...oneMetaDataManagerPersistServiceTest.java → ...oneMetaDataManagerPersistServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.standalone.persist;
package org.apache.shardingsphere.mode.manager.standalone.persist.service;

import lombok.SneakyThrows;
import org.apache.shardingsphere.infra.config.props.ConfigurationProperties;
Expand Down
2 changes: 1 addition & 1 deletion .../StandaloneProcessPersistServiceTest.java → .../StandaloneProcessPersistServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
* limitations under the License.
*/

package org.apache.shardingsphere.mode.manager.standalone.persist;
package org.apache.shardingsphere.mode.manager.standalone.persist.service;

import org.apache.shardingsphere.infra.executor.sql.process.Process;
import org.apache.shardingsphere.infra.executor.sql.process.ProcessRegistry;
Expand Down

0 comments on commit 2e2e400

Please sign in to comment.