From 41297f89b5efa239687d9fedd376c8f67a21b2be Mon Sep 17 00:00:00 2001 From: bigsheeper Date: Tue, 22 Sep 2020 11:47:25 +0800 Subject: [PATCH] Add segment stats functions Signed-off-by: bigsheeper --- reader/read_node/segment.go | 1 - reader/read_node/segment_service.go | 10 ++++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/reader/read_node/segment.go b/reader/read_node/segment.go index b52e5cfc5..8c452686b 100644 --- a/reader/read_node/segment.go +++ b/reader/read_node/segment.go @@ -88,7 +88,6 @@ func (s *Segment) CloseSegment(collection* Collection) error { // Change segment status to indexed s.SegmentStatus = SegmentIndexed - s.SegmentStatus = SegmentClosed return nil } diff --git a/reader/read_node/segment_service.go b/reader/read_node/segment_service.go index 7bed55212..1e5aa004b 100644 --- a/reader/read_node/segment_service.go +++ b/reader/read_node/segment_service.go @@ -21,7 +21,7 @@ func (node *QueryNode) SegmentsManagement() { // TODO: check segment status if timeNow >= oldSegment.SegmentCloseTime { // close old segment and move it into partition.ClosedSegments - if oldSegment.SegmentStatus == SegmentClosed { + if oldSegment.SegmentStatus != SegmentOpened { log.Println("Never reach here, Opened segment cannot be closed") continue } @@ -66,14 +66,16 @@ func (node *QueryNode) SegmentStatistic(sleepMillisecondTime int) { memIncreaseRate := float32((int64(currentMemSize))-(int64(segment.LastMemSize))) / (float32(sleepMillisecondTime) / 1000) segment.LastMemSize = currentMemSize - //segmentStatus := segment.SegmentStatus - //segmentNumOfRows := segment.GetRowCount() + segmentStatus := segment.SegmentStatus + segmentNumOfRows := segment.GetRowCount() stat := masterPb.SegmentStat{ // TODO: set master pb's segment id type from uint64 to int64 - SegmentId: uint64(segmentID), + SegmentId: uint64(segmentID), MemorySize: currentMemSize, MemoryRate: memIncreaseRate, + Status: masterPb.SegmentStatus(segmentStatus), + Rows: segmentNumOfRows, } statisticData = append(statisticData, stat) -- GitLab