diff --git a/pkg/sql/colexec/cast.eg.go b/pkg/sql/colexec/cast.eg.go index 42ad621a9500..550e17558222 100644 --- a/pkg/sql/colexec/cast.eg.go +++ b/pkg/sql/colexec/cast.eg.go @@ -26,6 +26,10 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var _ coldataext.Datum + func GetCastOperator( allocator *colmem.Allocator, input colexecbase.Operator, diff --git a/pkg/sql/colexec/cast_tmpl.go b/pkg/sql/colexec/cast_tmpl.go index 9ce0eb942d8e..b616fe653c5b 100644 --- a/pkg/sql/colexec/cast_tmpl.go +++ b/pkg/sql/colexec/cast_tmpl.go @@ -26,6 +26,7 @@ import ( "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" @@ -35,6 +36,10 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var _ coldataext.Datum + // {{/* type _R_GO_TYPE interface{} diff --git a/pkg/sql/colexec/const.eg.go b/pkg/sql/colexec/const.eg.go index 6078292915fe..d702e9e2d738 100644 --- a/pkg/sql/colexec/const.eg.go +++ b/pkg/sql/colexec/const.eg.go @@ -23,6 +23,13 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration +) + // NewConstOp creates a new operator that produces a constant value constVal of // type t at index outputIdx. func NewConstOp( diff --git a/pkg/sql/colexec/const_tmpl.go b/pkg/sql/colexec/const_tmpl.go index b9791b0f13ce..7f38bffb24dd 100644 --- a/pkg/sql/colexec/const_tmpl.go +++ b/pkg/sql/colexec/const_tmpl.go @@ -22,15 +22,24 @@ package colexec import ( "context" + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase" "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/distinct.eg.go b/pkg/sql/colexec/distinct.eg.go index db32411e2d48..3ccf747acbc5 100644 --- a/pkg/sql/colexec/distinct.eg.go +++ b/pkg/sql/colexec/distinct.eg.go @@ -27,6 +27,15 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + // OrderedDistinctColsToOperators is a utility function that given an input and // a slice of columns, creates a chain of distinct operators and returns the // last distinct operator in that chain as well as its output column. diff --git a/pkg/sql/colexec/distinct_tmpl.go b/pkg/sql/colexec/distinct_tmpl.go index 1e3dd23acd23..36df5a956759 100644 --- a/pkg/sql/colexec/distinct_tmpl.go +++ b/pkg/sql/colexec/distinct_tmpl.go @@ -22,15 +22,28 @@ package colexec import ( "context" + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + // OrderedDistinctColsToOperators is a utility function that given an input and // a slice of columns, creates a chain of distinct operators and returns the // last distinct operator in that chain as well as its output column. diff --git a/pkg/sql/colexec/hash_utils.eg.go b/pkg/sql/colexec/hash_utils.eg.go index d01335cf2832..2e53e4c8baec 100644 --- a/pkg/sql/colexec/hash_utils.eg.go +++ b/pkg/sql/colexec/hash_utils.eg.go @@ -25,6 +25,13 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum +) + // rehash takes an element of a key (tuple representing a row of equality // column values) at a given column and computes a new hash by applying a // transformation to the existing hash. diff --git a/pkg/sql/colexec/hash_utils_tmpl.go b/pkg/sql/colexec/hash_utils_tmpl.go index 2f82a5a93774..89d927b79052 100644 --- a/pkg/sql/colexec/hash_utils_tmpl.go +++ b/pkg/sql/colexec/hash_utils_tmpl.go @@ -23,6 +23,8 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" + "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/rowenc" @@ -30,6 +32,13 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum +) + // {{/* // _GOTYPESLICE is a template Go type slice variable. diff --git a/pkg/sql/colexec/hashtable_distinct.eg.go b/pkg/sql/colexec/hashtable_distinct.eg.go index bac6ffb9ccf0..d604bccc4e30 100644 --- a/pkg/sql/colexec/hashtable_distinct.eg.go +++ b/pkg/sql/colexec/hashtable_distinct.eg.go @@ -20,6 +20,14 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // checkColAgainstItself is similar to checkCol, but it probes the vector // against itself. func (ht *hashTable) checkColAgainstItself(vec coldata.Vec, nToCheck uint64, sel []int) { diff --git a/pkg/sql/colexec/hashtable_full_default.eg.go b/pkg/sql/colexec/hashtable_full_default.eg.go index 49ac673c8127..8c14122e312e 100644 --- a/pkg/sql/colexec/hashtable_full_default.eg.go +++ b/pkg/sql/colexec/hashtable_full_default.eg.go @@ -20,6 +20,14 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/types" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // checkCol determines if the current key column in the groupID buckets matches // the specified equality column key. If there is no match, then the key is // added to differs. If the bucket has reached the end, the key is rejected. If diff --git a/pkg/sql/colexec/hashtable_full_deleting.eg.go b/pkg/sql/colexec/hashtable_full_deleting.eg.go index 33b115f348fb..ca1255f46ac0 100644 --- a/pkg/sql/colexec/hashtable_full_deleting.eg.go +++ b/pkg/sql/colexec/hashtable_full_deleting.eg.go @@ -22,6 +22,14 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // checkColDeleting determines if the current key column in the groupID buckets // matches the specified equality column key. If there is no match *or* the key // has been already used, then the key is added to differs. If the bucket has diff --git a/pkg/sql/colexec/hashtable_tmpl.go b/pkg/sql/colexec/hashtable_tmpl.go index 4ea034bd235a..fdef027db1b4 100644 --- a/pkg/sql/colexec/hashtable_tmpl.go +++ b/pkg/sql/colexec/hashtable_tmpl.go @@ -21,11 +21,22 @@ package colexec import ( "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" + "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // {{/* // _LEFT_CANONICAL_TYPE_FAMILY is the template variable. diff --git a/pkg/sql/colexec/mergejoinbase.eg.go b/pkg/sql/colexec/mergejoinbase.eg.go index cd47dcfa5dbe..03c32639747f 100644 --- a/pkg/sql/colexec/mergejoinbase.eg.go +++ b/pkg/sql/colexec/mergejoinbase.eg.go @@ -22,6 +22,14 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // isBufferedGroupFinished checks to see whether or not the buffered group // corresponding to input continues in batch. func (o *mergeJoinBase) isBufferedGroupFinished( diff --git a/pkg/sql/colexec/mergejoinbase_tmpl.go b/pkg/sql/colexec/mergejoinbase_tmpl.go index 5818b81fb8d3..f63be9b21529 100644 --- a/pkg/sql/colexec/mergejoinbase_tmpl.go +++ b/pkg/sql/colexec/mergejoinbase_tmpl.go @@ -21,11 +21,22 @@ package colexec import ( "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" + "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/mergejoiner_exceptall.eg.go b/pkg/sql/colexec/mergejoiner_exceptall.eg.go index 0acb67c1ae6d..6f5a15ef87fa 100644 --- a/pkg/sql/colexec/mergejoiner_exceptall.eg.go +++ b/pkg/sql/colexec/mergejoiner_exceptall.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinExceptAllOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_fullouter.eg.go b/pkg/sql/colexec/mergejoiner_fullouter.eg.go index 323c94533868..fb9d71cb645a 100644 --- a/pkg/sql/colexec/mergejoiner_fullouter.eg.go +++ b/pkg/sql/colexec/mergejoiner_fullouter.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinFullOuterOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_inner.eg.go b/pkg/sql/colexec/mergejoiner_inner.eg.go index 7b103bea8e59..38a0a48efa56 100644 --- a/pkg/sql/colexec/mergejoiner_inner.eg.go +++ b/pkg/sql/colexec/mergejoiner_inner.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinInnerOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_intersectall.eg.go b/pkg/sql/colexec/mergejoiner_intersectall.eg.go index 7b1804a06515..ee2fa9e90e6b 100644 --- a/pkg/sql/colexec/mergejoiner_intersectall.eg.go +++ b/pkg/sql/colexec/mergejoiner_intersectall.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinIntersectAllOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_leftanti.eg.go b/pkg/sql/colexec/mergejoiner_leftanti.eg.go index 05e4645db4e5..bba873f84958 100644 --- a/pkg/sql/colexec/mergejoiner_leftanti.eg.go +++ b/pkg/sql/colexec/mergejoiner_leftanti.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinLeftAntiOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_leftouter.eg.go b/pkg/sql/colexec/mergejoiner_leftouter.eg.go index d14b1f582fe1..3c567aba0030 100644 --- a/pkg/sql/colexec/mergejoiner_leftouter.eg.go +++ b/pkg/sql/colexec/mergejoiner_leftouter.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinLeftOuterOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_leftsemi.eg.go b/pkg/sql/colexec/mergejoiner_leftsemi.eg.go index 94d0b788d18c..07e5edb025aa 100644 --- a/pkg/sql/colexec/mergejoiner_leftsemi.eg.go +++ b/pkg/sql/colexec/mergejoiner_leftsemi.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinLeftSemiOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_rightouter.eg.go b/pkg/sql/colexec/mergejoiner_rightouter.eg.go index 1e815de781e7..d94a2a85cc0b 100644 --- a/pkg/sql/colexec/mergejoiner_rightouter.eg.go +++ b/pkg/sql/colexec/mergejoiner_rightouter.eg.go @@ -27,6 +27,16 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + type mergeJoinRightOuterOp struct { *mergeJoinBase } diff --git a/pkg/sql/colexec/mergejoiner_tmpl.go b/pkg/sql/colexec/mergejoiner_tmpl.go index dbce11a18744..ac946ff96442 100644 --- a/pkg/sql/colexec/mergejoiner_tmpl.go +++ b/pkg/sql/colexec/mergejoiner_tmpl.go @@ -22,14 +22,29 @@ package colexec import ( "context" + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" + "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ coldataext.Datum + _ duration.Duration + _ tree.AggType +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/proj_const_left_ops.eg.go b/pkg/sql/colexec/proj_const_left_ops.eg.go index dd56ef577a94..8989b3492611 100644 --- a/pkg/sql/colexec/proj_const_left_ops.eg.go +++ b/pkg/sql/colexec/proj_const_left_ops.eg.go @@ -31,6 +31,15 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ sqltelemetry.EnumTelemetryType + _ telemetry.Counter +) + type projBitandInt16ConstInt16Op struct { projConstOpBase constArg int16 diff --git a/pkg/sql/colexec/proj_const_ops_tmpl.go b/pkg/sql/colexec/proj_const_ops_tmpl.go index 899fb9729251..ec7a3c5f2816 100644 --- a/pkg/sql/colexec/proj_const_ops_tmpl.go +++ b/pkg/sql/colexec/proj_const_ops_tmpl.go @@ -22,19 +22,32 @@ package colexec import ( "context" + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" + "github.com/cockroachdb/cockroach/pkg/server/telemetry" "github.com/cockroachdb/cockroach/pkg/sql/colconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" + "github.com/cockroachdb/cockroach/pkg/sql/sqltelemetry" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ sqltelemetry.EnumTelemetryType + _ telemetry.Counter +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/proj_const_right_ops.eg.go b/pkg/sql/colexec/proj_const_right_ops.eg.go index 3a1a82fa05fc..6e7212fe983e 100644 --- a/pkg/sql/colexec/proj_const_right_ops.eg.go +++ b/pkg/sql/colexec/proj_const_right_ops.eg.go @@ -32,6 +32,15 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ sqltelemetry.EnumTelemetryType + _ telemetry.Counter +) + type projBitandInt16Int16ConstOp struct { projConstOpBase constArg int16 diff --git a/pkg/sql/colexec/proj_non_const_ops.eg.go b/pkg/sql/colexec/proj_non_const_ops.eg.go index 0b7f65789c6c..700744800f6a 100644 --- a/pkg/sql/colexec/proj_non_const_ops.eg.go +++ b/pkg/sql/colexec/proj_non_const_ops.eg.go @@ -30,6 +30,15 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ duration.Duration + _ coldataext.Datum + _ sqltelemetry.EnumTelemetryType + _ telemetry.Counter +) + // projConstOpBase contains all of the fields for projections with a constant, // except for the constant itself. // NOTE: this struct should be declared in proj_const_ops_tmpl.go, but if we do diff --git a/pkg/sql/colexec/proj_non_const_ops_tmpl.go b/pkg/sql/colexec/proj_non_const_ops_tmpl.go index 1c17685365fd..d3fcb6ba88e4 100644 --- a/pkg/sql/colexec/proj_non_const_ops_tmpl.go +++ b/pkg/sql/colexec/proj_non_const_ops_tmpl.go @@ -23,17 +23,30 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" + "github.com/cockroachdb/cockroach/pkg/server/telemetry" "github.com/cockroachdb/cockroach/pkg/sql/colconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" + "github.com/cockroachdb/cockroach/pkg/sql/sqltelemetry" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ duration.Duration + _ coldataext.Datum + _ sqltelemetry.EnumTelemetryType + _ telemetry.Counter +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/rowstovec.eg.go b/pkg/sql/colexec/rowstovec.eg.go index 8cea723bef8c..36b7c00ce104 100644 --- a/pkg/sql/colexec/rowstovec.eg.go +++ b/pkg/sql/colexec/rowstovec.eg.go @@ -23,6 +23,15 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/encoding" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ duration.Duration + _ encoding.Direction +) + // EncDatumRowsToColVec converts one column from EncDatumRows to a column // vector. columnIdx is the 0-based index of the column in the EncDatumRows. func EncDatumRowsToColVec( diff --git a/pkg/sql/colexec/rowstovec_tmpl.go b/pkg/sql/colexec/rowstovec_tmpl.go index 26c4fb0247c3..f448539a0211 100644 --- a/pkg/sql/colexec/rowstovec_tmpl.go +++ b/pkg/sql/colexec/rowstovec_tmpl.go @@ -20,11 +20,24 @@ package colexec import ( + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/rowenc" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" + "github.com/cockroachdb/cockroach/pkg/util/encoding" +) + +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ apd.Context + _ duration.Duration + _ encoding.Direction ) // {{/* diff --git a/pkg/sql/colexec/select_in.eg.go b/pkg/sql/colexec/select_in.eg.go index 4008d37c7f3f..48252b5be9c0 100644 --- a/pkg/sql/colexec/select_in.eg.go +++ b/pkg/sql/colexec/select_in.eg.go @@ -29,6 +29,14 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ coldataext.Datum +) + // Remove unused warnings. var ( _ = colexecerror.InternalError diff --git a/pkg/sql/colexec/select_in_tmpl.go b/pkg/sql/colexec/select_in_tmpl.go index b6b4407a5d53..aaa56807bd2e 100644 --- a/pkg/sql/colexec/select_in_tmpl.go +++ b/pkg/sql/colexec/select_in_tmpl.go @@ -22,7 +22,9 @@ package colexec import ( "context" + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" @@ -31,9 +33,18 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colmem" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ coldataext.Datum +) + // Remove unused warnings. var ( _ = colexecerror.InternalError diff --git a/pkg/sql/colexec/selection_ops.eg.go b/pkg/sql/colexec/selection_ops.eg.go index dcae6cf26322..50d7b3000819 100644 --- a/pkg/sql/colexec/selection_ops.eg.go +++ b/pkg/sql/colexec/selection_ops.eg.go @@ -28,6 +28,14 @@ import ( "github.com/cockroachdb/cockroach/pkg/util/duration" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ coldataext.Datum +) + // selConstOpBase contains all of the fields for binary selections with a // constant, except for the constant itself. type selConstOpBase struct { diff --git a/pkg/sql/colexec/selection_ops_tmpl.go b/pkg/sql/colexec/selection_ops_tmpl.go index 282ee965eda9..2837eef14dfe 100644 --- a/pkg/sql/colexec/selection_ops_tmpl.go +++ b/pkg/sql/colexec/selection_ops_tmpl.go @@ -22,7 +22,9 @@ package colexec import ( "context" + "github.com/cockroachdb/apd/v2" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" @@ -30,9 +32,18 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" + "github.com/cockroachdb/cockroach/pkg/util/duration" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ apd.Context + _ duration.Duration + _ coldataext.Datum +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/sort.eg.go b/pkg/sql/colexec/sort.eg.go index fda51770b526..3fcd9c5744ef 100644 --- a/pkg/sql/colexec/sort.eg.go +++ b/pkg/sql/colexec/sort.eg.go @@ -24,6 +24,13 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ coldataext.Datum + _ tree.AggType +) + func isSorterSupported(t *types.T, dir execinfrapb.Ordering_Column_Direction) bool { switch dir { case execinfrapb.Ordering_Column_ASC: diff --git a/pkg/sql/colexec/sort_tmpl.go b/pkg/sql/colexec/sort_tmpl.go index a65639535716..4910372dffea 100644 --- a/pkg/sql/colexec/sort_tmpl.go +++ b/pkg/sql/colexec/sort_tmpl.go @@ -23,13 +23,22 @@ import ( "context" "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" "github.com/cockroachdb/cockroach/pkg/sql/execinfrapb" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ coldataext.Datum + _ tree.AggType +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/values_differ.eg.go b/pkg/sql/colexec/values_differ.eg.go index b8abe99ab361..7c1d0057625f 100644 --- a/pkg/sql/colexec/values_differ.eg.go +++ b/pkg/sql/colexec/values_differ.eg.go @@ -22,6 +22,14 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // valuesDiffer takes in two ColVecs as well as values indices to check whether // the values differ. This function pays attention to NULLs, and two NULL // values do *not* differ. diff --git a/pkg/sql/colexec/values_differ_tmpl.go b/pkg/sql/colexec/values_differ_tmpl.go index 9cfd0bc8479f..998858077d6e 100644 --- a/pkg/sql/colexec/values_differ_tmpl.go +++ b/pkg/sql/colexec/values_differ_tmpl.go @@ -21,11 +21,22 @@ package colexec import ( "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" + "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ = typeconv.DatumVecCanonicalTypeFamily + _ coldataext.Datum + _ tree.AggType +) + // {{/* // Declarations to make the template compile properly. diff --git a/pkg/sql/colexec/vec_comparators.eg.go b/pkg/sql/colexec/vec_comparators.eg.go index 9c656c942230..28cc4ec6fa3b 100644 --- a/pkg/sql/colexec/vec_comparators.eg.go +++ b/pkg/sql/colexec/vec_comparators.eg.go @@ -22,6 +22,13 @@ import ( "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ coldataext.Datum + _ tree.AggType +) + // vecComparator is a helper for the ordered synchronizer. It stores multiple // column vectors of a single type and facilitates comparing values between // them. diff --git a/pkg/sql/colexec/vec_comparators_tmpl.go b/pkg/sql/colexec/vec_comparators_tmpl.go index 13643b8ffbef..7cfe4eda3cca 100644 --- a/pkg/sql/colexec/vec_comparators_tmpl.go +++ b/pkg/sql/colexec/vec_comparators_tmpl.go @@ -21,13 +21,22 @@ package colexec import ( "github.com/cockroachdb/cockroach/pkg/col/coldata" + "github.com/cockroachdb/cockroach/pkg/col/coldataext" "github.com/cockroachdb/cockroach/pkg/col/typeconv" "github.com/cockroachdb/cockroach/pkg/sql/colexec/execgen" "github.com/cockroachdb/cockroach/pkg/sql/colexecbase/colexecerror" + "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" "github.com/cockroachdb/cockroach/pkg/sql/types" "github.com/cockroachdb/errors" ) +// Workaround for bazel auto-generated code. goimports does not automatically +// pick up the right packages when run within the bazel sandbox. +var ( + _ coldataext.Datum + _ tree.AggType +) + // {{/* // Declarations to make the template compile properly.