Skip to content

[BEAM-22] Clean up InProcess Read Evaluators #106

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

Closed
tgroh wants to merge 2 commits into from
Closed

[BEAM-22] Clean up InProcess Read Evaluators #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f77814f
Explicitly track the Source a ReadEvaluator is using
tgroh Mar 31, 2016
a8f862d
Use proper scoping, interfaces in BoundedReadEvaluator
tgroh Mar 31, 2016
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
26 changes: 14 additions & 12 deletions ...ain/java/com/google/cloud/dataflow/sdk/runners/inprocess/BoundedReadEvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
import com.google.cloud.dataflow.sdk.io.BoundedSource;
import com.google.cloud.dataflow.sdk.io.BoundedSource.BoundedReader;
import com.google.cloud.dataflow.sdk.io.Read.Bounded;
import com.google.cloud.dataflow.sdk.io.Source.Reader;
import com.google.cloud.dataflow.sdk.runners.inprocess.InProcessPipelineRunner.CommittedBundle;
import com.google.cloud.dataflow.sdk.runners.inprocess.InProcessPipelineRunner.UncommittedBundle;
import com.google.cloud.dataflow.sdk.transforms.AppliedPTransform;
Expand Down Expand Up @@ -62,8 +61,7 @@ public <InputT> TransformEvaluator<InputT> forApplication(

private <OutputT> TransformEvaluator<?> getTransformEvaluator(
final AppliedPTransform<?, PCollection<OutputT>, Bounded<OutputT>> transform,
final InProcessEvaluationContext evaluationContext)
throws IOException {
final InProcessEvaluationContext evaluationContext) {
BoundedReadEvaluator<?> evaluator =
getTransformEvaluatorQueue(transform, evaluationContext).poll();
if (evaluator == null) {
Expand Down Expand Up @@ -93,8 +91,9 @@ private <OutputT> Queue<BoundedReadEvaluator<OutputT>> getTransformEvaluatorQueu
if (sourceEvaluators.putIfAbsent(key, evaluatorQueue) == null) {
// If no queue existed in the evaluators, add an evaluator to initialize the evaluator
// factory for this transform
BoundedSource<OutputT> source = transform.getTransform().getSource();
BoundedReadEvaluator<OutputT> evaluator =
new BoundedReadEvaluator<OutputT>(transform, evaluationContext);
new BoundedReadEvaluator<OutputT>(transform, evaluationContext, source);
evaluatorQueue.offer(evaluator);
} else {
// otherwise return the existing Queue that arrived before us
Expand All @@ -116,26 +115,29 @@ private <OutputT> Queue<BoundedReadEvaluator<OutputT>> getTransformEvaluatorQueu
private static class BoundedReadEvaluator<OutputT> implements TransformEvaluator<Object> {
private final AppliedPTransform<?, PCollection<OutputT>, Bounded<OutputT>> transform;
private final InProcessEvaluationContext evaluationContext;
private boolean contentsRemaining;
/**
* The source being read from by this {@link BoundedReadEvaluator}. This may not be the same
* as the source derived from {@link #transform} due to splitting.
*/
private BoundedSource<OutputT> source;

public BoundedReadEvaluator(
AppliedPTransform<?, PCollection<OutputT>, Bounded<OutputT>> transform,
InProcessEvaluationContext evaluationContext) {
InProcessEvaluationContext evaluationContext,
BoundedSource<OutputT> source) {
this.transform = transform;
this.evaluationContext = evaluationContext;
this.source = source;
}

@Override
public void processElement(WindowedValue<Object> element) {}

@Override
public InProcessTransformResult finishBundle() throws IOException {
try (final Reader<OutputT> reader =
transform
.getTransform()
.getSource()
.createReader(evaluationContext.getPipelineOptions());) {
contentsRemaining = reader.start();
try (final BoundedReader<OutputT> reader =
source.createReader(evaluationContext.getPipelineOptions());) {
boolean contentsRemaining = reader.start();
UncommittedBundle<OutputT> output =
evaluationContext.createRootBundle(transform.getOutput());
while (contentsRemaining) {
Expand Down
14 changes: 11 additions & 3 deletions ...n/java/com/google/cloud/dataflow/sdk/runners/inprocess/UnboundedReadEvaluatorFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,10 @@ private <OutputT> Queue<UnboundedReadEvaluator<OutputT>> getTransformEvaluatorQu
if (sourceEvaluators.putIfAbsent(key, evaluatorQueue) == null) {
// If no queue existed in the evaluators, add an evaluator to initialize the evaluator
// factory for this transform
UnboundedSource<OutputT, ?> source = transform.getTransform().getSource();
UnboundedReadEvaluator<OutputT> evaluator =
new UnboundedReadEvaluator<OutputT>(transform, evaluationContext, evaluatorQueue);
new UnboundedReadEvaluator<OutputT>(
transform, evaluationContext, source, evaluatorQueue);
evaluatorQueue.offer(evaluator);
} else {
// otherwise return the existing Queue that arrived before us
Expand All @@ -116,15 +118,22 @@ private static class UnboundedReadEvaluator<OutputT> implements TransformEvaluat
private final AppliedPTransform<?, PCollection<OutputT>, Unbounded<OutputT>> transform;
private final InProcessEvaluationContext evaluationContext;
private final Queue<UnboundedReadEvaluator<OutputT>> evaluatorQueue;
/**
* The source being read from by this {@link UnboundedReadEvaluator}. This may not be the same
* source as derived from {@link #transform} due to splitting.
*/
private final UnboundedSource<OutputT, ?> source;
private CheckpointMark checkpointMark;

public UnboundedReadEvaluator(
AppliedPTransform<?, PCollection<OutputT>, Unbounded<OutputT>> transform,
InProcessEvaluationContext evaluationContext,
UnboundedSource<OutputT, ?> source,
Queue<UnboundedReadEvaluator<OutputT>> evaluatorQueue) {
this.transform = transform;
this.evaluationContext = evaluationContext;
this.evaluatorQueue = evaluatorQueue;
this.source = source;
this.checkpointMark = null;
}

Expand All @@ -135,8 +144,7 @@ public void processElement(WindowedValue<Object> element) {}
public InProcessTransformResult finishBundle() throws IOException {
UncommittedBundle<OutputT> output = evaluationContext.createRootBundle(transform.getOutput());
try (UnboundedReader<OutputT> reader =
createReader(
transform.getTransform().getSource(), evaluationContext.getPipelineOptions());) {
createReader(source, evaluationContext.getPipelineOptions());) {
int numElements = 0;
if (reader.start()) {
do {
Expand Down