You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by dh...@apache.org on 2017/01/19 23:40:48 UTC

[1/2] beam git commit: KvSwapTest: enhance validation

Repository: beam
Updated Branches:
  refs/heads/master 2f580caff -> 98d0efdc3


KvSwapTest: enhance validation

This test ensures that coders are propagated from input to output rather than
re-inferred.


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/43b7b0cd
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/43b7b0cd
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/43b7b0cd

Branch: refs/heads/master
Commit: 43b7b0cd3f355cdb026979f81481436191db8ba9
Parents: 2f580ca
Author: Dan Halperin <dh...@google.com>
Authored: Wed Jan 18 16:00:31 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jan 19 15:39:37 2017 -0800

----------------------------------------------------------------------
 .../org/apache/beam/sdk/transforms/KvSwapTest.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/beam/blob/43b7b0cd/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
index 24186ed..859312f 100644
--- a/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
+++ b/sdks/java/core/src/test/java/org/apache/beam/sdk/transforms/KvSwapTest.java
@@ -20,6 +20,7 @@ package org.apache.beam.sdk.transforms;
 import java.util.Arrays;
 import org.apache.beam.sdk.coders.BigEndianIntegerCoder;
 import org.apache.beam.sdk.coders.KvCoder;
+import org.apache.beam.sdk.coders.NullableCoder;
 import org.apache.beam.sdk.coders.StringUtf8Coder;
 import org.apache.beam.sdk.testing.PAssert;
 import org.apache.beam.sdk.testing.RunnableOnService;
@@ -38,16 +39,17 @@ import org.junit.runners.JUnit4;
 @RunWith(JUnit4.class)
 @SuppressWarnings({"rawtypes", "unchecked"})
 public class KvSwapTest {
-  static final KV<String, Integer>[] TABLE = new KV[] {
+  private static final KV<String, Integer>[] TABLE = new KV[] {
     KV.of("one", 1),
     KV.of("two", 2),
     KV.of("three", 3),
     KV.of("four", 4),
     KV.of("dup", 4),
-    KV.of("dup", 5)
+    KV.of("dup", 5),
+    KV.of("null", null),
   };
 
-  static final KV<String, Integer>[] EMPTY_TABLE = new KV[] {
+  private static final KV<String, Integer>[] EMPTY_TABLE = new KV[] {
   };
 
   @Rule
@@ -58,7 +60,7 @@ public class KvSwapTest {
   public void testKvSwap() {
     PCollection<KV<String, Integer>> input =
         p.apply(Create.of(Arrays.asList(TABLE)).withCoder(
-            KvCoder.of(StringUtf8Coder.of(), BigEndianIntegerCoder.of())));
+            KvCoder.of(StringUtf8Coder.of(), NullableCoder.of(BigEndianIntegerCoder.of()))));
 
     PCollection<KV<Integer, String>> output = input.apply(
         KvSwap.<String, Integer>create());
@@ -69,7 +71,8 @@ public class KvSwapTest {
         KV.of(3, "three"),
         KV.of(4, "four"),
         KV.of(4, "dup"),
-        KV.of(5, "dup"));
+        KV.of(5, "dup"),
+        KV.of((Integer) null, "null"));
     p.run();
   }
 


[2/2] beam git commit: This closes #1790

Posted by dh...@apache.org.
This closes #1790


Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/98d0efdc
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/98d0efdc
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/98d0efdc

Branch: refs/heads/master
Commit: 98d0efdc3497443ad6d2c562d2a74ebae4068707
Parents: 2f580ca 43b7b0c
Author: Dan Halperin <dh...@google.com>
Authored: Thu Jan 19 15:40:32 2017 -0800
Committer: Dan Halperin <dh...@google.com>
Committed: Thu Jan 19 15:40:32 2017 -0800

----------------------------------------------------------------------
 .../org/apache/beam/sdk/transforms/KvSwapTest.java     | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)
----------------------------------------------------------------------