Skip to content

exec: fix output types for projections #38983

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

Merged
merged 1 commit into from
Jul 19, 2019
Merged

exec: fix output types for projections #38983

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
29 changes: 17 additions & 12 deletions pkg/sql/distsqlrun/column_exec_setup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/util/timeutil"
"github.com/cockroachdb/cockroach/pkg/util/tracing"
"github.com/cockroachdb/errors"
opentracing "github.com/opentracing/opentracing-go"
"github.com/opentracing/opentracing-go"
)

func checkNumIn(inputs []exec.Operator, numIn int) error {
Expand Down Expand Up @@ -549,6 +549,7 @@ func newColOperator(
}
columnTypes = newTypes
} else if post.RenderExprs != nil {
log.VEventf(ctx, 2, "planning render expressions %+v", post.RenderExprs)
var renderedCols []uint32
for _, expr := range post.RenderExprs {
var (
Expand All @@ -570,6 +571,11 @@ func newColOperator(
memUsage += renderMem
renderedCols = append(renderedCols, uint32(outputIdx))
}
newTypes := make([]semtypes.T, 0, len(renderedCols))
for _, j := range renderedCols {
newTypes = append(newTypes, columnTypes[j])
}
columnTypes = newTypes
op = exec.NewSimpleProjectOp(op, renderedCols)
}
if post.Offset != 0 {
Expand Down Expand Up @@ -649,9 +655,9 @@ func planProjectionOperators(
case *tree.IndexedVar:
return input, t.Idx, columnTypes, memUsed, nil
case *tree.ComparisonExpr:
return planProjectionExpr(ctx, t.Operator, t.TypedLeft(), t.TypedRight(), columnTypes, input)
return planProjectionExpr(ctx, t.Operator, t.ResolvedType(), t.TypedLeft(), t.TypedRight(), columnTypes, input)
case *tree.BinaryExpr:
return planProjectionExpr(ctx, t.Operator, t.TypedLeft(), t.TypedRight(), columnTypes, input)
return planProjectionExpr(ctx, t.Operator, t.ResolvedType(), t.TypedLeft(), t.TypedRight(), columnTypes, input)
case *tree.FuncExpr:
var (
inputCols []int
Expand Down Expand Up @@ -702,6 +708,7 @@ func planProjectionOperators(
func planProjectionExpr(
ctx *tree.EvalContext,
binOp tree.Operator,
outputType *semtypes.T,
left, right tree.TypedExpr,
columnTypes []semtypes.T,
input exec.Operator,
Expand All @@ -722,11 +729,10 @@ func planProjectionExpr(
return nil, resultIdx, ct, memUsed, err
}
resultIdx = len(ct)
typ := &ct[rightIdx]
// The projection result will be outputted to a new column which is appended
// to the input batch.
op, err = exec.GetProjectionLConstOperator(typ, binOp, rightOp, rightIdx, lConstArg, resultIdx)
ct = append(ct, *typ)
op, err = exec.GetProjectionLConstOperator(&ct[rightIdx], binOp, rightOp, rightIdx, lConstArg, resultIdx)
ct = append(ct, *outputType)
if sMem, ok := op.(exec.StaticMemoryOperator); ok {
memUsed += sMem.EstimateStaticMemoryUsage()
}
Expand All @@ -736,7 +742,6 @@ func planProjectionExpr(
if err != nil {
return nil, resultIdx, ct, leftMem, err
}
typ := &ct[leftIdx]
if rConstArg, rConst := right.(tree.Datum); rConst {
// Case 2: The right is constant.
// The projection result will be outputted to a new column which is appended
Expand All @@ -749,11 +754,11 @@ func planProjectionExpr(
err = errors.Errorf("IN operator supported only on constant expressions")
return nil, resultIdx, ct, leftMem, err
}
op, err = exec.GetInProjectionOperator(typ, leftOp, leftIdx, resultIdx, datumTuple, negate)
op, err = exec.GetInProjectionOperator(&ct[leftIdx], leftOp, leftIdx, resultIdx, datumTuple, negate)
} else {
op, err = exec.GetProjectionRConstOperator(typ, binOp, leftOp, leftIdx, rConstArg, resultIdx)
op, err = exec.GetProjectionRConstOperator(&ct[leftIdx], binOp, leftOp, leftIdx, rConstArg, resultIdx)
}
ct = append(ct, *typ)
ct = append(ct, *outputType)
if sMem, ok := op.(exec.StaticMemoryOperator); ok {
memUsed += sMem.EstimateStaticMemoryUsage()
}
Expand All @@ -765,8 +770,8 @@ func planProjectionExpr(
return nil, resultIdx, nil, leftMem + rightMem, err
}
resultIdx = len(ct)
op, err = exec.GetProjectionOperator(typ, binOp, rightOp, leftIdx, rightIdx, resultIdx)
ct = append(ct, *typ)
op, err = exec.GetProjectionOperator(&ct[leftIdx], binOp, rightOp, leftIdx, rightIdx, resultIdx)
ct = append(ct, *outputType)
if sMem, ok := op.(exec.StaticMemoryOperator); ok {
memUsed += sMem.EstimateStaticMemoryUsage()
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/sql/exec/colserde/arrowbatchconverter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"github.com/apache/arrow/go/arrow/memory"
"github.com/cockroachdb/cockroach/pkg/sql/exec/coldata"
"github.com/cockroachdb/cockroach/pkg/sql/exec/types"
"github.com/pkg/errors"
"github.com/cockroachdb/errors"
)

// ArrowBatchConverter converts batches to arrow column data
Expand Down Expand Up @@ -103,7 +103,7 @@ var supportedTypes = func() map[types.T]struct{} {
// next call to BatchToArrow.
func (c *ArrowBatchConverter) BatchToArrow(batch coldata.Batch) ([]*array.Data, error) {
if batch.Width() != len(c.typs) {
return nil, errors.Errorf("mismatched batch width and schema length: %d != %d", batch.Width(), len(c.typs))
return nil, errors.AssertionFailedf("mismatched batch width and schema length: %d != %d", batch.Width(), len(c.typs))
}
n := int(batch.Length())
for i, typ := range c.typs {
Expand Down