This closes #77
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/6c34f3a3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/6c34f3a3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/6c34f3a3 Branch: refs/heads/master Commit: 6c34f3a343cb9c26dc922f9fa3fa5e0e39518f02 Parents: 2b55445 52cd18a Author: Kenneth Knowles <k...@google.com> Authored: Tue Apr 5 13:56:05 2016 -0700 Committer: Kenneth Knowles <k...@google.com> Committed: Tue Apr 5 13:56:05 2016 -0700 ---------------------------------------------------------------------- .../FlinkBatchTransformTranslators.java | 26 +- .../beam/runners/spark/SparkPipelineRunner.java | 20 ++ .../spark/translation/TransformTranslator.java | 15 +- .../sdk/runners/DirectPipelineRunner.java | 116 +++++++ .../inprocess/GroupByKeyEvaluatorFactory.java | 2 +- .../dataflow/sdk/transforms/GroupByKey.java | 310 +------------------ .../sdk/util/GroupByKeyViaGroupByKeyOnly.java | 244 +++++++++++++++ .../cloud/dataflow/sdk/util/ReduceFnRunner.java | 1 - .../GroupByKeyEvaluatorFactoryTest.java | 4 +- 9 files changed, 400 insertions(+), 338 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c34f3a3/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java ---------------------------------------------------------------------- diff --cc sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java index 8a30c33,417420a..35e392b --- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java +++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/DirectPipelineRunner.java @@@ -1,22 -1,22 +1,23 @@@ /* - * Copyright (C) 2015 Google Inc. + * 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 * - * Licensed 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 + * 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. + * 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 com.google.cloud.dataflow.sdk.runners; + import static com.google.cloud.dataflow.sdk.util.CoderUtils.encodeToByteArray; import static com.google.common.base.Preconditions.checkArgument; import static com.google.common.base.Preconditions.checkState; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c34f3a3/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactory.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c34f3a3/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java ---------------------------------------------------------------------- diff --cc sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java index ec6306d,490269b..320d16d --- a/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java +++ b/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/transforms/GroupByKey.java @@@ -1,32 -1,25 +1,26 @@@ /* - * Copyright (C) 2015 Google Inc. + * 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 * - * Licensed 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 + * 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. + * 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 com.google.cloud.dataflow.sdk.transforms; - import static com.google.cloud.dataflow.sdk.util.CoderUtils.encodeToByteArray; - import com.google.cloud.dataflow.sdk.coders.Coder; import com.google.cloud.dataflow.sdk.coders.Coder.NonDeterministicException; - import com.google.cloud.dataflow.sdk.coders.CoderException; import com.google.cloud.dataflow.sdk.coders.IterableCoder; import com.google.cloud.dataflow.sdk.coders.KvCoder; - import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner; - import com.google.cloud.dataflow.sdk.runners.DirectPipelineRunner.ValueWithMetadata; - import com.google.cloud.dataflow.sdk.transforms.windowing.BoundedWindow; import com.google.cloud.dataflow.sdk.transforms.windowing.DefaultTrigger; import com.google.cloud.dataflow.sdk.transforms.windowing.GlobalWindows; import com.google.cloud.dataflow.sdk.transforms.windowing.InvalidWindows; http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c34f3a3/sdks/java/core/src/main/java/com/google/cloud/dataflow/sdk/util/ReduceFnRunner.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/6c34f3a3/sdks/java/core/src/test/java/com/google/cloud/dataflow/sdk/runners/inprocess/GroupByKeyEvaluatorFactoryTest.java ----------------------------------------------------------------------
