git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/3.0 15a54d557 - f4eb0cdf8


PHOENIX-1284 Override config properties for unit tests not making it to server


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

Branch: refs/heads/3.0
Commit: f4eb0cdf88f8e408562dffcd104e3a10ad1e
Parents: 15a54d5
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:23:54 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 01:23:54 2014 -0700

--
 .../end2end/BaseClientManagedTimeIT.java| 31 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java | 31 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java |  2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  2 +-
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryPlanIT.java |  2 +-
 .../org/apache/phoenix/end2end/SequenceIT.java  |  2 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java |  2 +-
 .../phoenix/end2end/SpillableGroupByIT.java |  2 +-
 .../phoenix/end2end/SpooledOrderByIT.java   |  2 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  2 +-
 .../phoenix/end2end/index/DropViewIT.java   |  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  2 +-
 .../phoenix/end2end/index/SaltedIndexIT.java| 26 +++-
 .../java/org/apache/phoenix/query/BaseTest.java | 62 
 18 files changed, 75 insertions(+), 103 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/f4eb0cdf/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 8b47e11..2f60ea1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -24,9 +24,6 @@ import java.sql.Date;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
-import org.apache.phoenix.jdbc.PhoenixTestDriver;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.After;
@@ -50,15 +47,6 @@ import org.junit.experimental.categories.Category;
 @NotThreadSafe
 @Category(ClientManagedTimeTest.class)
 public abstract class BaseClientManagedTimeIT extends BaseTest {
-private static String url;
-protected static PhoenixTestDriver driver;
-protected static final Configuration config = HBaseConfiguration.create(); 
-private static boolean clusterInitialized = false;
-
-protected final static String getUrl() {
-return checkClusterInitialized();
-}
-
 protected static Configuration getTestClusterConfig() {
 // don't want callers to modify config.
 return new Configuration(config);
@@ -72,24 +60,7 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-setUpTestDriver(getUrl(), ReadOnlyProps.EMPTY_PROPS);
-}
-
-protected static void setUpTestDriver(String url, ReadOnlyProps props) 
throws Exception {
-if (PhoenixEmbeddedDriver.isTestUrl(url)) {
-checkClusterInitialized();
-if (driver == null) {
-driver = initAndRegisterDriver(url, props);
-}
-}
-}
-
-private static String checkClusterInitialized() {
-if (!clusterInitialized) {
-url = setUpTestCluster(config);
-clusterInitialized = true;
-}
-return url;
+setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
 }
 
 @AfterClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/f4eb0cdf/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
index 047afb8..1d0f004 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
+++ 

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

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-3.0-hadoop1/220/changes



[1/2] git commit: PHOENIX-1285 Override default for histogram depth in QueryServicesTestImpl

2014-09-23 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/4.0 757738397 - 53e2195dd


PHOENIX-1285 Override default for histogram depth in QueryServicesTestImpl


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

Branch: refs/heads/4.0
Commit: 768b9d22304dac02ed1ae0476bfbfdac9a9a9a78
Parents: 7577383
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:35:46 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 01:35:46 2014 -0700

--
 .../java/org/apache/phoenix/end2end/BaseQueryIT.java   |  1 -
 .../org/apache/phoenix/end2end/StatsCollectorIT.java   |  2 +-
 .../iterate/DefaultParallelIteratorRegionSplitter.java |  2 +-
 .../java/org/apache/phoenix/query/QueryServices.java   |  2 +-
 .../org/apache/phoenix/query/QueryServicesOptions.java | 13 ++---
 .../phoenix/schema/stat/StatisticsCollector.java   |  2 +-
 .../test/java/org/apache/phoenix/query/BaseTest.java   |  2 +-
 .../apache/phoenix/query/QueryServicesTestImpl.java|  3 +++
 8 files changed, 14 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index 9a66499..eb10512 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -75,7 +75,6 @@ public abstract class BaseQueryIT extends 
BaseClientManagedTimeIT {
 props.put(IndexWriterUtils.HTABLE_THREAD_KEY, Integer.toString(100));
 // Make a small batch size to test multiple calls to reserve sequences
 props.put(QueryServices.SEQUENCE_CACHE_SIZE_ATTRIB, 
Long.toString(BATCH_SIZE));
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, 
Integer.toString(20));
 // Must update config before starting server
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/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 407c128..a38abea 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
@@ -50,7 +50,7 @@ public class StatsCollectorIT extends BaseHBaseManagedTimeIT {
 + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM;
 int histogramDepth = 60;
 MapString, String props = Maps.newHashMapWithExpectedSize(3);
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, 
Integer.toString(histogramDepth));
+props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Integer.toString(histogramDepth));
 props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, 
Integer.toString(frequency));
 driver = initAndRegisterDriver(url, new 
ReadOnlyProps(props.entrySet().iterator()));
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/768b9d22/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
index 2f568db..227163e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
@@ -64,7 +64,7 @@ public class DefaultParallelIteratorRegionSplitter implements 
ParallelIteratorRe
 this.context = context;
 this.tableRef = table;
 ReadOnlyProps props = 
context.getConnection().getQueryServices().getProps();
-this.guidePostsDepth = 
props.getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY,
+this.guidePostsDepth = 
props.getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB,
 QueryServicesOptions.DEFAULT_HISTOGRAM_BYTE_DEPTH);
 }
 


[2/2] git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
PHOENIX-1284 Override config properties for unit tests not making it to server

Conflicts:

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java


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

Branch: refs/heads/4.0
Commit: 53e2195ddf7be5b0606f7338a8fb418bd81a93a1
Parents: 768b9d2
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:23:54 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 01:40:35 2014 -0700

--
 .../end2end/BaseClientManagedTimeIT.java| 31 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java | 31 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java |  2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  2 +-
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryPlanIT.java |  2 +-
 .../org/apache/phoenix/end2end/SequenceIT.java  |  2 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java |  2 +-
 .../phoenix/end2end/SpillableGroupByIT.java |  2 +-
 .../phoenix/end2end/SpooledOrderByIT.java   |  2 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  2 +-
 .../phoenix/end2end/index/DropViewIT.java   |  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  3 +-
 .../phoenix/end2end/index/SaltedIndexIT.java| 17 +++---
 .../java/org/apache/phoenix/query/BaseTest.java | 62 
 18 files changed, 76 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/53e2195d/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 8b47e11..2f60ea1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -24,9 +24,6 @@ import java.sql.Date;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
-import org.apache.phoenix.jdbc.PhoenixTestDriver;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.After;
@@ -50,15 +47,6 @@ import org.junit.experimental.categories.Category;
 @NotThreadSafe
 @Category(ClientManagedTimeTest.class)
 public abstract class BaseClientManagedTimeIT extends BaseTest {
-private static String url;
-protected static PhoenixTestDriver driver;
-protected static final Configuration config = HBaseConfiguration.create(); 
-private static boolean clusterInitialized = false;
-
-protected final static String getUrl() {
-return checkClusterInitialized();
-}
-
 protected static Configuration getTestClusterConfig() {
 // don't want callers to modify config.
 return new Configuration(config);
@@ -72,24 +60,7 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-setUpTestDriver(getUrl(), ReadOnlyProps.EMPTY_PROPS);
-}
-
-protected static void setUpTestDriver(String url, ReadOnlyProps props) 
throws Exception {
-if (PhoenixEmbeddedDriver.isTestUrl(url)) {
-checkClusterInitialized();
-if (driver == null) {
-driver = initAndRegisterDriver(url, props);
-}
-}
-}
-
-private static String checkClusterInitialized() {
-if (!clusterInitialized) {
-url = setUpTestCluster(config);
-clusterInitialized = true;
-}
-return url;
+setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
 }
 
 @AfterClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/53e2195d/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
 

[2/4] git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
PHOENIX-1284 Override config properties for unit tests not making it to server

Conflicts:

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/MutableIndexIT.java

phoenix-core/src/it/java/org/apache/phoenix/end2end/index/SaltedIndexIT.java
phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java


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

Branch: refs/heads/master
Commit: e4dc9cd5914dbdcedb34dc24450e97492f858480
Parents: 614a243
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:23:54 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 02:33:14 2014 -0700

--
 .../end2end/BaseClientManagedTimeIT.java| 31 +-
 .../phoenix/end2end/BaseHBaseManagedTimeIT.java | 31 +-
 .../BaseParallelIteratorsRegionSplitterIT.java  |  2 +-
 .../org/apache/phoenix/end2end/BaseQueryIT.java |  2 +-
 .../org/apache/phoenix/end2end/BaseViewIT.java  |  2 +-
 .../org/apache/phoenix/end2end/HashJoinIT.java  |  2 +-
 .../phoenix/end2end/InMemoryOrderByIT.java  |  2 +-
 .../org/apache/phoenix/end2end/QueryPlanIT.java |  2 +-
 .../org/apache/phoenix/end2end/SequenceIT.java  |  2 +-
 ...ipRangeParallelIteratorRegionSplitterIT.java |  2 +-
 .../end2end/SkipScanAfterManualSplitIT.java |  2 +-
 .../phoenix/end2end/SpillableGroupByIT.java |  2 +-
 .../phoenix/end2end/SpooledOrderByIT.java   |  2 +-
 .../apache/phoenix/end2end/UpsertSelectIT.java  |  2 +-
 .../phoenix/end2end/index/DropViewIT.java   |  2 +-
 .../phoenix/end2end/index/MutableIndexIT.java   |  3 +-
 .../phoenix/end2end/index/SaltedIndexIT.java| 17 +++---
 .../java/org/apache/phoenix/query/BaseTest.java | 62 
 18 files changed, 76 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/e4dc9cd5/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
index 8b47e11..2f60ea1 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseClientManagedTimeIT.java
@@ -24,9 +24,6 @@ import java.sql.Date;
 import javax.annotation.concurrent.NotThreadSafe;
 
 import org.apache.hadoop.conf.Configuration;
-import org.apache.hadoop.hbase.HBaseConfiguration;
-import org.apache.phoenix.jdbc.PhoenixEmbeddedDriver;
-import org.apache.phoenix.jdbc.PhoenixTestDriver;
 import org.apache.phoenix.query.BaseTest;
 import org.apache.phoenix.util.ReadOnlyProps;
 import org.junit.After;
@@ -50,15 +47,6 @@ import org.junit.experimental.categories.Category;
 @NotThreadSafe
 @Category(ClientManagedTimeTest.class)
 public abstract class BaseClientManagedTimeIT extends BaseTest {
-private static String url;
-protected static PhoenixTestDriver driver;
-protected static final Configuration config = HBaseConfiguration.create(); 
-private static boolean clusterInitialized = false;
-
-protected final static String getUrl() {
-return checkClusterInitialized();
-}
-
 protected static Configuration getTestClusterConfig() {
 // don't want callers to modify config.
 return new Configuration(config);
@@ -72,24 +60,7 @@ public abstract class BaseClientManagedTimeIT extends 
BaseTest {
 
 @BeforeClass
 public static void doSetup() throws Exception {
-setUpTestDriver(getUrl(), ReadOnlyProps.EMPTY_PROPS);
-}
-
-protected static void setUpTestDriver(String url, ReadOnlyProps props) 
throws Exception {
-if (PhoenixEmbeddedDriver.isTestUrl(url)) {
-checkClusterInitialized();
-if (driver == null) {
-driver = initAndRegisterDriver(url, props);
-}
-}
-}
-
-private static String checkClusterInitialized() {
-if (!clusterInitialized) {
-url = setUpTestCluster(config);
-clusterInitialized = true;
-}
-return url;
+setUpTestDriver(ReadOnlyProps.EMPTY_PROPS);
 }
 
 @AfterClass

http://git-wip-us.apache.org/repos/asf/phoenix/blob/e4dc9cd5/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseHBaseManagedTimeIT.java
 

[4/4] git commit: PHOENIX-1284 Override config properties for unit tests not making it to server

2014-09-23 Thread jamestaylor
PHOENIX-1284 Override config properties for unit tests not making it to server


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

Branch: refs/heads/master
Commit: 98078328864ef66308f429d26e93703467e5d5b9
Parents: 2bcabf8
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 02:38:57 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 02:38:57 2014 -0700

--
 .../it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/98078328/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
index 1cd8ee0..7d0e1da 100644
--- 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
+++ 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/ContextClassloaderIT.java
@@ -76,7 +76,7 @@ public class ContextClassloaderIT  extends BaseTest {
 File.createTempFile(invalid, .jar).toURI().toURL() }, 
null);
 }
 
-private static String getUrl() {
+protected static String getUrl() {
 return jdbc:phoenix:localhost: + 
hbaseTestUtil.getZkCluster().getClientPort() + ;test=true;
 }
 



[1/4] git commit: PHOENIX-1285 Override default for histogram depth in QueryServicesTestImpl

2014-09-23 Thread jamestaylor
Repository: phoenix
Updated Branches:
  refs/heads/master d88f3571f - 980783288


PHOENIX-1285 Override default for histogram depth in QueryServicesTestImpl


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

Branch: refs/heads/master
Commit: 614a2439b5ae005e1bea73e627eb7a989c8eaafe
Parents: d88f357
Author: James Taylor jtay...@salesforce.com
Authored: Tue Sep 23 01:35:46 2014 -0700
Committer: James Taylor jtay...@salesforce.com
Committed: Tue Sep 23 02:32:53 2014 -0700

--
 .../java/org/apache/phoenix/end2end/BaseQueryIT.java   |  1 -
 .../org/apache/phoenix/end2end/StatsCollectorIT.java   |  2 +-
 .../iterate/DefaultParallelIteratorRegionSplitter.java |  2 +-
 .../java/org/apache/phoenix/query/QueryServices.java   |  2 +-
 .../org/apache/phoenix/query/QueryServicesOptions.java | 13 ++---
 .../phoenix/schema/stat/StatisticsCollector.java   |  2 +-
 .../test/java/org/apache/phoenix/query/BaseTest.java   |  2 +-
 .../apache/phoenix/query/QueryServicesTestImpl.java|  3 +++
 8 files changed, 14 insertions(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/614a2439/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
--
diff --git 
a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java 
b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
index 9a66499..eb10512 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/BaseQueryIT.java
@@ -75,7 +75,6 @@ public abstract class BaseQueryIT extends 
BaseClientManagedTimeIT {
 props.put(IndexWriterUtils.HTABLE_THREAD_KEY, Integer.toString(100));
 // Make a small batch size to test multiple calls to reserve sequences
 props.put(QueryServices.SEQUENCE_CACHE_SIZE_ATTRIB, 
Long.toString(BATCH_SIZE));
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, 
Integer.toString(20));
 // Must update config before starting server
 setUpTestDriver(getUrl(), new 
ReadOnlyProps(props.entrySet().iterator()));
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/614a2439/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 407c128..a38abea 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
@@ -50,7 +50,7 @@ public class StatsCollectorIT extends BaseHBaseManagedTimeIT {
 + JDBC_PROTOCOL_TERMINATOR + PHOENIX_TEST_DRIVER_URL_PARAM;
 int histogramDepth = 60;
 MapString, String props = Maps.newHashMapWithExpectedSize(3);
-props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY, 
Integer.toString(histogramDepth));
+props.put(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB, 
Integer.toString(histogramDepth));
 props.put(QueryServices.STATS_UPDATE_FREQ_MS_ATTRIB, 
Integer.toString(frequency));
 driver = initAndRegisterDriver(url, new 
ReadOnlyProps(props.entrySet().iterator()));
 }

http://git-wip-us.apache.org/repos/asf/phoenix/blob/614a2439/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
index 2f568db..227163e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/iterate/DefaultParallelIteratorRegionSplitter.java
@@ -64,7 +64,7 @@ public class DefaultParallelIteratorRegionSplitter implements 
ParallelIteratorRe
 this.context = context;
 this.tableRef = table;
 ReadOnlyProps props = 
context.getConnection().getQueryServices().getProps();
-this.guidePostsDepth = 
props.getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_CONF_KEY,
+this.guidePostsDepth = 
props.getLong(QueryServices.HISTOGRAM_BYTE_DEPTH_ATTRIB,
 QueryServicesOptions.DEFAULT_HISTOGRAM_BYTE_DEPTH);
 }
 


Build failed in Jenkins: Phoenix | 4.0 | Hadoop1 #327

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop1/327/changes

Changes:

[jtaylor] PHOENIX-1285 Override default for histogram depth in 
QueryServicesTestImpl

[jtaylor] PHOENIX-1284 Override config properties for unit tests not making it 
to server

[jtaylor] Adding missing files from fix for PHOENIX-1284

--
[...truncated 28859 lines...]
  
DropViewIT.doSetup:57-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
IndexMetadataITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
SaltedIndexIT.doSetup:63-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
ViewIndexIT.doSetup:50-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
ImmutableIndexITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
SkipScanQueryITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
MutableIndexIT.doSetup:64-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
LocalIndexIT.doSetup:74-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
SaltedViewITBaseViewIT.doSetup:46-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
MD5FunctionITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
QueryMoreITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
UpsertBigValuesITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
AlterTableITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
ExecuteStatementsITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
LastValueFunctionITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
ViewITBaseViewIT.doSetup:46-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
TenantSpecificViewIndexSaltedITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
SortOrderFITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
PhoenixEncodeDecodeITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
SaltedTableUpsertSelectITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
FirstValueFunctionITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
ArithmeticQueryITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
GuidePostsLifeCycleITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
ConvertTimezoneFunctionITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  
DecodeFunctionITBaseHBaseManagedTimeIT.doSetup:61-BaseTest.setUpTestDriver:481-BaseTest.checkClusterInitialized:460-BaseTest.setUpTestCluster:474-BaseTest.initMiniCluster:521
 » Runtime
  

Jenkins build is back to normal : Phoenix | 4.0 | Hadoop2 #156

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop2/156/



git commit: PHOENIX-103 Drop hadoop1.0 specifics from code

2014-09-23 Thread jyates
Repository: phoenix
Updated Branches:
  refs/heads/master 980783288 - c72c4a65d


PHOENIX-103 Drop hadoop1.0 specifics from code


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

Branch: refs/heads/master
Commit: c72c4a65dc7b8406301fc6f9909f81195bc134a0
Parents: 9807832
Author: Jesse Yates jya...@apache.org
Authored: Mon Sep 22 14:15:56 2014 -0700
Committer: Jesse Yates jya...@apache.org
Committed: Tue Sep 23 14:22:34 2014 -0700

--
 bin/hadoop-metrics2-hbase.properties|  20 ++
 bin/hadoop-metrics2-phoenix.properties  |  53 +++
 phoenix-assembly/pom.xml|   4 +-
 phoenix-assembly/src/build/hadoop-one-all.xml   |  53 ---
 phoenix-assembly/src/build/hadoop-two-all.xml   |  64 
 .../src/build/package-to-tar-all.xml|  38 +++
 phoenix-core/pom.xml| 280 +---
 phoenix-flume/pom.xml   | 276 +---
 phoenix-hadoop1-compat/pom.xml  |  40 ---
 .../bin/hadoop-metrics2-hbase.properties|  20 --
 .../bin/hadoop-metrics2-phoenix.properties  |  53 ---
 phoenix-pig/pom.xml | 292 +---
 pom.xml | 329 ++-
 13 files changed, 475 insertions(+), 1047 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/bin/hadoop-metrics2-hbase.properties
--
diff --git a/bin/hadoop-metrics2-hbase.properties 
b/bin/hadoop-metrics2-hbase.properties
new file mode 100644
index 000..499ab6b
--- /dev/null
+++ b/bin/hadoop-metrics2-hbase.properties
@@ -0,0 +1,20 @@
+# HBase Server Sink Configuration
+#
+#
+# Configuration for the metrics2 system for the HBase RegionServers
+# to enable phoenix trace collection on the HBase servers.
+#
+# See hadoop-metrics2-phoenix.properties for how these configurations
+# are utilized.
+#
+# Either this file can be used in place of the standard
+# hadoop-metrics2-hbase.properties file or the below
+# properties should be added to the file of the same name on
+# the HBase classpath (likely in the HBase conf/ folder)
+
+# ensure that we receive traces on the server
+hbase.sink.tracing.class=org.apache.phoenix.trace.PhoenixMetricsSink
+# Tell the sink where to write the metrics
+hbase.sink.tracing.writer-class=org.apache.phoenix.trace.PhoenixTableMetricsWriter
+# Only handle traces with a context of tracing
+hbase.sink.tracing.context=tracing

http://git-wip-us.apache.org/repos/asf/phoenix/blob/c72c4a65/bin/hadoop-metrics2-phoenix.properties
--
diff --git a/bin/hadoop-metrics2-phoenix.properties 
b/bin/hadoop-metrics2-phoenix.properties
new file mode 100644
index 000..4a5794d
--- /dev/null
+++ b/bin/hadoop-metrics2-phoenix.properties
@@ -0,0 +1,53 @@
+# Metrics properties for phoenix
+
+#
+#There are two options with file names:
+#  1. hadoop-metrics2-[prefix].properties
+#  2. hadoop-metrics2.properties
+# Either will be loaded by the metrics system (but not both).
+#
+# NOTE: The metrics system is only initialized once per JVM (but does 
ref-counting, so we can't
+#shutdown and restart), so we only load the first prefix that we find. 
Generally, this will be
+#phoenix (unless someone else registers first, but for many clients, there 
should only be one).
+#
+# Usually, you would use hadoop-metrics2-phoenix.properties, but we use the 
generic
+# hadoop-metrics2.properties to ensure it these are loaded regardless of where 
we are running,
+# assuming there isn't another config on the classpath.
+
+# When specifying sinks, the syntax to use is:
+#[prefix].[source|sink].[instance].[options]
+# The interesting thing to note is that [instance] can literally be anything 
(as long as its
+# not zero-length). It is only there to differentiate the properties that are 
stored for
+# objects of the same type (e.g. differentiating between two phoenix.sink 
objects).
+#
+#You could the following lines in your config
+#
+# phoenix.sink.thingA.class=com.your-company.SpecialSink
+# phoenix.sink.thingA.option1=value1
+#
+# and also
+#
+# phoenix.sink.thingB.class=org.apache.phoenix.trace.PhoenixMetricsSink
+# phoenix.sink.thingB.doGoodStuff=true
+#
+# which will create both SpecialSink and PhoenixMetricsSink and register them
+# as a MetricsSink, but Special sink will only see option1=value1 in its
+# configuration, which similarly, the instantiated PhoenixMetricsSink will
+# only see 

Jenkins build became unstable: Phoenix | 4.0 | Hadoop2 #157

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop2/157/changes



Jenkins build is back to stable : Phoenix | 4.0 | Hadoop2 #158

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-4.0-hadoop2/158/



[1/2] git commit: PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs

2014-09-23 Thread larsh
Repository: phoenix
Updated Branches:
  refs/heads/4.0 a329d3f42 - 954133c32
  refs/heads/master c72c4a65d - ed4163b7e


PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs


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

Branch: refs/heads/master
Commit: ed4163b7e52dd7ca270b7ee42bdf83bdd769966a
Parents: c72c4a6
Author: Lars Hofhansl la...@apache.org
Authored: Tue Sep 23 17:49:36 2014 -0700
Committer: Lars Hofhansl la...@apache.org
Committed: Tue Sep 23 17:49:36 2014 -0700

--
 .../phoenix/filter/ColumnProjectionFilter.java  | 21 ++--
 1 file changed, 11 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ed4163b7/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
index 032fb7e..a238e8e 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
@@ -129,27 +129,28 @@ public class ColumnProjectionFilter extends FilterBase 
implements Writable {
 }
 }
 
+// ptr to be used for one time comparisons in filterRowCells
+private ImmutableBytesPtr ptr = new ImmutableBytesPtr();
 @Override
 public void filterRowCells(ListCell kvs) throws IOException {
 if (kvs.isEmpty()) return;
-KeyValue firstKV = KeyValueUtil.ensureKeyValue(kvs.get(0));
+Cell firstKV = kvs.get(0);
 IteratorCell itr = kvs.iterator();
 while (itr.hasNext()) {
-KeyValue kv = KeyValueUtil.ensureKeyValue(itr.next());
-ImmutableBytesPtr f = new ImmutableBytesPtr(kv.getFamilyArray(),
-  kv.getFamilyOffset(), kv.getFamilyLength());
-if (this.columnsTracker.containsKey(f)) {
-SetImmutableBytesPtr cols = this.columnsTracker.get(f);
-ImmutableBytesPtr q = new 
ImmutableBytesPtr(kv.getQualifierArray(),
-  kv.getQualifierOffset(),
-kv.getQualifierLength());
-if (cols != null  !(cols.contains(q))) {
+Cell kv = itr.next();
+ptr.set(kv.getFamilyArray(), kv.getFamilyOffset(), 
kv.getFamilyLength());
+if (this.columnsTracker.containsKey(ptr)) {
+SetImmutableBytesPtr cols = this.columnsTracker.get(ptr);
+ptr.set(kv.getQualifierArray(), kv.getQualifierOffset(), 
kv.getQualifierLength());
+if (cols != null  !(cols.contains(ptr))) {
 itr.remove();
 }
 } else {
 itr.remove();
 }
 }
+// make sure we're not holding to any of the byte[]'s
+ptr.set(HConstants.EMPTY_BYTE_ARRAY);
 if (kvs.isEmpty()) {
 kvs.add(new KeyValue(firstKV.getRowArray(), 
firstKV.getRowOffset(),firstKV.getRowLength(), this.emptyCFName,
 0, this.emptyCFName.length, 
QueryConstants.EMPTY_COLUMN_BYTES, 0,



git commit: PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs

2014-09-23 Thread larsh
Repository: phoenix
Updated Branches:
  refs/heads/3.0 f4eb0cdf8 - ca776fe89


PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs


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

Branch: refs/heads/3.0
Commit: ca776fe8912b2316701f13342c1d736c44a0c6b4
Parents: f4eb0cd
Author: Lars Hofhansl la...@apache.org
Authored: Tue Sep 23 17:56:06 2014 -0700
Committer: Lars Hofhansl la...@apache.org
Committed: Tue Sep 23 17:56:06 2014 -0700

--
 .../phoenix/filter/ColumnProjectionFilter.java   | 15 +--
 1 file changed, 9 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/ca776fe8/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
index 8c5225f..0af3258 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/filter/ColumnProjectionFilter.java
@@ -103,6 +103,8 @@ public class ColumnProjectionFilter extends FilterBase {
 }
 }
 
+// ptr to be used for one time comparisons in filterRowCells
+private ImmutableBytesPtr ptr = new ImmutableBytesPtr();
 @Override
 public void filterRow(ListKeyValue kvs) {
 if (kvs.isEmpty()) return;
@@ -110,18 +112,19 @@ public class ColumnProjectionFilter extends FilterBase {
 IteratorKeyValue itr = kvs.iterator();
 while (itr.hasNext()) {
 KeyValue kv = itr.next();
-ImmutableBytesPtr f = new ImmutableBytesPtr(kv.getBuffer(), 
kv.getFamilyOffset(), kv.getFamilyLength());
-if (this.columnsTracker.containsKey(f)) {
-SetImmutableBytesPtr cols = this.columnsTracker.get(f);
-ImmutableBytesPtr q = new ImmutableBytesPtr(kv.getBuffer(), 
kv.getQualifierOffset(),
-kv.getQualifierLength());
-if (cols != null  !(cols.contains(q))) {
+ptr.set(kv.getBuffer(), kv.getFamilyOffset(), 
kv.getFamilyLength());
+if (this.columnsTracker.containsKey(ptr)) {
+SetImmutableBytesPtr cols = this.columnsTracker.get(ptr);
+ptr.set(kv.getBuffer(), kv.getQualifierOffset(), 
kv.getQualifierLength());
+if (cols != null  !(cols.contains(ptr))) {
 itr.remove();
 }
 } else {
 itr.remove();
 }
 }
+// make sure we're not holding to any of the byte[]'s
+ptr.set(HConstants.EMPTY_BYTE_ARRAY);
 if (kvs.isEmpty()) {
 kvs.add(new KeyValue(firstKV.getBuffer(), firstKV.getRowOffset(), 
firstKV.getRowLength(), this.emptyCFName,
 0, this.emptyCFName.length, 
QueryConstants.EMPTY_COLUMN_BYTES, 0,



Build failed in Jenkins: Phoenix | Master | Hadoop1 #379

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-master-hadoop1/379/changes

Changes:

[larsh] PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs

--
[...truncated 31510 lines...]
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-booter/2.17/surefire-booter-2.17.jar
 (39 KB at 1680.5 KB/sec)
108/144 KB   130/260 KB  
108/144 KB   134/260 KB   
108/144 KB   138/260 KB   
112/144 KB   138/260 KB   
112/144 KB   142/260 KB   
116/144 KB   142/260 KB   
120/144 KB   142/260 KB   
120/144 KB   144/260 KB   
124/144 KB   144/260 KB   
124/144 KB   148/260 KB   
128/144 KB   148/260 KB   
128/144 KB   152/260 KB   
132/144 KB   152/260 KB   
132/144 KB   154/260 KB   
136/144 KB   154/260 KB   
140/144 KB   154/260 KB   
140/144 KB   158/260 KB   
144/144 KB   158/260 KB   
144/144 KB   160/260 KB   
144/144 KB   160/260 KB   
144/144 KB   164/260 KB   
144/144 KB   168/260 KB   
144/144 KB   172/260 KB   
144/144 KB   176/260 KB   
144/144 KB   180/260 KB   
144/144 KB   181/260 KB   
144/144 KB   185/260 KB   
144/144 KB   189/260 KB   
144/144 KB   193/260 KB   
144/144 KB   197/260 KB   
144/144 KB   201/260 KB   
144/144 KB   204/260 KB   
144/144 KB   208/260 KB   
144/144 KB   212/260 KB   
144/144 KB   215/260 KB   
144/144 KB   219/260 KB   
144/144 KB   222/260 KB   
144/144 KB   226/260 KB   
144/144 KB   230/260 KB   
144/144 KB   234/260 KB   
144/144 KB   238/260 KB   
144/144 KB   242/260 KB   
144/144 KB   246/260 KB   
144/144 KB   246/260 KB   
  
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-api/2.17/surefire-api-2.17.jar
 (144 KB at 3996.0 KB/sec)
250/260 KB
254/260 KB   
258/260 KB   
260/260 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/maven-surefire-common/2.17/maven-surefire-common-2.17.jar
 (260 KB at 5399.4 KB/sec)
[INFO] Failsafe report directory: 
https://builds.apache.org/job/Phoenix-master-hadoop1/ws/phoenix-core/target/failsafe-reports
[INFO] parallel='none', perCoreThreadCount=true, threadCount=0, 
useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, 
threadCountMethods=0, parallelOptimized=true
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-junit47/2.17/surefire-junit47-2.17.pom
4/5 KB   
5/5 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-junit47/2.17/surefire-junit47-2.17.pom
 (5 KB at 227.4 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-providers/2.17/surefire-providers-2.17.pom
3/3 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-providers/2.17/surefire-providers-2.17.pom
 (3 KB at 136.6 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit48/2.17/common-junit48-2.17.pom
4/4 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit48/2.17/common-junit48-2.17.pom
 (4 KB at 182.6 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit4/2.17/common-junit4-2.17.pom
2/2 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit4/2.17/common-junit4-2.17.pom
 (2 KB at 117.4 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit3/2.17/common-junit3-2.17.pom
2/2 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit3/2.17/common-junit3-2.17.pom
 (2 KB at 89.8 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-java5/2.17/common-java5-2.17.pom
2/2 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-java5/2.17/common-java5-2.17.pom
 (2 KB at 99.1 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-grouper/2.17/surefire-grouper-2.17.pom
3/3 KB   
 
Downloaded: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-grouper/2.17/surefire-grouper-2.17.pom
 (3 KB at 144.9 KB/sec)
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit48/2.17/common-junit48-2.17.jar
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit4/2.17/common-junit4-2.17.jar
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-junit3/2.17/common-junit3-2.17.jar
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/surefire-junit47/2.17/surefire-junit47-2.17.jar
Downloading: 
http://repo.maven.apache.org/maven2/org/apache/maven/surefire/common-java5/2.17/common-java5-2.17.jar
4/18 KB   
8/18 KB   
12/18 KB   
16/18 KB   
18/18 KB   
18/18 KB   4/16 KB   
18/18 KB   

Apache-Phoenix | 4.0 | Hadoop1 | Build Successful

2014-09-23 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
[larsh] PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs



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

2014-09-23 Thread Apache Jenkins Server
See https://builds.apache.org/job/Phoenix-3.0-hadoop1/221/changes

Changes:

[larsh] PHOENIX-1280 ColumnProjectionFilter creates too many ImmutableBytesPtrs

--
[...truncated 568 lines...]
at org.junit.runners.Suite.runChild(Suite.java:127)
at org.junit.runners.Suite.runChild(Suite.java:26)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
at org.junit.runner.JUnitCore.run(JUnitCore.java:160)
at org.junit.runner.JUnitCore.run(JUnitCore.java:138)
at 
org.apache.maven.surefire.junitcore.JUnitCoreWrapper.createRequestAndRun(JUnitCoreWrapper.java:113)
at 
org.apache.maven.surefire.junitcore.JUnitCoreWrapper.executeLazy(JUnitCoreWrapper.java:94)
at 
org.apache.maven.surefire.junitcore.JUnitCoreWrapper.execute(JUnitCoreWrapper.java:58)
at 
org.apache.maven.surefire.junitcore.JUnitCoreProvider.invoke(JUnitCoreProvider.java:134)
at 
org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:200)
at 
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:153)
at 
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103)

org.apache.phoenix.end2end.SkipScanAfterManualSplitIT  Time elapsed: 6,713.54 
sec   FAILURE!
java.lang.AssertionError: null
at org.junit.Assert.fail(Assert.java:86)
at org.junit.Assert.assertTrue(Assert.java:41)
at org.junit.Assert.assertTrue(Assert.java:52)
at 
org.apache.phoenix.end2end.BaseHBaseManagedTimeIT.dropTables(BaseHBaseManagedTimeIT.java:70)
at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)
at 
sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)
at 
sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)
at java.lang.reflect.Method.invoke(Method.java:606)
at 
org.junit.runners.model.FrameworkMethod$1.runReflectiveCall(FrameworkMethod.java:47)
at 
org.junit.internal.runners.model.ReflectiveCallable.run(ReflectiveCallable.java:12)
at 
org.junit.runners.model.FrameworkMethod.invokeExplosively(FrameworkMethod.java:44)
at 
org.junit.internal.runners.statements.RunAfters.evaluate(RunAfters.java:33)
at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
at org.junit.runners.Suite.runChild(Suite.java:127)
at org.junit.runners.Suite.runChild(Suite.java:26)
at org.junit.runners.ParentRunner$3.run(ParentRunner.java:238)
at org.junit.runners.ParentRunner$1.schedule(ParentRunner.java:63)
at org.junit.runners.ParentRunner.runChildren(ParentRunner.java:236)
at org.junit.runners.ParentRunner.access$000(ParentRunner.java:53)
at org.junit.runners.ParentRunner$2.evaluate(ParentRunner.java:229)
at org.junit.runners.ParentRunner.run(ParentRunner.java:309)
at org.junit.runner.JUnitCore.run(JUnitCore.java:160)
at org.junit.runner.JUnitCore.run(JUnitCore.java:138)
at 
org.apache.maven.surefire.junitcore.JUnitCoreWrapper.createRequestAndRun(JUnitCoreWrapper.java:113)
at 
org.apache.maven.surefire.junitcore.JUnitCoreWrapper.executeLazy(JUnitCoreWrapper.java:94)
at 
org.apache.maven.surefire.junitcore.JUnitCoreWrapper.execute(JUnitCoreWrapper.java:58)
at 
org.apache.maven.surefire.junitcore.JUnitCoreProvider.invoke(JUnitCoreProvider.java:134)
at 
org.apache.maven.surefire.booter.ForkedBooter.invokeProviderInSameClassLoader(ForkedBooter.java:200)
at 
org.apache.maven.surefire.booter.ForkedBooter.runSuitesInProcess(ForkedBooter.java:153)
at 
org.apache.maven.surefire.booter.ForkedBooter.main(ForkedBooter.java:103)


Results :

Failed tests: 
  SkipScanAfterManualSplitITBaseHBaseManagedTimeIT.dropTables:70 null

Tests in error: 
  
SkipScanAfterManualSplitITBaseHBaseManagedTimeIT.cleanUpAfterTest:56-BaseTest.deletePriorTables:683-BaseTest.deletePriorTables:693-BaseTest.deletePriorTables:727
 ? PhoenixIO

Tests run: 409, Failures: 1, Errors: 1, Skipped: 0

[INFO] 
[INFO] --- maven-failsafe-plugin:2.17:integration-test (ClientManagedTimeTests) 
@ phoenix-core ---
[INFO] Failsafe report directory: 
/x1/jenkins/jenkins-slave/workspace/Phoenix-3.0-hadoop1/phoenix-core/target/failsafe-reports
[INFO] parallel='none', perCoreThreadCount=true, threadCount=0, 
useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, 
threadCountMethods=0, parallelOptimized=true