Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 a73fb08ca -> 31dad52c0


PHOENIX-4650 Upgrade i18n-util dependency to version 1.0.4 (Shehzaad Nakhoda)


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

Branch: refs/heads/4.x-HBase-1.3
Commit: 31dad52c0df8ed2b6db47ea7ba8cf1c1303085bf
Parents: a73fb08
Author: James Taylor <jtay...@salesforce.com>
Authored: Tue Mar 13 10:10:55 2018 -0700
Committer: James Taylor <jtay...@salesforce.com>
Committed: Tue Mar 13 10:12:35 2018 -0700

----------------------------------------------------------------------
 .../org/apache/phoenix/end2end/CollationKeyFunctionIT.java    | 6 +++---
 .../phoenix/expression/function/CollationKeyFunctionTest.java | 7 ++++---
 pom.xml                                                       | 2 +-
 3 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/31dad52c/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java
index 9f9e4d1..e954874 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/CollationKeyFunctionIT.java
@@ -72,12 +72,12 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
        @Test
        public void testZhSort() throws Exception {
-               queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+               queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 4, 3, 1, 5, 2, 0, 6 });
        }
 
        @Test
        public void testZhTwSort() throws Exception {
-               queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+               queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 4, 3, 1, 5, 2, 0, 6 });
        }
 
        @Test
@@ -87,7 +87,7 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
        @Test
        public void testZhStrokeSort() throws Exception {
-               queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+               queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
        }
 
        @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/31dad52c/phoenix-core/src/test/java/org/apache/phoenix/expression/function/CollationKeyFunctionTest.java
----------------------------------------------------------------------
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/expression/function/CollationKeyFunctionTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/expression/function/CollationKeyFunctionTest.java
index 950875b..93154e3 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/expression/function/CollationKeyFunctionTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/expression/function/CollationKeyFunctionTest.java
@@ -90,12 +90,13 @@ public class CollationKeyFunctionTest {
 
        @Test
        public void testZhSort() throws Exception {
-               testSortOrderNoEquals(chineseChars, "zh", Boolean.FALSE, null, 
null, new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+               testSortOrderNoEquals(chineseChars, "zh", Boolean.FALSE, null, 
null, new Integer[] { 4, 3, 1, 5, 2, 0, 6 });
+
        }
 
        @Test
        public void testZhTwSort() throws Exception {
-               testSortOrderNoEquals(chineseChars, "zh_TW", Boolean.FALSE, 
null, null, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+               testSortOrderNoEquals(chineseChars, "zh_TW", Boolean.FALSE, 
null, null, new Integer[] { 4, 3, 1, 5, 2, 0, 6 });
        }
 
        @Test
@@ -107,7 +108,7 @@ public class CollationKeyFunctionTest {
        @Test
        public void testZhStrokeSort() throws Exception {
                testSortOrderNoEquals(chineseChars, "zh__STROKE", 
Boolean.FALSE, null, null,
-                               new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+                               new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
        }
 
        @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/31dad52c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index b860099..deaf848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -105,7 +105,7 @@
     <scala.version>2.11.8</scala.version>
     <scala.binary.version>2.11</scala.binary.version>
     <stream.version>2.9.5</stream.version>
-    <i18n-util.version>1.0.1</i18n-util.version>
+    <i18n-util.version>1.0.4</i18n-util.version>
     <servlet.api.version>3.1.0</servlet.api.version>
     <!-- Test Dependencies -->
     <mockito-all.version>1.8.5</mockito-all.version>

Reply via email to