You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@beam.apache.org by tg...@apache.org on 2017/04/11 18:35:17 UTC
[1/2] beam git commit: This closes #2492
Repository: beam
Updated Branches:
refs/heads/master 38cf23ebe -> 77712c936
This closes #2492
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/77712c93
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/77712c93
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/77712c93
Branch: refs/heads/master
Commit: 77712c9363937892208e791d6f6856639cbf0c67
Parents: 38cf23e 732610d
Author: Thomas Groh <tg...@google.com>
Authored: Tue Apr 11 11:12:13 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Tue Apr 11 11:12:13 2017 -0700
----------------------------------------------------------------------
.../io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/2] beam git commit: Fix build breaks caused by overlaps between
b615013 and c08b7b1
Posted by tg...@apache.org.
Fix build breaks caused by overlaps between b615013 and c08b7b1
Project: http://git-wip-us.apache.org/repos/asf/beam/repo
Commit: http://git-wip-us.apache.org/repos/asf/beam/commit/732610d8
Tree: http://git-wip-us.apache.org/repos/asf/beam/tree/732610d8
Diff: http://git-wip-us.apache.org/repos/asf/beam/diff/732610d8
Branch: refs/heads/master
Commit: 732610d8eb5c682934d6a1bec0c5c8d8f25c635d
Parents: 38cf23e
Author: Stephen Sisk <si...@google.com>
Authored: Tue Apr 11 11:07:48 2017 -0700
Committer: Thomas Groh <tg...@google.com>
Committed: Tue Apr 11 11:12:13 2017 -0700
----------------------------------------------------------------------
.../io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/beam/blob/732610d8/sdks/java/io/hadoop/jdk1.8-tests/src/test/java/org/apache/beam/sdk/io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java
----------------------------------------------------------------------
diff --git a/sdks/java/io/hadoop/jdk1.8-tests/src/test/java/org/apache/beam/sdk/io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java b/sdks/java/io/hadoop/jdk1.8-tests/src/test/java/org/apache/beam/sdk/io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java
index 97addcf..402c19c 100644
--- a/sdks/java/io/hadoop/jdk1.8-tests/src/test/java/org/apache/beam/sdk/io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java
+++ b/sdks/java/io/hadoop/jdk1.8-tests/src/test/java/org/apache/beam/sdk/io/hadoop/inputformat/HIFIOWithEmbeddedCassandraTest.java
@@ -26,7 +26,7 @@ import com.datastax.driver.mapping.annotations.Table;
import java.io.Serializable;
-import org.apache.beam.sdk.io.hadoop.inputformat.hashing.HashingFn;
+import org.apache.beam.sdk.io.common.HashingFn;
import org.apache.beam.sdk.testing.PAssert;
import org.apache.beam.sdk.testing.TestPipeline;
import org.apache.beam.sdk.transforms.Combine;
@@ -78,7 +78,7 @@ public class HIFIOWithEmbeddedCassandraTest implements Serializable {
@Test
public void testHIFReadForCassandra() throws Exception {
// Expected hashcode is evaluated during insertion time one time and hardcoded here.
- String expectedHashCode = "4651110ba1ef2cd3a7315091ca27877b18fceb0e";
+ String expectedHashCode = "1b9780833cce000138b9afa25ba63486";
Configuration conf = getConfiguration();
PCollection<KV<Long, String>> cassandraData =
p.apply(HadoopInputFormatIO.<Long, String>read().withConfiguration(conf)
@@ -109,7 +109,7 @@ public class HIFIOWithEmbeddedCassandraTest implements Serializable {
@Test
public void testHIFReadForCassandraQuery() throws Exception {
Long expectedCount = 1L;
- String expectedChecksum = "6a62f24ccce0713004889aec1cf226949482d188";
+ String expectedChecksum = "f11caabc7a9fc170e22b41218749166c";
Configuration conf = getConfiguration();
conf.set("cassandra.input.cql", "select * from " + CASSANDRA_KEYSPACE + "." + CASSANDRA_TABLE
+ " where token(id) > ? and token(id) <= ? and scientist='Faraday1' allow filtering");