Skip to content

Commit e4fa9e5

Browse files
committed
bugfix
1 parent 9ab7d50 commit e4fa9e5

2 files changed

Lines changed: 4 additions & 3 deletions

File tree

runners/google-cloud-dataflow-java/worker/src/main/java/org/apache/beam/runners/dataflow/worker/StreamingModeExecutionContext.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -723,8 +723,8 @@ private void validateCommitRequestSize() {
723723
// so, we're purposefully dropping them here
724724
Windmill.WorkItemCommitRequest.Builder truncationBuilder =
725725
buildWorkItemTruncationRequestBuilder(currentWork, estimatedCommitSize);
726-
this.outputBuilder.clear();
727-
this.outputBuilder.mergeFrom(truncationBuilder);
726+
currentBuilder.clear();
727+
currentBuilder.mergeFrom(truncationBuilder.build());
728728
}
729729

730730
private Windmill.WorkItemCommitRequest.Builder buildWorkItemTruncationRequestBuilder(

runners/google-cloud-dataflow-java/worker/src/test/java/org/apache/beam/runners/dataflow/worker/StreamingDataflowWorkerTest.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1401,7 +1401,8 @@ private void runKeyCommitTooLargeExceptionTest(
14011401
1, "large_key", DEFAULT_SHARDING_KEY, largeCommit.getEstimatedWorkItemCommitBytes())
14021402
.build(),
14031403
removeDynamicFields(largeCommit));
1404-
// Check this explicitly since the estimated commit bytes weren't actuallyExpand commentComment on line L1340
1404+
// Check this explicitly since the estimated commit bytes weren't actuallyExpand commentComment
1405+
// on line L1340
14051406
// checked against an expected value in the previous step
14061407
assertTrue(largeCommit.getEstimatedWorkItemCommitBytes() > 1000);
14071408

0 commit comments

Comments
 (0)