Jenkins build is back to normal : Phoenix-4.x-HBase-1.1 #164

[Apache Jenkins Server]

See 

Jenkins build is back to normal : Phoenix-4.x-HBase-1.0 #610

[Apache Jenkins Server]

See 

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 9c2b998b7 -> 07d6f26c3


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 07d6f26c37410657708cce1f7c118332b769b85f
Parents: 9c2b998
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:27:12 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/07d6f26c/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/07d6f26c/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 da974259d -> 2da8d9d69


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.8-HBase-1.2
Commit: 2da8d9d693569db75e39e302e0e0abb58a10c465
Parents: da97425
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:27:23 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2da8d9d6/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/2da8d9d6/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 07bd79caa -> 506ca5f30


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 506ca5f30f4f187bb0eb1e7ffc4c502056e7f2b9
Parents: 07bd79c
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:27:00 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/506ca5f3/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/506ca5f3/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/master 1f7a05b63 -> 5fecde8d8


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/master
Commit: 5fecde8d892fdc441aaa4e3ea8e195112da88705
Parents: 1f7a05b
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:26:23 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5fecde8d/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/5fecde8d/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 1ad4cd4d4 -> a8aa239d7


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.8-HBase-0.98
Commit: a8aa239d722d07c23ba8e727454019e2d44242b4
Parents: 1ad4cd4
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:26:45 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a8aa239d/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/a8aa239d/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 38d70c457 -> b0adcf25e


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: b0adcf25e98274d636bf307fb05c3a13e1565bde
Parents: 38d70c4
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:26:08 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b0adcf25/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/b0adcf25/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 833cf3b35 -> 551072cbc


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 551072cbc1becce61688e1b3fee45f92acd047dd
Parents: 833cf3b
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:25:51 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/551072cb/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/551072cb/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

phoenix git commit: PHOENIX-3195 Addendum. (James Taylor)

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 8cdf38a5b -> cae2885b5


PHOENIX-3195 Addendum. (James Taylor)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: cae2885b517e4859406db1d1e839a4c5e422183f
Parents: 8cdf38a
Author: Lars Hofhansl 
Authored: Mon Aug 22 20:21:54 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 20:21:54 2016 -0700

--
 .../java/org/apache/phoenix/compile/ExpressionCompiler.java| 6 +-
 .../main/java/org/apache/phoenix/compile/OrderByCompiler.java  | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cae2885b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
index 1278494..0fd1876 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ExpressionCompiler.java
@@ -393,6 +393,10 @@ public class ExpressionCompiler extends 
UnsupportedAllParseNodeVisitorhttp://git-wip-us.apache.org/repos/asf/phoenix/blob/cae2885b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
index 6804375..9bc0c31 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/OrderByCompiler.java
@@ -36,6 +36,7 @@ import org.apache.phoenix.parse.ParseNode;
 import org.apache.phoenix.parse.SelectStatement;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
+import org.apache.phoenix.schema.PColumn;
 import org.apache.phoenix.schema.PTableType;
 import org.apache.phoenix.schema.SortOrder;
 import org.apache.phoenix.schema.types.PInteger;
@@ -97,6 +98,8 @@ public class OrderByCompiler {
 compiler = new ExpressionCompiler(context, GroupBy.EMPTY_GROUP_BY) 
{
 @Override
 protected Expression addExpression(Expression expression) 
{return expression;}
+@Override
+protected void addColumn(PColumn column) {}
 };
 } else {
 compiler = new ExpressionCompiler(context, groupBy);

Build failed in Jenkins: Phoenix | Master #1366

[Apache Jenkins Server]

See 

Changes:

[larsh] PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

--
[...truncated 735 lines...]

Tests run: 1202, Failures: 0, Errors: 0, Skipped: 5

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTableReuseTest) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.8 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.086 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.415 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.417 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.052 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 30.057 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.573 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.115 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.103 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.834 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.104 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.932 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.743 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.439 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.1 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.583 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.421 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.14 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.388 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 19.645 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.DistinctPrefixFilterIT
testPlans(org.apache.phoenix.end2end.DistinctPrefixFilterIT)  Time elapsed: 
0.335 sec  <<< FAILURE!
java.lang.AssertionError: expected: but was:
at 
org.apache.phoenix.end2end.DistinctPrefixFilterIT.testPlan(DistinctPrefixFilterIT.java:210)
at 
org.apache.phoenix.end2end.DistinctPrefixFilterIT.testCommonPlans(DistinctPrefixFilterIT.java:196)
at 
org.apache.phoenix.end2end.DistinctPrefixFilterIT.testPlans(DistinctPrefixFilterIT.java:159)

Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 78.986 sec - 
in org

Build failed in Jenkins: Phoenix-4.x-HBase-1.1 #163

[Apache Jenkins Server]

See 

Changes:

[larsh] PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

--
[...truncated 705 lines...]
Results :

Tests run: 1202, Failures: 0, Errors: 0, Skipped: 5

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTableReuseTest) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.085 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.668 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.359 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.323 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.459 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.565 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.004 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.679 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.667 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.091 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.093 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.797 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.605 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.339 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.005 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.855 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.29 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.137 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.414 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 55.314 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.632 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.628 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 18.375 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.DistinctPrefixFilterIT
testPlans(org.apache.phoenix.end2end.Disti

Build failed in Jenkins: Phoenix-4.x-HBase-1.0 #609

[Apache Jenkins Server]

See 

Changes:

[larsh] PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

--
[...truncated 705 lines...]
Results :

Tests run: 1202, Failures: 0, Errors: 0, Skipped: 5

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTableReuseTest) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.302 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.119 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.AutoCommitIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.869 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.676 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.408 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 20.388 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.315 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 17.041 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.152 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.461 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.165 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 14.367 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.311 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.946 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.735 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 12.647 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.057 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.208 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.719 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 51.221 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.392 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.859 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 5, Failures: 1, Errors: 0, Skipped: 0, Time elapsed: 16.499 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.DistinctPrefixFilterIT
testPlans(org.apache.phoenix.end2end.Dist

Build failed in Jenkins: Phoenix | 4.x-HBase-0.98 #1270

[Apache Jenkins Server]

See 

Changes:

[larsh] PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

--
[...truncated 703 lines...]
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 606.703 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT

Results :

Tests run: 1202, Failures: 0, Errors: 0, Skipped: 5

[INFO] 
[INFO] --- maven-failsafe-plugin:2.19.1:integration-test 
(HBaseManagedTimeTableReuseTest) @ phoenix-core ---

---
 T E S T S
---
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.13 sec - in 
org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.67 sec - in 
org.apache.phoenix.end2end.AutoCommitIT
Running org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.572 sec - in 
org.apache.phoenix.end2end.CbrtFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 13.128 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.14 sec - in 
org.apache.phoenix.end2end.ArrayFillFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.434 sec - in 
org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.84 sec - in 
org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.021 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.833 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Running org.apache.phoenix.end2end.DynamicUpsertIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.219 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.188 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.848 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.337 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.861 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.22 sec - in 
org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.238 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Running org.apache.phoenix.end2end.PrimitiveTypeIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.129 sec - in 
org.apache.phoenix.end2end.PrimitiveTypeIT
Running org.apache.phoenix.end2end.QueryMoreIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.973 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.614 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.438 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.783 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.852 sec - in 
org.apache.phoenix.end2end.ReadOnlyIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Tests run: 11, Failures: 0, Errors: 0, Skip

phoenix git commit: PHOENIX-808 Create snapshot of system tables prior to upgrade and restore on any failure

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 002255ae1 -> 1ad4cd4d4


PHOENIX-808 Create snapshot of system tables prior to upgrade and restore on 
any failure


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 1ad4cd4d41b3b7b8b5f076bf3c34c1f4e50c520d
Parents: 002255a
Author: Samarth 
Authored: Mon Aug 22 14:17:16 2016 -0700
Committer: Samarth 
Committed: Mon Aug 22 14:17:16 2016 -0700

--
 .../phoenix/coprocessor/MetaDataProtocol.java   |  19 +
 .../query/ConnectionQueryServicesImpl.java  | 365 ---
 .../org/apache/phoenix/util/UpgradeUtil.java|  11 +
 3 files changed, 271 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1ad4cd4d/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 8982fe7..dce89bd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -19,7 +19,9 @@ package org.apache.phoenix.coprocessor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
@@ -27,6 +29,7 @@ import 
org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
 import org.apache.phoenix.hbase.index.util.VersionUtil;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.parse.PFunction;
 import org.apache.phoenix.parse.PSchema;
 import org.apache.phoenix.schema.PColumn;
@@ -83,6 +86,22 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0 = 
MIN_TABLE_TIMESTAMP + 18;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0;
+
+// ALWAYS update this map whenever rolling out a new release (major, minor 
or patch release). 
+// Key is the SYSTEM.CATALOG timestamp for the version and value is the 
version string.
+public static final Map TIMESTAMP_VERSION_MAP = new 
HashMap<>(10);
+static {
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_1_0, "4.1.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_0, "4.2.0");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_1, "4.2.1");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0, "4.3.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0, "4.5.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0, "4.6.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, "4.7.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0, "4.8.x");
+}
+public static final String CURRENT_CLIENT_VERSION = PHOENIX_MAJOR_VERSION 
+ "." + PHOENIX_MINOR_VERSION + "." + PHOENIX_PATCH_NUMBER; 
+
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need
 // a different code for every type of error.
 // ENTITY_ALREADY_EXISTS, ENTITY_NOT_FOUND, NEWER_ENTITY_FOUND, 
ENTITY_NOT_IN_REGION, CONCURRENT_MODIFICATION

http://git-wip-us.apache.org/repos/asf/phoenix/blob/1ad4cd4d/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 7fd35a4..9e4ec53 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -19,10 +19,15 @@ package org.apache.phoenix.query;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
+

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-0.98 304bdab06 -> 002255ae1


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.8-HBase-0.98
Commit: 002255ae105ead951f22ba6a438b7e659b754d50
Parents: 304bdab
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:40:41 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/002255ae/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/master bea9e03ae -> 1f7a05b63


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/master
Commit: 1f7a05b63ee86d79159ecb5fdeb01338207567af
Parents: bea9e03
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:40:08 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1f7a05b6/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.2 940e41ef9 -> da974259d


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.8-HBase-1.2
Commit: da974259d14c3d2991c7417ef47d90688cb948b3
Parents: 940e41e
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:39:50 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/da974259/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.1 762d8d3ac -> 9c2b998b7


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.8-HBase-1.1
Commit: 9c2b998b713724f6366563f55e427a547d55fe07
Parents: 762d8d3
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:39:33 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9c2b998b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.8-HBase-1.0 841e332d7 -> 07bd79caa


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.8-HBase-1.0
Commit: 07bd79caade76d61428af6c8d6d71c20ba5e7703
Parents: 841e332
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:39:14 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/07bd79ca/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 b8ac187b7 -> 833cf3b35


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 833cf3b3528eca10c8a6e4061e8ada3699873966
Parents: b8ac187
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:38:38 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/833cf3b3/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 a17e8ef45 -> 38d70c457


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 38d70c45742c77924267051cb58484a63a630638
Parents: a17e8ef
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:38:10 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/38d70c45/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

phoenix git commit: PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.

[larsh]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 875c701c2 -> 8cdf38a5b


PHOENIX-3195 Slight safety improvement for using DistinctPrefixFilter.


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 8cdf38a5bfb3034a04ae0ff361707aa496313df2
Parents: 875c701
Author: Lars Hofhansl 
Authored: Mon Aug 22 13:37:02 2016 -0700
Committer: Lars Hofhansl 
Committed: Mon Aug 22 13:37:02 2016 -0700

--
 .../main/java/org/apache/phoenix/iterate/BaseResultIterators.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8cdf38a5/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
index ceba000..8b9adfd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/BaseResultIterators.java
@@ -227,7 +227,7 @@ public abstract class BaseResultIterators extends 
ExplainTable implements Result
 }
 
 int cols = plan.getGroupBy().getOrderPreservingColumnCount();
-if (cols > 0 && context.getWhereConditionColumns().size() == 0 &&
+if (cols > 0 && keyOnlyFilter &&
 
!plan.getStatement().getHint().hasHint(HintNode.Hint.RANGE_SCAN) &&
 cols < 
plan.getTableRef().getTable().getRowKeySchema().getFieldCount() &&
 plan.getGroupBy().isOrderPreserving() &&

Jenkins build is back to normal : Phoenix-4.x-HBase-1.1 #162

[Apache Jenkins Server]

See 

Jenkins build is back to normal : Phoenix-4.x-HBase-1.0 #608

[Apache Jenkins Server]

See 

Apache-Phoenix | Master | Build Successful

[Apache Jenkins Server]

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf?p=phoenix.git;a=shortlog;h=refs/heads/master

Last Successful Compiled Artifacts https://builds.apache.org/job/Phoenix-master/lastSuccessfulBuild/artifact/

Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/

Changes
[samarth] PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and



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

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

[Apache Jenkins Server]

4.x-HBase-0.98 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-0.98

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

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

Changes
[samarth] PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and



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

phoenix git commit: PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on any failure

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 98e665fff -> b8ac187b7


PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on 
any failure


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

Branch: refs/heads/4.x-HBase-1.0
Commit: b8ac187b766ad6efb684f3a2640a9ec4dacdfe8a
Parents: 98e665f
Author: Samarth 
Authored: Mon Aug 22 11:43:12 2016 -0700
Committer: Samarth 
Committed: Mon Aug 22 11:43:12 2016 -0700

--
 .../phoenix/coprocessor/MetaDataProtocol.java   |  19 +
 .../query/ConnectionQueryServicesImpl.java  | 370 ---
 .../org/apache/phoenix/util/UpgradeUtil.java|  11 +
 3 files changed, 274 insertions(+), 126 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b8ac187b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 8982fe7..dce89bd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -19,7 +19,9 @@ package org.apache.phoenix.coprocessor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
@@ -27,6 +29,7 @@ import 
org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
 import org.apache.phoenix.hbase.index.util.VersionUtil;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.parse.PFunction;
 import org.apache.phoenix.parse.PSchema;
 import org.apache.phoenix.schema.PColumn;
@@ -83,6 +86,22 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0 = 
MIN_TABLE_TIMESTAMP + 18;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0;
+
+// ALWAYS update this map whenever rolling out a new release (major, minor 
or patch release). 
+// Key is the SYSTEM.CATALOG timestamp for the version and value is the 
version string.
+public static final Map TIMESTAMP_VERSION_MAP = new 
HashMap<>(10);
+static {
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_1_0, "4.1.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_0, "4.2.0");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_1, "4.2.1");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0, "4.3.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0, "4.5.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0, "4.6.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, "4.7.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0, "4.8.x");
+}
+public static final String CURRENT_CLIENT_VERSION = PHOENIX_MAJOR_VERSION 
+ "." + PHOENIX_MINOR_VERSION + "." + PHOENIX_PATCH_NUMBER; 
+
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need
 // a different code for every type of error.
 // ENTITY_ALREADY_EXISTS, ENTITY_NOT_FOUND, NEWER_ENTITY_FOUND, 
ENTITY_NOT_IN_REGION, CONCURRENT_MODIFICATION

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b8ac187b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 23f6964..d55e5ca 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -18,6 +18,14 @@
 package org.apache.phoenix.query;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
+imp

phoenix git commit: PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on any failure

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 c5c213d5d -> a17e8ef45


PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on 
any failure


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

Branch: refs/heads/4.x-HBase-1.1
Commit: a17e8ef45b49161034ac58b77c9f6d6b2a0a9c19
Parents: c5c213d
Author: Samarth 
Authored: Mon Aug 22 11:12:43 2016 -0700
Committer: Samarth 
Committed: Mon Aug 22 11:12:43 2016 -0700

--
 .../phoenix/coprocessor/MetaDataProtocol.java   |  19 ++
 .../query/ConnectionQueryServicesImpl.java  | 337 +--
 .../org/apache/phoenix/util/UpgradeUtil.java|  11 +
 3 files changed, 257 insertions(+), 110 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a17e8ef4/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 8982fe7..dce89bd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -19,7 +19,9 @@ package org.apache.phoenix.coprocessor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
@@ -27,6 +29,7 @@ import 
org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
 import org.apache.phoenix.hbase.index.util.VersionUtil;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.parse.PFunction;
 import org.apache.phoenix.parse.PSchema;
 import org.apache.phoenix.schema.PColumn;
@@ -83,6 +86,22 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0 = 
MIN_TABLE_TIMESTAMP + 18;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0;
+
+// ALWAYS update this map whenever rolling out a new release (major, minor 
or patch release). 
+// Key is the SYSTEM.CATALOG timestamp for the version and value is the 
version string.
+public static final Map TIMESTAMP_VERSION_MAP = new 
HashMap<>(10);
+static {
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_1_0, "4.1.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_0, "4.2.0");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_1, "4.2.1");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0, "4.3.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0, "4.5.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0, "4.6.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, "4.7.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0, "4.8.x");
+}
+public static final String CURRENT_CLIENT_VERSION = PHOENIX_MAJOR_VERSION 
+ "." + PHOENIX_MINOR_VERSION + "." + PHOENIX_PATCH_NUMBER; 
+
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need
 // a different code for every type of error.
 // ENTITY_ALREADY_EXISTS, ENTITY_NOT_FOUND, NEWER_ENTITY_FOUND, 
ENTITY_NOT_IN_REGION, CONCURRENT_MODIFICATION

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a17e8ef4/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index fb53f4a..3ed961b 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -17,7 +17,14 @@
  */
 package org.apache.phoenix.query;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
+import static 
org.apache.phoenix.coprocessor.MetaDataProto

phoenix git commit: PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on any failure

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 25e79e292 -> 875c701c2


PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on 
any failure


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 875c701c2c8255a64a463b78140b8dd98763ebaa
Parents: 25e79e2
Author: Samarth 
Authored: Mon Aug 22 10:36:19 2016 -0700
Committer: Samarth 
Committed: Mon Aug 22 10:36:19 2016 -0700

--
 .../phoenix/coprocessor/MetaDataProtocol.java   |  19 +
 .../query/ConnectionQueryServicesImpl.java  | 365 ---
 .../org/apache/phoenix/util/UpgradeUtil.java|  11 +
 3 files changed, 271 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/875c701c/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 8982fe7..dce89bd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -19,7 +19,9 @@ package org.apache.phoenix.coprocessor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
@@ -27,6 +29,7 @@ import 
org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
 import org.apache.phoenix.hbase.index.util.VersionUtil;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.parse.PFunction;
 import org.apache.phoenix.parse.PSchema;
 import org.apache.phoenix.schema.PColumn;
@@ -83,6 +86,22 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0 = 
MIN_TABLE_TIMESTAMP + 18;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0;
+
+// ALWAYS update this map whenever rolling out a new release (major, minor 
or patch release). 
+// Key is the SYSTEM.CATALOG timestamp for the version and value is the 
version string.
+public static final Map TIMESTAMP_VERSION_MAP = new 
HashMap<>(10);
+static {
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_1_0, "4.1.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_0, "4.2.0");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_1, "4.2.1");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0, "4.3.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0, "4.5.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0, "4.6.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, "4.7.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0, "4.8.x");
+}
+public static final String CURRENT_CLIENT_VERSION = PHOENIX_MAJOR_VERSION 
+ "." + PHOENIX_MINOR_VERSION + "." + PHOENIX_PATCH_NUMBER; 
+
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need
 // a different code for every type of error.
 // ENTITY_ALREADY_EXISTS, ENTITY_NOT_FOUND, NEWER_ENTITY_FOUND, 
ENTITY_NOT_IN_REGION, CONCURRENT_MODIFICATION

http://git-wip-us.apache.org/repos/asf/phoenix/blob/875c701c/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index 7fd35a4..9e4ec53 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -19,10 +19,15 @@ package org.apache.phoenix.query;
 
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;

phoenix git commit: PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on any failure

[samarth]

Repository: phoenix
Updated Branches:
  refs/heads/master 386cbbbf7 -> bea9e03ae


PHOENIX-808 Create snapshot of SYSTEM.CATALOG prior to upgrade and restore on 
any failure


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

Branch: refs/heads/master
Commit: bea9e03aebe0c3ef657f4a5b762f47cb7d8c81bb
Parents: 386cbbb
Author: Samarth 
Authored: Mon Aug 22 10:35:38 2016 -0700
Committer: Samarth 
Committed: Mon Aug 22 10:35:38 2016 -0700

--
 .../phoenix/coprocessor/MetaDataProtocol.java   |  19 +
 .../query/ConnectionQueryServicesImpl.java  | 365 ---
 .../org/apache/phoenix/util/UpgradeUtil.java|  11 +
 3 files changed, 271 insertions(+), 124 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bea9e03a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
index 8982fe7..dce89bd 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/MetaDataProtocol.java
@@ -19,7 +19,9 @@ package org.apache.phoenix.coprocessor;
 
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.hadoop.hbase.util.ByteStringer;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos;
@@ -27,6 +29,7 @@ import 
org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataResponse;
 import org.apache.phoenix.coprocessor.generated.MetaDataProtos.MetaDataService;
 import org.apache.phoenix.coprocessor.generated.PFunctionProtos;
 import org.apache.phoenix.hbase.index.util.VersionUtil;
+import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData;
 import org.apache.phoenix.parse.PFunction;
 import org.apache.phoenix.parse.PSchema;
 import org.apache.phoenix.schema.PColumn;
@@ -83,6 +86,22 @@ public abstract class MetaDataProtocol extends 
MetaDataService {
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0 = 
MIN_TABLE_TIMESTAMP + 18;
 // MIN_SYSTEM_TABLE_TIMESTAMP needs to be set to the max of all the 
MIN_SYSTEM_TABLE_TIMESTAMP_* constants
 public static final long MIN_SYSTEM_TABLE_TIMESTAMP = 
MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0;
+
+// ALWAYS update this map whenever rolling out a new release (major, minor 
or patch release). 
+// Key is the SYSTEM.CATALOG timestamp for the version and value is the 
version string.
+public static final Map TIMESTAMP_VERSION_MAP = new 
HashMap<>(10);
+static {
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_1_0, "4.1.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_0, "4.2.0");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_2_1, "4.2.1");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_3_0, "4.3.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_5_0, "4.5.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_6_0, "4.6.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_7_0, "4.7.x");
+TIMESTAMP_VERSION_MAP.put(MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0, "4.8.x");
+}
+public static final String CURRENT_CLIENT_VERSION = PHOENIX_MAJOR_VERSION 
+ "." + PHOENIX_MINOR_VERSION + "." + PHOENIX_PATCH_NUMBER; 
+
 // TODO: pare this down to minimum, as we don't need duplicates for both 
table and column errors, nor should we need
 // a different code for every type of error.
 // ENTITY_ALREADY_EXISTS, ENTITY_NOT_FOUND, NEWER_ENTITY_FOUND, 
ENTITY_NOT_IN_REGION, CONCURRENT_MODIFICATION

http://git-wip-us.apache.org/repos/asf/phoenix/blob/bea9e03a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index a5dcca8..7a57103 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -18,10 +18,15 @@
 package org.apache.phoenix.query;
 import static java.util.concurrent.TimeUnit.MILLISECONDS;
 import static org.apache.hadoop.hbase.HColumnDescriptor.TTL;
+import static 
o

Build failed in Jenkins: Phoenix Compile Level Compatibility with HBase #28

[Apache Jenkins Server]

See 

--
Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-4 (Ubuntu yahoo-not-h2 ubuntu ubuntu4 docker) in 
workspace 
[Phoenix_Compile_Compat_wHBase] $ /bin/bash /tmp/hudson585010964688550701.sh
core file size  (blocks, -c) 0
data seg size   (kbytes, -d) unlimited
scheduling priority (-e) 0
file size   (blocks, -f) unlimited
pending signals (-i) 386178
max locked memory   (kbytes, -l) 64
max memory size (kbytes, -m) unlimited
open files  (-n) 6
pipe size(512 bytes, -p) 8
POSIX message queues (bytes, -q) 819200
real-time priority  (-r) 0
stack size  (kbytes, -s) 8192
cpu time   (seconds, -t) unlimited
max user processes  (-u) 10240
virtual memory  (kbytes, -v) unlimited
file locks  (-x) unlimited
core id : 0
core id : 1
core id : 10
core id : 9
physical id : 0
physical id : 1
MemTotal:   49453208 kB
MemFree: 4740164 kB
Filesystem   Size  Used Avail Use% Mounted on
udev  24G   12K   24G   1% /dev
tmpfs4.8G  892K  4.8G   1% /run
/dev/mapper/pomona--vg-root  3.6T  765G  2.7T  23% /
none 4.0K 0  4.0K   0% /sys/fs/cgroup
none 5.0M 0  5.0M   0% /run/lock
none  24G 0   24G   0% /run/shm
none 100M 0  100M   0% /run/user
/dev/sda2237M   84M  141M  38% /boot
apache-maven-2.2.1
apache-maven-3.0.4
apache-maven-3.0.5
apache-maven-3.2.1
apache-maven-3.2.5
apache-maven-3.3.3
apache-maven-3.3.9
latest
latest2
latest3


===
Verifying compile level compatibility with HBase 0.98 with Phoenix 
4.x-HBase-0.98
===

Cloning into 'hbase'...
Switched to a new branch '0.98'
Branch 0.98 set up to track remote branch 0.98 from origin.

main:
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common
 [exec] 
~/jenkins-slave/workspace/Phoenix_Compile_Compat_wHBase/hbase/hbase-common

main:
[mkdir] Created dir: 

 [exec] tar: hadoop-snappy-nativelibs.tar: Cannot open: No such file or 
directory
 [exec] tar: Error is not recoverable: exiting now
 [exec] Result: 2

main:
[mkdir] Created dir: 

 [copy] Copying 20 files to 

[mkdir] Created dir: 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 17 files to 

[mkdir] Created dir: 


main:
[mkdir] Created dir: 

 [copy] Copying 1 file to 

[mkdir] Created dir: 


HBase pom.xml:

Got HBase version as 0.98.22-SNAPSHOT
Cloning into 'phoenix'...
Switched to a new branch '4.x-HBase-0.98'
Branch 4.x-HBase-0.98 set up to track remote branch 4.x-HBase-0.98 from origin.
ANTLR Parser Generator  Version 3.5.2
Output file 

 does not exist: must build 

PhoenixSQL.g


===
Verifyi