diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java index 5e59f8e74..a4bb885ba 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/grpc/handler/JVMMetricsServiceHandler.java @@ -30,10 +30,10 @@ import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; import org.skywalking.apm.collector.server.grpc.GRPCHandler; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricDataDefine; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricDataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricDataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricDataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricDataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricDataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricDataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java index 562db2c01..305c5fa43 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/CpuMetricPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu; import org.skywalking.apm.collector.agentjvm.worker.cpu.dao.ICpuMetricDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java index 03b42d710..bf8859215 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java index e6e735e21..afc8eec28 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/dao/CpuMetricH2DAO.java @@ -21,11 +21,11 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.dao; import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java index c73389119..e401b8dd9 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.define; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java index 8aeca7b55..5f41ea05b 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/cpu/define/CpuMetricH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentjvm.worker.cpu.define; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java index 68f6151ba..e8171c0d7 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/GCMetricPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentjvm.worker.gc; import org.skywalking.apm.collector.agentjvm.worker.gc.dao.IGCMetricDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java index e48122d56..063cd2216 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java index 8657efc96..e96576b5a 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/dao/GCMetricH2DAO.java @@ -21,11 +21,11 @@ package org.skywalking.apm.collector.agentjvm.worker.gc.dao; import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java index a5012800a..002aceed2 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentjvm.worker.gc.define; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java index d38789912..de1d236d6 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/gc/define/GCMetricH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentjvm.worker.gc.define; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java index bd37b9e28..095c1e6bb 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/InstHeartBeatPersistenceWorker.java @@ -20,8 +20,8 @@ package org.skywalking.apm.collector.agentjvm.worker.heartbeat; import org.skywalking.apm.collector.agentjvm.worker.heartbeat.dao.IInstanceHeartBeatDAO; import org.skywalking.apm.collector.agentjvm.worker.heartbeat.define.InstanceHeartBeatDataDefine; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java index 124807197..421e8d59e 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatEsDAO.java @@ -25,8 +25,8 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java index a249c295e..127ff72bc 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/dao/InstanceHeartBeatH2DAO.java @@ -28,11 +28,11 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java index 8ab56aff4..decab66b2 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/heartbeat/define/InstanceHeartBeatDataDefine.java @@ -23,10 +23,10 @@ import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java index 00f4b700f..59a0b91c7 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/MemoryMetricPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentjvm.worker.memory; import org.skywalking.apm.collector.agentjvm.worker.memory.dao.IMemoryMetricDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java index 442f42541..ca335e4a6 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java index eb4c823eb..282a90279 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/dao/MemoryMetricH2DAO.java @@ -21,11 +21,11 @@ package org.skywalking.apm.collector.agentjvm.worker.memory.dao; import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java index 947e75772..c5f095a5b 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentjvm.worker.memory.define; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java index b03bd692c..ff631cc66 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memory/define/MemoryMetricH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentjvm.worker.memory.define; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java index 11273ed47..ca42adab8 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/MemoryPoolMetricPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool; import org.skywalking.apm.collector.agentjvm.worker.memorypool.dao.IMemoryPoolMetricDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java index 0e2b3953c..243f7aa22 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java index c97c9f549..7eeea4bec 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/dao/MemoryPoolMetricH2DAO.java @@ -21,11 +21,11 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool.dao; import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java index d8bba3980..f98f82cd8 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool.define; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java index 1ada2297c..f7b9dc44d 100644 --- a/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentjvm/src/main/java/org/skywalking/apm/collector/agentjvm/worker/memorypool/define/MemoryPoolMetricH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentjvm.worker.memorypool.define; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java index 20dbb3fd5..209646469 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/application/ApplicationIDService.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.agentregister.application; import org.skywalking.apm.collector.agentregister.worker.application.ApplicationRegisterRemoteWorker; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.framework.CollectorContextHelper; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java index 01678eef3..6a4ae597a 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/instance/InstanceIDService.java @@ -21,8 +21,8 @@ package org.skywalking.apm.collector.agentregister.instance; import org.skywalking.apm.collector.agentregister.worker.instance.InstanceRegisterRemoteWorker; import org.skywalking.apm.collector.agentregister.worker.instance.dao.IInstanceDAO; import org.skywalking.apm.collector.core.framework.CollectorContextHelper; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java index 4f4daa761..f1d5c32b0 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/servicename/ServiceNameService.java @@ -21,8 +21,8 @@ package org.skywalking.apm.collector.agentregister.servicename; import org.skywalking.apm.collector.agentregister.worker.servicename.ServiceNameRegisterRemoteWorker; import org.skywalking.apm.collector.cache.dao.IServiceNameCacheDAO; import org.skywalking.apm.collector.core.framework.CollectorContextHelper; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java index 0db462e6a..2189cd2b1 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.application; -import org.skywalking.apm.collector.storage.define.register.ApplicationTable; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java index 85405495a..e8da1a567 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationH2TableDefine.java @@ -18,10 +18,10 @@ package org.skywalking.apm.collector.agentregister.worker.application; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; -import org.skywalking.apm.collector.storage.define.register.ApplicationTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java index d29e9a2be..f3cf8bd5b 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentregister.worker.application; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java index 2bcc9fb27..4c2312702 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/ApplicationRegisterSerialWorker.java @@ -22,9 +22,9 @@ import org.skywalking.apm.collector.agentregister.worker.IdAutoIncrement; import org.skywalking.apm.collector.agentregister.worker.application.dao.IApplicationDAO; import org.skywalking.apm.collector.cache.dao.IApplicationCacheDAO; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorker; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java index c830f5cd4..93c8933c7 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.support.WriteRequest; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; -import org.skywalking.apm.collector.storage.define.register.ApplicationTable; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java index 3ce9c1dcd..99c372bb9 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/ApplicationH2DAO.java @@ -22,10 +22,10 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; -import org.skywalking.apm.collector.storage.define.register.ApplicationTable; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java index 671c762d0..2e6d56eed 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/application/dao/IApplicationDAO.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.application.dao; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java index 7e5c854c1..34fc05e95 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.instance; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java index 70b9224f4..3a9fe3482 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentregister.worker.instance; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java index e86ac5be8..e0613c3fd 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentregister.worker.instance; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java index 0c581ec64..4a6b0bf85 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/InstanceRegisterSerialWorker.java @@ -19,10 +19,10 @@ package org.skywalking.apm.collector.agentregister.worker.instance; import org.skywalking.apm.collector.agentregister.worker.instance.dao.IInstanceDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorker; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java index 95dd699ef..5d7972dfc 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/IInstanceDAO.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.instance.dao; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java index dc49691e4..708c596f2 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceEsDAO.java @@ -30,8 +30,8 @@ import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java index 32bf7097b..5c45b56a2 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/instance/dao/InstanceH2DAO.java @@ -24,10 +24,10 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java index 85cfc58e1..73ad1be03 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.servicename; -import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java index fa4343d7c..c47813a9e 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentregister.worker.servicename; -import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java index 28708f868..bb498be0d 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentregister.worker.servicename; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java index ac893e3c4..34abe51a2 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/ServiceNameRegisterSerialWorker.java @@ -22,9 +22,9 @@ import org.skywalking.apm.collector.agentregister.worker.IdAutoIncrement; import org.skywalking.apm.collector.agentregister.worker.servicename.dao.IServiceNameDAO; import org.skywalking.apm.collector.cache.dao.IServiceNameCacheDAO; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorker; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java index d3bb8bf7c..3326998e7 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/IServiceNameDAO.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentregister.worker.servicename.dao; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java index c82ba981f..9c4a79bed 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexResponse; import org.elasticsearch.action.support.WriteRequest; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; -import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java index ef36d208e..984093051 100644 --- a/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentregister/src/main/java/org/skywalking/apm/collector/agentregister/worker/servicename/dao/ServiceNameH2DAO.java @@ -22,10 +22,10 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; -import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java index 25253e20d..9c178c3c2 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTracePersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.global; import org.skywalking.apm.collector.agentstream.worker.global.dao.IGlobalTraceDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java index 4bcf18729..2640146df 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/GlobalTraceSpanListener.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceDataDefine; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java index 3707b9b8c..f2b71a56c 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java index 5852e5822..e01f730b4 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/dao/GlobalTraceH2DAO.java @@ -22,11 +22,11 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java index 7de114578..9c375320b 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.global.define; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java index 70ead9d44..8b34dfe91 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/global/define/GlobalTraceH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.global.define; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java index 6974b56ea..f56fb0352 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformancePersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.instance.performance; import org.skywalking.apm.collector.agentstream.worker.instance.performance.dao.IInstPerformanceDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java index 0ca3d665e..18d42b1e3 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/InstPerformanceSpanListener.java @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java index ff753391e..16977d807 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java index 93c96517d..b674ad0cc 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/dao/InstPerformanceH2DAO.java @@ -27,11 +27,11 @@ import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java index e5e9e0881..4ec7ca5c7 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.instance.performance.define; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java index daf3bded0..60e35f1c4 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/instance/performance/define/InstPerformanceH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.instance.performance.define; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java index b994a5d9e..0ddc2326c 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentAggregationWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.node.component; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeComponentDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java index b9367aa82..447012931 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.node.component; import org.skywalking.apm.collector.agentstream.worker.node.component.dao.INodeComponentDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeComponentDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java index d197456d3..80f0bcce3 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.node.component; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeComponentDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java index fe24049d5..01c98fa1c 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/NodeComponentSpanListener.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.node.NodeComponentDataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java index 7e367de7b..867336bd4 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java index eff769b28..6b5365c2c 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/dao/NodeComponentH2DAO.java @@ -27,11 +27,11 @@ import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java index 71e935d82..bb781b4c0 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.component.define; -import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java index cc6bc9399..b51abc885 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/component/define/NodeComponentH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.node.component.define; -import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java index ec07f3766..dae97619c 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingAggregationWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeMappingDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java index 0d1f8f1d4..b6cb1e5ed 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping; import org.skywalking.apm.collector.agentstream.worker.node.mapping.dao.INodeMappingDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeMappingDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java index 82e144aaa..e0d9b8861 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeMappingDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java index 319f917a0..6cbe12ffa 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/NodeMappingSpanListener.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.node.NodeMappingDataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java index acd2f7c62..63d01e862 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeMappingTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java index 1e25502c1..b3ff41794 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/dao/NodeMappingH2DAO.java @@ -28,11 +28,11 @@ import org.skywalking.apm.collector.agentstream.worker.node.component.dao.NodeCo import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.node.NodeMappingTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java index 1a793abd0..8914990bd 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping.define; -import org.skywalking.apm.collector.storage.define.node.NodeMappingTable; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java index 0622deded..445ae0043 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/node/mapping/define/NodeMappingH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.node.mapping.define; -import org.skywalking.apm.collector.storage.define.node.NodeMappingTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java index 26344ceac..f50ab9bb4 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceAggregationWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.noderef; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java index bad368e0c..7ba6e30ed 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferencePersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.noderef; import org.skywalking.apm.collector.agentstream.worker.noderef.dao.INodeReferenceDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java index 56d712994..94968a0bf 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.noderef; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java index 61888efd0..8455922d0 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/NodeReferenceSpanListener.java @@ -30,7 +30,7 @@ import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java index 1fe559062..9a6c63982 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java index 2a0e89994..73733d89e 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/dao/NodeReferenceH2DAO.java @@ -27,11 +27,11 @@ import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java index 4b8d2753b..896a3494b 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.define; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java index 8c4186fda..0618f7162 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/noderef/define/NodeReferenceH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.noderef.define; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java index 65d636fda..ed969b954 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/SegmentParse.java @@ -37,7 +37,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.agentstream.worker.service.entry.ServiceEntrySpanListener; import org.skywalking.apm.collector.agentstream.worker.serviceref.ServiceReferenceSpanListener; import org.skywalking.apm.collector.core.framework.CollectorContextHelper; -import org.skywalking.apm.collector.storage.define.segment.SegmentDataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java index e5b5320db..1a5a0a01a 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost; import org.skywalking.apm.collector.agentstream.worker.segment.cost.dao.ISegmentCostDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java index 405e6d8c6..d72d22485 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/SegmentCostSpanListener.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.cache.ServiceNameCache; import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostDataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java index b7a8f6746..cfa7ef180 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostEsDAO.java @@ -23,8 +23,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java index 82c0a1009..bb9319020 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/dao/SegmentCostH2DAO.java @@ -21,11 +21,11 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.dao; import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java index 8a7e38c2a..6fdd31170 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.define; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java index 811be3222..687daff88 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/cost/define/SegmentCostH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.segment.cost.define; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java index 8c51294f5..8a2e9a046 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/SegmentPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin; import org.skywalking.apm.collector.agentstream.worker.segment.origin.dao.ISegmentDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.segment.SegmentDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java index 26e597e14..60ba2044f 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentEsDAO.java @@ -24,8 +24,8 @@ import java.util.Map; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.segment.SegmentTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java index 51dc2d9dc..c5cc429b7 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/dao/SegmentH2DAO.java @@ -22,11 +22,11 @@ import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.agentstream.worker.segment.cost.dao.SegmentCostH2DAO; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.segment.SegmentTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java index 6c38de543..acb00444f 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin.define; -import org.skywalking.apm.collector.storage.define.segment.SegmentTable; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java index dfbfe2942..f05be709a 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/origin/define/SegmentH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.segment.origin.define; -import org.skywalking.apm.collector.storage.define.segment.SegmentTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java index 003059a70..529ca69b9 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/segment/standardization/SegmentStandardizationWorker.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.agentstream.worker.segment.standardization; import org.skywalking.apm.collector.agentstream.worker.segment.buffer.SegmentBufferManager; import org.skywalking.apm.collector.core.queue.EndOfBatchCommand; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorker; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java index 4cd82ba9f..f155e0d9f 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryAggregationWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.service.entry; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java index 154dabb4e..f0e2e196c 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryPersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.service.entry; import org.skywalking.apm.collector.agentstream.worker.service.entry.dao.IServiceEntryDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java index 14adfe27c..5dc4c4354 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntryRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.service.entry; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java index 17db7484a..615b16536 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/ServiceEntrySpanListener.java @@ -27,7 +27,7 @@ import org.skywalking.apm.collector.cache.ServiceNameCache; import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryDataDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java index 724bd91d0..29ee4d2b8 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java index dc9bf950b..415a9f3c0 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/dao/ServiceEntryH2DAO.java @@ -27,11 +27,11 @@ import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java index 62ed13bf2..7abb59b12 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.service.entry.define; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java index 2ff731367..e814f2f00 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/service/entry/define/ServiceEntryH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.service.entry.define; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java index 52a71efea..d5e5d3eb6 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceAggregationWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java index 095f9f434..8bd2ab9e7 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferencePersistenceWorker.java @@ -19,9 +19,9 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref; import org.skywalking.apm.collector.agentstream.worker.serviceref.dao.IServiceReferenceDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java index 6b915cef5..7aa6e97f7 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceRemoteWorker.java @@ -18,8 +18,8 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceDataDefine; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorker; import org.skywalking.apm.collector.stream.worker.AbstractRemoteWorkerProvider; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java index 63ec5d862..c25b66525 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/ServiceReferenceSpanListener.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.agentstream.worker.segment.standardization.S import org.skywalking.apm.collector.core.framework.CollectorContextHelper; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceDataDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceDataDefine; import org.skywalking.apm.collector.stream.StreamModuleContext; import org.skywalking.apm.collector.stream.StreamModuleGroupDefine; import org.skywalking.apm.collector.stream.worker.WorkerInvokeException; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java index 55d8ba70c..e60d1eed9 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceEsDAO.java @@ -24,8 +24,8 @@ import org.elasticsearch.action.get.GetResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java index fecd14745..2095f4958 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/dao/ServiceReferenceH2DAO.java @@ -27,11 +27,11 @@ import java.util.Map; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.skywalking.apm.collector.stream.worker.impl.dao.IPersistenceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java index 3090c98f1..bcd04c2d2 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceEsTableDefine.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref.define; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchColumnDefine; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchTableDefine; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java index e5ee62eed..fc344793f 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/serviceref/define/ServiceReferenceH2TableDefine.java @@ -18,9 +18,9 @@ package org.skywalking.apm.collector.agentstream.worker.serviceref.define; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java index 88f668ad1..475a33961 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/main/java/org/skywalking/apm/collector/agentstream/worker/storage/PersistenceTimer.java @@ -23,8 +23,8 @@ import java.util.List; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; import org.skywalking.apm.collector.core.framework.Starter; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; import org.skywalking.apm.collector.stream.worker.WorkerException; import org.skywalking.apm.collector.stream.worker.impl.FlushAndSwitch; import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker; diff --git a/apm-collector-3.2.3/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java b/apm-collector-3.2.3/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java index 8899f759a..0dd19e4cc 100644 --- a/apm-collector-3.2.3/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java +++ b/apm-collector-3.2.3/apm-collector-agentstream/src/test/java/org/skywalking/apm/collector/agentstream/mock/SegmentPost.java @@ -31,10 +31,10 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.core.CollectorException; import org.skywalking.apm.collector.core.config.SystemConfig; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.register.ApplicationDataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; -import org.skywalking.apm.collector.storage.define.register.ServiceNameDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameDataDefine; import org.skywalking.apm.collector.storage.elasticsearch.StorageElasticSearchModuleDefine; import org.skywalking.apm.collector.storage.h2.StorageH2ModuleDefine; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java index de0f82053..1c1498a43 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ApplicationCache.java @@ -23,7 +23,7 @@ import com.google.common.cache.CacheBuilder; import org.skywalking.apm.collector.cache.dao.IApplicationCacheDAO; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java index 946d992d9..245f0db08 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/InstanceCache.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.cache; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import org.skywalking.apm.collector.cache.dao.IInstanceCacheDAO; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java index d4c25118f..171182782 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceIdCache.java @@ -22,7 +22,7 @@ import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; import org.skywalking.apm.collector.cache.dao.IServiceNameCacheDAO; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java index 26546ec49..5197486d1 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/ServiceNameCache.java @@ -23,7 +23,7 @@ import com.google.common.cache.CacheBuilder; import org.skywalking.apm.collector.cache.dao.IServiceNameCacheDAO; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java index 9ebed3a08..1a7939eb3 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationEsCacheDAO.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.register.ApplicationTable; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java index accd1c094..20f66dda5 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ApplicationH2CacheDAO.java @@ -23,9 +23,9 @@ import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.register.ApplicationTable; +import org.skywalking.apm.collector.storage.base.define.register.ApplicationTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java index b65501f9d..e47ab8340 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceEsCacheDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.cache.dao; import org.elasticsearch.action.get.GetResponse; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java index 696ceac56..88b76705b 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/InstanceH2CacheDAO.java @@ -22,9 +22,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java index 4d3ab730b..3b9367f4c 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameEsCacheDAO.java @@ -27,7 +27,7 @@ import org.elasticsearch.index.query.BoolQueryBuilder; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java index 30b160a44..3be6d4726 100644 --- a/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java +++ b/apm-collector-3.2.3/apm-collector-cache/src/main/java/org/skywalking/apm/collector/cache/dao/ServiceNameH2CacheDAO.java @@ -23,9 +23,9 @@ import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.register.ServiceNameTable; +import org.skywalking.apm.collector.storage.base.define.register.ServiceNameTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java index f3203d71b..35c1af85f 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.dao; +package org.skywalking.apm.collector.storage.base.dao; import org.skywalking.apm.collector.core.client.Client; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java index 4d2c9b91e..dcab9495f 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.dao; +package org.skywalking.apm.collector.storage.base.dao; import java.util.HashMap; import java.util.Map; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java index f57aa8f5e..10c92b195 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.dao; +package org.skywalking.apm.collector.storage.base.dao; import java.util.List; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java index 495638136..8cdb40f85 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import org.skywalking.apm.collector.core.stream.Operation; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java index 6727c87d1..0384583a5 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java index 19d160b7c..db87cbc22 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java index 2d93f9804..5c12c9549 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java index f592b3822..6ed893d24 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.global; +package org.skywalking.apm.collector.storage.base.define.global; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java index 0bf92e6b5..a2e75c0dc 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/global/GlobalTraceTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.global; +package org.skywalking.apm.collector.storage.base.define.global; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java index 987f13ecc..23c923785 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceDataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.instance; +package org.skywalking.apm.collector.storage.base.define.instance; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; @@ -24,9 +24,9 @@ import org.skywalking.apm.collector.core.stream.operate.AddOperation; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java index 82b8c5604..a8eb50da6 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/instance/InstPerformanceTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.instance; +package org.skywalking.apm.collector.storage.base.define.instance; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java index 5e791c49a..5fd430c5d 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricDataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; @@ -25,9 +25,9 @@ import org.skywalking.apm.collector.core.stream.operate.AddOperation; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java index 054e328f2..ffd357bac 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/CpuMetricTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java index 8021a6d0c..fc40e2a27 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricDataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; @@ -24,9 +24,9 @@ import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java index 2f47ba03d..f71618166 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/GCMetricTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java index 4ecd8ed51..e38bbe861 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricDataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; @@ -24,9 +24,9 @@ import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java index 996c16c81..42e8942d8 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryMetricTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java index 69e78a131..36b71b7c4 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricDataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.stream.Data; @@ -24,9 +24,9 @@ import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java index 9382e526b..e5e4c7610 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/jvm/MemoryPoolMetricTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.jvm; +package org.skywalking.apm.collector.storage.base.define.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java index a30ab47cd..6cd5980eb 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.node; +package org.skywalking.apm.collector.storage.base.define.node; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java index cfd80b4b7..66cd0550a 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeComponentTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.node; +package org.skywalking.apm.collector.storage.base.define.node; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java index 76108464b..1afa7467a 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.node; +package org.skywalking.apm.collector.storage.base.define.node; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java index 4af90a8a5..13a38e804 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/node/NodeMappingTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.node; +package org.skywalking.apm.collector.storage.base.define.node; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java index 4c67a0dab..6c672bd41 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.noderef; +package org.skywalking.apm.collector.storage.base.define.noderef; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.AddOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java index 8ea1eb782..c62e64d59 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/noderef/NodeReferenceTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.noderef; +package org.skywalking.apm.collector.storage.base.define.noderef; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java index 4458fb994..ff2cbe06c 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationDataDefine.java @@ -16,14 +16,14 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.register; +package org.skywalking.apm.collector.storage.base.define.register; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java index 6168451b3..390c34e7a 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ApplicationTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.register; +package org.skywalking.apm.collector.storage.base.define.register; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java index 09b5519b5..05ade3aa8 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceDataDefine.java @@ -16,14 +16,14 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.register; +package org.skywalking.apm.collector.storage.base.define.register; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java index a38d4c068..a4266cb89 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/InstanceTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.register; +package org.skywalking.apm.collector.storage.base.define.register; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java index d9af3a3fe..2fcb24dcc 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameDataDefine.java @@ -16,14 +16,14 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.register; +package org.skywalking.apm.collector.storage.base.define.register; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java index 85ba19b2a..2c04d32d1 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/register/ServiceNameTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.register; +package org.skywalking.apm.collector.storage.base.define.register; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java index bfb386c1b..acbf570db 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.segment; +package org.skywalking.apm.collector.storage.base.define.segment; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java index 8ad71576c..3f1716341 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentCostTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.segment; +package org.skywalking.apm.collector.storage.base.define.segment; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java index 3a85df4af..203341002 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.segment; +package org.skywalking.apm.collector.storage.base.define.segment; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java index 6066c9506..74e305c22 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/segment/SegmentTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.segment; +package org.skywalking.apm.collector.storage.base.define.segment; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java index bc6e5d22b..e461983f8 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.service; +package org.skywalking.apm.collector.storage.base.define.service; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.CoverOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java index 959bad634..456cb491d 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/service/ServiceEntryTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.service; +package org.skywalking.apm.collector.storage.base.define.service; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java index 4903fb310..0f5418809 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceDataDefine.java @@ -16,16 +16,16 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.serviceref; +package org.skywalking.apm.collector.storage.base.define.serviceref; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.stream.Transform; import org.skywalking.apm.collector.core.stream.operate.AddOperation; import org.skywalking.apm.collector.core.stream.operate.NonOperation; import org.skywalking.apm.collector.remote.grpc.proto.RemoteData; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java index 4a4953462..bb959436a 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/define/serviceref/ServiceReferenceTable.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.serviceref; +package org.skywalking.apm.collector.storage.base.define.serviceref; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java index 8ad1ed04f..4d38f3241 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/StorageElasticSearchModuleDefine.java @@ -26,7 +26,7 @@ import org.skywalking.apm.collector.core.module.ModuleConfigParser; import org.skywalking.apm.collector.core.storage.StorageInstaller; import org.skywalking.apm.collector.storage.StorageModuleDefine; import org.skywalking.apm.collector.storage.StorageModuleGroupDefine; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAODefineLoader; import org.skywalking.apm.collector.storage.elasticsearch.define.ElasticSearchStorageInstaller; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java index fe372619a..a55a93f9b 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/BatchEsDAO.java @@ -24,7 +24,7 @@ import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.util.CollectionUtils; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java index 01097da01..3ac9b8717 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/elasticsearch/dao/EsDAO.java @@ -26,7 +26,7 @@ import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.min.Min; import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.dao.DAO; +import org.skywalking.apm.collector.storage.base.dao.DAO; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java index ee1ddbf4e..efab1ba6b 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/StorageH2ModuleDefine.java @@ -26,10 +26,10 @@ import org.skywalking.apm.collector.core.module.ModuleConfigParser; import org.skywalking.apm.collector.core.storage.StorageInstaller; import org.skywalking.apm.collector.storage.StorageModuleDefine; import org.skywalking.apm.collector.storage.StorageModuleGroupDefine; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.dao.H2DAODefineLoader; -import org.skywalking.apm.collector.storage.h2.define.H2StorageInstaller; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAODefineLoader; +import org.skywalking.apm.collector.storage.h2.base.define.H2StorageInstaller; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java index 4175f47bb..d921b1d90 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java index ff6403353..b73bfa802 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java @@ -16,13 +16,13 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import java.sql.ResultSet; import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.dao.DAO; +import org.skywalking.apm.collector.storage.base.dao.DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java index 607e30788..d9495dded 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import java.util.ArrayList; import java.util.List; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java index e44b87366..9fbbb7464 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import org.skywalking.apm.collector.core.framework.DefinitionFile; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java index 1a9e2bfff..851831656 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; import org.skywalking.apm.collector.core.storage.ColumnDefine; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java index 39cba0ad9..0818bf9f9 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; /** * @author clevertension diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java index e9ef07141..560b16900 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java index 6e7a2f326..50aefb6f6 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; import org.skywalking.apm.collector.core.storage.TableDefine; diff --git a/apm-collector-3.2.3/apm-collector-storage/src/main/resources/META-INF/defines/h2_dao.define b/apm-collector-3.2.3/apm-collector-storage/src/main/resources/META-INF/defines/h2_dao.define index de143481d..719ee5329 100644 --- a/apm-collector-3.2.3/apm-collector-storage/src/main/resources/META-INF/defines/h2_dao.define +++ b/apm-collector-3.2.3/apm-collector-storage/src/main/resources/META-INF/defines/h2_dao.define @@ -1 +1 @@ -org.skywalking.apm.collector.storage.h2.dao.BatchH2DAO \ No newline at end of file +org.skywalking.apm.collector.storage.h2.base.dao.BatchH2DAO \ No newline at end of file diff --git a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java index d50439a12..a46f291dd 100644 --- a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java +++ b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/StreamModuleContext.java @@ -21,7 +21,7 @@ package org.skywalking.apm.collector.stream; import java.util.HashMap; import java.util.Map; import org.skywalking.apm.collector.core.framework.Context; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; /** diff --git a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java index 68d57eb85..18ee23768 100644 --- a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java +++ b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/Role.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.stream.worker; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; import org.skywalking.apm.collector.stream.worker.selector.WorkerSelector; /** diff --git a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java index 4c0c7ddfe..4827347a1 100644 --- a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java +++ b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/PersistenceWorker.java @@ -24,8 +24,8 @@ import java.util.Map; import org.skywalking.apm.collector.core.queue.EndOfBatchCommand; import org.skywalking.apm.collector.core.stream.Data; import org.skywalking.apm.collector.core.util.ObjectUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; import org.skywalking.apm.collector.stream.worker.AbstractLocalAsyncWorker; import org.skywalking.apm.collector.stream.worker.ClusterWorkerContext; import org.skywalking.apm.collector.stream.worker.ProviderNotFoundException; diff --git a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java index 8818ed410..c25540c1b 100644 --- a/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java +++ b/apm-collector-3.2.3/apm-collector-stream/src/main/java/org/skywalking/apm/collector/stream/worker/impl/dao/IPersistenceDAO.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.stream.worker.impl.dao; import org.skywalking.apm.collector.core.stream.Data; -import org.skywalking.apm.collector.storage.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.DataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java index 40cff2afa..1367f5b09 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.get.MultiGetRequestBuilder; import org.elasticsearch.action.get.MultiGetResponse; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java index 100727168..cb740c0bc 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/CpuMetricH2DAO.java @@ -27,9 +27,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.CpuMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.CpuMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java index ee694205b..e04c33cfd 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricEsDAO.java @@ -34,7 +34,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.network.proto.GCPhrase; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java index 8a8fe0023..490f83ea0 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GCMetricH2DAO.java @@ -28,9 +28,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.GCMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.GCMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.network.proto.GCPhrase; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java index d5c15e953..b26333e68 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceEsDAO.java @@ -25,7 +25,7 @@ import org.elasticsearch.action.search.SearchResponse; import org.elasticsearch.action.search.SearchType; import org.elasticsearch.index.query.QueryBuilders; import org.elasticsearch.search.SearchHit; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java index 6383833d0..1092843ae 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/GlobalTraceH2DAO.java @@ -25,9 +25,9 @@ import java.util.List; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java index 483d5111e..ff5bc58fa 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/IInstanceDAO.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.ui.dao; import com.google.gson.JsonArray; import java.util.List; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; /** * @author peng-yongsheng diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java index 838080a67..4cd08faf5 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceEsDAO.java @@ -33,7 +33,7 @@ import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.elasticsearch.search.sort.SortOrder; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java index 28f8fa2a9..1a3cdc0d3 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstPerformanceH2DAO.java @@ -27,9 +27,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.instance.InstPerformanceTable; +import org.skywalking.apm.collector.storage.base.define.instance.InstPerformanceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java index 50524142a..1a2d147c0 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceEsDAO.java @@ -39,8 +39,8 @@ import org.elasticsearch.search.sort.SortBuilders; import org.elasticsearch.search.sort.SortMode; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java index 7cfb79c30..95f956ba9 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/InstanceH2DAO.java @@ -28,10 +28,10 @@ import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; -import org.skywalking.apm.collector.storage.define.register.InstanceTable; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.define.register.InstanceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java index c3c0f2062..554ac23aa 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricEsDAO.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.get.MultiGetRequestBuilder; import org.elasticsearch.action.get.MultiGetResponse; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java index 0b45f0153..a392a971c 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryMetricH2DAO.java @@ -28,9 +28,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.MemoryMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java index f5c23bec0..f386ef7a9 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricEsDAO.java @@ -26,7 +26,7 @@ import org.elasticsearch.action.get.MultiGetRequestBuilder; import org.elasticsearch.action.get.MultiGetResponse; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java index b759c2c3b..397817cdd 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/MemoryPoolMetricH2DAO.java @@ -28,9 +28,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.define.jvm.MemoryPoolMetricTable; +import org.skywalking.apm.collector.storage.base.define.jvm.MemoryPoolMetricTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java index 09bf4b72d..29c943053 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentEsDAO.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.network.trace.component.ComponentsDefine; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java index 2aabff5b7..4896c4a63 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeComponentH2DAO.java @@ -26,9 +26,9 @@ import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.node.NodeComponentTable; +import org.skywalking.apm.collector.storage.base.define.node.NodeComponentTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.network.trace.component.ComponentsDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java index 12f544627..83b28598a 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingEsDAO.java @@ -28,7 +28,7 @@ import org.elasticsearch.search.aggregations.AggregationBuilders; import org.elasticsearch.search.aggregations.bucket.terms.Terms; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.node.NodeMappingTable; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java index 53b330b50..c5593d869 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeMappingH2DAO.java @@ -26,9 +26,9 @@ import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.node.NodeMappingTable; +import org.skywalking.apm.collector.storage.base.define.node.NodeMappingTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java index 52d3ce3c0..dda8ed65e 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceEsDAO.java @@ -30,7 +30,7 @@ import org.elasticsearch.search.aggregations.bucket.terms.TermsAggregationBuilde import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java index 6c910f295..7681efc34 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/NodeReferenceH2DAO.java @@ -25,9 +25,9 @@ import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java index 87a02bf92..c5274c02f 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostEsDAO.java @@ -32,9 +32,9 @@ import org.elasticsearch.search.SearchHit; import org.elasticsearch.search.sort.SortOrder; import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java index 32f5a4317..1c9e2e84a 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentCostH2DAO.java @@ -28,11 +28,11 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.global.GlobalTraceTable; -import org.skywalking.apm.collector.storage.define.segment.SegmentCostTable; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.global.GlobalTraceTable; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentCostTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java index 43047665e..e2599c4b2 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentEsDAO.java @@ -23,7 +23,7 @@ import java.util.Base64; import java.util.Map; import org.elasticsearch.action.get.GetResponse; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.segment.SegmentTable; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.skywalking.apm.network.proto.TraceSegmentObject; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java index d37e581c2..67baa7f34 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/SegmentH2DAO.java @@ -23,9 +23,9 @@ import java.sql.ResultSet; import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.define.segment.SegmentTable; +import org.skywalking.apm.collector.storage.base.define.segment.SegmentTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.skywalking.apm.network.proto.TraceSegmentObject; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java index 2574818ea..2895ca780 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryEsDAO.java @@ -32,7 +32,7 @@ import org.elasticsearch.search.sort.SortOrder; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java index cdc3b7ae8..fe27c2f4d 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceEntryH2DAO.java @@ -29,9 +29,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.define.service.ServiceEntryTable; +import org.skywalking.apm.collector.storage.base.define.service.ServiceEntryTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java index 2f4bc38d8..b92c34b9a 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceEsDAO.java @@ -32,7 +32,7 @@ import org.elasticsearch.search.aggregations.metrics.sum.Sum; import org.skywalking.apm.collector.cache.ServiceNameCache; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.storage.elasticsearch.dao.EsDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java index 543ccce9c..768693a6c 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/dao/ServiceReferenceH2DAO.java @@ -28,9 +28,9 @@ import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.storage.h2.SqlBuilder; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java index 0ac5c7066..9ec9af0a9 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ApplicationService.java @@ -19,7 +19,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.IInstanceDAO; /** diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java index 6ae7e753c..1e07d7502 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceHealthService.java @@ -23,8 +23,8 @@ import com.google.gson.JsonObject; import java.util.List; import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.core.util.TimeBucketUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; import org.skywalking.apm.collector.ui.dao.IGCMetricDAO; import org.skywalking.apm.collector.ui.dao.IInstPerformanceDAO; import org.skywalking.apm.collector.ui.dao.IInstanceDAO; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java index 7f262eadb..7bd078dad 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/InstanceJVMService.java @@ -23,8 +23,8 @@ import com.google.gson.JsonObject; import java.util.Set; import org.skywalking.apm.collector.core.framework.UnexpectedException; import org.skywalking.apm.collector.core.util.ObjectUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.register.InstanceDataDefine; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.register.InstanceDataDefine; import org.skywalking.apm.collector.ui.dao.ICpuMetricDAO; import org.skywalking.apm.collector.ui.dao.IGCMetricDAO; import org.skywalking.apm.collector.ui.dao.IInstPerformanceDAO; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java index fc7177720..b34a2dd8a 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SegmentTopService.java @@ -22,7 +22,7 @@ import com.google.gson.JsonObject; import java.util.LinkedList; import java.util.List; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.IGlobalTraceDAO; import org.skywalking.apm.collector.ui.dao.ISegmentCostDAO; import org.slf4j.Logger; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java index e770b4d9c..bb4a846d7 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/ServiceTreeService.java @@ -25,8 +25,8 @@ import java.util.Map; import org.skywalking.apm.collector.core.util.ColumnNameUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.ObjectUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.define.serviceref.ServiceReferenceTable; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.define.serviceref.ServiceReferenceTable; import org.skywalking.apm.collector.ui.dao.IServiceEntryDAO; import org.skywalking.apm.collector.ui.dao.IServiceReferenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java index 0d8f14fe5..b6a6c8aa7 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/SpanService.java @@ -25,7 +25,7 @@ import org.skywalking.apm.collector.cache.ApplicationCache; import org.skywalking.apm.collector.cache.ServiceNameCache; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.ISegmentDAO; import org.skywalking.apm.network.proto.KeyWithStringValue; import org.skywalking.apm.network.proto.LogMessage; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java index 1556d9dfe..3f115141d 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TimeSynchronousService.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.ui.service; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.IInstanceDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java index 1249a0d75..18608033c 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagDataBuilder.java @@ -24,7 +24,7 @@ import java.util.HashMap; import java.util.LinkedHashMap; import java.util.Map; import org.skywalking.apm.collector.core.util.Const; -import org.skywalking.apm.collector.storage.define.noderef.NodeReferenceTable; +import org.skywalking.apm.collector.storage.base.define.noderef.NodeReferenceTable; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java index 3bad83c9a..4fa53875c 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceDagService.java @@ -20,7 +20,7 @@ package org.skywalking.apm.collector.ui.service; import com.google.gson.JsonArray; import com.google.gson.JsonObject; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.INodeComponentDAO; import org.skywalking.apm.collector.ui.dao.INodeMappingDAO; import org.skywalking.apm.collector.ui.dao.INodeReferenceDAO; diff --git a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java index 337e793a5..201b13b94 100644 --- a/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java +++ b/apm-collector-3.2.3/apm-collector-ui/src/main/java/org/skywalking/apm/collector/ui/service/TraceStackService.java @@ -28,7 +28,7 @@ import org.skywalking.apm.collector.core.util.CollectionUtils; import org.skywalking.apm.collector.core.util.Const; import org.skywalking.apm.collector.core.util.ObjectUtils; import org.skywalking.apm.collector.core.util.StringUtils; -import org.skywalking.apm.collector.storage.dao.DAOContainer; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; import org.skywalking.apm.collector.ui.dao.IGlobalTraceDAO; import org.skywalking.apm.collector.ui.dao.ISegmentDAO; import org.skywalking.apm.network.proto.SpanObject; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java index aedc59776..676a3ec53 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/StorageInstaller.java @@ -21,8 +21,8 @@ package org.skywalking.apm.collector.storage; import java.util.List; import org.skywalking.apm.collector.client.Client; import org.skywalking.apm.collector.core.define.DefineException; -import org.skywalking.apm.collector.storage.define.StorageDefineLoader; -import org.skywalking.apm.collector.storage.define.TableDefine; +import org.skywalking.apm.collector.storage.base.define.StorageDefineLoader; +import org.skywalking.apm.collector.storage.base.define.TableDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/DAO.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/DAO.java index b6819c5b4..6c332e5b9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/DAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.dao; +package org.skywalking.apm.collector.storage.base.dao; import org.skywalking.apm.collector.client.Client; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/DAOContainer.java similarity index 95% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/DAOContainer.java index 4d2c9b91e..dcab9495f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/DAOContainer.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/DAOContainer.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.dao; +package org.skywalking.apm.collector.storage.base.dao; import java.util.HashMap; import java.util.Map; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IBatchDAO.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IBatchDAO.java index f57aa8f5e..10c92b195 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/dao/IBatchDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IBatchDAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.dao; +package org.skywalking.apm.collector.storage.base.dao; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java similarity index 95% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java index 8777f9270..ad0105352 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Attribute.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java index 6727c87d1..0384583a5 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/AttributeType.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/ColumnDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/ColumnDefine.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java index f2da01dfa..e8efd260a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/ColumnDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java index 19d160b7c..db87cbc22 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/CommonTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java similarity index 98% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java index 8cb6d9e24..5e598a8af 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/DataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import org.skywalking.apm.collector.core.data.Data; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Operation.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Operation.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java index 3f065027b..1ff63c756 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Operation.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/StorageDefineLoader.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java similarity index 96% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/StorageDefineLoader.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java index c7402858b..af392396e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/StorageDefineLoader.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import java.util.LinkedList; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/StorageDefinitionFile.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/StorageDefinitionFile.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java index e15355bfa..d5994a8be 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/StorageDefinitionFile.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import org.skywalking.apm.collector.core.define.DefinitionFile; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java similarity index 95% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java index eb7e8669d..89d19c92b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import java.util.LinkedList; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java index bc5dd0b70..95245d16a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/Transform.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define; +package org.skywalking.apm.collector.storage.base.define; import org.skywalking.apm.collector.core.data.Data; diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/AddOperation.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java similarity index 92% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/AddOperation.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java index 86ceebc9d..584e71c2b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/AddOperation.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.operator; +package org.skywalking.apm.collector.storage.base.define.operator; -import org.skywalking.apm.collector.storage.define.Operation; +import org.skywalking.apm.collector.storage.base.define.Operation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/CoverOperation.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java similarity index 91% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/CoverOperation.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java index 87fe344df..531555eae 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/CoverOperation.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.operator; +package org.skywalking.apm.collector.storage.base.define.operator; -import org.skywalking.apm.collector.storage.define.Operation; +import org.skywalking.apm.collector.storage.base.define.Operation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/NonOperation.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java similarity index 91% rename from apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/NonOperation.java rename to apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java index 4930ddb0d..eeb5ff7a9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/define/operator/NonOperation.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.define.operator; +package org.skywalking.apm.collector.storage.base.define.operator; -import org.skywalking.apm.collector.storage.define.Operation; +import org.skywalking.apm.collector.storage.base.define.Operation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java index b60fd6b7f..d53c379e2 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.global; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java index ff52f9400..4836a783d 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/global/GlobalTraceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.global; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java index a35198d44..e723d61d0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceDataDefine.java @@ -18,12 +18,12 @@ package org.skywalking.apm.collector.storage.table.instance; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java index 203fc5669..ae309ff46 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/instance/InstPerformanceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.instance; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java index a35f37b3b..7b9608bb8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricDataDefine.java @@ -18,12 +18,12 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java index 3e47a210d..9a7fcfd62 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/CpuMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java index 73004636d..be928554e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java index 00007b552..9cf646b23 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/GCMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java index aba048c9d..bd8f68034 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java index 0cbd60764..e2b04d641 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java index b45d1fbd1..5ef95a348 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java index fc5915876..c84558667 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/jvm/MemoryPoolMetricTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.jvm; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java index 3f290d177..46f222c80 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java index 3693b2302..0c40af9a0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeComponentTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java index 8586a4fdd..f301ec019 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java index bad6ce6cc..f4a65a247 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/node/NodeMappingTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.node; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java index d5dd29657..8ff7a34e1 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.noderef; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java index 2b47af19a..f640c96d6 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/noderef/NodeReferenceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.noderef; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java index 92acd0969..a2e30bd25 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java index d8ed1184b..8f8d974bb 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java index 2bab996be..e3b6c526a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java index bda607499..bd0a88348 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java index 224e11beb..9ad0fddb4 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java index b9c326252..b6df01621 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.register; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java index 34d43c241..4f06c06f8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java index a1656a6a9..39c9481e9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentCostTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java index 2b9ff7f49..986afef1e 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java index 29a933cb5..cec261310 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/segment/SegmentTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.segment; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java index 58dbb00b3..12bb8f6bf 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.service; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.CoverOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.CoverOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java index 402a05c9b..9100ad4bc 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/service/ServiceEntryTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.service; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java index feeec7ad7..c60d35703 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceDataDefine.java @@ -18,11 +18,11 @@ package org.skywalking.apm.collector.storage.table.serviceref; -import org.skywalking.apm.collector.storage.define.Attribute; -import org.skywalking.apm.collector.storage.define.AttributeType; -import org.skywalking.apm.collector.storage.define.DataDefine; -import org.skywalking.apm.collector.storage.define.operator.AddOperation; -import org.skywalking.apm.collector.storage.define.operator.NonOperation; +import org.skywalking.apm.collector.storage.base.define.Attribute; +import org.skywalking.apm.collector.storage.base.define.AttributeType; +import org.skywalking.apm.collector.storage.base.define.DataDefine; +import org.skywalking.apm.collector.storage.base.define.operator.AddOperation; +import org.skywalking.apm.collector.storage.base.define.operator.NonOperation; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java index 587d66560..f0b5f8b90 100644 --- a/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java +++ b/apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/serviceref/ServiceReferenceTable.java @@ -18,7 +18,7 @@ package org.skywalking.apm.collector.storage.table.serviceref; -import org.skywalking.apm.collector.storage.define.CommonTable; +import org.skywalking.apm.collector.storage.base.define.CommonTable; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java index cb99a34b5..3a92ae347 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/StorageModuleEsProvider.java @@ -28,10 +28,10 @@ import org.skywalking.apm.collector.core.module.ModuleProvider; import org.skywalking.apm.collector.core.module.ServiceNotProvidedException; import org.skywalking.apm.collector.storage.StorageException; import org.skywalking.apm.collector.storage.StorageModule; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.es.dao.EsDAO; -import org.skywalking.apm.collector.storage.es.dao.EsDAODefineLoader; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchStorageInstaller; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.es.base.dao.EsDAO; +import org.skywalking.apm.collector.storage.es.base.dao.EsDAODefineLoader; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchStorageInstaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/BatchEsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/BatchEsDAO.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/BatchEsDAO.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/BatchEsDAO.java index e9bbb7fee..4c261c31a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/BatchEsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/BatchEsDAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.dao; +package org.skywalking.apm.collector.storage.es.base.dao; import java.util.List; import org.elasticsearch.action.bulk.BulkRequestBuilder; @@ -24,7 +24,7 @@ import org.elasticsearch.action.bulk.BulkResponse; import org.elasticsearch.action.index.IndexRequestBuilder; import org.elasticsearch.action.update.UpdateRequestBuilder; import org.skywalking.apm.collector.core.util.CollectionUtils; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAO.java similarity index 96% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAO.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAO.java index 2b40df121..10e0054d3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.dao; +package org.skywalking.apm.collector.storage.es.base.dao; import org.elasticsearch.action.search.SearchRequestBuilder; import org.elasticsearch.action.search.SearchResponse; @@ -26,7 +26,7 @@ import org.elasticsearch.search.aggregations.metrics.max.MaxAggregationBuilder; import org.elasticsearch.search.aggregations.metrics.min.Min; import org.elasticsearch.search.aggregations.metrics.min.MinAggregationBuilder; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; -import org.skywalking.apm.collector.storage.dao.DAO; +import org.skywalking.apm.collector.storage.base.dao.DAO; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAODefineLoader.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAODefineLoader.java similarity index 96% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAODefineLoader.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAODefineLoader.java index 1edd72f32..08a997619 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAODefineLoader.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAODefineLoader.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.dao; +package org.skywalking.apm.collector.storage.es.base.dao; import java.util.ArrayList; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAODefinitionFile.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAODefinitionFile.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAODefinitionFile.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAODefinitionFile.java index cadb61492..ecb703eab 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/EsDAODefinitionFile.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/dao/EsDAODefinitionFile.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.dao; +package org.skywalking.apm.collector.storage.es.base.dao; import org.skywalking.apm.collector.core.define.DefinitionFile; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchColumnDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchColumnDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java index fa2f4ad0c..5d3cd63fd 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchColumnDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.define; +package org.skywalking.apm.collector.storage.es.base.define; -import org.skywalking.apm.collector.storage.define.ColumnDefine; +import org.skywalking.apm.collector.storage.base.define.ColumnDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchStorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java similarity index 96% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchStorageInstaller.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java index 3407e7abd..81dc3eee3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchStorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.define; +package org.skywalking.apm.collector.storage.es.base.define; import java.io.IOException; import java.util.List; @@ -27,8 +27,8 @@ import org.elasticsearch.index.IndexNotFoundException; import org.skywalking.apm.collector.client.Client; import org.skywalking.apm.collector.client.elasticsearch.ElasticSearchClient; import org.skywalking.apm.collector.storage.StorageInstaller; -import org.skywalking.apm.collector.storage.define.ColumnDefine; -import org.skywalking.apm.collector.storage.define.TableDefine; +import org.skywalking.apm.collector.storage.base.define.ColumnDefine; +import org.skywalking.apm.collector.storage.base.define.TableDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java index 4216634b3..d875319a9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ElasticSearchTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.define; +package org.skywalking.apm.collector.storage.es.base.define; -import org.skywalking.apm.collector.storage.define.TableDefine; +import org.skywalking.apm.collector.storage.base.define.TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ApplicationEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationEsTableDefine.java similarity index 85% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ApplicationEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationEsTableDefine.java index 62dbf472e..cae76d3a0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ApplicationEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ApplicationEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.register.ApplicationTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/CpuMetricEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/CpuMetricEsTableDefine.java similarity index 86% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/CpuMetricEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/CpuMetricEsTableDefine.java index 5719043de..d49c48d46 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/CpuMetricEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/CpuMetricEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.jvm.CpuMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/GCMetricEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/GCMetricEsTableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/GCMetricEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/GCMetricEsTableDefine.java index 08464cd4d..0e5c5b52b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/GCMetricEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/GCMetricEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.jvm.GCMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/GlobalTraceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java similarity index 86% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/GlobalTraceEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java index 3ac9eb9fc..626961037 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/GlobalTraceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/GlobalTraceEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.global.GlobalTraceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/InstPerformanceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/InstPerformanceEsTableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/InstPerformanceEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/InstPerformanceEsTableDefine.java index 54247d2cf..92523d2d3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/InstPerformanceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/InstPerformanceEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.instance.InstPerformanceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/InstanceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/InstanceEsTableDefine.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/InstanceEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/InstanceEsTableDefine.java index b262aeb6b..0b1e59ab2 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/InstanceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/InstanceEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.register.InstanceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/MemoryMetricEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/MemoryMetricEsTableDefine.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/MemoryMetricEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/MemoryMetricEsTableDefine.java index d5f5cc312..25046557a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/MemoryMetricEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/MemoryMetricEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.jvm.MemoryMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/MemoryPoolMetricEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/MemoryPoolMetricEsTableDefine.java similarity index 90% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/MemoryPoolMetricEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/MemoryPoolMetricEsTableDefine.java index 9ed8e5470..86e34a89b 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/MemoryPoolMetricEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/MemoryPoolMetricEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeComponentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeComponentEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java index 7c0ea1367..4448559c8 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeComponentEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeComponentEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.node.NodeComponentTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeMappingEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeMappingEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java index bc7d52d02..ebe71f580 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeMappingEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeMappingEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.node.NodeMappingTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeReferenceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java similarity index 91% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeReferenceEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java index 7b754fd0c..2fd9859d5 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/NodeReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/NodeReferenceEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/SegmentCostEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentCostEsTableDefine.java similarity index 90% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/SegmentCostEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentCostEsTableDefine.java index a3ad98f6f..6af322e45 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/SegmentCostEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentCostEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.segment.SegmentCostTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/SegmentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java similarity index 84% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/SegmentEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java index 66af3922f..c5885869a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/SegmentEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.segment.SegmentTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceEntryEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceEntryEsTableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceEntryEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceEntryEsTableDefine.java index 41a9e343e..2621dfb37 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceEntryEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceEntryEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.service.ServiceEntryTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceNameEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceNameEsTableDefine.java similarity index 86% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceNameEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceNameEsTableDefine.java index 9198762f2..0b7eab1bc 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceNameEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceNameEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.register.ServiceNameTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceReferenceEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceReferenceEsTableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java index 87797da3f..2dd4612c9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/tabledefine/ServiceReferenceEsTableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/ServiceReferenceEsTableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.es.tabledefine; +package org.skywalking.apm.collector.storage.es.define; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchColumnDefine; -import org.skywalking.apm.collector.storage.es.define.ElasticSearchTableDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchColumnDefine; +import org.skywalking.apm.collector.storage.es.base.define.ElasticSearchTableDefine; import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define index 90ac94ee9..539421a58 100644 --- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define +++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/resources/META-INF/defines/storage.define @@ -1,16 +1,16 @@ -org.skywalking.apm.collector.storage.es.tabledefine.ApplicationEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.InstanceEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.ServiceNameEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.CpuMetricEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.GCMetricEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.MemoryMetricEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.MemoryPoolMetricEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.GlobalTraceEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.InstPerformanceEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.NodeComponentEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.NodeMappingEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.NodeReferenceEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.SegmentCostEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.SegmentEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.ServiceEntryEsTableDefine -org.skywalking.apm.collector.storage.es.tabledefine.ServiceReferenceEsTableDefine \ No newline at end of file +org.skywalking.apm.collector.storage.es.define.ApplicationEsTableDefine +org.skywalking.apm.collector.storage.es.define.InstanceEsTableDefine +org.skywalking.apm.collector.storage.es.define.ServiceNameEsTableDefine +org.skywalking.apm.collector.storage.es.define.CpuMetricEsTableDefine +org.skywalking.apm.collector.storage.es.define.GCMetricEsTableDefine +org.skywalking.apm.collector.storage.es.define.MemoryMetricEsTableDefine +org.skywalking.apm.collector.storage.es.define.MemoryPoolMetricEsTableDefine +org.skywalking.apm.collector.storage.es.define.GlobalTraceEsTableDefine +org.skywalking.apm.collector.storage.es.define.InstPerformanceEsTableDefine +org.skywalking.apm.collector.storage.es.define.NodeComponentEsTableDefine +org.skywalking.apm.collector.storage.es.define.NodeMappingEsTableDefine +org.skywalking.apm.collector.storage.es.define.NodeReferenceEsTableDefine +org.skywalking.apm.collector.storage.es.define.SegmentCostEsTableDefine +org.skywalking.apm.collector.storage.es.define.SegmentEsTableDefine +org.skywalking.apm.collector.storage.es.define.ServiceEntryEsTableDefine +org.skywalking.apm.collector.storage.es.define.ServiceReferenceEsTableDefine \ No newline at end of file diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java index 1dedd81be..3e2ba3a08 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/StorageModuleH2Provider.java @@ -28,10 +28,10 @@ import org.skywalking.apm.collector.core.module.ModuleProvider; import org.skywalking.apm.collector.core.module.ServiceNotProvidedException; import org.skywalking.apm.collector.storage.StorageException; import org.skywalking.apm.collector.storage.StorageModule; -import org.skywalking.apm.collector.storage.dao.DAOContainer; -import org.skywalking.apm.collector.storage.h2.dao.H2DAO; -import org.skywalking.apm.collector.storage.h2.dao.H2DAODefineLoader; -import org.skywalking.apm.collector.storage.h2.define.H2StorageInstaller; +import org.skywalking.apm.collector.storage.base.dao.DAOContainer; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO; +import org.skywalking.apm.collector.storage.h2.base.dao.H2DAODefineLoader; +import org.skywalking.apm.collector.storage.h2.base.define.H2StorageInstaller; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/BatchH2DAO.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/BatchH2DAO.java index 4175f47bb..d921b1d90 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/BatchH2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/BatchH2DAO.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import java.sql.Connection; import java.sql.PreparedStatement; @@ -25,8 +25,8 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.dao.IBatchDAO; -import org.skywalking.apm.collector.storage.h2.define.H2SqlEntity; +import org.skywalking.apm.collector.storage.base.dao.IBatchDAO; +import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAO.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAO.java index ff6403353..b73bfa802 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAO.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAO.java @@ -16,13 +16,13 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import java.sql.ResultSet; import java.sql.SQLException; import org.skywalking.apm.collector.client.h2.H2Client; import org.skywalking.apm.collector.client.h2.H2ClientException; -import org.skywalking.apm.collector.storage.dao.DAO; +import org.skywalking.apm.collector.storage.base.dao.DAO; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAODefineLoader.java similarity index 96% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAODefineLoader.java index df93af70a..ae73143e7 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefineLoader.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAODefineLoader.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import java.util.ArrayList; import java.util.List; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAODefinitionFile.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAODefinitionFile.java index ef47eff34..db92c2a77 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/H2DAODefinitionFile.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/dao/H2DAODefinitionFile.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.dao; +package org.skywalking.apm.collector.storage.h2.base.dao; import org.skywalking.apm.collector.core.define.DefinitionFile; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java index d8fd379ee..cb93aca66 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2ColumnDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; -import org.skywalking.apm.collector.storage.define.ColumnDefine; +import org.skywalking.apm.collector.storage.base.define.ColumnDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2SqlEntity.java similarity index 94% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2SqlEntity.java index 39cba0ad9..0818bf9f9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2SqlEntity.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2SqlEntity.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; /** * @author clevertension diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java similarity index 97% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java index 44c4eacee..dc8f78a44 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2StorageInstaller.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java @@ -16,7 +16,7 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; import org.skywalking.apm.collector.client.Client; import org.skywalking.apm.collector.client.h2.H2Client; @@ -24,7 +24,7 @@ import org.skywalking.apm.collector.client.h2.H2ClientException; import org.skywalking.apm.collector.storage.StorageException; import org.skywalking.apm.collector.storage.StorageInstallException; import org.skywalking.apm.collector.storage.StorageInstaller; -import org.skywalking.apm.collector.storage.define.TableDefine; +import org.skywalking.apm.collector.storage.base.define.TableDefine; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java similarity index 86% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java index b638ddc51..6f97cb0c0 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/H2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java @@ -16,9 +16,9 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.define; +package org.skywalking.apm.collector.storage.h2.base.define; -import org.skywalking.apm.collector.storage.define.TableDefine; +import org.skywalking.apm.collector.storage.base.define.TableDefine; /** * @author peng-yongsheng diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ApplicationH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationH2TableDefine.java similarity index 86% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ApplicationH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationH2TableDefine.java index 6f9b702cf..be21e2231 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ApplicationH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ApplicationH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.register.ApplicationTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/CpuMetricH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/CpuMetricH2TableDefine.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/CpuMetricH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/CpuMetricH2TableDefine.java index 62e8971ef..c74657f5a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/CpuMetricH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/CpuMetricH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.jvm.CpuMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/GCMetricH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/GCMetricH2TableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/GCMetricH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/GCMetricH2TableDefine.java index aa3e939de..905dec70a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/GCMetricH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/GCMetricH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.jvm.GCMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/GlobalTraceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/GlobalTraceH2TableDefine.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/GlobalTraceH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/GlobalTraceH2TableDefine.java index f542292f3..e2cd07f85 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/GlobalTraceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/GlobalTraceH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.global.GlobalTraceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/InstPerformanceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/InstPerformanceH2TableDefine.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/InstPerformanceH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/InstPerformanceH2TableDefine.java index 109b9a024..c1c6b8dd3 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/InstPerformanceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/InstPerformanceH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.instance.InstPerformanceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/InstanceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/InstanceH2TableDefine.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/InstanceH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/InstanceH2TableDefine.java index 4a9609974..e1c1da651 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/InstanceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/InstanceH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.register.InstanceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/MemoryMetricH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/MemoryMetricH2TableDefine.java similarity index 90% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/MemoryMetricH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/MemoryMetricH2TableDefine.java index a25094748..0ae2e68c2 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/MemoryMetricH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/MemoryMetricH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.jvm.MemoryMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/MemoryPoolMetricH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/MemoryPoolMetricH2TableDefine.java similarity index 90% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/MemoryPoolMetricH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/MemoryPoolMetricH2TableDefine.java index 7bf1da92d..657f8e587 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/MemoryPoolMetricH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/MemoryPoolMetricH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetricTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeComponentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeComponentH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java index 66bc7a6a3..166522864 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeComponentH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeComponentH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.node.NodeComponentTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeMappingH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java similarity index 88% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeMappingH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java index e8ef99c72..a615ab64a 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeMappingH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeMappingH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.node.NodeMappingTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeReferenceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java similarity index 91% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeReferenceH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java index 2c1627d86..906abf5a5 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/NodeReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/NodeReferenceH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/SegmentCostH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentCostH2TableDefine.java similarity index 90% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/SegmentCostH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentCostH2TableDefine.java index a90859ede..901fc1a5f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/SegmentCostH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentCostH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.segment.SegmentCostTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/SegmentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java similarity index 85% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/SegmentH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java index 321185f46..50001f547 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/SegmentH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.segment.SegmentTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceEntryH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceEntryH2TableDefine.java similarity index 89% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceEntryH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceEntryH2TableDefine.java index a25d003cf..bb66eead9 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceEntryH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceEntryH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.service.ServiceEntryTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceNameH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceNameH2TableDefine.java similarity index 87% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceNameH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceNameH2TableDefine.java index 38037e096..26a9e75a6 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceNameH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceNameH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.register.ServiceNameTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceReferenceH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java similarity index 93% rename from apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceReferenceH2TableDefine.java rename to apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java index 38511c95f..97f251439 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/tabledefine/ServiceReferenceH2TableDefine.java +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/ServiceReferenceH2TableDefine.java @@ -16,10 +16,10 @@ * Project repository: https://github.com/OpenSkywalking/skywalking */ -package org.skywalking.apm.collector.storage.h2.tabledefine; +package org.skywalking.apm.collector.storage.h2.define; -import org.skywalking.apm.collector.storage.h2.define.H2ColumnDefine; -import org.skywalking.apm.collector.storage.h2.define.H2TableDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2ColumnDefine; +import org.skywalking.apm.collector.storage.h2.base.define.H2TableDefine; import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceTable; /** diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define index 9aa768cd2..da36dc97f 100644 --- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define +++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/resources/META-INF/defines/storage.define @@ -1,16 +1,16 @@ -org.skywalking.apm.collector.storage.h2.tabledefine.ApplicationH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.InstanceH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.ServiceNameH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.CpuMetricH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.GCMetricH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.MemoryMetricH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.MemoryPoolMetricH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.GlobalTraceH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.InstPerformanceH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.NodeComponentH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.NodeMappingH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.NodeReferenceH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.SegmentCostH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.SegmentH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.ServiceEntryH2TableDefine -org.skywalking.apm.collector.storage.h2.tabledefine.ServiceReferenceH2TableDefine \ No newline at end of file +org.skywalking.apm.collector.storage.h2.define.ApplicationH2TableDefine +org.skywalking.apm.collector.storage.h2.define.InstanceH2TableDefine +org.skywalking.apm.collector.storage.h2.define.ServiceNameH2TableDefine +org.skywalking.apm.collector.storage.h2.define.CpuMetricH2TableDefine +org.skywalking.apm.collector.storage.h2.define.GCMetricH2TableDefine +org.skywalking.apm.collector.storage.h2.define.MemoryMetricH2TableDefine +org.skywalking.apm.collector.storage.h2.define.MemoryPoolMetricH2TableDefine +org.skywalking.apm.collector.storage.h2.define.GlobalTraceH2TableDefine +org.skywalking.apm.collector.storage.h2.define.InstPerformanceH2TableDefine +org.skywalking.apm.collector.storage.h2.define.NodeComponentH2TableDefine +org.skywalking.apm.collector.storage.h2.define.NodeMappingH2TableDefine +org.skywalking.apm.collector.storage.h2.define.NodeReferenceH2TableDefine +org.skywalking.apm.collector.storage.h2.define.SegmentCostH2TableDefine +org.skywalking.apm.collector.storage.h2.define.SegmentH2TableDefine +org.skywalking.apm.collector.storage.h2.define.ServiceEntryH2TableDefine +org.skywalking.apm.collector.storage.h2.define.ServiceReferenceH2TableDefine \ No newline at end of file