enhance: Rename preAllocatedSegments (#35871)

Rename `preAllocatedSegments` to `preAllocatedSegmentIDs` to avoid confusion. Signed-off-by: bigsheeper <[email protected]>
milvus-io · Sep 1, 2024 · 1413ffe · 1413ffe
1 parent 2e090b2
commit 1413ffe
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 28 deletions.
diff --git a/internal/datacoord/compaction_task_clustering.go b/internal/datacoord/compaction_task_clustering.go
@@ -172,7 +172,7 @@ func (t *clusteringCompactionTask) BuildCompactionRequest() (*datapb.CompactionP
 		AnalyzeResultPath:  path.Join(t.meta.(*meta).chunkManager.RootPath(), common.AnalyzeStatsPath, metautil.JoinIDPath(t.AnalyzeTaskID, t.AnalyzeVersion)),
 		AnalyzeSegmentIds:  t.GetInputSegments(),
 		BeginLogID:         beginLogID,
-		PreAllocatedSegments: &datapb.IDRange{
+		PreAllocatedSegmentIDs: &datapb.IDRange{
 			Begin: t.GetResultSegments()[0],
 			End:   t.GetResultSegments()[1],
 		},

diff --git a/internal/datacoord/compaction_task_mix.go b/internal/datacoord/compaction_task_mix.go
@@ -347,7 +347,7 @@ func (t *mixCompactionTask) BuildCompactionRequest() (*datapb.CompactionPlan, er
 		TotalRows:        t.GetTotalRows(),
 		Schema:           t.GetSchema(),
 		BeginLogID:       beginLogID,
-		PreAllocatedSegments: &datapb.IDRange{
+		PreAllocatedSegmentIDs: &datapb.IDRange{
 			Begin: t.GetResultSegments()[0],
 			End:   t.GetResultSegments()[1],
 		},

diff --git a/internal/datacoord/compaction_trigger_test.go b/internal/datacoord/compaction_trigger_test.go
@@ -481,14 +481,14 @@ func Test_compactionTrigger_force(t *testing.T) {
 						},
 					},
 					// StartTime:        0,
-					TimeoutInSeconds:     Params.DataCoordCfg.CompactionTimeoutInSeconds.GetAsInt32(),
-					Type:                 datapb.CompactionType_MixCompaction,
-					Channel:              "ch1",
-					TotalRows:            200,
-					Schema:               schema,
-					PreAllocatedSegments: &datapb.IDRange{Begin: 100, End: 200},
-					SlotUsage:            8,
-					MaxSize:              1342177280,
+					TimeoutInSeconds:       Params.DataCoordCfg.CompactionTimeoutInSeconds.GetAsInt32(),
+					Type:                   datapb.CompactionType_MixCompaction,
+					Channel:                "ch1",
+					TotalRows:              200,
+					Schema:                 schema,
+					PreAllocatedSegmentIDs: &datapb.IDRange{Begin: 100, End: 200},
+					SlotUsage:              8,
+					MaxSize:                1342177280,
 				},
 			},
 		},

diff --git a/internal/datanode/compaction/clustering_compactor.go b/internal/datanode/compaction/clustering_compactor.go
@@ -188,7 +188,7 @@ func (t *clusteringCompactionTask) init() error {
 	t.partitionID = t.plan.GetSegmentBinlogs()[0].GetPartitionID()
 
 	logIDAlloc := allocator.NewLocalAllocator(t.plan.GetBeginLogID(), math.MaxInt64)
-	segIDAlloc := allocator.NewLocalAllocator(t.plan.GetPreAllocatedSegments().GetBegin(), t.plan.GetPreAllocatedSegments().GetEnd())
+	segIDAlloc := allocator.NewLocalAllocator(t.plan.GetPreAllocatedSegmentIDs().GetBegin(), t.plan.GetPreAllocatedSegmentIDs().GetEnd())
 	t.logIDAlloc = logIDAlloc
 	t.segIDAlloc = segIDAlloc
 

diff --git a/internal/datanode/compaction/clustering_compactor_test.go b/internal/datanode/compaction/clustering_compactor_test.go
@@ -199,7 +199,7 @@ func (s *ClusteringCompactionTaskSuite) TestScalarCompactionNormal() {
 	s.task.plan.ClusteringKeyField = 100
 	s.task.plan.PreferSegmentRows = 2048
 	s.task.plan.MaxSegmentRows = 2048
-	s.task.plan.PreAllocatedSegments = &datapb.IDRange{
+	s.task.plan.PreAllocatedSegmentIDs = &datapb.IDRange{
 		Begin: time.Now().UnixMilli(),
 		End:   time.Now().UnixMilli() + 1000,
 	}

diff --git a/internal/datanode/compaction/mix_compactor.go b/internal/datanode/compaction/mix_compactor.go
@@ -135,7 +135,7 @@ func (t *mixCompactionTask) mergeSplit(
 
 	log := log.With(zap.Int64("planID", t.GetPlanID()))
 
-	segIDAlloc := allocator.NewLocalAllocator(t.plan.GetPreAllocatedSegments().GetBegin(), t.plan.GetPreAllocatedSegments().GetEnd())
+	segIDAlloc := allocator.NewLocalAllocator(t.plan.GetPreAllocatedSegmentIDs().GetBegin(), t.plan.GetPreAllocatedSegmentIDs().GetEnd())
 	logIDAlloc := allocator.NewLocalAllocator(t.plan.GetBeginLogID(), math.MaxInt64)
 	compAlloc := NewCompactionAllocator(segIDAlloc, logIDAlloc)
 	mWriter := NewMultiSegmentWriter(t.binlogIO, compAlloc, t.plan, t.maxRows, t.partitionID, t.collectionID)

diff --git a/internal/datanode/compaction/mix_compactor_test.go b/internal/datanode/compaction/mix_compactor_test.go
@@ -79,12 +79,12 @@ func (s *MixCompactionTaskSuite) SetupTest() {
 			Field2StatslogPaths: nil,
 			Deltalogs:           nil,
 		}},
-		TimeoutInSeconds:     10,
-		Type:                 datapb.CompactionType_MixCompaction,
-		Schema:               s.meta.GetSchema(),
-		BeginLogID:           19530,
-		PreAllocatedSegments: &datapb.IDRange{Begin: 19531, End: math.MaxInt64},
-		MaxSize:              64 * 1024 * 1024,
+		TimeoutInSeconds:       10,
+		Type:                   datapb.CompactionType_MixCompaction,
+		Schema:                 s.meta.GetSchema(),
+		BeginLogID:             19530,
+		PreAllocatedSegmentIDs: &datapb.IDRange{Begin: 19531, End: math.MaxInt64},
+		MaxSize:                64 * 1024 * 1024,
 	}
 
 	s.task = NewMixCompactionTask(context.Background(), s.mockBinlogIO, s.plan)

diff --git a/internal/datanode/services.go b/internal/datanode/services.go
@@ -234,7 +234,7 @@ func (node *DataNode) CompactionV2(ctx context.Context, req *datapb.CompactionPl
 			req,
 		)
 	case datapb.CompactionType_MixCompaction:
-		if req.GetPreAllocatedSegments() == nil || req.GetPreAllocatedSegments().GetBegin() == 0 {
+		if req.GetPreAllocatedSegmentIDs() == nil || req.GetPreAllocatedSegmentIDs().GetBegin() == 0 {
 			return merr.Status(merr.WrapErrParameterInvalidMsg("invalid pre-allocated segmentID range")), nil
 		}
 		task = compaction.NewMixCompactionTask(
@@ -243,7 +243,7 @@ func (node *DataNode) CompactionV2(ctx context.Context, req *datapb.CompactionPl
 			req,
 		)
 	case datapb.CompactionType_ClusteringCompaction:
-		if req.GetPreAllocatedSegments() == nil || req.GetPreAllocatedSegments().GetBegin() == 0 {
+		if req.GetPreAllocatedSegmentIDs() == nil || req.GetPreAllocatedSegmentIDs().GetBegin() == 0 {
 			return merr.Status(merr.WrapErrParameterInvalidMsg("invalid pre-allocated segmentID range")), nil
 		}
 		task = compaction.NewClusteringCompactionTask(

diff --git a/internal/datanode/services_test.go b/internal/datanode/services_test.go
@@ -270,9 +270,9 @@ func (s *DataNodeServicesSuite) TestCompaction() {
 				{SegmentID: 102, Level: datapb.SegmentLevel_L0},
 				{SegmentID: 103, Level: datapb.SegmentLevel_L1},
 			},
-			Type:                 datapb.CompactionType_ClusteringCompaction,
-			BeginLogID:           100,
-			PreAllocatedSegments: &datapb.IDRange{Begin: 100, End: 200},
+			Type:                   datapb.CompactionType_ClusteringCompaction,
+			BeginLogID:             100,
+			PreAllocatedSegmentIDs: &datapb.IDRange{Begin: 100, End: 200},
 		}
 
 		resp, err := node.CompactionV2(ctx, req)
@@ -315,9 +315,9 @@ func (s *DataNodeServicesSuite) TestCompaction() {
 				{SegmentID: 102, Level: datapb.SegmentLevel_L0},
 				{SegmentID: 103, Level: datapb.SegmentLevel_L1},
 			},
-			Type:                 datapb.CompactionType_ClusteringCompaction,
-			BeginLogID:           100,
-			PreAllocatedSegments: &datapb.IDRange{Begin: 0, End: 0},
+			Type:                   datapb.CompactionType_ClusteringCompaction,
+			BeginLogID:             100,
+			PreAllocatedSegmentIDs: &datapb.IDRange{Begin: 0, End: 0},
 		}
 
 		resp, err := node.CompactionV2(ctx, req)

diff --git a/internal/proto/data_coord.proto b/internal/proto/data_coord.proto
@@ -590,7 +590,7 @@ message CompactionPlan {
   repeated int64 analyze_segment_ids = 15;
   int32 state = 16;
   int64 begin_logID = 17;
-  IDRange pre_allocated_segments = 18; // only for clustering compaction
+  IDRange pre_allocated_segmentIDs = 18; // only for clustering compaction
   int64 slot_usage = 19;
   int64 max_size = 20;
 }