set the user input mergeplan option correctly

Thejas-bhat · Thejas-bhat · commit c8138c8adc52 · 2025-03-27T11:13:46.000+05:30
diff --git a/index/scorch/merge.go b/index/scorch/merge.go
@@ -226,12 +226,14 @@ func (s *Scorch) parseMergePlannerOptions() (*mergeplan.MergePlanOptions,
 		}
 	}
 
-	po, err := s.parsePersisterOptions()
-	if err != nil {
-		return nil, err
-	}
+	if mergePlannerOptions.FloorSegmentFileSize == 0 {
+		po, err := s.parsePersisterOptions()
+		if err != nil {
+			return nil, err
+		}
 
-	mergePlannerOptions.FloorSegmentFileSize = int64(po.MaxSizeInMemoryMergePerWorker)
+		mergePlannerOptions.FloorSegmentFileSize = int64(po.MaxSizeInMemoryMergePerWorker)
+	}
 
 	return &mergePlannerOptions, nil
 }

Original file line number	Diff line number	Diff line change
`@@ -226,12 +226,14 @@ func (s Scorch) parseMergePlannerOptions() (mergeplan.MergePlanOptions,`
`226`	`226`	`}`
`227`	`227`	`}`
`228`	`228`
`229`		`- po, err := s.parsePersisterOptions()`
`230`		`- if err != nil {`
`231`		`- return nil, err`
`232`		`- }`
	`229`	`+ if mergePlannerOptions.FloorSegmentFileSize == 0 {`
	`230`	`+ po, err := s.parsePersisterOptions()`
	`231`	`+ if err != nil {`
	`232`	`+ return nil, err`
	`233`	`+ }`
`233`	`234`
`234`		`- mergePlannerOptions.FloorSegmentFileSize = int64(po.MaxSizeInMemoryMergePerWorker)`
	`235`	`+ mergePlannerOptions.FloorSegmentFileSize = int64(po.MaxSizeInMemoryMergePerWorker)`
	`236`	`+ }`
`235`	`237`
`236`	`238`	`return &mergePlannerOptions, nil`
`237`	`239`	`}`