fix: time disorder of order files after merge unordered data (openGemini#586)

Signed-off-by: fx408 <[email protected]>

Author: fx408

engine/immutable/merge_out_of_order.go

@@ -279,7 +279,7 @@ func (m *MmsTables) matchOrderFiles(ctx *MergeContext) {
 			continue
 		}
 
-		if ctx.tr.Overlaps(min, max) || min > ctx.tr.Max {
+		if ctx.order.Len() > 0 || ctx.tr.Overlaps(min, max) || min > ctx.tr.Max {
 			ctx.order.add(f)
 		}
 	}

engine/immutable/merge_tool_test.go

@@ -576,6 +576,37 @@ func TestMergeTool_Merge_mod17(t *testing.T) {
 	}
 }
 
+func TestMergeTool_Merge_mod18(t *testing.T) {
+	var begin int64 = 1e12
+	defer beforeTest(t, 10)()
+	schemas := getDefaultSchemas()
+
+	immutable.SetMergeFlag4TsStore(1)
+	mh := NewMergeTestHelper(immutable.NewTsStoreConfig())
+	defer mh.store.Close()
+	rg := newRecordGenerator(begin, defaultInterval, false)
+
+	rg.setBegin(begin)
+	mh.addRecord(100, rg.generate(schemas, 1))
+	mh.addRecord(101, rg.generate(schemas, 10))
+	require.NoError(t, mh.saveToOrder())
+
+	rg.setBegin(begin).incrBegin(2)
+	mh.addRecord(100, rg.generate(schemas, 1))
+	require.NoError(t, mh.saveToOrder())
+
+	rg.setBegin(begin).incrBegin(5)
+	mh.addRecord(100, rg.generate(schemas, 1))
+	require.NoError(t, mh.saveToUnordered())
+
+	assert.NoError(t, mh.mergeAndCompact(true))
+	assert.NoError(t, mh.store.FullCompact(1))
+	mh.store.Wait()
+	for _, rec := range mh.readMergedRecord() {
+		record.CheckTimes(rec.Times())
+	}
+}
+
 func TestMergeTool_recentFile(t *testing.T) {
 	var begin int64 = 1e12
 	defer beforeTest(t, 0)()