phoenix git commit: PHOENIX-1656 - Add release dir to gitignore
Repository: phoenix Updated Branches: refs/heads/3.2 f0e6f5d70 - acbfea4b8 PHOENIX-1656 - Add release dir to gitignore Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/acbfea4b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/acbfea4b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/acbfea4b Branch: refs/heads/3.2 Commit: acbfea4b8d36ad18a2d005b41e000e8fe1ccdec1 Parents: f0e6f5d Author: Mujtaba mujt...@apache.org Authored: Thu Feb 12 13:01:31 2015 -0800 Committer: Mujtaba mujt...@apache.org Committed: Thu Feb 12 13:01:31 2015 -0800 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/acbfea4b/.gitignore -- diff --git a/.gitignore b/.gitignore index 21a2c92..5f0dab5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ #maven stuffs target/ +release/
phoenix git commit: PHOENIX-1588 Fix for TableNotFoundException when optimizing SELECT * FROM a tenant-specific table
Repository: phoenix Updated Branches: refs/heads/4.0 4d58ef05a - 73d7275c3 PHOENIX-1588 Fix for TableNotFoundException when optimizing SELECT * FROM a tenant-specific table Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/73d7275c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/73d7275c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/73d7275c Branch: refs/heads/4.0 Commit: 73d7275c36a924dac54b660cb0bb33d108fcae2b Parents: 4d58ef0 Author: Thomas D'Silva twdsi...@gmail.com Authored: Tue Feb 10 21:06:43 2015 -0800 Committer: Thomas tdsi...@salesforce.com Committed: Thu Feb 12 14:39:50 2015 -0800 -- .../index/GlobalIndexOptimizationIT.java| 2 +- .../phoenix/compile/ProjectionCompiler.java | 28 ++-- 2 files changed, 21 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/73d7275c/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java index e4ba2c6..7fb879e 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/GlobalIndexOptimizationIT.java @@ -105,7 +105,7 @@ public class GlobalIndexOptimizationIT extends BaseHBaseManagedTimeIT { conn1.commit(); createIndex(TestUtil.DEFAULT_INDEX_TABLE_NAME, TestUtil.DEFAULT_DATA_TABLE_NAME, v1); -String query = SELECT /*+ INDEX( + TestUtil.DEFAULT_DATA_TABLE_NAME + + TestUtil.DEFAULT_INDEX_TABLE_NAME + )*/ t_id, k1, k2, k3, V1 FROM + TestUtil.DEFAULT_DATA_TABLE_NAME + where v1='a'; +String query = SELECT /*+ INDEX( + TestUtil.DEFAULT_DATA_TABLE_NAME + + TestUtil.DEFAULT_INDEX_TABLE_NAME + )*/ * FROM + TestUtil.DEFAULT_DATA_TABLE_NAME + where v1='a'; ResultSet rs = conn1.createStatement().executeQuery(EXPLAIN + query); String expected = http://git-wip-us.apache.org/repos/asf/phoenix/blob/73d7275c/phoenix-core/src/main/java/org/apache/phoenix/compile/ProjectionCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ProjectionCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ProjectionCompiler.java index 6b518b9..27fe0f9 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ProjectionCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ProjectionCompiler.java @@ -74,6 +74,7 @@ import org.apache.phoenix.schema.PColumnFamily; import org.apache.phoenix.schema.PDatum; import org.apache.phoenix.schema.PName; import org.apache.phoenix.schema.PTable; +import org.apache.phoenix.schema.TableNotFoundException; import org.apache.phoenix.schema.PTable.IndexType; import org.apache.phoenix.schema.PTable.ViewType; import org.apache.phoenix.schema.PTableKey; @@ -170,24 +171,35 @@ public class ProjectionCompiler { PhoenixConnection conn = context.getConnection(); PName tenantId = conn.getTenantId(); String tableName = index.getParentName().getString(); -PTable table = conn.getMetaDataCache().getTable(new PTableKey(tenantId, tableName)); -int tableOffset = table.getBucketNum() == null ? 0 : 1; -int minTablePKOffset = getMinPKOffset(table, tenantId); +PTable dataTable = null; +try { + dataTable = conn.getMetaDataCache().getTable(new PTableKey(tenantId, tableName)); +} catch (TableNotFoundException e) { +if (tenantId != null) { + // Check with null tenantId + dataTable = conn.getMetaDataCache().getTable(new PTableKey(null, tableName)); +} +else { + throw e; +} +} +int tableOffset = dataTable.getBucketNum() == null ? 0 : 1; +int minTablePKOffset = getMinPKOffset(dataTable, tenantId); int minIndexPKOffset = getMinPKOffset(index, tenantId); if (index.getIndexType() != IndexType.LOCAL) { -if (index.getColumns().size()-minIndexPKOffset != table.getColumns().size()-minTablePKOffset) { +if (index.getColumns().size()-minIndexPKOffset != dataTable.getColumns().size()-minTablePKOffset) { // We'll end up not using this by the optimizer, so just throw throw new ColumnNotFoundException(WildcardParseNode.INSTANCE.toString()); }
phoenix git commit: PHOENIX-1654 Incorrect group-by keys from ClientAggregatePlan
Repository: phoenix Updated Branches: refs/heads/3.0 be2267441 - c27661790 PHOENIX-1654 Incorrect group-by keys from ClientAggregatePlan Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c2766179 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c2766179 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c2766179 Branch: refs/heads/3.0 Commit: c2766179035985c65ef0031a0e0b68f89be541fa Parents: be22674 Author: maryannxue wei@intel.com Authored: Thu Feb 12 15:51:18 2015 -0500 Committer: maryannxue wei@intel.com Committed: Thu Feb 12 15:51:18 2015 -0500 -- .../java/org/apache/phoenix/end2end/HashJoinIT.java | 14 ++ .../org/apache/phoenix/end2end/SortMergeJoinIT.java | 14 ++ .../apache/phoenix/execute/ClientAggregatePlan.java | 2 +- 3 files changed, 29 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2766179/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java index e4f7065..a81d17c 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/HashJoinIT.java @@ -2638,6 +2638,20 @@ public class HashJoinIT extends BaseHBaseManagedTimeIT { + GROUP BY t1.TID, t1.A, t2.A); upsertStmt.execute(); conn.commit(); + +rs = statement.executeQuery(SELECT * FROM + joinTable); +assertTrue(rs.next()); +assertEquals(rs.getString(1), 1); +assertEquals(rs.getInt(2), 1); +assertEquals(rs.getInt(3), 2); +assertEquals(rs.getInt(4), 2); +assertTrue(rs.next()); +assertEquals(rs.getString(1), 1); +assertEquals(rs.getInt(2), 2); +assertEquals(rs.getInt(3), 1); +assertEquals(rs.getInt(4), 2); + +assertFalse(rs.next()); } finally { conn.close(); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2766179/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java index 736a991..7cb2111 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/SortMergeJoinIT.java @@ -2029,6 +2029,20 @@ public class SortMergeJoinIT extends BaseHBaseManagedTimeIT { + GROUP BY t1.TID, t1.A, t2.A); upsertStmt.execute(); conn.commit(); + +rs = statement.executeQuery(SELECT * FROM + joinTable); +assertTrue(rs.next()); +assertEquals(rs.getString(1), 1); +assertEquals(rs.getInt(2), 1); +assertEquals(rs.getInt(3), 2); +assertEquals(rs.getInt(4), 2); +assertTrue(rs.next()); +assertEquals(rs.getString(1), 1); +assertEquals(rs.getInt(2), 2); +assertEquals(rs.getInt(3), 1); +assertEquals(rs.getInt(4), 2); + +assertFalse(rs.next()); } finally { conn.close(); } http://git-wip-us.apache.org/repos/asf/phoenix/blob/c2766179/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientAggregatePlan.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientAggregatePlan.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientAggregatePlan.java index 8cd5a40..0ff7277 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientAggregatePlan.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/ClientAggregatePlan.java @@ -100,7 +100,7 @@ public class ClientAggregatePlan extends ClientProcessingPlan { } iterator = new OrderedResultIterator(iterator, keyExpressionOrderBy, thresholdBytes, limit, projector.getEstimatedRowByteSize()); } -aggResultIterator = new ClientGroupedAggregatingResultIterator(LookAheadResultIterator.wrap(iterator), serverAggregators, groupBy.getExpressions()); +aggResultIterator = new ClientGroupedAggregatingResultIterator(LookAheadResultIterator.wrap(iterator), serverAggregators, groupBy.getKeyExpressions());
phoenix git commit: PHOENIX-1656 - Add release dir to gitignore
Repository: phoenix Updated Branches: refs/heads/4.2 907f9c25c - a66a02cbd PHOENIX-1656 - Add release dir to gitignore Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/a66a02cb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/a66a02cb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/a66a02cb Branch: refs/heads/4.2 Commit: a66a02cbdca670f8da1e38a7efcfb8a43f83d741 Parents: 907f9c2 Author: Mujtaba mujt...@apache.org Authored: Thu Feb 12 12:58:39 2015 -0800 Committer: Mujtaba mujt...@apache.org Committed: Thu Feb 12 12:58:39 2015 -0800 -- .gitignore | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/a66a02cb/.gitignore -- diff --git a/.gitignore b/.gitignore index 21a2c92..5f0dab5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ #maven stuffs target/ +release/
Build failed in Jenkins: Phoenix | Master #590
See https://builds.apache.org/job/Phoenix-master/590/changes Changes: [maryannxue] PHOENIX-1654 Incorrect group-by keys from ClientAggregatePlan [mujtaba] PHOENIX-1656 - Add release dir to gitignore -- [...truncated 411 lines...] Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 33.586 sec - in org.apache.phoenix.end2end.UpsertSelectIT Running org.apache.phoenix.end2end.IsNullIT Running org.apache.phoenix.end2end.RowValueConstructorIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.861 sec - in org.apache.phoenix.end2end.IsNullIT Running org.apache.phoenix.end2end.ArrayIT Tests run: 63, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 46.693 sec - in org.apache.phoenix.end2end.CaseStatementIT Running org.apache.phoenix.end2end.GroupByCaseIT Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 29.445 sec - in org.apache.phoenix.end2end.CreateTableIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.828 sec - in org.apache.phoenix.end2end.GroupByCaseIT Running org.apache.phoenix.end2end.SpooledOrderByIT Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.8 sec - in org.apache.phoenix.end2end.SpooledOrderByIT Running org.apache.phoenix.end2end.GroupByIT Tests run: 48, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 22.087 sec - in org.apache.phoenix.end2end.ArrayIT Running org.apache.phoenix.end2end.ProductMetricsIT Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 40.359 sec - in org.apache.phoenix.end2end.RowValueConstructorIT Tests run: 61, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.906 sec - in org.apache.phoenix.end2end.ProductMetricsIT Tests run: 126, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 90.834 sec - in org.apache.phoenix.end2end.QueryIT Tests run: 91, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 66.676 sec - in org.apache.phoenix.end2end.GroupByIT Tests run: 210, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 123.503 sec - in org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT Results : Tests run: 1227, Failures: 0, Errors: 0, Skipped: 0 [INFO] [INFO] --- maven-failsafe-plugin:2.18:integration-test (HBaseManagedTimeTests) @ phoenix-core --- [INFO] Failsafe report directory: /x1/jenkins/jenkins-slave/workspace/Phoenix-master/phoenix-core/target/failsafe-reports [INFO] parallel='none', perCoreThreadCount=true, threadCount=0, useUnlimitedThreads=false, threadCountSuites=0, threadCountClasses=0, threadCountMethods=0, parallelOptimized=true --- T E S T S --- Running org.apache.phoenix.end2end.DeleteIT Running org.apache.phoenix.end2end.QueryExecWithoutSCNIT Running org.apache.phoenix.end2end.TenantSpecificViewIndexIT Running org.apache.phoenix.end2end.BinaryRowKeyIT Running org.apache.phoenix.end2end.SkipScanQueryIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.487 sec - in org.apache.phoenix.end2end.BinaryRowKeyIT Running org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.002 sec - in org.apache.phoenix.end2end.QueryExecWithoutSCNIT Running org.apache.phoenix.end2end.EncodeFunctionIT Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.972 sec - in org.apache.phoenix.end2end.EncodeFunctionIT Running org.apache.phoenix.end2end.TimezoneOffsetFunctionIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 11.821 sec - in org.apache.phoenix.end2end.TenantSpecificViewIndexSaltedIT Running org.apache.phoenix.end2end.index.GlobalMutableIndexIT Tests run: 9, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 18.426 sec - in org.apache.phoenix.end2end.SkipScanQueryIT Tests run: 6, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.638 sec - in org.apache.phoenix.end2end.TimezoneOffsetFunctionIT Running org.apache.phoenix.end2end.index.GlobalIndexOptimizationIT Running org.apache.phoenix.end2end.index.ViewIndexIT Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.496 sec - in org.apache.phoenix.end2end.TenantSpecificViewIndexIT Running org.apache.phoenix.end2end.index.DropViewIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 6.387 sec - in org.apache.phoenix.end2end.index.ViewIndexIT Running org.apache.phoenix.end2end.index.IndexMetadataIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.775 sec - in org.apache.phoenix.end2end.index.DropViewIT Running org.apache.phoenix.end2end.index.SaltedIndexIT Tests run: 20, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 36.411 sec - in org.apache.phoenix.end2end.DeleteIT Running org.apache.phoenix.end2end.index.LocalMutableIndexIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 21.757 sec - in
Jenkins build is back to normal : Phoenix | Master #591
See https://builds.apache.org/job/Phoenix-master/591/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 [thomas] PHOENIX 1588 Fix for TableNotFoundException when optimizing SELECT * FROM a tenant-specific table Build times for last couple of runsLatest build time is the right most | Legend blue: normal, red: test failure, gray: timeout
phoenix git commit: PHOENIX-1656 - Add release dir to gitignore
Repository: phoenix Updated Branches: refs/heads/4.0 225d72595 - 4d58ef05a PHOENIX-1656 - Add release dir to gitignore Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4d58ef05 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4d58ef05 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4d58ef05 Branch: refs/heads/4.0 Commit: 4d58ef05a73431578017d160a7bb98f786028d33 Parents: 225d725 Author: Mujtaba mujt...@apache.org Authored: Thu Feb 12 12:54:09 2015 -0800 Committer: Mujtaba mujt...@apache.org Committed: Thu Feb 12 12:54:09 2015 -0800 -- .gitignore | 1 + .../src/phoenix-4.3.0-SNAPSHOT-src.tar.gz| Bin 1469150 - 0 bytes 2 files changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4d58ef05/.gitignore -- diff --git a/.gitignore b/.gitignore index 21a2c92..5f0dab5 100644 --- a/.gitignore +++ b/.gitignore @@ -15,3 +15,4 @@ #maven stuffs target/ +release/ http://git-wip-us.apache.org/repos/asf/phoenix/blob/4d58ef05/release/phoenix-4.3.0-SNAPSHOT/src/phoenix-4.3.0-SNAPSHOT-src.tar.gz -- diff --git a/release/phoenix-4.3.0-SNAPSHOT/src/phoenix-4.3.0-SNAPSHOT-src.tar.gz b/release/phoenix-4.3.0-SNAPSHOT/src/phoenix-4.3.0-SNAPSHOT-src.tar.gz deleted file mode 100644 index a13e75c..000 Binary files a/release/phoenix-4.3.0-SNAPSHOT/src/phoenix-4.3.0-SNAPSHOT-src.tar.gz and /dev/null differ