asterixdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pou...@apache.org
Subject incubator-asterixdb-hyracks git commit: NKC fix for int64
Date Tue, 28 Jul 2015 21:16:41 GMT
Repository: incubator-asterixdb-hyracks
Updated Branches:
  refs/heads/master da37cb245 -> d48d18fd2


NKC fix for int64

Change-Id: I60b3ec3f15921093b1fa11ac9fc157b7930f4e4d
Reviewed-on: https://asterix-gerrit.ics.uci.edu/329
Tested-by: Jenkins <jenkins@fulliautomatix.ics.uci.edu>
Reviewed-by: Ian Maxon <imaxon@apache.org>
Reviewed-by: Yingyi Bu <buyingyi@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/commit/d48d18fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/tree/d48d18fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/diff/d48d18fd

Branch: refs/heads/master
Commit: d48d18fd2cc3fe225e3fe4112580d2e1e3edbdcf
Parents: da37cb2
Author: pouria.pirzadeh@gmail.com <pouria.pirzadeh@gmail.com>
Authored: Tue Jul 28 11:51:42 2015 -0700
Committer: Pouria Pirzadeh <pouria.pirzadeh@gmail.com>
Committed: Tue Jul 28 14:05:34 2015 -0700

----------------------------------------------------------------------
 .../data/normalizers/Integer64NormalizedKeyComputerFactory.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-asterixdb-hyracks/blob/d48d18fd/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/data/normalizers/Integer64NormalizedKeyComputerFactory.java
----------------------------------------------------------------------
diff --git a/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/data/normalizers/Integer64NormalizedKeyComputerFactory.java
b/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/data/normalizers/Integer64NormalizedKeyComputerFactory.java
index bcff79f..1608327 100644
--- a/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/data/normalizers/Integer64NormalizedKeyComputerFactory.java
+++ b/hyracks/hyracks-dataflow-common/src/main/java/edu/uci/ics/hyracks/dataflow/common/data/normalizers/Integer64NormalizedKeyComputerFactory.java
@@ -34,7 +34,7 @@ public class Integer64NormalizedKeyComputerFactory implements INormalizedKeyComp
             public int normalize(byte[] bytes, int start, int length) {
                 long value = LongPointable.getLong(bytes, start);
                 int highValue = (int) (value >> 32);
-                if (highValue > 0) {
+                if (value > Integer.MAX_VALUE) {
                     /**
                      * larger than Integer.MAX
                      */
@@ -42,7 +42,7 @@ public class Integer64NormalizedKeyComputerFactory implements INormalizedKeyComp
                     highNmk >>= 2;
                     highNmk |= POSTIVE_LONG_MASK;
                     return highNmk;
-                } else if (highValue == 0) {
+                } else if (value >=0 && value <= Integer.MAX_VALUE) {
                     /**
                      * smaller than Integer.MAX but >=0
                      */


Mime
View raw message