You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@shardingsphere.apache.org by pa...@apache.org on 2022/10/14 03:37:26 UTC
[shardingsphere] branch master updated: Remove TransactionOperation (#21551)
This is an automated email from the ASF dual-hosted git repository.
panjuan 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 0eaf90f83e8 Remove TransactionOperation (#21551)
0eaf90f83e8 is described below
commit 0eaf90f83e8c65fe365ec2e95ca70b1ed76cb923
Author: zhaojinchao <zh...@apache.org>
AuthorDate: Fri Oct 14 11:37:15 2022 +0800
Remove TransactionOperation (#21551)
---
.../fixture/FixtureClusterPersistRepository.java | 5 --
.../fixture/ClusterPersistRepositoryFixture.java | 5 --
...ProcessListClusterPersistRepositoryFixture.java | 5 --
.../cluster/ClusterPersistRepository.java | 10 ---
.../cluster/transaction/TransactionOperation.java | 88 ----------------------
.../cluster/consul/ConsulRepository.java | 6 --
.../repository/cluster/etcd/EtcdRepository.java | 6 --
.../repository/cluster/nacos/NacosRepository.java | 6 --
.../zookeeper/CuratorZookeeperRepository.java | 38 ----------
.../fixture/ClusterPersistRepositoryFixture.java | 5 --
.../fixture/TestClusterPersistRepository.java | 5 --
11 files changed, 179 deletions(-)
diff --git a/jdbc/spring/core/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java b/jdbc/spring/core/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
index 336b5ba356f..342c1bae36f 100644
--- a/jdbc/spring/core/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
+++ b/jdbc/spring/core/shardingsphere-jdbc-core-spring-namespace/src/test/java/org/apache/shardingsphere/spring/namespace/fixture/FixtureClusterPersistRepository.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.LeaderExecutionCallback;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -61,10 +60,6 @@ public final class FixtureClusterPersistRepository implements ClusterPersistRepo
public void executeInLeader(final String key, final LeaderExecutionCallback callback) {
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
index 3c6f7a93159..8c95570623f 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/fixture/ClusterPersistRepositoryFixture.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.LeaderExecutionCallback;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collections;
import java.util.List;
@@ -55,10 +54,6 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
public void executeInLeader(final String key, final LeaderExecutionCallback callback) {
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
}
diff --git a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
index 1c47bb6509d..8bcdb7dfb0b 100644
--- a/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
+++ b/mode/type/cluster/core/src/test/java/org/apache/shardingsphere/mode/manager/cluster/coordinator/registry/process/ProcessListClusterPersistRepositoryFixture.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.LeaderExecutionCallback;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -59,10 +58,6 @@ public final class ProcessListClusterPersistRepositoryFixture implements Cluster
public void executeInLeader(final String key, final LeaderExecutionCallback callback) {
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
}
diff --git a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
index 0c042b7c5e3..efe3adb04d7 100644
--- a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
+++ b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/ClusterPersistRepository.java
@@ -19,9 +19,7 @@ package org.apache.shardingsphere.mode.repository.cluster;
import org.apache.shardingsphere.mode.persist.PersistRepository;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
-import java.util.List;
import java.util.concurrent.Executor;
/**
@@ -89,14 +87,6 @@ public interface ClusterPersistRepository extends PersistRepository {
*/
void executeInLeader(String key, LeaderExecutionCallback callback);
- /**
- * Execute oprations in transaction.
- *
- * @param transactionOperations operations
- * @throws Exception exception
- */
- void executeInTransaction(List<TransactionOperation> transactionOperations) throws Exception;
-
/**
* Update data in transaction.
*
diff --git a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/transaction/TransactionOperation.java b/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/transaction/TransactionOperation.java
deleted file mode 100644
index db2c0d90293..00000000000
--- a/mode/type/cluster/repository/api/src/main/java/org/apache/shardingsphere/mode/repository/cluster/transaction/TransactionOperation.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.shardingsphere.mode.repository.cluster.transaction;
-
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.ToString;
-
-@RequiredArgsConstructor(access = AccessLevel.PRIVATE)
-@Getter
-@ToString
-public final class TransactionOperation {
-
- public enum Type {
-
- CHECK_EXISTS,
-
- ADD,
-
- UPDATE,
-
- DELETE
- }
-
- private final Type type;
-
- private final String key;
-
- private final String value;
-
- /**
- * Operation add.
- *
- * @param key key
- * @param value value
- * @return TransactionOperation
- */
- public static TransactionOperation opAdd(final String key, final String value) {
- return new TransactionOperation(Type.ADD, key, value);
- }
-
- /**
- * Operation update.
- *
- * @param key key
- * @param value value
- * @return TransactionOperation
- */
- public static TransactionOperation opUpdate(final String key, final String value) {
- return new TransactionOperation(Type.UPDATE, key, value);
- }
-
- /**
- * Operation delete.
- *
- * @param key key
- * @return TransactionOperation
- */
- public static TransactionOperation opDelete(final String key) {
- return new TransactionOperation(Type.DELETE, key, null);
- }
-
- /**
- * Operation check exists.
- *
- * @param key key
- * @return TransactionOperation
- */
- public static TransactionOperation opCheckExists(final String key) {
- return new TransactionOperation(Type.CHECK_EXISTS, key, null);
- }
-}
diff --git a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java
index ac2200f5819..40168650322 100644
--- a/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java
+++ b/mode/type/cluster/repository/provider/consul/src/main/java/org/apache/shardingsphere/mode/repository/cluster/consul/ConsulRepository.java
@@ -32,7 +32,6 @@ import org.apache.shardingsphere.mode.repository.cluster.consul.props.ConsulProp
import org.apache.shardingsphere.mode.repository.cluster.consul.props.ConsulPropertyKey;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collection;
import java.util.Collections;
@@ -90,11 +89,6 @@ public class ConsulRepository implements ClusterPersistRepository {
// TODO
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- // TODO
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
// TODO
diff --git a/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java b/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
index d4a3d0427cc..d7c3c3441b9 100644
--- a/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
+++ b/mode/type/cluster/repository/provider/etcd/src/main/java/org/apache/shardingsphere/mode/repository/cluster/etcd/EtcdRepository.java
@@ -40,7 +40,6 @@ import org.apache.shardingsphere.mode.repository.cluster.etcd.props.EtcdProperty
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.nio.charset.StandardCharsets;
import java.util.List;
@@ -96,11 +95,6 @@ public final class EtcdRepository implements ClusterPersistRepository {
// TODO
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- // TODO
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
// TODO
diff --git a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
index 6b463020e33..cabc0e96183 100644
--- a/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
+++ b/mode/type/cluster/repository/provider/nacos/src/main/java/org/apache/shardingsphere/mode/repository/cluster/nacos/NacosRepository.java
@@ -40,7 +40,6 @@ import org.apache.shardingsphere.mode.repository.cluster.nacos.listener.NamingEv
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosProperties;
import org.apache.shardingsphere.mode.repository.cluster.nacos.props.NacosPropertyKey;
import org.apache.shardingsphere.mode.repository.cluster.nacos.utils.NacosMetaDataUtil;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collection;
import java.util.Comparator;
@@ -102,11 +101,6 @@ public final class NacosRepository implements ClusterPersistRepository {
// TODO
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- // TODO
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
// TODO
diff --git a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
index 98125f0855b..b791f6a2d39 100644
--- a/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
+++ b/mode/type/cluster/repository/provider/zookeeper-curator/src/main/java/org/apache/shardingsphere/mode/repository/cluster/zookeeper/CuratorZookeeperRepository.java
@@ -23,7 +23,6 @@ import org.apache.curator.framework.CuratorFramework;
import org.apache.curator.framework.CuratorFrameworkFactory;
import org.apache.curator.framework.CuratorFrameworkFactory.Builder;
import org.apache.curator.framework.api.ACLProvider;
-import org.apache.curator.framework.api.transaction.CuratorOp;
import org.apache.curator.framework.api.transaction.TransactionOp;
import org.apache.curator.framework.recipes.cache.ChildData;
import org.apache.curator.framework.recipes.cache.CuratorCache;
@@ -40,7 +39,6 @@ import org.apache.shardingsphere.mode.repository.cluster.exception.ClusterPersis
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEvent.Type;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.handler.CuratorZookeeperExceptionHandler;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.listener.SessionConnectionListener;
import org.apache.shardingsphere.mode.repository.cluster.zookeeper.lock.ZookeeperInternalLockProvider;
@@ -54,7 +52,6 @@ import org.apache.zookeeper.data.ACL;
import org.apache.zookeeper.data.Stat;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Optional;
import java.util.List;
@@ -178,41 +175,6 @@ public final class CuratorZookeeperRepository implements ClusterPersistRepositor
// TODO
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) throws Exception {
- client.transaction().forOperations(toCuratorOps(transactionOperations));
- }
-
- private List<CuratorOp> toCuratorOps(final List<TransactionOperation> transactionOperations) {
- List<CuratorOp> result = new ArrayList<>(transactionOperations.size());
- TransactionOp transactionOp = client.transactionOp();
- for (TransactionOperation each : transactionOperations) {
- result.add(toCuratorOp(each, transactionOp));
- }
- return result;
- }
-
- private CuratorOp toCuratorOp(final TransactionOperation each, final TransactionOp transactionOp) {
- try {
- switch (each.getType()) {
- case CHECK_EXISTS:
- return transactionOp.check().forPath(each.getKey());
- case ADD:
- return transactionOp.create().forPath(each.getKey(), each.getValue().getBytes(StandardCharsets.UTF_8));
- case UPDATE:
- return transactionOp.setData().forPath(each.getKey(), each.getValue().getBytes(StandardCharsets.UTF_8));
- case DELETE:
- return transactionOp.delete().forPath(each.getKey());
- default:
- throw new UnsupportedOperationException(each.toString());
- }
- // CHECKSTYLE:OFF
- } catch (final Exception ex) {
- // CHECKSTYLE:ON
- throw new ClusterPersistRepositoryException(ex);
- }
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
try {
diff --git a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
index 437ec156d15..42ff8bfdea7 100644
--- a/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
+++ b/proxy/bootstrap/src/test/java/org/apache/shardingsphere/proxy/fixture/ClusterPersistRepositoryFixture.java
@@ -21,7 +21,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.LeaderExecutionCallback;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -59,10 +58,6 @@ public final class ClusterPersistRepositoryFixture implements ClusterPersistRepo
public void executeInLeader(final String key, final LeaderExecutionCallback callback) {
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
}
diff --git a/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java b/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
index cd3d79abac0..09db0feafaf 100644
--- a/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
+++ b/test/integration-driver-test/src/test/java/org/apache/shardingsphere/driver/fixture/TestClusterPersistRepository.java
@@ -22,7 +22,6 @@ import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositor
import org.apache.shardingsphere.mode.repository.cluster.ClusterPersistRepositoryConfiguration;
import org.apache.shardingsphere.mode.repository.cluster.LeaderExecutionCallback;
import org.apache.shardingsphere.mode.repository.cluster.listener.DataChangedEventListener;
-import org.apache.shardingsphere.mode.repository.cluster.transaction.TransactionOperation;
import java.util.Collections;
import java.util.LinkedHashMap;
@@ -61,10 +60,6 @@ public final class TestClusterPersistRepository implements ClusterPersistReposit
public void executeInLeader(final String key, final LeaderExecutionCallback callback) {
}
- @Override
- public void executeInTransaction(final List<TransactionOperation> transactionOperations) {
- }
-
@Override
public void updateInTransaction(final String key, final String value) {
}