From 15d790698978b994b2e1d854cf4b5b20e8fd0aad Mon Sep 17 00:00:00 2001 From: Kenneth Knowles Date: Fri, 1 Jul 2016 14:39:03 -0700 Subject: [PATCH 1/2] Move aggregator scraping util code to runners/core-java --- .../org/apache/beam/sdk/runners/AggregatorPipelineExtractor.java | 0 .../main/java/org/apache/beam/sdk/util/MapAggregatorValues.java | 0 .../apache/beam/sdk/runners/AggregatorPipelineExtractorTest.java | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename {sdks/java/core => runners/core-java}/src/main/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractor.java (100%) rename {sdks/java/core => runners/core-java}/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java (100%) rename {sdks/java/core => runners/core-java}/src/test/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractorTest.java (100%) diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractor.java b/runners/core-java/src/main/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractor.java similarity index 100% rename from sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractor.java rename to runners/core-java/src/main/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractor.java diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java b/runners/core-java/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java similarity index 100% rename from sdks/java/core/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java rename to runners/core-java/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractorTest.java b/runners/core-java/src/test/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractorTest.java similarity index 100% rename from sdks/java/core/src/test/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractorTest.java rename to runners/core-java/src/test/java/org/apache/beam/sdk/runners/AggregatorPipelineExtractorTest.java From 7ca450df8c8bacb1d90b86dd2f5dbe074843a01f Mon Sep 17 00:00:00 2001 From: Kenneth Knowles Date: Fri, 1 Jul 2016 14:56:20 -0700 Subject: [PATCH 2/2] Move user-facing aggregator classes out of runners namespace --- .../java/org/apache/beam/sdk/util/MapAggregatorValues.java | 2 +- .../java/org/apache/beam/runners/direct/DirectRunner.java | 4 ++-- .../org/apache/beam/runners/dataflow/DataflowPipelineJob.java | 4 ++-- .../apache/beam/runners/dataflow/DataflowPipelineJobTest.java | 4 ++-- .../beam/sdk/{runners => }/AggregatorRetrievalException.java | 2 +- .../org/apache/beam/sdk/{runners => }/AggregatorValues.java | 2 +- .../src/main/java/org/apache/beam/sdk/PipelineResult.java | 2 -- 7 files changed, 9 insertions(+), 11 deletions(-) rename sdks/java/core/src/main/java/org/apache/beam/sdk/{runners => }/AggregatorRetrievalException.java (97%) rename sdks/java/core/src/main/java/org/apache/beam/sdk/{runners => }/AggregatorValues.java (97%) diff --git a/runners/core-java/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java b/runners/core-java/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java index fe02666dee49..f543bb73e3c8 100644 --- a/runners/core-java/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java +++ b/runners/core-java/src/main/java/org/apache/beam/sdk/util/MapAggregatorValues.java @@ -17,7 +17,7 @@ */ package org.apache.beam.sdk.util; -import org.apache.beam.sdk.runners.AggregatorValues; +import org.apache.beam.sdk.AggregatorValues; import org.apache.beam.sdk.transforms.Aggregator; import com.google.common.base.MoreObjects; diff --git a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java index 7408c0bf56a3..11b6140314b8 100644 --- a/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java +++ b/runners/direct-java/src/main/java/org/apache/beam/runners/direct/DirectRunner.java @@ -20,14 +20,14 @@ import org.apache.beam.runners.direct.DirectGroupByKey.DirectGroupByKeyOnly; import org.apache.beam.runners.direct.DirectRunner.DirectPipelineResult; import org.apache.beam.runners.direct.ViewEvaluatorFactory.ViewOverrideFactory; +import org.apache.beam.sdk.AggregatorRetrievalException; +import org.apache.beam.sdk.AggregatorValues; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.Pipeline.PipelineExecutionException; import org.apache.beam.sdk.PipelineResult; import org.apache.beam.sdk.annotations.Experimental; import org.apache.beam.sdk.options.PipelineOptions; import org.apache.beam.sdk.runners.AggregatorPipelineExtractor; -import org.apache.beam.sdk.runners.AggregatorRetrievalException; -import org.apache.beam.sdk.runners.AggregatorValues; import org.apache.beam.sdk.runners.PipelineRunner; import org.apache.beam.sdk.transforms.Aggregator; import org.apache.beam.sdk.transforms.AppliedPTransform; diff --git a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java index 0c79a920261e..21f9aa05c3ef 100644 --- a/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java +++ b/runners/google-cloud-dataflow-java/src/main/java/org/apache/beam/runners/dataflow/DataflowPipelineJob.java @@ -22,9 +22,9 @@ import org.apache.beam.runners.dataflow.internal.DataflowAggregatorTransforms; import org.apache.beam.runners.dataflow.internal.DataflowMetricUpdateExtractor; import org.apache.beam.runners.dataflow.util.MonitoringUtil; +import org.apache.beam.sdk.AggregatorRetrievalException; +import org.apache.beam.sdk.AggregatorValues; import org.apache.beam.sdk.PipelineResult; -import org.apache.beam.sdk.runners.AggregatorRetrievalException; -import org.apache.beam.sdk.runners.AggregatorValues; import org.apache.beam.sdk.transforms.Aggregator; import org.apache.beam.sdk.util.AttemptAndTimeBoundedExponentialBackOff; import org.apache.beam.sdk.util.AttemptBoundedExponentialBackOff; diff --git a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java index 80b7e7b12454..43d0225e5af2 100644 --- a/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java +++ b/runners/google-cloud-dataflow-java/src/test/java/org/apache/beam/runners/dataflow/DataflowPipelineJobTest.java @@ -34,9 +34,9 @@ import org.apache.beam.runners.dataflow.internal.DataflowAggregatorTransforms; import org.apache.beam.runners.dataflow.util.MonitoringUtil; +import org.apache.beam.sdk.AggregatorRetrievalException; +import org.apache.beam.sdk.AggregatorValues; import org.apache.beam.sdk.PipelineResult.State; -import org.apache.beam.sdk.runners.AggregatorRetrievalException; -import org.apache.beam.sdk.runners.AggregatorValues; import org.apache.beam.sdk.testing.FastNanoClockAndSleeper; import org.apache.beam.sdk.transforms.Aggregator; import org.apache.beam.sdk.transforms.AppliedPTransform; diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorRetrievalException.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/AggregatorRetrievalException.java similarity index 97% rename from sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorRetrievalException.java rename to sdks/java/core/src/main/java/org/apache/beam/sdk/AggregatorRetrievalException.java index a0973c3b52ec..30408152c3a7 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorRetrievalException.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/AggregatorRetrievalException.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.runners; +package org.apache.beam.sdk; import org.apache.beam.sdk.transforms.Aggregator; diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorValues.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/AggregatorValues.java similarity index 97% rename from sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorValues.java rename to sdks/java/core/src/main/java/org/apache/beam/sdk/AggregatorValues.java index a42ece2c51af..1a1c1bac84c4 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/runners/AggregatorValues.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/AggregatorValues.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.beam.sdk.runners; +package org.apache.beam.sdk; import org.apache.beam.sdk.transforms.Aggregator; import org.apache.beam.sdk.transforms.Combine.CombineFn; diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java index f67cb477a204..7df6696dae6f 100644 --- a/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java +++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/PipelineResult.java @@ -17,8 +17,6 @@ */ package org.apache.beam.sdk; -import org.apache.beam.sdk.runners.AggregatorRetrievalException; -import org.apache.beam.sdk.runners.AggregatorValues; import org.apache.beam.sdk.transforms.Aggregator; /**