try fix IT

Signed-off-by: lance6716 <[email protected]>
lance6716 · Feb 26, 2024 · 12725fa · 12725fa
1 parent 844b110
commit 12725fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/pkg/ddl/backfilling_dist_scheduler.go b/pkg/ddl/backfilling_dist_scheduler.go
@@ -421,14 +421,13 @@ func splitSubtaskMetaForOneKVMetaGroup(
 		return nil, nil
 	}
 	pdCli := store.GetPDClient()
-	p, l, err := pdCli.GetTS(ctx)
+	physical, logical, err := pdCli.GetTS(ctx)
 	if err != nil {
 		return nil, err
 	}
-	ts := oracle.ComposeTS(p, l)
-	failpoint.Inject("mockTSForGlobalSort", func(val failpoint.Value) {
+	failpoint.Inject("mockPhysicalTSForGlobalSort", func(val failpoint.Value) {
 		i := val.(int)
-		ts = uint64(i)
+		physical = int64(i)
 	})
 	splitter, err := getRangeSplitter(
 		ctx, store, cloudStorageURI, int64(kvMeta.TotalKVSize), instanceCnt, kvMeta.MultipleFilesStats, logger)
@@ -462,6 +461,8 @@ func splitSubtaskMetaForOneKVMetaGroup(
 			return nil, errors.Errorf("invalid range, startKey: %s, endKey: %s",
 				hex.EncodeToString(startKey), hex.EncodeToString(endKey))
 		}
+		ts := oracle.ComposeTS(physical, logical)
+		logical++
 		m := &BackfillSubTaskMeta{
 			MetaGroups: []*external.SortedKVMeta{{
 				StartKey:    startKey,

diff --git a/tests/realtikvtest/addindextest2/global_sort_test.go b/tests/realtikvtest/addindextest2/global_sort_test.go
@@ -38,6 +38,7 @@ import (
 	"github.com/pingcap/tidb/pkg/types"
 	"github.com/pingcap/tidb/tests/realtikvtest"
 	"github.com/stretchr/testify/require"
+	"github.com/tikv/client-go/v2/oracle"
 )
 
 func init() {
@@ -273,13 +274,13 @@ func TestIngestUseSameTS(t *testing.T) {
 	tk.MustExec("set global tidb_enable_dist_task = on;")
 	tk.MustExec("set @@global.tidb_cloud_storage_uri = '" + cloudStorageURI + "';")
 
-	err = failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockTSForGlobalSort", `return(123456789)`)
+	err = failpoint.Enable("github.com/pingcap/tidb/pkg/ddl/mockPhysicalTSForGlobalSort", `return(123456789)`)
 	require.NoError(t, err)
 	tk.MustExec("create table t (a int);")
 	tk.MustExec("insert into t values (1), (2), (3);")
 	dom.DDL().SetHook(cb)
 	tk.MustExec("alter table t add index idx(a);")
-	err = failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockTSForGlobalSort")
+	err = failpoint.Disable("github.com/pingcap/tidb/pkg/ddl/mockPhysicalTSForGlobalSort")
 	require.NoError(t, err)
 
 	dts := []types.Datum{types.NewIntDatum(1)}
@@ -289,13 +290,14 @@ func TestIngestUseSameTS(t *testing.T) {
 
 	tikvStore := dom.Store().(helper.Storage)
 	newHelper := helper.NewHelper(tikvStore)
-	mvccResp, err := newHelper.GetMvccByEncodedKeyWithTS(idxKey, 123456789)
+	ts := oracle.ComposeTS(123456789, 0)
+	mvccResp, err := newHelper.GetMvccByEncodedKeyWithTS(idxKey, ts)
 	require.NoError(t, err)
 	require.NotNil(t, mvccResp)
 	require.NotNil(t, mvccResp.Info)
 	require.Greater(t, len(mvccResp.Info.Writes), 0)
 	// TODO(lance6716): it should be greater than startTS after finishing development of ingesting with PiTR
-	require.Equal(t, uint64(123456789), mvccResp.Info.Writes[0].CommitTs)
+	require.Equal(t, ts, mvccResp.Info.Writes[0].CommitTs)
 
 	tk.MustExec("set @@global.tidb_cloud_storage_uri = '';")
 }