sanha closed pull request #105: [NEMO-184] Upgrade to Beam 2.6.0
URL: https://github.com/apache/incubator-nemo/pull/105
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/compiler/frontend/beam/src/main/java/edu/snu/nemo/compiler/frontend/beam/transform/DoTransform.java
b/compiler/frontend/beam/src/main/java/edu/snu/nemo/compiler/frontend/beam/transform/DoTransform.java
index f0233804c..8b1ff0f18 100644
---
a/compiler/frontend/beam/src/main/java/edu/snu/nemo/compiler/frontend/beam/transform/DoTransform.java
+++
b/compiler/frontend/beam/src/main/java/edu/snu/nemo/compiler/frontend/beam/transform/DoTransform.java
@@ -31,6 +31,7 @@
import org.apache.beam.sdk.transforms.windowing.GlobalWindow;
import org.apache.beam.sdk.transforms.windowing.PaneInfo;
import org.apache.beam.sdk.values.PCollectionView;
+import org.apache.beam.sdk.values.Row;
import org.apache.beam.sdk.values.TupleTag;
import org.joda.time.Instant;
@@ -240,6 +241,11 @@ public I element() {
return this.input;
}
+ @Override
+ public Row asRow(final String id) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public <T> T sideInput(final PCollectionView<T> view) {
return (T) sideInputs.get(view);
@@ -354,6 +360,11 @@ public TimeDomain timeDomain(final DoFn<I, O> doFn) {
return new OutputReceiver<>((OutputCollectorImpl) outputCollector);
}
+ @Override
+ public DoFn.OutputReceiver<Row> outputRowReceiver(final DoFn<I, O> doFn) {
+ throw new UnsupportedOperationException();
+ }
+
@Override
public DoFn.MultiOutputReceiver taggedOutputReceiver(final DoFn<I, O>
doFn) {
return new MultiOutputReceiver((OutputCollectorImpl) outputCollector,
additionalOutputs);
@@ -432,5 +443,10 @@ public void outputWithTimestamp(final O output, final
Instant timestamp) {
public <T> DoFn.OutputReceiver<T> get(final TupleTag<T> tag) {
return new OutputReceiver<>(this.outputCollector, tag, tagToVertex);
}
+
+ @Override
+ public <T> OutputReceiver<Row> getRowReceiver(final TupleTag<T> tag) {
+ throw new UnsupportedOperationException();
+ }
}
}
diff --git a/pom.xml b/pom.xml
index dc750ceb3..eff288914 100644
--- a/pom.xml
+++ b/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <beam.version>2.5.0</beam.version>
+ <beam.version>2.6.0</beam.version>
<spark.version>2.2.0</spark.version>
<scala.version>2.11.8</scala.version>
<kryo.version>4.0.1</kryo.version>
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
