You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/04/26 11:25:41 UTC
[iotdb] branch master updated: [IOTDB-3012][De-Singleton-1] remove singleton pattern for some classes (#5672)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 506b515c83 [IOTDB-3012][De-Singleton-1] remove singleton pattern for some classes (#5672)
506b515c83 is described below
commit 506b515c83c934056effb1e0b33f86b6db158ab9
Author: Jianyun Cheng <ch...@360.cn>
AuthorDate: Tue Apr 26 19:25:36 2022 +0800
[IOTDB-3012][De-Singleton-1] remove singleton pattern for some classes (#5672)
---
.../apache/iotdb/cluster/server/ClusterRPCService.java | 5 -----
.../cluster/server/clusterinfo/ClusterInfoServer.java | 5 -----
.../cluster/server/raft/DataRaftHeartBeatService.java | 6 ------
.../iotdb/cluster/server/raft/DataRaftService.java | 6 ------
.../cluster/server/raft/MetaRaftHeartBeatService.java | 6 ------
.../iotdb/cluster/server/raft/MetaRaftService.java | 6 ------
.../org/apache/iotdb/confignode/service/ConfigNode.java | 17 ++---------------
.../iotdb/confignode/service/ConfigNodeCommandLine.java | 2 +-
.../confignode/service/thrift/ConfigNodeRPCService.java | 9 ---------
.../confignode/utils/ConfigNodeEnvironmentUtils.java | 4 ++--
.../org/apache/iotdb/commons/service/ThriftService.java | 4 +---
.../apache/iotdb/procedure/service/ProcedureServer.java | 5 -----
.../apache/iotdb/db/mpp/buffer/DataBlockService.java | 5 -----
.../org/apache/iotdb/db/service/InfluxDBRPCService.java | 5 -----
.../org/apache/iotdb/db/service/InternalService.java | 5 -----
.../java/org/apache/iotdb/db/service/RPCService.java | 5 -----
.../sync/transport/server/TransportServerManager.java | 5 -----
17 files changed, 6 insertions(+), 94 deletions(-)
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterRPCService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterRPCService.java
index dfb957b71f..7bdb9de7a2 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterRPCService.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/ClusterRPCService.java
@@ -38,11 +38,6 @@ public class ClusterRPCService extends ThriftService implements ClusterRPCServic
private ClusterRPCService() {}
- @Override
- public ThriftService getImplementation() {
- return ClusterRPCServiceHolder.INSTANCE;
- }
-
@Override
public ServiceType getID() {
return ServiceType.CLUSTER_RPC_SERVICE;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/clusterinfo/ClusterInfoServer.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/clusterinfo/ClusterInfoServer.java
index d931274be2..d525790f4f 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/clusterinfo/ClusterInfoServer.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/clusterinfo/ClusterInfoServer.java
@@ -42,11 +42,6 @@ public class ClusterInfoServer extends ThriftService implements ClusterInfoServe
return ServiceType.CLUSTER_INFO_SERVICE;
}
- @Override
- public ThriftService getImplementation() {
- return getInstance();
- }
-
@Override
public void initTProcessor() {
initSyncedServiceImpl(null);
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftHeartBeatService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftHeartBeatService.java
index f9de563a4d..b70851618c 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftHeartBeatService.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftHeartBeatService.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.cluster.utils.ClusterUtils;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.service.ServiceType;
-import org.apache.iotdb.commons.service.ThriftService;
import org.apache.iotdb.commons.service.ThriftServiceThread;
public class DataRaftHeartBeatService extends AbstractDataRaftService
@@ -31,11 +30,6 @@ public class DataRaftHeartBeatService extends AbstractDataRaftService
private DataRaftHeartBeatService() {}
- @Override
- public ThriftService getImplementation() {
- return DataRaftHeartBeatServiceHolder.INSTANCE;
- }
-
@Override
public ServiceType getID() {
return ServiceType.CLUSTER_DATA_HEART_BEAT_RPC_SERVICE;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftService.java
index b855ef8d0f..b449730386 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftService.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/DataRaftService.java
@@ -22,18 +22,12 @@ package org.apache.iotdb.cluster.server.raft;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.service.ServiceType;
-import org.apache.iotdb.commons.service.ThriftService;
import org.apache.iotdb.commons.service.ThriftServiceThread;
public class DataRaftService extends AbstractDataRaftService implements DataRaftServiceMBean {
private DataRaftService() {}
- @Override
- public ThriftService getImplementation() {
- return DataRaftServiceHolder.INSTANCE;
- }
-
@Override
public ServiceType getID() {
return ServiceType.CLUSTER_DATA_RPC_SERVICE;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftHeartBeatService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftHeartBeatService.java
index 85c1d5b55b..5166b56b22 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftHeartBeatService.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftHeartBeatService.java
@@ -23,7 +23,6 @@ import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.cluster.utils.ClusterUtils;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.service.ServiceType;
-import org.apache.iotdb.commons.service.ThriftService;
import org.apache.iotdb.commons.service.ThriftServiceThread;
public class MetaRaftHeartBeatService extends AbstractMetaRaftService
@@ -31,11 +30,6 @@ public class MetaRaftHeartBeatService extends AbstractMetaRaftService
private MetaRaftHeartBeatService() {}
- @Override
- public ThriftService getImplementation() {
- return MetaRaftHeartBeatServiceHolder.INSTANCE;
- }
-
@Override
public ServiceType getID() {
return ServiceType.CLUSTER_META_HEART_BEAT_RPC_SERVICE;
diff --git a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftService.java b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftService.java
index 2793ca3efa..a7eff19b76 100644
--- a/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftService.java
+++ b/cluster/src/main/java/org/apache/iotdb/cluster/server/raft/MetaRaftService.java
@@ -22,18 +22,12 @@ package org.apache.iotdb.cluster.server.raft;
import org.apache.iotdb.cluster.config.ClusterDescriptor;
import org.apache.iotdb.commons.concurrent.ThreadName;
import org.apache.iotdb.commons.service.ServiceType;
-import org.apache.iotdb.commons.service.ThriftService;
import org.apache.iotdb.commons.service.ThriftServiceThread;
public class MetaRaftService extends AbstractMetaRaftService implements MetaRaftServiceMBean {
private MetaRaftService() {}
- @Override
- public ThriftService getImplementation() {
- return MetaRaftServiceHolder.INSTANCE;
- }
-
@Override
public ServiceType getID() {
return ServiceType.CLUSTER_META_RPC_SERVICE;
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
index ced863471f..9dbb4b30bc 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNode.java
@@ -47,7 +47,7 @@ public class ConfigNode implements ConfigNodeMBean {
private ConfigManager configManager;
- private ConfigNode() {
+ public ConfigNode() {
this.configNodeRPCService = new ConfigNodeRPCService();
try {
@@ -67,7 +67,7 @@ public class ConfigNode implements ConfigNodeMBean {
private void setUp() throws StartupException, IOException {
LOGGER.info("Setting up {}...", ConfigNodeConstant.GLOBAL_NAME);
registerManager.register(new JMXService());
- JMXService.registerMBean(getInstance(), mbeanName);
+ JMXService.registerMBean(this, mbeanName);
configNodeRPCService.initSyncedServiceImpl(new ConfigNodeRPCServiceProcessor(configManager));
registerManager.register(configNodeRPCService);
@@ -104,17 +104,4 @@ public class ConfigNode implements ConfigNodeMBean {
public void stop() {
deactivate();
}
-
- private static class ConfigNodeHolder {
-
- private static final ConfigNode INSTANCE = new ConfigNode();
-
- private ConfigNodeHolder() {
- // empty constructor
- }
- }
-
- public static ConfigNode getInstance() {
- return ConfigNodeHolder.INSTANCE;
- }
}
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
index 52894d3968..05c997f4eb 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/ConfigNodeCommandLine.java
@@ -76,7 +76,7 @@ public class ConfigNodeCommandLine extends ServerCommandLine {
LOGGER.error("Meet error when doing start checking", e);
return -1;
}
- ConfigNode configNode = ConfigNode.getInstance();
+ ConfigNode configNode = new ConfigNode();
configNode.active();
} else if (MODE_ADD.equals(mode)) {
// TODO: add node
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
index 90016df031..7f73117c61 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCService.java
@@ -35,15 +35,6 @@ public class ConfigNodeRPCService extends ThriftService implements ConfigNodeRPC
private ConfigNodeRPCServiceProcessor configNodeRPCServiceProcessor;
- public ConfigNodeRPCService() {
- // Empty constructor
- }
-
- @Override
- public ThriftService getImplementation() {
- return this;
- }
-
@Override
public ServiceType getID() {
return ServiceType.CONFIG_NODE_SERVICE;
diff --git a/confignode/src/test/java/org/apache/iotdb/confignode/utils/ConfigNodeEnvironmentUtils.java b/confignode/src/test/java/org/apache/iotdb/confignode/utils/ConfigNodeEnvironmentUtils.java
index cd775c8708..c178aadb1d 100644
--- a/confignode/src/test/java/org/apache/iotdb/confignode/utils/ConfigNodeEnvironmentUtils.java
+++ b/confignode/src/test/java/org/apache/iotdb/confignode/utils/ConfigNodeEnvironmentUtils.java
@@ -44,7 +44,7 @@ public class ConfigNodeEnvironmentUtils {
LOGGER.debug("ConfigNodeEnvironmentUtils setup...");
if (daemon == null) {
- daemon = ConfigNode.getInstance();
+ daemon = new ConfigNode();
}
try {
@@ -93,7 +93,7 @@ public class ConfigNodeEnvironmentUtils {
@TestOnly
public static void reactiveDaemon() {
if (daemon == null) {
- daemon = ConfigNode.getInstance();
+ daemon = new ConfigNode();
daemon.active();
} else {
activeDaemon();
diff --git a/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java b/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
index 30d75a94eb..5a4e6d8eaa 100644
--- a/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
+++ b/node-commons/src/main/java/org/apache/iotdb/commons/service/ThriftService.java
@@ -63,11 +63,9 @@ public abstract class ThriftService implements IService {
}
}
- public abstract ThriftService getImplementation();
-
@Override
public void start() throws StartupException {
- JMXService.registerMBean(getImplementation(), mbeanName);
+ JMXService.registerMBean(this, mbeanName);
startService();
}
diff --git a/procedure/src/main/java/org/apache/iotdb/procedure/service/ProcedureServer.java b/procedure/src/main/java/org/apache/iotdb/procedure/service/ProcedureServer.java
index 2da216e66e..33b0a55e95 100644
--- a/procedure/src/main/java/org/apache/iotdb/procedure/service/ProcedureServer.java
+++ b/procedure/src/main/java/org/apache/iotdb/procedure/service/ProcedureServer.java
@@ -72,11 +72,6 @@ public class ProcedureServer extends ThriftService implements ProcedureNodeMBean
return ServiceType.PROCEDURE_SERVICE;
}
- @Override
- public ThriftService getImplementation() {
- return ProcedureServer.getInstance();
- }
-
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
diff --git a/server/src/main/java/org/apache/iotdb/db/mpp/buffer/DataBlockService.java b/server/src/main/java/org/apache/iotdb/db/mpp/buffer/DataBlockService.java
index cabb725b95..affc738f77 100644
--- a/server/src/main/java/org/apache/iotdb/db/mpp/buffer/DataBlockService.java
+++ b/server/src/main/java/org/apache/iotdb/db/mpp/buffer/DataBlockService.java
@@ -42,11 +42,6 @@ public class DataBlockService extends ThriftService implements DataBlockServiceM
private DataBlockService() {}
- @Override
- public ThriftService getImplementation() {
- return DataBlockManagerServiceHolder.INSTANCE;
- }
-
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java b/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java
index 146a13317c..4f3ffe3ccb 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/InfluxDBRPCService.java
@@ -37,11 +37,6 @@ public class InfluxDBRPCService extends ThriftService implements InfluxDBRPCServ
return InfluxDBServiceHolder.INSTANCE;
}
- @Override
- public ThriftService getImplementation() {
- return getInstance();
- }
-
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/InternalService.java b/server/src/main/java/org/apache/iotdb/db/service/InternalService.java
index fbe6c4634e..7ce1aef254 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/InternalService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/InternalService.java
@@ -41,11 +41,6 @@ public class InternalService extends ThriftService implements InternalServiceMBe
return ServiceType.INTERNAL_SERVICE;
}
- @Override
- public ThriftService getImplementation() {
- return InternalServiceHolder.INSTANCE;
- }
-
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException {
diff --git a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
index 0080857171..9658e85427 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/RPCService.java
@@ -42,11 +42,6 @@ public class RPCService extends ThriftService implements RPCServiceMBean {
return RPCServiceHolder.INSTANCE;
}
- @Override
- public ThriftService getImplementation() {
- return getInstance();
- }
-
@Override
public void initTProcessor()
throws ClassNotFoundException, IllegalAccessException, InstantiationException,
diff --git a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/TransportServerManager.java b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/TransportServerManager.java
index d765c85b16..91e0d27765 100644
--- a/server/src/main/java/org/apache/iotdb/db/sync/transport/server/TransportServerManager.java
+++ b/server/src/main/java/org/apache/iotdb/db/sync/transport/server/TransportServerManager.java
@@ -62,11 +62,6 @@ public class TransportServerManager extends ThriftService
return ServiceType.SYNC_SERVICE;
}
- @Override
- public ThriftService getImplementation() {
- return getInstance();
- }
-
@Override
public void initTProcessor() {
initSyncedServiceImpl(null);