Shorten excessive name in DirectExecutionContext
Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/0dc0334a Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/0dc0334a Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/0dc0334a Branch: refs/heads/master Commit: 0dc0334a0c1350c1693019f104dac911a618c9c8 Parents: 62115b2 Author: Kenneth Knowles <[email protected]> Authored: Mon May 22 17:49:01 2017 -0700 Committer: Kenneth Knowles <[email protected]> Committed: Tue May 23 11:16:27 2017 -0700 ---------------------------------------------------------------------- .../beam/runners/direct/DirectExecutionContext.java | 2 +- .../direct/GroupAlsoByWindowEvaluatorFactory.java | 2 +- .../beam/runners/direct/ParDoEvaluatorFactory.java | 2 +- .../SplittableProcessElementsEvaluatorFactory.java | 2 +- .../direct/StatefulParDoEvaluatorFactory.java | 2 +- .../beam/runners/direct/EvaluationContextTest.java | 16 ++++++++-------- .../beam/runners/direct/ParDoEvaluatorTest.java | 2 +- .../direct/StatefulParDoEvaluatorFactoryTest.java | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java index cca5719..11c1b86 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectExecutionContext.java @@ -55,7 +55,7 @@ class DirectExecutionContext { /** * Returns the {@link StepContext} associated with the given step. */ - public DirectStepContext getOrCreateStepContext(String stepName, String transformName) { + public DirectStepContext getStepContext(String stepName, String transformName) { final String finalStepName = stepName; final String finalTransformName = transformName; DirectStepContext context = cachedStepContexts.get(stepName); http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java index 78ef7fe..49b7512 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/GroupAlsoByWindowEvaluatorFactory.java @@ -129,7 +129,7 @@ class GroupAlsoByWindowEvaluatorFactory implements TransformEvaluatorFactory { structuralKey = inputBundle.getKey(); stepContext = evaluationContext .getExecutionContext(application, inputBundle.getKey()) - .getOrCreateStepContext( + .getStepContext( evaluationContext.getStepName(application), application.getTransform().getName()); windowingStrategy = (WindowingStrategy<?, BoundedWindow>) http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java index 74470bf..12c6751 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/ParDoEvaluatorFactory.java @@ -112,7 +112,7 @@ final class ParDoEvaluatorFactory<InputT, OutputT> implements TransformEvaluator DirectStepContext stepContext = evaluationContext .getExecutionContext(application, inputBundleKey) - .getOrCreateStepContext(stepName, stepName); + .getStepContext(stepName, stepName); DoFnLifecycleManager fnManager = fnClones.getUnchecked(doFn); http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SplittableProcessElementsEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SplittableProcessElementsEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SplittableProcessElementsEvaluatorFactory.java index dc85d87..13d9345 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SplittableProcessElementsEvaluatorFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/SplittableProcessElementsEvaluatorFactory.java @@ -109,7 +109,7 @@ class SplittableProcessElementsEvaluatorFactory< final DirectExecutionContext.DirectStepContext stepContext = evaluationContext .getExecutionContext(application, inputBundle.getKey()) - .getOrCreateStepContext(stepName, stepName); + .getStepContext(stepName, stepName); final ParDoEvaluator<KeyedWorkItem<String, ElementAndRestriction<InputT, RestrictionT>>> parDoEvaluator = http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactory.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactory.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactory.java index 985c3be..70d0cf5 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactory.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactory.java @@ -163,7 +163,7 @@ final class StatefulParDoEvaluatorFactory<K, InputT, OutputT> implements Transfo evaluationContext .getExecutionContext( transformOutputWindow.getTransform(), transformOutputWindow.getKey()) - .getOrCreateStepContext(stepName, stepName); + .getStepContext(stepName, stepName); final StateNamespace namespace = StateNamespaces.window( http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java index 72b1bbc..0e2be8d 100644 --- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java +++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/EvaluationContextTest.java @@ -160,7 +160,7 @@ public class EvaluationContextTest { StateTag<BagState<Integer>> intBag = StateTags.bag("myBag", VarIntCoder.of()); - DirectStepContext stepContext = fooContext.getOrCreateStepContext("s1", "s1"); + DirectStepContext stepContext = fooContext.getStepContext("s1", "s1"); stepContext.stateInternals().state(StateNamespaces.global(), intBag).add(1); context.handleResult( @@ -177,7 +177,7 @@ public class EvaluationContextTest { StructuralKey.of("foo", StringUtf8Coder.of())); assertThat( secondFooContext - .getOrCreateStepContext("s1", "s1") + .getStepContext("s1", "s1") .stateInternals() .state(StateNamespaces.global(), intBag) .read(), @@ -194,7 +194,7 @@ public class EvaluationContextTest { StateTag<BagState<Integer>> intBag = StateTags.bag("myBag", VarIntCoder.of()); fooContext - .getOrCreateStepContext("s1", "s1") + .getStepContext("s1", "s1") .stateInternals() .state(StateNamespaces.global(), intBag) .add(1); @@ -205,7 +205,7 @@ public class EvaluationContextTest { assertThat(barContext, not(equalTo(fooContext))); assertThat( barContext - .getOrCreateStepContext("s1", "s1") + .getStepContext("s1", "s1") .stateInternals() .state(StateNamespaces.global(), intBag) .read(), @@ -221,7 +221,7 @@ public class EvaluationContextTest { StateTag<BagState<Integer>> intBag = StateTags.bag("myBag", VarIntCoder.of()); fooContext - .getOrCreateStepContext("s1", "s1") + .getStepContext("s1", "s1") .stateInternals() .state(StateNamespaces.global(), intBag) .add(1); @@ -230,7 +230,7 @@ public class EvaluationContextTest { context.getExecutionContext(downstreamProducer, myKey); assertThat( barContext - .getOrCreateStepContext("s1", "s1") + .getStepContext("s1", "s1") .stateInternals() .state(StateNamespaces.global(), intBag) .read(), @@ -246,7 +246,7 @@ public class EvaluationContextTest { StateTag<BagState<Integer>> intBag = StateTags.bag("myBag", VarIntCoder.of()); CopyOnAccessInMemoryStateInternals<?> state = - fooContext.getOrCreateStepContext("s1", "s1").stateInternals(); + fooContext.getStepContext("s1", "s1").stateInternals(); BagState<Integer> bag = state.state(StateNamespaces.global(), intBag); bag.add(1); bag.add(2); @@ -266,7 +266,7 @@ public class EvaluationContextTest { context.getExecutionContext(downstreamProducer, myKey); CopyOnAccessInMemoryStateInternals<?> afterResultState = - afterResultContext.getOrCreateStepContext("s1", "s1").stateInternals(); + afterResultContext.getStepContext("s1", "s1").stateInternals(); assertThat(afterResultState.state(StateNamespaces.global(), intBag).read(), contains(1, 2, 4)); } http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java index 286e44d..22b3b7e 100644 --- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java +++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/ParDoEvaluatorTest.java @@ -140,7 +140,7 @@ public class ParDoEvaluatorTest { DirectExecutionContext executionContext = mock(DirectExecutionContext.class); DirectStepContext stepContext = mock(DirectStepContext.class); when( - executionContext.getOrCreateStepContext( + executionContext.getStepContext( Mockito.any(String.class), Mockito.any(String.class))) .thenReturn(stepContext); when(stepContext.getTimerUpdate()).thenReturn(TimerUpdate.empty()); http://git-wip-us.apache.org/repos/asf/beam/blob/0dc0334a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java ---------------------------------------------------------------------- diff --git a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java index eb54d5c..b233c1b 100644 --- a/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java +++ b/runners/direct-java/src/test/java/org/apache/beam/runners/direct/StatefulParDoEvaluatorFactoryTest.java @@ -153,7 +153,7 @@ public class StatefulParDoEvaluatorFactoryTest implements Serializable { when(mockEvaluationContext.getExecutionContext( eq(producingTransform), Mockito.<StructuralKey>any())) .thenReturn(mockExecutionContext); - when(mockExecutionContext.getOrCreateStepContext(anyString(), anyString())) + when(mockExecutionContext.getStepContext(anyString(), anyString())) .thenReturn(mockStepContext); IntervalWindow firstWindow = new IntervalWindow(new Instant(0), new Instant(9)); @@ -269,7 +269,7 @@ public class StatefulParDoEvaluatorFactoryTest implements Serializable { when(mockEvaluationContext.getExecutionContext( eq(producingTransform), Mockito.<StructuralKey>any())) .thenReturn(mockExecutionContext); - when(mockExecutionContext.getOrCreateStepContext(anyString(), anyString())) + when(mockExecutionContext.getStepContext(anyString(), anyString())) .thenReturn(mockStepContext); when(mockEvaluationContext.createBundle(Matchers.<PCollection<Integer>>any())) .thenReturn(mockUncommittedBundle);
