Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

exec: fix planning of count operator #38767

Merged
merged 1 commit into from
Jul 16, 2019
Merged

exec: fix planning of count operator #38767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion pkg/sql/distsqlrun/column_exec_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,9 @@ func newColOperator(
aggSpec.Aggregations[0].FilterColIdx == nil &&
aggSpec.Aggregations[0].Func == distsqlpb.AggregatorSpec_COUNT_ROWS &&
!aggSpec.Aggregations[0].Distinct {
return exec.NewCountOp(inputs[0]), []types.T{types.Int64}, nil
op, err = exec.NewCountOp(inputs[0]), nil
columnTypes = []semtypes.T{*semtypes.Int}
break
}

var groupCols, orderedCols util.FastIntSet
Expand Down
14 changes: 7 additions & 7 deletions pkg/sql/exec/execgen/cmd/execgen/projection_ops_gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,9 +61,9 @@ func (p {{template "opRConstName" .}}) Next(ctx context.Context) coldata.Batch {
batch.AppendCol(types.{{.RetTyp}})
}
vec := batch.ColVec(p.colIdx)
col := vec.{{.LTyp}}()[:coldata.BatchSize]
col := vec.{{.LTyp}}()
projVec := batch.ColVec(p.outputIdx)
projCol := projVec.{{.RetTyp}}()[:coldata.BatchSize]
projCol := projVec.{{.RetTyp}}()
if sel := batch.Selection(); sel != nil {
for _, i := range sel {
{{(.Assign "projCol[i]" "col[i]" "p.constArg")}}
Expand Down Expand Up @@ -105,9 +105,9 @@ func (p {{template "opLConstName" .}}) Next(ctx context.Context) coldata.Batch {
batch.AppendCol(types.{{.RetTyp}})
}
vec := batch.ColVec(p.colIdx)
col := vec.{{.RTyp}}()[:coldata.BatchSize]
col := vec.{{.RTyp}}()
projVec := batch.ColVec(p.outputIdx)
projCol := projVec.{{.RetTyp}}()[:coldata.BatchSize]
projCol := projVec.{{.RetTyp}}()
if sel := batch.Selection(); sel != nil {
for _, i := range sel {
{{(.Assign "projCol[i]" "p.constArg" "col[i]")}}
Expand Down Expand Up @@ -149,11 +149,11 @@ func (p {{template "opName" .}}) Next(ctx context.Context) coldata.Batch {
batch.AppendCol(types.{{.RetTyp}})
}
projVec := batch.ColVec(p.outputIdx)
projCol := projVec.{{.RetTyp}}()[:coldata.BatchSize]
projCol := projVec.{{.RetTyp}}()
vec1 := batch.ColVec(p.col1Idx)
vec2 := batch.ColVec(p.col2Idx)
col1 := vec1.{{.LTyp}}()[:coldata.BatchSize]
col2 := vec2.{{.RTyp}}()[:coldata.BatchSize]
col1 := vec1.{{.LTyp}}()
col2 := vec2.{{.RTyp}}()
if sel := batch.Selection(); sel != nil {
for _, i := range sel {
{{(.Assign "projCol[i]" "col1[i]" "col2[i]")}}
Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/exec/execgen/cmd/execgen/selection_ops_gen.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@ func (p *{{template "opConstName" .}}) Next(ctx context.Context) coldata.Batch {
}

vec := batch.ColVec(p.colIdx)
col := vec.{{.LTyp}}()[:coldata.BatchSize]
col := vec.{{.LTyp}}()
var idx uint16
n := batch.Length()
if vec.MaybeHasNulls() {
Expand Down Expand Up @@ -143,8 +143,8 @@ func (p *{{template "opName" .}}) Next(ctx context.Context) coldata.Batch {

vec1 := batch.ColVec(p.col1Idx)
vec2 := batch.ColVec(p.col2Idx)
col1 := vec1.{{.LTyp}}()[:coldata.BatchSize]
col2 := vec2.{{.RTyp}}()[:coldata.BatchSize]
col1 := vec1.{{.LTyp}}()
col2 := vec2.{{.RTyp}}()
n := batch.Length()

var idx uint16
Expand Down
6 changes: 3 additions & 3 deletions pkg/sql/exec/select_in_tmpl.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ func (si *selectInOp_TYPE) Next(ctx context.Context) coldata.Batch {
}

vec := batch.ColVec(si.colIdx)
col := vec._TemplateType()[:coldata.BatchSize]
col := vec._TemplateType()
var idx uint16
n := batch.Length()

Expand Down Expand Up @@ -247,10 +247,10 @@ func (pi *projectInOp_TYPE) Next(ctx context.Context) coldata.Batch {
}

vec := batch.ColVec(pi.colIdx)
col := vec._TemplateType()[:coldata.BatchSize]
col := vec._TemplateType()

projVec := batch.ColVec(pi.outputIdx)
projCol := projVec.Bool()[:coldata.BatchSize]
projCol := projVec.Bool()
projNulls := projVec.Nulls()

n := batch.Length()
Expand Down
11 changes: 11 additions & 0 deletions pkg/sql/logictest/testdata/logic_test/vectorize
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -444,3 +444,14 @@ query II
SELECT * FROM t38753 ORDER BY y;
----
0 NULL

# Regression test for #38752.
query IIBB
SELECT count(*), count(*) + 1, count(*) > 4, count(*) + 1 > 4 FROM b
----
4 5 false true

query I
SELECT * FROM (SELECT count(*) AS x FROM b) WHERE x > 0;
----
4