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

2016-09-23 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
[elserj] PHOENIX-3287 Retry starting KDC on BindException



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

Jenkins build is back to normal : Phoenix | Master #1419

2016-09-23 Thread Apache Jenkins Server 
See

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

2016-09-23 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-3327 Use same driver for all tests within a group



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

[2/3] phoenix git commit: PHOENIX-3287 Retry starting KDC on BindException

2016-09-23 Thread elserj 
PHOENIX-3287 Retry starting KDC on BindException

MiniKDC has a race-condition in its port-allocation.


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 42efa45e6c497557e05564a533aeb5ff96432c4b
Parents: dab3843
Author: Josh Elser 
Authored: Fri Sep 23 14:29:50 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 23 18:02:42 2016 -0400

--
 .../phoenix/jdbc/SecureUserConnectionsTest.java | 27 +++-
 1 file changed, 21 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/42efa45e/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
index a14e47b..4996f94 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
@@ -31,13 +31,14 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.minikdc.MiniKdc;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.util.KerberosName;
-import org.apache.hadoop.security.authentication.util.KerberosUtil;
 import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
 import org.apache.phoenix.query.ConfigurationFactory;
 import org.apache.phoenix.util.InstanceResolver;
@@ -54,6 +55,9 @@ import org.junit.Test;
  * collide and when they do not.
  */
 public class SecureUserConnectionsTest {
+private static final Log LOG = 
LogFactory.getLog(SecureUserConnectionsTest.class); 
+private static final int KDC_START_ATTEMPTS = 10;
+
 private static final File TEMP_DIR = new File(getClassTempDir());
 private static final File KEYTAB_DIR = new File(TEMP_DIR, "keytabs");
 private static final File KDC_DIR = new File(TEMP_DIR, "kdc");
@@ -68,11 +72,22 @@ public class SecureUserConnectionsTest {
 public static void setupKdc() throws Exception {
 ensureIsEmptyDirectory(KDC_DIR);
 ensureIsEmptyDirectory(KEYTAB_DIR);
-// Create and start the KDC
-Properties kdcConf = MiniKdc.createConf();
-kdcConf.put(MiniKdc.DEBUG, true);
-KDC = new MiniKdc(kdcConf, KDC_DIR);
-KDC.start();
+// Create and start the KDC. MiniKDC appears to have a race condition 
in how it does
+// port allocation (with apache-ds). See PHOENIX-3287.
+boolean started = false;
+for (int i = 0; !started && i < KDC_START_ATTEMPTS; i++) {
+Properties kdcConf = MiniKdc.createConf();
+kdcConf.put(MiniKdc.DEBUG, true);
+KDC = new MiniKdc(kdcConf, KDC_DIR);
+try {
+KDC.start();
+started = true;
+} catch (Exception e) {
+LOG.warn("PHOENIX-3287: Failed to start KDC, retrying..", e);
+}
+}
+assertTrue("The embedded KDC failed to start successfully after " + 
KDC_START_ATTEMPTS
++ " attempts.", started);
 
 createUsers(NUM_USERS);

[1/3] phoenix git commit: PHOENIX-3287 Retry starting KDC on BindException

2016-09-23 Thread elserj 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 ba132fe4c -> 591f3ce6e
  refs/heads/4.x-HBase-1.1 dab384345 -> 42efa45e6
  refs/heads/master fedbca8bf -> cb7234d3f


PHOENIX-3287 Retry starting KDC on BindException

MiniKDC has a race-condition in its port-allocation.


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

Branch: refs/heads/master
Commit: cb7234d3f09c49f21e9a58a990c0efb141ddf6c5
Parents: fedbca8
Author: Josh Elser 
Authored: Fri Sep 23 14:29:50 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 23 17:54:40 2016 -0400

--
 .../phoenix/jdbc/SecureUserConnectionsTest.java | 27 +++-
 1 file changed, 21 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/cb7234d3/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
index a14e47b..4996f94 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
@@ -31,13 +31,14 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.minikdc.MiniKdc;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.util.KerberosName;
-import org.apache.hadoop.security.authentication.util.KerberosUtil;
 import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
 import org.apache.phoenix.query.ConfigurationFactory;
 import org.apache.phoenix.util.InstanceResolver;
@@ -54,6 +55,9 @@ import org.junit.Test;
  * collide and when they do not.
  */
 public class SecureUserConnectionsTest {
+private static final Log LOG = 
LogFactory.getLog(SecureUserConnectionsTest.class); 
+private static final int KDC_START_ATTEMPTS = 10;
+
 private static final File TEMP_DIR = new File(getClassTempDir());
 private static final File KEYTAB_DIR = new File(TEMP_DIR, "keytabs");
 private static final File KDC_DIR = new File(TEMP_DIR, "kdc");
@@ -68,11 +72,22 @@ public class SecureUserConnectionsTest {
 public static void setupKdc() throws Exception {
 ensureIsEmptyDirectory(KDC_DIR);
 ensureIsEmptyDirectory(KEYTAB_DIR);
-// Create and start the KDC
-Properties kdcConf = MiniKdc.createConf();
-kdcConf.put(MiniKdc.DEBUG, true);
-KDC = new MiniKdc(kdcConf, KDC_DIR);
-KDC.start();
+// Create and start the KDC. MiniKDC appears to have a race condition 
in how it does
+// port allocation (with apache-ds). See PHOENIX-3287.
+boolean started = false;
+for (int i = 0; !started && i < KDC_START_ATTEMPTS; i++) {
+Properties kdcConf = MiniKdc.createConf();
+kdcConf.put(MiniKdc.DEBUG, true);
+KDC = new MiniKdc(kdcConf, KDC_DIR);
+try {
+KDC.start();
+started = true;
+} catch (Exception e) {
+LOG.warn("PHOENIX-3287: Failed to start KDC, retrying..", e);
+}
+}
+assertTrue("The embedded KDC failed to start successfully after " + 
KDC_START_ATTEMPTS
++ " attempts.", started);
 
 createUsers(NUM_USERS);

[3/3] phoenix git commit: PHOENIX-3287 Retry starting KDC on BindException

2016-09-23 Thread elserj 
PHOENIX-3287 Retry starting KDC on BindException

MiniKDC has a race-condition in its port-allocation.


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

Branch: refs/heads/4.x-HBase-0.98
Commit: 591f3ce6e55eb52c9b98770210f1b8977e644c9f
Parents: ba132fe
Author: Josh Elser 
Authored: Fri Sep 23 14:29:50 2016 -0400
Committer: Josh Elser 
Committed: Fri Sep 23 18:09:08 2016 -0400

--
 .../phoenix/jdbc/SecureUserConnectionsTest.java | 27 +++-
 1 file changed, 21 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/591f3ce6/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
index a14e47b..4996f94 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/SecureUserConnectionsTest.java
@@ -31,13 +31,14 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.CommonConfigurationKeys;
 import org.apache.hadoop.hbase.security.User;
 import org.apache.hadoop.minikdc.MiniKdc;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.apache.hadoop.security.authentication.util.KerberosName;
-import org.apache.hadoop.security.authentication.util.KerberosUtil;
 import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver.ConnectionInfo;
 import org.apache.phoenix.query.ConfigurationFactory;
 import org.apache.phoenix.util.InstanceResolver;
@@ -54,6 +55,9 @@ import org.junit.Test;
  * collide and when they do not.
  */
 public class SecureUserConnectionsTest {
+private static final Log LOG = 
LogFactory.getLog(SecureUserConnectionsTest.class); 
+private static final int KDC_START_ATTEMPTS = 10;
+
 private static final File TEMP_DIR = new File(getClassTempDir());
 private static final File KEYTAB_DIR = new File(TEMP_DIR, "keytabs");
 private static final File KDC_DIR = new File(TEMP_DIR, "kdc");
@@ -68,11 +72,22 @@ public class SecureUserConnectionsTest {
 public static void setupKdc() throws Exception {
 ensureIsEmptyDirectory(KDC_DIR);
 ensureIsEmptyDirectory(KEYTAB_DIR);
-// Create and start the KDC
-Properties kdcConf = MiniKdc.createConf();
-kdcConf.put(MiniKdc.DEBUG, true);
-KDC = new MiniKdc(kdcConf, KDC_DIR);
-KDC.start();
+// Create and start the KDC. MiniKDC appears to have a race condition 
in how it does
+// port allocation (with apache-ds). See PHOENIX-3287.
+boolean started = false;
+for (int i = 0; !started && i < KDC_START_ATTEMPTS; i++) {
+Properties kdcConf = MiniKdc.createConf();
+kdcConf.put(MiniKdc.DEBUG, true);
+KDC = new MiniKdc(kdcConf, KDC_DIR);
+try {
+KDC.start();
+started = true;
+} catch (Exception e) {
+LOG.warn("PHOENIX-3287: Failed to start KDC, retrying..", e);
+}
+}
+assertTrue("The embedded KDC failed to start successfully after " + 
KDC_START_ATTEMPTS
++ " attempts.", started);
 
 createUsers(NUM_USERS);

Build failed in Jenkins: Phoenix | Master #1418

2016-09-23 Thread Apache Jenkins Server 
See 

Changes:

[jamestaylor] PHOENIX-3327 Use same driver for all tests within a group

--
[...truncated 438 lines...]
Running org.apache.phoenix.util.csv.CsvUpsertExecutorTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.346 sec - in 
org.apache.phoenix.expression.GetSetByteBitFunctionTest
Running org.apache.phoenix.util.csv.StringToArrayConverterTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.285 sec - in 
org.apache.phoenix.expression.function.BuiltinFunctionConstructorTest
Running org.apache.phoenix.util.PrefixByteEncoderDecoderTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.011 sec - in 
org.apache.phoenix.util.PrefixByteEncoderDecoderTest
Running org.apache.phoenix.util.SequenceUtilTest
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.03 sec - in 
org.apache.phoenix.util.SequenceUtilTest
Running org.apache.phoenix.util.Base62EncoderTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.049 sec - in 
org.apache.phoenix.util.Base62EncoderTest
Running org.apache.phoenix.util.PhoenixEncodeDecodeTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.2 sec - in 
org.apache.phoenix.util.csv.StringToArrayConverterTest
Running org.apache.phoenix.util.ByteUtilTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.036 sec - in 
org.apache.phoenix.util.ByteUtilTest
Running org.apache.phoenix.util.DateUtilTest
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.02 sec - in 
org.apache.phoenix.util.DateUtilTest
Running org.apache.phoenix.util.PhoenixRuntimeTest
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.601 sec - in 
org.apache.phoenix.util.csv.CsvUpsertExecutorTest
Running org.apache.phoenix.util.ScanUtilTest
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.106 sec - in 
org.apache.phoenix.util.ScanUtilTest
Running org.apache.phoenix.util.TenantIdByteConversionTest
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.38 sec - in 
org.apache.phoenix.util.PhoenixRuntimeTest
Running org.apache.phoenix.util.JDBCUtilTest
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.util.JDBCUtilTest
Running org.apache.phoenix.util.ColumnInfoTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.004 sec - in 
org.apache.phoenix.util.ColumnInfoTest
Running org.apache.phoenix.util.LogUtilTest
Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.12 sec - in 
org.apache.phoenix.util.TenantIdByteConversionTest
Running org.apache.phoenix.util.LikeExpressionTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in 
org.apache.phoenix.util.LikeExpressionTest
Running org.apache.phoenix.util.PhoenixContextExecutorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.006 sec - in 
org.apache.phoenix.util.PhoenixContextExecutorTest
Running org.apache.phoenix.util.StringUtilTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.062 sec - in 
org.apache.phoenix.util.LogUtilTest
Running org.apache.phoenix.util.IndexUtilTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.009 sec - in 
org.apache.phoenix.util.StringUtilTest
Running org.apache.phoenix.util.json.JsonUpsertExecutorTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.005 sec - in 
org.apache.phoenix.util.IndexUtilTest
Running org.apache.phoenix.util.QueryUtilTest
Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.019 sec - in 
org.apache.phoenix.util.QueryUtilTest
Running org.apache.phoenix.util.MetaDataUtilTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.023 sec - in 
org.apache.phoenix.util.MetaDataUtilTest
Running org.apache.phoenix.util.PropertiesUtilTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.027 sec - in 
org.apache.phoenix.util.PropertiesUtilTest
Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.06 sec - in 
org.apache.phoenix.util.PhoenixEncodeDecodeTest
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.703 sec - in 
org.apache.phoenix.util.json.JsonUpsertExecutorTest

Results :

Tests run: 1403, Failures: 0, Errors: 0, Skipped: 6

[INFO] 
[INFO] --- maven-source-plugin:2.2.1:jar-no-fork (attach-sources) @ 
phoenix-core ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:test-jar (default) @ phoenix-core ---
[INFO] Building jar: 

[INFO] 
[INFO] --- maven-jar-plugin:2.4:jar (default-jar) @ phoenix-core ---
[INFO] Building jar:

Build failed in Jenkins: Phoenix-encode-columns #7

2016-09-23 Thread Apache Jenkins Server 
See 

Changes:

[samarth] Fix column qualifiers for StorageScheme.COLUMNS_STORED_IN_SINGLE_CELL.

--
[...truncated 799 lines...]
Running org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Running org.apache.phoenix.end2end.OctetLengthFunctionEnd2EndIT
Running org.apache.phoenix.end2end.NthValueFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.015 sec - in 
org.apache.phoenix.end2end.MinMaxAggregateFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.09 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.38 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.903 sec - in 
org.apache.phoenix.end2end.PowerFunctionEnd2EndIT
Running org.apache.phoenix.end2end.RTrimFunctionIT
Tests run: 26, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.948 sec - 
in org.apache.phoenix.end2end.ArithmeticQueryIT
Running org.apache.phoenix.end2end.ReadOnlyIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.041 sec - in 
org.apache.phoenix.end2end.RTrimFunctionIT
Running org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.337 sec - in 
org.apache.phoenix.end2end.NthValueFunctionIT
Running org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.063 sec - in 
org.apache.phoenix.end2end.RegexpSplitFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.225 sec - in 
org.apache.phoenix.end2end.ReadOnlyIT
Running org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.SerialIteratorsIT
Running org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.577 sec - in 
org.apache.phoenix.end2end.ReverseFunctionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.807 sec - in 
org.apache.phoenix.end2end.SerialIteratorsIT
Running org.apache.phoenix.end2end.ServerExceptionIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.685 sec - in 
org.apache.phoenix.end2end.ServerExceptionIT
Running org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Running org.apache.phoenix.end2end.SortOrderIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.678 sec - in 
org.apache.phoenix.end2end.SignFunctionEnd2EndIT
Tests run: 33, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.28 sec - in 
org.apache.phoenix.end2end.RoundFloorCeilFunctionsEnd2EndIT
Running org.apache.phoenix.end2end.StatementHintsIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.814 sec - in 
org.apache.phoenix.end2end.StatementHintsIT
Running org.apache.phoenix.end2end.StoreNullsIT
Running org.apache.phoenix.end2end.StringToArrayFunctionIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 23.079 sec - in 
org.apache.phoenix.end2end.QueryMoreIT
Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Tests run: 22, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.992 sec - in 
org.apache.phoenix.end2end.StringToArrayFunctionIT
Running org.apache.phoenix.end2end.ToCharFunctionIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.908 sec - in 
org.apache.phoenix.end2end.StoreNullsIT
Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.314 sec - in 
org.apache.phoenix.end2end.TimezoneOffsetFunctionIT
Running org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.index.AsyncIndexDisabledIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.507 sec - in 
org.apache.phoenix.end2end.index.AsyncIndexDisabledIT
Running org.apache.phoenix.end2end.salted.SaltedTableUpsertSelectIT
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.088 sec - in 
org.apache.phoenix.end2end.UpsertSelectAutoCommitIT
Running org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.685 sec - in 
org.apache.phoenix.end2end.salted.SaltedTableVarLengthRowKeyIT
Running org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.305 sec - in 
org.apache.phoenix.iterate.PhoenixQueryTimeoutIT
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.476 sec - 
in org.apache.phoenix.end2end.ToCharFunctionIT
Tests run: 5, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.877 sec - in 
org.apache.phoenix.end2end.DistinctPrefixFilterIT
Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.727 sec - in

[1/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 26109c4fa -> ba132fe4c


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba132fe4/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 0302286..8c07ca6 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -37,6 +37,7 @@ import static 
org.apache.phoenix.query.QueryServices.GLOBAL_METRICS_ENABLED;
 import static 
org.apache.phoenix.query.QueryServices.GROUPBY_MAX_CACHE_SIZE_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.GROUPBY_SPILLABLE_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.GROUPBY_SPILL_FILES_ATTRIB;
+import static 
org.apache.phoenix.query.QueryServices.HBASE_CLIENT_SCANNER_TIMEOUT_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.IMMUTABLE_ROWS_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.INDEX_MUTATE_BATCH_SIZE_THRESHOLD_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.INDEX_POPULATION_SLEEP_TIME;
@@ -59,7 +60,6 @@ import static 
org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.NUM_RETRIES_FOR_SCHEMA_UPDATE_CHECK;
 import static org.apache.phoenix.query.QueryServices.QUEUE_SIZE_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.REGIONSERVER_INFO_PORT_ATTRIB;
-import static 
org.apache.phoenix.query.QueryServices.HBASE_CLIENT_SCANNER_TIMEOUT_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.RENEW_LEASE_ENABLED;
 import static 
org.apache.phoenix.query.QueryServices.RENEW_LEASE_THREAD_POOL_SIZE;
 import static 
org.apache.phoenix.query.QueryServices.RENEW_LEASE_THRESHOLD_MILLISECONDS;
@@ -78,6 +78,7 @@ import static 
org.apache.phoenix.query.QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB
 import static 
org.apache.phoenix.query.QueryServices.STATS_USE_CURRENT_TIME_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.THREAD_POOL_SIZE_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.THREAD_TIMEOUT_MS_ATTRIB;
+import static org.apache.phoenix.query.QueryServices.TRANSACTIONS_ENABLED;
 import static 
org.apache.phoenix.query.QueryServices.USE_BYTE_BASED_REGEX_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.USE_INDEXES_ATTRIB;
 
@@ -594,6 +595,11 @@ public class QueryServicesOptions {
 return this;
 }
 
+public QueryServicesOptions setTransactionsEnabled(boolean 
transactionsEnabled) {
+config.setBoolean(TRANSACTIONS_ENABLED, transactionsEnabled);
+return this;
+}
+
 public QueryServicesOptions setExplainRowCount(boolean showRowCount) {
 config.setBoolean(EXPLAIN_ROW_COUNT_ATTRIB, showRowCount);
 return this;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba132fe4/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index 74b3132..ff0b6aa 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -383,7 +383,7 @@ public final class QueryUtil {
 HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
 String url = getUrl(server, port, znodeParent, principal);
 // Mainly for testing to tack on the test=true part to ensure driver 
is found on server
-String extraArgs = conf.get(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+String extraArgs = 
props.getProperty(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
conf.get(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS));
 if (extraArgs.length() > 0) {
 url += extraArgs + PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR;
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba132fe4/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
index fde70d0..4ab75a9 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
@@ -34,6 +34,7 @@ import org.apache.phoenix.query.QueryServices;
 import

[2/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba132fe4/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 0b5a92d..2445948 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -34,7 +34,6 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
 
@@ -50,18 +49,14 @@ import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
-import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.collect.Maps;
-
 @RunWith(Parameterized.class)
 public class StatsCollectorIT extends ParallelStatsEnabledIT {
 private final String tableDDLOptions;
@@ -69,23 +64,18 @@ public class StatsCollectorIT extends 
ParallelStatsEnabledIT {
 private String schemaName;
 private String fullTableName;
 
-@BeforeClass
-@Shadower(classBeingShadowed = ParallelStatsEnabledIT.class)
-public static void doSetup() throws Exception {
-Map props = Maps.newHashMapWithExpectedSize(10);
-// Must update config before starting server
-props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20));
-props.put(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, 
Boolean.TRUE.toString());
-props.put(QueryServices.EXPLAIN_ROW_COUNT_ATTRIB, 
Boolean.TRUE.toString());
-props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));
-props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, 
Long.toString(Long.MAX_VALUE));
-setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
-}
-
 public StatsCollectorIT( boolean transactional) {
 this.tableDDLOptions= transactional ? " TRANSACTIONAL=true" : "";
 }
 
+private static Connection getConnection() throws SQLException {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, 
Boolean.TRUE.toString());
+props.setProperty(QueryServices.EXPLAIN_ROW_COUNT_ATTRIB, 
Boolean.TRUE.toString());
+props.setProperty(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, 
Long.toString(Long.MAX_VALUE));
+return DriverManager.getConnection(getUrl(), props);
+}
+
 @Before
 public void generateTableNames() {
 schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
@@ -100,9 +90,7 @@ public class StatsCollectorIT extends ParallelStatsEnabledIT 
{
 
 @Test
 public void testUpdateEmptyStats() throws Exception {
-Connection conn;
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-conn = DriverManager.getConnection(getUrl(), props);
+Connection conn = getConnection();
 conn.setAutoCommit(true);
 conn.createStatement().execute(
 "CREATE TABLE " + fullTableName +" ( k CHAR(1) PRIMARY KEY )"  
+ tableDDLOptions);
@@ -118,9 +106,7 @@ public class StatsCollectorIT extends 
ParallelStatsEnabledIT {
 
 @Test
 public void testSomeUpdateEmptyStats() throws Exception {
-Connection conn;
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-conn = DriverManager.getConnection(getUrl(), props);
+Connection conn = getConnection();
 conn.setAutoCommit(true);
 conn.createStatement().execute(
 "CREATE TABLE " + fullTableName +" ( k VARCHAR PRIMARY KEY, 
a.v1 VARCHAR, b.v2 VARCHAR ) " + tableDDLOptions + (tableDDLOptions.isEmpty() ? 
"" : ",") + "SALT_BUCKETS = 3");
@@ -158,7 +144,7 @@ public class StatsCollectorIT extends 
ParallelStatsEnabledIT {
 PreparedStatement stmt;
 ResultSet rs;
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-conn = DriverManager.getConnection(getUrl(), props);
+conn = getConnection();
 conn.createStatement().execute(
 "CREATE TABLE " + fullTableName +" ( k VARCHAR, a_string_array 
VARCHAR(100) ARRAY[4], b_string_array VARCHAR(100) ARRAY[4] \n"
 + " CONSTRAINT pk PRIMARY KEY (k, b_string_array 
DESC))"
@@ -178,9 +164,6 @@ public class

[3/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
PHOENIX-3327 Use same driver for all tests within a group


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

Branch: refs/heads/4.x-HBase-0.98
Commit: ba132fe4c0015ea5e043d4fd0b49c9d39961cf37
Parents: 26109c4
Author: James Taylor 
Authored: Fri Sep 23 13:13:41 2016 -0700
Committer: James Taylor 
Committed: Fri Sep 23 13:23:46 2016 -0700

--
 .../StatisticsCollectionRunTrackerIT.java   | 15 
 .../apache/phoenix/end2end/AlterTableIT.java|  9 +-
 .../phoenix/end2end/AlterTableWithViewsIT.java  | 14 
 .../phoenix/end2end/ArrayFillFunctionIT.java| 66 ---
 .../apache/phoenix/end2end/BaseParallelIT.java  | 69 
 .../org/apache/phoenix/end2end/BaseViewIT.java  | 15 
 .../phoenix/end2end/CbrtFunctionEnd2EndIT.java  | 27 +++---
 .../phoenix/end2end/DisableLocalIndexIT.java| 24 ++
 .../phoenix/end2end/DistinctPrefixFilterIT.java | 24 +++---
 .../apache/phoenix/end2end/DynamicColumnIT.java | 19 +++--
 .../end2end/GetSetByteBitFunctionEnd2EndIT.java |  8 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  | 16 
 .../phoenix/end2end/InMemoryOrderByIT.java  | 42 --
 .../apache/phoenix/end2end/IndexExtendedIT.java |  4 +-
 .../phoenix/end2end/LikeExpressionIT.java   | 16 ++--
 .../end2end/ParallelStatsDisabledIT.java| 14 +++-
 .../phoenix/end2end/ParallelStatsEnabledIT.java | 12 +--
 .../phoenix/end2end/PowerFunctionEnd2EndIT.java | 19 +++--
 .../phoenix/end2end/QueryWithOffsetIT.java  | 14 
 .../phoenix/end2end/SerialIteratorsIT.java  | 19 ++---
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  | 27 +++---
 .../end2end/SkipScanAfterManualSplitIT.java | 33 +++-
 .../phoenix/end2end/SortMergeJoinMoreIT.java| 16 
 .../phoenix/end2end/SpooledOrderByIT.java   | 40 -
 .../phoenix/end2end/SpooledSortMergeJoinIT.java | 44 --
 .../phoenix/end2end/SpooledTmpFileDeleteIT.java | 62 +++---
 .../phoenix/end2end/StatsCollectorIT.java   | 61 --
 .../end2end/StringToArrayFunctionIT.java| 87 +++-
 .../phoenix/end2end/TransactionalViewIT.java| 15 
 .../end2end/index/AsyncIndexDisabledIT.java | 13 ---
 .../phoenix/end2end/index/DropMetadataIT.java   | 50 +--
 .../index/GlobalIndexOptimizationIT.java| 20 +
 .../apache/phoenix/end2end/index/IndexIT.java   | 15 
 .../phoenix/end2end/index/LocalIndexIT.java |  2 +-
 .../end2end/index/MutableIndexFailureIT.java|  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   | 55 +
 .../phoenix/end2end/index/SaltedIndexIT.java| 31 +++
 .../phoenix/end2end/index/ViewIndexIT.java  |  2 +-
 .../end2end/index/txn/MutableRollbackIT.java| 34 +++-
 .../phoenix/end2end/index/txn/RollbackIT.java   | 25 ++
 .../phoenix/iterate/PhoenixQueryTimeoutIT.java  | 52 ++--
 .../iterate/RoundRobinResultIteratorIT.java | 38 -
 .../org/apache/phoenix/rpc/UpdateCacheIT.java   | 15 
 .../phoenix/tx/NotThreadSafeTransactionIT.java  | 62 ++
 .../org/apache/phoenix/tx/TransactionIT.java| 54 
 .../org/apache/phoenix/tx/TxCheckpointIT.java   | 29 +++
 .../phoenix/query/QueryServicesOptions.java |  8 +-
 .../java/org/apache/phoenix/util/QueryUtil.java |  2 +-
 .../apache/phoenix/jdbc/PhoenixDriverTest.java  |  2 +
 .../java/org/apache/phoenix/query/BaseTest.java |  4 +-
 .../phoenix/query/QueryServicesTestImpl.java|  2 +
 51 files changed, 454 insertions(+), 894 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba132fe4/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index 33d473d..05ef9bd 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -26,7 +26,6 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -34,33 +33,19 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 import org.apache.hadoop.hbase.util.Bytes;
 import

[1/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 44e43d7c2 -> dab384345


http://git-wip-us.apache.org/repos/asf/phoenix/blob/dab38434/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
--
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
index 21ea072..14bcd70 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TxCheckpointIT.java
@@ -30,26 +30,20 @@ import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.Arrays;
 import java.util.Collection;
-import java.util.Map;
 import java.util.Properties;
 
 import org.apache.phoenix.end2end.ParallelStatsDisabledIT;
-import org.apache.phoenix.end2end.Shadower;
 import org.apache.phoenix.execute.MutationState;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PropertiesUtil;
-import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.tephra.Transaction.VisibilityLevel;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.collect.Maps;
-
 @RunWith(Parameterized.class)
 public class TxCheckpointIT extends ParallelStatsDisabledIT {

@@ -62,13 +56,14 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT 
{
 
}

-   @BeforeClass
-@Shadower(classBeingShadowed = ParallelStatsDisabledIT.class)
-public static void doSetup() throws Exception {
-Map props = Maps.newHashMapWithExpectedSize(2);
-props.put(QueryServices.DEFAULT_TABLE_ISTRANSACTIONAL_ATTRIB, 
Boolean.toString(true));
-props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));
-setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
+private static Connection getConnection() throws SQLException {
+return getConnection(PropertiesUtil.deepCopy(TEST_PROPERTIES));
+}
+
+private static Connection getConnection(Properties props) throws 
SQLException {
+props.setProperty(QueryServices.DEFAULT_TABLE_ISTRANSACTIONAL_ATTRIB, 
Boolean.toString(true));
+Connection conn = DriverManager.getConnection(getUrl(), props);
+return conn;
 }

@Parameters(name="TxCheckpointIT_localIndex={0},mutable={1}") // name 
is used by failsafe as file name in reports
@@ -88,7 +83,7 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT {
 props.setProperty(QueryServices.MUTATE_BATCH_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_CACHE_SIZE_ATTRIB, 
Integer.toString(3));
 props.setProperty(QueryServices.SCAN_RESULT_CHUNK_SIZE, 
Integer.toString(3));
-Connection conn = DriverManager.getConnection(getUrl(), props);
+Connection conn = getConnection(props);
 conn.setAutoCommit(true);
 conn.createStatement().execute("CREATE SEQUENCE "+seqName);
 conn.createStatement().execute("CREATE TABLE " + fullTableName + "(pk 
INTEGER PRIMARY KEY, val INTEGER)"+(!mutable? " IMMUTABLE_ROWS=true" : ""));
@@ -123,7 +118,7 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT 
{
 
 private void testRollbackOfUncommittedDelete(String indexDDL, String 
fullTableName) throws Exception {
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-Connection conn = DriverManager.getConnection(getUrl(), props);
+Connection conn = getConnection();
 conn.setAutoCommit(false);
 try {
 Statement stmt = conn.createStatement();
@@ -212,7 +207,7 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT 
{
 String indexName = "IDX_" + generateUniqueName();
 String fullTableName = SchemaUtil.getTableName(tableName, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-   try (Connection conn = DriverManager.getConnection(getUrl(), 
props);) {
+   try (Connection conn = getConnection()) {
conn.setAutoCommit(false);
Statement stmt = conn.createStatement();
 
@@ -303,7 +298,7 @@ public class TxCheckpointIT extends ParallelStatsDisabledIT 
{
 String fullTableName = SchemaUtil.getTableName(tableName, tableName);
Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
ResultSet rs;
-   try (Connection conn = DriverManager.getConnection(getUrl(), 
props);) {
+   try (Connection conn = getConnection()) {
conn.setAutoCommit(false);

[3/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
PHOENIX-3327 Use same driver for all tests within a group


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

Branch: refs/heads/4.x-HBase-1.1
Commit: dab3843459c9227dd2945047d5220a0b7b632d32
Parents: 44e43d7
Author: James Taylor 
Authored: Fri Sep 23 13:13:41 2016 -0700
Committer: James Taylor 
Committed: Fri Sep 23 13:21:19 2016 -0700

--
 .../StatisticsCollectionRunTrackerIT.java   | 15 
 .../apache/phoenix/end2end/AlterSessionIT.java  | 59 ++---
 .../apache/phoenix/end2end/AlterTableIT.java|  9 +-
 .../phoenix/end2end/AlterTableWithViewsIT.java  | 14 
 .../phoenix/end2end/ArrayFillFunctionIT.java| 66 ---
 .../apache/phoenix/end2end/BaseParallelIT.java  | 69 
 .../org/apache/phoenix/end2end/BaseViewIT.java  | 15 
 .../phoenix/end2end/CbrtFunctionEnd2EndIT.java  | 27 +++---
 .../phoenix/end2end/DisableLocalIndexIT.java| 24 ++
 .../phoenix/end2end/DistinctPrefixFilterIT.java | 24 +++---
 .../apache/phoenix/end2end/DynamicColumnIT.java | 19 +++--
 .../end2end/GetSetByteBitFunctionEnd2EndIT.java |  8 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  | 16 
 .../phoenix/end2end/InMemoryOrderByIT.java  | 42 --
 .../apache/phoenix/end2end/IndexExtendedIT.java |  4 +-
 .../phoenix/end2end/LikeExpressionIT.java   | 16 ++--
 .../end2end/ParallelStatsDisabledIT.java| 14 +++-
 .../phoenix/end2end/ParallelStatsEnabledIT.java | 12 +--
 .../phoenix/end2end/PowerFunctionEnd2EndIT.java | 19 +++--
 .../phoenix/end2end/QueryWithOffsetIT.java  | 14 
 .../phoenix/end2end/SerialIteratorsIT.java  | 19 ++---
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  | 27 +++---
 .../end2end/SkipScanAfterManualSplitIT.java | 33 +++-
 .../phoenix/end2end/SortMergeJoinMoreIT.java| 16 
 .../phoenix/end2end/SpooledOrderByIT.java   | 40 -
 .../phoenix/end2end/SpooledSortMergeJoinIT.java | 45 --
 .../phoenix/end2end/SpooledTmpFileDeleteIT.java | 62 +++---
 .../phoenix/end2end/StatsCollectorIT.java   | 61 --
 .../end2end/StringToArrayFunctionIT.java| 87 +++-
 .../phoenix/end2end/TransactionalViewIT.java| 15 
 .../end2end/index/AsyncIndexDisabledIT.java | 13 ---
 .../phoenix/end2end/index/DropMetadataIT.java   | 50 +--
 .../index/GlobalIndexOptimizationIT.java| 20 +
 .../apache/phoenix/end2end/index/IndexIT.java   | 15 
 .../phoenix/end2end/index/LocalIndexIT.java |  2 +-
 .../end2end/index/MutableIndexFailureIT.java|  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   | 55 +
 .../phoenix/end2end/index/SaltedIndexIT.java| 31 +++
 .../phoenix/end2end/index/ViewIndexIT.java  |  2 +-
 .../end2end/index/txn/MutableRollbackIT.java| 34 +++-
 .../phoenix/end2end/index/txn/RollbackIT.java   | 25 ++
 .../phoenix/iterate/PhoenixQueryTimeoutIT.java  | 52 ++--
 .../iterate/RoundRobinResultIteratorIT.java | 38 -
 .../org/apache/phoenix/rpc/UpdateCacheIT.java   | 15 
 .../phoenix/tx/NotThreadSafeTransactionIT.java  | 62 ++
 .../org/apache/phoenix/tx/TransactionIT.java| 54 
 .../org/apache/phoenix/tx/TxCheckpointIT.java   | 29 +++
 .../phoenix/query/QueryServicesOptions.java |  8 +-
 .../java/org/apache/phoenix/util/QueryUtil.java |  2 +-
 .../apache/phoenix/jdbc/PhoenixDriverTest.java  |  2 +
 .../java/org/apache/phoenix/query/BaseTest.java |  4 +-
 .../phoenix/query/QueryServicesTestImpl.java|  2 +
 52 files changed, 481 insertions(+), 927 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/dab38434/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index 759ad4f..cf475f9 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -26,7 +26,6 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -35,33 +34,19 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;

[2/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
http://git-wip-us.apache.org/repos/asf/phoenix/blob/fedbca8b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
index 0b5a92d..2445948 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java
@@ -34,7 +34,6 @@ import java.sql.SQLException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.List;
-import java.util.Map;
 import java.util.Properties;
 import java.util.Random;
 
@@ -50,18 +49,14 @@ import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.query.QueryServicesOptions;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
-import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 
-import com.google.common.collect.Maps;
-
 @RunWith(Parameterized.class)
 public class StatsCollectorIT extends ParallelStatsEnabledIT {
 private final String tableDDLOptions;
@@ -69,23 +64,18 @@ public class StatsCollectorIT extends 
ParallelStatsEnabledIT {
 private String schemaName;
 private String fullTableName;
 
-@BeforeClass
-@Shadower(classBeingShadowed = ParallelStatsEnabledIT.class)
-public static void doSetup() throws Exception {
-Map props = Maps.newHashMapWithExpectedSize(10);
-// Must update config before starting server
-props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, 
Long.toString(20));
-props.put(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, 
Boolean.TRUE.toString());
-props.put(QueryServices.EXPLAIN_ROW_COUNT_ATTRIB, 
Boolean.TRUE.toString());
-props.put(QueryServices.TRANSACTIONS_ENABLED, Boolean.toString(true));
-props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, 
Long.toString(Long.MAX_VALUE));
-setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator()));
-}
-
 public StatsCollectorIT( boolean transactional) {
 this.tableDDLOptions= transactional ? " TRANSACTIONAL=true" : "";
 }
 
+private static Connection getConnection() throws SQLException {
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
+props.setProperty(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, 
Boolean.TRUE.toString());
+props.setProperty(QueryServices.EXPLAIN_ROW_COUNT_ATTRIB, 
Boolean.TRUE.toString());
+props.setProperty(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, 
Long.toString(Long.MAX_VALUE));
+return DriverManager.getConnection(getUrl(), props);
+}
+
 @Before
 public void generateTableNames() {
 schemaName = TestUtil.DEFAULT_SCHEMA_NAME;
@@ -100,9 +90,7 @@ public class StatsCollectorIT extends ParallelStatsEnabledIT 
{
 
 @Test
 public void testUpdateEmptyStats() throws Exception {
-Connection conn;
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-conn = DriverManager.getConnection(getUrl(), props);
+Connection conn = getConnection();
 conn.setAutoCommit(true);
 conn.createStatement().execute(
 "CREATE TABLE " + fullTableName +" ( k CHAR(1) PRIMARY KEY )"  
+ tableDDLOptions);
@@ -118,9 +106,7 @@ public class StatsCollectorIT extends 
ParallelStatsEnabledIT {
 
 @Test
 public void testSomeUpdateEmptyStats() throws Exception {
-Connection conn;
-Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-conn = DriverManager.getConnection(getUrl(), props);
+Connection conn = getConnection();
 conn.setAutoCommit(true);
 conn.createStatement().execute(
 "CREATE TABLE " + fullTableName +" ( k VARCHAR PRIMARY KEY, 
a.v1 VARCHAR, b.v2 VARCHAR ) " + tableDDLOptions + (tableDDLOptions.isEmpty() ? 
"" : ",") + "SALT_BUCKETS = 3");
@@ -158,7 +144,7 @@ public class StatsCollectorIT extends 
ParallelStatsEnabledIT {
 PreparedStatement stmt;
 ResultSet rs;
 Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
-conn = DriverManager.getConnection(getUrl(), props);
+conn = getConnection();
 conn.createStatement().execute(
 "CREATE TABLE " + fullTableName +" ( k VARCHAR, a_string_array 
VARCHAR(100) ARRAY[4], b_string_array VARCHAR(100) ARRAY[4] \n"
 + " CONSTRAINT pk PRIMARY KEY (k, b_string_array 
DESC))"
@@ -178,9 +164,6 @@ public class

[3/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
PHOENIX-3327 Use same driver for all tests within a group


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

Branch: refs/heads/master
Commit: fedbca8bf090baccaaed5d555daeba2ba9da5f32
Parents: bebb5ce
Author: James Taylor 
Authored: Fri Sep 23 13:13:41 2016 -0700
Committer: James Taylor 
Committed: Fri Sep 23 13:13:41 2016 -0700

--
 .../StatisticsCollectionRunTrackerIT.java   | 15 
 .../apache/phoenix/end2end/AlterSessionIT.java  | 59 ++---
 .../apache/phoenix/end2end/AlterTableIT.java|  9 +-
 .../phoenix/end2end/AlterTableWithViewsIT.java  | 14 
 .../phoenix/end2end/ArrayFillFunctionIT.java| 66 ---
 .../apache/phoenix/end2end/BaseParallelIT.java  | 69 
 .../org/apache/phoenix/end2end/BaseViewIT.java  | 15 
 .../phoenix/end2end/CbrtFunctionEnd2EndIT.java  | 27 +++---
 .../phoenix/end2end/DisableLocalIndexIT.java| 24 ++
 .../phoenix/end2end/DistinctPrefixFilterIT.java | 24 +++---
 .../apache/phoenix/end2end/DynamicColumnIT.java | 19 +++--
 .../end2end/GetSetByteBitFunctionEnd2EndIT.java |  8 +-
 .../apache/phoenix/end2end/HashJoinMoreIT.java  | 16 
 .../phoenix/end2end/InMemoryOrderByIT.java  | 42 --
 .../apache/phoenix/end2end/IndexExtendedIT.java |  4 +-
 .../phoenix/end2end/LikeExpressionIT.java   | 16 ++--
 .../end2end/ParallelStatsDisabledIT.java| 14 +++-
 .../phoenix/end2end/ParallelStatsEnabledIT.java | 12 +--
 .../phoenix/end2end/PowerFunctionEnd2EndIT.java | 19 +++--
 .../phoenix/end2end/QueryWithOffsetIT.java  | 14 
 .../phoenix/end2end/SerialIteratorsIT.java  | 19 ++---
 .../phoenix/end2end/SignFunctionEnd2EndIT.java  | 27 +++---
 .../end2end/SkipScanAfterManualSplitIT.java | 33 +++-
 .../phoenix/end2end/SortMergeJoinMoreIT.java| 16 
 .../phoenix/end2end/SpooledOrderByIT.java   | 40 -
 .../phoenix/end2end/SpooledSortMergeJoinIT.java | 45 --
 .../phoenix/end2end/SpooledTmpFileDeleteIT.java | 62 +++---
 .../phoenix/end2end/StatsCollectorIT.java   | 61 --
 .../end2end/StringToArrayFunctionIT.java| 87 +++-
 .../phoenix/end2end/TransactionalViewIT.java| 15 
 .../end2end/index/AsyncIndexDisabledIT.java | 13 ---
 .../phoenix/end2end/index/DropMetadataIT.java   | 50 +--
 .../index/GlobalIndexOptimizationIT.java| 20 +
 .../apache/phoenix/end2end/index/IndexIT.java   | 15 
 .../phoenix/end2end/index/LocalIndexIT.java |  2 +-
 .../end2end/index/MutableIndexFailureIT.java|  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   | 55 +
 .../phoenix/end2end/index/SaltedIndexIT.java| 31 +++
 .../phoenix/end2end/index/ViewIndexIT.java  |  2 +-
 .../end2end/index/txn/MutableRollbackIT.java| 34 +++-
 .../phoenix/end2end/index/txn/RollbackIT.java   | 25 ++
 .../phoenix/iterate/PhoenixQueryTimeoutIT.java  | 52 ++--
 .../iterate/RoundRobinResultIteratorIT.java | 38 -
 .../org/apache/phoenix/rpc/UpdateCacheIT.java   | 15 
 .../phoenix/tx/NotThreadSafeTransactionIT.java  | 62 ++
 .../org/apache/phoenix/tx/TransactionIT.java| 54 
 .../org/apache/phoenix/tx/TxCheckpointIT.java   | 29 +++
 .../phoenix/query/QueryServicesOptions.java |  8 +-
 .../java/org/apache/phoenix/util/QueryUtil.java |  2 +-
 .../apache/phoenix/jdbc/PhoenixDriverTest.java  |  2 +
 .../java/org/apache/phoenix/query/BaseTest.java |  4 +-
 .../phoenix/query/QueryServicesTestImpl.java|  2 +
 52 files changed, 481 insertions(+), 927 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fedbca8b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
index 759ad4f..cf475f9 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/coprocessor/StatisticsCollectionRunTrackerIT.java
@@ -26,7 +26,6 @@ import java.sql.Connection;
 import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.util.List;
-import java.util.Map;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.HRegionInfo;
@@ -35,33 +34,19 @@ import org.apache.hadoop.hbase.client.HBaseAdmin;
 import

[1/3] phoenix git commit: PHOENIX-3327 Use same driver for all tests within a group

2016-09-23 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master bebb5cedf -> fedbca8bf


http://git-wip-us.apache.org/repos/asf/phoenix/blob/fedbca8b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 9b87361..ef3ac39 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -37,6 +37,7 @@ import static 
org.apache.phoenix.query.QueryServices.GLOBAL_METRICS_ENABLED;
 import static 
org.apache.phoenix.query.QueryServices.GROUPBY_MAX_CACHE_SIZE_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.GROUPBY_SPILLABLE_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.GROUPBY_SPILL_FILES_ATTRIB;
+import static 
org.apache.phoenix.query.QueryServices.HBASE_CLIENT_SCANNER_TIMEOUT_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.IMMUTABLE_ROWS_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.INDEX_MUTATE_BATCH_SIZE_THRESHOLD_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.INDEX_POPULATION_SLEEP_TIME;
@@ -59,7 +60,6 @@ import static 
org.apache.phoenix.query.QueryServices.MUTATE_BATCH_SIZE_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.NUM_RETRIES_FOR_SCHEMA_UPDATE_CHECK;
 import static org.apache.phoenix.query.QueryServices.QUEUE_SIZE_ATTRIB;
 import static 
org.apache.phoenix.query.QueryServices.REGIONSERVER_INFO_PORT_ATTRIB;
-import static 
org.apache.phoenix.query.QueryServices.HBASE_CLIENT_SCANNER_TIMEOUT_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.RENEW_LEASE_ENABLED;
 import static 
org.apache.phoenix.query.QueryServices.RENEW_LEASE_THREAD_POOL_SIZE;
 import static 
org.apache.phoenix.query.QueryServices.RENEW_LEASE_THRESHOLD_MILLISECONDS;
@@ -78,6 +78,7 @@ import static 
org.apache.phoenix.query.QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB
 import static 
org.apache.phoenix.query.QueryServices.STATS_USE_CURRENT_TIME_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.THREAD_POOL_SIZE_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.THREAD_TIMEOUT_MS_ATTRIB;
+import static org.apache.phoenix.query.QueryServices.TRANSACTIONS_ENABLED;
 import static 
org.apache.phoenix.query.QueryServices.USE_BYTE_BASED_REGEX_ATTRIB;
 import static org.apache.phoenix.query.QueryServices.USE_INDEXES_ATTRIB;
 
@@ -598,6 +599,11 @@ public class QueryServicesOptions {
 return this;
 }
 
+public QueryServicesOptions setTransactionsEnabled(boolean 
transactionsEnabled) {
+config.setBoolean(TRANSACTIONS_ENABLED, transactionsEnabled);
+return this;
+}
+
 public QueryServicesOptions setExplainRowCount(boolean showRowCount) {
 config.setBoolean(EXPLAIN_ROW_COUNT_ATTRIB, showRowCount);
 return this;

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fedbca8b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
--
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java 
b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
index bab52a4..58fb151 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/util/QueryUtil.java
@@ -382,7 +382,7 @@ public final class QueryUtil {
 HConstants.DEFAULT_ZOOKEEPER_ZNODE_PARENT);
 String url = getUrl(server, port, znodeParent, principal);
 // Mainly for testing to tack on the test=true part to ensure driver 
is found on server
-String extraArgs = conf.get(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS);
+String extraArgs = 
props.getProperty(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
conf.get(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, 
QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS));
 if (extraArgs.length() > 0) {
 url += extraArgs + PhoenixRuntime.JDBC_PROTOCOL_TERMINATOR;
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/fedbca8b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
index fde70d0..4ab75a9 100644
--- a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixDriverTest.java
@@ -34,6 +34,7 @@ import org.apache.phoenix.query.QueryServices;
 import

phoenix git commit: Fix column qualifiers for StorageScheme.COLUMNS_STORED_IN_SINGLE_CELL. Enable encoded column qualifiers for joins. Bring back qualifier counter per column family. Please enter the

2016-09-23 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/encodecolumns 29dbf051c -> aaecd5a4d


Fix column qualifiers for StorageScheme.COLUMNS_STORED_IN_SINGLE_CELL.
Enable encoded column qualifiers for joins.
Bring back qualifier counter per column family.
 Please enter the commit message for your changes. Lines starting


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

Branch: refs/heads/encodecolumns
Commit: aaecd5a4d9c12bcaad2d278b79a87e4ddc888671
Parents: 29dbf05
Author: Samarth 
Authored: Fri Sep 23 10:29:02 2016 -0700
Committer: Samarth 
Committed: Fri Sep 23 10:29:02 2016 -0700

--
 .../phoenix/compile/TupleProjectionCompiler.java   | 17 -
 .../phoenix/expression/ArrayColumnExpression.java  |  8 +---
 .../org/apache/phoenix/schema/MetaDataClient.java  |  9 -
 .../java/org/apache/phoenix/schema/PTable.java | 15 +++
 .../java/org/apache/phoenix/schema/PTableImpl.java |  2 +-
 .../tuple/EncodedColumnQualiferCellsList.java  |  4 ++--
 .../java/org/apache/phoenix/util/ScanUtil.java |  2 +-
 .../apache/phoenix/execute/CorrelatePlanTest.java  |  4 +++-
 .../execute/LiteralResultIteratorPlanTest.java |  4 +++-
 9 files changed, 38 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/aaecd5a4/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
index 3898969..9f7de36 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/compile/TupleProjectionCompiler.java
@@ -26,7 +26,6 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import org.apache.hadoop.hbase.util.Bytes;
 import org.apache.phoenix.parse.AliasedNode;
 import org.apache.phoenix.parse.ColumnParseNode;
 import org.apache.phoenix.parse.FamilyWildcardParseNode;
@@ -168,8 +167,6 @@ public class TupleProjectionCompiler {
 boolean hasSaltingColumn = retainPKColumns && table.getBucketNum() != 
null;
 List projectedColumns = new ArrayList();
 int position = hasSaltingColumn ? 1 : 0;
-EncodedCQCounter cqCounter = null;
-String valueColFamilyName = Bytes.toString(VALUE_COLUMN_FAMILY);
 for (int i = position; i < sourceColumnRefs.size(); i++) {
 ColumnRef sourceColumnRef = sourceColumnRefs.get(i);
 PColumn sourceColumn = sourceColumnRef.getColumn();
@@ -182,18 +179,12 @@ public class TupleProjectionCompiler {
 retainPKColumns && SchemaUtil.isPKColumn(sourceColumn) ? 
 null : PNameFactory.newName(VALUE_COLUMN_FAMILY), 
 position++, sourceColumn.isNullable(), sourceColumnRef);
-if (EncodedColumnsUtil.hasEncodedColumnName(sourceColumn)) {
-if (cqCounter == null) {
-cqCounter = new EncodedCQCounter();
-} else {
-cqCounter.increment(valueColFamilyName);
-}
-}
 projectedColumns.add(column);
 }
-StorageScheme storageScheme = StorageScheme.NON_ENCODED_COLUMN_NAMES;
-if (cqCounter != null) {
-storageScheme = StorageScheme.ENCODED_COLUMN_NAMES;
+StorageScheme storageScheme = table.getStorageScheme();
+EncodedCQCounter cqCounter = EncodedCQCounter.NULL_COUNTER;
+if (storageScheme != StorageScheme.NON_ENCODED_COLUMN_NAMES) {
+cqCounter = EncodedCQCounter.copy(table.getEncodedCQCounter());
 }
 return PTableImpl.makePTable(table.getTenantId(), 
PROJECTED_TABLE_SCHEMA, table.getName(), PTableType.PROJECTED,
 null, table.getTimeStamp(), table.getSequenceNumber(), 
table.getPKName(),

http://git-wip-us.apache.org/repos/asf/phoenix/blob/aaecd5a4/phoenix-core/src/main/java/org/apache/phoenix/expression/ArrayColumnExpression.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/ArrayColumnExpression.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/expression/ArrayColumnExpression.java
index aaa9f75..7310e59 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/expression/ArrayColumnExpression.java
+++

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

2016-09-23 Thread Apache Jenkins Server 
See 

--
Started by timer
[EnvInject] - Loading node environment variables.
Building remotely on ubuntu-1 (Ubuntu ubuntu1 yahoo-not-h2 ubuntu docker) in 
workspace 
[Phoenix_Compile_Compat_wHBase] $ /bin/bash /tmp/hudson6024790780375057851.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:   49453340 kB
MemFree:18562308 kB
Filesystem  Size  Used Avail Use% Mounted on
udev 24G   12K   24G   1% /dev
tmpfs   4.8G  1.3M  4.8G   1% /run
/dev/dm-0   3.6T  738G  2.7T  22% /
none4.0K 0  4.0K   0% /sys/fs/cgroup
none5.0M 0  5.0M   0% /run/lock
none 24G   28M   24G   1% /run/shm
none100M 0  100M   0% /run/user
/dev/sda2   237M  114M  111M  51% /boot
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/9f378295fb02772be51778becc9e165357dfaaf5373641c84bbc51cae2ab92ab
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/4f15f5cf0f6f7d0009cc5ad5b97687b7e47a8d5f13672c2da326e82afbc6a26e
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/bd7d9e806e8d9a2d989becbbb89b82fd19f895bf279daa91fc4be62608617a42
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/16ad298156ba95d86bed922841d38fdd7d2aa60b82fdfc912c4360021ce24c13
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/10aee9d57e8899fad53fcf896198ed6b7268cae4adfe2539136cc416e1923696
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/9a305c1df1252120cf70d36483710c7918c146d07ad2d8a460fd39370a018f4b
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/de4b4a355ef1c9e7eff1ce99604b628dc9674a18e09ea15cc4941954c8797f3a
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/800fa9e0d32cd75c1a949f5582dc5e52bfa01477ec8ae698b87aaba03ab4bd8c
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/478050f1b4f8b7efecfd5a1b08beba6e80ee0f1a81c3c5debc0a3d58b31fe660
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/cec9e465c07bc7196d284f921a14efb1840554ebe88cca1e4b0f3ff2b251876b
none3.6T  738G  2.7T  22% 
/var/lib/docker/aufs/mnt/d37c3ab1125ce4bacb8b991e72a07d706b7bfaa12e7ab16ea9965f71bf2eb36f
3.0.4
apache-maven-2.2.1
apache-maven-3.0.4
apache-maven-3.0.4-jenkins
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
maven


===
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

Apache-Phoenix | 4.8-HBase-0.98 | Build Successful

2016-09-23 Thread Apache Jenkins Server 
4.8-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.8-HBase-0.98

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

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

Changes
[larsh] PHOENIX-3323 make_rc script fails to build the RC.



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