Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 491486954 -> 04b27d542


PHOENIX-4441 Reflect changes that were made recently in HBase branch-2 Changes 
required after : HBASE-19417. Changed method signature in RegionObserver 
HBASE-19430. Removed setTimestamp(byte[], int) method from ExtendedCell.


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/04b27d54
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/04b27d54
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/04b27d54

Branch: refs/heads/5.x-HBase-2.0
Commit: 04b27d542120707446a70575d02cbd31b63ea050
Parents: 4914869
Author: Sergey Soldatov <s...@apache.org>
Authored: Wed Dec 6 23:27:37 2017 -0800
Committer: Sergey Soldatov <s...@apache.org>
Committed: Thu Dec 7 14:09:23 2017 -0800

----------------------------------------------------------------------
 .../org/apache/phoenix/coprocessor/DelegateRegionObserver.java | 6 +++---
 .../org/apache/phoenix/coprocessor/SequenceRegionObserver.java | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/04b27d54/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
index a65f78f..94cdb1e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/DelegateRegionObserver.java
@@ -320,10 +320,10 @@ public class DelegateRegionObserver implements 
RegionObserver {
     }
 
     @Override
-    public boolean 
postBulkLoadHFile(ObserverContext<RegionCoprocessorEnvironment> ctx,
-            List<Pair<byte[], String>> stagingFamilyPaths, Map<byte[], 
List<Path>> finalPaths, boolean hasLoaded)
+    public void 
postBulkLoadHFile(ObserverContext<RegionCoprocessorEnvironment> ctx,
+            List<Pair<byte[], String>> stagingFamilyPaths, Map<byte[], 
List<Path>> finalPaths)
             throws IOException {
-        return delegate.postBulkLoadHFile(ctx, stagingFamilyPaths, finalPaths, 
hasLoaded);
+        delegate.postBulkLoadHFile(ctx, stagingFamilyPaths, finalPaths);
     }
     
    

http://git-wip-us.apache.org/repos/asf/phoenix/blob/04b27d54/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
index 75ab61b..4c2ec1a 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/SequenceRegionObserver.java
@@ -422,7 +422,7 @@ public class SequenceRegionObserver implements 
RegionObserver, RegionCoprocessor
                 if (!hadClientTimestamp) {
                     for (List<Cell> kvs : m.getFamilyCellMap().values()) {
                         for (Cell kv : kvs) {
-                            
((ExtendedCell)kv).setTimestamp(clientTimestampBuf, 0);
+                            
((ExtendedCell)kv).setTimestamp(clientTimestampBuf);
                         }
                     }
                 }

Reply via email to