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

2016-07-10 Thread Apache Jenkins Server
See 

Changes:

[rajeshbabu] PHOENIX-3002 Upgrading to 4.8 doesn't recreate local

--
[...truncated 2092 lines...]
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.007 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.AsyncImmutableIndexIT
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT  Time elapsed: 0.006 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)

Running org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.007 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT  Time elapsed: 0.006 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)

Running org.apache.phoenix.end2end.index.MutableIndexFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexFailureIT
org.apache.phoenix.end2end.index.MutableIndexFailureIT  Time elapsed: 0.005 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)

Running org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
Running org.apache.phoenix.end2end.index.MutableIndexReplicationIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexReplicationIT
org.apache.phoenix.end2end.index.MutableIndexReplicationIT  Time elapsed: 0.006 
sec  <<< ERROR!
java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)

Running org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT  Time elapsed: 0.005 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)

Running org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT  Time elapsed: 0.005 sec  
<<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT.doSetup(TxWriteFailureIT.java:86)
Caused by: java.io.IOExcep

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

2016-07-10 Thread Apache Jenkins Server
4.x-HBase-1.0 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.0

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

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

Changes
[rajeshbabu] PHOENIX-3002 Upgrading to 4.8 doesn't recreate local



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 #1316

2016-07-10 Thread Apache Jenkins Server
See 

Changes:

[rajeshbabu] PHOENIX-3002 Upgrading to 4.8 doesn't recreate local

--
[...truncated 720 lines...]
Running org.apache.phoenix.trace.PhoenixTraceReaderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.589 sec - in 
org.apache.phoenix.trace.PhoenixTraceReaderIT
Running org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 122.03 sec - in 
org.apache.phoenix.iterate.RoundRobinResultIteratorIT
Running org.apache.phoenix.tx.TransactionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 93.628 sec - in 
org.apache.phoenix.trace.PhoenixTracingEndToEndIT
Running org.apache.phoenix.tx.TxCheckpointIT
Tests run: 128, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 642.325 sec - 
in org.apache.phoenix.end2end.index.IndexIT
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 141.4 sec - in 
org.apache.phoenix.tx.TxCheckpointIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 626.241 sec - 
in org.apache.phoenix.end2end.index.LocalIndexIT
Tests run: 21, Failures: 0, Errors: 0, Skipped: 1, Time elapsed: 238.286 sec - 
in org.apache.phoenix.tx.TransactionIT
Tests run: 40, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 823.968 sec - 
in org.apache.phoenix.end2end.index.MutableIndexIT

Results :

Tests run: 1194, 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.AlterSessionIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.093 sec - in 
org.apache.phoenix.end2end.AlterSessionIT
Running org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.AbsFunctionEnd2EndIT
Running org.apache.phoenix.end2end.ArrayToStringFunctionIT
Running org.apache.phoenix.end2end.ArithmeticQueryIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.753 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.66 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.434 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.287 sec - 
in org.apache.phoenix.end2end.ArrayFillFunctionIT
Running org.apache.phoenix.end2end.DecodeFunctionIT
Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.115 sec - 
in org.apache.phoenix.end2end.ArrayToStringFunctionIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.479 sec - in 
org.apache.phoenix.end2end.ConvertTimezoneFunctionIT
Running org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.093 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.105 sec - in 
org.apache.phoenix.end2end.DynamicUpsertIT
Running org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.802 sec - in 
org.apache.phoenix.end2end.DynamicFamilyIT
Tests run: 16, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 45.953 sec - 
in org.apache.phoenix.end2end.ArraysWithNullsIT
Running org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.14 sec - in 
org.apache.phoenix.end2end.GetSetByteBitFunctionEnd2EndIT
Running org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.LikeExpressionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.732 sec - in 
org.apache.phoenix.end2end.LikeExpressionIT
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.073 sec - in 
org.apache.phoenix.end2end.MD5FunctionIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.469 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 16.767 sec - in 
org.apache.phoenix.end2end.FirstValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.39 sec - in 
org.apache.phoenix.end2end.OctetLengthFunct

phoenix git commit: PHOENIX-3002 Upgrading to 4.8 doesn't recreate local indexes-addendum2(Rajeshbabu)

2016-07-10 Thread rajeshbabu
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 c25243199 -> 9bc0cebe1


PHOENIX-3002 Upgrading to 4.8 doesn't recreate local 
indexes-addendum2(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 9bc0cebe1f1f356cc89dd8757c1c5d0411dce9b9
Parents: c252431
Author: Rajeshbabu Chintaguntla 
Authored: Mon Jul 11 10:14:19 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Mon Jul 11 10:14:19 2016 +0530

--
 .../end2end/QueryDatabaseMetaDataIT.java| 14 +
 .../query/ConnectionQueryServicesImpl.java  |  2 +-
 .../org/apache/phoenix/util/UpgradeUtil.java| 22 ++--
 3 files changed, 26 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bc0cebe/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 4012d0c..12066e6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -572,6 +572,20 @@ public class QueryDatabaseMetaDataIT extends 
BaseClientManagedTimeIT {
 
 assertFalse(rs.next());
 
+conn.createStatement().execute("CREATE TABLE SALTEDTABLE123 (k INTEGER 
PRIMARY KEY, v VARCHAR) SALT_BUCKETS=3");
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
+dbmd = conn.getMetaData();
+rs = dbmd.getPrimaryKeys(null, "", "SALTEDTABLE123");
+assertTrue(rs.next());
+assertEquals(null, rs.getString("TABLE_SCHEM"));
+assertEquals("SALTEDTABLE123", rs.getString("TABLE_NAME"));
+assertEquals(null, rs.getString("TABLE_CAT"));
+assertEquals("K", rs.getString("COLUMN_NAME"));
+assertEquals(1, rs.getInt("KEY_SEQ"));
+assertEquals(null, rs.getString("PK_NAME"));
+assertFalse(rs.next());
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bc0cebe/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 818b1fc..f14371d 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
@@ -2475,11 +2475,11 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0,
 
PhoenixDatabaseMetaData.APPEND_ONLY_SCHEMA + " "
 + 
PBoolean.INSTANCE.getSqlTypeName());
+metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
if(getProps().getBoolean(QueryServices.LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB,
 
QueryServicesOptions.DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE)) {
 metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
 }
-metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
ConnectionQueryServicesImpl.this.removeTable(null,
 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME, null,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/9bc0cebe/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
index 49ebadc..c9bb738 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/Upgr

phoenix git commit: PHOENIX-3002 Upgrading to 4.8 doesn't recreate local indexes-addendum2(Rajeshbabu)

2016-07-10 Thread rajeshbabu
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 6ebccca26 -> 02ba6507f


PHOENIX-3002 Upgrading to 4.8 doesn't recreate local 
indexes-addendum2(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 02ba6507fd6cfdc7cfb3128903e708d3c6fa9826
Parents: 6ebccca
Author: Rajeshbabu Chintaguntla 
Authored: Mon Jul 11 10:04:12 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Mon Jul 11 10:04:12 2016 +0530

--
 .../end2end/QueryDatabaseMetaDataIT.java| 14 +
 .../query/ConnectionQueryServicesImpl.java  |  2 +-
 .../org/apache/phoenix/util/UpgradeUtil.java| 22 ++--
 3 files changed, 26 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/02ba6507/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 4012d0c..12066e6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -572,6 +572,20 @@ public class QueryDatabaseMetaDataIT extends 
BaseClientManagedTimeIT {
 
 assertFalse(rs.next());
 
+conn.createStatement().execute("CREATE TABLE SALTEDTABLE123 (k INTEGER 
PRIMARY KEY, v VARCHAR) SALT_BUCKETS=3");
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
+dbmd = conn.getMetaData();
+rs = dbmd.getPrimaryKeys(null, "", "SALTEDTABLE123");
+assertTrue(rs.next());
+assertEquals(null, rs.getString("TABLE_SCHEM"));
+assertEquals("SALTEDTABLE123", rs.getString("TABLE_NAME"));
+assertEquals(null, rs.getString("TABLE_CAT"));
+assertEquals("K", rs.getString("COLUMN_NAME"));
+assertEquals(1, rs.getInt("KEY_SEQ"));
+assertEquals(null, rs.getString("PK_NAME"));
+assertFalse(rs.next());
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/02ba6507/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 84a56f9..e6fd1f6 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
@@ -2475,11 +2475,11 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0,
 
PhoenixDatabaseMetaData.APPEND_ONLY_SCHEMA + " "
 + 
PBoolean.INSTANCE.getSqlTypeName());
+metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
if(getProps().getBoolean(QueryServices.LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB,
 
QueryServicesOptions.DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE)) {
 metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
 }
-metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
ConnectionQueryServicesImpl.this.removeTable(null,
 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME, null,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/02ba6507/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
index fe0a0b3..d7ed01a 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/Upgrad

phoenix git commit: PHOENIX-3002 Upgrading to 4.8 doesn't recreate local indexes-addendum2(Rajeshbabu)

2016-07-10 Thread rajeshbabu
Repository: phoenix
Updated Branches:
  refs/heads/master b19aba2bb -> 4790b3710


PHOENIX-3002 Upgrading to 4.8 doesn't recreate local 
indexes-addendum2(Rajeshbabu)


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

Branch: refs/heads/master
Commit: 4790b3710254103245d83fdc1ab0977d06045878
Parents: b19aba2
Author: Rajeshbabu Chintaguntla 
Authored: Mon Jul 11 09:49:15 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Mon Jul 11 09:49:15 2016 +0530

--
 .../end2end/QueryDatabaseMetaDataIT.java| 14 +
 .../query/ConnectionQueryServicesImpl.java  |  2 +-
 .../org/apache/phoenix/util/UpgradeUtil.java| 22 ++--
 3 files changed, 26 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4790b371/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 4012d0c..12066e6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -572,6 +572,20 @@ public class QueryDatabaseMetaDataIT extends 
BaseClientManagedTimeIT {
 
 assertFalse(rs.next());
 
+conn.createStatement().execute("CREATE TABLE SALTEDTABLE123 (k INTEGER 
PRIMARY KEY, v VARCHAR) SALT_BUCKETS=3");
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
+dbmd = conn.getMetaData();
+rs = dbmd.getPrimaryKeys(null, "", "SALTEDTABLE123");
+assertTrue(rs.next());
+assertEquals(null, rs.getString("TABLE_SCHEM"));
+assertEquals("SALTEDTABLE123", rs.getString("TABLE_NAME"));
+assertEquals(null, rs.getString("TABLE_CAT"));
+assertEquals("K", rs.getString("COLUMN_NAME"));
+assertEquals(1, rs.getInt("KEY_SEQ"));
+assertEquals(null, rs.getString("PK_NAME"));
+assertFalse(rs.next());
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4790b371/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 25effc9..d757001 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
@@ -2479,11 +2479,11 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0,
 
PhoenixDatabaseMetaData.APPEND_ONLY_SCHEMA + " "
 + 
PBoolean.INSTANCE.getSqlTypeName());
+metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
if(getProps().getBoolean(QueryServices.LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB,
 
QueryServicesOptions.DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE)) {
 metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
 }
-metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
ConnectionQueryServicesImpl.this.removeTable(null,
 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME, null,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/4790b371/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
index 9046287..7ed9f70 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
+++

phoenix git commit: PHOENIX-3002 Upgrading to 4.8 doesn't recreate local indexes-addendum2(Rajeshbabu)

2016-07-10 Thread rajeshbabu
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 8a0f320d9 -> 275f716c2


PHOENIX-3002 Upgrading to 4.8 doesn't recreate local 
indexes-addendum2(Rajeshbabu)


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 275f716c25c7e7ea2ecec054cf0f17d586ac4683
Parents: 8a0f320
Author: Rajeshbabu Chintaguntla 
Authored: Mon Jul 11 09:41:42 2016 +0530
Committer: Rajeshbabu Chintaguntla 
Committed: Mon Jul 11 09:41:42 2016 +0530

--
 .../end2end/QueryDatabaseMetaDataIT.java| 14 +
 .../query/ConnectionQueryServicesImpl.java  |  2 +-
 .../org/apache/phoenix/util/UpgradeUtil.java| 22 ++--
 3 files changed, 26 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/275f716c/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
index 4012d0c..12066e6 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java
@@ -572,6 +572,20 @@ public class QueryDatabaseMetaDataIT extends 
BaseClientManagedTimeIT {
 
 assertFalse(rs.next());
 
+conn.createStatement().execute("CREATE TABLE SALTEDTABLE123 (k INTEGER 
PRIMARY KEY, v VARCHAR) SALT_BUCKETS=3");
+conn.close();
+props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 10));
+conn = DriverManager.getConnection(getUrl(), props);
+dbmd = conn.getMetaData();
+rs = dbmd.getPrimaryKeys(null, "", "SALTEDTABLE123");
+assertTrue(rs.next());
+assertEquals(null, rs.getString("TABLE_SCHEM"));
+assertEquals("SALTEDTABLE123", rs.getString("TABLE_NAME"));
+assertEquals(null, rs.getString("TABLE_CAT"));
+assertEquals("K", rs.getString("COLUMN_NAME"));
+assertEquals(1, rs.getInt("KEY_SEQ"));
+assertEquals(null, rs.getString("PK_NAME"));
+assertFalse(rs.next());
 }
 
 @Test

http://git-wip-us.apache.org/repos/asf/phoenix/blob/275f716c/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 99666dd..bdb5960 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
@@ -2479,11 +2479,11 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0,
 
PhoenixDatabaseMetaData.APPEND_ONLY_SCHEMA + " "
 + 
PBoolean.INSTANCE.getSqlTypeName());
+metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
if(getProps().getBoolean(QueryServices.LOCAL_INDEX_CLIENT_UPGRADE_ATTRIB,
 
QueryServicesOptions.DEFAULT_LOCAL_INDEX_CLIENT_UPGRADE)) {
 metaConnection = 
UpgradeUtil.upgradeLocalIndexes(metaConnection);
 }
-metaConnection = 
UpgradeUtil.disableViewIndexes(metaConnection);
 
ConnectionQueryServicesImpl.this.removeTable(null,
 
PhoenixDatabaseMetaData.SYSTEM_CATALOG_NAME, null,
 
MetaDataProtocol.MIN_SYSTEM_TABLE_TIMESTAMP_4_8_0);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/275f716c/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/UpgradeUtil.java
index 9046287..7ed9f70 100644
--- a/phoenix-c

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

2016-07-10 Thread Apache Jenkins Server
See 

Changes:

[jamestaylor] PHOENIX-3040 Don't use guideposts for executing queries serially

--
[...truncated 2092 lines...]
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.005 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.AsyncImmutableIndexIT
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT  Time elapsed: 0.005 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.AsyncImmutableIndexIT.doSetup(AsyncImmutableIndexIT.java:52)

Running org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT  Time elapsed: 0.005 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ImmutableIndexWithStatsIT.doSetup(ImmutableIndexWithStatsIT.java:52)

Running org.apache.phoenix.end2end.index.MutableIndexFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexFailureIT
org.apache.phoenix.end2end.index.MutableIndexFailureIT  Time elapsed: 0.006 sec 
 <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexFailureIT.doSetup(MutableIndexFailureIT.java:115)

Running org.apache.phoenix.hbase.index.FailForUnsupportedHBaseVersionsIT
Running org.apache.phoenix.end2end.index.MutableIndexReplicationIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.MutableIndexReplicationIT
org.apache.phoenix.end2end.index.MutableIndexReplicationIT  Time elapsed: 0.005 
sec  <<< ERROR!
java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setupConfigsAndStartCluster(MutableIndexReplicationIT.java:170)
at 
org.apache.phoenix.end2end.index.MutableIndexReplicationIT.setUpBeforeClass(MutableIndexReplicationIT.java:108)

Running org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.007 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT  Time elapsed: 0.006 
sec  <<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)
Caused by: java.lang.RuntimeException: Master not initialized after 20ms 
seconds
at 
org.apache.phoenix.end2end.index.ReadOnlyIndexFailureIT.doSetup(ReadOnlyIndexFailureIT.java:119)

Running org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 0.006 sec <<< 
FAILURE! - in org.apache.phoenix.end2end.index.txn.TxWriteFailureIT
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT  Time elapsed: 0.005 sec  
<<< ERROR!
java.lang.RuntimeException: java.io.IOException: Shutting down
at 
org.apache.phoenix.end2end.index.txn.TxWriteFailureIT.doSetup(TxWriteFailureIT.java:86)
Caused by: ja

Apache-Phoenix | Master | Build Successful

2016-07-10 Thread 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
[jamestaylor] PHOENIX-3040 Don't use guideposts for executing queries serially



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-1.0 | Build Successful

2016-07-10 Thread Apache Jenkins Server
4.x-HBase-1.0 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.0

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

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

Changes
[jamestaylor] PHOENIX-3040 Don't use guideposts for executing queries serially



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-3040 Don't use guideposts for executing queries serially simplification

2016-07-10 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 f47bcd13e -> c25243199


PHOENIX-3040 Don't use guideposts for executing queries serially simplification


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

Branch: refs/heads/4.x-HBase-0.98
Commit: c2524319912d649b7999c919c3be799ea61cd9e8
Parents: f47bcd1
Author: James Taylor 
Authored: Sun Jul 10 10:43:25 2016 +0200
Committer: James Taylor 
Committed: Sun Jul 10 15:16:16 2016 +0200

--
 .../phoenix/compile/ListJarsQueryPlan.java  |  5 --
 .../org/apache/phoenix/compile/QueryPlan.java   |  2 -
 .../apache/phoenix/compile/TraceQueryPlan.java  |  5 --
 .../apache/phoenix/execute/AggregatePlan.java   |  5 --
 .../phoenix/execute/DelegateQueryPlan.java  |  5 --
 .../execute/LiteralResultIterationPlan.java |  6 ---
 .../org/apache/phoenix/execute/ScanPlan.java| 48 +++-
 .../phoenix/execute/SortMergeJoinPlan.java  |  6 ---
 .../org/apache/phoenix/execute/UnionPlan.java   |  9 
 .../phoenix/iterate/BaseResultIterators.java|  9 ++--
 .../apache/phoenix/iterate/SerialIterators.java |  8 
 .../apache/phoenix/jdbc/PhoenixStatement.java   |  5 --
 .../org/apache/phoenix/query/QueryServices.java |  5 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +-
 .../query/ParallelIteratorsSplitTest.java   |  5 --
 15 files changed, 22 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2524319/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
index 9bffad9..2df0671 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
@@ -251,9 +251,4 @@ public class ListJarsQueryPlan implements QueryPlan {
public Operation getOperation() {
return stmt.getUpdateOperation();
}
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2524319/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
index f403e34..ea77d79 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
@@ -86,6 +86,4 @@ public interface QueryPlan extends StatementPlan {
  * @throws SQLException 
  */
 public boolean useRoundRobinIterator() throws SQLException;
-
-public boolean isSerial();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2524319/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
index aad3188..ed5cda9 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
@@ -265,9 +265,4 @@ public class TraceQueryPlan implements QueryPlan {
 public boolean useRoundRobinIterator() {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2524319/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
index c439618..136379d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
@@ -265,9 +265,4 @@ public class AggregatePlan extends BaseQueryPlan {
 public boolean useRoundRobinIterator() throws SQLException {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return isSerial;
-}
 }

http:

phoenix git commit: PHOENIX-3040 Don't use guideposts for executing queries serially simplification

2016-07-10 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.0 ee61a3c79 -> 6ebccca26


PHOENIX-3040 Don't use guideposts for executing queries serially simplification


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

Branch: refs/heads/4.x-HBase-1.0
Commit: 6ebccca2657c62f97c6116d1c4e7b1e2a7d53b61
Parents: ee61a3c
Author: James Taylor 
Authored: Sun Jul 10 10:43:25 2016 +0200
Committer: James Taylor 
Committed: Sun Jul 10 15:15:23 2016 +0200

--
 .../phoenix/compile/ListJarsQueryPlan.java  |  5 --
 .../org/apache/phoenix/compile/QueryPlan.java   |  2 -
 .../apache/phoenix/compile/TraceQueryPlan.java  |  5 --
 .../apache/phoenix/execute/AggregatePlan.java   |  5 --
 .../phoenix/execute/DelegateQueryPlan.java  |  5 --
 .../execute/LiteralResultIterationPlan.java |  6 ---
 .../org/apache/phoenix/execute/ScanPlan.java| 48 +++-
 .../phoenix/execute/SortMergeJoinPlan.java  |  6 ---
 .../org/apache/phoenix/execute/UnionPlan.java   |  9 
 .../phoenix/iterate/BaseResultIterators.java|  9 ++--
 .../apache/phoenix/iterate/SerialIterators.java |  8 
 .../apache/phoenix/jdbc/PhoenixStatement.java   |  5 --
 .../org/apache/phoenix/query/QueryServices.java |  5 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +-
 .../query/ParallelIteratorsSplitTest.java   |  5 --
 15 files changed, 22 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ebccca2/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
index e3025cc..b52e704 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
@@ -251,9 +251,4 @@ public class ListJarsQueryPlan implements QueryPlan {
public Operation getOperation() {
return stmt.getUpdateOperation();
}
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ebccca2/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
index f403e34..ea77d79 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
@@ -86,6 +86,4 @@ public interface QueryPlan extends StatementPlan {
  * @throws SQLException 
  */
 public boolean useRoundRobinIterator() throws SQLException;
-
-public boolean isSerial();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ebccca2/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
index ed11b46..5e0977b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
@@ -259,9 +259,4 @@ public class TraceQueryPlan implements QueryPlan {
 public boolean useRoundRobinIterator() {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6ebccca2/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
index c439618..136379d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
@@ -265,9 +265,4 @@ public class AggregatePlan extends BaseQueryPlan {
 public boolean useRoundRobinIterator() throws SQLException {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return isSerial;
-}
 }

http://

phoenix git commit: PHOENIX-3040 Don't use guideposts for executing queries serially simplification

2016-07-10 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 583698288 -> 8a0f320d9


PHOENIX-3040 Don't use guideposts for executing queries serially simplification


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 8a0f320d9e63535ddd39296730a54ee835ad6f9a
Parents: 5836982
Author: James Taylor 
Authored: Sun Jul 10 10:43:25 2016 +0200
Committer: James Taylor 
Committed: Sun Jul 10 15:04:20 2016 +0200

--
 .../phoenix/compile/ListJarsQueryPlan.java  |  5 --
 .../org/apache/phoenix/compile/QueryPlan.java   |  2 -
 .../apache/phoenix/compile/TraceQueryPlan.java  |  5 --
 .../apache/phoenix/execute/AggregatePlan.java   |  5 --
 .../phoenix/execute/DelegateQueryPlan.java  |  5 --
 .../execute/LiteralResultIterationPlan.java |  6 ---
 .../org/apache/phoenix/execute/ScanPlan.java| 48 +++-
 .../phoenix/execute/SortMergeJoinPlan.java  |  6 ---
 .../org/apache/phoenix/execute/UnionPlan.java   |  9 
 .../phoenix/iterate/BaseResultIterators.java|  9 ++--
 .../apache/phoenix/iterate/SerialIterators.java |  8 
 .../apache/phoenix/jdbc/PhoenixStatement.java   |  5 --
 .../org/apache/phoenix/query/QueryServices.java |  3 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +-
 .../query/ParallelIteratorsSplitTest.java   |  5 --
 15 files changed, 21 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8a0f320d/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
index e3025cc..b52e704 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
@@ -251,9 +251,4 @@ public class ListJarsQueryPlan implements QueryPlan {
public Operation getOperation() {
return stmt.getUpdateOperation();
}
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8a0f320d/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
index f403e34..ea77d79 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
@@ -86,6 +86,4 @@ public interface QueryPlan extends StatementPlan {
  * @throws SQLException 
  */
 public boolean useRoundRobinIterator() throws SQLException;
-
-public boolean isSerial();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8a0f320d/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
index ed11b46..5e0977b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
@@ -259,9 +259,4 @@ public class TraceQueryPlan implements QueryPlan {
 public boolean useRoundRobinIterator() {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/8a0f320d/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
index c439618..136379d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
@@ -265,9 +265,4 @@ public class AggregatePlan extends BaseQueryPlan {
 public boolean useRoundRobinIterator() throws SQLException {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return isSerial;
-}
 }

http://

phoenix git commit: PHOENIX-3040 Don't use guideposts for executing queries serially simplification

2016-07-10 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master dca188f02 -> b19aba2bb


PHOENIX-3040 Don't use guideposts for executing queries serially simplification


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

Branch: refs/heads/master
Commit: b19aba2bb11f3b9c94ca0a593159828ee029e2c8
Parents: dca188f
Author: James Taylor 
Authored: Sun Jul 10 10:43:25 2016 +0200
Committer: James Taylor 
Committed: Sun Jul 10 15:02:15 2016 +0200

--
 .../phoenix/compile/ListJarsQueryPlan.java  |  5 --
 .../org/apache/phoenix/compile/QueryPlan.java   |  2 -
 .../apache/phoenix/compile/TraceQueryPlan.java  |  5 --
 .../apache/phoenix/execute/AggregatePlan.java   |  5 --
 .../phoenix/execute/DelegateQueryPlan.java  |  5 --
 .../execute/LiteralResultIterationPlan.java |  6 ---
 .../org/apache/phoenix/execute/ScanPlan.java| 48 +++-
 .../phoenix/execute/SortMergeJoinPlan.java  |  6 ---
 .../org/apache/phoenix/execute/UnionPlan.java   |  9 
 .../phoenix/iterate/BaseResultIterators.java|  9 ++--
 .../apache/phoenix/iterate/SerialIterators.java |  8 
 .../apache/phoenix/jdbc/PhoenixStatement.java   |  5 --
 .../org/apache/phoenix/query/QueryServices.java |  3 +-
 .../phoenix/query/QueryServicesOptions.java |  2 +-
 .../query/ParallelIteratorsSplitTest.java   |  5 --
 15 files changed, 21 insertions(+), 102 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b19aba2b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
index e3025cc..b52e704 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/ListJarsQueryPlan.java
@@ -251,9 +251,4 @@ public class ListJarsQueryPlan implements QueryPlan {
public Operation getOperation() {
return stmt.getUpdateOperation();
}
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b19aba2b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
index f403e34..ea77d79 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/QueryPlan.java
@@ -86,6 +86,4 @@ public interface QueryPlan extends StatementPlan {
  * @throws SQLException 
  */
 public boolean useRoundRobinIterator() throws SQLException;
-
-public boolean isSerial();
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b19aba2b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
index ed11b46..5e0977b 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/TraceQueryPlan.java
@@ -259,9 +259,4 @@ public class TraceQueryPlan implements QueryPlan {
 public boolean useRoundRobinIterator() {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return true;
-}
 }
\ No newline at end of file

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b19aba2b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java 
b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
index c439618..136379d 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/AggregatePlan.java
@@ -265,9 +265,4 @@ public class AggregatePlan extends BaseQueryPlan {
 public boolean useRoundRobinIterator() throws SQLException {
 return false;
 }
-
-@Override
-public boolean isSerial() {
-return isSerial;
-}
 }

http://git-wip-us.apa