Refactor stream module.

apm-collector/apm-collector-boot/src/main/resources/application.yml

-cluster:
-  zookeeper:
-    hostPort: localhost:2181
-    sessionTimeout: 100000
 naming:
   jetty:
     host: localhost

apm-collector/apm-collector-component/pom.xml

@@ -14,7 +14,6 @@
     <modules>
         <module>client-component</module>
         <module>server-component</module>
-        <module>stream-component</module>
         <module>queue-component</module>
     </modules>
 

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/DaemonThreadFactory.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue;
-
-import java.util.concurrent.ThreadFactory;
-
-/**
- * @author peng-yongsheng
- */
-public enum DaemonThreadFactory implements ThreadFactory {
-    INSTANCE;
-
-    @Override
-    public Thread newThread(Runnable r) {
-        Thread t = new Thread(r);
-        t.setDaemon(true);
-        return t;
-    }
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/MessageHolder.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue;
-
-/**
- * @author peng-yongsheng
- */
-public class MessageHolder {
-    private Object message;
-
-    public Object getMessage() {
-        return message;
-    }
-
-    public void setMessage(Object message) {
-        this.message = message;
-    }
-
-    public void reset() {
-        message = null;
-    }
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueCreator.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue;
-
-/**
- * @author peng-yongsheng
- */
-public interface QueueCreator {
-    QueueEventHandler create(int queueSize, QueueExecutor executor);
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueEventHandler.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue;
-
-/**
- * @author peng-yongsheng
- */
-public interface QueueEventHandler {
-    void tell(Object message);
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/QueueExecutor.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue;
-
-/**
- * @author peng-yongsheng
- */
-public interface QueueExecutor {
-    void execute(Object message);
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorEventHandler.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue.disruptor;
-
-import com.lmax.disruptor.EventHandler;
-import com.lmax.disruptor.RingBuffer;
-import org.skywalking.apm.collector.queue.EndOfBatchCommand;
-import org.skywalking.apm.collector.queue.MessageHolder;
-import org.skywalking.apm.collector.queue.QueueEventHandler;
-import org.skywalking.apm.collector.queue.QueueExecutor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * @author peng-yongsheng
- */
-public class DisruptorEventHandler implements EventHandler<MessageHolder>, QueueEventHandler {
-
-    private final Logger logger = LoggerFactory.getLogger(DisruptorEventHandler.class);
-
-    private RingBuffer<MessageHolder> ringBuffer;
-    private QueueExecutor executor;
-
-    DisruptorEventHandler(RingBuffer<MessageHolder> ringBuffer, QueueExecutor executor) {
-        this.ringBuffer = ringBuffer;
-        this.executor = executor;
-    }
-
-    /**
-     * Receive the message from disruptor, when message in disruptor is empty, then send the cached data
-     * to the next workers.
-     *
-     * @param event published to the {@link RingBuffer}
-     * @param sequence of the event being processed
-     * @param endOfBatch flag to indicate if this is the last event in a batch from the {@link RingBuffer}
-     */
-    public void onEvent(MessageHolder event, long sequence, boolean endOfBatch) {
-        Object message = event.getMessage();
-        event.reset();
-
-        executor.execute(message);
-        if (endOfBatch) {
-            executor.execute(new EndOfBatchCommand());
-        }
-    }
-
-    /**
-     * Push the message into disruptor ring buffer.
-     *
-     * @param message of the data to process.
-     */
-    public void tell(Object message) {
-        long sequence = ringBuffer.next();
-        try {
-            ringBuffer.get(sequence).setMessage(message);
-        } finally {
-            ringBuffer.publish(sequence);
-        }
-    }
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/DisruptorQueueCreator.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue.disruptor;
-
-import com.lmax.disruptor.RingBuffer;
-import com.lmax.disruptor.dsl.Disruptor;
-import org.skywalking.apm.collector.queue.DaemonThreadFactory;
-import org.skywalking.apm.collector.queue.MessageHolder;
-import org.skywalking.apm.collector.queue.QueueCreator;
-import org.skywalking.apm.collector.queue.QueueEventHandler;
-import org.skywalking.apm.collector.queue.QueueExecutor;
-
-/**
- * @author peng-yongsheng
- */
-public class DisruptorQueueCreator implements QueueCreator {
-
-    @Override public QueueEventHandler create(int queueSize, QueueExecutor executor) {
-        // Specify the size of the ring buffer, must be power of 2.
-        if (!((((queueSize - 1) & queueSize) == 0) && queueSize != 0)) {
-            throw new IllegalArgumentException("queue size must be power of 2");
-        }
-
-        // Construct the Disruptor
-        Disruptor<MessageHolder> disruptor = new Disruptor(MessageHolderFactory.INSTANCE, queueSize, DaemonThreadFactory.INSTANCE);
-
-        RingBuffer<MessageHolder> ringBuffer = disruptor.getRingBuffer();
-        DisruptorEventHandler eventHandler = new DisruptorEventHandler(ringBuffer, executor);
-
-        // Connect the handler
-        disruptor.handleEventsWith(eventHandler);
-
-        // Start the Disruptor, starts all threads running
-        disruptor.start();
-        return eventHandler;
-    }
-}

apm-collector/apm-collector-component/queue-component/src/main/java/org/skywalking/apm/collector/queue/disruptor/MessageHolderFactory.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.queue.disruptor;
-
-import com.lmax.disruptor.EventFactory;
-import org.skywalking.apm.collector.queue.MessageHolder;
-
-/**
- * @author peng-yongsheng
- */
-public class MessageHolderFactory implements EventFactory<MessageHolder> {
-
-    public static MessageHolderFactory INSTANCE = new MessageHolderFactory();
-
-    public MessageHolder newInstance() {
-        return new MessageHolder();
-    }
-}

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Attribute.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Attribute.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/AttributeType.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/AttributeType.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/ColumnDefine.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/ColumnDefine.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/CommonTable.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/CommonTable.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/DataDefine.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/DataDefine.java

@@ -16,9 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
-
-import org.skywalking.apm.collector.core.data.Data;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Operation.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/Operation.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefineLoader.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefineLoader.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 import java.util.LinkedList;
 import java.util.List;

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/StorageDefinitionFile.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/StorageDefinitionFile.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 import org.skywalking.apm.collector.core.define.DefinitionFile;
 

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/TableDefine.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/TableDefine.java

@@ -16,7 +16,7 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define;
+package org.skywalking.apm.collector.core.data;
 
 import java.util.LinkedList;
 import java.util.List;

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/AddOperation.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/AddOperation.java

@@ -16,9 +16,9 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define.operator;
+package org.skywalking.apm.collector.core.data.operator;
 
-import org.skywalking.apm.collector.storage.base.define.Operation;
+import org.skywalking.apm.collector.core.data.Operation;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/CoverOperation.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/CoverOperation.java

@@ -16,9 +16,9 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define.operator;
+package org.skywalking.apm.collector.core.data.operator;
 
-import org.skywalking.apm.collector.storage.base.define.Operation;
+import org.skywalking.apm.collector.core.data.Operation;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/operator/NonOperation.java → apm-collector/apm-collector-core/src/main/java/org/skywalking/apm/collector/core/data/operator/NonOperation.java

@@ -16,9 +16,9 @@
  * Project repository: https://github.com/OpenSkywalking/skywalking
  */
 
-package org.skywalking.apm.collector.storage.base.define.operator;
+package org.skywalking.apm.collector.core.data.operator;
 
-import org.skywalking.apm.collector.storage.base.define.Operation;
+import org.skywalking.apm.collector.core.data.Operation;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-queue/collector-queue-datacarrier-provider/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Project repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-queue</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-queue-datacarrier-provider</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-component/stream-component/pom.xml → apm-collector/apm-collector-queue/collector-queue-define/pom.xml

 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Project repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>apm-collector-component</artifactId>
+        <artifactId>apm-collector-queue</artifactId>
         <groupId>org.skywalking</groupId>
         <version>3.2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>stream-component</artifactId>
+    <artifactId>collector-queue-define</artifactId>
     <packaging>jar</packaging>
 
 </project>
\ No newline at end of file

apm-collector/apm-collector-queue/collector-queue-disruptor-provider/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Project repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-queue</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-queue-disruptor-provider</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-queue/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Project repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>apm-collector-queue</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>collector-queue-define</module>
+        <module>collector-queue-datacarrier-provider</module>
+        <module>collector-queue-disruptor-provider</module>
+    </modules>
+
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-remote/collector-remote-grpc-provider/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Project repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-remote</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-remote-grpc-provider</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-remote/collector-remote-kafka-provider/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright 2017, OpenSkywalking Organization All rights reserved.
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~     http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License.
+  ~
+  ~ Project repository: https://github.com/OpenSkywalking/skywalking
+  -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>apm-collector-remote</artifactId>
+        <groupId>org.skywalking</groupId>
+        <version>3.2.3-2017</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>collector-remote-kafka-provider</artifactId>
+    <packaging>jar</packaging>
+
+</project>
\ No newline at end of file

apm-collector/apm-collector-remote/pom.xml

@@ -14,6 +14,8 @@
     <modules>
         <module>collector-remote-define</module>
         <module>collector-remote-grpc-define</module>
+        <module>collector-remote-kafka-provider</module>
+        <module>collector-remote-grpc-provider</module>
     </modules>
 
     <dependencies>

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.base.define.StorageDefineLoader;
-import org.skywalking.apm.collector.storage.base.define.TableDefine;
+import org.skywalking.apm.collector.core.data.StorageDefineLoader;
+import org.skywalking.apm.collector.core.data.TableDefine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/dao/IPersistenceDAO.java

@@ -19,7 +19,7 @@
 package org.skywalking.apm.collector.storage.base.dao;
 
 import org.skywalking.apm.collector.core.data.Data;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/base/define/Transform.java

-/*
- * Copyright 2017, OpenSkywalking Organization All rights reserved.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- * Project repository: https://github.com/OpenSkywalking/skywalking
- */
-
-package org.skywalking.apm.collector.storage.base.define;
-
-import org.skywalking.apm.collector.core.data.Data;
-
-/**
- * @author peng-yongsheng
- */
-public interface Transform<T> {
-    Data toData();
-
-    T toSelf(Data data);
-}

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.AddOperation;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.AddOperation;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.AddOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ApplicationDataDefine.java

@@ -19,11 +19,11 @@
 package org.skywalking.apm.collector.storage.table.register;
 
 import org.skywalking.apm.collector.core.data.Data;
-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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/InstanceDataDefine.java

@@ -19,11 +19,11 @@
 package org.skywalking.apm.collector.storage.table.register;
 
 import org.skywalking.apm.collector.core.data.Data;
-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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-define/src/main/java/org/skywalking/apm/collector/storage/table/register/ServiceNameDataDefine.java

@@ -19,11 +19,11 @@
 package org.skywalking.apm.collector.storage.table.register;
 
 import org.skywalking.apm.collector.core.data.Data;
-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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.CoverOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

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.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;
+import org.skywalking.apm.collector.core.data.Attribute;
+import org.skywalking.apm.collector.core.data.AttributeType;
+import org.skywalking.apm.collector.core.data.DataDefine;
+import org.skywalking.apm.collector.core.data.operator.AddOperation;
+import org.skywalking.apm.collector.core.data.operator.NonOperation;
 
 /**
  * @author peng-yongsheng

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.base.define.CommonTable;
+import org.skywalking.apm.collector.core.data.CommonTable;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchColumnDefine.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.storage.es.base.define;
 
-import org.skywalking.apm.collector.storage.base.define.ColumnDefine;
+import org.skywalking.apm.collector.core.data.ColumnDefine;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchStorageInstaller.java

@@ -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.base.define.ColumnDefine;
-import org.skywalking.apm.collector.storage.base.define.TableDefine;
+import org.skywalking.apm.collector.core.data.ColumnDefine;
+import org.skywalking.apm.collector.core.data.TableDefine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/base/define/ElasticSearchTableDefine.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.storage.es.base.define;
 
-import org.skywalking.apm.collector.storage.base.define.TableDefine;
+import org.skywalking.apm.collector.core.data.TableDefine;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/CpuMetricEsDAO.java

@@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.ICpuMetricDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.jvm.CpuMetricTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GCMetricEsDAO.java

@@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IGCMetricDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.jvm.GCMetricTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/GlobalTraceEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.UnexpectedException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IGlobalTraceDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.global.GlobalTraceTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstPerformanceEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IInstPerformanceDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.instance.InstPerformanceTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/InstanceHeartBeatEsDAO.java

@@ -26,7 +26,7 @@ import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.UnexpectedException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.register.InstanceTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryMetricEsDAO.java

@@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IMemoryMetricDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.jvm.MemoryMetricTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/MemoryPoolMetricEsDAO.java

@@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.jvm.MemoryPoolMetricTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeComponentEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.INodeComponentDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.node.NodeComponentTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/NodeReferenceEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.INodeReferenceDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.noderef.NodeReferenceTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentCostEsDAO.java

@@ -24,7 +24,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.ISegmentCostDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.segment.SegmentCostTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.ISegmentDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.segment.SegmentTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceEntryEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IServiceEntryDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.service.ServiceEntryTable;

apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/ServiceReferenceEsDAO.java

@@ -25,7 +25,7 @@ import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.action.update.UpdateRequestBuilder;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IServiceReferenceDAO;
 import org.skywalking.apm.collector.storage.es.base.dao.EsDAO;
 import org.skywalking.apm.collector.storage.table.serviceref.ServiceReferenceTable;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2ColumnDefine.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.storage.h2.base.define;
 
-import org.skywalking.apm.collector.storage.base.define.ColumnDefine;
+import org.skywalking.apm.collector.core.data.ColumnDefine;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2StorageInstaller.java

@@ -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.base.define.TableDefine;
+import org.skywalking.apm.collector.core.data.TableDefine;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/base/define/H2TableDefine.java

@@ -18,7 +18,7 @@
 
 package org.skywalking.apm.collector.storage.h2.base.define;
 
-import org.skywalking.apm.collector.storage.base.define.TableDefine;
+import org.skywalking.apm.collector.core.data.TableDefine;
 
 /**
  * @author peng-yongsheng

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/CpuMetricH2DAO.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.ICpuMetricDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GCMetricH2DAO.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IGCMetricDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/GlobalTraceH2DAO.java

@@ -23,7 +23,7 @@ import java.util.Map;
 import org.skywalking.apm.collector.core.UnexpectedException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IGlobalTraceDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstPerformanceH2DAO.java

@@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IInstPerformanceDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/InstanceHeartBeatH2DAO.java

@@ -29,7 +29,7 @@ import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.UnexpectedException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IInstanceHeartBeatDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryMetricH2DAO.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IMemoryMetricDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/MemoryPoolMetricH2DAO.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IMemoryPoolMetricDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeComponentH2DAO.java

@@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.INodeComponentDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/NodeReferenceH2DAO.java

@@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.INodeReferenceDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentCostH2DAO.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.ISegmentCostDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2DAO.java

@@ -22,7 +22,7 @@ import java.util.HashMap;
 import java.util.Map;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.ISegmentDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceEntryH2DAO.java

@@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IServiceEntryDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/ServiceReferenceH2DAO.java

@@ -28,7 +28,7 @@ import org.skywalking.apm.collector.client.h2.H2Client;
 import org.skywalking.apm.collector.client.h2.H2ClientException;
 import org.skywalking.apm.collector.core.data.Data;
 import org.skywalking.apm.collector.storage.base.dao.IPersistenceDAO;
-import org.skywalking.apm.collector.storage.base.define.DataDefine;
+import org.skywalking.apm.collector.core.data.DataDefine;
 import org.skywalking.apm.collector.storage.dao.IServiceReferenceDAO;
 import org.skywalking.apm.collector.storage.h2.base.dao.H2DAO;
 import org.skywalking.apm.collector.storage.h2.base.define.H2SqlEntity;

apm-collector/apm-collector-component/queue-component/pom.xml → apm-collector/apm-collector-stream/collector-stream-define/pom.xml

@@ -21,20 +21,20 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>apm-collector-component</artifactId>
+        <artifactId>apm-collector-stream</artifactId>
         <groupId>org.skywalking</groupId>
         <version>3.2.3-2017</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>queue-component</artifactId>
+    <artifactId>collector-stream-define</artifactId>
     <packaging>jar</packaging>
 
     <dependencies>
         <dependency>
-            <groupId>com.lmax</groupId>
-            <artifactId>disruptor</artifactId>
-            <version>3.3.6</version>
+            <groupId>org.skywalking</groupId>
+            <artifactId>queue-component</artifactId>
+            <version>${project.version}</version>
         </dependency>
     </dependencies>
 </project>
\ No newline at end of file

apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java → apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorker.java

@@ -18,6 +18,8 @@
 
 package org.skywalking.apm.collector.stream;
 
+import org.skywalking.apm.collector.queue.QueueExecutor;
+
 /**
  * The <code>AbstractLocalAsyncWorker</code> implementations represent workers,
  * which receive local asynchronous message.

apm-collector/apm-collector-component/stream-component/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java → apm-collector/apm-collector-stream/collector-stream-define/src/main/java/org/skywalking/apm/collector/stream/AbstractLocalAsyncWorkerProvider.java

@@ -18,14 +18,9 @@
 
 package org.skywalking.apm.collector.stream;
 
-import org.skywalking.apm.collector.core.framework.CollectorContextHelper;
-import org.skywalking.apm.collector.core.queue.QueueCreator;
-import org.skywalking.apm.collector.core.queue.QueueEventHandler;
-import org.skywalking.apm.collector.core.queue.QueueExecutor;
-import org.skywalking.apm.collector.queue.QueueModuleContext;
-import org.skywalking.apm.collector.queue.QueueModuleGroupDefine;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorker;
-import org.skywalking.apm.collector.stream.worker.impl.PersistenceWorkerContainer;
+import org.skywalking.apm.collector.queue.QueueCreator;
+import org.skywalking.apm.collector.queue.QueueEventHandler;
+import org.skywalking.apm.collector.queue.QueueExecutor;
 
 /**
  * @author peng-yongsheng