phoenix git commit: PHOENIX-1552 Add a self-contained sandbox
Repository: phoenix Updated Branches: refs/heads/4.0 7578ee92b - 968e431b3 PHOENIX-1552 Add a self-contained sandbox Add a sandbox that can be started via the phoenix_sandbox.py script. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/968e431b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/968e431b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/968e431b Branch: refs/heads/4.0 Commit: 968e431b3e750d515ff29a4d3b9dc8fa8db82bc7 Parents: 7578ee9 Author: Gabriel Reid gabri...@ngdata.com Authored: Tue Dec 23 15:44:46 2014 +0100 Committer: Gabriel Reid gabri...@ngdata.com Committed: Mon Jan 12 10:25:04 2015 +0100 -- bin/phoenix_sandbox.py | 59 + bin/sandbox-log4j.properties| 45 + phoenix-core/pom.xml| 15 + .../src/it/java/org/apache/phoenix/Sandbox.java | 67 4 files changed, 186 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/968e431b/bin/phoenix_sandbox.py -- diff --git a/bin/phoenix_sandbox.py b/bin/phoenix_sandbox.py new file mode 100755 index 000..c4fb841 --- /dev/null +++ b/bin/phoenix_sandbox.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +# +# 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. +# + + +import os +import subprocess +import sys +import phoenix_utils + +phoenix_utils.setPath() + +base_dir = os.path.join(phoenix_utils.current_dir, '..') +phoenix_target_dir = os.path.join(base_dir, 'phoenix-core', 'target') + +cp_file_path = os.path.join(phoenix_target_dir, 'cached_classpath.txt') + + +if not os.path.exists(cp_file_path): +sys.err.write(cached_classpath.txt is not present under ++ phoenix-core/target, please rebuild the project first) +sys.exit(1) + +logging_config = os.path.join(base_dir, 'bin', 'sandbox-log4j.properties') + +cp_components = [phoenix_target_dir + /*] +with open(cp_file_path, 'rb') as cp_file: +cp_components.append(cp_file.read()) + +java_cmd = (java -Dlog4j.configuration=file:%s + +-cp %s org.apache.phoenix.Sandbox) % ( +logging_config, :.join(cp_components)) + +proc = subprocess.Popen(java_cmd, shell=True) +try: +proc.wait() +except KeyboardInterrupt: +print Shutting down sandbox... +proc.terminate() + +proc.wait() + +print Sandbox is stopped http://git-wip-us.apache.org/repos/asf/phoenix/blob/968e431b/bin/sandbox-log4j.properties -- diff --git a/bin/sandbox-log4j.properties b/bin/sandbox-log4j.properties new file mode 100644 index 000..a30f129 --- /dev/null +++ b/bin/sandbox-log4j.properties @@ -0,0 +1,45 @@ +# +# +# 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. +# +# + +# Define some default values that can be overridden by system properties +sandbox.root.logger=INFO,console + +# Define the root logger to the system property plsql.root.logger. +log4j.rootLogger=${sandbox.root.logger} + +# Logging Threshold +log4j.threshold=WARN + +# +# console +# Add console
phoenix git commit: PHOENIX-1552 Add a self-contained sandbox
Repository: phoenix Updated Branches: refs/heads/master a6538d792 - 13aa61a86 PHOENIX-1552 Add a self-contained sandbox Add a sandbox that can be started via the phoenix_sandbox.py script. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/13aa61a8 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/13aa61a8 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/13aa61a8 Branch: refs/heads/master Commit: 13aa61a86f0e2de84df184646c9ea7d730b0720f Parents: a6538d7 Author: Gabriel Reid gabri...@ngdata.com Authored: Tue Dec 23 15:44:46 2014 +0100 Committer: Gabriel Reid gabri...@ngdata.com Committed: Mon Jan 12 10:24:53 2015 +0100 -- bin/phoenix_sandbox.py | 59 + bin/sandbox-log4j.properties| 45 + phoenix-core/pom.xml| 15 + .../src/it/java/org/apache/phoenix/Sandbox.java | 67 4 files changed, 186 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/13aa61a8/bin/phoenix_sandbox.py -- diff --git a/bin/phoenix_sandbox.py b/bin/phoenix_sandbox.py new file mode 100755 index 000..c4fb841 --- /dev/null +++ b/bin/phoenix_sandbox.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +# +# 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. +# + + +import os +import subprocess +import sys +import phoenix_utils + +phoenix_utils.setPath() + +base_dir = os.path.join(phoenix_utils.current_dir, '..') +phoenix_target_dir = os.path.join(base_dir, 'phoenix-core', 'target') + +cp_file_path = os.path.join(phoenix_target_dir, 'cached_classpath.txt') + + +if not os.path.exists(cp_file_path): +sys.err.write(cached_classpath.txt is not present under ++ phoenix-core/target, please rebuild the project first) +sys.exit(1) + +logging_config = os.path.join(base_dir, 'bin', 'sandbox-log4j.properties') + +cp_components = [phoenix_target_dir + /*] +with open(cp_file_path, 'rb') as cp_file: +cp_components.append(cp_file.read()) + +java_cmd = (java -Dlog4j.configuration=file:%s + +-cp %s org.apache.phoenix.Sandbox) % ( +logging_config, :.join(cp_components)) + +proc = subprocess.Popen(java_cmd, shell=True) +try: +proc.wait() +except KeyboardInterrupt: +print Shutting down sandbox... +proc.terminate() + +proc.wait() + +print Sandbox is stopped http://git-wip-us.apache.org/repos/asf/phoenix/blob/13aa61a8/bin/sandbox-log4j.properties -- diff --git a/bin/sandbox-log4j.properties b/bin/sandbox-log4j.properties new file mode 100644 index 000..a30f129 --- /dev/null +++ b/bin/sandbox-log4j.properties @@ -0,0 +1,45 @@ +# +# +# 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. +# +# + +# Define some default values that can be overridden by system properties +sandbox.root.logger=INFO,console + +# Define the root logger to the system property plsql.root.logger. +log4j.rootLogger=${sandbox.root.logger} + +# Logging Threshold +log4j.threshold=WARN + +# +# console +# Add
phoenix git commit: PHOENIX-1552 Add a self-contained sandbox
Repository: phoenix Updated Branches: refs/heads/3.0 912e530ae - 2e957f63c PHOENIX-1552 Add a self-contained sandbox Add a sandbox that can be started via the phoenix_sandbox.py script. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2e957f63 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2e957f63 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2e957f63 Branch: refs/heads/3.0 Commit: 2e957f63c7b095d5c36f2ce86eae7ad256d55108 Parents: 912e530 Author: Gabriel Reid gabri...@ngdata.com Authored: Tue Dec 23 15:44:46 2014 +0100 Committer: Gabriel Reid gabri...@ngdata.com Committed: Mon Jan 12 10:26:19 2015 +0100 -- bin/phoenix_sandbox.py | 59 + bin/sandbox-log4j.properties| 45 + phoenix-core/pom.xml| 19 ++ .../src/it/java/org/apache/phoenix/Sandbox.java | 67 4 files changed, 190 insertions(+) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2e957f63/bin/phoenix_sandbox.py -- diff --git a/bin/phoenix_sandbox.py b/bin/phoenix_sandbox.py new file mode 100755 index 000..c4fb841 --- /dev/null +++ b/bin/phoenix_sandbox.py @@ -0,0 +1,59 @@ +#!/usr/bin/env python + +# +# 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. +# + + +import os +import subprocess +import sys +import phoenix_utils + +phoenix_utils.setPath() + +base_dir = os.path.join(phoenix_utils.current_dir, '..') +phoenix_target_dir = os.path.join(base_dir, 'phoenix-core', 'target') + +cp_file_path = os.path.join(phoenix_target_dir, 'cached_classpath.txt') + + +if not os.path.exists(cp_file_path): +sys.err.write(cached_classpath.txt is not present under ++ phoenix-core/target, please rebuild the project first) +sys.exit(1) + +logging_config = os.path.join(base_dir, 'bin', 'sandbox-log4j.properties') + +cp_components = [phoenix_target_dir + /*] +with open(cp_file_path, 'rb') as cp_file: +cp_components.append(cp_file.read()) + +java_cmd = (java -Dlog4j.configuration=file:%s + +-cp %s org.apache.phoenix.Sandbox) % ( +logging_config, :.join(cp_components)) + +proc = subprocess.Popen(java_cmd, shell=True) +try: +proc.wait() +except KeyboardInterrupt: +print Shutting down sandbox... +proc.terminate() + +proc.wait() + +print Sandbox is stopped http://git-wip-us.apache.org/repos/asf/phoenix/blob/2e957f63/bin/sandbox-log4j.properties -- diff --git a/bin/sandbox-log4j.properties b/bin/sandbox-log4j.properties new file mode 100644 index 000..a30f129 --- /dev/null +++ b/bin/sandbox-log4j.properties @@ -0,0 +1,45 @@ +# +# +# 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. +# +# + +# Define some default values that can be overridden by system properties +sandbox.root.logger=INFO,console + +# Define the root logger to the system property plsql.root.logger. +log4j.rootLogger=${sandbox.root.logger} + +# Logging Threshold +log4j.threshold=WARN + +# +# console +# Add
Apache-Phoenix | 4.0 | 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/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0/lastCompletedBuild/testReport/ Changes [gabrielr] PHOENIX-1552 Add a self-contained sandbox
Apache-Phoenix | Master | Build Successful
Master 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-master/lastSuccessfulBuild/artifact/ Last Complete Test Report https://builds.apache.org/job/Phoenix-master/lastCompletedBuild/testReport/ Changes [gabrielr] PHOENIX-1552 Add a self-contained sandbox
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 [gabrielr] PHOENIX-1552 Add a self-contained sandbox
phoenix git commit: PHOENIX-1570 Data missing when using local index (Maryann Xue, James Taylor)
Repository: phoenix Updated Branches: refs/heads/4.0 968e431b3 - b871f0693 PHOENIX-1570 Data missing when using local index (Maryann Xue, James Taylor) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b871f069 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b871f069 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b871f069 Branch: refs/heads/4.0 Commit: b871f069385a6c7ac83ebcc65a56bf0476353689 Parents: 968e431 Author: James Taylor jtay...@salesforce.com Authored: Mon Jan 12 12:10:14 2015 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Mon Jan 12 12:12:06 2015 -0800 -- .../phoenix/end2end/index/LocalIndexIT.java | 12 ++-- .../apache/phoenix/compile/GroupByCompiler.java | 7 +-- .../apache/phoenix/execute/AggregatePlan.java | 59 +++- .../expression/ProjectedColumnExpression.java | 41 +++--- .../phoenix/compile/QueryCompilerTest.java | 18 +++--- 5 files changed, 69 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b871f069/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java index a9e7304..2a9a82d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java @@ -59,7 +59,7 @@ import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.hbase.index.IndexRegionSplitPolicy; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; -import org.apache.phoenix.jdbc.PhoenixPreparedStatement; +import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; @@ -480,10 +480,6 @@ public class LocalIndexIT extends BaseHBaseManagedTimeIT { assertEquals(z, rs.getString(V1)); query = SELECT v1,sum(k3) from + TestUtil.DEFAULT_DATA_TABLE_FULL_NAME + where v1 ='z' group by v1 order by v1; -PhoenixPreparedStatement statement = conn1.prepareStatement(query).unwrap(PhoenixPreparedStatement.class); -QueryPlan plan = statement.compileQuery(EXPLAIN + query); -assertTrue(query, plan.getContext().getScan().getAttribute(BaseScannerRegionObserver.KEY_ORDERED_GROUP_BY_EXPRESSIONS) == null); -assertTrue(query, plan.getContext().getScan().getAttribute(BaseScannerRegionObserver.UNORDERED_GROUP_BY_EXPRESSIONS) != null); rs = conn1.createStatement().executeQuery(EXPLAIN + query); assertEquals( @@ -492,7 +488,11 @@ public class LocalIndexIT extends BaseHBaseManagedTimeIT { + SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [V1]\nCLIENT MERGE SORT, QueryUtil.getExplainPlan(rs)); -rs = conn1.createStatement().executeQuery(query); +PhoenixStatement stmt = conn1.createStatement().unwrap(PhoenixStatement.class); +rs = stmt.executeQuery(query); +QueryPlan plan = stmt.getQueryPlan(); +assertEquals(TestUtil.DEFAULT_INDEX_TABLE_NAME, plan.getContext().getCurrentTable().getTable().getName().getString()); + assertEquals(BaseScannerRegionObserver.KEY_ORDERED_GROUP_BY_EXPRESSIONS, plan.getGroupBy().getScanAttribName()); assertTrue(rs.next()); assertEquals(a, rs.getString(1)); assertEquals(5, rs.getInt(2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/b871f069/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java index ecb238a..4f1ba5b 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java @@ -27,7 +27,6 @@ import org.apache.http.annotation.Immutable; import org.apache.phoenix.compile.TrackOrderPreservingExpressionCompiler.Entry; import org.apache.phoenix.compile.TrackOrderPreservingExpressionCompiler.Ordering; import org.apache.phoenix.coprocessor.BaseScannerRegionObserver; -import org.apache.phoenix.coprocessor.GroupedAggregateRegionObserver; import org.apache.phoenix.exception.SQLExceptionCode;
phoenix git commit: PHOENIX-1570 Data missing when using local index (Maryann Xue, James Taylor)
Repository: phoenix Updated Branches: refs/heads/master 13aa61a86 - 6f16a6a62 PHOENIX-1570 Data missing when using local index (Maryann Xue, James Taylor) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6f16a6a6 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6f16a6a6 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6f16a6a6 Branch: refs/heads/master Commit: 6f16a6a629fdeca587f38fe6e1349a2b6f0fabd8 Parents: 13aa61a Author: James Taylor jtay...@salesforce.com Authored: Mon Jan 12 12:10:14 2015 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Mon Jan 12 12:10:41 2015 -0800 -- .../phoenix/end2end/index/LocalIndexIT.java | 12 ++-- .../apache/phoenix/compile/GroupByCompiler.java | 7 +-- .../apache/phoenix/execute/AggregatePlan.java | 59 +++- .../expression/ProjectedColumnExpression.java | 41 +++--- .../phoenix/compile/QueryCompilerTest.java | 18 +++--- 5 files changed, 69 insertions(+), 68 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f16a6a6/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java index a9e7304..2a9a82d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/LocalIndexIT.java @@ -59,7 +59,7 @@ import org.apache.phoenix.end2end.Shadower; import org.apache.phoenix.hbase.index.IndexRegionSplitPolicy; import org.apache.phoenix.jdbc.PhoenixConnection; import org.apache.phoenix.jdbc.PhoenixDatabaseMetaData; -import org.apache.phoenix.jdbc.PhoenixPreparedStatement; +import org.apache.phoenix.jdbc.PhoenixStatement; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.schema.PIndexState; import org.apache.phoenix.schema.PTable; @@ -480,10 +480,6 @@ public class LocalIndexIT extends BaseHBaseManagedTimeIT { assertEquals(z, rs.getString(V1)); query = SELECT v1,sum(k3) from + TestUtil.DEFAULT_DATA_TABLE_FULL_NAME + where v1 ='z' group by v1 order by v1; -PhoenixPreparedStatement statement = conn1.prepareStatement(query).unwrap(PhoenixPreparedStatement.class); -QueryPlan plan = statement.compileQuery(EXPLAIN + query); -assertTrue(query, plan.getContext().getScan().getAttribute(BaseScannerRegionObserver.KEY_ORDERED_GROUP_BY_EXPRESSIONS) == null); -assertTrue(query, plan.getContext().getScan().getAttribute(BaseScannerRegionObserver.UNORDERED_GROUP_BY_EXPRESSIONS) != null); rs = conn1.createStatement().executeQuery(EXPLAIN + query); assertEquals( @@ -492,7 +488,11 @@ public class LocalIndexIT extends BaseHBaseManagedTimeIT { + SERVER AGGREGATE INTO ORDERED DISTINCT ROWS BY [V1]\nCLIENT MERGE SORT, QueryUtil.getExplainPlan(rs)); -rs = conn1.createStatement().executeQuery(query); +PhoenixStatement stmt = conn1.createStatement().unwrap(PhoenixStatement.class); +rs = stmt.executeQuery(query); +QueryPlan plan = stmt.getQueryPlan(); +assertEquals(TestUtil.DEFAULT_INDEX_TABLE_NAME, plan.getContext().getCurrentTable().getTable().getName().getString()); + assertEquals(BaseScannerRegionObserver.KEY_ORDERED_GROUP_BY_EXPRESSIONS, plan.getGroupBy().getScanAttribName()); assertTrue(rs.next()); assertEquals(a, rs.getString(1)); assertEquals(5, rs.getInt(2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f16a6a6/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java index ecb238a..4f1ba5b 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/GroupByCompiler.java @@ -27,7 +27,6 @@ import org.apache.http.annotation.Immutable; import org.apache.phoenix.compile.TrackOrderPreservingExpressionCompiler.Entry; import org.apache.phoenix.compile.TrackOrderPreservingExpressionCompiler.Ordering; import org.apache.phoenix.coprocessor.BaseScannerRegionObserver; -import org.apache.phoenix.coprocessor.GroupedAggregateRegionObserver; import
Apache-Phoenix | 4.0 | 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/lastSuccessfulBuild/artifact/ Test Report https://builds.apache.org/job/Phoenix-4.0/lastCompletedBuild/testReport/ Changes [jtaylor] PHOENIX-1570 Data missing when using local index (Maryann Xue, James Taylor)
phoenix git commit: PHOENIX-1551 Upgrading from Phoenix 4.0.x to 4.2.2 and throw can't find SYSTEM.STATS
Repository: phoenix Updated Branches: refs/heads/4.0 b871f0693 - 16fbfa7ab PHOENIX-1551 Upgrading from Phoenix 4.0.x to 4.2.2 and throw can't find SYSTEM.STATS Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/16fbfa7a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/16fbfa7a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/16fbfa7a Branch: refs/heads/4.0 Commit: 16fbfa7abd1c8f7e265b8656e8f574ae7f6f93b9 Parents: b871f06 Author: Jeffrey Zhong jeffr...@apache.org Authored: Mon Jan 12 14:12:52 2015 -0800 Committer: Jeffrey Zhong jeffr...@apache.org Committed: Mon Jan 12 14:12:52 2015 -0800 -- .../main/java/org/apache/phoenix/util/ServerUtil.java | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/16fbfa7a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 7205faa..0998e72 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -142,13 +142,22 @@ public class ServerUtil { * This code works around HBASE-11837 which causes HTableInterfaces retrieved from * RegionCoprocessorEnvironment to not read local data. */ -private static HTableInterface getTableFromSingletonPool(RegionCoprocessorEnvironment env, byte[] tableName) { +private static HTableInterface getTableFromSingletonPool(RegionCoprocessorEnvironment env, byte[] tableName) throws IOException { // It's ok to not ever do a pool.close() as we're storing a single // table only. The HTablePool holds no other resources that this table // which will be closed itself when it's no longer needed. @SuppressWarnings(resource) HTablePool pool = new HTablePool(env.getConfiguration(),1); -return pool.getTable(tableName); +try { +return pool.getTable(tableName); +} catch (RuntimeException t) { +// handle cases that an IOE is wrapped inside a RuntimeException like HTableInterface#createHTableInterface +if(t.getCause() instanceof IOException) { +throw (IOException)t.getCause(); +} else { +throw t; +} +} } public static HTableInterface getHTableForCoprocessorScan (RegionCoprocessorEnvironment env, HTableInterface writerTable) throws IOException {
phoenix git commit: PHOENIX-1562 NPE in ServerCacheClient
Repository: phoenix Updated Branches: refs/heads/master 6f16a6a62 - 71832b59f PHOENIX-1562 NPE in ServerCacheClient Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/71832b59 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/71832b59 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/71832b59 Branch: refs/heads/master Commit: 71832b59ff8435067f9db3ac79f0a6360271fa75 Parents: 6f16a6a Author: maryannxue wei@intel.com Authored: Mon Jan 12 17:47:28 2015 -0500 Committer: maryannxue wei@intel.com Committed: Mon Jan 12 17:47:28 2015 -0500 -- .../main/java/org/apache/phoenix/cache/ServerCacheClient.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/71832b59/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java index ba7d265..1233e1c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java @@ -24,12 +24,12 @@ import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -82,7 +82,7 @@ public class ServerCacheClient { private static final Log LOG = LogFactory.getLog(ServerCacheClient.class); private static final Random RANDOM = new Random(); private final PhoenixConnection connection; -private final MapInteger, TableRef cacheUsingTableRefMap = new HashMapInteger, TableRef(); +private final MapInteger, TableRef cacheUsingTableRefMap = new ConcurrentHashMapInteger, TableRef(); /** * Construct client used to create a serialized cached snapshot of a table and send it to each region server
phoenix git commit: PHOENIX-1562 NPE in ServerCacheClient
Repository: phoenix Updated Branches: refs/heads/4.0 16fbfa7ab - ba3fa3424 PHOENIX-1562 NPE in ServerCacheClient Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ba3fa342 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ba3fa342 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ba3fa342 Branch: refs/heads/4.0 Commit: ba3fa342476a668731f5ce767920a2efd8d36d85 Parents: 16fbfa7 Author: maryannxue wei@intel.com Authored: Mon Jan 12 17:48:55 2015 -0500 Committer: maryannxue wei@intel.com Committed: Mon Jan 12 17:48:55 2015 -0500 -- .../main/java/org/apache/phoenix/cache/ServerCacheClient.java| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ba3fa342/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java index ba7d265..1233e1c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/cache/ServerCacheClient.java @@ -24,12 +24,12 @@ import java.io.IOException; import java.sql.SQLException; import java.util.ArrayList; import java.util.Collections; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Random; import java.util.Set; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; @@ -82,7 +82,7 @@ public class ServerCacheClient { private static final Log LOG = LogFactory.getLog(ServerCacheClient.class); private static final Random RANDOM = new Random(); private final PhoenixConnection connection; -private final MapInteger, TableRef cacheUsingTableRefMap = new HashMapInteger, TableRef(); +private final MapInteger, TableRef cacheUsingTableRefMap = new ConcurrentHashMapInteger, TableRef(); /** * Construct client used to create a serialized cached snapshot of a table and send it to each region server
Build failed in Jenkins: Phoenix | 4.0 #518
See https://builds.apache.org/job/Phoenix-4.0/518/ -- Started by an SCM change Started by an SCM change Building remotely on ubuntu-6 (docker Ubuntu ubuntu) in workspace https://builds.apache.org/job/Phoenix-4.0/ws/ git rev-parse --is-inside-work-tree # timeout=10 Fetching changes from the remote Git repository git config remote.origin.url https://git-wip-us.apache.org/repos/asf/phoenix.git # timeout=10 Fetching upstream changes from https://git-wip-us.apache.org/repos/asf/phoenix.git git --version # timeout=10 FATAL: Failed to fetch from https://git-wip-us.apache.org/repos/asf/phoenix.git hudson.plugins.git.GitException: Failed to fetch from https://git-wip-us.apache.org/repos/asf/phoenix.git at hudson.plugins.git.GitSCM.fetchFrom(GitSCM.java:647) at hudson.plugins.git.GitSCM.retrieveChanges(GitSCM.java:889) at hudson.plugins.git.GitSCM.checkout(GitSCM.java:914) at hudson.model.AbstractProject.checkout(AbstractProject.java:1252) at hudson.model.AbstractBuild$AbstractBuildExecution.defaultCheckout(AbstractBuild.java:615) at jenkins.scm.SCMCheckoutStrategy.checkout(SCMCheckoutStrategy.java:86) at hudson.model.AbstractBuild$AbstractBuildExecution.run(AbstractBuild.java:524) at hudson.model.Run.execute(Run.java:1706) at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43) at hudson.model.ResourceController.execute(ResourceController.java:88) at hudson.model.Executor.run(Executor.java:232) Caused by: hudson.plugins.git.GitException: Failed to connect to https://git-wip-us.apache.org/repos/asf/phoenix.git (exception: java.net.UnknownHostException: git-wip-us.apache.org: Name or service not known) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.checkCredentials(CliGitAPIImpl.java:2253) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.launchCommandWithCredentials(CliGitAPIImpl.java:1169) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl.access$300(CliGitAPIImpl.java:85) at org.jenkinsci.plugins.gitclient.CliGitAPIImpl$1.execute(CliGitAPIImpl.java:280) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:153) at org.jenkinsci.plugins.gitclient.RemoteGitImpl$CommandInvocationHandler$1.call(RemoteGitImpl.java:146) at hudson.remoting.UserRequest.perform(UserRequest.java:118) at hudson.remoting.UserRequest.perform(UserRequest.java:48) at hudson.remoting.Request$2.run(Request.java:328) at hudson.remoting.InterceptingExecutorService$1.call(InterceptingExecutorService.java:72) at java.util.concurrent.FutureTask.run(FutureTask.java:262) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615) at java.lang.Thread.run(Thread.java:745)
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 [maryannxue] PHOENIX-1562 NPE in ServerCacheClient
Jenkins build is back to normal : Phoenix | Master #545
See https://builds.apache.org/job/Phoenix-master/545/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 Build Time (last few runs - current run is the right most - blue: normal, red: test failure, grey: timeout)
phoenix git commit: PHOENIX-1551 Upgrading from Phoenix 4.0.x to 4.2.2 and throw can't find SYSTEM.STATS
Repository: phoenix Updated Branches: refs/heads/master 71832b59f - ddcb591f3 PHOENIX-1551 Upgrading from Phoenix 4.0.x to 4.2.2 and throw can't find SYSTEM.STATS Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ddcb591f Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ddcb591f Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ddcb591f Branch: refs/heads/master Commit: ddcb591f3ed3aa8e9d4ab1f7eda62052638647bc Parents: 71832b5 Author: Jeffrey Zhong jeffr...@apache.org Authored: Mon Jan 12 14:12:52 2015 -0800 Committer: Jeffrey Zhong jeffr...@apache.org Committed: Mon Jan 12 15:12:16 2015 -0800 -- .../main/java/org/apache/phoenix/util/ServerUtil.java | 13 +++-- 1 file changed, 11 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ddcb591f/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 7205faa..0998e72 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -142,13 +142,22 @@ public class ServerUtil { * This code works around HBASE-11837 which causes HTableInterfaces retrieved from * RegionCoprocessorEnvironment to not read local data. */ -private static HTableInterface getTableFromSingletonPool(RegionCoprocessorEnvironment env, byte[] tableName) { +private static HTableInterface getTableFromSingletonPool(RegionCoprocessorEnvironment env, byte[] tableName) throws IOException { // It's ok to not ever do a pool.close() as we're storing a single // table only. The HTablePool holds no other resources that this table // which will be closed itself when it's no longer needed. @SuppressWarnings(resource) HTablePool pool = new HTablePool(env.getConfiguration(),1); -return pool.getTable(tableName); +try { +return pool.getTable(tableName); +} catch (RuntimeException t) { +// handle cases that an IOE is wrapped inside a RuntimeException like HTableInterface#createHTableInterface +if(t.getCause() instanceof IOException) { +throw (IOException)t.getCause(); +} else { +throw t; +} +} } public static HTableInterface getHTableForCoprocessorScan (RegionCoprocessorEnvironment env, HTableInterface writerTable) throws IOException {