date:20140726

Build failed in Jenkins: Phoenix | 3.0 | Hadoop1 #154

2014-07-26 Thread Apache Jenkins Server

See https://builds.apache.org/job/Phoenix-3.0-hadoop1/154/changes

Changes:

[jtaylor] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test 
flapping

--
[...truncated 113 lines...]
[INFO] 
[INFO] --- maven-remote-resources-plugin:1.5:process (default) @ phoenix-core 
---
[INFO] 
[INFO] --- maven-resources-plugin:2.6:resources (default-resources) @ 
phoenix-core ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 1 resource to META-INF/services
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:compile (default-compile) @ phoenix-core 
---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 641 source files to 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/target/classes
[WARNING] 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java:
 Some input files use or override a deprecated API.
[WARNING] 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java:
 Recompile with -Xlint:deprecation for details.
[WARNING] 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java:
 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java
 uses unchecked or unsafe operations.
[WARNING] 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixStatement.java:
 Recompile with -Xlint:unchecked for details.
[INFO] 
[INFO] --- maven-resources-plugin:2.6:testResources (default-testResources) @ 
phoenix-core ---
[INFO] Using 'UTF-8' encoding to copy filtered resources.
[INFO] Copying 2 resources
[INFO] Copying 2 resources
[INFO] Copying 3 resources
[INFO] 
[INFO] --- maven-compiler-plugin:3.0:testCompile (default-testCompile) @ 
phoenix-core ---
[INFO] Changes detected - recompiling the module!
[INFO] Compiling 214 source files to 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/target/test-classes
[INFO] 
[INFO] --- maven-surefire-plugin:2.17:test (default-test) @ phoenix-core ---
[INFO] Surefire report directory: 
https://builds.apache.org/job/Phoenix-3.0-hadoop1/ws/phoenix-core/target/surefire-reports

---
 T E S T S
---

---
 T E S T S
---
Running org.apache.phoenix.mapreduce.CsvBulkLoadToolTest
Running org.apache.phoenix.mapreduce.CsvToKeyValueMapperTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.334 sec - in 
org.apache.phoenix.mapreduce.CsvBulkLoadToolTest
Running org.apache.phoenix.mapreduce.CsvBulkImportUtilTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.12 sec - in 
org.apache.phoenix.mapreduce.CsvBulkImportUtilTest
Running org.apache.phoenix.jdbc.PhoenixEmbeddedDriverTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.063 sec - in 
org.apache.phoenix.jdbc.PhoenixEmbeddedDriverTest
Running org.apache.phoenix.jdbc.PhoenixDriverTest
Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.652 sec - in 
org.apache.phoenix.mapreduce.CsvToKeyValueMapperTest
Running org.apache.phoenix.util.ScanUtilTest
Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.071 sec - in 
org.apache.phoenix.util.ScanUtilTest
Running org.apache.phoenix.util.PropertiesUtilTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.util.PropertiesUtilTest
Running org.apache.phoenix.util.MetaDataUtilTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.064 sec - in 
org.apache.phoenix.util.MetaDataUtilTest
Running org.apache.phoenix.util.DateUtilTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.014 sec - in 
org.apache.phoenix.util.DateUtilTest
Running org.apache.phoenix.util.ColumnInfoTest
Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.003 sec - in 
org.apache.phoenix.util.ColumnInfoTest
Running org.apache.phoenix.util.SequenceUtilTest
Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.028 sec - in 
org.apache.phoenix.util.SequenceUtilTest
Running org.apache.phoenix.util.PhoenixContextExecutorTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.002 sec - in 
org.apache.phoenix.util.PhoenixContextExecutorTest
Running org.apache.phoenix.util.Base62EncoderTest
Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.015 sec - in 
org.apache.phoenix.util.Base62EncoderTest
Running org.apache.phoenix.util.PhoenixRuntimeTest
Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.838 sec - in

git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 c587ef6db - 893aaf258


PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/3.0
Commit: 893aaf2586e31f6414ae27c92ca08672fb1dd2c9
Parents: c587ef6
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 00:06:41 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 00:06:41 2014 -0700

--
 .../phoenix/query/BaseConnectionlessQueryTest.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/893aaf25/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
index c78567a..ff31f7c 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
@@ -30,6 +30,7 @@ import static 
org.apache.phoenix.util.TestUtil.PHOENIX_CONNECTIONLESS_JDBC_URL;
 import static org.apache.phoenix.util.TestUtil.PTSDB_NAME;
 import static org.apache.phoenix.util.TestUtil.TABLE_WITH_ARRAY;
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.DriverManager;
@@ -48,6 +49,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 
@@ -76,7 +78,7 @@ public class BaseConnectionlessQueryTest extends BaseTest {
 protected static PhoenixTestDriver driver;
 
 private static void startServer(String url) throws Exception {
-//assertNull(driver);
+assertNull(driver);
 // only load the test driver if we are testing locally - for 
integration tests, we want to
 // test on a wider scale
 if (PhoenixEmbeddedDriver.isTestUrl(url)) {
@@ -128,5 +130,17 @@ public class BaseConnectionlessQueryTest extends BaseTest {
 }
 }
 
+@AfterClass
+public static void doTeardown() throws Exception {
+if (driver != null) {
+try {
+driver.close();
+} finally {
+PhoenixTestDriver driver = BaseConnectionlessQueryTest.driver;
+BaseConnectionlessQueryTest.driver = null;
+DriverManager.deregisterDriver(driver);
+}
+}
+}
 
 }

git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 893aaf258 - 57b22cfd8


PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/3.0
Commit: 57b22cfd81f03e6d60383154aa91762c3475b423
Parents: 893aaf2
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 07:34:29 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 07:34:29 2014 -0700

--
 .../src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/57b22cfd/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 9f118a6..8daea9c 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
 import org.apache.phoenix.jdbc.PhoenixDriver;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.apache.pig.ExecType;
@@ -88,7 +89,7 @@ public class PhoenixHBaseLoaderIT {
 
 Class.forName(PhoenixDriver.class.getName());
 zkQuorum = localhost: + hbaseTestUtil.getZkCluster().getClientPort();
-Properties props = TestUtil.TEST_PROPERTIES;
+Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
 conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL +
  PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum,props);

Jenkins build is back to normal : Phoenix | 3.0 | Hadoop1 #156

2014-07-26 Thread Apache Jenkins Server

See https://builds.apache.org/job/Phoenix-3.0-hadoop1/156/changes

[5/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1d3c78/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
index 3ebbc8b..cd8f1fb 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.schema.PDataType;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -85,7 +86,7 @@ public class DefaultParallelIteratorsRegionSplitterIT extends 
BaseParallelIterat
 long ts = nextTimestamp();
 initTableValues(ts);
 String url = getUrl() + ; + PhoenixRuntime.CURRENT_SCN_ATTRIB + = 
+ ts;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(url, props);
 
 Scan scan = new Scan();
@@ -127,12 +128,12 @@ public class DefaultParallelIteratorsRegionSplitterIT 
extends BaseParallelIterat
 long ts = nextTimestamp();
 initTableValues(ts);
 String url = getUrl() + ; + PhoenixRuntime.CURRENT_SCN_ATTRIB + = 
+ ts;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(url, props);
 
 Scan scan = new Scan();
 
-ConnectionQueryServices services = 
driver.getConnectionQueryServices(getUrl(), TEST_PROPERTIES);
+ConnectionQueryServices services = 
driver.getConnectionQueryServices(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES));
 TableRef table = getTableRef(conn,ts);
 services.getStatsManager().updateStats(table);
 scan.setStartRow(HConstants.EMPTY_START_ROW);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1d3c78/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
index d2b0c8a..2e45313 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
@@ -47,6 +47,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -74,7 +75,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
  ts = nextTimestamp();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 if (indexDDL != null  indexDDL.length()  0) {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement().execute(indexDDL);
@@ -93,7 +94,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
 @Test
 public void testDerivedTableWithWhere() throws Exception {
 long ts = nextTimestamp();
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -205,7 +206,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT 
{
 @Test
 public void testDerivedTableWithGroupBy() throws Exception {
 long ts = nextTimestamp();
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -240,7 +241,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT 
{
 @Test
 public void testDerivedTableWithOrderBy() throws Exception {
 long ts =

[4/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1d3c78/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
index e7ced92..0e6562c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -41,6 +41,7 @@ import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -66,7 +67,7 @@ public class NotQueryIT extends QueryIT {
 @Test
 public void testNotInList() throws Exception {
 String query = SELECT entity_id FROM aTable WHERE organization_id=? 
and entity_id NOT IN (?,?,?,?,?,?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -94,7 +95,7 @@ public class NotQueryIT extends QueryIT {
 @Test
 public void testNotInListOfFloat() throws Exception {
 String query = SELECT a_float FROM aTable WHERE organization_id=? and 
a_float NOT IN (?,?,?,?,?,?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -122,7 +123,7 @@ public class NotQueryIT extends QueryIT {
 @Test
 public void testNotInListOfDouble() throws Exception {
 String query = SELECT a_double FROM aTable WHERE organization_id=? 
and a_double NOT IN (?,?,?,?,?,?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -151,7 +152,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEquals() throws Exception {
 String query = SELECT entity_id -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_integer != 1 and a_integer 
= 2;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -170,7 +171,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEqualsByTinyInt() throws Exception {
 String query = SELECT a_byte -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_byte != 1 and a_byte = 2;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -189,7 +190,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEqualsBySmallInt() throws Exception {
 String query = SELECT a_short -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_short != 128 and a_short 
!=0 and a_short = 129;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -208,7 +209,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEqualsByFloat() throws Exception {
 String query = SELECT a_float -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_float != 0.01d and a_float 
= 0.02d;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -227,7 +228,7 @@ public class NotQueryIT

[7/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/4.0
Commit: 7d699d5158093c737aa4d5cf1c6e71a89cdca1d0
Parents: 6b1d3c7
Author: James Taylor jtay...@salesforce.com
Authored: Fri Jul 25 22:50:28 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 08:50:12 2014 -0700

--
 .../test/java/org/apache/phoenix/compile/ViewCompilerTest.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/7d699d51/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
index d2822a8..3ce2759 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
@@ -62,15 +62,18 @@ public class ViewCompilerTest extends 
BaseConnectionlessQueryTest {
 conn.createStatement().execute(view);
 }
 
+StringBuilder buf = new StringBuilder();
 int count = 0;
 for (PTable table : conn.getMetaDataCache().getTables()) {
 if (table.getType() == PTableType.VIEW) {
 assertEquals(viewType, table.getViewType());
 conn.createStatement().execute(DROP VIEW  + 
table.getName().getString());
+buf.append(' ');
+buf.append(table.getName().getString());
 count++;
 }
 }
-assertEquals(views.length, count);
+assertEquals(Expected  + views.length + , but got  + count + :+ 
buf.toString(), views.length, count);
 }
 
 @Test

[1/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.0 ba75ea131 - d16e7c905


http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1d3c78/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
index 5122963..b3b8ac0 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
@@ -65,6 +65,7 @@ import org.apache.phoenix.schema.SaltingUtil;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.NumberUtil;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
 import org.junit.Ignore;
@@ -79,7 +80,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 public void testSingleEqualFilter() throws SQLException {
 String tenantId = 001;
 String query = select * from atable where organization_id=' + 
tenantId + ' and a_integer=0;
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
 QueryPlan plan = pstmt.optimizeQuery();
 Scan scan = plan.getContext().getScan();
@@ -94,7 +95,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 
 @Test
 public void testSingleFixedFullPkSalted() throws SQLException {
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 pconn.createStatement().execute(CREATE TABLE t (k bigint not null 
primary key, v varchar) SALT_BUCKETS=20);
 String query = select * from t where k= + 1;
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
@@ -115,7 +116,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 
 @Test
 public void testSingleVariableFullPkSalted() throws SQLException {
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 pconn.createStatement().execute(CREATE TABLE t (k varchar primary 
key, v varchar) SALT_BUCKETS=20);
 String query = select * from t where k='a';
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
@@ -136,7 +137,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 
 @Test
 public void testMultiFixedFullPkSalted() throws SQLException {
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 pconn.createStatement().execute(CREATE TABLE t (k bigint not null 
primary key, v varchar) SALT_BUCKETS=20);
 String query = select * from t where k in (1,3);
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
@@ -185,7 +186,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 public void testMultiColumnEqualFilter() throws SQLException {
 String tenantId = 001;
 String query = select * from atable where organization_id=' + 
tenantId + ' and a_string=b_string;
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
 QueryPlan plan = pstmt.optimizeQuery();
 Scan scan = plan.getContext().getScan();
@@ -202,7 +203,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 public void testCollapseFunctionToNull() throws SQLException {
 String tenantId = 001;
 String query = select * from atable where organization_id=' + 
tenantId + ' and substr(entity_id,null) = 'foo';
-PhoenixConnection pconn

[9/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/4.0
Commit: d16e7c905b8d59c499f55a8c0a64f85f9a3b0ecf
Parents: 1b957bf
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 07:34:29 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 08:51:02 2014 -0700

--
 .../src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d16e7c90/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 9f118a6..8daea9c 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
 import org.apache.phoenix.jdbc.PhoenixDriver;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.apache.pig.ExecType;
@@ -88,7 +89,7 @@ public class PhoenixHBaseLoaderIT {
 
 Class.forName(PhoenixDriver.class.getName());
 zkQuorum = localhost: + hbaseTestUtil.getZkCluster().getClientPort();
-Properties props = TestUtil.TEST_PROPERTIES;
+Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
 conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL +
  PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum,props);

[2/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1d3c78/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index 698ade0..b522931 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -39,6 +39,7 @@ import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.PTableKey;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category;
 public class ImmutableIndexIT extends BaseHBaseManagedTimeIT {
 // Populate the test table with data.
 private static void populateTestTable() throws SQLException {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
 String upsert = UPSERT INTO  + INDEX_DATA_SCHEMA + 
QueryConstants.NAME_SEPARATOR + INDEX_DATA_TABLE
@@ -112,7 +113,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testIndexWithNullableFixedWithCols() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -168,7 +169,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 ResultSet rs;
 String fullTableName = T;
 
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 
@@ -190,7 +191,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testDeleteFromAllPKColumnIndex() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -244,7 +245,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testDropIfImmutableKeyValueColumn() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -278,7 +279,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testGroupByCount() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -297,7 +298,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test   
 public void testSelectDistinctOnTableWithSecondaryImmutableIndex() throws 
Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
 populateTestTable();
 String ddl = CREATE INDEX IDX ON  + INDEX_DATA_SCHEMA + 
QueryConstants.NAME_SEPARATOR + INDEX_DATA_TABLE
@@ -333,7 +334,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testInClauseWithIndexOnColumnOfUsignedIntType() throws 
Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = null;
 PreparedStatement stmt = null;
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/6b1d3c78/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff

[8/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/4.0
Commit: 1b957bf74350fa3b7dcef469e2fb0d70b6e8de03
Parents: 7d699d5
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 00:06:41 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 08:50:40 2014 -0700

--
 .../phoenix/query/BaseConnectionlessQueryTest.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/1b957bf7/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
index c78567a..ff31f7c 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
@@ -30,6 +30,7 @@ import static 
org.apache.phoenix.util.TestUtil.PHOENIX_CONNECTIONLESS_JDBC_URL;
 import static org.apache.phoenix.util.TestUtil.PTSDB_NAME;
 import static org.apache.phoenix.util.TestUtil.TABLE_WITH_ARRAY;
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.DriverManager;
@@ -48,6 +49,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 
@@ -76,7 +78,7 @@ public class BaseConnectionlessQueryTest extends BaseTest {
 protected static PhoenixTestDriver driver;
 
 private static void startServer(String url) throws Exception {
-//assertNull(driver);
+assertNull(driver);
 // only load the test driver if we are testing locally - for 
integration tests, we want to
 // test on a wider scale
 if (PhoenixEmbeddedDriver.isTestUrl(url)) {
@@ -128,5 +130,17 @@ public class BaseConnectionlessQueryTest extends BaseTest {
 }
 }
 
+@AfterClass
+public static void doTeardown() throws Exception {
+if (driver != null) {
+try {
+driver.close();
+} finally {
+PhoenixTestDriver driver = BaseConnectionlessQueryTest.driver;
+BaseConnectionlessQueryTest.driver = null;
+DriverManager.deregisterDriver(driver);
+}
+}
+}
 
 }

[6/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/4.0
Commit: 6b1d3c78ea44e1fc37b16c34e0821e287413ae3b
Parents: ba75ea1
Author: James Taylor jtay...@salesforce.com
Authored: Fri Jul 25 22:32:21 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 08:49:58 2014 -0700

--
 .../apache/phoenix/end2end/AlterTableIT.java|  34 ++---
 .../phoenix/end2end/ArithmeticQueryIT.java  |  17 +--
 .../org/apache/phoenix/end2end/ArrayIT.java | 107 +++
 .../apache/phoenix/end2end/AutoCommitIT.java|   3 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |   3 +-
 .../apache/phoenix/end2end/BinaryRowKeyIT.java  |   9 +-
 .../apache/phoenix/end2end/CaseStatementIT.java |  19 +--
 .../apache/phoenix/end2end/CastAndCoerceIT.java |  13 +-
 .../end2end/ClientTimeArithmeticQueryIT.java|  57 
 .../end2end/ColumnProjectionOptimizationIT.java |   5 +-
 .../phoenix/end2end/CustomEntityDataIT.java |   7 +-
 ...efaultParallelIteratorsRegionSplitterIT.java |   7 +-
 .../apache/phoenix/end2end/DerivedTableIT.java  |  19 +--
 .../apache/phoenix/end2end/DistinctCountIT.java |  19 +--
 .../apache/phoenix/end2end/DynamicColumnIT.java |  15 ++-
 .../apache/phoenix/end2end/DynamicFamilyIT.java |  19 +--
 .../apache/phoenix/end2end/DynamicUpsertIT.java |  17 +--
 .../phoenix/end2end/ExtendedQueryExecIT.java|   9 +-
 .../apache/phoenix/end2end/FunkyNamesIT.java|   9 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   |  11 +-
 .../org/apache/phoenix/end2end/GroupByIT.java   |  27 ++--
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  67 +-
 .../org/apache/phoenix/end2end/InListIT.java|   5 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   |   3 +-
 .../phoenix/end2end/MultiCfQueryExecIT.java |  15 ++-
 .../phoenix/end2end/NativeHBaseTypesIT.java |  19 +--
 .../org/apache/phoenix/end2end/NotQueryIT.java  |  23 ++--
 .../org/apache/phoenix/end2end/OrderByIT.java   |   7 +-
 .../apache/phoenix/end2end/PercentileIT.java|  31 ++---
 .../phoenix/end2end/ProductMetricsIT.java   | 131 ++-
 .../end2end/QueryDatabaseMetaDataIT.java|   5 +-
 .../org/apache/phoenix/end2end/QueryIT.java |  49 +++
 .../phoenix/end2end/ReadIsolationLevelIT.java   |   3 +-
 .../phoenix/end2end/RowValueConstructorIT.java  |  49 +++
 .../org/apache/phoenix/end2end/ScanQueryIT.java |  35 ++---
 .../org/apache/phoenix/end2end/SequenceIT.java  |   5 +-
 .../phoenix/end2end/ServerExceptionIT.java  |   3 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |   7 +-
 .../apache/phoenix/end2end/SortOrderFIT.java|   3 +-
 .../phoenix/end2end/SpillableGroupByIT.java |   5 +-
 .../phoenix/end2end/StatementHintsIT.java   |   7 +-
 .../apache/phoenix/end2end/StatsManagerIT.java  |   7 +-
 .../org/apache/phoenix/end2end/StddevIT.java|   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   3 +-
 .../end2end/TenantSpecificTablesDMLIT.java  |   5 +-
 .../phoenix/end2end/ToCharFunctionIT.java   |   3 +-
 .../phoenix/end2end/ToNumberFunctionIT.java |   3 +-
 .../java/org/apache/phoenix/end2end/TopNIT.java |   7 +-
 .../end2end/UpsertSelectAutoCommitIT.java   |   3 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |   4 +-
 .../phoenix/end2end/VariableLengthPKIT.java | 103 +++
 .../end2end/index/BaseMutableIndexIT.java   |   5 +-
 .../phoenix/end2end/index/DropViewIT.java   |   5 +-
 .../phoenix/end2end/index/ImmutableIndexIT.java |  17 +--
 .../phoenix/end2end/index/IndexMetadataIT.java  |   9 +-
 .../end2end/index/MutableIndexFailureIT.java|   5 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  29 ++--
 .../phoenix/end2end/index/SaltedIndexIT.java|   5 +-
 .../phoenix/end2end/salted/SaltedTableIT.java   |  17 +--
 .../salted/SaltedTableUpsertSelectIT.java   |  11 +-
 .../salted/SaltedTableVarLengthRowKeyIT.java|   5 +-
 .../phoenix/compile/HavingCompilerTest.java |   3 +-
 .../phoenix/compile/JoinQueryCompilerTest.java  |   3 +-
 .../phoenix/compile/LimitCompilerTest.java  |   3 +-
 .../phoenix/compile/QueryCompilerTest.java  |  50 +++
 .../phoenix/compile/QueryMetaDataTest.java  |  70 +-
 .../compile/SelectStatementRewriterTest.java|   3 +-
 .../compile/StatementHintsCompilationTest.java  |   3 +-
 .../phoenix/compile/ViewCompilerTest.java   |   9 +-
 .../phoenix/compile/WhereCompilerTest.java  |  75 +--
 .../phoenix/compile/WhereOptimizerTest.java |   3 +-
 .../iterate/AggregateResultScannerTest.java |   3 +-

[9/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/master
Commit: 331e27ae39cf13a8759c34a4f03bd14925fbc543
Parents: ebbe34c
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 07:34:29 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 09:24:59 2014 -0700

--
 .../src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/331e27ae/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
--
diff --git 
a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java 
b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
index 9f118a6..8daea9c 100644
--- a/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
+++ b/phoenix-pig/src/it/java/org/apache/phoenix/pig/PhoenixHBaseLoaderIT.java
@@ -41,6 +41,7 @@ import org.apache.phoenix.end2end.NeedsOwnMiniClusterTest;
 import org.apache.phoenix.jdbc.PhoenixDriver;
 import org.apache.phoenix.query.QueryServices;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.apache.pig.ExecType;
@@ -88,7 +89,7 @@ public class PhoenixHBaseLoaderIT {
 
 Class.forName(PhoenixDriver.class.getName());
 zkQuorum = localhost: + hbaseTestUtil.getZkCluster().getClientPort();
-Properties props = TestUtil.TEST_PROPERTIES;
+Properties props = PropertiesUtil.deepCopy(TestUtil.TEST_PROPERTIES);
 props.put(QueryServices.DROP_METADATA_ATTRIB, Boolean.toString(true));
 conn = DriverManager.getConnection(PhoenixRuntime.JDBC_PROTOCOL +
  PhoenixRuntime.JDBC_PROTOCOL_SEPARATOR + zkQuorum,props);

[3/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
index dec44c2..bdae151 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/RowValueConstructorIT.java
@@ -52,6 +52,7 @@ import java.util.Properties;
 
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.TestUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -65,7 +66,7 @@ public class RowValueConstructorIT extends 
BaseClientManagedTimeIT {
 String tenantId = getOrganizationId();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 String query = SELECT a_integer, x_integer FROM aTable WHERE 
?=organization_id  AND (a_integer, x_integer) = (7, 5);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -90,7 +91,7 @@ public class RowValueConstructorIT extends 
BaseClientManagedTimeIT {
 String tenantId = getOrganizationId();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 String query = SELECT a_integer, x_integer FROM aTable WHERE 
?=organization_id  AND (a_integer, x_integer) = (4, 4);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -116,7 +117,7 @@ public class RowValueConstructorIT extends 
BaseClientManagedTimeIT {
 String tenantId = getOrganizationId();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 String query = SELECT a_integer, x_integer FROM aTable WHERE 
?=organization_id  AND (a_integer, x_integer, y_integer) = (7, 5);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -142,7 +143,7 @@ public class RowValueConstructorIT extends 
BaseClientManagedTimeIT {
 String tenantId = getOrganizationId();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 String query = SELECT a_integer, x_integer FROM aTable WHERE 
?=organization_id  AND (a_integer, x_integer) = (?, ?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -169,7 +170,7 @@ public class RowValueConstructorIT extends 
BaseClientManagedTimeIT {
 String tenantId = getOrganizationId();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 String query = SELECT a_integer, x_integer FROM aTable WHERE 
?=organization_id  AND (a_integer, x_integer) = 7;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -193,7 +194,7 @@ public class RowValueConstructorIT extends 
BaseClientManagedTimeIT {
 String tenantId = getOrganizationId();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 String query = SELECT a_integer, x_integer FROM aTable WHERE 
?=organization_id  AND 7 = (a_integer, x_integer);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -217,7 +218,7 @@ public class RowValueConstructorIT extends

[5/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
index 3ebbc8b..cd8f1fb 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DefaultParallelIteratorsRegionSplitterIT.java
@@ -43,6 +43,7 @@ import org.apache.phoenix.query.KeyRange;
 import org.apache.phoenix.schema.PDataType;
 import org.apache.phoenix.schema.TableRef;
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 
@@ -85,7 +86,7 @@ public class DefaultParallelIteratorsRegionSplitterIT extends 
BaseParallelIterat
 long ts = nextTimestamp();
 initTableValues(ts);
 String url = getUrl() + ; + PhoenixRuntime.CURRENT_SCN_ATTRIB + = 
+ ts;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(url, props);
 
 Scan scan = new Scan();
@@ -127,12 +128,12 @@ public class DefaultParallelIteratorsRegionSplitterIT 
extends BaseParallelIterat
 long ts = nextTimestamp();
 initTableValues(ts);
 String url = getUrl() + ; + PhoenixRuntime.CURRENT_SCN_ATTRIB + = 
+ ts;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(url, props);
 
 Scan scan = new Scan();
 
-ConnectionQueryServices services = 
driver.getConnectionQueryServices(getUrl(), TEST_PROPERTIES);
+ConnectionQueryServices services = 
driver.getConnectionQueryServices(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES));
 TableRef table = getTableRef(conn,ts);
 services.getStatsManager().updateStats(table);
 scan.setStartRow(HConstants.EMPTY_START_ROW);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
index d2b0c8a..2e45313 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DerivedTableIT.java
@@ -47,6 +47,7 @@ import java.util.List;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -74,7 +75,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
  ts = nextTimestamp();
 initATableValues(tenantId, getDefaultSplits(tenantId), null, ts);
 if (indexDDL != null  indexDDL.length()  0) {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, 
Long.toString(ts));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.createStatement().execute(indexDDL);
@@ -93,7 +94,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT {
 @Test
 public void testDerivedTableWithWhere() throws Exception {
 long ts = nextTimestamp();
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -205,7 +206,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT 
{
 @Test
 public void testDerivedTableWithGroupBy() throws Exception {
 long ts = nextTimestamp();
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 1));
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -240,7 +241,7 @@ public class DerivedTableIT extends BaseClientManagedTimeIT 
{
 @Test
 public void testDerivedTableWithOrderBy() throws Exception {
 long ts =

[1/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master 14aa52c95 - 331e27ae3


http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
index 5122963..b3b8ac0 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/WhereCompilerTest.java
@@ -65,6 +65,7 @@ import org.apache.phoenix.schema.SaltingUtil;
 import org.apache.phoenix.util.ByteUtil;
 import org.apache.phoenix.util.DateUtil;
 import org.apache.phoenix.util.NumberUtil;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.SchemaUtil;
 import org.apache.phoenix.util.StringUtil;
 import org.junit.Ignore;
@@ -79,7 +80,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 public void testSingleEqualFilter() throws SQLException {
 String tenantId = 001;
 String query = select * from atable where organization_id=' + 
tenantId + ' and a_integer=0;
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
 QueryPlan plan = pstmt.optimizeQuery();
 Scan scan = plan.getContext().getScan();
@@ -94,7 +95,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 
 @Test
 public void testSingleFixedFullPkSalted() throws SQLException {
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 pconn.createStatement().execute(CREATE TABLE t (k bigint not null 
primary key, v varchar) SALT_BUCKETS=20);
 String query = select * from t where k= + 1;
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
@@ -115,7 +116,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 
 @Test
 public void testSingleVariableFullPkSalted() throws SQLException {
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 pconn.createStatement().execute(CREATE TABLE t (k varchar primary 
key, v varchar) SALT_BUCKETS=20);
 String query = select * from t where k='a';
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
@@ -136,7 +137,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 
 @Test
 public void testMultiFixedFullPkSalted() throws SQLException {
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 pconn.createStatement().execute(CREATE TABLE t (k bigint not null 
primary key, v varchar) SALT_BUCKETS=20);
 String query = select * from t where k in (1,3);
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
@@ -185,7 +186,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 public void testMultiColumnEqualFilter() throws SQLException {
 String tenantId = 001;
 String query = select * from atable where organization_id=' + 
tenantId + ' and a_string=b_string;
-PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
TEST_PROPERTIES).unwrap(PhoenixConnection.class);
+PhoenixConnection pconn = DriverManager.getConnection(getUrl(), 
PropertiesUtil.deepCopy(TEST_PROPERTIES)).unwrap(PhoenixConnection.class);
 PhoenixPreparedStatement pstmt = new PhoenixPreparedStatement(pconn, 
query);
 QueryPlan plan = pstmt.optimizeQuery();
 Scan scan = plan.getContext().getScan();
@@ -202,7 +203,7 @@ public class WhereCompilerTest extends 
BaseConnectionlessQueryTest {
 public void testCollapseFunctionToNull() throws SQLException {
 String tenantId = 001;
 String query = select * from atable where organization_id=' + 
tenantId + ' and substr(entity_id,null) = 'foo';
-PhoenixConnection

[8/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/master
Commit: ebbe34cec14ce59fd6df39bd4991c100d268be7c
Parents: 628904f
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 00:06:41 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 09:24:40 2014 -0700

--
 .../phoenix/query/BaseConnectionlessQueryTest.java  | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ebbe34ce/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
index c78567a..ff31f7c 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
@@ -30,6 +30,7 @@ import static 
org.apache.phoenix.util.TestUtil.PHOENIX_CONNECTIONLESS_JDBC_URL;
 import static org.apache.phoenix.util.TestUtil.PTSDB_NAME;
 import static org.apache.phoenix.util.TestUtil.TABLE_WITH_ARRAY;
 import static org.apache.phoenix.util.TestUtil.TEST_PROPERTIES;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 import java.sql.DriverManager;
@@ -48,6 +49,7 @@ import org.apache.phoenix.util.PhoenixRuntime;
 import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.apache.phoenix.util.TestUtil;
+import org.junit.AfterClass;
 import org.junit.BeforeClass;
 
 
@@ -76,7 +78,7 @@ public class BaseConnectionlessQueryTest extends BaseTest {
 protected static PhoenixTestDriver driver;
 
 private static void startServer(String url) throws Exception {
-//assertNull(driver);
+assertNull(driver);
 // only load the test driver if we are testing locally - for 
integration tests, we want to
 // test on a wider scale
 if (PhoenixEmbeddedDriver.isTestUrl(url)) {
@@ -128,5 +130,17 @@ public class BaseConnectionlessQueryTest extends BaseTest {
 }
 }
 
+@AfterClass
+public static void doTeardown() throws Exception {
+if (driver != null) {
+try {
+driver.close();
+} finally {
+PhoenixTestDriver driver = BaseConnectionlessQueryTest.driver;
+BaseConnectionlessQueryTest.driver = null;
+DriverManager.deregisterDriver(driver);
+}
+}
+}
 
 }

[7/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/master
Commit: 628904f025e83d9a275ed71de9d9243c30234921
Parents: 4861493
Author: James Taylor jtay...@salesforce.com
Authored: Fri Jul 25 22:50:28 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 09:24:01 2014 -0700

--
 .../test/java/org/apache/phoenix/compile/ViewCompilerTest.java  | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/628904f0/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
--
diff --git 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
index d2822a8..3ce2759 100644
--- 
a/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
+++ 
b/phoenix-core/src/test/java/org/apache/phoenix/compile/ViewCompilerTest.java
@@ -62,15 +62,18 @@ public class ViewCompilerTest extends 
BaseConnectionlessQueryTest {
 conn.createStatement().execute(view);
 }
 
+StringBuilder buf = new StringBuilder();
 int count = 0;
 for (PTable table : conn.getMetaDataCache().getTables()) {
 if (table.getType() == PTableType.VIEW) {
 assertEquals(viewType, table.getViewType());
 conn.createStatement().execute(DROP VIEW  + 
table.getName().getString());
+buf.append(' ');
+buf.append(table.getName().getString());
 count++;
 }
 }
-assertEquals(views.length, count);
+assertEquals(Expected  + views.length + , but got  + count + :+ 
buf.toString(), views.length, count);
 }
 
 @Test

[6/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping


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

Branch: refs/heads/master
Commit: 48614937b27c9474cb2eb3bf76da2d97a66d0044
Parents: 14aa52c
Author: James Taylor jtay...@salesforce.com
Authored: Fri Jul 25 22:32:21 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 09:23:34 2014 -0700

--
 .../apache/phoenix/end2end/AlterTableIT.java|  34 ++---
 .../phoenix/end2end/ArithmeticQueryIT.java  |  17 +--
 .../org/apache/phoenix/end2end/ArrayIT.java | 107 +++
 .../apache/phoenix/end2end/AutoCommitIT.java|   3 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |   3 +-
 .../apache/phoenix/end2end/BinaryRowKeyIT.java  |   9 +-
 .../apache/phoenix/end2end/CaseStatementIT.java |  19 +--
 .../apache/phoenix/end2end/CastAndCoerceIT.java |  13 +-
 .../end2end/ClientTimeArithmeticQueryIT.java|  57 
 .../end2end/ColumnProjectionOptimizationIT.java |   5 +-
 .../phoenix/end2end/CustomEntityDataIT.java |   7 +-
 ...efaultParallelIteratorsRegionSplitterIT.java |   7 +-
 .../apache/phoenix/end2end/DerivedTableIT.java  |  19 +--
 .../apache/phoenix/end2end/DistinctCountIT.java |  19 +--
 .../apache/phoenix/end2end/DynamicColumnIT.java |  15 ++-
 .../apache/phoenix/end2end/DynamicFamilyIT.java |  19 +--
 .../apache/phoenix/end2end/DynamicUpsertIT.java |  17 +--
 .../phoenix/end2end/ExtendedQueryExecIT.java|   9 +-
 .../apache/phoenix/end2end/FunkyNamesIT.java|   9 +-
 .../apache/phoenix/end2end/GroupByCaseIT.java   |  11 +-
 .../org/apache/phoenix/end2end/GroupByIT.java   |  27 ++--
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  67 +-
 .../org/apache/phoenix/end2end/InListIT.java|   5 +-
 .../org/apache/phoenix/end2end/KeyOnlyIT.java   |   3 +-
 .../phoenix/end2end/MultiCfQueryExecIT.java |  15 ++-
 .../phoenix/end2end/NativeHBaseTypesIT.java |  19 +--
 .../org/apache/phoenix/end2end/NotQueryIT.java  |  23 ++--
 .../org/apache/phoenix/end2end/OrderByIT.java   |   7 +-
 .../apache/phoenix/end2end/PercentileIT.java|  31 ++---
 .../phoenix/end2end/ProductMetricsIT.java   | 131 ++-
 .../end2end/QueryDatabaseMetaDataIT.java|   5 +-
 .../org/apache/phoenix/end2end/QueryIT.java |  49 +++
 .../phoenix/end2end/ReadIsolationLevelIT.java   |   3 +-
 .../phoenix/end2end/RowValueConstructorIT.java  |  49 +++
 .../org/apache/phoenix/end2end/ScanQueryIT.java |  35 ++---
 .../org/apache/phoenix/end2end/SequenceIT.java  |   5 +-
 .../phoenix/end2end/ServerExceptionIT.java  |   3 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |   7 +-
 .../apache/phoenix/end2end/SortOrderFIT.java|   3 +-
 .../phoenix/end2end/SpillableGroupByIT.java |   5 +-
 .../phoenix/end2end/StatementHintsIT.java   |   7 +-
 .../apache/phoenix/end2end/StatsManagerIT.java  |   7 +-
 .../org/apache/phoenix/end2end/StddevIT.java|   9 +-
 .../end2end/TenantSpecificTablesDDLIT.java  |   3 +-
 .../end2end/TenantSpecificTablesDMLIT.java  |   5 +-
 .../phoenix/end2end/ToCharFunctionIT.java   |   3 +-
 .../phoenix/end2end/ToNumberFunctionIT.java |   3 +-
 .../java/org/apache/phoenix/end2end/TopNIT.java |   7 +-
 .../end2end/UpsertSelectAutoCommitIT.java   |   3 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |   4 +-
 .../phoenix/end2end/VariableLengthPKIT.java | 103 +++
 .../end2end/index/BaseMutableIndexIT.java   |   5 +-
 .../phoenix/end2end/index/DropViewIT.java   |   5 +-
 .../phoenix/end2end/index/ImmutableIndexIT.java |  17 +--
 .../phoenix/end2end/index/IndexMetadataIT.java  |   9 +-
 .../end2end/index/MutableIndexFailureIT.java|   5 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  29 ++--
 .../phoenix/end2end/index/SaltedIndexIT.java|   5 +-
 .../phoenix/end2end/salted/SaltedTableIT.java   |  17 +--
 .../salted/SaltedTableUpsertSelectIT.java   |  11 +-
 .../salted/SaltedTableVarLengthRowKeyIT.java|   5 +-
 .../phoenix/compile/HavingCompilerTest.java |   3 +-
 .../phoenix/compile/JoinQueryCompilerTest.java  |   3 +-
 .../phoenix/compile/LimitCompilerTest.java  |   3 +-
 .../phoenix/compile/QueryCompilerTest.java  |  50 +++
 .../phoenix/compile/QueryMetaDataTest.java  |  70 +-
 .../compile/SelectStatementRewriterTest.java|   3 +-
 .../compile/StatementHintsCompilationTest.java  |   3 +-
 .../phoenix/compile/ViewCompilerTest.java   |   9 +-
 .../phoenix/compile/WhereCompilerTest.java  |  75 +--
 .../phoenix/compile/WhereOptimizerTest.java |   3 +-
 .../iterate/AggregateResultScannerTest.java |   3 +-

[4/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
index e7ced92..0e6562c 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/NotQueryIT.java
@@ -41,6 +41,7 @@ import java.util.Collection;
 import java.util.Properties;
 
 import org.apache.phoenix.util.PhoenixRuntime;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.junit.runner.RunWith;
@@ -66,7 +67,7 @@ public class NotQueryIT extends QueryIT {
 @Test
 public void testNotInList() throws Exception {
 String query = SELECT entity_id FROM aTable WHERE organization_id=? 
and entity_id NOT IN (?,?,?,?,?,?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -94,7 +95,7 @@ public class NotQueryIT extends QueryIT {
 @Test
 public void testNotInListOfFloat() throws Exception {
 String query = SELECT a_float FROM aTable WHERE organization_id=? and 
a_float NOT IN (?,?,?,?,?,?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -122,7 +123,7 @@ public class NotQueryIT extends QueryIT {
 @Test
 public void testNotInListOfDouble() throws Exception {
 String query = SELECT a_double FROM aTable WHERE organization_id=? 
and a_double NOT IN (?,?,?,?,?,?);
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -151,7 +152,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEquals() throws Exception {
 String query = SELECT entity_id -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_integer != 1 and a_integer 
= 2;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -170,7 +171,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEqualsByTinyInt() throws Exception {
 String query = SELECT a_byte -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_byte != 1 and a_byte = 2;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -189,7 +190,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEqualsBySmallInt() throws Exception {
 String query = SELECT a_short -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_short != 128 and a_short 
!=0 and a_short = 129;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -208,7 +209,7 @@ public class NotQueryIT extends QueryIT {
 public void testNotEqualsByFloat() throws Exception {
 String query = SELECT a_float -- and here comment\n + 
 FROM aTable WHERE organization_id=? and a_float != 0.01d and a_float 
= 0.02d;
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts 
+ 2)); // Execute at timestamp 2
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
@@ -227,7 +228,7 @@ public class NotQueryIT

[2/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

2014-07-26 Thread jamestaylor

http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
index 698ade0..b522931 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/ImmutableIndexIT.java
@@ -39,6 +39,7 @@ import org.apache.phoenix.exception.SQLExceptionCode;
 import org.apache.phoenix.jdbc.PhoenixConnection;
 import org.apache.phoenix.query.QueryConstants;
 import org.apache.phoenix.schema.PTableKey;
+import org.apache.phoenix.util.PropertiesUtil;
 import org.apache.phoenix.util.QueryUtil;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -47,7 +48,7 @@ import org.junit.experimental.categories.Category;
 public class ImmutableIndexIT extends BaseHBaseManagedTimeIT {
 // Populate the test table with data.
 private static void populateTestTable() throws SQLException {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 try {
 String upsert = UPSERT INTO  + INDEX_DATA_SCHEMA + 
QueryConstants.NAME_SEPARATOR + INDEX_DATA_TABLE
@@ -112,7 +113,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testIndexWithNullableFixedWithCols() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -168,7 +169,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 ResultSet rs;
 String fullTableName = T;
 
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 
@@ -190,7 +191,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testDeleteFromAllPKColumnIndex() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -244,7 +245,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testDropIfImmutableKeyValueColumn() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -278,7 +279,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testGroupByCount() throws Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = DriverManager.getConnection(getUrl(), props);
 conn.setAutoCommit(false);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
@@ -297,7 +298,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test   
 public void testSelectDistinctOnTableWithSecondaryImmutableIndex() throws 
Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);
 populateTestTable();
 String ddl = CREATE INDEX IDX ON  + INDEX_DATA_SCHEMA + 
QueryConstants.NAME_SEPARATOR + INDEX_DATA_TABLE
@@ -333,7 +334,7 @@ public class ImmutableIndexIT extends 
BaseHBaseManagedTimeIT {
 
 @Test
 public void testInClauseWithIndexOnColumnOfUsignedIntType() throws 
Exception {
-Properties props = new Properties(TEST_PROPERTIES);
+Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES);
 Connection conn = null;
 PreparedStatement stmt = null;
 ensureTableCreated(getUrl(), INDEX_DATA_TABLE);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/48614937/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/IndexMetadataIT.java
--
diff

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-07-26 Thread Apache Jenkins Server

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

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

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

Changes
[jtaylor] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[jtaylor] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[jtaylor] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[jtaylor] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

git commit: Remove contents of apparently errand directory phoenix/b

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master 331e27ae3 - d382b3ae3


Remove contents of apparently errand directory phoenix/b


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

Branch: refs/heads/master
Commit: d382b3ae39f729eb90ac8fd7d7eb1bd41b1efb78
Parents: 331e27a
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 15:27:59 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 15:27:59 2014 -0700

--
 .../phoenix/end2end/index/LocalIndexIT.java | 58 
 1 file changed, 58 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d382b3ae/b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
--
diff --git 
a/b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java 
b/b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
deleted file mode 100644
index 4589259..000
--- 
a/b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.phoenix.end2end.index;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
-import java.sql.Connection;
-import java.sql.DriverManager;
-import java.sql.SQLException;
-
-import org.apache.phoenix.jdbc.PhoenixConnection;
-import org.apache.phoenix.schema.PTable;
-import org.apache.phoenix.schema.PTable.IndexType;
-import org.apache.phoenix.schema.PTableKey;
-import org.junit.Test;
-
-public class LocalIndexIT extends BaseIndexIT {
-private void createBaseTable(String tableName, Integer saltBuckets) throws 
SQLException {
-Connection conn = DriverManager.getConnection(getUrl());
-String ddl = CREATE TABLE  + tableName +  (t_id VARCHAR NOT 
NULL,\n +
-k1 INTEGER NOT NULL,\n +
-k2 INTEGER NOT NULL,\n +
-v1 VARCHAR,\n +
-CONSTRAINT pk PRIMARY KEY (t_id, k1, k2))\n
-+ (saltBuckets == null ?  : (,salt_buckets=+saltBuckets));
-conn.createStatement().execute(ddl);
-conn.close();
-}
-
-@Test
-public void testLocalIndexRoundTrip() throws Exception {
-createBaseTable(DATA_TABLE_NAME, null);
-Connection conn1 = DriverManager.getConnection(getUrl());
-Connection conn2 = DriverManager.getConnection(getUrl());
-conn1.createStatement().execute(CREATE LOCAL INDEX  + 
INDEX_TABLE_NAME +  ON  + DATA_TABLE_NAME + (v1));
-conn2.createStatement().executeQuery(SELECT * FROM  + 
DATA_TABLE_FULL_NAME).next();
-PTable localIndex = 
conn2.unwrap(PhoenixConnection.class).getMetaDataCache().getTable(new 
PTableKey(null,INDEX_TABLE_NAME));
-assertEquals(IndexType.LOCAL, localIndex.getIndexType());
-assertNotNull(localIndex.getViewIndexId());
-}
-
-}

git commit: Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/3.0 57b22cfd8 - 2df0594ff


Remove obsolete split policy required for 2.2.x-3.0/4.0 migration


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

Branch: refs/heads/3.0
Commit: 2df0594ff4e2ba9ef0f2756b96ecb4c6cac2c567
Parents: 57b22cf
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 15:32:18 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 15:32:18 2014 -0700

--
 .../phoenix/schema/MetaDataSplitPolicy.java | 30 
 1 file changed, 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/2df0594f/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
--
diff --git 
a/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
 
b/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
deleted file mode 100644
index 7138593..000
--- 
a/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.salesforce.phoenix.schema;
-
-
-
-/**
- * 
- * Dummy class to allow easy upgrade to Apache Phoenix from previous
- * Salesforce Phoenix. Without this dummy class, the HBase server
- * won't start up.
- *
- */
-public class MetaDataSplitPolicy extends 
org.apache.phoenix.schema.MetaDataSplitPolicy {
-}
\ No newline at end of file

git commit: Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/4.0 d16e7c905 - 4cced1bf4


Remove obsolete split policy required for 2.2.x-3.0/4.0 migration


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

Branch: refs/heads/4.0
Commit: 4cced1bf43ab6cad4502cef89a58a14d8fcb1631
Parents: d16e7c9
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 15:32:48 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 15:32:48 2014 -0700

--
 .../phoenix/schema/MetaDataSplitPolicy.java | 30 
 1 file changed, 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/4cced1bf/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
--
diff --git 
a/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
 
b/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
deleted file mode 100644
index 7138593..000
--- 
a/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.salesforce.phoenix.schema;
-
-
-
-/**
- * 
- * Dummy class to allow easy upgrade to Apache Phoenix from previous
- * Salesforce Phoenix. Without this dummy class, the HBase server
- * won't start up.
- *
- */
-public class MetaDataSplitPolicy extends 
org.apache.phoenix.schema.MetaDataSplitPolicy {
-}
\ No newline at end of file

git commit: Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

2014-07-26 Thread jamestaylor

Repository: phoenix
Updated Branches:
  refs/heads/master d382b3ae3 - caa3ec09b


Remove obsolete split policy required for 2.2.x-3.0/4.0 migration


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

Branch: refs/heads/master
Commit: caa3ec09bc7dcd72e9da93ed5942ce6ec55b0578
Parents: d382b3a
Author: James Taylor jtay...@salesforce.com
Authored: Sat Jul 26 15:33:11 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Sat Jul 26 15:33:11 2014 -0700

--
 .../phoenix/schema/MetaDataSplitPolicy.java | 30 
 1 file changed, 30 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/caa3ec09/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
--
diff --git 
a/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
 
b/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
deleted file mode 100644
index 7138593..000
--- 
a/phoenix-core/src/main/java/com/salesforce/phoenix/schema/MetaDataSplitPolicy.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * License); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an AS IS BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.salesforce.phoenix.schema;
-
-
-
-/**
- * 
- * Dummy class to allow easy upgrade to Apache Phoenix from previous
- * Salesforce Phoenix. Without this dummy class, the HBase server
- * won't start up.
- *
- */
-public class MetaDataSplitPolicy extends 
org.apache.phoenix.schema.MetaDataSplitPolicy {
-}
\ No newline at end of file

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

2014-07-26 Thread Apache Jenkins Server

3.0 branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/phoenix.git

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

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

Changes
[jtaylor] Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

Apache-Phoenix | Master | Hadoop1 | Build Successful

2014-07-26 Thread Apache Jenkins Server

Master branch build status Successful
Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

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

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

Changes
[jtaylor] Remove contents of apparently errand directory phoenix/b

[jtaylor] Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-07-26 Thread Apache Jenkins Server

4.0 branch build status Successful

Source repository https://git-wip-us.apache.org/repos/asf/incubator-phoenix.git

Compiled Artifacts https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastSuccessfulBuild/artifact/

Test Report https://builds.apache.org/job/Phoenix-4.0-hadoop1/lastCompletedBuild/testReport/

Changes
[jtaylor] Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

Build failed in Jenkins: Phoenix | 3.0 | Hadoop1 #154

git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

Jenkins build is back to normal : Phoenix | 3.0 | Hadoop1 #156

[5/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[4/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[7/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[1/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[9/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[2/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[8/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[6/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[9/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[3/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[5/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[1/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[8/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[7/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[6/9] git commit: PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[4/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

[2/9] PHOENIX-1122 Ensure TEST_PROPERTIES is not updated to prevent test flapping

Apache-Phoenix | Master | Hadoop1 | Build Successful

git commit: Remove contents of apparently errand directory phoenix/b

git commit: Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

git commit: Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

git commit: Remove obsolete split policy required for 2.2.x-3.0/4.0 migration

Apache-Phoenix | 3.0 | Hadoop1 | Build Successful

Apache-Phoenix | Master | Hadoop1 | Build Successful

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

29 matches

Site Navigation

Mail list logo

Footer information