fluo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ktur...@apache.org
Subject incubator-fluo-recipes git commit: Update for changes in apache/fluo#746
Date Fri, 05 Aug 2016 14:17:56 GMT
Repository: incubator-fluo-recipes
Updated Branches:
  refs/heads/master e86ab10da -> 5d6b35c62


Update for changes in apache/fluo#746


Project: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/commit/5d6b35c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/tree/5d6b35c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/diff/5d6b35c6

Branch: refs/heads/master
Commit: 5d6b35c627c87309430212a46ac62e9fc2be12d7
Parents: e86ab10
Author: Keith Turner <kturner@apache.org>
Authored: Fri Jul 29 17:55:02 2016 -0400
Committer: Keith Turner <keith@deenlo.com>
Committed: Thu Aug 4 11:03:20 2016 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/fluo/recipes/core/data/RowHasher.java  | 2 +-
 .../java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java | 2 +-
 .../fluo/recipes/core/transaction/RecordingTransactionTest.java | 5 +++--
 .../java/org/apache/fluo/recipes/spark/FluoSparkHelper.java     | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/5d6b35c6/modules/core/src/main/java/org/apache/fluo/recipes/core/data/RowHasher.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/data/RowHasher.java b/modules/core/src/main/java/org/apache/fluo/recipes/core/data/RowHasher.java
index 3be8b27..55f1c9a 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/core/data/RowHasher.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/data/RowHasher.java
@@ -23,7 +23,7 @@ import com.google.common.base.Preconditions;
 import com.google.common.base.Strings;
 import com.google.common.hash.Hashing;
 import org.apache.fluo.api.data.Bytes;
-import org.apache.fluo.api.data.BytesBuilder;
+import org.apache.fluo.api.data.Bytes.BytesBuilder;
 import org.apache.fluo.recipes.core.common.TableOptimizations;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/5d6b35c6/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java
b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java
index 4f57003..ee47b5c 100644
--- a/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java
+++ b/modules/core/src/main/java/org/apache/fluo/recipes/core/map/CollisionFreeMap.java
@@ -39,7 +39,7 @@ import org.apache.fluo.api.config.FluoConfiguration;
 import org.apache.fluo.api.config.ObserverConfiguration;
 import org.apache.fluo.api.config.SimpleConfiguration;
 import org.apache.fluo.api.data.Bytes;
-import org.apache.fluo.api.data.BytesBuilder;
+import org.apache.fluo.api.data.Bytes.BytesBuilder;
 import org.apache.fluo.api.data.Column;
 import org.apache.fluo.api.data.RowColumn;
 import org.apache.fluo.api.data.RowColumnValue;

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/5d6b35c6/modules/core/src/test/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionTest.java
----------------------------------------------------------------------
diff --git a/modules/core/src/test/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionTest.java
b/modules/core/src/test/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionTest.java
index 1e9b262..4fd8aa9 100644
--- a/modules/core/src/test/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionTest.java
+++ b/modules/core/src/test/java/org/apache/fluo/recipes/core/transaction/RecordingTransactionTest.java
@@ -18,6 +18,7 @@ package org.apache.fluo.recipes.core.transaction;
 import java.util.Collections;
 import java.util.Iterator;
 import java.util.List;
+import java.util.TreeMap;
 
 import com.google.common.collect.Iterators;
 import org.apache.fluo.api.client.Transaction;
@@ -73,8 +74,8 @@ public class RecordingTransactionTest {
     Assert.assertEquals("LogEntry{op=GET, row=r4, col=cf4  , value=v4}", entries.get(3).toString());
     Assert.assertEquals("{r4 cf4  =v4}", rtx.getTxLog().getOperationMap(LogEntry.Operation.GET)
         .toString());
-    Assert.assertEquals("{r2 cf2 cq2 =v2, r1 cf1  =v1}",
-        rtx.getTxLog().getOperationMap(LogEntry.Operation.SET).toString());
+    Assert.assertEquals("{r1 cf1  =v1, r2 cf2 cq2 =v2}", new TreeMap<>(rtx.getTxLog()
+        .getOperationMap(LogEntry.Operation.SET)).toString());
     Assert.assertEquals("{r3 cf3  =}", rtx.getTxLog().getOperationMap(LogEntry.Operation.DELETE)
         .toString());
   }

http://git-wip-us.apache.org/repos/asf/incubator-fluo-recipes/blob/5d6b35c6/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
----------------------------------------------------------------------
diff --git a/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
b/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
index ae57e91..dc467b3 100644
--- a/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
+++ b/modules/spark/src/main/java/org/apache/fluo/recipes/spark/FluoSparkHelper.java
@@ -89,7 +89,7 @@ public class FluoSparkHelper {
    * @return RowColumn/Bytes PairRDD
    */
   public static JavaPairRDD<RowColumn, Bytes> toPairRDD(JavaRDD<RowColumnValue>
rcvRDD) {
-    return rcvRDD.mapToPair(rcv -> new Tuple2<>((RowColumn) rcv, rcv.getValue()));
+    return rcvRDD.mapToPair(rcv -> new Tuple2<>(rcv.getRowColumn(), rcv.getValue()));
   }
 
   /**


Mime
View raw message