You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@omid.apache.org by ja...@apache.org on 2018/09/28 15:38:30 UTC

incubator-omid git commit: OMID-112 Make batch method signature compatible with Table.batch signature

Repository: incubator-omid
Updated Branches:
  refs/heads/phoenix-integration d8f8f9a93 -> 49181e876


OMID-112 Make batch method signature compatible with Table.batch signature


Project: http://git-wip-us.apache.org/repos/asf/incubator-omid/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-omid/commit/49181e87
Tree: http://git-wip-us.apache.org/repos/asf/incubator-omid/tree/49181e87
Diff: http://git-wip-us.apache.org/repos/asf/incubator-omid/diff/49181e87

Branch: refs/heads/phoenix-integration
Commit: 49181e87653351325f734f1014419a71e7de1366
Parents: d8f8f9a
Author: James Taylor <ja...@apache.org>
Authored: Thu Sep 27 10:12:42 2018 -0700
Committer: James Taylor <ja...@apache.org>
Committed: Fri Sep 28 08:37:58 2018 -0700

----------------------------------------------------------------------
 .../src/main/java/org/apache/omid/transaction/TTable.java   | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-omid/blob/49181e87/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
----------------------------------------------------------------------
diff --git a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
index 16400b8..e2e0535 100644
--- a/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
+++ b/hbase-client/src/main/java/org/apache/omid/transaction/TTable.java
@@ -43,6 +43,7 @@ import org.apache.hadoop.hbase.client.OperationWithAttributes;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
 import org.apache.hadoop.hbase.client.ResultScanner;
+import org.apache.hadoop.hbase.client.Row;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.client.Table;
 import org.apache.hadoop.hbase.io.TimeRange;
@@ -553,14 +554,14 @@ public class TTable implements Closeable {
     }
 
     /**
-     * Transactional version of {@link Table#put(List puts)}
+     * Transactional version of {@link Table#batch(List<? extends Row> mutations)}
      *
      * @param transaction an instance of transaction to be used
-     * @param puts        List of puts
+     * @param mutations        List of rows that must be instances of Put or Delete
      * @throws IOException if a remote or network exception occurs
      */
-    public void batch(Transaction transaction, List<Mutation> mutations) throws IOException {
-        for (Mutation mutation : mutations) {
+    public void batch(Transaction transaction, List<? extends Row> mutations) throws IOException {
+        for (Row mutation : mutations) {
             if (mutation instanceof Put) {
                 put(transaction, (Put)mutation);
             } else if (mutation instanceof Delete) {