Merge pull request apache#606 from OpenSkywalking/feature/582

wu-sheng · web-flow · commit 513ae0136c5b · 2017-11-21T09:41:38.000+08:00
Add TIME column for table segment data
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
@@ -53,6 +53,7 @@ public SegmentEsPersistenceDAO(ElasticSearchClient client) {
     @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-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 SegmentEsTableDefine() {
 
     @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/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 SegmentH2PersistenceDAO(H2Client client) {
         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());
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
@@ -34,5 +34,6 @@ public SegmentH2TableDefine() {
     @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()));
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -53,6 +53,7 @@ public SegmentEsPersistenceDAO(ElasticSearchClient client) {`
`53`	`53`	`@Override public IndexRequestBuilder prepareBatchInsert(Segment data) {`
`54`	`54`	`Map<String, Object> source = new HashMap<>();`
`55`	`55`	`source.put(SegmentTable.COLUMN_DATA_BINARY, new String(Base64.getEncoder().encode(data.getDataBinary())));`
	`56`	`+ source.put(SegmentTable.COLUMN_TIME_BUCKET, data.getTimeBucket());`
`56`	`57`	`logger.debug("segment source: {}", source.toString());`
`57`	`58`	`return getClient().prepareIndex(SegmentTable.TABLE, data.getId()).setSource(source);`
`58`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,5 +37,6 @@ public SegmentEsTableDefine() {`
`37`	`37`
`38`	`38`	`@Override public void initialize() {`
`39`	`39`	`addColumn(new ElasticSearchColumnDefine(SegmentTable.COLUMN_DATA_BINARY, ElasticSearchColumnDefine.Type.Binary.name()));`
	`40`	`+ addColumn(new ElasticSearchColumnDefine(SegmentTable.COLUMN_TIME_BUCKET, ElasticSearchColumnDefine.Type.Long.name()));`
`40`	`41`	`}`
`41`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,5 +34,6 @@ public SegmentH2TableDefine() {`
`34`	`34`	`@Override public void initialize() {`
`35`	`35`	`addColumn(new H2ColumnDefine(SegmentTable.COLUMN_ID, H2ColumnDefine.Type.Varchar.name()));`
`36`	`36`	`addColumn(new H2ColumnDefine(SegmentTable.COLUMN_DATA_BINARY, H2ColumnDefine.Type.BINARY.name()));`
	`37`	`+ addColumn(new H2ColumnDefine(SegmentTable.COLUMN_TIME_BUCKET, H2ColumnDefine.Type.Bigint.name()));`
`37`	`38`	`}`
`38`	`39`	`}`