forked from apache/beam
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #1 from mareksimunek/vasek/package-change-rebase
[BEAM-4294] [BEAM-4360] Join translation and ReduceByKey test suite where moved to org.apache.beam.* package.
- Loading branch information
Showing
25 changed files
with
1,351 additions
and
168 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
125 changes: 125 additions & 0 deletions
125
...horia-beam/src/main/java/org/apache/beam/sdk/extensions/euphoria/beam/JoinTranslator.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,125 @@ | ||
| package org.apache.beam.sdk.extensions.euphoria.beam; | ||
|
|
||
| import java.util.List; | ||
| import org.apache.beam.sdk.coders.Coder; | ||
| import org.apache.beam.sdk.coders.KvCoder; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.common.InputToKvDoFn; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.io.KryoCoder; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.join.FullJoinFn; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.join.InnerJoinFn; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.join.JoinFn; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.join.LeftOuterJoinFn; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.join.RightOuterJoinFn; | ||
| import org.apache.beam.sdk.extensions.euphoria.beam.window.WindowingUtils; | ||
| import org.apache.beam.sdk.extensions.euphoria.core.client.dataset.windowing.Window; | ||
| import org.apache.beam.sdk.extensions.euphoria.core.client.functional.BinaryFunctor; | ||
| import org.apache.beam.sdk.extensions.euphoria.core.client.functional.UnaryFunction; | ||
| import org.apache.beam.sdk.extensions.euphoria.core.client.operator.Join; | ||
| import org.apache.beam.sdk.extensions.euphoria.core.client.util.Pair; | ||
| import org.apache.beam.sdk.transforms.ParDo; | ||
| import org.apache.beam.sdk.transforms.join.CoGbkResult; | ||
| import org.apache.beam.sdk.transforms.join.CoGroupByKey; | ||
| import org.apache.beam.sdk.transforms.join.KeyedPCollectionTuple; | ||
| import org.apache.beam.sdk.values.KV; | ||
| import org.apache.beam.sdk.values.PCollection; | ||
| import org.apache.beam.sdk.values.TupleTag; | ||
|
|
||
|
|
||
| /** | ||
| * {@link OperatorTranslator Translator } for Euphoria {@link Join} operator. | ||
| */ | ||
| public class JoinTranslator implements OperatorTranslator<Join> { | ||
|
|
||
| @Override | ||
| @SuppressWarnings("unchecked") | ||
| public PCollection<?> translate(Join operator, BeamExecutorContext context) { | ||
| return doTranslate(operator, context); | ||
| } | ||
|
|
||
|
|
||
| public <K, LeftT, RightT, OutputT, W extends Window<W>> PCollection<Pair<K, OutputT>> | ||
| doTranslate(Join<LeftT, RightT, K, OutputT, W> operator, BeamExecutorContext context) { | ||
|
|
||
| Coder<K> keyCoder = context.getCoder(operator.getLeftKeyExtractor()); | ||
|
|
||
| // get input data-sets transformed to Pcollections<KV<K,LeftT/RightT>> | ||
| List<PCollection<Object>> inputs = context.getInputs(operator); | ||
|
|
||
| PCollection<KV<K, LeftT>> leftKvInput = getKVInputCollection(inputs.get(0), | ||
| operator.getLeftKeyExtractor(), | ||
| keyCoder, new KryoCoder<>(), "::extract-keys-left"); | ||
|
|
||
| PCollection<KV<K, RightT>> rightKvInput = getKVInputCollection(inputs.get(1), | ||
| operator.getRightKeyExtractor(), | ||
| keyCoder, new KryoCoder<>(), "::extract-keys-right"); | ||
|
|
||
| // and apply the same widowing on input Pcolections since the documentation states: | ||
| //'all of the PCollections you want to group must use the same | ||
| // windowing strategy and window sizing' | ||
| leftKvInput = WindowingUtils.applyWindowingIfSpecified( | ||
| operator, leftKvInput, context.getAllowedLateness(operator)); | ||
| rightKvInput = WindowingUtils.applyWindowingIfSpecified( | ||
| operator, rightKvInput, context.getAllowedLateness(operator)); | ||
|
|
||
| // GoGroupByKey collections | ||
| TupleTag<LeftT> leftTag = new TupleTag<>(); | ||
| TupleTag<RightT> rightTag = new TupleTag<>(); | ||
|
|
||
| PCollection<KV<K, CoGbkResult>> coGrouped = KeyedPCollectionTuple | ||
| .of(leftTag, leftKvInput) | ||
| .and(rightTag, rightKvInput) | ||
| .apply("::co-group-by-key", CoGroupByKey.create()); | ||
|
|
||
| // Join | ||
| JoinFn<LeftT, RightT, K, OutputT> joinFn = chooseJoinFn(operator, leftTag, rightTag); | ||
|
|
||
| return coGrouped.apply(joinFn.getFnName(), ParDo.of(joinFn)); | ||
| } | ||
|
|
||
| private <K, ValueT> PCollection<KV<K, ValueT>> getKVInputCollection( | ||
| PCollection<Object> inputPCollection, | ||
| UnaryFunction<ValueT, K> keyExtractor, | ||
| Coder<K> keyCoder, Coder<ValueT> valueCoder, String transformName) { | ||
|
|
||
| @SuppressWarnings("unchecked") | ||
| PCollection<ValueT> typedInput = (PCollection<ValueT>) inputPCollection; | ||
| typedInput.setCoder(valueCoder); | ||
|
|
||
| PCollection<KV<K, ValueT>> kvInput = | ||
| typedInput.apply(transformName, ParDo.of(new InputToKvDoFn<>(keyExtractor))); | ||
| kvInput.setCoder(KvCoder.of(keyCoder, valueCoder)); | ||
|
|
||
| return kvInput; | ||
| } | ||
|
|
||
| private <K, LeftT, RightT, OutputT, W extends Window<W>> JoinFn<LeftT, RightT, K, OutputT> | ||
| chooseJoinFn( | ||
| Join<LeftT, RightT, K, OutputT, W> operator, TupleTag<LeftT> leftTag, | ||
| TupleTag<RightT> rightTag) { | ||
|
|
||
| JoinFn<LeftT, RightT, K, OutputT> joinFn; | ||
| BinaryFunctor<LeftT, RightT, OutputT> joiner = operator.getJoiner(); | ||
|
|
||
| switch (operator.getType()) { | ||
| case INNER: | ||
| joinFn = new InnerJoinFn<>(joiner, leftTag, rightTag); | ||
| break; | ||
| case LEFT: | ||
| joinFn = new LeftOuterJoinFn<>(joiner, leftTag, rightTag); | ||
| break; | ||
| case RIGHT: | ||
| joinFn = new RightOuterJoinFn<>(joiner, leftTag, rightTag); | ||
| break; | ||
| case FULL: | ||
| joinFn = new FullJoinFn<>(joiner, leftTag, rightTag); | ||
| break; | ||
|
|
||
| default: | ||
| throw new UnsupportedOperationException(String.format( | ||
| "Cannot translate Euphoria '%s' operator to Beam transformations." | ||
| + " Given join type '%s' is not supported.", | ||
| Join.class.getSimpleName(), operator.getType())); | ||
| } | ||
| return joinFn; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
26 changes: 26 additions & 0 deletions
26
...beam/src/main/java/org/apache/beam/sdk/extensions/euphoria/beam/common/InputToKvDoFn.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| package org.apache.beam.sdk.extensions.euphoria.beam.common; | ||
|
|
||
| import org.apache.beam.sdk.extensions.euphoria.core.client.functional.UnaryFunction; | ||
| import org.apache.beam.sdk.transforms.DoFn; | ||
| import org.apache.beam.sdk.values.KV; | ||
|
|
||
| /** | ||
| * {@link DoFn} which takes input elements and transforms them to {@link KV} using given key | ||
| * extractor. | ||
| */ | ||
| public class InputToKvDoFn<InputT, K> extends DoFn<InputT, KV<K, InputT>> { | ||
|
|
||
| private final UnaryFunction<InputT, K> keyExtractor; | ||
|
|
||
| public InputToKvDoFn(UnaryFunction<InputT, K> keyExtractor) { | ||
| this.keyExtractor = keyExtractor; | ||
| } | ||
|
|
||
| @ProcessElement | ||
| public void processElement(ProcessContext c) { | ||
| InputT element = c.element(); | ||
| K key = keyExtractor.apply(element); | ||
| c.output(KV.of(key, element)); | ||
| } | ||
|
|
||
| } |
22 changes: 22 additions & 0 deletions
22
...-beam/src/main/java/org/apache/beam/sdk/extensions/euphoria/beam/common/package-info.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| /* | ||
| * 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. | ||
| */ | ||
|
|
||
| /** | ||
| * A set of commonly used classes enabling some code reuse. | ||
| */ | ||
| package org.apache.beam.sdk.extensions.euphoria.beam.common; |
Oops, something went wrong.