From 4edcd4d22b63902bb69397753adef4003c0d4bce Mon Sep 17 00:00:00 2001 From: yah01 Date: Fri, 12 Jan 2024 10:20:51 +0800 Subject: [PATCH] fix: the insert count is zero after set the pointer to nil (#29870) (#29881) this leads to the EntitiesNum metric would be never reduced fix: #29766 pr: #29870 Signed-off-by: yah01 --- internal/querynodev2/segments/segment.go | 5 +---- internal/querynodev2/segments/segment_test.go | 15 ++++++++------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/internal/querynodev2/segments/segment.go b/internal/querynodev2/segments/segment.go index 27d8fc4da0..80f3f4bcb6 100644 --- a/internal/querynodev2/segments/segment.go +++ b/internal/querynodev2/segments/segment.go @@ -233,10 +233,6 @@ func (s *LocalSegment) InsertCount() int64 { s.ptrLock.RLock() defer s.ptrLock.RUnlock() - if !s.isValid() { - return 0 - } - return s.insertCount.Load() } @@ -987,5 +983,6 @@ func (s *LocalSegment) Release() { zap.Int64("partitionID", s.partitionID), zap.Int64("segmentID", s.ID()), zap.String("segmentType", s.typ.String()), + zap.Int64("insertCount", s.InsertCount()), ) } diff --git a/internal/querynodev2/segments/segment_test.go b/internal/querynodev2/segments/segment_test.go index 1b2d7e186f..1ecf0b8fd9 100644 --- a/internal/querynodev2/segments/segment_test.go +++ b/internal/querynodev2/segments/segment_test.go @@ -184,13 +184,14 @@ func (suite *SegmentSuite) TestLoadDupIndex() { func (suite *SegmentSuite) TestSegmentReleased() { suite.sealed.Release() - suite.sealed.ptrLock.RLock() - suite.False(suite.sealed.isValid()) - suite.sealed.ptrLock.RUnlock() - suite.EqualValues(0, suite.sealed.InsertCount()) - suite.EqualValues(0, suite.sealed.RowNum()) - suite.EqualValues(0, suite.sealed.MemSize()) - suite.False(suite.sealed.HasRawData(101)) + sealed := suite.sealed + + sealed.ptrLock.RLock() + suite.False(sealed.isValid()) + sealed.ptrLock.RUnlock() + suite.EqualValues(0, sealed.RowNum()) + suite.EqualValues(0, sealed.MemSize()) + suite.False(sealed.HasRawData(101)) } func TestSegment(t *testing.T) {