Skip to content

[BEAM-4745] Revert "[BEAM-4016] Invoke Setup and TearDown on SplitRestrictionFn and PairWithRestrictionFn" #5905

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
iemejia merged 1 commit into from
Jul 9, 2018
Merged

[BEAM-4745] Revert "[BEAM-4016] Invoke Setup and TearDown on SplitRestrictionFn and PairWithRestrictionFn" #5905

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
14 changes: 0 additions & 14 deletions ...ruction-java/src/main/java/org/apache/beam/runners/core/construction/SplittableParDo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,20 +415,13 @@ private static class PairWithRestrictionFn<InputT, OutputT, RestrictionT>
@Setup
public void setup() {
invoker = DoFnInvokers.invokerFor(fn);
invoker.invokeSetup();
}

@ProcessElement
public void processElement(ProcessContext context) {
context.output(
KV.of(context.element(), invoker.invokeGetInitialRestriction(context.element())));
}

@Teardown
public void tearDown() {
invoker.invokeTeardown();
invoker = null;
}
}

/** Splits the restriction using the given {@link SplitRestriction} method. */
Expand All @@ -446,7 +439,6 @@ private static class SplitRestrictionFn<InputT, RestrictionT>
@Setup
public void setup() {
invoker = DoFnInvokers.invokerFor(splittableFn);
invoker.invokeSetup();
}

@ProcessElement
Expand All @@ -467,11 +459,5 @@ public void outputWithTimestamp(RestrictionT part, Instant timestamp) {
}
});
}

@Teardown
public void tearDown() {
invoker.invokeTeardown();
invoker = null;
}
}
}
25 changes: 10 additions & 15 deletions sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/SplittableDoFnTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -513,19 +513,18 @@ private enum State {

private State state = State.BEFORE_SETUP;

@ProcessElement
public void processElement(ProcessContext c, OffsetRangeTracker tracker) {
assertEquals(State.INSIDE_BUNDLE, state);
assertTrue(tracker.tryClaim(0L));
c.output(c.element());
}

@GetInitialRestriction
public OffsetRange getInitialRestriction(String value) {
assertEquals(State.OUTSIDE_BUNDLE, state);
return new OffsetRange(0, 1);
}

@SplitRestriction
public void splitRestriction(
String value, OffsetRange range, OutputReceiver<OffsetRange> receiver) {
assertEquals(State.OUTSIDE_BUNDLE, state);
receiver.output(range);
}

@Setup
public void setUp() {
assertEquals(State.BEFORE_SETUP, state);
Expand All @@ -538,13 +537,6 @@ public void startBundle() {
state = State.INSIDE_BUNDLE;
}

@ProcessElement
public void processElement(ProcessContext c, OffsetRangeTracker tracker) {
assertEquals(State.INSIDE_BUNDLE, state);
assertTrue(tracker.tryClaim(0L));
c.output(c.element());
}

@FinishBundle
public void finishBundle() {
assertEquals(State.INSIDE_BUNDLE, state);
Expand All @@ -561,9 +553,12 @@ public void tearDown() {
@Test
@Category({ValidatesRunner.class, UsesSplittableParDo.class})
public void testLifecycleMethods() throws Exception {

PCollection<String> res =
p.apply(Create.of("a", "b", "c")).apply(ParDo.of(new SDFWithLifecycle()));

PAssert.that(res).containsInAnyOrder("a", "b", "c");

p.run();
}

Expand Down