This is an automated cherry-pick of #58473

Signed-off-by: ti-chi-bot <[email protected]>

Author: you06

pkg/ddl/ddl_test.go

@@ -304,3 +304,235 @@ func TestCheckDuplicateConstraint(t *testing.T) {
 	err = checkDuplicateConstraint(constrNames, "u1", ast.ConstraintUniq)
 	require.EqualError(t, err, "[ddl:1061]Duplicate key name 'u1'")
 }
+<<<<<<< HEAD
+=======
+
+func TestGetTableDataKeyRanges(t *testing.T) {
+	// case 1, empty flashbackIDs
+	keyRanges := getTableDataKeyRanges([]int64{})
+	require.Len(t, keyRanges, 1)
+	require.Equal(t, keyRanges[0].StartKey, tablecodec.EncodeTablePrefix(0))
+	require.Equal(t, keyRanges[0].EndKey, tablecodec.EncodeTablePrefix(meta.MaxGlobalID))
+
+	// case 2, insert a execluded table ID
+	keyRanges = getTableDataKeyRanges([]int64{3})
+	require.Len(t, keyRanges, 2)
+	require.Equal(t, keyRanges[0].StartKey, tablecodec.EncodeTablePrefix(0))
+	require.Equal(t, keyRanges[0].EndKey, tablecodec.EncodeTablePrefix(3))
+	require.Equal(t, keyRanges[1].StartKey, tablecodec.EncodeTablePrefix(4))
+	require.Equal(t, keyRanges[1].EndKey, tablecodec.EncodeTablePrefix(meta.MaxGlobalID))
+
+	// case 3, insert some execluded table ID
+	keyRanges = getTableDataKeyRanges([]int64{3, 5, 9})
+	require.Len(t, keyRanges, 4)
+	require.Equal(t, keyRanges[0].StartKey, tablecodec.EncodeTablePrefix(0))
+	require.Equal(t, keyRanges[0].EndKey, tablecodec.EncodeTablePrefix(3))
+	require.Equal(t, keyRanges[1].StartKey, tablecodec.EncodeTablePrefix(4))
+	require.Equal(t, keyRanges[1].EndKey, tablecodec.EncodeTablePrefix(5))
+	require.Equal(t, keyRanges[2].StartKey, tablecodec.EncodeTablePrefix(6))
+	require.Equal(t, keyRanges[2].EndKey, tablecodec.EncodeTablePrefix(9))
+	require.Equal(t, keyRanges[3].StartKey, tablecodec.EncodeTablePrefix(10))
+	require.Equal(t, keyRanges[3].EndKey, tablecodec.EncodeTablePrefix(meta.MaxGlobalID))
+}
+
+func TestMergeContinuousKeyRanges(t *testing.T) {
+	cases := []struct {
+		input  []keyRangeMayExclude
+		expect []kv.KeyRange
+	}{
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: true,
+				},
+			},
+			[]kv.KeyRange{},
+		},
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: false,
+				},
+			},
+			[]kv.KeyRange{{StartKey: []byte{1}, EndKey: []byte{2}}},
+		},
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: false,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{3}, EndKey: []byte{4}},
+					exclude: false,
+				},
+			},
+			[]kv.KeyRange{{StartKey: []byte{1}, EndKey: []byte{4}}},
+		},
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: false,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{3}, EndKey: []byte{4}},
+					exclude: true,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{5}, EndKey: []byte{6}},
+					exclude: false,
+				},
+			},
+			[]kv.KeyRange{
+				{StartKey: []byte{1}, EndKey: []byte{2}},
+				{StartKey: []byte{5}, EndKey: []byte{6}},
+			},
+		},
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: true,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{3}, EndKey: []byte{4}},
+					exclude: true,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{5}, EndKey: []byte{6}},
+					exclude: false,
+				},
+			},
+			[]kv.KeyRange{{StartKey: []byte{5}, EndKey: []byte{6}}},
+		},
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: false,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{3}, EndKey: []byte{4}},
+					exclude: true,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{5}, EndKey: []byte{6}},
+					exclude: true,
+				},
+			},
+			[]kv.KeyRange{{StartKey: []byte{1}, EndKey: []byte{2}}},
+		},
+		{
+			[]keyRangeMayExclude{
+				{
+					r:       kv.KeyRange{StartKey: []byte{1}, EndKey: []byte{2}},
+					exclude: true,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{3}, EndKey: []byte{4}},
+					exclude: false,
+				},
+				{
+					r:       kv.KeyRange{StartKey: []byte{5}, EndKey: []byte{6}},
+					exclude: true,
+				},
+			},
+			[]kv.KeyRange{{StartKey: []byte{3}, EndKey: []byte{4}}},
+		},
+	}
+
+	for i, ca := range cases {
+		ranges := mergeContinuousKeyRanges(ca.input)
+		require.Equal(t, ca.expect, ranges, "case %d", i)
+	}
+}
+
+func TestDetectAndUpdateJobVersion(t *testing.T) {
+	d := &ddl{ddlCtx: &ddlCtx{ctx: context.Background()}}
+
+	reset := func() {
+		model.SetJobVerInUse(model.JobVersion1)
+	}
+	t.Cleanup(reset)
+	// other ut in the same address space might change it
+	reset()
+	require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+
+	t.Run("in ut", func(t *testing.T) {
+		reset()
+		d.detectAndUpdateJobVersion()
+		if testargsv1.ForceV1 {
+			require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+		} else {
+			require.Equal(t, model.JobVersion2, model.GetJobVerInUse())
+		}
+	})
+
+	d.etcdCli = &clientv3.Client{}
+	mockGetAllServerInfo := func(t *testing.T, versions ...string) {
+		serverInfos := make(map[string]*infosync.ServerInfo, len(versions))
+		for i, v := range versions {
+			serverInfos[fmt.Sprintf("node%d", i)] = &infosync.ServerInfo{
+				StaticServerInfo: infosync.StaticServerInfo{
+					ServerVersionInfo: infosync.ServerVersionInfo{Version: v},
+				}}
+		}
+		bytes, err := json.Marshal(serverInfos)
+		require.NoError(t, err)
+		inTerms := fmt.Sprintf("return(`%s`)", string(bytes))
+		testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/domain/infosync/mockGetAllServerInfo", inTerms)
+	}
+
+	t.Run("all support v2, even with pre-release label", func(t *testing.T) {
+		reset()
+		mockGetAllServerInfo(t, "8.0.11-TiDB-v8.4.0-alpha-228-g650888fea7-dirty",
+			"8.0.11-TiDB-v8.4.1", "8.0.11-TiDB-8.5.0-beta")
+		d.detectAndUpdateJobVersion()
+		require.Equal(t, model.JobVersion2, model.GetJobVerInUse())
+	})
+
+	t.Run("v1 first, later all support v2", func(t *testing.T) {
+		reset()
+		intervalBak := detectJobVerInterval
+		t.Cleanup(func() {
+			detectJobVerInterval = intervalBak
+		})
+		detectJobVerInterval = time.Millisecond
+		// unknown version
+		mockGetAllServerInfo(t, "unknown")
+		iterateCnt := 0
+		testfailpoint.EnableCall(t, "github.com/pingcap/tidb/pkg/ddl/afterDetectAndUpdateJobVersionOnce", func() {
+			iterateCnt++
+			if iterateCnt == 1 {
+				require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+				// user set version explicitly in config
+				mockGetAllServerInfo(t, "9.0.0-xxx")
+			} else if iterateCnt == 2 {
+				require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+				// invalid version
+				mockGetAllServerInfo(t, "xxx")
+			} else if iterateCnt == 3 {
+				require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+				// less than 8.4.0
+				mockGetAllServerInfo(t, "8.0.11-TiDB-8.3.0")
+			} else if iterateCnt == 4 {
+				require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+				// upgrade case
+				mockGetAllServerInfo(t, "8.0.11-TiDB-v8.3.0", "8.0.11-TiDB-v8.3.0", "8.0.11-TiDB-v8.4.0")
+			} else if iterateCnt == 5 {
+				require.Equal(t, model.JobVersion1, model.GetJobVerInUse())
+				// upgrade done
+				mockGetAllServerInfo(t, "8.0.11-TiDB-v8.4.0", "8.0.11-TiDB-v8.4.0", "8.0.11-TiDB-v8.4.0")
+			} else {
+				require.Equal(t, model.JobVersion2, model.GetJobVerInUse())
+			}
+		})
+		d.detectAndUpdateJobVersion()
+		d.wg.Wait()
+		require.EqualValues(t, 6, iterateCnt)
+	})
+}
+>>>>>>> 80d6b5683c5 (infosync: refactor server config into dynamic and static sections (#58473))