enhance: Reduce datanode metacache frequent scan range (#33400)

See also #32165

There were some frequent scan in metacache:
- List all segments whose start positions not synced
- List compacted segments

Those scan shall cause lots of CPU time when flushed segment number is
large meanwhile `Flushed` segments can be skipped in those two scenarios

This PR make:
- Add segment state shortcut in metacache
- List start positions state before `Flushed`
- Make compacted segments state to be `Dropped` and use `Dropped` state
while scanning them

---------

Signed-off-by: Congqi Xia <congqi.xia@zilliz.com>

internal/datanode/data_sync_service_test.go

@@ -433,6 +433,7 @@ func (s *DataSyncServiceSuite) TestStartStop() {
 					CollectionID:  collMeta.ID,
 					PartitionID:   1,
 					InsertChannel: insertChannelName,
+					State:         commonpb.SegmentState_Flushed,
 				},
 
 				1: {
@@ -440,6 +441,7 @@ func (s *DataSyncServiceSuite) TestStartStop() {
 					CollectionID:  collMeta.ID,
 					PartitionID:   1,
 					InsertChannel: insertChannelName,
+					State:         commonpb.SegmentState_Flushed,
 				},
 			}
 			return lo.FilterMap(segmentIDs, func(id int64, _ int) (*datapb.SegmentInfo, bool) {

internal/datanode/metacache/actions.go

@@ -25,40 +25,75 @@ import (
 	"github.com/milvus-io/milvus/pkg/util/typeutil"
 )
 
+type segmentCriterion struct {
+	ids    typeutil.Set[int64]
+	states typeutil.Set[commonpb.SegmentState]
+	others []SegmentFilter
+}
+
+func (sc *segmentCriterion) Match(segment *SegmentInfo) bool {
+	for _, filter := range sc.others {
+		if !filter.Filter(segment) {
+			return false
+		}
+	}
+	return true
+}
+
 type SegmentFilter interface {
 	Filter(info *SegmentInfo) bool
-	SegmentIDs() ([]int64, bool)
+	AddFilter(*segmentCriterion)
 }
 
+// SegmentIDFilter segment filter with segment ids.
 type SegmentIDFilter struct {
-	segmentIDs []int64
-	ids        typeutil.Set[int64]
-}
-
-func WithSegmentIDs(segmentIDs ...int64) SegmentFilter {
-	set := typeutil.NewSet(segmentIDs...)
-	return &SegmentIDFilter{
-		segmentIDs: segmentIDs,
-		ids:        set,
-	}
+	ids typeutil.Set[int64]
 }
 
 func (f *SegmentIDFilter) Filter(info *SegmentInfo) bool {
 	return f.ids.Contain(info.segmentID)
 }
 
-func (f *SegmentIDFilter) SegmentIDs() ([]int64, bool) {
-	return f.segmentIDs, true
+func (f *SegmentIDFilter) AddFilter(criterion *segmentCriterion) {
+	criterion.ids = f.ids
 }
 
+func WithSegmentIDs(segmentIDs ...int64) SegmentFilter {
+	set := typeutil.NewSet(segmentIDs...)
+	return &SegmentIDFilter{
+		ids: set,
+	}
+}
+
+// SegmentStateFilter segment filter with segment states.
+type SegmentStateFilter struct {
+	states typeutil.Set[commonpb.SegmentState]
+}
+
+func (f *SegmentStateFilter) Filter(info *SegmentInfo) bool {
+	return f.states.Contain(info.State())
+}
+
+func (f *SegmentStateFilter) AddFilter(criterion *segmentCriterion) {
+	criterion.states = f.states
+}
+
+func WithSegmentState(states ...commonpb.SegmentState) SegmentFilter {
+	set := typeutil.NewSet(states...)
+	return &SegmentStateFilter{
+		states: set,
+	}
+}
+
+// SegmentFilterFunc implements segment filter with other filters logic.
 type SegmentFilterFunc func(info *SegmentInfo) bool
 
 func (f SegmentFilterFunc) Filter(info *SegmentInfo) bool {
 	return f(info)
 }
 
-func (f SegmentFilterFunc) SegmentIDs() ([]int64, bool) {
-	return nil, false
+func (f SegmentFilterFunc) AddFilter(criterion *segmentCriterion) {
+	criterion.others = append(criterion.others, f)
 }
 
 func WithPartitionID(partitionID int64) SegmentFilter {
@@ -67,13 +102,6 @@ func WithPartitionID(partitionID int64) SegmentFilter {
 	})
 }
 
-func WithSegmentState(states ...commonpb.SegmentState) SegmentFilter {
-	set := typeutil.NewSet(states...)
-	return SegmentFilterFunc(func(info *SegmentInfo) bool {
-		return set.Len() > 0 && set.Contain(info.state)
-	})
-}
-
 func WithStartPosNotRecorded() SegmentFilter {
 	return SegmentFilterFunc(func(info *SegmentInfo) bool {
 		return !info.startPosRecorded

internal/datanode/metacache/meta_cache.go

@@ -60,18 +60,32 @@ type PkStatsFactory func(vchannel *datapb.SegmentInfo) *BloomFilterSet
 type metaCacheImpl struct {
 	collectionID int64
 	vChannelName string
-	segmentInfos map[int64]*SegmentInfo
 	schema       *schemapb.CollectionSchema
-	mu           sync.RWMutex
+
+	mu            sync.RWMutex
+	segmentInfos  map[int64]*SegmentInfo
+	stateSegments map[commonpb.SegmentState]map[int64]*SegmentInfo
 }
 
 func NewMetaCache(info *datapb.ChannelWatchInfo, factory PkStatsFactory) MetaCache {
 	vchannel := info.GetVchan()
 	cache := &metaCacheImpl{
-		collectionID: vchannel.GetCollectionID(),
-		vChannelName: vchannel.GetChannelName(),
-		segmentInfos: make(map[int64]*SegmentInfo),
-		schema:       info.GetSchema(),
+		collectionID:  vchannel.GetCollectionID(),
+		vChannelName:  vchannel.GetChannelName(),
+		segmentInfos:  make(map[int64]*SegmentInfo),
+		stateSegments: make(map[commonpb.SegmentState]map[int64]*SegmentInfo),
+		schema:        info.GetSchema(),
+	}
+
+	for _, state := range []commonpb.SegmentState{
+		commonpb.SegmentState_Growing,
+		commonpb.SegmentState_Sealed,
+		commonpb.SegmentState_Flushing,
+		commonpb.SegmentState_Flushed,
+		commonpb.SegmentState_Dropped,
+		commonpb.SegmentState_Importing,
+	} {
+		cache.stateSegments[state] = make(map[int64]*SegmentInfo)
 	}
 
 	cache.init(vchannel, factory)
@@ -80,13 +94,13 @@ func NewMetaCache(info *datapb.ChannelWatchInfo, factory PkStatsFactory) MetaCac
 
 func (c *metaCacheImpl) init(vchannel *datapb.VchannelInfo, factory PkStatsFactory) {
 	for _, seg := range vchannel.FlushedSegments {
-		c.segmentInfos[seg.GetID()] = NewSegmentInfo(seg, factory(seg))
+		c.addSegment(NewSegmentInfo(seg, factory(seg)))
 	}
 
 	for _, seg := range vchannel.UnflushedSegments {
 		// segment state could be sealed for growing segment if flush request processed before datanode watch
 		seg.State = commonpb.SegmentState_Growing
-		c.segmentInfos[seg.GetID()] = NewSegmentInfo(seg, factory(seg))
+		c.addSegment(NewSegmentInfo(seg, factory(seg)))
 	}
 }
 
@@ -110,7 +124,13 @@ func (c *metaCacheImpl) AddSegment(segInfo *datapb.SegmentInfo, factory PkStatsF
 	c.mu.Lock()
 	defer c.mu.Unlock()
 
-	c.segmentInfos[segInfo.GetID()] = segment
+	c.addSegment(segment)
+}
+
+func (c *metaCacheImpl) addSegment(segment *SegmentInfo) {
+	segID := segment.SegmentID()
+	c.segmentInfos[segID] = segment
+	c.stateSegments[segment.State()][segID] = segment
 }
 
 func (c *metaCacheImpl) CompactSegments(newSegmentID, partitionID int64, numOfRows int64, bfs *BloomFilterSet, oldSegmentIDs ...int64) {
@@ -121,7 +141,7 @@ func (c *metaCacheImpl) CompactSegments(newSegmentID, partitionID int64, numOfRo
 	if numOfRows > 0 {
 		compactTo = newSegmentID
 		if _, ok := c.segmentInfos[newSegmentID]; !ok {
-			c.segmentInfos[newSegmentID] = &SegmentInfo{
+			c.addSegment(&SegmentInfo{
 				segmentID:        newSegmentID,
 				partitionID:      partitionID,
 				state:            commonpb.SegmentState_Flushed,
@@ -129,7 +149,7 @@ func (c *metaCacheImpl) CompactSegments(newSegmentID, partitionID int64, numOfRo
 				flushedRows:      numOfRows,
 				startPosRecorded: true,
 				bfs:              bfs,
-			}
+			})
 		}
 		log.Info("add compactTo segment info metacache", zap.Int64("segmentID", compactTo))
 	}
@@ -140,7 +160,10 @@ func (c *metaCacheImpl) CompactSegments(newSegmentID, partitionID int64, numOfRo
 			oldSet.Contain(segment.compactTo) {
 			updated := segment.Clone()
 			updated.compactTo = compactTo
+			updated.state = commonpb.SegmentState_Dropped
 			c.segmentInfos[segment.segmentID] = updated
+			delete(c.stateSegments[commonpb.SegmentState_Flushed], segment.segmentID)
+			c.stateSegments[commonpb.SegmentState_Dropped][segment.segmentID] = segment
 			log.Info("update segment compactTo",
 				zap.Int64("segmentID", segment.segmentID),
 				zap.Int64("originalCompactTo", segment.compactTo),
@@ -160,6 +183,7 @@ func (c *metaCacheImpl) RemoveSegments(filters ...SegmentFilter) []int64 {
 	var result []int64
 	process := func(id int64, info *SegmentInfo) {
 		delete(c.segmentInfos, id)
+		delete(c.stateSegments[info.State()], id)
 		result = append(result, id)
 	}
 	c.rangeWithFilter(process, filters...)
@@ -207,6 +231,8 @@ func (c *metaCacheImpl) UpdateSegments(action SegmentAction, filters ...SegmentF
 		nInfo := info.Clone()
 		action(nInfo)
 		c.segmentInfos[id] = nInfo
+		delete(c.stateSegments[info.State()], info.SegmentID())
+		c.stateSegments[nInfo.State()][nInfo.SegmentID()] = nInfo
 	}, filters...)
 }
 
@@ -223,38 +249,38 @@ func (c *metaCacheImpl) PredictSegments(pk storage.PrimaryKey, filters ...Segmen
 }
 
 func (c *metaCacheImpl) rangeWithFilter(fn func(id int64, info *SegmentInfo), filters ...SegmentFilter) {
-	var hasIDs bool
-	set := typeutil.NewSet[int64]()
-	filtered := make([]SegmentFilter, 0, len(filters))
+	criterion := &segmentCriterion{}
 	for _, filter := range filters {
-		ids, ok := filter.SegmentIDs()
-		if ok {
-			set.Insert(ids...)
-			hasIDs = true
-		} else {
-			filtered = append(filtered, filter)
-		}
-	}
-	mergedFilter := func(info *SegmentInfo) bool {
-		for _, filter := range filtered {
-			if !filter.Filter(info) {
-				return false
-			}
-		}
-		return true
+		filter.AddFilter(criterion)
 	}
 
-	if hasIDs {
-		for id := range set {
-			info, has := c.segmentInfos[id]
-			if has && mergedFilter(info) {
-				fn(id, info)
-			}
-		}
+	var candidates []map[int64]*SegmentInfo
+	if criterion.states != nil {
+		candidates = lo.Map(criterion.states.Collect(), func(state commonpb.SegmentState, _ int) map[int64]*SegmentInfo {
+			return c.stateSegments[state]
+		})
 	} else {
-		for id, info := range c.segmentInfos {
-			if mergedFilter(info) {
-				fn(id, info)
+		candidates = []map[int64]*SegmentInfo{
+			c.segmentInfos,
+		}
+	}
+
+	for _, candidate := range candidates {
+		var segments map[int64]*SegmentInfo
+		if criterion.ids != nil {
+			segments = lo.SliceToMap(lo.FilterMap(criterion.ids.Collect(), func(id int64, _ int) (*SegmentInfo, bool) {
+				segment, ok := candidate[id]
+				return segment, ok
+			}), func(segment *SegmentInfo) (int64, *SegmentInfo) {
+				return segment.SegmentID(), segment
+			})
+		} else {
+			segments = candidate
+		}
+
+		for id, segment := range segments {
+			if criterion.Match(segment) {
+				fn(id, segment)
 			}
 		}
 	}

internal/datanode/services_test.go

@@ -283,6 +283,7 @@ func (s *DataNodeServicesSuite) TestFlushSegments() {
 		ID:            segmentID,
 		CollectionID:  1,
 		PartitionID:   2,
+		State:         commonpb.SegmentState_Growing,
 		StartPosition: &msgpb.MsgPosition{},
 	}, func(_ *datapb.SegmentInfo) *metacache.BloomFilterSet { return metacache.NewBloomFilterSet() })
 

internal/datanode/syncmgr/meta_writer.go

@@ -7,6 +7,7 @@ import (
 	"github.com/samber/lo"
 	"go.uber.org/zap"
 
+	"github.com/milvus-io/milvus-proto/go-api/v2/commonpb"
 	"github.com/milvus-io/milvus/internal/datanode/broker"
 	"github.com/milvus-io/milvus/internal/datanode/metacache"
 	"github.com/milvus-io/milvus/internal/proto/datapb"
@@ -60,7 +61,8 @@ func (b *brokerMetaWriter) UpdateSync(pack *SyncTask) error {
 		Position:  pack.checkpoint,
 	})
 
-	startPos := lo.Map(pack.metacache.GetSegmentsBy(metacache.WithStartPosNotRecorded()), func(info *metacache.SegmentInfo, _ int) *datapb.SegmentStartPosition {
+	startPos := lo.Map(pack.metacache.GetSegmentsBy(metacache.WithSegmentState(commonpb.SegmentState_Growing, commonpb.SegmentState_Sealed, commonpb.SegmentState_Flushing),
+		metacache.WithStartPosNotRecorded()), func(info *metacache.SegmentInfo, _ int) *datapb.SegmentStartPosition {
 		return &datapb.SegmentStartPosition{
 			SegmentID:     info.SegmentID(),
 			StartPosition: info.StartPosition(),
@@ -150,7 +152,8 @@ func (b *brokerMetaWriter) UpdateSyncV2(pack *SyncTaskV2) error {
 		Position:  pack.checkpoint,
 	})
 
-	startPos := lo.Map(pack.metacache.GetSegmentsBy(metacache.WithStartPosNotRecorded()), func(info *metacache.SegmentInfo, _ int) *datapb.SegmentStartPosition {
+	startPos := lo.Map(pack.metacache.GetSegmentsBy(metacache.WithSegmentState(commonpb.SegmentState_Growing, commonpb.SegmentState_Flushing),
+		metacache.WithStartPosNotRecorded()), func(info *metacache.SegmentInfo, _ int) *datapb.SegmentStartPosition {
 		return &datapb.SegmentStartPosition{
 			SegmentID:     info.SegmentID(),
 			StartPosition: info.StartPosition(),

internal/datanode/syncmgr/meta_writer_test.go

@@ -39,7 +39,7 @@ func (s *MetaWriterSuite) TestNormalSave() {
 	bfs := metacache.NewBloomFilterSet()
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, bfs)
 	metacache.UpdateNumOfRows(1000)(seg)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacache.EXPECT().GetSegmentByID(mock.Anything).Return(seg, true)
 	s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 	task := NewSyncTask()
@@ -55,7 +55,7 @@ func (s *MetaWriterSuite) TestReturnError() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, bfs)
 	metacache.UpdateNumOfRows(1000)(seg)
 	s.metacache.EXPECT().GetSegmentByID(mock.Anything).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	task := NewSyncTask()
 	task.WithMetaCache(s.metacache)
 	err := s.writer.UpdateSync(task)
@@ -69,7 +69,7 @@ func (s *MetaWriterSuite) TestNormalSaveV2() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, bfs)
 	metacache.UpdateNumOfRows(1000)(seg)
 	s.metacache.EXPECT().GetSegmentByID(mock.Anything).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	task := NewSyncTaskV2()
 	task.WithMetaCache(s.metacache)
 	err := s.writer.UpdateSyncV2(task)
@@ -83,7 +83,7 @@ func (s *MetaWriterSuite) TestReturnErrorV2() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, bfs)
 	metacache.UpdateNumOfRows(1000)(seg)
 	s.metacache.EXPECT().GetSegmentByID(mock.Anything).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	task := NewSyncTaskV2()
 	task.WithMetaCache(s.metacache)
 	err := s.writer.UpdateSyncV2(task)

internal/datanode/syncmgr/mock_sync_manager.go

@@ -57,7 +57,7 @@ type MockSyncManager_GetEarliestPosition_Call struct {
 }
 
 // GetEarliestPosition is a helper method to define mock.On call
-//  - channel string
+//   - channel string
 func (_e *MockSyncManager_Expecter) GetEarliestPosition(channel interface{}) *MockSyncManager_GetEarliestPosition_Call {
 	return &MockSyncManager_GetEarliestPosition_Call{Call: _e.mock.On("GetEarliestPosition", channel)}
 }
@@ -101,8 +101,8 @@ type MockSyncManager_SyncData_Call struct {
 }
 
 // SyncData is a helper method to define mock.On call
-//  - ctx context.Context
-//  - task Task
+//   - ctx context.Context
+//   - task Task
 func (_e *MockSyncManager_Expecter) SyncData(ctx interface{}, task interface{}) *MockSyncManager_SyncData_Call {
 	return &MockSyncManager_SyncData_Call{Call: _e.mock.On("SyncData", ctx, task)}
 }

internal/datanode/syncmgr/sync_manager_test.go

@@ -155,7 +155,7 @@ func (s *SyncManagerSuite) TestSubmit() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, bfs)
 	metacache.UpdateNumOfRows(1000)(seg)
 	s.metacache.EXPECT().GetSegmentByID(s.segmentID).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 
 	manager, err := NewSyncManager(s.chunkManager, s.allocator)
@@ -186,7 +186,7 @@ func (s *SyncManagerSuite) TestCompacted() {
 	metacache.UpdateNumOfRows(1000)(seg)
 	metacache.CompactTo(1001)(seg)
 	s.metacache.EXPECT().GetSegmentByID(s.segmentID).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 
 	manager, err := NewSyncManager(s.chunkManager, s.allocator)

internal/datanode/syncmgr/task_test.go

@@ -185,7 +185,7 @@ func (s *SyncTaskSuite) TestRunNormal() {
 	metacache.UpdateNumOfRows(1000)(seg)
 	seg.GetBloomFilterSet().Roll()
 	s.metacache.EXPECT().GetSegmentByID(s.segmentID).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 
 	s.Run("without_data", func() {
@@ -268,7 +268,7 @@ func (s *SyncTaskSuite) TestRunL0Segment() {
 	bfs := metacache.NewBloomFilterSet()
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{Level: datapb.SegmentLevel_L0}, bfs)
 	s.metacache.EXPECT().GetSegmentByID(s.segmentID).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 
 	s.Run("pure_delete_l0_flush", func() {
@@ -362,7 +362,7 @@ func (s *SyncTaskSuite) TestRunError() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, metacache.NewBloomFilterSet())
 	metacache.UpdateNumOfRows(1000)(seg)
 	s.metacache.EXPECT().GetSegmentByID(s.segmentID).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 
 	s.Run("allocate_id_fail", func() {
 		mockAllocator := allocator.NewMockAllocator(s.T())

internal/datanode/syncmgr/taskv2_test.go

@@ -216,7 +216,7 @@ func (s *SyncTaskSuiteV2) TestRunNormal() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{}, bfs)
 	metacache.UpdateNumOfRows(1000)(seg)
 	s.metacache.EXPECT().GetSegmentByID(mock.Anything).Return(seg, true)
-	s.metacache.EXPECT().GetSegmentsBy(mock.Anything).Return([]*metacache.SegmentInfo{seg})
+	s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 
 	s.Run("without_insert_delete", func() {

internal/datanode/writebuffer/bf_write_buffer.go

@@ -98,7 +98,8 @@ func (wb *bfWriteBuffer) BufferData(insertMsgs []*msgstream.InsertMsg, deleteMsg
 	// update pk oracle
 	for _, inData := range groups {
 		// segment shall always exists after buffer insert
-		segments := wb.metaCache.GetSegmentsBy(metacache.WithSegmentIDs(inData.segmentID))
+		segments := wb.metaCache.GetSegmentsBy(
+			metacache.WithSegmentIDs(inData.segmentID))
 		for _, segment := range segments {
 			for _, fieldData := range inData.pkField {
 				err := segment.GetBloomFilterSet().UpdatePKRange(fieldData)

internal/datanode/writebuffer/bf_write_buffer_test.go

@@ -218,7 +218,7 @@ func (s *BFWriteBufferSuite) TestBufferData() {
 		s.metacacheInt64.EXPECT().GetSegmentByID(int64(1000)).Return(nil, false)
 		s.metacacheInt64.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacacheInt64.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
-		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 
 		pks, msg := s.composeInsertMsg(1000, 10, 128, schemapb.DataType_Int64)
 		delMsg := s.composeDeleteMsg(lo.Map(pks, func(id int64, _ int) storage.PrimaryKey { return storage.NewInt64PrimaryKey(id) }))
@@ -248,7 +248,7 @@ func (s *BFWriteBufferSuite) TestBufferData() {
 		s.metacacheVarchar.EXPECT().GetSegmentByID(int64(1000)).Return(nil, false)
 		s.metacacheVarchar.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacacheVarchar.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
-		s.metacacheVarchar.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacacheVarchar.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 
 		pks, msg := s.composeInsertMsg(1000, 10, 128, schemapb.DataType_VarChar)
 		delMsg := s.composeDeleteMsg(lo.Map(pks, func(id int64, _ int) storage.PrimaryKey { return storage.NewVarCharPrimaryKey(fmt.Sprintf("%v", id)) }))
@@ -273,7 +273,7 @@ func (s *BFWriteBufferSuite) TestBufferData() {
 		s.metacacheInt64.EXPECT().GetSegmentByID(int64(1000)).Return(nil, false)
 		s.metacacheInt64.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacacheInt64.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
-		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 
 		pks, msg := s.composeInsertMsg(1000, 10, 128, schemapb.DataType_VarChar)
 		delMsg := s.composeDeleteMsg(lo.Map(pks, func(id int64, _ int) storage.PrimaryKey { return storage.NewInt64PrimaryKey(id) }))
@@ -294,7 +294,7 @@ func (s *BFWriteBufferSuite) TestBufferData() {
 		s.metacacheVarchar.EXPECT().GetSegmentByID(int64(1000)).Return(nil, false)
 		s.metacacheVarchar.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacacheVarchar.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
-		s.metacacheVarchar.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacacheVarchar.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 
 		pks, msg := s.composeInsertMsg(1000, 10, 128, schemapb.DataType_Int64)
 		delMsg := s.composeDeleteMsg(lo.Map(pks, func(id int64, _ int) storage.PrimaryKey { return storage.NewInt64PrimaryKey(id) }))
@@ -325,7 +325,7 @@ func (s *BFWriteBufferSuite) TestAutoSync() {
 		s.metacacheInt64.EXPECT().GetSegmentByID(int64(1000)).Return(seg, true).Once()
 		s.metacacheInt64.EXPECT().GetSegmentByID(int64(1002)).Return(seg1, true)
 		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything).Return([]int64{1002})
-		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 		s.metacacheInt64.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacacheInt64.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 		s.metacacheInt64.EXPECT().UpdateSegments(mock.Anything, mock.Anything, mock.Anything).Return()
@@ -363,7 +363,7 @@ func (s *BFWriteBufferSuite) TestBufferDataWithStorageV2() {
 	seg := metacache.NewSegmentInfo(&datapb.SegmentInfo{ID: 1000}, metacache.NewBloomFilterSet())
 	s.metacacheInt64.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 	s.metacacheInt64.EXPECT().GetSegmentByID(int64(1000)).Return(nil, false)
-	s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+	s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 	s.metacacheInt64.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 	s.metacacheInt64.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
 
@@ -409,7 +409,7 @@ func (s *BFWriteBufferSuite) TestAutoSyncWithStorageV2() {
 		s.metacacheInt64.EXPECT().GetSegmentByID(int64(1000)).Return(seg, true).Once()
 		s.metacacheInt64.EXPECT().GetSegmentByID(int64(1002)).Return(seg1, true)
 		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything).Return([]int64{1002})
-		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{1003}) // mocked compacted
+		s.metacacheInt64.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{1003}) // mocked compacted
 		s.metacacheInt64.EXPECT().RemoveSegments(mock.Anything).Return([]int64{1003})
 		s.metacacheInt64.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacacheInt64.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()

internal/datanode/writebuffer/l0_write_buffer_test.go

@@ -186,7 +186,7 @@ func (s *L0WriteBufferSuite) TestBufferData() {
 		s.metacache.EXPECT().GetSegmentByID(int64(1000)).Return(nil, false).Once()
 		s.metacache.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
-		s.metacache.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacache.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 
 		metrics.DataNodeFlowGraphBufferDataSize.Reset()
 		err = wb.BufferData([]*msgstream.InsertMsg{msg}, []*msgstream.DeleteMsg{delMsg}, &msgpb.MsgPosition{Timestamp: 100}, &msgpb.MsgPosition{Timestamp: 200})
@@ -215,7 +215,7 @@ func (s *L0WriteBufferSuite) TestBufferData() {
 		s.metacache.EXPECT().GetSegmentsBy(mock.Anything, mock.Anything).Return([]*metacache.SegmentInfo{seg})
 		s.metacache.EXPECT().AddSegment(mock.Anything, mock.Anything, mock.Anything).Return()
 		s.metacache.EXPECT().UpdateSegments(mock.Anything, mock.Anything).Return()
-		s.metacache.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything).Return([]int64{})
+		s.metacache.EXPECT().GetSegmentIDsBy(mock.Anything, mock.Anything, mock.Anything).Return([]int64{})
 
 		metrics.DataNodeFlowGraphBufferDataSize.Reset()
 		err = wb.BufferData([]*msgstream.InsertMsg{msg}, []*msgstream.DeleteMsg{delMsg}, &msgpb.MsgPosition{Timestamp: 100}, &msgpb.MsgPosition{Timestamp: 200})

internal/datanode/writebuffer/write_buffer.go

@@ -279,7 +279,10 @@ func (wb *writeBufferBase) triggerSync() (segmentIDs []int64) {
 }
 
 func (wb *writeBufferBase) cleanupCompactedSegments() {
-	segmentIDs := wb.metaCache.GetSegmentIDsBy(metacache.WithCompacted(), metacache.WithNoSyncingTask())
+	segmentIDs := wb.metaCache.GetSegmentIDsBy(
+		metacache.WithSegmentState(commonpb.SegmentState_Dropped),
+		metacache.WithCompacted(),
+		metacache.WithNoSyncingTask())
 	// remove compacted only when there is no writebuffer
 	targetIDs := lo.Filter(segmentIDs, func(segmentID int64, _ int) bool {
 		_, ok := wb.buffers[segmentID]