Unverified Commit 513ae013 authored by 吴晟's avatar 吴晟 Committed by GitHub
Browse files

Merge pull request #606 from OpenSkywalking/feature/582 

Add TIME column for table segment data
parents 59630799 6e642dfd

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

+1 −0
Original line number Diff line number Diff line
@@ -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);

    }

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

+1 −0
Original line number Diff line number Diff line
@@ -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()));

    }

}

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

+1 −0
Original line number Diff line number Diff line
@@ -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());

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

+1 −0
Original line number Diff line number Diff line
@@ -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()));

    }

}