MyFavMirrors/minio
1
0
Fork 0
mirror of https://github.com/minio/minio.git synced 2025-11-21 02:09:08 -05:00
Code Issues Packages Projects Releases Wiki Activity

S3 select: Fix output conversion on select * (#8303)

Browse Source 
Fixes #8268
This commit is contained in:
Klaus Post
2019-09-27 12:33:14 -07:00
committed by Harshavardhana
parent 4155f4e49b
commit 1c5b05c130
6 changed files with 78 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/s3select/sql/statement.go
View File

@@ -220,11 +220,11 @@ func (e *SelectStatement) AggregateRow(input Record) error {
// Eval - evaluates the Select statement for the given record. It
// applies only to non-aggregation queries.
// The function returns whether the statement passed the WHERE clause and should be outputted.
func (e *SelectStatement) Eval(input, output Record) (bool, error) {
func (e *SelectStatement) Eval(input, output Record) (Record, error) {
ok, err := e.isPassingWhereClause(input)
if err != nil || !ok {
// Either error or row did not pass where clause
return false, err
return nil, err
}
if e.selectAST.Expression.All {
@@ -235,13 +235,14 @@ func (e *SelectStatement) Eval(input, output Record) (bool, error) {
if e.limitValue > -1 {
e.outputCount++
}
return true, output.CopyFrom(input)
output = input.Clone(output)
return output, nil
}
for i, expr := range e.selectAST.Expression.Expressions {
v, err := expr.evalNode(input)
if err != nil {
return false, err
return nil, err
}
// Pick output column names
@@ -259,7 +260,7 @@ func (e *SelectStatement) Eval(input, output Record) (bool, error) {
e.outputCount++
}
return true, nil
return output, nil
}
// LimitReached - returns true if the number of records output has