You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by el...@apache.org on 2019/05/22 17:16:35 UTC

[phoenix] branch master updated (27a5368 -> c84beaf)

This is an automated email from the ASF dual-hosted git repository.

elserj pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git.


    from 27a5368  IndexRebuildTaskIT fails with HBase 1.5.x.
     new 4d1f4a2  Revert "IndexRebuildTaskIT fails with HBase 1.5.x."
     new c84beaf  PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:


[phoenix] 01/02: Revert "IndexRebuildTaskIT fails with HBase 1.5.x."

Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit 4d1f4a2b1d1f5cb2420c31853828136ba8a0014a
Author: Josh Elser <el...@apache.org>
AuthorDate: Wed May 22 13:12:53 2019 -0400

    Revert "IndexRebuildTaskIT fails with HBase 1.5.x."
    
    This reverts commit 27a53681cbab108e208bd5051200b69dd9d6398a.
    
    Reverting to reapply with correct commit msg.
---
 .../java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
index 2245f26..025dcc8 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
@@ -53,10 +53,7 @@ public class IndexedKeyValue extends KeyValue {
     public IndexedKeyValue() {}
 
     public IndexedKeyValue(byte[] bs, Mutation mutation) {
-        this.bytes = mutation.getRow();
-        this.offset = 0;
-        this.length = mutation.getRow().length;
-
+        super(mutation.getRow(), 0, mutation.getRow().length);
         this.indexTableName = new ImmutableBytesPtr(bs);
         this.mutation = mutation;
         this.hashCode = calcHashCode(indexTableName, mutation);


[phoenix] 02/02: PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.

Posted by el...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

elserj pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit c84beaf695dbbd53de57e52b84300d93767902f6
Author: Lars Hofhansl <la...@apache.org>
AuthorDate: Wed May 22 13:13:00 2019 -0400

    PHOENIX-5289 IndexRebuildTaskIT fails with HBase 1.5.x.
    
    Re-apply original commit with proper commit msg
---
 .../java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
index 025dcc8..2245f26 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/wal/IndexedKeyValue.java
@@ -53,7 +53,10 @@ public class IndexedKeyValue extends KeyValue {
     public IndexedKeyValue() {}
 
     public IndexedKeyValue(byte[] bs, Mutation mutation) {
-        super(mutation.getRow(), 0, mutation.getRow().length);
+        this.bytes = mutation.getRow();
+        this.offset = 0;
+        this.length = mutation.getRow().length;
+
         this.indexTableName = new ImmutableBytesPtr(bs);
         this.mutation = mutation;
         this.hashCode = calcHashCode(indexTableName, mutation);