Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
240 changes: 113 additions & 127 deletions sdks/go/pkg/beam/beam.shims.go

Large diffs are not rendered by default.

8 changes: 5 additions & 3 deletions sdks/go/pkg/beam/core/runtime/exec/emit.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ import (
// emit event time.
type ReusableEmitter interface {
// Init resets the value. Can be called multiple times.
Init(ctx context.Context, ws []typex.Window, t typex.EventTime) error
Init(ctx context.Context, pn typex.PaneInfo, ws []typex.Window, t typex.EventTime) error
// Value returns the side input value. Constant value.
Value() any
}
Expand Down Expand Up @@ -96,12 +96,14 @@ type emitValue struct {
est *sdf.WatermarkEstimator

ctx context.Context
pn typex.PaneInfo
ws []typex.Window
et typex.EventTime
}

func (e *emitValue) Init(ctx context.Context, ws []typex.Window, et typex.EventTime) error {
func (e *emitValue) Init(ctx context.Context, pn typex.PaneInfo, ws []typex.Window, et typex.EventTime) error {
e.ctx = ctx
e.pn = pn
e.ws = ws
e.et = et
return nil
Expand All @@ -116,7 +118,7 @@ func (e *emitValue) AttachEstimator(est *sdf.WatermarkEstimator) {
}

func (e *emitValue) invoke(args []reflect.Value) []reflect.Value {
value := &FullValue{Windows: e.ws, Timestamp: e.et}
value := &FullValue{Pane: e.pn, Windows: e.ws, Timestamp: e.et}
isKey := true
for i, t := range e.types {
switch {
Expand Down
2,028 changes: 1,015 additions & 1,013 deletions sdks/go/pkg/beam/core/runtime/exec/optimized/emitters.go

Large diffs are not rendered by default.

12 changes: 7 additions & 5 deletions sdks/go/pkg/beam/core/runtime/exec/optimized/emitters.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -44,13 +44,15 @@ type emitNative struct {
est *sdf.WatermarkEstimator

ctx context.Context
pn typex.PaneInfo
ws []typex.Window
et typex.EventTime
value exec.FullValue
}

func (e *emitNative) Init(ctx context.Context, ws []typex.Window, et typex.EventTime) error {
func (e *emitNative) Init(ctx context.Context, pn typex.PaneInfo, ws []typex.Window, et typex.EventTime) error {
e.ctx = ctx
e.pn = pn
e.ws = ws
e.et = et
return nil
Expand All @@ -72,7 +74,7 @@ func emitMaker{{$x.Name}}(n exec.ElementProcessor) exec.ReusableEmitter {
}

func (e *emitNative) invoke{{$x.Name}}(elm {{$x.Type}}) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: e.et, Elm: elm }
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: e.et, Elm: elm }
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(e.et.ToTime())
}
Expand All @@ -88,7 +90,7 @@ func emitMakerET{{$x.Name}}(n exec.ElementProcessor) exec.ReusableEmitter {
}

func (e *emitNative) invokeET{{$x.Name}}(t typex.EventTime, elm {{$x.Type}}) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: t, Elm: elm }
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: t, Elm: elm }
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(t.ToTime())
}
Expand All @@ -105,7 +107,7 @@ func emitMaker{{$x.Name}}{{$y.Name}}(n exec.ElementProcessor) exec.ReusableEmitt
}

func (e *emitNative) invoke{{$x.Name}}{{$y.Name}}(key {{$x.Type}}, val {{$y.Type}}) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: e.et, Elm: key, Elm2: val }
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: e.et, Elm: key, Elm2: val }
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(e.et.ToTime())
}
Expand All @@ -121,7 +123,7 @@ func emitMakerET{{$x.Name}}{{$y.Name}}(n exec.ElementProcessor) exec.ReusableEmi
}

func (e *emitNative) invokeET{{$x.Name}}{{$y.Name}}(t typex.EventTime, key {{$x.Type}}, val {{$y.Type}}) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: t, Elm: key, Elm2: val }
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: t, Elm: key, Elm2: val }
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(t.ToTime())
}
Expand Down
10 changes: 5 additions & 5 deletions sdks/go/pkg/beam/core/runtime/exec/pardo.go
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ func (n *ParDo) invokeDataFn(ctx context.Context, pn typex.PaneInfo, ws []typex.
err = postErr
}
}()
if err := n.preInvoke(ctx, ws, ts); err != nil {
if err := n.preInvoke(ctx, pn, ws, ts); err != nil {
return nil, err
}
val, err = Invoke(ctx, pn, ws, ts, fn, opt, n.bf, n.we, n.UState, n.reader, n.cache.extra...)
Expand Down Expand Up @@ -474,7 +474,7 @@ func (n *ParDo) processTimer(timerFamilyID string, singleWindow []typex.Window,
err = postErr
}
}()
if err := n.preInvoke(n.ctx, singleWindow, tmap.HoldTimestamp); err != nil {
if err := n.preInvoke(n.ctx, typex.NoFiringPane(), singleWindow, tmap.HoldTimestamp); err != nil {
return err
}

Expand Down Expand Up @@ -502,7 +502,7 @@ func (n *ParDo) invokeProcessFn(ctx context.Context, pn typex.PaneInfo, ws []typ
err = postErr
}
}()
if err := n.preInvoke(ctx, ws, ts); err != nil {
if err := n.preInvoke(ctx, pn, ws, ts); err != nil {
return nil, err
}
val, err = n.inv.invokeWithOpts(ctx, pn, ws, ts, InvokeOpts{opt: opt, bf: n.bf, we: n.we, sa: n.UState, sr: n.reader, ta: n.TimerTracker, tm: n.timerManager, extra: n.cache.extra})
Expand All @@ -512,9 +512,9 @@ func (n *ParDo) invokeProcessFn(ctx context.Context, pn typex.PaneInfo, ws []typ
return val, nil
}

func (n *ParDo) preInvoke(ctx context.Context, ws []typex.Window, ts typex.EventTime) error {
func (n *ParDo) preInvoke(ctx context.Context, pn typex.PaneInfo, ws []typex.Window, ts typex.EventTime) error {
for _, e := range n.emitters {
if err := e.Init(ctx, ws, ts); err != nil {
if err := e.Init(ctx, pn, ws, ts); err != nil {
return err
}
}
Expand Down
12 changes: 7 additions & 5 deletions sdks/go/pkg/beam/register/emitter.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,13 +28,15 @@ type emit struct {
est *sdf.WatermarkEstimator

ctx context.Context
pn typex.PaneInfo
ws []typex.Window
et typex.EventTime
value exec.FullValue
}

func (e *emit) Init(ctx context.Context, ws []typex.Window, et typex.EventTime) error {
func (e *emit) Init(ctx context.Context, pn typex.PaneInfo, ws []typex.Window, et typex.EventTime) error {
e.ctx = ctx
e.pn = pn
e.ws = ws
e.et = et
return nil
Expand All @@ -54,7 +56,7 @@ func (e *emit1[T]) Value() any {
}

func (e *emit1[T]) invoke(val T) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: e.et, Elm: val}
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: e.et, Elm: val}
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(e.et.ToTime())
}
Expand All @@ -73,7 +75,7 @@ func (e *emit2[T1, T2]) Value() any {
}

func (e *emit2[T1, T2]) invoke(key T1, val T2) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: e.et, Elm: key, Elm2: val}
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: e.et, Elm: key, Elm2: val}
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(e.et.ToTime())
}
Expand All @@ -92,7 +94,7 @@ func (e *emit1WithTimestamp[T]) Value() any {
}

func (e *emit1WithTimestamp[T]) invoke(et typex.EventTime, val T) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: et, Elm: val}
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: et, Elm: val}
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(et.ToTime())
}
Expand All @@ -111,7 +113,7 @@ func (e *emit2WithTimestamp[T1, T2]) Value() any {
}

func (e *emit2WithTimestamp[T1, T2]) invoke(et typex.EventTime, key T1, val T2) {
e.value = exec.FullValue{Windows: e.ws, Timestamp: et, Elm: key, Elm2: val}
e.value = exec.FullValue{Pane: e.pn, Windows: e.ws, Timestamp: et, Elm: key, Elm2: val}
if e.est != nil {
(*e.est).(sdf.TimestampObservingEstimator).ObserveTimestamp(et.ToTime())
}
Expand Down
8 changes: 4 additions & 4 deletions sdks/go/pkg/beam/register/emitter_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ func TestEmitter3(t *testing.T) {

func TestEmit1(t *testing.T) {
e := &emit1[int]{n: &elementProcessor{}}
e.Init(context.Background(), []typex.Window{}, mtime.ZeroTimestamp)
e.Init(context.Background(), typex.NoFiringPane(), []typex.Window{}, mtime.ZeroTimestamp)
fn := e.Value().(func(int))
fn(3)
if got, want := e.n.(*elementProcessor).inFV.Elm, 3; got != want {
Expand All @@ -119,7 +119,7 @@ func TestEmit1(t *testing.T) {

func TestEmit2(t *testing.T) {
e := &emit2[int, string]{n: &elementProcessor{}}
e.Init(context.Background(), []typex.Window{}, mtime.ZeroTimestamp)
e.Init(context.Background(), typex.NoFiringPane(), []typex.Window{}, mtime.ZeroTimestamp)
fn := e.Value().(func(int, string))
fn(3, "hello")
if got, want := e.n.(*elementProcessor).inFV.Elm, 3; got != want {
Expand All @@ -135,7 +135,7 @@ func TestEmit2(t *testing.T) {

func TestEmit1WithTimestamp(t *testing.T) {
e := &emit1WithTimestamp[int]{n: &elementProcessor{}}
e.Init(context.Background(), []typex.Window{}, mtime.ZeroTimestamp)
e.Init(context.Background(), typex.NoFiringPane(), []typex.Window{}, mtime.ZeroTimestamp)
fn := e.Value().(func(typex.EventTime, int))
fn(mtime.MaxTimestamp, 3)
if got, want := e.n.(*elementProcessor).inFV.Elm, 3; got != want {
Expand All @@ -151,7 +151,7 @@ func TestEmit1WithTimestamp(t *testing.T) {

func TestEmit2WithTimestamp(t *testing.T) {
e := &emit2WithTimestamp[int, string]{n: &elementProcessor{}}
e.Init(context.Background(), []typex.Window{}, mtime.ZeroTimestamp)
e.Init(context.Background(), typex.NoFiringPane(), []typex.Window{}, mtime.ZeroTimestamp)
fn := e.Value().(func(typex.EventTime, int, string))
fn(mtime.MaxTimestamp, 3, "hello")
if got, want := e.n.(*elementProcessor).inFV.Elm, 3; got != want {
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Loading