ddl: Add index fast path to be a default add index path

ddl/cancel_test.go

@@ -232,6 +232,8 @@ func TestCancel(t *testing.T) {
 
 	// Prepare schema.
 	tk.MustExec("use test")
+	// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("drop table if exists t_partition;")
 	tk.MustExec(`create table t_partition (
 		c1 int, c2 int, c3 int

ddl/column_modify_test.go

@@ -1036,6 +1036,7 @@ func TestWriteReorgForColumnTypeChangeOnAmendTxn(t *testing.T) {
 
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0")
 	tk.MustExec("set global tidb_enable_amend_pessimistic_txn = ON")
 	defer tk.MustExec("set global tidb_enable_amend_pessimistic_txn = OFF")
 

ddl/db_change_test.go

@@ -1719,6 +1719,8 @@ func TestCreateUniqueExpressionIndex(t *testing.T) {
 
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
+	// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("create table t(a int default 0, b int default 0)")
 	tk.MustExec("insert into t values (1, 1), (2, 2), (3, 3), (4, 4)")
 

ddl/db_test.go

@@ -985,6 +985,7 @@ func TestCommitTxnWithIndexChange(t *testing.T) {
 	// Prepare work.
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk.MustExec("use test")
 	tk.MustExec("create table t1 (c1 int primary key, c2 int, c3 int, index ok2(c2))")
@@ -1385,6 +1386,7 @@ func TestAmendTxnSavepointWithDDL(t *testing.T) {
 	tk.MustExec("use test;")
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
 	tk2.MustExec("use test;")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 
 	prepareFn := func() {

ddl/failtest/fail_db_test.go

@@ -320,6 +320,8 @@ func TestRunDDLJobPanicEnableClusteredIndex(t *testing.T) {
 	s := createFailDBSuite(t)
 	testAddIndexWorkerNum(t, s, func(tk *testkit.TestKit) {
 		tk.Session().GetSessionVars().EnableClusteredIndex = variable.ClusteredIndexDefModeOn
+		// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+		tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 		tk.MustExec("create table test_add_index (c1 bigint, c2 bigint, c3 bigint, primary key(c1, c3))")
 	})
 }
@@ -328,6 +330,8 @@ func TestRunDDLJobPanicEnableClusteredIndex(t *testing.T) {
 func TestRunDDLJobPanicDisableClusteredIndex(t *testing.T) {
 	s := createFailDBSuite(t)
 	testAddIndexWorkerNum(t, s, func(tk *testkit.TestKit) {
+		// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+		tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 		tk.MustExec("create table test_add_index (c1 bigint, c2 bigint, c3 bigint, primary key(c1))")
 	})
 }
@@ -420,6 +424,7 @@ func TestPartitionAddIndexGC(t *testing.T) {
 	s := createFailDBSuite(t)
 	tk := testkit.NewTestKit(t, s.store)
 	tk.MustExec("use test")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec(`create table partition_add_idx (
 	id int not null,
 	hired date not null

ddl/index_change_test.go

@@ -37,6 +37,8 @@ func TestIndexChange(t *testing.T) {
 	ddl.SetWaitTimeWhenErrorOccurred(1 * time.Microsecond)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
+	// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("create table t (c1 int primary key, c2 int)")
 	tk.MustExec("insert t values (1, 1), (2, 2), (3, 3);")
 

ddl/index_merge_tmp_test.go

@@ -255,7 +255,6 @@ func TestPessimisticAmendIncompatibleWithFastReorg(t *testing.T) {
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
 	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 1;")
-	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 1;")
 
 	tk.MustGetErrMsg("set @@tidb_enable_amend_pessimistic_txn = 1;",
 		"amend pessimistic transactions is not compatible with tidb_ddl_enable_fast_reorg")

ddl/multi_schema_change_test.go

@@ -568,6 +568,8 @@ func TestMultiSchemaChangeAddIndexesCancelled(t *testing.T) {
 	store, dom := testkit.CreateMockStoreAndDomain(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
+	// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	originHook := dom.DDL().GetHook()
 
 	// Test cancel successfully.
@@ -1014,6 +1016,7 @@ func TestMultiSchemaChangeMixCancelled(t *testing.T) {
 	store, dom := testkit.CreateMockStoreAndDomain(t)
 	tk := testkit.NewTestKit(t, store)
 	tk.MustExec("use test;")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 
 	tk.MustExec("create table t (a int, b int, c int, index i1(c), index i2(c));")
 	tk.MustExec("insert into t values (1, 2, 3);")

ddl/serial_test.go

@@ -432,6 +432,8 @@ func TestCancelAddIndexPanic(t *testing.T) {
 		require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/errorMockPanic"))
 	}()
 	tk.MustExec("use test")
+	// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("drop table if exists t")
 	tk.MustExec("create table t(c1 int, c2 int)")
 

ddl/stat_test.go

@@ -44,13 +44,16 @@ func TestDDLStatsInfo(t *testing.T) {
 	store, domain := testkit.CreateMockStoreAndDomainWithSchemaLease(t, testLease)
 	d := domain.DDL()
 
+	tk := testkit.NewTestKit(t, store)
+	ctx := tk.Session()
 	dbInfo, err := testSchemaInfo(store, "test_stat")
 	require.NoError(t, err)
-	testCreateSchema(t, testkit.NewTestKit(t, store).Session(), d, dbInfo)
+	testCreateSchema(t, ctx, d, dbInfo)
 	tblInfo, err := testTableInfo(store, "t", 2)
 	require.NoError(t, err)
-	testCreateTable(t, testkit.NewTestKit(t, store).Session(), d, dbInfo, tblInfo)
-	ctx := testkit.NewTestKit(t, store).Session()
+	testCreateTable(t, ctx, d, dbInfo, tblInfo)
+	// ToDo: will check why tidb_ddl_enable_fast_reorg could not be default on in another pr.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	err = sessiontxn.NewTxn(context.Background(), ctx)
 	require.NoError(t, err)
 

ddl/table_modify_test.go

@@ -163,6 +163,7 @@ func TestLockTableReadOnly(t *testing.T) {
 	tk1.MustExec("admin cleanup table lock t1")
 	tk2.MustExec("insert into t1 set a=1, b=2")
 
+	tk1.MustExec("set global tidb_ddl_enable_fast_reorg = 0")
 	tk1.MustExec("set tidb_enable_amend_pessimistic_txn = 1")
 	tk1.MustExec("begin pessimistic")
 	tk1.MustQuery("select * from t1 where a = 1").Check(testkit.Rows("1 2"))

expression/integration_test.go

@@ -4956,6 +4956,7 @@ func TestSchemaDMLNotChange(t *testing.T) {
 	tk2 := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk2.MustExec("use test")
 	tk.MustExec("drop table if exists t")

session/schema_test.go

@@ -134,6 +134,7 @@ func TestRetrySchemaChangeForEmptyChange(t *testing.T) {
 	tk1.MustExec("commit")
 
 	// TODO remove this enable after fixing table delta map.
+	tk1.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk1.MustExec("set tidb_enable_amend_pessimistic_txn = 1")
 	tk1.MustExec("begin pessimistic")
 	tk2.MustExec("alter table t add k int")

sessionctx/variable/sysvar_test.go

@@ -692,8 +692,8 @@ func TestSetTIDBFastDDL(t *testing.T) {
 	vars.GlobalVarsAccessor = mock
 	fastDDL := GetSysVar(TiDBDDLEnableFastReorg)
 
-	// Default off
-	require.Equal(t, fastDDL.Value, Off)
+	// Default true
+	require.Equal(t, fastDDL.Value, On)
 
 	// Set to On
 	err := mock.SetGlobalSysVar(context.Background(), TiDBDDLEnableFastReorg, On)

sessionctx/variable/tidb_vars.go

@@ -1065,7 +1065,7 @@ const (
 	DefTiFlashFastScan                             = false
 	DefMemoryUsageAlarmRatio                       = 0.7
 	DefMemoryUsageAlarmKeepRecordNum               = 5
-	DefTiDBEnableFastReorg                         = false
+	DefTiDBEnableFastReorg                         = true
 	DefTiDBDDLDiskQuota                            = 100 * 1024 * 1024 * 1024 // 100GB
 	DefExecutorConcurrency                         = 5
 	DefTiDBEnableGeneralPlanCache                  = false

telemetry/data_feature_usage_test.go

@@ -498,7 +498,7 @@ func TestAddIndexAccelerationAndMDL(t *testing.T) {
 	require.NoError(t, err)
 
 	allow := ddl.IsEnableFastReorg()
-	require.Equal(t, false, allow)
+	require.Equal(t, true, allow)
 	tk.MustExec("set global tidb_enable_metadata_lock = 0")
 	tk.MustExec("use test")
 	tk.MustExec("drop table if exists tele_t")
@@ -507,7 +507,7 @@ func TestAddIndexAccelerationAndMDL(t *testing.T) {
 	tk.MustExec("alter table tele_t add index idx_org(b)")
 	usage, err = telemetry.GetFeatureUsage(tk.Session())
 	require.NoError(t, err)
-	require.Equal(t, int64(0), usage.DDLUsageCounter.AddIndexIngestUsed)
+	require.Equal(t, int64(1), usage.DDLUsageCounter.AddIndexIngestUsed)
 	require.Equal(t, false, usage.DDLUsageCounter.MetadataLockUsed)
 
 	tk.MustExec("set @@global.tidb_ddl_enable_fast_reorg = on")
@@ -516,11 +516,11 @@ func TestAddIndexAccelerationAndMDL(t *testing.T) {
 	require.Equal(t, true, allow)
 	usage, err = telemetry.GetFeatureUsage(tk.Session())
 	require.NoError(t, err)
-	require.Equal(t, int64(0), usage.DDLUsageCounter.AddIndexIngestUsed)
+	require.Equal(t, int64(1), usage.DDLUsageCounter.AddIndexIngestUsed)
 	tk.MustExec("alter table tele_t add index idx_new(b)")
 	usage, err = telemetry.GetFeatureUsage(tk.Session())
 	require.NoError(t, err)
-	require.Equal(t, int64(1), usage.DDLUsageCounter.AddIndexIngestUsed)
+	require.Equal(t, int64(2), usage.DDLUsageCounter.AddIndexIngestUsed)
 	require.Equal(t, true, usage.DDLUsageCounter.MetadataLockUsed)
 }
 

tests/realtikvtest/pessimistictest/pessimistic_test.go

@@ -1850,6 +1850,7 @@ func TestPessimisticTxnWithDDLAddDropColumn(t *testing.T) {
 
 	// tk2 starts a pessimistic transaction and make some changes on table t1.
 	// tk executes some ddl statements add/drop column on table t1.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk.MustExec("begin pessimistic")
 	tk.MustExec("update t1 set c2 = c1 * 10")
@@ -1880,6 +1881,7 @@ func TestPessimisticTxnWithDDLChangeColumn(t *testing.T) {
 	tk.MustExec("insert t1 values (1, 77, 'a'), (2, 88, 'b')")
 
 	// Extend column field length is acceptable.
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk.MustExec("begin pessimistic")
 	tk.MustExec("update t1 set c2 = c1 * 10")
@@ -2153,6 +2155,7 @@ func TestAmendTxnVariable(t *testing.T) {
 	tk3.MustExec("set tidb_enable_amend_pessimistic_txn = 0;")
 	tk3.MustExec("begin pessimistic")
 	tk3.MustExec("insert into t1 values(3, 3, 3)")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk.MustExec("begin pessimistic")
 	tk.MustExec("insert into t1 values(4, 4, 4)")
@@ -2173,6 +2176,7 @@ func TestAmendTxnVariable(t *testing.T) {
 	tk4.MustExec("insert into t1 values(5, 5, 5, 5)")
 	tk2.MustExec("alter table t1 drop column new_col")
 	require.Error(t, tk4.ExecToErr("commit"))
+	tk4.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk4.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk4.MustExec("begin pessimistic")
 	tk4.MustExec("insert into t1 values(5, 5, 5)")
@@ -2303,6 +2307,7 @@ func TestAsyncCommitWithSchemaChange(t *testing.T) {
 	tk.MustExec("insert into tk values(1, 1, 1)")
 	tk2 := createAsyncCommitTestKit(t, store)
 	tk3 := createAsyncCommitTestKit(t, store)
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk2.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk3.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
@@ -2377,6 +2382,7 @@ func Test1PCWithSchemaChange(t *testing.T) {
 	tk.MustExec("drop table if exists tk")
 	tk.MustExec("create table tk (c1 int primary key, c2 int)")
 	tk.MustExec("insert into tk values (1, 1)")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk2.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 	tk3.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
@@ -2424,6 +2430,7 @@ func TestAmendForUniqueIndex(t *testing.T) {
 	tk2 := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
 	tk2.MustExec("use test")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 
 	tk2.MustExec("drop table if exists t1")
@@ -2546,6 +2553,7 @@ func TestAmendWithColumnTypeChange(t *testing.T) {
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
 	tk2.MustExec("use test")
 
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1;")
 
 	tk2.MustExec("drop table if exists t")
@@ -2563,6 +2571,7 @@ func TestIssue21498(t *testing.T) {
 	tk2 := testkit.NewTestKit(t, store)
 	tk.MustExec("use test")
 	tk2.MustExec("use test")
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1")
 
 	for _, partition := range []bool{false, true} {
@@ -2732,6 +2741,7 @@ func TestPlanCacheSchemaChange(t *testing.T) {
 	tk.MustExec("create table t (id int primary key, v int, unique index iv (v), vv int)")
 	tk.MustExec("insert into t values(1, 1, 1), (2, 2, 2), (4, 4, 4)")
 
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = 0")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = 1")
 	tk2.MustExec("set tidb_enable_amend_pessimistic_txn = 1")
 
@@ -2899,6 +2909,7 @@ func TestAmendForIndexChange(t *testing.T) {
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
 	tk2.MustExec("use test")
 
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = OFF;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = ON;")
 	tk.Session().GetSessionVars().EnableAsyncCommit = false
 	tk.Session().GetSessionVars().Enable1PC = false
@@ -2974,6 +2985,7 @@ func TestAmendForColumnChange(t *testing.T) {
 	tk.MustExec("set global tidb_enable_metadata_lock=0")
 	tk2.MustExec("use test")
 
+	tk.MustExec("set global tidb_ddl_enable_fast_reorg = OFF;")
 	tk.MustExec("set tidb_enable_amend_pessimistic_txn = ON;")
 	tk2.MustExec("drop table if exists t1")