Merge #70937 #71442

70937: sql,importccl: reorganize import files r=ajwerner,dt a=adityamaru This change only involves moving code into appropriate files. Concretely, it splits up `import_stmt` into the more idiomatic planning, job, processor_planning pattern used by other bulk jobs. Informs: #70050 Release note: None 71442: goschedstats: update comment r=RaduBerinde a=RaduBerinde I have checked that the structures still match go1.17.2. Release note: None Fixes #66418. Co-authored-by: Aditya Maru <[email protected]> Co-authored-by: Radu Berinde <[email protected]>
cockroachdb · Oct 13, 2021 · 2f2c517 · 2f2c517
3 parents 1a94c17 + d27dafc + c8ef13b
commit 2f2c517
Show file tree

Hide file tree

Showing 10 changed files with 2,355 additions and 2,304 deletions.
diff --git a/pkg/ccl/importccl/BUILD.bazel b/pkg/ccl/importccl/BUILD.bazel
@@ -4,8 +4,10 @@ go_library(
     name = "importccl",
     srcs = [
         "exportcsv.go",
+        "import_job.go",
+        "import_planning.go",
         "import_processor.go",
-        "import_stmt.go",
+        "import_processor_planning.go",
         "import_table_creation.go",
         "import_type_resolver.go",
         "read_import_avro.go",
@@ -60,6 +62,7 @@ go_library(
         "//pkg/sql/pgwire/pgcode",
         "//pkg/sql/pgwire/pgerror",
         "//pkg/sql/pgwire/pgnotice",
+        "//pkg/sql/physicalplan",
         "//pkg/sql/privilege",
         "//pkg/sql/row",
         "//pkg/sql/rowenc",
@@ -88,6 +91,7 @@ go_library(
         "//pkg/workload",
         "@com_github_cockroachdb_apd_v2//:apd",
         "@com_github_cockroachdb_errors//:errors",
+        "@com_github_cockroachdb_logtags//:logtags",
         "@com_github_lib_pq//oid",
         "@com_github_linkedin_goavro_v2//:goavro",
         "@io_vitess_vitess//go/sqltypes",