From 42e522ac0af581cc5f37507bd4b8b47e537ef1a2 Mon Sep 17 00:00:00 2001 From: Noah Treuhaft Date: Mon, 7 Oct 2024 09:37:05 -0400 Subject: [PATCH] Remove runtime/sam/op/pass.Op A dag.Pass compiles to a pass.Op. Since pass.Op.Pull simply calls its parent's Pull method and returns the result, dag.Pass can simply compile to its parent, and pass.Op isn't needed. --- compiler/kernel/op.go | 3 +-- runtime/sam/op/pass/pass.go | 17 ----------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 runtime/sam/op/pass/pass.go diff --git a/compiler/kernel/op.go b/compiler/kernel/op.go index df53baaebe..215222b544 100644 --- a/compiler/kernel/op.go +++ b/compiler/kernel/op.go @@ -30,7 +30,6 @@ import ( "github.com/brimdata/zed/runtime/sam/op/merge" "github.com/brimdata/zed/runtime/sam/op/meta" "github.com/brimdata/zed/runtime/sam/op/mirror" - "github.com/brimdata/zed/runtime/sam/op/pass" "github.com/brimdata/zed/runtime/sam/op/shape" "github.com/brimdata/zed/runtime/sam/op/sort" "github.com/brimdata/zed/runtime/sam/op/switcher" @@ -197,7 +196,7 @@ func (b *Builder) compileLeaf(o dag.Op, parent zbuf.Puller) (zbuf.Puller, error) case *dag.Uniq: return uniq.New(b.rctx, parent, v.Cflag), nil case *dag.Pass: - return pass.New(parent), nil + return parent, nil case *dag.Filter: b.resetResetters() f, err := b.compileExpr(v.Expr) diff --git a/runtime/sam/op/pass/pass.go b/runtime/sam/op/pass/pass.go deleted file mode 100644 index 54de1dd65d..0000000000 --- a/runtime/sam/op/pass/pass.go +++ /dev/null @@ -1,17 +0,0 @@ -package pass - -import ( - "github.com/brimdata/zed/zbuf" -) - -type Op struct { - parent zbuf.Puller -} - -func New(parent zbuf.Puller) *Op { - return &Op{parent} -} - -func (o *Op) Pull(done bool) (zbuf.Batch, error) { - return o.parent.Pull(done) -}