[01/12] phoenix git commit: PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC
Repository: phoenix
Updated Branches:
refs/heads/4.5-HBase-1.1 93bd2c33c - 6c8d08e9e
PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6c8d08e9
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6c8d08e9
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6c8d08e9
Branch: refs/heads/4.5-HBase-1.1
Commit: 6c8d08e9e4e12d1f4231c67f1c09eda9f0d0a504
Parents: 149cd24
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 01:59:23 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:44:51 2015 -0700
--
.../org/apache/phoenix/end2end/SortOrderIT.java | 6 ++--
.../UngroupedAggregateRegionObserver.java | 6
.../org/apache/phoenix/schema/PTableImpl.java | 10 +-
.../apache/phoenix/schema/types/PDataType.java | 4 +--
.../apache/phoenix/schema/types/PDouble.java| 18 +++
.../org/apache/phoenix/schema/types/PFloat.java | 18 ++-
.../org/apache/phoenix/util/UpgradeUtil.java| 5 +++
.../phoenix/schema/types/PDataTypeTest.java | 33
8 files changed, 82 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6c8d08e9/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 9228ab5..fdbd26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -41,6 +41,8 @@ import org.apache.commons.lang.ArrayUtils;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.types.PDataType;
import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -404,7 +406,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
public void testNonPKCompare() throws Exception {
ListInteger expectedResults = Lists.newArrayList(2,3,4);
Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE,
PDouble.INSTANCE, PFloat.INSTANCE};
for (Integer saltBucket : saltBuckets) {
for (PDataType dataType : dataTypes) {
for (SortOrder sortOrder : SortOrder.values()) {
@@ -420,7 +422,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
ListInteger rExpectedResults = new ArrayList(expectedResults);
Collections.reverse(rExpectedResults);
Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE,
PDouble.INSTANCE, PFloat.INSTANCE};
for (Integer saltBucket : saltBuckets) {
for (PDataType dataType : dataTypes) {
for (SortOrder sortOrder : SortOrder.values()) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/6c8d08e9/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index a7e3e44..6b51138 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -88,6 +88,8 @@ import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
import org.apache.phoenix.schema.types.PBinary;
import org.apache.phoenix.schema.types.PChar;
import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.KeyValueUtil;
@@ -312,6 +314,10 @@ public class UngroupedAggregateRegionObserver extends
BaseScannerRegionObserver{
len--;
}
ptr.set(ptr.get(),
ptr.getOffset(), len);
+// Special case
[01/12] phoenix git commit: PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC
Repository: phoenix
Updated Branches:
refs/heads/4.5-HBase-1.0 d21ee23ed - 381e448d5
PHOENIX-2171 DOUBLE and FLOAT DESC are stored as ASC
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/381e448d
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/381e448d
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/381e448d
Branch: refs/heads/4.5-HBase-1.0
Commit: 381e448d5a82eff7b4ab1ceb9a8c5ff6c5313354
Parents: 5421ba0
Author: James Taylor jtay...@salesforce.com
Authored: Tue Aug 11 01:59:23 2015 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Aug 11 18:42:11 2015 -0700
--
.../org/apache/phoenix/end2end/SortOrderIT.java | 6 ++--
.../UngroupedAggregateRegionObserver.java | 6
.../org/apache/phoenix/schema/PTableImpl.java | 10 +-
.../apache/phoenix/schema/types/PDataType.java | 4 +--
.../apache/phoenix/schema/types/PDouble.java| 18 +++
.../org/apache/phoenix/schema/types/PFloat.java | 18 ++-
.../org/apache/phoenix/util/UpgradeUtil.java| 5 +++
.../phoenix/schema/types/PDataTypeTest.java | 33
8 files changed, 82 insertions(+), 18 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/phoenix/blob/381e448d/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
--
diff --git
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
index 9228ab5..fdbd26d 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortOrderIT.java
@@ -41,6 +41,8 @@ import org.apache.commons.lang.ArrayUtils;
import org.apache.phoenix.schema.SortOrder;
import org.apache.phoenix.schema.types.PDataType;
import org.apache.phoenix.schema.types.PDecimal;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Assert;
import org.junit.Test;
@@ -404,7 +406,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
public void testNonPKCompare() throws Exception {
ListInteger expectedResults = Lists.newArrayList(2,3,4);
Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE,
PDouble.INSTANCE, PFloat.INSTANCE};
for (Integer saltBucket : saltBuckets) {
for (PDataType dataType : dataTypes) {
for (SortOrder sortOrder : SortOrder.values()) {
@@ -420,7 +422,7 @@ public class SortOrderIT extends BaseHBaseManagedTimeIT {
ListInteger rExpectedResults = new ArrayList(expectedResults);
Collections.reverse(rExpectedResults);
Integer[] saltBuckets = new Integer[] {null,3};
-PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE};
+PDataType[] dataTypes = new PDataType[] {PDecimal.INSTANCE,
PDouble.INSTANCE, PFloat.INSTANCE};
for (Integer saltBucket : saltBuckets) {
for (PDataType dataType : dataTypes) {
for (SortOrder sortOrder : SortOrder.values()) {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/381e448d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
--
diff --git
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index 571d0d1..7316bb1 100644
---
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -88,6 +88,8 @@ import org.apache.phoenix.schema.tuple.MultiKeyValueTuple;
import org.apache.phoenix.schema.types.PBinary;
import org.apache.phoenix.schema.types.PChar;
import org.apache.phoenix.schema.types.PDataType;
+import org.apache.phoenix.schema.types.PDouble;
+import org.apache.phoenix.schema.types.PFloat;
import org.apache.phoenix.util.ByteUtil;
import org.apache.phoenix.util.IndexUtil;
import org.apache.phoenix.util.KeyValueUtil;
@@ -312,6 +314,10 @@ public class UngroupedAggregateRegionObserver extends
BaseScannerRegionObserver{
len--;
}
ptr.set(ptr.get(),
ptr.getOffset(), len);
+// Special case
