Skip to content

revert outputWindowedValue changes as there is outputBuilder #36523

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
kennknowles merged 1 commit into from
Oct 15, 2025
Merged

revert outputWindowedValue changes as there is outputBuilder #36523

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
35 changes: 1 addition & 34 deletions ...ava/org/apache/beam/runners/core/OutputAndTimeBoundedSplittableProcessElementInvoker.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -424,24 +424,6 @@ public void outputWindowedValue(
outputReceiver.output(mainOutputTag, WindowedValues.of(value, timestamp, windows, paneInfo));
}

@Override
public void outputWindowedValue(
OutputT value,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
noteOutput();
if (watermarkEstimator instanceof TimestampObservingWatermarkEstimator) {
((TimestampObservingWatermarkEstimator) watermarkEstimator).observeTimestamp(timestamp);
}
outputReceiver.output(
mainOutputTag,
WindowedValues.of(
value, timestamp, windows, paneInfo, currentRecordId, currentRecordOffset));
}

@Override
public <T> void output(TupleTag<T> tag, T value) {
outputWithTimestamp(tag, value, element.getTimestamp());
Expand All @@ -460,26 +442,11 @@ public <T> void outputWindowedValue(
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo) {
outputWindowedValue(tag, value, timestamp, windows, paneInfo, null, null);
}

@Override
public <T> void outputWindowedValue(
TupleTag<T> tag,
T value,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
noteOutput();
if (watermarkEstimator instanceof TimestampObservingWatermarkEstimator) {
((TimestampObservingWatermarkEstimator) watermarkEstimator).observeTimestamp(timestamp);
}
outputReceiver.output(
tag,
WindowedValues.of(
value, timestamp, windows, paneInfo, currentRecordId, currentRecordOffset));
outputReceiver.output(tag, WindowedValues.of(value, timestamp, windows, paneInfo));
}

private void noteOutput() {
Expand Down
130 changes: 0 additions & 130 deletions runners/core-java/src/main/java/org/apache/beam/runners/core/SimpleDoFnRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,35 +336,6 @@ public void output(OutputT output, Instant timestamp, BoundedWindow window) {
public <T> void output(TupleTag<T> tag, T output, Instant timestamp, BoundedWindow window) {
outputWindowedValue(tag, WindowedValues.of(output, timestamp, window, PaneInfo.NO_FIRING));
}

@Override
public void output(
OutputT output,
Instant timestamp,
BoundedWindow window,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
output(mainOutputTag, output, timestamp, window, currentRecordId, currentRecordOffset);
}

@Override
public <T> void output(
TupleTag<T> tag,
T output,
Instant timestamp,
BoundedWindow window,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
outputWindowedValue(
tag,
WindowedValues.of(
output,
timestamp,
Collections.singletonList(window),
PaneInfo.NO_FIRING,
currentRecordId,
currentRecordOffset));
}
}

private final DoFnFinishBundleArgumentProvider.Context context =
Expand Down Expand Up @@ -461,24 +432,6 @@ public void outputWindowedValue(
outputWindowedValue(mainOutputTag, output, timestamp, windows, paneInfo);
}

@Override
public void outputWindowedValue(
OutputT output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
outputWindowedValue(
mainOutputTag,
output,
timestamp,
windows,
paneInfo,
currentRecordId,
currentRecordOffset);
}

@Override
public <T> void output(TupleTag<T> tag, T output) {
checkNotNull(tag, "Tag passed to output cannot be null");
Expand Down Expand Up @@ -512,21 +465,6 @@ public <T> void outputWindowedValue(
.output();
}

@Override
public <T> void outputWindowedValue(
TupleTag<T> tag,
T output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
SimpleDoFnRunner.this.outputWindowedValue(
tag,
WindowedValues.of(
output, timestamp, windows, paneInfo, currentRecordId, currentRecordOffset));
}

@Override
public Instant timestamp() {
return elem.getTimestamp();
Expand Down Expand Up @@ -964,24 +902,6 @@ public void outputWindowedValue(
outputWindowedValue(mainOutputTag, output, timestamp, windows, paneInfo);
}

@Override
public void outputWindowedValue(
OutputT output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
outputWindowedValue(
mainOutputTag,
output,
timestamp,
windows,
paneInfo,
currentRecordId,
currentRecordOffset);
}

@Override
public <T> void output(TupleTag<T> tag, T output) {
checkTimestamp(timestamp(), timestamp);
Expand Down Expand Up @@ -1013,22 +933,6 @@ public <T> void outputWindowedValue(
.output();
}

@Override
public <T> void outputWindowedValue(
TupleTag<T> tag,
T output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
checkTimestamp(timestamp(), timestamp);
SimpleDoFnRunner.this.outputWindowedValue(
tag,
WindowedValues.of(
output, timestamp, windows, paneInfo, currentRecordId, currentRecordOffset));
}

@Override
public BundleFinalizer bundleFinalizer() {
throw new UnsupportedOperationException(
Expand Down Expand Up @@ -1243,24 +1147,6 @@ public void outputWindowedValue(
outputWindowedValue(mainOutputTag, output, timestamp, windows, paneInfo);
}

@Override
public void outputWindowedValue(
OutputT output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
outputWindowedValue(
mainOutputTag,
output,
timestamp,
windows,
paneInfo,
currentRecordId,
currentRecordOffset);
}

@Override
public <T> void output(TupleTag<T> tag, T output) {
checkTimestamp(this.timestamp, timestamp);
Expand Down Expand Up @@ -1291,22 +1177,6 @@ public <T> void outputWindowedValue(
.output();
}

@Override
public <T> void outputWindowedValue(
TupleTag<T> tag,
T output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
checkTimestamp(this.timestamp, timestamp);
SimpleDoFnRunner.this.outputWindowedValue(
tag,
WindowedValues.of(
output, timestamp, windows, paneInfo, currentRecordId, currentRecordOffset));
}

@Override
public BundleFinalizer bundleFinalizer() {
throw new UnsupportedOperationException(
Expand Down
21 changes: 0 additions & 21 deletions ...ore-java/src/main/java/org/apache/beam/runners/core/SplittableParDoViaKeyedWorkItems.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -662,27 +662,6 @@ public <T> void output(
throwUnsupportedOutput();
}

@Override
public void output(
OutputT output,
Instant timestamp,
BoundedWindow window,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
throwUnsupportedOutput();
}

@Override
public <T> void output(
TupleTag<T> tag,
T output,
Instant timestamp,
BoundedWindow window,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset) {
throwUnsupportedOutput();
}

@Override
public PipelineOptions getPipelineOptions() {
return baseContext.getPipelineOptions();
Expand Down
31 changes: 0 additions & 31 deletions sdks/java/core/src/main/java/org/apache/beam/sdk/transforms/DoFn.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,6 @@ public abstract class FinishBundleContext {
*/
public abstract void output(OutputT output, Instant timestamp, BoundedWindow window);

public abstract void output(
OutputT output,
Instant timestamp,
BoundedWindow window,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset);
/**
* Adds the given element to the output {@code PCollection} with the given tag at the given
* timestamp in the given window.
Expand All @@ -140,14 +134,6 @@ public abstract void output(
*/
public abstract <T> void output(
TupleTag<T> tag, T output, Instant timestamp, BoundedWindow window);

public abstract <T> void output(
TupleTag<T> tag,
T output,
Instant timestamp,
BoundedWindow window,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset);
}

/**
Expand Down Expand Up @@ -226,14 +212,6 @@ public abstract void outputWindowedValue(
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo);

public abstract void outputWindowedValue(
OutputT output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset);

/**
* Adds the given element to the output {@code PCollection} with the given tag.
*
Expand Down Expand Up @@ -306,15 +284,6 @@ public abstract <T> void outputWindowedValue(
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo);

public abstract <T> void outputWindowedValue(
TupleTag<T> tag,
T output,
Instant timestamp,
Collection<? extends BoundedWindow> windows,
PaneInfo paneInfo,
@Nullable String currentRecordId,
@Nullable Long currentRecordOffset);
}

/** Information accessible when running a {@link DoFn.ProcessElement} method. */
Expand Down
Loading
Loading