git commit: PHOENIX-1249 Support local immutable index
Repository: phoenix Updated Branches: refs/heads/4.0 c0c4bdf10 - 6d91f8c4c PHOENIX-1249 Support local immutable index Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6d91f8c4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6d91f8c4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6d91f8c4 Branch: refs/heads/4.0 Commit: 6d91f8c4c27fe0c843412b010529a12195e0be23 Parents: c0c4bdf Author: Rajeshbabu Chintaguntla rajeshbabu.chintagun...@huawei.com Authored: Tue Sep 30 07:40:17 2014 +0530 Committer: Rajeshbabu Chintaguntla rajeshbabu.chintagun...@huawei.com Committed: Tue Sep 30 19:41:54 2014 +0530 -- .../org/apache/phoenix/end2end/DeleteIT.java| 11 +- .../phoenix/end2end/index/ImmutableIndexIT.java | 74 -- .../phoenix/end2end/index/LocalIndexIT.java | 60 +++ .../apache/phoenix/compile/DeleteCompiler.java | 13 ++- .../hbase/index/covered/IndexUpdate.java| 2 +- .../apache/phoenix/index/IndexMaintainer.java | 55 -- .../phoenix/index/PhoenixIndexBuilder.java | 20 +++- .../apache/phoenix/index/PhoenixIndexCodec.java | 101 +++ .../apache/phoenix/schema/MetaDataClient.java | 3 - 9 files changed, 255 insertions(+), 84 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6d91f8c4/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java index 337e49b..677fb53 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/DeleteIT.java @@ -344,6 +344,15 @@ public class DeleteIT extends BaseHBaseManagedTimeIT { @Test public void testDeleteRowFromTableWithImmutableIndex() throws SQLException { +testDeleteRowFromTableWithImmutableIndex(false); +} + +@Test +public void testDeleteRowFromTableWithImmutableLocalIndex() throws SQLException { +testDeleteRowFromTableWithImmutableIndex(true); +} + +public void testDeleteRowFromTableWithImmutableIndex(boolean localIndex) throws SQLException { Connection con = null; try { boolean autoCommit = false; @@ -360,7 +369,7 @@ public class DeleteIT extends BaseHBaseManagedTimeIT { USAGE.DB BIGINT, + STATS.ACTIVE_VISITOR INTEGER + CONSTRAINT PK PRIMARY KEY (HOST, DOMAIN, FEATURE, DATE)) IMMUTABLE_ROWS=true); -stm.execute(CREATE INDEX web_stats_idx ON web_stats (DATE, FEATURE)); +stm.execute(CREATE + (localIndex ? LOCAL : ) + INDEX web_stats_idx ON web_stats (DATE, FEATURE)); stm.close(); Date date = new Date(0); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6d91f8c4/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 b522931..c1a50da 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 @@ -113,12 +113,21 @@ public class ImmutableIndexIT extends BaseHBaseManagedTimeIT { @Test public void testIndexWithNullableFixedWithCols() throws Exception { +testIndexWithNullableFixedWithCols(false); +} + +@Test +public void testLocalIndexWithNullableFixedWithCols() throws Exception { +testIndexWithNullableFixedWithCols(true); +} + +public void testIndexWithNullableFixedWithCols(boolean localIndex) throws Exception { Properties props = PropertiesUtil.deepCopy(TEST_PROPERTIES); Connection conn = DriverManager.getConnection(getUrl(), props); conn.setAutoCommit(false); ensureTableCreated(getUrl(), INDEX_DATA_TABLE); populateTestTable(); -String ddl = CREATE INDEX IDX ON + INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + INDEX_DATA_TABLE +String ddl = CREATE + (localIndex ? LOCAL : ) + INDEX IDX ON + INDEX_DATA_SCHEMA + QueryConstants.NAME_SEPARATOR + INDEX_DATA_TABLE + (char_col1 ASC, int_col1 ASC) + INCLUDE (long_col1, long_col2); PreparedStatement stmt = conn.prepareStatement(ddl); @@ -126,7 +135,13 @@ public class ImmutableIndexIT extends BaseHBaseManagedTimeIT {
[3/3] git commit: PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core
PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/aaadb360 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aaadb360 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aaadb360 Branch: refs/heads/3.0 Commit: aaadb360e20b117e0475c6f6fbc71e3b0b7c0f7e Parents: 71cc391 Author: Andrew Purtell apurt...@apache.org Authored: Tue Sep 30 16:35:42 2014 -0700 Committer: Andrew Purtell apurt...@apache.org Committed: Tue Sep 30 16:35:42 2014 -0700 -- phoenix-core/pom.xml | 1 + phoenix-flume/pom.xml | 1 + phoenix-pig/pom.xml | 1 + 3 files changed, 3 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/aaadb360/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index 6d3c0c5..7e4d3cd 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -251,6 +251,7 @@ dependency groupIdorg.apache.hbase/groupId artifactIdhbase/artifactId + scopetest/scope typetest-jar/type /dependency !-- Needed by HBase to run the minicluster -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/aaadb360/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index 7d9c48a..9abda53 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -56,6 +56,7 @@ dependency groupIdorg.apache.hbase/groupId artifactIdhbase/artifactId + scopetest/scope typetest-jar/type /dependency /dependencies http://git-wip-us.apache.org/repos/asf/phoenix/blob/aaadb360/phoenix-pig/pom.xml -- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index e3b7a0f..b46c7dd 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -53,6 +53,7 @@ dependency groupIdorg.apache.hbase/groupId artifactIdhbase/artifactId + scopetest/scope typetest-jar/type /dependency dependency
[1/3] git commit: PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core
Repository: phoenix Updated Branches: refs/heads/3.0 71cc391b2 - aaadb360e refs/heads/4.0 6d91f8c4c - 846ed101a refs/heads/master f28fb8b7c - fff2edb4d PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/fff2edb4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/fff2edb4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/fff2edb4 Branch: refs/heads/master Commit: fff2edb4d0a10cd19e13d80465a4b0653ab0ab6b Parents: f28fb8b Author: Andrew Purtell apurt...@apache.org Authored: Tue Sep 30 16:26:39 2014 -0700 Committer: Andrew Purtell apurt...@apache.org Committed: Tue Sep 30 16:26:39 2014 -0700 -- phoenix-core/pom.xml | 2 ++ phoenix-flume/pom.xml | 2 ++ phoenix-pig/pom.xml | 2 ++ pom.xml | 7 +++ 4 files changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/fff2edb4/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index d9ac9eb..bbd262b 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -336,6 +336,8 @@ dependency groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId + scopetest/scope + optionaltrue/optional /dependency dependency groupIdorg.apache.hbase/groupId http://git-wip-us.apache.org/repos/asf/phoenix/blob/fff2edb4/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index d023cc4..731955e 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -86,6 +86,8 @@ groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId version${hbase.version}/version + scopetest/scope + optionaltrue/optional exclusions exclusion groupIdorg.jruby/groupId http://git-wip-us.apache.org/repos/asf/phoenix/blob/fff2edb4/phoenix-pig/pom.xml -- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 6c912f9..ea83513 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -55,6 +55,8 @@ groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId version${hbase.version}/version + scopetest/scope + optionaltrue/optional exclusions exclusion groupIdorg.jruby/groupId http://git-wip-us.apache.org/repos/asf/phoenix/blob/fff2edb4/pom.xml -- diff --git a/pom.xml b/pom.xml index 4c83363..34a88b0 100644 --- a/pom.xml +++ b/pom.xml @@ -448,6 +448,8 @@ groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId version${hbase.version}/version +scopetest/scope +optionaltrue/optional exclusions exclusion groupIdorg.jruby/groupId @@ -472,6 +474,11 @@ /dependency dependency groupIdorg.apache.hbase/groupId +artifactIdhbase-server/artifactId +version${hbase.version}/version + /dependency + dependency +groupIdorg.apache.hbase/groupId artifactIdhbase-hadoop-compat/artifactId version${hbase.version}/version /dependency
[2/3] git commit: PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core
PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/846ed101 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/846ed101 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/846ed101 Branch: refs/heads/4.0 Commit: 846ed101a33bfc34546f327e9e90e8c572e2372b Parents: 6d91f8c Author: Andrew Purtell apurt...@apache.org Authored: Tue Sep 30 16:26:39 2014 -0700 Committer: Andrew Purtell apurt...@apache.org Committed: Tue Sep 30 16:26:45 2014 -0700 -- phoenix-core/pom.xml | 2 ++ phoenix-flume/pom.xml | 2 ++ phoenix-pig/pom.xml | 2 ++ pom.xml | 7 +++ 4 files changed, 13 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/846ed101/phoenix-core/pom.xml -- diff --git a/phoenix-core/pom.xml b/phoenix-core/pom.xml index d5ec5fe..5b7d63d 100644 --- a/phoenix-core/pom.xml +++ b/phoenix-core/pom.xml @@ -336,6 +336,8 @@ dependency groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId + scopetest/scope + optionaltrue/optional /dependency dependency groupIdorg.apache.hbase/groupId http://git-wip-us.apache.org/repos/asf/phoenix/blob/846ed101/phoenix-flume/pom.xml -- diff --git a/phoenix-flume/pom.xml b/phoenix-flume/pom.xml index a7fd0c6..d76a9fe 100644 --- a/phoenix-flume/pom.xml +++ b/phoenix-flume/pom.xml @@ -86,6 +86,8 @@ groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId version${hbase.version}/version + scopetest/scope + optionaltrue/optional exclusions exclusion groupIdorg.jruby/groupId http://git-wip-us.apache.org/repos/asf/phoenix/blob/846ed101/phoenix-pig/pom.xml -- diff --git a/phoenix-pig/pom.xml b/phoenix-pig/pom.xml index 4d427d1..825c8da 100644 --- a/phoenix-pig/pom.xml +++ b/phoenix-pig/pom.xml @@ -55,6 +55,8 @@ groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId version${hbase.version}/version + scopetest/scope + optionaltrue/optional exclusions exclusion groupIdorg.jruby/groupId http://git-wip-us.apache.org/repos/asf/phoenix/blob/846ed101/pom.xml -- diff --git a/pom.xml b/pom.xml index f9b9cad..ebce9b3 100644 --- a/pom.xml +++ b/pom.xml @@ -448,6 +448,8 @@ groupIdorg.apache.hbase/groupId artifactIdhbase-testing-util/artifactId version${hbase.version}/version +scopetest/scope +optionaltrue/optional exclusions exclusion groupIdorg.jruby/groupId @@ -472,6 +474,11 @@ /dependency dependency groupIdorg.apache.hbase/groupId +artifactIdhbase-server/artifactId +version${hbase.version}/version + /dependency + dependency +groupIdorg.apache.hbase/groupId artifactIdhbase-hadoop-compat/artifactId version${hbase.version}/version /dependency
Apache-Phoenix | 4.0 | Hadoop1 | Build Successful
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 [apurtell] PHOENIX-1272 Avoid pulling in unintended HBase dependencies in phoenix-core
Jenkins build is back to normal : Phoenix | Master | Hadoop1 #395
See https://builds.apache.org/job/Phoenix-master-hadoop1/395/changes
Apache-Phoenix | 3.0 | Hadoop1 | Build Successful
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 [ramkrishna] Phoenix-1264 Add StatisticsCollector to existing tables on first