Repository: beam Updated Branches: refs/heads/master e0189f352 -> 224e44765
Move TimerInternalsFactory to runners/core-java Project: http://git-wip-us.apache.org/repos/asf/beam/repo Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/92b33bc7 Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/92b33bc7 Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/92b33bc7 Branch: refs/heads/master Commit: 92b33bc7ec6d7c5c32a49c5750ac1d4381a478ce Parents: 2e6c131 Author: Kenneth Knowles <k...@google.com> Authored: Thu Jan 26 21:13:42 2017 -0800 Committer: Kenneth Knowles <k...@google.com> Committed: Mon Feb 6 09:26:06 2017 -0800 ---------------------------------------------------------------------- .../beam/runners/core/SplittableParDo.java | 1 - .../runners/core/TimerInternalsFactory.java | 36 ++++++++++++++++++++ .../beam/runners/core/SplittableParDoTest.java | 1 - ...littableProcessElementsEvaluatorFactory.java | 2 +- .../sdk/util/state/TimerInternalsFactory.java | 36 -------------------- 5 files changed, 37 insertions(+), 39 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/beam/blob/92b33bc7/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java index e414430..7368b2f 100644 --- a/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/SplittableParDo.java @@ -57,7 +57,6 @@ import org.apache.beam.sdk.util.state.StateNamespace; import org.apache.beam.sdk.util.state.StateNamespaces; import org.apache.beam.sdk.util.state.StateTag; import org.apache.beam.sdk.util.state.StateTags; -import org.apache.beam.sdk.util.state.TimerInternalsFactory; import org.apache.beam.sdk.util.state.ValueState; import org.apache.beam.sdk.util.state.WatermarkHoldState; import org.apache.beam.sdk.values.KV; http://git-wip-us.apache.org/repos/asf/beam/blob/92b33bc7/runners/core-java/src/main/java/org/apache/beam/runners/core/TimerInternalsFactory.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/TimerInternalsFactory.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/TimerInternalsFactory.java new file mode 100644 index 0000000..e129aed --- /dev/null +++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/TimerInternalsFactory.java @@ -0,0 +1,36 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.beam.runners.core; + +import java.io.Serializable; +import org.apache.beam.sdk.annotations.Experimental; +import org.apache.beam.sdk.annotations.Experimental.Kind; +import org.apache.beam.sdk.util.TimerInternals; + +/** + * A factory for providing {@link TimerInternals} for a particular key. + * + * <p>Because it will generally be embedded in a {@link org.apache.beam.sdk.transforms.DoFn DoFn}, + * albeit at execution time, it is marked {@link Serializable}. + */ +@Experimental(Kind.STATE) +public interface TimerInternalsFactory<K> { + + /** Returns {@link TimerInternals} for the provided key. */ + TimerInternals timerInternalsForKey(K key); +} http://git-wip-us.apache.org/repos/asf/beam/blob/92b33bc7/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java ---------------------------------------------------------------------- diff --git a/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java b/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java index b408d37..427e2f4 100644 --- a/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java +++ b/runners/core-java/src/test/java/org/apache/beam/runners/core/SplittableParDoTest.java @@ -55,7 +55,6 @@ import org.apache.beam.sdk.util.SideInputReader; import org.apache.beam.sdk.util.TimerInternals; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.state.StateInternals; -import org.apache.beam.sdk.util.state.TimerInternalsFactory; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionView; import org.apache.beam.sdk.values.TimestampedValue; http://git-wip-us.apache.org/repos/asf/beam/blob/92b33bc7/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 2122df8..7ed4690 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 @@ -26,6 +26,7 @@ import org.apache.beam.runners.core.OutputAndTimeBoundedSplittableProcessElement import org.apache.beam.runners.core.OutputWindowedValue; import org.apache.beam.runners.core.SplittableParDo; import org.apache.beam.runners.core.StateInternalsFactory; +import org.apache.beam.runners.core.TimerInternalsFactory; import org.apache.beam.runners.direct.DirectRunner.CommittedBundle; import org.apache.beam.sdk.transforms.AppliedPTransform; import org.apache.beam.sdk.transforms.splittabledofn.RestrictionTracker; @@ -34,7 +35,6 @@ import org.apache.beam.sdk.transforms.windowing.PaneInfo; import org.apache.beam.sdk.util.TimerInternals; import org.apache.beam.sdk.util.WindowedValue; import org.apache.beam.sdk.util.state.StateInternals; -import org.apache.beam.sdk.util.state.TimerInternalsFactory; import org.apache.beam.sdk.values.PCollection; import org.apache.beam.sdk.values.PCollectionTuple; import org.apache.beam.sdk.values.TupleTag; http://git-wip-us.apache.org/repos/asf/beam/blob/92b33bc7/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerInternalsFactory.java ---------------------------------------------------------------------- diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerInternalsFactory.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerInternalsFactory.java deleted file mode 100644 index b9c3d5e..0000000 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/state/TimerInternalsFactory.java +++ /dev/null @@ -1,36 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.beam.sdk.util.state; - -import java.io.Serializable; -import org.apache.beam.sdk.annotations.Experimental; -import org.apache.beam.sdk.annotations.Experimental.Kind; -import org.apache.beam.sdk.util.TimerInternals; - -/** - * A factory for providing {@link TimerInternals} for a particular key. - * - * <p>Because it will generally be embedded in a {@link org.apache.beam.sdk.transforms.DoFn DoFn}, - * albeit at execution time, it is marked {@link Serializable}. - */ -@Experimental(Kind.STATE) -public interface TimerInternalsFactory<K> { - - /** Returns {@link TimerInternals} for the provided key. */ - TimerInternals timerInternalsForKey(K key); -}
