You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by al...@apache.org on 2022/03/18 01:09:33 UTC
[beam] branch master updated: [BEAM-10212] Clean-up comments, remove rawtypes usage.
This is an automated email from the ASF dual-hosted git repository.
altay pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 48ed687 [BEAM-10212] Clean-up comments, remove rawtypes usage.
new 4c979cc Merge pull request #16954 from lukecwik/beam10212
48ed687 is described below
commit 48ed6878d6f886bcfba745fb5474088ef76141f3
Author: Luke Cwik <lc...@google.com>
AuthorDate: Fri Feb 25 12:19:31 2022 -0800
[BEAM-10212] Clean-up comments, remove rawtypes usage.
---
.../apache/beam/fn/harness/FnApiDoFnRunner.java | 26 +++++++---------------
1 file changed, 8 insertions(+), 18 deletions(-)
diff --git a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java
index 89c05b8..cf84027 100644
--- a/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java
+++ b/sdks/java/harness/src/main/java/org/apache/beam/fn/harness/FnApiDoFnRunner.java
@@ -721,7 +721,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
// no-op
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor =
new FnApiStateAccessor(
pipelineOptions,
@@ -810,7 +809,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
currentRestriction = null;
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}
@@ -841,7 +839,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
currentRestriction = null;
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}
@@ -869,7 +866,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
currentTracker = null;
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}
@@ -903,7 +899,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
currentTracker = null;
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}
@@ -935,7 +930,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
currentWatermarkEstimatorState = null;
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}
@@ -987,20 +981,18 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
initialWatermark = null;
}
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}
/** Internal class to hold the primary and residual roots when converted to an input element. */
@AutoValue
@AutoValue.CopyAnnotations
- @SuppressWarnings({"rawtypes"})
abstract static class WindowedSplitResult {
public static WindowedSplitResult forRoots(
- WindowedValue primaryInFullyProcessedWindowsRoot,
- WindowedValue primarySplitRoot,
- WindowedValue residualSplitRoot,
- WindowedValue residualInUnprocessedWindowsRoot) {
+ WindowedValue<?> primaryInFullyProcessedWindowsRoot,
+ WindowedValue<?> primarySplitRoot,
+ WindowedValue<?> residualSplitRoot,
+ WindowedValue<?> residualInUnprocessedWindowsRoot) {
return new AutoValue_FnApiDoFnRunner_WindowedSplitResult(
primaryInFullyProcessedWindowsRoot,
primarySplitRoot,
@@ -1008,18 +1000,17 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
residualInUnprocessedWindowsRoot);
}
- public abstract @Nullable WindowedValue getPrimaryInFullyProcessedWindowsRoot();
+ public abstract @Nullable WindowedValue<?> getPrimaryInFullyProcessedWindowsRoot();
- public abstract @Nullable WindowedValue getPrimarySplitRoot();
+ public abstract @Nullable WindowedValue<?> getPrimarySplitRoot();
- public abstract @Nullable WindowedValue getResidualSplitRoot();
+ public abstract @Nullable WindowedValue<?> getResidualSplitRoot();
- public abstract @Nullable WindowedValue getResidualInUnprocessedWindowsRoot();
+ public abstract @Nullable WindowedValue<?> getResidualInUnprocessedWindowsRoot();
}
@AutoValue
@AutoValue.CopyAnnotations
- @SuppressWarnings({"rawtypes"})
abstract static class SplitResultsWithStopIndex {
public static SplitResultsWithStopIndex of(
WindowedSplitResult windowSplit,
@@ -1750,7 +1741,6 @@ public class FnApiDoFnRunner<InputT, RestrictionT, PositionT, WatermarkEstimator
doFnInvoker.invokeFinishBundle(finishBundleArgumentProvider);
- // TODO(BEAM-10212): Support caching state data across bundle boundaries.
this.stateAccessor.finalizeState();
}