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] 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 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());