From 90bd26c89e351c6a8a0c0d308725f6f5c1aeca73 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Mon, 20 Nov 2017 13:30:59 +0800
Subject: [PATCH 1/2] Add TIME column for table segment data

#582
---
 .../apm/collector/storage/es/define/SegmentEsTableDefine.java    | 1 +
 .../apm/collector/storage/h2/define/SegmentH2TableDefine.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java
index c5885869a..787cca045 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/define/SegmentEsTableDefine.java
@@ -37,5 +37,6 @@ public class SegmentEsTableDefine extends ElasticSearchTableDefine {
 
     @Override public void initialize() {
         addColumn(new ElasticSearchColumnDefine(SegmentTable.COLUMN_DATA_BINARY, ElasticSearchColumnDefine.Type.Binary.name()));
+        addColumn(new ElasticSearchColumnDefine(SegmentTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name()));
     }
 }
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java
index 50001f547..aa096647c 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/define/SegmentH2TableDefine.java
@@ -34,5 +34,6 @@ public class SegmentH2TableDefine extends H2TableDefine {
     @Override public void initialize() {
         addColumn(new H2ColumnDefine(SegmentTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name()));
         addColumn(new H2ColumnDefine(SegmentTable.COLUMN_DATA_BINARY, H2ColumnDefine.Type.BINARY.name()));
+        addColumn(new H2ColumnDefine(SegmentTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name()));
     }
 }

From 4d415a8aeeb554ddee3062f45ac73536419a8fb9 Mon Sep 17 00:00:00 2001
From: peng-yongsheng <8082209@qq.com>
Date: Tue, 21 Nov 2017 09:11:27 +0800
Subject: [PATCH 2/2] Add the time bucket setting in segment DAO class.

---
 .../apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java    | 1 +
 .../apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java    | 1 +
 2 files changed, 2 insertions(+)

diff --git a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java
index aed49c510..a1011e0ec 100644
--- a/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-es-provider/src/main/java/org/skywalking/apm/collector/storage/es/dao/SegmentEsPersistenceDAO.java
@@ -53,6 +53,7 @@ public class SegmentEsPersistenceDAO extends EsDAO implements ISegmentPersistenc
     @Override public IndexRequestBuilder prepareBatchInsert(Segment data) {
         Map<String, Object> source = new HashMap<>();
         source.put(SegmentTable.COLUMN_DATA_BINARY, new String(Base64.getEncoder().encode(data.getDataBinary())));
+        source.put(SegmentTable.COLUMN_TIME_BUCKET, data.getTimeBucket());
         logger.debug("segment source: {}", source.toString());
         return getClient().prepareIndex(SegmentTable.TABLE, data.getId()).setSource(source);
     }
diff --git a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java
index 4f84b1c61..c0e0d85e3 100644
--- a/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java
+++ b/apm-collector/apm-collector-storage/collector-storage-h2-provider/src/main/java/org/skywalking/apm/collector/storage/h2/dao/SegmentH2PersistenceDAO.java
@@ -50,6 +50,7 @@ public class SegmentH2PersistenceDAO extends H2DAO implements ISegmentPersistenc
         H2SqlEntity entity = new H2SqlEntity();
         source.put(SegmentTable.COLUMN_ID, data.getId());
         source.put(SegmentTable.COLUMN_DATA_BINARY, data.getDataBinary());
+        source.put(SegmentTable.COLUMN_TIME_BUCKET, data.getTimeBucket());
         logger.debug("segment source: {}", source.toString());
 
         String sql = SqlBuilder.buildBatchInsertSql(SegmentTable.TABLE, source.keySet());