Skip to content

Commit

Permalink
bazel,colexec: generate crossjoiner.eg.go within bazel
Browse files Browse the repository at this point in the history
We broke the bazel build in 52c5f51 when we introduced a new .eg.go
file, without updating the bazel target. We do that here.

Fixes: cockroachdb#59052.

Release note: None
  • Loading branch information
alan-mas authored and irfansharif committed Jan 15, 2021
1 parent cd18042 commit 04a80b6
Show file tree
Hide file tree
Showing 3 changed files with 17 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkg/sql/colexec/COLEXEC.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ targets = [
('and_or_projection.eg.go', 'and_or_projection_tmpl.go'),
('cast.eg.go', 'cast_tmpl.go'),
('const.eg.go', 'const_tmpl.go'),
('crossjoiner.eg.go', 'crossjoiner_tmpl.go'),
('default_cmp_expr.eg.go', 'default_cmp_expr_tmpl.go'),
('default_cmp_proj_ops.eg.go', 'default_cmp_proj_ops_tmpl.go'),
('default_cmp_sel_ops.eg.go', 'default_cmp_sel_ops_tmpl.go'),
Expand Down
7 changes: 7 additions & 0 deletions pkg/sql/colexec/crossjoiner.eg.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions pkg/sql/colexec/crossjoiner_tmpl.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,20 @@ import (
"context"

"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/colexecerror"
"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

)

// buildFromLeftInput builds part of the output of a cross join that comes from
// the vectors of the left input. The new output tuples are put starting at
// index destStartIdx and will not exceed the capacity of the output batch. It
Expand Down

0 comments on commit 04a80b6

Please sign in to comment.