Apache-Phoenix | 4.x-HBase-1.1 | Build Successful

2018-03-05 Thread Apache Jenkins Server
4.x-HBase-1.1 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.1

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.1/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout


Jenkins build is back to normal : Phoenix-4.x-HBase-1.3 #53

2018-03-05 Thread Apache Jenkins Server
See 




Apache-Phoenix | 4.x-HBase-1.2 | Build Successful

2018-03-05 Thread Apache Jenkins Server
4.x-HBase-1.2 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/4.x-HBase-1.2

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.x-HBase-1.2/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.x-HBase-1.2/lastCompletedBuild/testReport/

Changes
[jtaylor] PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad



Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout


Build failed in Jenkins: Phoenix | Master #1952

2018-03-05 Thread Apache Jenkins Server
See 


Changes:

[jtaylor] PHOENIX-4624 COLLATION_KEY function cannot handle null values 
(Shehzaad

--
[...truncated 109.85 KB...]
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 361.918 
s - in org.apache.phoenix.end2end.join.HashJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 377.056 
s - in org.apache.phoenix.end2end.join.SortMergeJoinNoIndexIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Tests run: 72, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 827.711 
s - in org.apache.phoenix.end2end.index.MutableIndexIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 26.33 s 
- in org.apache.phoenix.end2end.salted.SaltedTableIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Tests run: 24, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 405.782 
s - in org.apache.phoenix.end2end.join.SubqueryIT
[INFO] Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.353 s 
- in org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
[INFO] Running org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.282 s 
- in org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
[INFO] Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 628.088 
s - in org.apache.phoenix.end2end.join.HashJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.315 s 
- in org.apache.phoenix.replication.SystemCatalogWALEntryFilterIT
[INFO] Running org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 75.071 s 
- in org.apache.phoenix.iterate.RoundRobinResultIteratorIT
[INFO] Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[INFO] Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.379 s 
- in org.apache.phoenix.trace.PhoenixTableMetricsWriterIT
[INFO] Running org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 50.265 s 
- in org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
[INFO] Running org.apache.phoenix.tx.ParameterizedTransactionIT
[INFO] Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.475 s 
- in org.apache.phoenix.tx.FlappingTransactionIT
[INFO] Running org.apache.phoenix.tx.TransactionIT
[INFO] Running org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 43.129 s 
- in org.apache.phoenix.rpc.UpdateCacheIT
[INFO] Running org.apache.phoenix.tx.TxCheckpointIT
[INFO] Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 282.003 
s - in org.apache.phoenix.end2end.join.SubqueryUsingSortMergeJoinIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 104.707 
s - in org.apache.phoenix.trace.PhoenixTracingEndToEndIT
[INFO] Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 97.016 s 
- in org.apache.phoenix.tx.TransactionIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 640.939 
s - in org.apache.phoenix.end2end.join.SortMergeJoinGlobalIndexIT
[INFO] Running org.apache.phoenix.util.IndexScrutinyIT
[INFO] Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 29.534 s 
- in org.apache.phoenix.util.IndexScrutinyIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 825.987 
s - in org.apache.phoenix.end2end.join.HashJoinLocalIndexIT
[INFO] Tests run: 34, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 847.357 
s - in org.apache.phoenix.end2end.join.SortMergeJoinLocalIndexIT
[WARNING] Tests run: 52, Failures: 0, Errors: 0, Skipped: 4, Time elapsed: 
359.957 s - in org.apache.phoenix.tx.ParameterizedTransactionIT
[INFO] Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 423.677 
s - in org.apache.phoenix.tx.TxCheckpointIT
[INFO] 
[INFO] Results:
[INFO] 
[ERROR] Failures: 
[ERROR]   ConcurrentMutationsIT.testConcurrentDeletesAndUpsertValues:214 
Expected to find PK in data table: (0,0)
[ERROR]   DefaultColumnValueIT.testDefaultIndexed:978
[ERROR]   RowValueConstructorIT.testRVCLastPkIsTable1stPkIndex:1584
[ERROR]   
IndexMetadataIT.testMutableTableOnlyHasPrimaryKeyIndex:623->helpTestTableOnlyHasPrimaryKeyIndex:662
[ERROR] 

phoenix git commit: PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)

2018-03-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 81784909f -> 6e7b7d4ca


PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)


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

Branch: refs/heads/5.x-HBase-2.0
Commit: 6e7b7d4ca7fe0cf7b8e6213a2644758c0096be2e
Parents: 8178490
Author: James Taylor 
Authored: Mon Mar 5 13:44:09 2018 -0800
Committer: James Taylor 
Committed: Mon Mar 5 13:50:35 2018 -0800

--
 .../phoenix/end2end/CollationKeyFunctionIT.java | 37 ++--
 .../function/CollationKeyFunction.java  | 10 ++
 .../function/CollationKeyFunctionTest.java  |  7 
 3 files changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6e7b7d4c/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 efbab64..9f9e4d1 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
@@ -41,7 +41,10 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
// (0-6) chinese characters
"\u963f", "\u55c4", "\u963e", "\u554a", "\u4ec8", 
"\u3d9a", "\u9f51",
// (7-13) western characters, some with accent
-   "a", "b", "ä", "A", "a", "ä", "A" };
+   "a", "b", "ä", "A", "a", "ä", "A",
+   // null for null-input tests 
+   null
+   };
 
@Before
public void initAndPopulateTable() throws Exception {
@@ -69,27 +72,27 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
@Test
public void testZhSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", 0, 6, new 
Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
}
 
@Test
public void testZhTwSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", 0, 6, new 
Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
}
 
@Test
public void testZhTwStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 0, 
6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
}
 
@Test
public void testZhStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
public void testZhPinyinSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
@@ -120,6 +123,18 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
queryWithCollKeyWithStrengthWithExpectedOrder("en", 
Collator.TERTIARY, true, 7, 13,
new Integer[] { 8, 12, 9, 13, 10, 11, 7 });
}
+   
+   // Null before anything else when doing ascending sort
+   @Test
+   public void testSortWithNullInputAsc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", false, 13, 
14, new Integer[] {14, 13});
+   }
+   
+   // Null before anything else when doing descending sort (same behavior 
when doing order by without collation_key)
+   @Test
+   public void testSortWithNullInputDesc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", true, 13, 
14, new Integer[] {14, 13});
+   }
 

/**
@@ -132,14 +147,16 @@ public 

phoenix git commit: PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)

2018-03-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 c1fcc92ce -> b8a3ef3cc


PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: b8a3ef3ccfe280ff2a5a3aae982feece18fd55a5
Parents: c1fcc92
Author: James Taylor 
Authored: Mon Mar 5 13:44:09 2018 -0800
Committer: James Taylor 
Committed: Mon Mar 5 13:49:07 2018 -0800

--
 .../phoenix/end2end/CollationKeyFunctionIT.java | 37 ++--
 .../function/CollationKeyFunction.java  | 10 ++
 .../function/CollationKeyFunctionTest.java  |  7 
 3 files changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b8a3ef3c/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 efbab64..9f9e4d1 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
@@ -41,7 +41,10 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
// (0-6) chinese characters
"\u963f", "\u55c4", "\u963e", "\u554a", "\u4ec8", 
"\u3d9a", "\u9f51",
// (7-13) western characters, some with accent
-   "a", "b", "ä", "A", "a", "ä", "A" };
+   "a", "b", "ä", "A", "a", "ä", "A",
+   // null for null-input tests 
+   null
+   };
 
@Before
public void initAndPopulateTable() throws Exception {
@@ -69,27 +72,27 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
@Test
public void testZhSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", 0, 6, new 
Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
}
 
@Test
public void testZhTwSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", 0, 6, new 
Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
}
 
@Test
public void testZhTwStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 0, 
6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
}
 
@Test
public void testZhStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
public void testZhPinyinSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
@@ -120,6 +123,18 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
queryWithCollKeyWithStrengthWithExpectedOrder("en", 
Collator.TERTIARY, true, 7, 13,
new Integer[] { 8, 12, 9, 13, 10, 11, 7 });
}
+   
+   // Null before anything else when doing ascending sort
+   @Test
+   public void testSortWithNullInputAsc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", false, 13, 
14, new Integer[] {14, 13});
+   }
+   
+   // Null before anything else when doing descending sort (same behavior 
when doing order by without collation_key)
+   @Test
+   public void testSortWithNullInputDesc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", true, 13, 
14, new Integer[] {14, 13});
+   }
 

/**
@@ -132,14 +147,16 @@ public 

phoenix git commit: PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)

2018-03-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-cdh5.11.2 d14233ccd -> 1459cbce5


PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)


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

Branch: refs/heads/4.x-cdh5.11.2
Commit: 1459cbce5bd26add34bed9f7bc583d395b9790d3
Parents: d14233c
Author: James Taylor 
Authored: Mon Mar 5 13:44:09 2018 -0800
Committer: James Taylor 
Committed: Mon Mar 5 13:47:50 2018 -0800

--
 .../phoenix/end2end/CollationKeyFunctionIT.java | 37 ++--
 .../function/CollationKeyFunction.java  | 10 ++
 .../function/CollationKeyFunctionTest.java  |  7 
 3 files changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1459cbce/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 efbab64..9f9e4d1 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
@@ -41,7 +41,10 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
// (0-6) chinese characters
"\u963f", "\u55c4", "\u963e", "\u554a", "\u4ec8", 
"\u3d9a", "\u9f51",
// (7-13) western characters, some with accent
-   "a", "b", "ä", "A", "a", "ä", "A" };
+   "a", "b", "ä", "A", "a", "ä", "A",
+   // null for null-input tests 
+   null
+   };
 
@Before
public void initAndPopulateTable() throws Exception {
@@ -69,27 +72,27 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
@Test
public void testZhSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", 0, 6, new 
Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
}
 
@Test
public void testZhTwSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", 0, 6, new 
Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
}
 
@Test
public void testZhTwStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 0, 
6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
}
 
@Test
public void testZhStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
public void testZhPinyinSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
@@ -120,6 +123,18 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
queryWithCollKeyWithStrengthWithExpectedOrder("en", 
Collator.TERTIARY, true, 7, 13,
new Integer[] { 8, 12, 9, 13, 10, 11, 7 });
}
+   
+   // Null before anything else when doing ascending sort
+   @Test
+   public void testSortWithNullInputAsc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", false, 13, 
14, new Integer[] {14, 13});
+   }
+   
+   // Null before anything else when doing descending sort (same behavior 
when doing order by without collation_key)
+   @Test
+   public void testSortWithNullInputDesc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", true, 13, 
14, new Integer[] {14, 13});
+   }
 

/**
@@ -132,14 +147,16 @@ public 

phoenix git commit: PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)

2018-03-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 8f19583c5 -> e06882c20


PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)


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

Branch: refs/heads/4.x-HBase-1.2
Commit: e06882c2087ee1c822098e2d933a430e1d4e9310
Parents: 8f19583
Author: James Taylor 
Authored: Mon Mar 5 13:44:09 2018 -0800
Committer: James Taylor 
Committed: Mon Mar 5 13:46:26 2018 -0800

--
 .../phoenix/end2end/CollationKeyFunctionIT.java | 37 ++--
 .../function/CollationKeyFunction.java  | 10 ++
 .../function/CollationKeyFunctionTest.java  |  7 
 3 files changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e06882c2/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 efbab64..9f9e4d1 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
@@ -41,7 +41,10 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
// (0-6) chinese characters
"\u963f", "\u55c4", "\u963e", "\u554a", "\u4ec8", 
"\u3d9a", "\u9f51",
// (7-13) western characters, some with accent
-   "a", "b", "ä", "A", "a", "ä", "A" };
+   "a", "b", "ä", "A", "a", "ä", "A",
+   // null for null-input tests 
+   null
+   };
 
@Before
public void initAndPopulateTable() throws Exception {
@@ -69,27 +72,27 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
@Test
public void testZhSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", 0, 6, new 
Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
}
 
@Test
public void testZhTwSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", 0, 6, new 
Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
}
 
@Test
public void testZhTwStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 0, 
6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
}
 
@Test
public void testZhStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
public void testZhPinyinSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
@@ -120,6 +123,18 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
queryWithCollKeyWithStrengthWithExpectedOrder("en", 
Collator.TERTIARY, true, 7, 13,
new Integer[] { 8, 12, 9, 13, 10, 11, 7 });
}
+   
+   // Null before anything else when doing ascending sort
+   @Test
+   public void testSortWithNullInputAsc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", false, 13, 
14, new Integer[] {14, 13});
+   }
+   
+   // Null before anything else when doing descending sort (same behavior 
when doing order by without collation_key)
+   @Test
+   public void testSortWithNullInputDesc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", true, 13, 
14, new Integer[] {14, 13});
+   }
 

/**
@@ -132,14 +147,16 @@ public 

phoenix git commit: PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)

2018-03-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 26f06354a -> bad0381df


PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)


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

Branch: refs/heads/4.x-HBase-1.3
Commit: bad0381df675d7b10de200671c8738b8572ebf2f
Parents: 26f0635
Author: James Taylor 
Authored: Mon Mar 5 13:44:09 2018 -0800
Committer: James Taylor 
Committed: Mon Mar 5 13:44:52 2018 -0800

--
 .../phoenix/end2end/CollationKeyFunctionIT.java | 37 ++--
 .../function/CollationKeyFunction.java  | 10 ++
 .../function/CollationKeyFunctionTest.java  |  7 
 3 files changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bad0381d/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 efbab64..9f9e4d1 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
@@ -41,7 +41,10 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
// (0-6) chinese characters
"\u963f", "\u55c4", "\u963e", "\u554a", "\u4ec8", 
"\u3d9a", "\u9f51",
// (7-13) western characters, some with accent
-   "a", "b", "ä", "A", "a", "ä", "A" };
+   "a", "b", "ä", "A", "a", "ä", "A",
+   // null for null-input tests 
+   null
+   };
 
@Before
public void initAndPopulateTable() throws Exception {
@@ -69,27 +72,27 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
@Test
public void testZhSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", 0, 6, new 
Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
}
 
@Test
public void testZhTwSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", 0, 6, new 
Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
}
 
@Test
public void testZhTwStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 0, 
6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
}
 
@Test
public void testZhStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
public void testZhPinyinSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
@@ -120,6 +123,18 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
queryWithCollKeyWithStrengthWithExpectedOrder("en", 
Collator.TERTIARY, true, 7, 13,
new Integer[] { 8, 12, 9, 13, 10, 11, 7 });
}
+   
+   // Null before anything else when doing ascending sort
+   @Test
+   public void testSortWithNullInputAsc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", false, 13, 
14, new Integer[] {14, 13});
+   }
+   
+   // Null before anything else when doing descending sort (same behavior 
when doing order by without collation_key)
+   @Test
+   public void testSortWithNullInputDesc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", true, 13, 
14, new Integer[] {14, 13});
+   }
 

/**
@@ -132,14 +147,16 @@ public 

phoenix git commit: PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)

2018-03-05 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master 2b7861536 -> 916186e97


PHOENIX-4624 COLLATION_KEY function cannot handle null values (Shehzaad Nakhoda)


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

Branch: refs/heads/master
Commit: 916186e974da77e4b58ca9392c3052957b8eecba
Parents: 2b78615
Author: James Taylor 
Authored: Mon Mar 5 13:44:09 2018 -0800
Committer: James Taylor 
Committed: Mon Mar 5 13:44:09 2018 -0800

--
 .../phoenix/end2end/CollationKeyFunctionIT.java | 37 ++--
 .../function/CollationKeyFunction.java  | 10 ++
 .../function/CollationKeyFunctionTest.java  |  7 
 3 files changed, 44 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/916186e9/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 efbab64..9f9e4d1 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
@@ -41,7 +41,10 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
// (0-6) chinese characters
"\u963f", "\u55c4", "\u963e", "\u554a", "\u4ec8", 
"\u3d9a", "\u9f51",
// (7-13) western characters, some with accent
-   "a", "b", "ä", "A", "a", "ä", "A" };
+   "a", "b", "ä", "A", "a", "ä", "A",
+   // null for null-input tests 
+   null
+   };
 
@Before
public void initAndPopulateTable() throws Exception {
@@ -69,27 +72,27 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
 
@Test
public void testZhSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", 0, 6, new 
Integer[] { 3, 0, 1, 6, 5, 4, 2 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh", false, 0, 6, 
new Integer[] { 3, 0, 1, 6, 5, 4, 2 });
}
 
@Test
public void testZhTwSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", 0, 6, new 
Integer[] { 0, 3, 4, 1, 5, 2, 6 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW", false, 0, 
6, new Integer[] { 0, 3, 4, 1, 5, 2, 6 });
}
 
@Test
public void testZhTwStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 0, 
6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh_TW_STROKE", 
false, 0, 6, new Integer[] { 4, 2, 0, 3, 1, 6, 5 });
}
 
@Test
public void testZhStrokeSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__STROKE", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
public void testZhPinyinSort() throws Exception {
-   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 0, 
6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
+   queryWithCollKeyDefaultArgsWithExpectedOrder("zh__PINYIN", 
false, 0, 6, new Integer[] { 0, 1, 3, 4, 6, 2, 5 });
}
 
@Test
@@ -120,6 +123,18 @@ public class CollationKeyFunctionIT extends 
ParallelStatsDisabledIT {
queryWithCollKeyWithStrengthWithExpectedOrder("en", 
Collator.TERTIARY, true, 7, 13,
new Integer[] { 8, 12, 9, 13, 10, 11, 7 });
}
+   
+   // Null before anything else when doing ascending sort
+   @Test
+   public void testSortWithNullInputAsc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", false, 13, 
14, new Integer[] {14, 13});
+   }
+   
+   // Null before anything else when doing descending sort (same behavior 
when doing order by without collation_key)
+   @Test
+   public void testSortWithNullInputDesc() throws Exception {
+   queryWithCollKeyDefaultArgsWithExpectedOrder("en", true, 13, 
14, new Integer[] {14, 13});
+   }
 

/**
@@ -132,14 +147,16 @@ public class 

Build failed in Jenkins: Phoenix Compile Compatibility with HBase #567

2018-03-05 Thread Apache Jenkins Server
See 


--
[...truncated 39.70 KB...]
[ERROR] 
:[364,5]
 method does not override or implement a method from a supertype
[ERROR] 
:[370,5]
 method does not override or implement a method from a supertype
[ERROR] 
:[376,5]
 method does not override or implement a method from a supertype
[ERROR] 
:[382,5]
 method does not override or implement a method from a supertype
[ERROR] Failed to execute goal 
org.apache.maven.plugins:maven-compiler-plugin:3.0:compile (default-compile) on 
project phoenix-core: Compilation failure: Compilation failure: 
[ERROR] 
:[34,39]
 cannot find symbol
[ERROR]   symbol:   class MetricRegistry
[ERROR]   location: package org.apache.hadoop.hbase.metrics
[ERROR] 
:[144,16]
 cannot find symbol
[ERROR]   symbol:   class MetricRegistry
[ERROR]   location: class 
org.apache.phoenix.coprocessor.PhoenixMetaDataCoprocessorHost.PhoenixMetaDataControllerEnvironment
[ERROR] 
:[24,35]
 cannot find symbol
[ERROR]   symbol:   class DelegatingHBaseRpcController
[ERROR]   location: package org.apache.hadoop.hbase.ipc
[ERROR] 
:[25,35]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: package org.apache.hadoop.hbase.ipc
[ERROR] 
:[37,37]
 cannot find symbol
[ERROR]   symbol: class DelegatingHBaseRpcController
[ERROR] 
:[56,38]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.MetadataRpcController
[ERROR] 
:[26,35]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: package org.apache.hadoop.hbase.ipc
[ERROR] 
:[40,12]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.InterRegionServerMetadataRpcControllerFactory
[ERROR] 
:[46,12]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.InterRegionServerMetadataRpcControllerFactory
[ERROR] 
:[52,12]
 cannot find symbol
[ERROR]   symbol:   class HBaseRpcController
[ERROR]   location: class 
org.apache.hadoop.hbase.ipc.controller.InterRegionServerMetadataRpcControllerFactory
[ERROR] 
:[57,46]
 cannot