-
Notifications
You must be signed in to change notification settings - Fork 66
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'main' into use-kernel.Builder.zctx
- Loading branch information
Showing
26 changed files
with
327 additions
and
61 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| package expr | ||
|
|
||
| import ( | ||
| "github.com/brimdata/zed" | ||
| "github.com/brimdata/zed/vector" | ||
| ) | ||
|
|
||
| // Index represents an index operator "container[index]" where container is | ||
| // either an array or set (with index type integer), or a record | ||
| // (with index type string), or a map (with any index type). | ||
| type Index struct { | ||
| zctx *zed.Context | ||
| container Evaluator | ||
| index Evaluator | ||
| } | ||
|
|
||
| func NewIndexExpr(zctx *zed.Context, container, index Evaluator) Evaluator { | ||
| return &Index{zctx, container, index} | ||
| } | ||
|
|
||
| func (i *Index) Eval(this vector.Any) vector.Any { | ||
| return vector.Apply(true, i.eval, this) | ||
| } | ||
|
|
||
| func (i *Index) eval(args ...vector.Any) vector.Any { | ||
| this := args[0] | ||
| container := i.container.Eval(this) | ||
| index := i.index.Eval(this) | ||
| switch val := vector.Under(container).(type) { | ||
| case *vector.Array: | ||
| return indexArrayOrSet(i.zctx, val.Offsets, val.Values, index, val.Nulls) | ||
| case *vector.Set: | ||
| return indexArrayOrSet(i.zctx, val.Offsets, val.Values, index, val.Nulls) | ||
| case *vector.Record: | ||
| return indexRecord(i.zctx, val, index) | ||
| case *vector.Map: | ||
| panic("vector index operations on maps not supported") | ||
| default: | ||
| return vector.NewMissing(i.zctx, this.Len()) | ||
| } | ||
| } | ||
|
|
||
| func indexArrayOrSet(zctx *zed.Context, offsets []uint32, vals, index vector.Any, nulls *vector.Bool) vector.Any { | ||
| if !zed.IsInteger(index.Type().ID()) { | ||
| return vector.NewWrappedError(zctx, "index is not an integer", index) | ||
| } | ||
| index = promoteToSigned(index) | ||
| var errs []uint32 | ||
| var viewIndexes []uint32 | ||
| for i, start := range offsets[:len(offsets)-1] { | ||
| idx, idxNull := vector.IntValue(index, uint32(i)) | ||
| if !nulls.Value(uint32(i)) && !idxNull { | ||
| len := int64(offsets[i+1]) - int64(start) | ||
| if idx < 0 { | ||
| idx = len + idx | ||
| } | ||
| if idx >= 0 && idx < len { | ||
| viewIndexes = append(viewIndexes, start+uint32(idx)) | ||
| continue | ||
| } | ||
| } | ||
| errs = append(errs, uint32(i)) | ||
| } | ||
| out := vector.Deunion(vector.NewView(viewIndexes, vals)) | ||
| if len(errs) > 0 { | ||
| return vector.Combine(out, errs, vector.NewMissing(zctx, uint32(len(errs)))) | ||
| } | ||
| return out | ||
| } | ||
|
|
||
| func indexRecord(zctx *zed.Context, record *vector.Record, index vector.Any) vector.Any { | ||
| if index.Type().ID() != zed.IDString { | ||
| return vector.NewWrappedError(zctx, "record index is not a string", index) | ||
| } | ||
| var errcnt uint32 | ||
| tags := make([]uint32, record.Len()) | ||
| n := len(record.Typ.Fields) | ||
| viewIndexes := make([][]uint32, n) | ||
| for i := uint32(0); i < record.Len(); i++ { | ||
| field, _ := vector.StringValue(index, i) | ||
| k, ok := record.Typ.IndexOfField(field) | ||
| if !ok { | ||
| tags[i] = uint32(n) | ||
| errcnt++ | ||
| continue | ||
| } | ||
| tags[i] = uint32(k) | ||
| viewIndexes[k] = append(viewIndexes[k], i) | ||
| } | ||
| out := make([]vector.Any, n+1) | ||
| out[n] = vector.NewMissing(zctx, errcnt) | ||
| for i, field := range record.Fields { | ||
| out[i] = vector.NewView(viewIndexes[i], field) | ||
| } | ||
| return vector.NewVariant(tags, out) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package expr | ||
|
|
||
| import ( | ||
| "github.com/brimdata/zed" | ||
| "github.com/brimdata/zed/runtime/sam/expr" | ||
| "github.com/brimdata/zed/vector" | ||
| ) | ||
|
|
||
| // Renamer renames one or more fields in a record. See [expr.Renamer], on which | ||
| // it relies, for more detail. | ||
| type Renamer struct { | ||
| zctx *zed.Context | ||
| renamer *expr.Renamer | ||
| } | ||
|
|
||
| func NewRenamer(zctx *zed.Context, srcs, dsts []*expr.Lval) *Renamer { | ||
| return &Renamer{zctx, expr.NewRenamer(zctx, srcs, dsts)} | ||
| } | ||
|
|
||
| func (r *Renamer) Eval(vec vector.Any) vector.Any { | ||
| return vector.Apply(false, r.eval, vec) | ||
| } | ||
|
|
||
| func (r *Renamer) eval(vecs ...vector.Any) vector.Any { | ||
| vec := vecs[0] | ||
| recVec, ok := vector.Under(vec).(*vector.Record) | ||
| if !ok { | ||
| return vec | ||
| } | ||
| val, err := r.renamer.EvalToValAndError(nil, zed.NewValue(vec.Type(), nil)) | ||
| if err != nil { | ||
| return vector.NewWrappedError(r.zctx, err.Error(), vec) | ||
| } | ||
| return vector.NewRecord(val.Type().(*zed.TypeRecord), recVec.Fields, recVec.Len(), recVec.Nulls) | ||
| } |
2 changes: 2 additions & 0 deletions
2
...sam/expr/ztests/index-deunion-vector.yaml → ...ime/ztests/expr/index-deunion-vector.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.