Merge branch 'master' into speedUpTest

pingcap · May 8, 2023 · d6036f2 · d6036f2
2 parents 5fe44d4 + e999296
commit d6036f2
Show file tree

Hide file tree

Showing 73 changed files with 3 additions and 3 deletions.
diff --git a/ddl/db_partition_test.go b/ddl/db_partition_test.go
@@ -4256,10 +4256,10 @@ func TestTruncatePartitionMultipleTimes(t *testing.T) {
 			time.Sleep(30 * time.Millisecond)
 		}
 	}
-	var errCount int32
+	var errCount atomic.Int32
 	onJobUpdatedExportedFunc := func(job *model.Job) {
 		if job.Type == model.ActionTruncateTablePartition && job.Error != nil {
-			atomic.AddInt32(&errCount, 1)
+			errCount.Add(1)
 		}
 	}
 	hook.OnJobUpdatedExported.Store(&onJobUpdatedExportedFunc)
@@ -4269,7 +4269,7 @@ func TestTruncatePartitionMultipleTimes(t *testing.T) {
 	go backgroundExec(store, "test", "alter table test.t truncate partition p0;", done2)
 	<-done1
 	<-done2
-	require.LessOrEqual(t, errCount, int32(1))
+	require.LessOrEqual(t, errCount.Load(), int32(1))
 }
 
 func TestAddPartitionReplicaBiggerThanTiFlashStores(t *testing.T) {

diff --git a/executor/admintest/BUILD.bazel → executor/test/admintest/BUILD.bazel b/executor/admintest/BUILD.bazel → executor/test/admintest/BUILD.bazel
diff --git a/executor/admintest/admin_test.go → executor/test/admintest/admin_test.go b/executor/admintest/admin_test.go → executor/test/admintest/admin_test.go
diff --git a/executor/admintest/main_test.go → executor/test/admintest/main_test.go b/executor/admintest/main_test.go → executor/test/admintest/main_test.go
diff --git a/executor/analyzetest/BUILD.bazel → executor/test/analyzetest/BUILD.bazel b/executor/analyzetest/BUILD.bazel → executor/test/analyzetest/BUILD.bazel
diff --git a/executor/analyzetest/analyze_test.go → executor/test/analyzetest/analyze_test.go b/executor/analyzetest/analyze_test.go → executor/test/analyzetest/analyze_test.go
diff --git a/executor/analyzetest/main_test.go → executor/test/analyzetest/main_test.go b/executor/analyzetest/main_test.go → executor/test/analyzetest/main_test.go
diff --git a/executor/autoidtest/BUILD.bazel → executor/test/autoidtest/BUILD.bazel b/executor/autoidtest/BUILD.bazel → executor/test/autoidtest/BUILD.bazel
diff --git a/executor/autoidtest/autoid_test.go → executor/test/autoidtest/autoid_test.go b/executor/autoidtest/autoid_test.go → executor/test/autoidtest/autoid_test.go
diff --git a/executor/autoidtest/main_test.go → executor/test/autoidtest/main_test.go b/executor/autoidtest/main_test.go → executor/test/autoidtest/main_test.go
diff --git a/executor/distsqltest/BUILD.bazel → executor/test/distsqltest/BUILD.bazel b/executor/distsqltest/BUILD.bazel → executor/test/distsqltest/BUILD.bazel
diff --git a/executor/distsqltest/distsql_test.go → executor/test/distsqltest/distsql_test.go b/executor/distsqltest/distsql_test.go → executor/test/distsqltest/distsql_test.go
diff --git a/executor/distsqltest/main_test.go → executor/test/distsqltest/main_test.go b/executor/distsqltest/main_test.go → executor/test/distsqltest/main_test.go
diff --git a/executor/fktest/BUILD.bazel → executor/test/fktest/BUILD.bazel b/executor/fktest/BUILD.bazel → executor/test/fktest/BUILD.bazel
diff --git a/executor/fktest/foreign_key_test.go → executor/test/fktest/foreign_key_test.go b/executor/fktest/foreign_key_test.go → executor/test/fktest/foreign_key_test.go
diff --git a/executor/fktest/main_test.go → executor/test/fktest/main_test.go b/executor/fktest/main_test.go → executor/test/fktest/main_test.go
diff --git a/executor/indexmergereadtest/BUILD.bazel → executor/test/indexmergereadtest/BUILD.bazel b/executor/indexmergereadtest/BUILD.bazel → executor/test/indexmergereadtest/BUILD.bazel
diff --git a/...xmergereadtest/index_merge_reader_test.go → ...xmergereadtest/index_merge_reader_test.go b/...xmergereadtest/index_merge_reader_test.go → ...xmergereadtest/index_merge_reader_test.go
diff --git a/executor/indexmergereadtest/main_test.go → ...utor/test/indexmergereadtest/main_test.go b/executor/indexmergereadtest/main_test.go → ...utor/test/indexmergereadtest/main_test.go
diff --git a/executor/issuetest/BUILD.bazel → executor/test/issuetest/BUILD.bazel b/executor/issuetest/BUILD.bazel → executor/test/issuetest/BUILD.bazel
diff --git a/executor/issuetest/executor_issue_test.go → ...tor/test/issuetest/executor_issue_test.go b/executor/issuetest/executor_issue_test.go → ...tor/test/issuetest/executor_issue_test.go
diff --git a/executor/issuetest/main_test.go → executor/test/issuetest/main_test.go b/executor/issuetest/main_test.go → executor/test/issuetest/main_test.go
diff --git a/executor/jointest/BUILD.bazel → executor/test/jointest/BUILD.bazel b/executor/jointest/BUILD.bazel → executor/test/jointest/BUILD.bazel
diff --git a/executor/jointest/join_test.go → executor/test/jointest/join_test.go b/executor/jointest/join_test.go → executor/test/jointest/join_test.go
diff --git a/executor/jointest/main_test.go → executor/test/jointest/main_test.go b/executor/jointest/main_test.go → executor/test/jointest/main_test.go
diff --git a/executor/kvtest/BUILD.bazel → executor/test/kvtest/BUILD.bazel b/executor/kvtest/BUILD.bazel → executor/test/kvtest/BUILD.bazel
diff --git a/executor/kvtest/kv_test.go → executor/test/kvtest/kv_test.go b/executor/kvtest/kv_test.go → executor/test/kvtest/kv_test.go
diff --git a/executor/kvtest/main_test.go → executor/test/kvtest/main_test.go b/executor/kvtest/main_test.go → executor/test/kvtest/main_test.go
diff --git a/executor/loaddatatest/BUILD.bazel → executor/test/loaddatatest/BUILD.bazel b/executor/loaddatatest/BUILD.bazel → executor/test/loaddatatest/BUILD.bazel
diff --git a/executor/loaddatatest/load_data_test.go → executor/test/loaddatatest/load_data_test.go b/executor/loaddatatest/load_data_test.go → executor/test/loaddatatest/load_data_test.go
diff --git a/executor/loaddatatest/main_test.go → executor/test/loaddatatest/main_test.go b/executor/loaddatatest/main_test.go → executor/test/loaddatatest/main_test.go
diff --git a/executor/loadremotetest/BUILD.bazel → executor/test/loadremotetest/BUILD.bazel b/executor/loadremotetest/BUILD.bazel → executor/test/loadremotetest/BUILD.bazel
diff --git a/executor/loadremotetest/error_test.go → executor/test/loadremotetest/error_test.go b/executor/loadremotetest/error_test.go → executor/test/loadremotetest/error_test.go
diff --git a/executor/loadremotetest/main_test.go → executor/test/loadremotetest/main_test.go b/executor/loadremotetest/main_test.go → executor/test/loadremotetest/main_test.go
diff --git a/executor/loadremotetest/multi_file_test.go → ...or/test/loadremotetest/multi_file_test.go b/executor/loadremotetest/multi_file_test.go → ...or/test/loadremotetest/multi_file_test.go
diff --git a/executor/loadremotetest/one_csv_test.go → executor/test/loadremotetest/one_csv_test.go b/executor/loadremotetest/one_csv_test.go → executor/test/loadremotetest/one_csv_test.go
diff --git a/executor/loadremotetest/util_test.go → executor/test/loadremotetest/util_test.go b/executor/loadremotetest/util_test.go → executor/test/loadremotetest/util_test.go
diff --git a/executor/memtest/BUILD.bazel → executor/test/memtest/BUILD.bazel b/executor/memtest/BUILD.bazel → executor/test/memtest/BUILD.bazel
diff --git a/executor/memtest/main_test.go → executor/test/memtest/main_test.go b/executor/memtest/main_test.go → executor/test/memtest/main_test.go
diff --git a/executor/memtest/mem_test.go → executor/test/memtest/mem_test.go b/executor/memtest/mem_test.go → executor/test/memtest/mem_test.go
diff --git a/executor/oomtest/BUILD.bazel → executor/test/oomtest/BUILD.bazel b/executor/oomtest/BUILD.bazel → executor/test/oomtest/BUILD.bazel
diff --git a/executor/oomtest/oom_test.go → executor/test/oomtest/oom_test.go b/executor/oomtest/oom_test.go → executor/test/oomtest/oom_test.go
diff --git a/executor/partitiontest/BUILD.bazel → executor/test/partitiontest/BUILD.bazel b/executor/partitiontest/BUILD.bazel → executor/test/partitiontest/BUILD.bazel
diff --git a/executor/partitiontest/main_test.go → executor/test/partitiontest/main_test.go b/executor/partitiontest/main_test.go → executor/test/partitiontest/main_test.go
diff --git a/executor/partitiontest/partition_test.go → ...utor/test/partitiontest/partition_test.go b/executor/partitiontest/partition_test.go → ...utor/test/partitiontest/partition_test.go
diff --git a/executor/passwordtest/BUILD.bazel → executor/test/passwordtest/BUILD.bazel b/executor/passwordtest/BUILD.bazel → executor/test/passwordtest/BUILD.bazel
diff --git a/executor/passwordtest/main_test.go → executor/test/passwordtest/main_test.go b/executor/passwordtest/main_test.go → executor/test/passwordtest/main_test.go
diff --git a/.../passwordtest/password_management_test.go → .../passwordtest/password_management_test.go b/.../passwordtest/password_management_test.go → .../passwordtest/password_management_test.go
diff --git a/executor/seqtest/BUILD.bazel → executor/test/seqtest/BUILD.bazel b/executor/seqtest/BUILD.bazel → executor/test/seqtest/BUILD.bazel
diff --git a/executor/seqtest/main_test.go → executor/test/seqtest/main_test.go b/executor/seqtest/main_test.go → executor/test/seqtest/main_test.go
diff --git a/executor/seqtest/prepared_test.go → executor/test/seqtest/prepared_test.go b/executor/seqtest/prepared_test.go → executor/test/seqtest/prepared_test.go
diff --git a/executor/seqtest/seq_executor_test.go → executor/test/seqtest/seq_executor_test.go b/executor/seqtest/seq_executor_test.go → executor/test/seqtest/seq_executor_test.go
diff --git a/executor/showtest/BUILD.bazel → executor/test/showtest/BUILD.bazel b/executor/showtest/BUILD.bazel → executor/test/showtest/BUILD.bazel
diff --git a/executor/showtest/main_test.go → executor/test/showtest/main_test.go b/executor/showtest/main_test.go → executor/test/showtest/main_test.go
diff --git a/executor/showtest/show_test.go → executor/test/showtest/show_test.go b/executor/showtest/show_test.go → executor/test/showtest/show_test.go
diff --git a/executor/simpletest/BUILD.bazel → executor/test/simpletest/BUILD.bazel b/executor/simpletest/BUILD.bazel → executor/test/simpletest/BUILD.bazel
diff --git a/executor/simpletest/chunk_reuse_test.go → executor/test/simpletest/chunk_reuse_test.go b/executor/simpletest/chunk_reuse_test.go → executor/test/simpletest/chunk_reuse_test.go
diff --git a/executor/simpletest/main_test.go → executor/test/simpletest/main_test.go b/executor/simpletest/main_test.go → executor/test/simpletest/main_test.go
diff --git a/executor/simpletest/simple_test.go → executor/test/simpletest/simple_test.go b/executor/simpletest/simple_test.go → executor/test/simpletest/simple_test.go
diff --git a/executor/splittest/BUILD.bazel → executor/test/splittest/BUILD.bazel b/executor/splittest/BUILD.bazel → executor/test/splittest/BUILD.bazel
diff --git a/executor/splittest/main_test.go → executor/test/splittest/main_test.go b/executor/splittest/main_test.go → executor/test/splittest/main_test.go
diff --git a/executor/splittest/split_table_test.go → executor/test/splittest/split_table_test.go b/executor/splittest/split_table_test.go → executor/test/splittest/split_table_test.go
diff --git a/executor/tiflashtest/BUILD.bazel → executor/test/tiflashtest/BUILD.bazel b/executor/tiflashtest/BUILD.bazel → executor/test/tiflashtest/BUILD.bazel
diff --git a/executor/tiflashtest/main_test.go → executor/test/tiflashtest/main_test.go b/executor/tiflashtest/main_test.go → executor/test/tiflashtest/main_test.go
diff --git a/executor/tiflashtest/tiflash_test.go → executor/test/tiflashtest/tiflash_test.go b/executor/tiflashtest/tiflash_test.go → executor/test/tiflashtest/tiflash_test.go
diff --git a/executor/unstabletest/BUILD.bazel → executor/test/unstabletest/BUILD.bazel b/executor/unstabletest/BUILD.bazel → executor/test/unstabletest/BUILD.bazel
diff --git a/executor/unstabletest/README.md → executor/test/unstabletest/README.md b/executor/unstabletest/README.md → executor/test/unstabletest/README.md
diff --git a/executor/unstabletest/main_test.go → executor/test/unstabletest/main_test.go b/executor/unstabletest/main_test.go → executor/test/unstabletest/main_test.go
diff --git a/executor/unstabletest/memory_test.go → executor/test/unstabletest/memory_test.go b/executor/unstabletest/memory_test.go → executor/test/unstabletest/memory_test.go
diff --git a/executor/unstabletest/unstable_test.go → executor/test/unstabletest/unstable_test.go b/executor/unstabletest/unstable_test.go → executor/test/unstabletest/unstable_test.go
diff --git a/executor/writetest/BUILD.bazel → executor/test/writetest/BUILD.bazel b/executor/writetest/BUILD.bazel → executor/test/writetest/BUILD.bazel
diff --git a/executor/writetest/main_test.go → executor/test/writetest/main_test.go b/executor/writetest/main_test.go → executor/test/writetest/main_test.go
diff --git a/executor/writetest/write_test.go → executor/test/writetest/write_test.go b/executor/writetest/write_test.go → executor/test/writetest/write_test.go