Change all daos to be services.

apache · Nov 15, 2017 · c10b7b1 · c10b7b1
1 parent b744d40
commit c10b7b1
Show file tree

Hide file tree

Showing 117 changed files with 787 additions and 689 deletions.
diff --git a/...java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java b/...java/org/skywalking/apm/collector/agent/stream/worker/jvm/CpuMetricPersistenceWorker.java
@@ -23,7 +23,6 @@
 import org.skywalking.apm.collector.storage.StorageModule;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.skywalking.apm.collector.storage.dao.ICpuMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
 import org.skywalking.apm.collector.storage.table.jvm.CpuMetric;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
 import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -46,7 +45,7 @@ public CpuMetricPersistenceWorker(ModuleManager moduleManager) {
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {
-        return getModuleManager().find(StorageModule.NAME).getService(DAOService.class).getPersistenceDAO(ICpuMetricPersistenceDAO.class);
+        return getModuleManager().find(StorageModule.NAME).getService(ICpuMetricPersistenceDAO.class);
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<CpuMetric, CpuMetric, CpuMetricPersistenceWorker> {

diff --git a/.../java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java b/.../java/org/skywalking/apm/collector/agent/stream/worker/jvm/GCMetricPersistenceWorker.java
@@ -23,7 +23,6 @@
 import org.skywalking.apm.collector.storage.StorageModule;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.skywalking.apm.collector.storage.dao.IGCMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
 import org.skywalking.apm.collector.storage.table.jvm.GCMetric;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
 import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@
  */
 public class GCMetricPersistenceWorker extends PersistenceWorker<GCMetric, GCMetric> {
 
-    private final DAOService daoService;
-
     public GCMetricPersistenceWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
     }
 
     @Override public int id() {
@@ -49,7 +45,7 @@ public GCMetricPersistenceWorker(ModuleManager moduleManager) {
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {
-        return daoService.getPersistenceDAO(IGCMetricPersistenceDAO.class);
+        return getModuleManager().find(StorageModule.NAME).getService(IGCMetricPersistenceDAO.class);
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<GCMetric, GCMetric, GCMetricPersistenceWorker> {

diff --git a/.../org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java b/.../org/skywalking/apm/collector/agent/stream/worker/jvm/InstHeartBeatPersistenceWorker.java
@@ -23,7 +23,6 @@
 import org.skywalking.apm.collector.storage.StorageModule;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatPersistenceDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
 import org.skywalking.apm.collector.storage.table.register.Instance;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
 import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@
  */
 public class InstHeartBeatPersistenceWorker extends PersistenceWorker<Instance, Instance> {
 
-    private final DAOService daoService;
-
     public InstHeartBeatPersistenceWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
     }
 
     @Override public int id() {
@@ -49,7 +45,7 @@ public InstHeartBeatPersistenceWorker(ModuleManager moduleManager) {
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {
-        return daoService.getPersistenceDAO(IInstanceHeartBeatPersistenceDAO.class);
+        return getModuleManager().find(StorageModule.NAME).getService(IInstanceHeartBeatPersistenceDAO.class);
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<Instance, Instance, InstHeartBeatPersistenceWorker> {

diff --git a/...a/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java b/...a/org/skywalking/apm/collector/agent/stream/worker/jvm/MemoryMetricPersistenceWorker.java
@@ -23,7 +23,6 @@
 import org.skywalking.apm.collector.storage.StorageModule;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.skywalking.apm.collector.storage.dao.IMemoryMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
 import org.skywalking.apm.collector.storage.table.jvm.MemoryMetric;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
 import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@
  */
 public class MemoryMetricPersistenceWorker extends PersistenceWorker<MemoryMetric, MemoryMetric> {
 
-    private final DAOService daoService;
-
     public MemoryMetricPersistenceWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
     }
 
     @Override public int id() {
@@ -49,7 +45,7 @@ public MemoryMetricPersistenceWorker(ModuleManager moduleManager) {
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {
-        return daoService.getPersistenceDAO(IMemoryMetricPersistenceDAO.class);
+        return getModuleManager().find(StorageModule.NAME).getService(IMemoryMetricPersistenceDAO.class);
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<MemoryMetric, MemoryMetric, MemoryMetricPersistenceWorker> {

diff --git a/...g/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java b/...g/skywalking/apm/collector/agent/stream/worker/jvm/MemoryPoolMetricPersistenceWorker.java
@@ -23,7 +23,6 @@
 import org.skywalking.apm.collector.storage.StorageModule;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricPersistenceDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
 import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetric;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
 import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -37,19 +36,16 @@ public class MemoryPoolMetricPersistenceWorker extends PersistenceWorker<MemoryP
         return 0;
     }
 
-    private final DAOService daoService;
-
     public MemoryPoolMetricPersistenceWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
     }
 
     @Override protected boolean needMergeDBData() {
         return false;
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {
-        return daoService.getPersistenceDAO(IMemoryPoolMetricPersistenceDAO.class);
+        return getModuleManager().find(StorageModule.NAME).getService(IMemoryPoolMetricPersistenceDAO.class);
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<MemoryPoolMetric, MemoryPoolMetric, MemoryPoolMetricPersistenceWorker> {

diff --git a/...kywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java b/...kywalking/apm/collector/agent/stream/worker/register/ApplicationRegisterSerialWorker.java
@@ -25,8 +25,7 @@
 import org.skywalking.apm.collector.core.util.Const;
 import org.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IApplicationStreamDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
+import org.skywalking.apm.collector.storage.dao.IApplicationRegisterDAO;
 import org.skywalking.apm.collector.storage.table.register.Application;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
@@ -41,12 +40,12 @@ public class ApplicationRegisterSerialWorker extends AbstractLocalAsyncWorker<Ap
 
     private final Logger logger = LoggerFactory.getLogger(ApplicationRegisterSerialWorker.class);
 
-    private final DAOService daoService;
+    private final IApplicationRegisterDAO applicationRegisterDAO;
     private final ApplicationCacheService applicationCacheService;
 
     public ApplicationRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
+        this.applicationRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IApplicationRegisterDAO.class);
         this.applicationCacheService = getModuleManager().find(CacheModule.NAME).getService(ApplicationCacheService.class);
     }
 
@@ -59,27 +58,26 @@ public ApplicationRegisterSerialWorker(ModuleManager moduleManager) {
         int applicationId = applicationCacheService.get(application.getApplicationCode());
 
         if (applicationId == 0) {
-            IApplicationStreamDAO dao = (IApplicationStreamDAO)daoService.get(IApplicationStreamDAO.class);
             Application newApplication;
-            int min = dao.getMinApplicationId();
+            int min = applicationRegisterDAO.getMinApplicationId();
             if (min == 0) {
                 Application userApplication = new Application(String.valueOf(Const.USER_ID));
                 userApplication.setApplicationCode(Const.USER_CODE);
                 userApplication.setApplicationId(Const.USER_ID);
-                dao.save(userApplication);
+                applicationRegisterDAO.save(userApplication);
 
                 newApplication = new Application("-1");
                 newApplication.setApplicationId(-1);
                 newApplication.setApplicationCode(application.getApplicationCode());
             } else {
-                int max = dao.getMaxApplicationId();
+                int max = applicationRegisterDAO.getMaxApplicationId();
                 applicationId = IdAutoIncrement.INSTANCE.increment(min, max);
 
                 newApplication = new Application(String.valueOf(applicationId));
                 newApplication.setApplicationId(applicationId);
                 newApplication.setApplicationCode(application.getApplicationCode());
             }
-            dao.save(newApplication);
+            applicationRegisterDAO.save(newApplication);
         }
     }
 

diff --git a/...ain/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java b/...ain/java/org/skywalking/apm/collector/agent/stream/worker/register/InstanceIDService.java
@@ -27,8 +27,7 @@
 import org.skywalking.apm.collector.core.module.ModuleNotFoundException;
 import org.skywalking.apm.collector.core.module.ServiceNotProvidedException;
 import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IInstanceStreamDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
+import org.skywalking.apm.collector.storage.dao.IInstanceRegisterDAO;
 import org.skywalking.apm.collector.storage.table.register.Instance;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -42,10 +41,12 @@ public class InstanceIDService {
 
     private final ModuleManager moduleManager;
     private final Graph<Instance> instanceRegisterGraph;
+    private final IInstanceRegisterDAO instanceRegisterDAO;
 
     public InstanceIDService(ModuleManager moduleManager) {
         this.moduleManager = moduleManager;
         this.instanceRegisterGraph = GraphManager.INSTANCE.createIfAbsent(RegisterStreamGraph.INSTANCE_REGISTER_GRAPH_ID, Instance.class);
+        this.instanceRegisterDAO = moduleManager.find(StorageModule.NAME).getService(IInstanceRegisterDAO.class);
     }
 
     public int getOrCreate(int applicationId, String agentUUID, long registerTime,
@@ -71,8 +72,6 @@ public int getOrCreate(int applicationId, String agentUUID, long registerTime,
     public void recover(int instanceId, int applicationId, long registerTime,
         String osInfo) throws ModuleNotFoundException, ServiceNotProvidedException {
         logger.debug("instance recover, instance id: {}, application id: {}, register time: {}", instanceId, applicationId, registerTime);
-        DAOService daoService = moduleManager.find(StorageModule.NAME).getService(DAOService.class);
-        IInstanceStreamDAO dao = (IInstanceStreamDAO)daoService.get(IInstanceStreamDAO.class);
 
         Instance instance = new Instance(String.valueOf(instanceId));
         instance.setApplicationId(applicationId);
@@ -81,6 +80,6 @@ public void recover(int instanceId, int applicationId, long registerTime,
         instance.setHeartBeatTime(registerTime);
         instance.setInstanceId(instanceId);
         instance.setOsInfo(osInfo);
-        dao.save(instance);
+        instanceRegisterDAO.save(instance);
     }
 }
diff --git a/...g/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java b/...g/skywalking/apm/collector/agent/stream/worker/register/InstanceRegisterSerialWorker.java
@@ -23,8 +23,7 @@
 import org.skywalking.apm.collector.core.module.ModuleManager;
 import org.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IInstanceStreamDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
+import org.skywalking.apm.collector.storage.dao.IInstanceRegisterDAO;
 import org.skywalking.apm.collector.storage.table.register.Instance;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
@@ -40,12 +39,12 @@ public class InstanceRegisterSerialWorker extends AbstractLocalAsyncWorker<Insta
     private final Logger logger = LoggerFactory.getLogger(InstanceRegisterSerialWorker.class);
 
     private final InstanceCacheService instanceCacheService;
-    private final DAOService daoService;
+    private final IInstanceRegisterDAO instanceRegisterDAO;
 
     public InstanceRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
         this.instanceCacheService = getModuleManager().find(CacheModule.NAME).getService(InstanceCacheService.class);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
+        this.instanceRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IInstanceRegisterDAO.class);
     }
 
     @Override public int id() {
@@ -56,11 +55,10 @@ public InstanceRegisterSerialWorker(ModuleManager moduleManager) {
         logger.debug("register instance, application id: {}, agentUUID: {}", instance.getApplicationId(), instance.getAgentUUID());
         int instanceId = instanceCacheService.getInstanceId(instance.getApplicationId(), instance.getAgentUUID());
         if (instanceId == 0) {
-            IInstanceStreamDAO dao = (IInstanceStreamDAO)daoService.get(IInstanceStreamDAO.class);
             Instance newInstance;
 
-            int min = dao.getMinInstanceId();
-            int max = dao.getMaxInstanceId();
+            int min = instanceRegisterDAO.getMinInstanceId();
+            int max = instanceRegisterDAO.getMaxInstanceId();
             if (min == 0 && max == 0) {
                 newInstance = new Instance("1");
                 newInstance.setInstanceId(1);
@@ -78,7 +76,7 @@ public InstanceRegisterSerialWorker(ModuleManager moduleManager) {
                 newInstance.setOsInfo(instance.getOsInfo());
                 newInstance.setRegisterTime(instance.getRegisterTime());
             }
-            dao.save(newInstance);
+            instanceRegisterDAO.save(newInstance);
         }
     }
 

diff --git a/...kywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java b/...kywalking/apm/collector/agent/stream/worker/register/ServiceNameRegisterSerialWorker.java
@@ -25,8 +25,7 @@
 import org.skywalking.apm.collector.core.util.Const;
 import org.skywalking.apm.collector.queue.service.QueueCreatorService;
 import org.skywalking.apm.collector.storage.StorageModule;
-import org.skywalking.apm.collector.storage.dao.IServiceNameStreamDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
+import org.skywalking.apm.collector.storage.dao.IServiceNameRegisterDAO;
 import org.skywalking.apm.collector.storage.table.register.ServiceName;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorker;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
@@ -41,12 +40,12 @@ public class ServiceNameRegisterSerialWorker extends AbstractLocalAsyncWorker<Se
 
     private final Logger logger = LoggerFactory.getLogger(ServiceNameRegisterSerialWorker.class);
 
-    private final DAOService daoService;
+    private final IServiceNameRegisterDAO serviceNameRegisterDAO;
     private final ServiceIdCacheService serviceIdCacheService;
 
     public ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
+        this.serviceNameRegisterDAO = getModuleManager().find(StorageModule.NAME).getService(IServiceNameRegisterDAO.class);
         this.serviceIdCacheService = getModuleManager().find(CacheModule.NAME).getService(ServiceIdCacheService.class);
     }
 
@@ -58,31 +57,30 @@ public ServiceNameRegisterSerialWorker(ModuleManager moduleManager) {
         logger.debug("register service name: {}, application id: {}", serviceName.getServiceName(), serviceName.getApplicationId());
         int serviceId = serviceIdCacheService.get(serviceName.getApplicationId(), serviceName.getServiceName());
         if (serviceId == 0) {
-            IServiceNameStreamDAO dao = (IServiceNameStreamDAO)daoService.get(IServiceNameStreamDAO.class);
             ServiceName newServiceName;
 
-            int min = dao.getMinServiceId();
+            int min = serviceNameRegisterDAO.getMinServiceId();
             if (min == 0) {
                 ServiceName noneServiceName = new ServiceName("1");
                 noneServiceName.setApplicationId(0);
                 noneServiceName.setServiceId(Const.NONE_SERVICE_ID);
                 noneServiceName.setServiceName(Const.NONE_SERVICE_NAME);
-                dao.save(noneServiceName);
+                serviceNameRegisterDAO.save(noneServiceName);
 
                 newServiceName = new ServiceName("-1");
                 newServiceName.setApplicationId(serviceName.getApplicationId());
                 newServiceName.setServiceId(-1);
                 newServiceName.setServiceName(serviceName.getServiceName());
             } else {
-                int max = dao.getMaxServiceId();
+                int max = serviceNameRegisterDAO.getMaxServiceId();
                 serviceId = IdAutoIncrement.INSTANCE.increment(min, max);
 
                 newServiceName = new ServiceName(String.valueOf(serviceId));
                 newServiceName.setApplicationId(serviceName.getApplicationId());
                 newServiceName.setServiceId(serviceId);
                 newServiceName.setServiceName(serviceName.getServiceName());
             }
-            dao.save(newServiceName);
+            serviceNameRegisterDAO.save(newServiceName);
         }
     }
 

diff --git a/...ywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java b/...ywalking/apm/collector/agent/stream/worker/trace/global/GlobalTracePersistenceWorker.java
@@ -23,7 +23,6 @@
 import org.skywalking.apm.collector.storage.StorageModule;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
 import org.skywalking.apm.collector.storage.dao.IGlobalTracePersistenceDAO;
-import org.skywalking.apm.collector.storage.service.DAOService;
 import org.skywalking.apm.collector.storage.table.global.GlobalTrace;
 import org.skywalking.apm.collector.stream.worker.base.AbstractLocalAsyncWorkerProvider;
 import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
@@ -33,11 +32,8 @@
  */
 public class GlobalTracePersistenceWorker extends PersistenceWorker<GlobalTrace, GlobalTrace> {
 
-    private final DAOService daoService;
-
     public GlobalTracePersistenceWorker(ModuleManager moduleManager) {
         super(moduleManager);
-        this.daoService = getModuleManager().find(StorageModule.NAME).getService(DAOService.class);
     }
 
     @Override public int id() {
@@ -49,7 +45,7 @@ public GlobalTracePersistenceWorker(ModuleManager moduleManager) {
     }
 
     @Override protected IPersistenceDAO persistenceDAO() {
-        return (IGlobalTracePersistenceDAO)daoService.get(IGlobalTracePersistenceDAO.class);
+        return getModuleManager().find(StorageModule.NAME).getService(IGlobalTracePersistenceDAO.class);
     }
 
     public static class Factory extends AbstractLocalAsyncWorkerProvider<GlobalTrace, GlobalTrace, GlobalTracePersistenceWorker> {