You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by ke...@apache.org on 2016/10/12 18:28:13 UTC
[1/3] incubator-beam git commit: Remove the deprecated
PCollectionView.fromIterableInternal
Repository: incubator-beam
Updated Branches:
refs/heads/master 7675035be -> 4d10f86cf
Remove the deprecated PCollectionView.fromIterableInternal
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/02cfaf0c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/02cfaf0c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/02cfaf0c
Branch: refs/heads/master
Commit: 02cfaf0cc2338616da35de8403365c7d76c266d4
Parents: 1ab5d00
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 10 13:45:58 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Oct 11 20:42:36 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/sdk/util/PCollectionViews.java | 6 ------
.../main/java/org/apache/beam/sdk/values/PCollectionView.java | 7 -------
.../org/apache/beam/sdk/testing/PCollectionViewTesting.java | 7 -------
3 files changed, 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/02cfaf0c/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
index 3b1fde9..83ccae8 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/util/PCollectionViews.java
@@ -458,12 +458,6 @@ public class PCollectionViews {
return untypedViewFn;
}
- @Override
- @Deprecated
- public ViewT fromIterableInternal(Iterable<WindowedValue<?>> elements) {
- return getViewFn().apply(elements);
- }
-
/**
* Returns a unique {@link TupleTag} identifying this {@link PCollectionView}.
*
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/02cfaf0c/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java
index 0e5f594..457e78a 100644
--- a/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java
+++ b/sdks/java/core/src/main/java/org/apache/beam/sdk/values/PCollectionView.java
@@ -52,13 +52,6 @@ public interface PCollectionView<T> extends PValue, Serializable {
public TupleTag<Iterable<WindowedValue<?>>> getTagInternal();
/**
- * @deprecated use {@link #getViewFn()} for now, but eventually get the needed information via the
- * side input specification on the {@link ParDo} transform.
- */
- @Deprecated
- public T fromIterableInternal(Iterable<WindowedValue<?>> contents);
-
- /**
* @deprecated this method will be removed entirely. The {@link ViewFn} for a side input is an
* attribute of the side input's specification with a {@link ParDo} transform, which will
* obtain this specification via a package-private channel.
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/02cfaf0c/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PCollectionViewTesting.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PCollectionViewTesting.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PCollectionViewTesting.java
index ea8e0af..99fb1fb 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PCollectionViewTesting.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/testing/PCollectionViewTesting.java
@@ -245,13 +245,6 @@ public final class PCollectionViewTesting {
return (TupleTag) tag;
}
- @SuppressWarnings({"unchecked", "rawtypes"})
- @Override
- @Deprecated
- public ViewT fromIterableInternal(Iterable<WindowedValue<?>> contents) {
- return getViewFn().apply(contents);
- }
-
@Override
public ViewFn<Iterable<WindowedValue<?>>, ViewT> getViewFn() {
// Safe cast; runners must maintain type safety
[3/3] incubator-beam git commit: This closes #1076
Posted by ke...@apache.org.
This closes #1076
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/4d10f86c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/4d10f86c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/4d10f86c
Branch: refs/heads/master
Commit: 4d10f86cfb26ba7c765e8130ea561c78ebabe52d
Parents: 7675035 02cfaf0
Author: Kenneth Knowles <kl...@google.com>
Authored: Wed Oct 12 11:27:24 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Wed Oct 12 11:27:24 2016 -0700
----------------------------------------------------------------------
.../java/org/apache/beam/runners/core/SideInputHandler.java | 2 +-
.../main/java/org/apache/beam/sdk/util/PCollectionViews.java | 6 ------
.../main/java/org/apache/beam/sdk/values/PCollectionView.java | 7 -------
.../org/apache/beam/sdk/testing/PCollectionViewTesting.java | 7 -------
4 files changed, 1 insertion(+), 21 deletions(-)
----------------------------------------------------------------------
[2/3] incubator-beam git commit: Remove last use of
PCollectionView.fromIterableInternal
Posted by ke...@apache.org.
Remove last use of PCollectionView.fromIterableInternal
Project: http://git-wip-us.apache.org/repos/asf/incubator-beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-beam/commit/1ab5d00e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-beam/tree/1ab5d00e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-beam/diff/1ab5d00e
Branch: refs/heads/master
Commit: 1ab5d00e78a124d297c45edc8c6b55d7c2683543
Parents: 135790b
Author: Kenneth Knowles <kl...@google.com>
Authored: Mon Oct 10 13:22:02 2016 -0700
Committer: Kenneth Knowles <kl...@google.com>
Committed: Tue Oct 11 20:42:36 2016 -0700
----------------------------------------------------------------------
.../main/java/org/apache/beam/runners/core/SideInputHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-beam/blob/1ab5d00e/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
----------------------------------------------------------------------
diff --git a/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java b/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
index 851ed37..ae7f759 100644
--- a/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
+++ b/runners/core-java/src/main/java/org/apache/beam/runners/core/SideInputHandler.java
@@ -187,7 +187,7 @@ public class SideInputHandler implements ReadyCheckingSideInputReader {
Iterable<WindowedValue<?>> elements = state.read();
- return sideInput.fromIterableInternal(elements);
+ return sideInput.getViewFn().apply(elements);
}
@Override