phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From els...@apache.org
Subject [3/4] phoenix git commit: PHOENIX-3769 Use length from correct byte array in PhoenixIndexBuilder (Sneha Kanekar)
Date Mon, 07 Aug 2017 20:52:55 GMT
PHOENIX-3769 Use length from correct byte array in PhoenixIndexBuilder (Sneha Kanekar)

This was found via failing tests on ppc64.


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

Branch: refs/heads/4.x-HBase-1.1
Commit: c538918adf4700f95da515e1a18995480a4bccda
Parents: 1a820ee
Author: Josh Elser <elserj@apache.org>
Authored: Mon Aug 7 16:19:10 2017 -0400
Committer: Josh Elser <elserj@apache.org>
Committed: Mon Aug 7 16:35:07 2017 -0400

----------------------------------------------------------------------
 .../main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c538918a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java
b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java
index 5011245..acb139e 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexBuilder.java
@@ -354,7 +354,7 @@ public class PhoenixIndexBuilder extends NonTxIndexBuilder {
                 int repeating1 = oldInput.readShort();
                 if (Bytes.compareTo(
                     oldOnDupKeyBytes, ON_DUP_KEY_HEADER_BYTE_SIZE, oldOnDupKeyBytes.length
- ON_DUP_KEY_HEADER_BYTE_SIZE, 
-                    newOnDupKeyBytes, Bytes.SIZEOF_SHORT + Bytes.SIZEOF_BOOLEAN, oldOnDupKeyBytes.length
- ON_DUP_KEY_HEADER_BYTE_SIZE) == 0) {
+                    newOnDupKeyBytes, Bytes.SIZEOF_SHORT + Bytes.SIZEOF_BOOLEAN, newOnDupKeyBytes.length
- ON_DUP_KEY_HEADER_BYTE_SIZE) == 0) {
                 // If both old and new ON DUPLICATE KEY UPDATE clauses match,
                 // reduce the size of data we're sending over the wire.
                 // TODO: optimization size of RPC more.
@@ -381,4 +381,4 @@ public class PhoenixIndexBuilder extends NonTxIndexBuilder {
     public static boolean isDupKeyIgnore(byte[] onDupKeyBytes) {
         return onDupKeyBytes != null && Bytes.compareTo(ON_DUP_KEY_IGNORE_BYTES,
onDupKeyBytes) == 0;
     }
-}
\ No newline at end of file
+}


Mime
View raw message