Merge cockroachdb#79485

79485: sql: clean up some dependencies r=yuzefovich a=yuzefovich **row: move Metrics struct into rowinfra** This allows us to break dependency of `execinfra` on `row` which speeds up the build a bit. Release note: None **colexecbase: move a single struct to clean up dependencies** This commit moves `colexecbase.BinaryOverloadHelper` into `colexecutils` package in order to break the dependencies of `colexecproj` and `colexecprojconst` packages on `colexecbase`. This will speed up the build a bit. Addresses: cockroachdb#79357. Release note: None Co-authored-by: Yahor Yuzefovich <[email protected]>
ajwerner · Apr 8, 2022 · dbbe9ed · dbbe9ed
2 parents 94fe8dd + 8fdd210
commit dbbe9ed
Show file tree

Hide file tree

Showing 25 changed files with 236 additions and 234 deletions.
diff --git a/pkg/sql/backfill/backfill.go b/pkg/sql/backfill/backfill.go
@@ -86,7 +86,7 @@ type ColumnBackfiller struct {
 	// mon is a memory monitor linked with the ColumnBackfiller on creation.
 	mon *mon.BytesMonitor
 
-	rowMetrics *row.Metrics
+	rowMetrics *rowinfra.Metrics
 }
 
 // initCols is a helper to populate some column metadata on a ColumnBackfiller.
@@ -111,7 +111,7 @@ func (cb *ColumnBackfiller) init(
 	computedExprs []tree.TypedExpr,
 	desc catalog.TableDescriptor,
 	mon *mon.BytesMonitor,
-	rowMetrics *row.Metrics,
+	rowMetrics *rowinfra.Metrics,
 ) error {
 	cb.evalCtx = evalCtx
 	cb.updateCols = append(cb.added, cb.dropped...)
@@ -171,7 +171,7 @@ func (cb *ColumnBackfiller) InitForLocalUse(
 	semaCtx *tree.SemaContext,
 	desc catalog.TableDescriptor,
 	mon *mon.BytesMonitor,
-	rowMetrics *row.Metrics,
+	rowMetrics *rowinfra.Metrics,
 ) error {
 	cb.initCols(desc)
 	defaultExprs, err := schemaexpr.MakeDefaultExprs(

diff --git a/pkg/sql/colexec/colexecbase/BUILD.bazel b/pkg/sql/colexec/colexecbase/BUILD.bazel
@@ -8,7 +8,6 @@ go_library(
         "distinct.go",
         "fn_op.go",
         "ordinality.go",
-        "overloads_bin_util.go",
         "simple_project.go",
         ":gen-exec",  # keep
     ],

diff --git a/pkg/sql/colexec/colexecproj/BUILD.bazel b/pkg/sql/colexec/colexecproj/BUILD.bazel
@@ -15,7 +15,6 @@ go_library(
         "//pkg/col/typeconv",  # keep
         "//pkg/server/telemetry",  # keep
         "//pkg/sql/colconv",  # keep
-        "//pkg/sql/colexec/colexecbase",  # keep
         "//pkg/sql/colexec/colexeccmp",  # keep
         "//pkg/sql/colexec/colexecutils",  # keep
         "//pkg/sql/colexec/execgen",  # keep
@@ -97,6 +96,7 @@ disallowed_imports_test(
     [
         "//pkg/sql/colexec",
         "//pkg/sql/colexec/colexecagg",
+        "//pkg/sql/colexec/colexecbase",
         "//pkg/sql/colexec/colexechash",
         "//pkg/sql/colexec/colexecjoin",
         "//pkg/sql/colexec/colexecprojconst",