phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize
Repository: phoenix Updated Branches: refs/heads/3.0 9ffd8c63a - d2cd2856b PHOENIX-1404 Ignore call to ResultSet#setFetchSize Don't throw an exception on calls to ResultSet#setFetchSize, instead just ignore the call. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d2cd2856 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d2cd2856 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d2cd2856 Branch: refs/heads/3.0 Commit: d2cd2856bfd41167e27b30d137e07342c2fc2b96 Parents: 9ffd8c6 Author: Gabriel Reid gabri...@ngdata.com Authored: Thu Nov 6 19:31:39 2014 +0100 Committer: Gabriel Reid gabri...@ngdata.com Committed: Thu Nov 6 19:51:04 2014 +0100 -- .../apache/phoenix/jdbc/PhoenixResultSet.java | 23 1 file changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2cd2856/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java index 8a6cf64..8c3c863 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java @@ -41,6 +41,8 @@ import java.text.Format; import java.util.Calendar; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.phoenix.compile.ColumnProjector; import org.apache.phoenix.compile.RowProjector; @@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable; /** - * + * * JDBC ResultSet implementation of Phoenix. * Currently only the following data types are supported: * - String @@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable; * - ResultSet.CONCUR_READ_ONLY * - ResultSet.TYPE_FORWARD_ONLY * - ResultSet.CLOSE_CURSORS_AT_COMMIT - * - * + * + * * @since 0.1 */ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet { + +private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class); + private final static String STRING_FALSE = 0; private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0); private final static Integer INTEGER_FALSE = Integer.valueOf(0); private final static Tuple BEFORE_FIRST = new ResultTuple(); - + private final ResultIterator scanner; private final RowProjector rowProjector; private final PhoenixStatement statement; private final ImmutableBytesWritable ptr = new ImmutableBytesWritable(); - + private Tuple currentRow = BEFORE_FIRST; private boolean isClosed = false; private boolean wasNull = false; - + public PhoenixResultSet(ResultIterator resultIterator, RowProjector rowProjector, PhoenixStatement statement) throws SQLException { this.rowProjector = rowProjector; this.scanner = resultIterator; this.statement = statement; } - + @Override public boolean absolute(int row) throws SQLException { throw new SQLFeatureNotSupportedException(); @@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho public Tuple getCurrentRow() { return currentRow; } - + @Override public boolean next() throws SQLException { checkOpen(); @@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho @Override public void setFetchSize(int rows) throws SQLException { -throw new SQLFeatureNotSupportedException(); +LOG.warn(Ignoring setFetchSize( + rows + )); } @Override
phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize
Repository: phoenix Updated Branches: refs/heads/3.2 2a674dd01 - 2ec907f73 PHOENIX-1404 Ignore call to ResultSet#setFetchSize Don't throw an exception on calls to ResultSet#setFetchSize, instead just ignore the call. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2ec907f7 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2ec907f7 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2ec907f7 Branch: refs/heads/3.2 Commit: 2ec907f73d1b98c32c2113121a96ab216f897206 Parents: 2a674dd Author: Gabriel Reid gabri...@ngdata.com Authored: Thu Nov 6 19:31:39 2014 +0100 Committer: Gabriel Reid gabri...@ngdata.com Committed: Thu Nov 6 19:51:12 2014 +0100 -- .../apache/phoenix/jdbc/PhoenixResultSet.java | 23 1 file changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2ec907f7/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java index 8a6cf64..8c3c863 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java @@ -41,6 +41,8 @@ import java.text.Format; import java.util.Calendar; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.phoenix.compile.ColumnProjector; import org.apache.phoenix.compile.RowProjector; @@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable; /** - * + * * JDBC ResultSet implementation of Phoenix. * Currently only the following data types are supported: * - String @@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable; * - ResultSet.CONCUR_READ_ONLY * - ResultSet.TYPE_FORWARD_ONLY * - ResultSet.CLOSE_CURSORS_AT_COMMIT - * - * + * + * * @since 0.1 */ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet { + +private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class); + private final static String STRING_FALSE = 0; private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0); private final static Integer INTEGER_FALSE = Integer.valueOf(0); private final static Tuple BEFORE_FIRST = new ResultTuple(); - + private final ResultIterator scanner; private final RowProjector rowProjector; private final PhoenixStatement statement; private final ImmutableBytesWritable ptr = new ImmutableBytesWritable(); - + private Tuple currentRow = BEFORE_FIRST; private boolean isClosed = false; private boolean wasNull = false; - + public PhoenixResultSet(ResultIterator resultIterator, RowProjector rowProjector, PhoenixStatement statement) throws SQLException { this.rowProjector = rowProjector; this.scanner = resultIterator; this.statement = statement; } - + @Override public boolean absolute(int row) throws SQLException { throw new SQLFeatureNotSupportedException(); @@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho public Tuple getCurrentRow() { return currentRow; } - + @Override public boolean next() throws SQLException { checkOpen(); @@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho @Override public void setFetchSize(int rows) throws SQLException { -throw new SQLFeatureNotSupportedException(); +LOG.warn(Ignoring setFetchSize( + rows + )); } @Override
phoenix git commit: PHOENIX-1404 Ignore call to ResultSet#setFetchSize
Repository: phoenix Updated Branches: refs/heads/4.2 2b181d325 - 5b5f5ce72 PHOENIX-1404 Ignore call to ResultSet#setFetchSize Don't throw an exception on calls to ResultSet#setFetchSize, instead just ignore the call. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5b5f5ce7 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5b5f5ce7 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5b5f5ce7 Branch: refs/heads/4.2 Commit: 5b5f5ce721ec2663683b3d86be7a16cfcca29590 Parents: 2b181d3 Author: Gabriel Reid gabri...@ngdata.com Authored: Thu Nov 6 19:31:39 2014 +0100 Committer: Gabriel Reid gabri...@ngdata.com Committed: Thu Nov 6 19:55:38 2014 +0100 -- .../apache/phoenix/jdbc/PhoenixResultSet.java | 23 1 file changed, 14 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5b5f5ce7/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java index 8a6cf64..8c3c863 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSet.java @@ -41,6 +41,8 @@ import java.text.Format; import java.util.Calendar; import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.io.ImmutableBytesWritable; import org.apache.phoenix.compile.ColumnProjector; import org.apache.phoenix.compile.RowProjector; @@ -56,7 +58,7 @@ import org.apache.phoenix.util.SQLCloseable; /** - * + * * JDBC ResultSet implementation of Phoenix. * Currently only the following data types are supported: * - String @@ -77,31 +79,34 @@ import org.apache.phoenix.util.SQLCloseable; * - ResultSet.CONCUR_READ_ONLY * - ResultSet.TYPE_FORWARD_ONLY * - ResultSet.CLOSE_CURSORS_AT_COMMIT - * - * + * + * * @since 0.1 */ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.phoenix.jdbc.Jdbc7Shim.ResultSet { + +private static final Log LOG = LogFactory.getLog(PhoenixResultSet.class); + private final static String STRING_FALSE = 0; private final static BigDecimal BIG_DECIMAL_FALSE = BigDecimal.valueOf(0); private final static Integer INTEGER_FALSE = Integer.valueOf(0); private final static Tuple BEFORE_FIRST = new ResultTuple(); - + private final ResultIterator scanner; private final RowProjector rowProjector; private final PhoenixStatement statement; private final ImmutableBytesWritable ptr = new ImmutableBytesWritable(); - + private Tuple currentRow = BEFORE_FIRST; private boolean isClosed = false; private boolean wasNull = false; - + public PhoenixResultSet(ResultIterator resultIterator, RowProjector rowProjector, PhoenixStatement statement) throws SQLException { this.rowProjector = rowProjector; this.scanner = resultIterator; this.statement = statement; } - + @Override public boolean absolute(int row) throws SQLException { throw new SQLFeatureNotSupportedException(); @@ -726,7 +731,7 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho public Tuple getCurrentRow() { return currentRow; } - + @Override public boolean next() throws SQLException { checkOpen(); @@ -782,7 +787,7 @@ public class PhoenixResultSet implements ResultSet, SQLCloseable, org.apache.pho @Override public void setFetchSize(int rows) throws SQLException { -throw new SQLFeatureNotSupportedException(); +LOG.warn(Ignoring setFetchSize( + rows + )); } @Override
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-1404 Ignore call to ResultSet#setFetchSize
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-1404 Ignore call to ResultSet#setFetchSize
phoenix git commit: PHOENIX-1402 Don't recalculate stats on split
Repository: phoenix Updated Branches: refs/heads/4.0 0813b6c08 - d0c9dac00 PHOENIX-1402 Don't recalculate stats on split Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d0c9dac0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d0c9dac0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d0c9dac0 Branch: refs/heads/4.0 Commit: d0c9dac00306c7f42ec0cda77d364ad6888edc86 Parents: 0813b6c Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 14:29:52 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 14:30:20 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 4 - .../phoenix/end2end/StatsCollectorIT.java | 98 + .../UngroupedAggregateRegionObserver.java | 43 .../phoenix/iterate/ParallelIterators.java | 2 +- .../phoenix/schema/stats/GuidePostsInfo.java| 3 + .../schema/stats/StatisticsCollector.java | 104 +++ .../phoenix/schema/stats/StatisticsUtil.java| 11 ++ .../phoenix/schema/stats/StatisticsWriter.java | 70 - .../org/apache/phoenix/util/UpgradeUtil.java| 18 +++- pom.xml | 4 +- 10 files changed, 233 insertions(+), 124 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d0c9dac0/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index e8c1a09..5a0d998 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -464,9 +464,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.lineNumber=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.localVariable=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -516,7 +514,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 @@ -775,7 +772,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.ExpressionView.org.eclipse.jdt.debug.ui.show_null_entries=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.VariableView.org.eclipse.jdt.debug.ui.show_null_entries=true -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML=?xml version\=1.0 encoding\=UTF-8?\ndefaultEnvironments\ndefaultEnvironment environmentId\=J2SE-1.5 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217539956414/\ndefaultEnvironment environmentId\=JavaSE-1.6 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217443741223/\n/defaultEnvironments\n /instance/org.eclipse.jdt.ui/content_assist_disabled_computers=org.eclipse.jdt.ui.javaNoTypeProposalCategory\uorg.eclipse.jdt.ui.textProposalCategory\uorg.eclipse.jdt.ui.templateProposalCategory\uorg.eclipse.jdt.ui.javaTypeProposalCategory\u /instance/org.eclipse.jdt.ui/content_assist_lru_history=?xml version\=1.0 encoding\=UTF-8?history maxLHS\=100 maxRHS\=10/ /instance/org.eclipse.jdt.ui/content_assist_number_of_computers=17 http://git-wip-us.apache.org/repos/asf/phoenix/blob/d0c9dac0/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java -- diff --git
phoenix git commit: PHOENIX-1402 Don't recalculate stats on split
Repository: phoenix Updated Branches: refs/heads/4.2 5b5f5ce72 - 34fcdc807 PHOENIX-1402 Don't recalculate stats on split Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/34fcdc80 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/34fcdc80 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/34fcdc80 Branch: refs/heads/4.2 Commit: 34fcdc807583b99b66fab273c6459fef24cf0fb1 Parents: 5b5f5ce Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 14:29:52 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 14:31:33 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 4 - .../phoenix/end2end/StatsCollectorIT.java | 98 + .../UngroupedAggregateRegionObserver.java | 43 .../phoenix/iterate/ParallelIterators.java | 2 +- .../phoenix/schema/stats/GuidePostsInfo.java| 3 + .../schema/stats/StatisticsCollector.java | 104 +++ .../phoenix/schema/stats/StatisticsUtil.java| 11 ++ .../phoenix/schema/stats/StatisticsWriter.java | 70 - .../org/apache/phoenix/util/UpgradeUtil.java| 18 +++- pom.xml | 4 +- 10 files changed, 233 insertions(+), 124 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/34fcdc80/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index e8c1a09..5a0d998 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -464,9 +464,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.lineNumber=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.localVariable=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -516,7 +514,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 @@ -775,7 +772,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.ExpressionView.org.eclipse.jdt.debug.ui.show_null_entries=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.VariableView.org.eclipse.jdt.debug.ui.show_null_entries=true -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML=?xml version\=1.0 encoding\=UTF-8?\ndefaultEnvironments\ndefaultEnvironment environmentId\=J2SE-1.5 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217539956414/\ndefaultEnvironment environmentId\=JavaSE-1.6 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217443741223/\n/defaultEnvironments\n /instance/org.eclipse.jdt.ui/content_assist_disabled_computers=org.eclipse.jdt.ui.javaNoTypeProposalCategory\uorg.eclipse.jdt.ui.textProposalCategory\uorg.eclipse.jdt.ui.templateProposalCategory\uorg.eclipse.jdt.ui.javaTypeProposalCategory\u /instance/org.eclipse.jdt.ui/content_assist_lru_history=?xml version\=1.0 encoding\=UTF-8?history maxLHS\=100 maxRHS\=10/ /instance/org.eclipse.jdt.ui/content_assist_number_of_computers=17 http://git-wip-us.apache.org/repos/asf/phoenix/blob/34fcdc80/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java -- diff --git
phoenix git commit: PHOENIX-1402 Don't recalculate stats on split
Repository: phoenix Updated Branches: refs/heads/master caa8826fc - d42fffe01 PHOENIX-1402 Don't recalculate stats on split Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d42fffe0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d42fffe0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d42fffe0 Branch: refs/heads/master Commit: d42fffe019f757b00ff37c6d149e153f9bf97123 Parents: caa8826 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 14:29:52 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 14:34:50 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 4 - .../phoenix/end2end/StatsCollectorIT.java | 98 + .../UngroupedAggregateRegionObserver.java | 43 .../phoenix/iterate/ParallelIterators.java | 2 +- .../phoenix/schema/stats/GuidePostsInfo.java| 3 + .../schema/stats/StatisticsCollector.java | 104 +++ .../phoenix/schema/stats/StatisticsUtil.java| 11 ++ .../phoenix/schema/stats/StatisticsWriter.java | 70 - .../org/apache/phoenix/util/UpgradeUtil.java| 18 +++- pom.xml | 4 +- 10 files changed, 233 insertions(+), 124 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d42fffe0/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index e8c1a09..5a0d998 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -464,9 +464,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.lineNumber=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.localVariable=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -516,7 +514,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 @@ -775,7 +772,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.ExpressionView.org.eclipse.jdt.debug.ui.show_null_entries=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.VariableView.org.eclipse.jdt.debug.ui.show_null_entries=true -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML=?xml version\=1.0 encoding\=UTF-8?\ndefaultEnvironments\ndefaultEnvironment environmentId\=J2SE-1.5 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217539956414/\ndefaultEnvironment environmentId\=JavaSE-1.6 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217443741223/\n/defaultEnvironments\n /instance/org.eclipse.jdt.ui/content_assist_disabled_computers=org.eclipse.jdt.ui.javaNoTypeProposalCategory\uorg.eclipse.jdt.ui.textProposalCategory\uorg.eclipse.jdt.ui.templateProposalCategory\uorg.eclipse.jdt.ui.javaTypeProposalCategory\u /instance/org.eclipse.jdt.ui/content_assist_lru_history=?xml version\=1.0 encoding\=UTF-8?history maxLHS\=100 maxRHS\=10/ /instance/org.eclipse.jdt.ui/content_assist_number_of_computers=17 http://git-wip-us.apache.org/repos/asf/phoenix/blob/d42fffe0/phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java -- diff --git
Build failed in Jenkins: Phoenix | Master #476
See https://builds.apache.org/job/Phoenix-master/476/changes Changes: [jtaylor] PHOENIX-1402 Don't recalculate stats on split -- [...truncated 348 lines...] Running org.apache.phoenix.end2end.TopNIT Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 27.544 sec - in org.apache.phoenix.end2end.VariableLengthPKIT Running org.apache.phoenix.end2end.SpooledOrderByIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.154 sec - in org.apache.phoenix.end2end.TopNIT Running org.apache.phoenix.end2end.SequenceIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.363 sec - in org.apache.phoenix.end2end.SpooledOrderByIT Running org.apache.phoenix.end2end.DynamicUpsertIT Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.257 sec - in org.apache.phoenix.end2end.DynamicUpsertIT Tests run: 15, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 35.449 sec - in org.apache.phoenix.end2end.QueryDatabaseMetaDataIT Running org.apache.phoenix.end2end.ExtendedQueryExecIT Running org.apache.phoenix.end2end.NativeHBaseTypesIT Tests run: 4, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.24 sec - in org.apache.phoenix.end2end.ExtendedQueryExecIT Running org.apache.phoenix.end2end.CastAndCoerceIT Tests run: 7, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.403 sec - in org.apache.phoenix.end2end.NativeHBaseTypesIT Running org.apache.phoenix.end2end.ToNumberFunctionIT Tests run: 18, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.308 sec - in org.apache.phoenix.end2end.ToNumberFunctionIT Running org.apache.phoenix.end2end.ColumnProjectionOptimizationIT Tests run: 63, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 53.023 sec - in org.apache.phoenix.end2end.CaseStatementIT Running org.apache.phoenix.end2end.ClientTimeArithmeticQueryIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 10.81 sec - in org.apache.phoenix.end2end.ColumnProjectionOptimizationIT Running org.apache.phoenix.end2end.FunkyNamesIT Tests run: 3, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 2.572 sec - in org.apache.phoenix.end2end.FunkyNamesIT Running org.apache.phoenix.end2end.QueryIT Tests run: 50, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 31.547 sec - in org.apache.phoenix.end2end.SequenceIT Running org.apache.phoenix.end2end.UpsertSelectIT Tests run: 91, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 80.79 sec - in org.apache.phoenix.end2end.GroupByIT Running org.apache.phoenix.end2end.ProductMetricsIT Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.487 sec - in org.apache.phoenix.end2end.UpsertSelectIT Running org.apache.phoenix.end2end.UpsertValuesIT Tests run: 49, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 49.198 sec - in org.apache.phoenix.end2end.CastAndCoerceIT Running org.apache.phoenix.end2end.salted.SaltedTableIT Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 5.601 sec - in org.apache.phoenix.end2end.salted.SaltedTableIT Running org.apache.phoenix.end2end.ScanQueryIT Tests run: 12, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 15.198 sec - in org.apache.phoenix.end2end.UpsertValuesIT Running org.apache.phoenix.end2end.CreateTableIT Tests run: 61, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 28.449 sec - in org.apache.phoenix.end2end.ProductMetricsIT Running org.apache.phoenix.end2end.CompareDecimalToLongIT Tests run: 8, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 3.461 sec - in org.apache.phoenix.end2end.CompareDecimalToLongIT Running org.apache.phoenix.end2end.ArrayIT Tests run: 11, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 19.944 sec - in org.apache.phoenix.end2end.CreateTableIT Running org.apache.phoenix.end2end.TruncateFunctionIT Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.775 sec - in org.apache.phoenix.end2end.TruncateFunctionIT Running org.apache.phoenix.end2end.RowValueConstructorIT Tests run: 48, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 24.897 sec - in org.apache.phoenix.end2end.ArrayIT Running org.apache.phoenix.end2end.NotQueryIT Tests run: 36, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 34.764 sec - in org.apache.phoenix.end2end.RowValueConstructorIT Running org.apache.phoenix.end2end.IsNullIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 4.864 sec - in org.apache.phoenix.end2end.IsNullIT Running org.apache.phoenix.end2end.PercentileIT Tests run: 17, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.715 sec - in org.apache.phoenix.end2end.PercentileIT Running org.apache.phoenix.end2end.DistinctCountIT Tests run: 119, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 88.178 sec - in org.apache.phoenix.end2end.ScanQueryIT Running org.apache.phoenix.end2end.InMemoryOrderByIT Tests run: 10, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 9.265 sec - in org.apache.phoenix.end2end.DistinctCountIT Tests run: 2, Failures: 0, Errors: 0, Skipped: 0, Time
[1/4] phoenix git commit: PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema
Repository: phoenix Updated Branches: refs/heads/4.0 d0c9dac00 - 4ed86c0cc PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/798531c4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/798531c4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/798531c4 Branch: refs/heads/4.0 Commit: 798531c45e88c92b6851de11ca0f3dd8af00e5f0 Parents: d0c9dac Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 17:57:57 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 17:57:57 2014 -0800 -- .../end2end/QueryDatabaseMetaDataIT.java| 43 ++ .../org/apache/phoenix/compile/ScanRanges.java | 8 +++- .../phoenix/expression/AndExpression.java | 4 +- .../phoenix/expression/AndOrExpression.java | 11 + .../apache/phoenix/expression/OrExpression.java | 4 +- .../phoenix/compile/WhereOptimizerTest.java | 47 6 files changed, 102 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/798531c4/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index f243562..4c5c828 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -1063,4 +1063,47 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { } conn5.close(); } + + +@Test +public void testTableWithScemaMetadataScan() throws SQLException { +long ts = nextTimestamp(); +Properties props = new Properties(); +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.createStatement().execute(create table foo.bar(k varchar primary key)); +conn.createStatement().execute(create table bar(k varchar primary key)); +conn.close(); + +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10)); +conn = DriverManager.getConnection(getUrl(), props); + +DatabaseMetaData metaData = conn.getMetaData(); +ResultSet rs; + +// Tricky case that requires returning false for null AND true expression +rs = metaData.getTables(null, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +// Tricky case that requires end key to maintain trailing nulls +rs = metaData.getTables(, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +rs = metaData.getTables(, null, BAR, null); +assertTrue(rs.next()); +assertEquals(null,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); +} + } http://git-wip-us.apache.org/repos/asf/phoenix/blob/798531c4/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java index 0ab6368..0842f6a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java @@ -440,9 +440,13 @@ public class ScanRanges { if (ScanUtil.getTotalSpan(ranges, slotSpan) schema.getMaxFields()) { return false; } -for (ListKeyRange orRanges : ranges) { +int lastIndex = ranges.size()-1; +for (int i = lastIndex; i = 0; i--) { +ListKeyRange orRanges = ranges.get(i); for (KeyRange keyRange : orRanges) { -if (!keyRange.isSingleKey()) { +// Special case for single trailing IS NULL. We cannot consider this as a point key because +// we strip trailing nulls when we
[4/4] phoenix git commit: PHOENIX-1418 Optionally display number of parallel chunks in explain plan
PHOENIX-1418 Optionally display number of parallel chunks in explain plan Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4ed86c0c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4ed86c0c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4ed86c0c Branch: refs/heads/4.0 Commit: 4ed86c0cc78f316256eb119fcc5f8ffe6ed97362 Parents: 7f7425e Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:42:19 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:42:19 2014 -0800 -- .../org/apache/phoenix/end2end/StatsCollectorIT.java | 11 --- .../org/apache/phoenix/iterate/ParallelIterators.java| 6 +- .../java/org/apache/phoenix/query/QueryServices.java | 1 + .../org/apache/phoenix/query/QueryServicesOptions.java | 7 +++ .../org/apache/phoenix/query/QueryServicesTestImpl.java | 2 ++ 5 files changed, 23 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4ed86c0c/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 e7aada6..faa54ea 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 @@ -43,6 +43,7 @@ import org.apache.phoenix.query.ConnectionQueryServices; import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; @@ -61,6 +62,7 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { MapString,String props = Maps.newHashMapWithExpectedSize(3); // Must update config before starting server props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(20)); +props.put(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, Boolean.TRUE.toString()); setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } @@ -298,7 +300,7 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } while (nRegions == nRegionsNow nTries 10); // FIXME: I see the commit of the stats finishing before this with a lower timestamp that the scan timestamp, // yet without this sleep, the query finds the old data. Seems like an HBase bug and a potentially serious one. -Thread.sleep(2000); +Thread.sleep(3000); } finally { admin.close(); } @@ -320,15 +322,18 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } conn.commit(); +ResultSet rs; TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME); ListKeyRangekeyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME); assertEquals(nRows+1, keyRanges.size()); - +rs = conn.createStatement().executeQuery(EXPLAIN SELECT * FROM + STATS_TEST_TABLE_NAME); +assertEquals(CLIENT + (nRows+1) + -CHUNK + PARALLEL 1-WAY FULL SCAN OVER + STATS_TEST_TABLE_NAME, QueryUtil.getExplainPlan(rs)); + ConnectionQueryServices services = conn.unwrap(PhoenixConnection.class).getQueryServices(); ListHRegionLocation regions = services.getAllTableRegions(STATS_TEST_TABLE_BYTES); assertEquals(1, regions.size()); -ResultSet rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); +rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); assertTrue(rs.next()); assertEquals(nRows, rs.getLong(1)); assertEquals(regions.get(0).getRegionInfo().getRegionNameAsString(), rs.getString(2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/4ed86c0c/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java index 00458f3..7905d34 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java +++
[3/4] phoenix git commit: PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain)
PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7f7425e4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7f7425e4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7f7425e4 Branch: refs/heads/4.0 Commit: 7f7425e462536d16eacd271315054f4f989adca1 Parents: b46d3e2 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:22:08 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:22:08 2014 -0800 -- .../phoenix/jdbc/PhoenixResultSetMetaData.java | 18 +++- .../jdbc/PhoenixResultSetMetadataTest.java | 45 2 files changed, 52 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7f7425e4/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java index b58d5ad..30e9862 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java @@ -55,9 +55,7 @@ import org.apache.phoenix.schema.PDataType; * @since 0.1 */ public class PhoenixResultSetMetaData implements ResultSetMetaData { -private static final int MIN_DISPLAY_WIDTH = 3; -private static final int MAX_DISPLAY_WIDTH = 40; -private static final int DEFAULT_DISPLAY_WIDTH = 10; +static final int DEFAULT_DISPLAY_WIDTH = 40; private final RowProjector rowProjector; private final PhoenixConnection connection; @@ -85,21 +83,19 @@ public class PhoenixResultSetMetaData implements ResultSetMetaData { @Override public int getColumnDisplaySize(int column) throws SQLException { ColumnProjector projector = rowProjector.getColumnProjector(column-1); -int displaySize = Math.max(projector.getName().length(),MIN_DISPLAY_WIDTH); PDataType type = projector.getExpression().getDataType(); if (type == null) { -return Math.min(Math.max(displaySize, QueryConstants.NULL_DISPLAY_TEXT.length()), MAX_DISPLAY_WIDTH); +return QueryConstants.NULL_DISPLAY_TEXT.length(); } if (type.isCoercibleTo(PDataType.DATE)) { -return Math.min(Math.max(displaySize, connection.getDatePattern().length()), MAX_DISPLAY_WIDTH); +return connection.getDatePattern().length(); } -if (type.isFixedWidth() projector.getExpression().getMaxLength() != null) { -return Math.min(Math.max(displaySize, projector.getExpression().getMaxLength()), MAX_DISPLAY_WIDTH); +if (projector.getExpression().getMaxLength() != null) { +return projector.getExpression().getMaxLength(); } - -return Math.min(Math.max(displaySize, DEFAULT_DISPLAY_WIDTH), MAX_DISPLAY_WIDTH); +return DEFAULT_DISPLAY_WIDTH; } - + @Override public String getColumnLabel(int column) throws SQLException { return rowProjector.getColumnProjector(column-1).getName(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/7f7425e4/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java new file mode 100644 index 000..9153595 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java @@ -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. + */ +package org.apache.phoenix.jdbc; + +import static
[3/4] phoenix git commit: PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain)
PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b5a102e0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b5a102e0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b5a102e0 Branch: refs/heads/4.2 Commit: b5a102e03f4ad6d09640bd86b7629060ac6cee11 Parents: dbe76fa Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:22:08 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:48:18 2014 -0800 -- .../phoenix/jdbc/PhoenixResultSetMetaData.java | 18 +++- .../jdbc/PhoenixResultSetMetadataTest.java | 45 2 files changed, 52 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5a102e0/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java index b58d5ad..30e9862 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java @@ -55,9 +55,7 @@ import org.apache.phoenix.schema.PDataType; * @since 0.1 */ public class PhoenixResultSetMetaData implements ResultSetMetaData { -private static final int MIN_DISPLAY_WIDTH = 3; -private static final int MAX_DISPLAY_WIDTH = 40; -private static final int DEFAULT_DISPLAY_WIDTH = 10; +static final int DEFAULT_DISPLAY_WIDTH = 40; private final RowProjector rowProjector; private final PhoenixConnection connection; @@ -85,21 +83,19 @@ public class PhoenixResultSetMetaData implements ResultSetMetaData { @Override public int getColumnDisplaySize(int column) throws SQLException { ColumnProjector projector = rowProjector.getColumnProjector(column-1); -int displaySize = Math.max(projector.getName().length(),MIN_DISPLAY_WIDTH); PDataType type = projector.getExpression().getDataType(); if (type == null) { -return Math.min(Math.max(displaySize, QueryConstants.NULL_DISPLAY_TEXT.length()), MAX_DISPLAY_WIDTH); +return QueryConstants.NULL_DISPLAY_TEXT.length(); } if (type.isCoercibleTo(PDataType.DATE)) { -return Math.min(Math.max(displaySize, connection.getDatePattern().length()), MAX_DISPLAY_WIDTH); +return connection.getDatePattern().length(); } -if (type.isFixedWidth() projector.getExpression().getMaxLength() != null) { -return Math.min(Math.max(displaySize, projector.getExpression().getMaxLength()), MAX_DISPLAY_WIDTH); +if (projector.getExpression().getMaxLength() != null) { +return projector.getExpression().getMaxLength(); } - -return Math.min(Math.max(displaySize, DEFAULT_DISPLAY_WIDTH), MAX_DISPLAY_WIDTH); +return DEFAULT_DISPLAY_WIDTH; } - + @Override public String getColumnLabel(int column) throws SQLException { return rowProjector.getColumnProjector(column-1).getName(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/b5a102e0/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java new file mode 100644 index 000..9153595 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java @@ -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. + */ +package org.apache.phoenix.jdbc; + +import static
[1/4] phoenix git commit: PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema
Repository: phoenix Updated Branches: refs/heads/4.2 34fcdc807 - 8024b59f8 PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/0aab07ae Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/0aab07ae Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/0aab07ae Branch: refs/heads/4.2 Commit: 0aab07aea5b79533cbdb20c1548ff28a8d804aec Parents: 34fcdc8 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 17:57:57 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:47:41 2014 -0800 -- .../end2end/QueryDatabaseMetaDataIT.java| 43 ++ .../org/apache/phoenix/compile/ScanRanges.java | 8 +++- .../phoenix/expression/AndExpression.java | 4 +- .../phoenix/expression/AndOrExpression.java | 11 + .../apache/phoenix/expression/OrExpression.java | 4 +- .../phoenix/compile/WhereOptimizerTest.java | 47 6 files changed, 102 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/0aab07ae/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index f243562..4c5c828 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -1063,4 +1063,47 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { } conn5.close(); } + + +@Test +public void testTableWithScemaMetadataScan() throws SQLException { +long ts = nextTimestamp(); +Properties props = new Properties(); +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.createStatement().execute(create table foo.bar(k varchar primary key)); +conn.createStatement().execute(create table bar(k varchar primary key)); +conn.close(); + +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10)); +conn = DriverManager.getConnection(getUrl(), props); + +DatabaseMetaData metaData = conn.getMetaData(); +ResultSet rs; + +// Tricky case that requires returning false for null AND true expression +rs = metaData.getTables(null, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +// Tricky case that requires end key to maintain trailing nulls +rs = metaData.getTables(, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +rs = metaData.getTables(, null, BAR, null); +assertTrue(rs.next()); +assertEquals(null,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); +} + } http://git-wip-us.apache.org/repos/asf/phoenix/blob/0aab07ae/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java index 0ab6368..0842f6a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java @@ -440,9 +440,13 @@ public class ScanRanges { if (ScanUtil.getTotalSpan(ranges, slotSpan) schema.getMaxFields()) { return false; } -for (ListKeyRange orRanges : ranges) { +int lastIndex = ranges.size()-1; +for (int i = lastIndex; i = 0; i--) { +ListKeyRange orRanges = ranges.get(i); for (KeyRange keyRange : orRanges) { -if (!keyRange.isSingleKey()) { +// Special case for single trailing IS NULL. We cannot consider this as a point key because +// we strip trailing nulls when we
[2/4] phoenix git commit: PHOENIX-1413 Add Phoenix coprocessors with configurable priority
PHOENIX-1413 Add Phoenix coprocessors with configurable priority Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/dbe76fa8 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/dbe76fa8 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/dbe76fa8 Branch: refs/heads/4.2 Commit: dbe76fa8752862bac28f9be482c7f8271bd92f68 Parents: 0aab07a Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 18:24:54 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:48:02 2014 -0800 -- .../EndToEndCoveredColumnsIndexBuilderIT.java | 3 ++- .../org/apache/phoenix/hbase/index/Indexer.java | 10 - .../CoveredColumnIndexSpecifierBuilder.java | 4 ++-- .../query/ConnectionQueryServicesImpl.java | 23 ++-- .../org/apache/phoenix/query/QueryServices.java | 2 ++ .../phoenix/query/QueryServicesOptions.java | 5 + 6 files changed, 28 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/dbe76fa8/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java index d93b011..9aae820 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java @@ -33,6 +33,7 @@ import java.util.Queue; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; @@ -306,7 +307,7 @@ public class EndToEndCoveredColumnsIndexBuilderIT { // initializer blows up. indexerOpts.put(CoveredColumnsIndexBuilder.CODEC_CLASS_NAME_KEY, CoveredIndexCodecForTesting.class.getName()); -Indexer.enableIndexing(desc, CoveredColumnsIndexBuilder.class, indexerOpts); +Indexer.enableIndexing(desc, CoveredColumnsIndexBuilder.class, indexerOpts, Coprocessor.PRIORITY_USER); // create the table HBaseAdmin admin = UTIL.getHBaseAdmin(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/dbe76fa8/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java index 9c48a8d..b841410 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java @@ -31,7 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; @@ -607,18 +606,19 @@ public class Indexer extends BaseRegionObserver { /** * Enable indexing on the given table * @param desc {@link HTableDescriptor} for the table on which indexing should be enabled - * @param builder class to use when building the index for this table - * @param properties map of custom configuration options to make available to your + * @param builder class to use when building the index for this table + * @param properties map of custom configuration options to make available to your * {@link IndexBuilder} on the server-side + * @param priority TODO * @throws IOException the Indexer coprocessor cannot be added */ public static void enableIndexing(HTableDescriptor desc, Class? extends IndexBuilder builder, - MapString, String properties) throws IOException { + MapString, String properties, int priority) throws IOException { if (properties == null) { properties = new HashMapString, String(); } properties.put(Indexer.INDEX_BUILDER_CONF_KEY, builder.getName()); -desc.addCoprocessor(Indexer.class.getName(), null, Coprocessor.PRIORITY_USER, properties); +desc.addCoprocessor(Indexer.class.getName(), null, priority, properties); } }
[1/4] phoenix git commit: PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema
Repository: phoenix Updated Branches: refs/heads/master d42fffe01 - 7a20d3dd7 PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/429c69da Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/429c69da Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/429c69da Branch: refs/heads/master Commit: 429c69daea697df280b969f9745fd6351acb03c3 Parents: d42fffe Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 17:57:57 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:49:57 2014 -0800 -- .../end2end/QueryDatabaseMetaDataIT.java| 43 ++ .../org/apache/phoenix/compile/ScanRanges.java | 8 +++- .../phoenix/expression/AndExpression.java | 4 +- .../phoenix/expression/AndOrExpression.java | 11 + .../apache/phoenix/expression/OrExpression.java | 4 +- .../phoenix/compile/WhereOptimizerTest.java | 47 6 files changed, 102 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/429c69da/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index f243562..4c5c828 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -1063,4 +1063,47 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { } conn5.close(); } + + +@Test +public void testTableWithScemaMetadataScan() throws SQLException { +long ts = nextTimestamp(); +Properties props = new Properties(); +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.createStatement().execute(create table foo.bar(k varchar primary key)); +conn.createStatement().execute(create table bar(k varchar primary key)); +conn.close(); + +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10)); +conn = DriverManager.getConnection(getUrl(), props); + +DatabaseMetaData metaData = conn.getMetaData(); +ResultSet rs; + +// Tricky case that requires returning false for null AND true expression +rs = metaData.getTables(null, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +// Tricky case that requires end key to maintain trailing nulls +rs = metaData.getTables(, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +rs = metaData.getTables(, null, BAR, null); +assertTrue(rs.next()); +assertEquals(null,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); +} + } http://git-wip-us.apache.org/repos/asf/phoenix/blob/429c69da/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java index 0ab6368..0842f6a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java @@ -440,9 +440,13 @@ public class ScanRanges { if (ScanUtil.getTotalSpan(ranges, slotSpan) schema.getMaxFields()) { return false; } -for (ListKeyRange orRanges : ranges) { +int lastIndex = ranges.size()-1; +for (int i = lastIndex; i = 0; i--) { +ListKeyRange orRanges = ranges.get(i); for (KeyRange keyRange : orRanges) { -if (!keyRange.isSingleKey()) { +// Special case for single trailing IS NULL. We cannot consider this as a point key because +// we strip trailing nulls when
[4/4] phoenix git commit: PHOENIX-1418 Optionally display number of parallel chunks in explain plan
PHOENIX-1418 Optionally display number of parallel chunks in explain plan Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7a20d3dd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7a20d3dd Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7a20d3dd Branch: refs/heads/master Commit: 7a20d3dd75d999ff730990a8c4e7e663e48258c8 Parents: f39af64 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:42:19 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:50:20 2014 -0800 -- .../org/apache/phoenix/end2end/StatsCollectorIT.java | 11 --- .../org/apache/phoenix/iterate/ParallelIterators.java| 6 +- .../java/org/apache/phoenix/query/QueryServices.java | 1 + .../org/apache/phoenix/query/QueryServicesOptions.java | 7 +++ .../org/apache/phoenix/query/QueryServicesTestImpl.java | 2 ++ 5 files changed, 23 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a20d3dd/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 1d40df5..78fb22f 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 @@ -26,6 +26,7 @@ import org.apache.phoenix.query.ConnectionQueryServices; import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; @@ -44,6 +45,7 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { MapString,String props = Maps.newHashMapWithExpectedSize(3); // Must update config before starting server props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(20)); +props.put(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, Boolean.TRUE.toString()); setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } @@ -281,7 +283,7 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } while (nRegions == nRegionsNow nTries 10); // FIXME: I see the commit of the stats finishing before this with a lower timestamp that the scan timestamp, // yet without this sleep, the query finds the old data. Seems like an HBase bug and a potentially serious one. -Thread.sleep(2000); +Thread.sleep(3000); } finally { admin.close(); } @@ -303,15 +305,18 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } conn.commit(); +ResultSet rs; TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME); ListKeyRangekeyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME); assertEquals(nRows+1, keyRanges.size()); - +rs = conn.createStatement().executeQuery(EXPLAIN SELECT * FROM + STATS_TEST_TABLE_NAME); +assertEquals(CLIENT + (nRows+1) + -CHUNK + PARALLEL 1-WAY FULL SCAN OVER + STATS_TEST_TABLE_NAME, QueryUtil.getExplainPlan(rs)); + ConnectionQueryServices services = conn.unwrap(PhoenixConnection.class).getQueryServices(); ListHRegionLocation regions = services.getAllTableRegions(STATS_TEST_TABLE_BYTES); assertEquals(1, regions.size()); -ResultSet rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); +rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); assertTrue(rs.next()); assertEquals(nRows, rs.getLong(1)); assertEquals(regions.get(0).getRegionInfo().getRegionNameAsString(), rs.getString(2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/7a20d3dd/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java b/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java index 00458f3..7905d34 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java +++
[2/4] phoenix git commit: PHOENIX-1413 Add Phoenix coprocessors with configurable priority
PHOENIX-1413 Add Phoenix coprocessors with configurable priority Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/de7c4df1 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/de7c4df1 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/de7c4df1 Branch: refs/heads/master Commit: de7c4df1c43e5eb34630d75b30568642488fe43d Parents: 429c69d Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 18:24:54 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 19:50:04 2014 -0800 -- .../EndToEndCoveredColumnsIndexBuilderIT.java | 3 ++- .../org/apache/phoenix/hbase/index/Indexer.java | 10 - .../CoveredColumnIndexSpecifierBuilder.java | 4 ++-- .../query/ConnectionQueryServicesImpl.java | 23 ++-- .../org/apache/phoenix/query/QueryServices.java | 2 ++ .../phoenix/query/QueryServicesOptions.java | 5 + 6 files changed, 28 insertions(+), 19 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/de7c4df1/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java index fc134a3..f635dff 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java @@ -33,6 +33,7 @@ import java.util.Queue; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; +import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; @@ -302,7 +303,7 @@ public class EndToEndCoveredColumnsIndexBuilderIT { // initializer blows up. indexerOpts.put(CoveredColumnsIndexBuilder.CODEC_CLASS_NAME_KEY, CoveredIndexCodecForTesting.class.getName()); -Indexer.enableIndexing(desc, CoveredColumnsIndexBuilder.class, indexerOpts); +Indexer.enableIndexing(desc, CoveredColumnsIndexBuilder.class, indexerOpts, Coprocessor.PRIORITY_USER); // create the table HBaseAdmin admin = UTIL.getHBaseAdmin(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/de7c4df1/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java index 9c48a8d..b841410 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java @@ -31,7 +31,6 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.Cell; -import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; @@ -607,18 +606,19 @@ public class Indexer extends BaseRegionObserver { /** * Enable indexing on the given table * @param desc {@link HTableDescriptor} for the table on which indexing should be enabled - * @param builder class to use when building the index for this table - * @param properties map of custom configuration options to make available to your + * @param builder class to use when building the index for this table + * @param properties map of custom configuration options to make available to your * {@link IndexBuilder} on the server-side + * @param priority TODO * @throws IOException the Indexer coprocessor cannot be added */ public static void enableIndexing(HTableDescriptor desc, Class? extends IndexBuilder builder, - MapString, String properties) throws IOException { + MapString, String properties, int priority) throws IOException { if (properties == null) { properties = new HashMapString, String(); } properties.put(Indexer.INDEX_BUILDER_CONF_KEY, builder.getName()); -desc.addCoprocessor(Indexer.class.getName(), null, Coprocessor.PRIORITY_USER, properties); +desc.addCoprocessor(Indexer.class.getName(), null, priority, properties); } }
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-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema [jtaylor] PHOENIX-1413 Add Phoenix coprocessors with configurable priority [jtaylor] PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain) [jtaylor] PHOENIX-1418 Optionally display number of parallel chunks in explain plan
[2/5] phoenix git commit: PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema
PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6abe4df0 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6abe4df0 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6abe4df0 Branch: refs/heads/3.0 Commit: 6abe4df01e4c298a16f029c40e3b8cb120702f18 Parents: c971557 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 17:57:57 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:38:19 2014 -0800 -- .../end2end/QueryDatabaseMetaDataIT.java| 43 ++ .../org/apache/phoenix/compile/ScanRanges.java | 8 +++- .../phoenix/expression/AndExpression.java | 4 +- .../phoenix/expression/AndOrExpression.java | 11 + .../apache/phoenix/expression/OrExpression.java | 4 +- .../phoenix/compile/WhereOptimizerTest.java | 47 6 files changed, 102 insertions(+), 15 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6abe4df0/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java index 9bf2b0c..83bb91d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/QueryDatabaseMetaDataIT.java @@ -1058,4 +1058,47 @@ public class QueryDatabaseMetaDataIT extends BaseClientManagedTimeIT { } conn5.close(); } + + +@Test +public void testTableWithScemaMetadataScan() throws SQLException { +long ts = nextTimestamp(); +Properties props = new Properties(); +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts)); +Connection conn = DriverManager.getConnection(getUrl(), props); + +conn.createStatement().execute(create table foo.bar(k varchar primary key)); +conn.createStatement().execute(create table bar(k varchar primary key)); +conn.close(); + +props.setProperty(PhoenixRuntime.CURRENT_SCN_ATTRIB, Long.toString(ts + 10)); +conn = DriverManager.getConnection(getUrl(), props); + +DatabaseMetaData metaData = conn.getMetaData(); +ResultSet rs; + +// Tricky case that requires returning false for null AND true expression +rs = metaData.getTables(null, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +// Tricky case that requires end key to maintain trailing nulls +rs = metaData.getTables(, FOO, BAR, null); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); + +rs = metaData.getTables(, null, BAR, null); +assertTrue(rs.next()); +assertEquals(null,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertTrue(rs.next()); +assertEquals(FOO,rs.getString(TABLE_SCHEM)); +assertEquals(BAR, rs.getString(TABLE_NAME)); +assertFalse(rs.next()); +} + } http://git-wip-us.apache.org/repos/asf/phoenix/blob/6abe4df0/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java index d60a288..61b6451 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/compile/ScanRanges.java @@ -440,9 +440,13 @@ public class ScanRanges { if (ScanUtil.getTotalSpan(ranges, slotSpan) schema.getMaxFields()) { return false; } -for (ListKeyRange orRanges : ranges) { +int lastIndex = ranges.size()-1; +for (int i = lastIndex; i = 0; i--) { +ListKeyRange orRanges = ranges.get(i); for (KeyRange keyRange : orRanges) { -if (!keyRange.isSingleKey()) { +// Special case for single trailing IS NULL. We cannot consider this as a point key because +// we strip trailing nulls when we form the key. +if (!keyRange.isSingleKey() || (i == lastIndex
[4/5] phoenix git commit: PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain)
PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/efd5b217 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/efd5b217 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/efd5b217 Branch: refs/heads/3.0 Commit: efd5b217941fb6c6484f2cdc7b07ee3757139df2 Parents: 4f1df52 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:22:08 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:41:36 2014 -0800 -- .../phoenix/jdbc/PhoenixResultSetMetaData.java | 18 +++- .../jdbc/PhoenixResultSetMetadataTest.java | 45 2 files changed, 52 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/efd5b217/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java index b58d5ad..30e9862 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java @@ -55,9 +55,7 @@ import org.apache.phoenix.schema.PDataType; * @since 0.1 */ public class PhoenixResultSetMetaData implements ResultSetMetaData { -private static final int MIN_DISPLAY_WIDTH = 3; -private static final int MAX_DISPLAY_WIDTH = 40; -private static final int DEFAULT_DISPLAY_WIDTH = 10; +static final int DEFAULT_DISPLAY_WIDTH = 40; private final RowProjector rowProjector; private final PhoenixConnection connection; @@ -85,21 +83,19 @@ public class PhoenixResultSetMetaData implements ResultSetMetaData { @Override public int getColumnDisplaySize(int column) throws SQLException { ColumnProjector projector = rowProjector.getColumnProjector(column-1); -int displaySize = Math.max(projector.getName().length(),MIN_DISPLAY_WIDTH); PDataType type = projector.getExpression().getDataType(); if (type == null) { -return Math.min(Math.max(displaySize, QueryConstants.NULL_DISPLAY_TEXT.length()), MAX_DISPLAY_WIDTH); +return QueryConstants.NULL_DISPLAY_TEXT.length(); } if (type.isCoercibleTo(PDataType.DATE)) { -return Math.min(Math.max(displaySize, connection.getDatePattern().length()), MAX_DISPLAY_WIDTH); +return connection.getDatePattern().length(); } -if (type.isFixedWidth() projector.getExpression().getMaxLength() != null) { -return Math.min(Math.max(displaySize, projector.getExpression().getMaxLength()), MAX_DISPLAY_WIDTH); +if (projector.getExpression().getMaxLength() != null) { +return projector.getExpression().getMaxLength(); } - -return Math.min(Math.max(displaySize, DEFAULT_DISPLAY_WIDTH), MAX_DISPLAY_WIDTH); +return DEFAULT_DISPLAY_WIDTH; } - + @Override public String getColumnLabel(int column) throws SQLException { return rowProjector.getColumnProjector(column-1).getName(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/efd5b217/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java new file mode 100644 index 000..9153595 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java @@ -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. + */ +package org.apache.phoenix.jdbc; + +import static
[3/5] phoenix git commit: PHOENIX-1413 Add Phoenix coprocessors with configurable priority
PHOENIX-1413 Add Phoenix coprocessors with configurable priority Conflicts: phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/4f1df52b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/4f1df52b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/4f1df52b Branch: refs/heads/3.0 Commit: 4f1df52b78edbdae7950c26f5b7afd6677e4e319 Parents: 6abe4df Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 18:24:54 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:41:10 2014 -0800 -- .../EndToEndCoveredColumnsIndexBuilderIT.java| 3 ++- .../org/apache/phoenix/hbase/index/Indexer.java | 10 +- .../CoveredColumnIndexSpecifierBuilder.java | 4 ++-- .../query/ConnectionQueryServicesImpl.java | 19 ++- .../org/apache/phoenix/query/QueryServices.java | 2 ++ .../phoenix/query/QueryServicesOptions.java | 5 + 6 files changed, 26 insertions(+), 17 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/4f1df52b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java -- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java index d7b9099..75ed0bf 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/hbase/index/covered/EndToEndCoveredColumnsIndexBuilderIT.java @@ -32,6 +32,7 @@ import java.util.Map; import java.util.Queue; import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.HBaseTestingUtility; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HTableDescriptor; @@ -301,7 +302,7 @@ public class EndToEndCoveredColumnsIndexBuilderIT { // initializer blows up. indexerOpts.put(CoveredColumnsIndexBuilder.CODEC_CLASS_NAME_KEY, CoveredIndexCodecForTesting.class.getName()); -Indexer.enableIndexing(desc, CoveredColumnsIndexBuilder.class, indexerOpts); +Indexer.enableIndexing(desc, CoveredColumnsIndexBuilder.class, indexerOpts, Coprocessor.PRIORITY_USER); // create the table HBaseAdmin admin = UTIL.getHBaseAdmin(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/4f1df52b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java index 3ab400a..8531361 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/Indexer.java @@ -32,7 +32,6 @@ import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hbase.Coprocessor; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.HRegionInfo; @@ -639,17 +638,18 @@ public class Indexer extends BaseRegionObserver { /** * Enable indexing on the given table * @param desc {@link HTableDescriptor} for the table on which indexing should be enabled - * @param builder class to use when building the index for this table - * @param properties map of custom configuration options to make available to your + * @param builder class to use when building the index for this table + * @param properties map of custom configuration options to make available to your * {@link IndexBuilder} on the server-side + * @param priority TODO * @throws IOException the Indexer coprocessor cannot be added */ public static void enableIndexing(HTableDescriptor desc, Class? extends IndexBuilder builder, - MapString, String properties) throws IOException { + MapString, String properties, int priority) throws IOException { if (properties == null) { properties = new HashMapString, String(); }
[1/5] phoenix git commit: PHOENIX-1402 Don't recalculate stats on split
Repository: phoenix Updated Branches: refs/heads/3.0 d2cd2856b - 84f634325 PHOENIX-1402 Don't recalculate stats on split Conflicts: phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsUtil.java phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c9715571 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c9715571 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c9715571 Branch: refs/heads/3.0 Commit: c9715571a6bfb83c224459d0202a2e41e7cdde1a Parents: d2cd285 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 14:29:52 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:37:52 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 4 - .../phoenix/end2end/StatsCollectorIT.java | 103 ++ .../UngroupedAggregateRegionObserver.java | 44 .../phoenix/iterate/ParallelIterators.java | 2 +- .../phoenix/schema/stats/GuidePostsInfo.java| 3 + .../schema/stats/StatisticsCollector.java | 105 --- .../phoenix/schema/stats/StatisticsUtil.java| 11 ++ .../phoenix/schema/stats/StatisticsWriter.java | 70 - .../org/apache/phoenix/util/UpgradeUtil.java| 18 +++- pom.xml | 4 +- 10 files changed, 239 insertions(+), 125 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c9715571/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index e8c1a09..5a0d998 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -464,9 +464,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.staticFieldPrefixes= /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.codeComplete.visibilityCheck=enabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.compliance=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.lineNumber=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.localVariable=generate /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.debug.sourceFile=generate @@ -516,7 +514,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedParameterWhenOverridingConcrete=disabled /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.unusedPrivateMember=error /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.problem.varargsArgumentNeedCast=error -/instance/org.eclipse.jdt.core/org.eclipse.jdt.core.compiler.source=1.6 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_enum_constant=16 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.alignment_for_arguments_in_explicit_constructor_call=16 @@ -775,7 +772,6 @@ file_export_version=3.0 /instance/org.eclipse.jdt.core/org.eclipse.jdt.core.formatter.wrap_before_binary_operator=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.ExpressionView.org.eclipse.jdt.debug.ui.show_null_entries=true /instance/org.eclipse.jdt.debug.ui/org.eclipse.debug.ui.VariableView.org.eclipse.jdt.debug.ui.show_null_entries=true -/instance/org.eclipse.jdt.launching/org.eclipse.jdt.launching.PREF_DEFAULT_ENVIRONMENTS_XML=?xml version\=1.0 encoding\=UTF-8?\ndefaultEnvironments\ndefaultEnvironment environmentId\=J2SE-1.5 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217539956414/\ndefaultEnvironment environmentId\=JavaSE-1.6 vmId\=57,org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType13,1217443741223/\n/defaultEnvironments\n
[5/5] phoenix git commit: PHOENIX-1418 Optionally display number of parallel chunks in explain plan
PHOENIX-1418 Optionally display number of parallel chunks in explain plan Conflicts: phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/84f63432 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/84f63432 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/84f63432 Branch: refs/heads/3.0 Commit: 84f634325891949ea56002e1aa13d4852b60b604 Parents: efd5b21 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:42:19 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:46:07 2014 -0800 -- .../org/apache/phoenix/end2end/StatsCollectorIT.java| 12 +--- .../org/apache/phoenix/iterate/ParallelIterators.java | 6 +- .../java/org/apache/phoenix/query/QueryServices.java| 1 + .../org/apache/phoenix/query/QueryServicesOptions.java | 7 +++ .../org/apache/phoenix/query/QueryServicesTestImpl.java | 2 ++ 5 files changed, 24 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/84f63432/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 71eaf42..85b7c23 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 @@ -43,6 +43,7 @@ import org.apache.phoenix.query.ConnectionQueryServices; import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; @@ -58,11 +59,12 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -MapString,String props = Maps.newHashMapWithExpectedSize(3); +MapString,String props = Maps.newHashMapWithExpectedSize(5); // Must update config before starting server props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(20)); props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(10)); props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000)); +props.put(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, Boolean.TRUE.toString()); setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } @@ -303,6 +305,7 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } // FIXME: I see the commit of the stats finishing before this with a lower timestamp that the scan timestamp, // yet without this sleep, the query finds the old data. Seems like an HBase bug and a potentially serious one. + Thread.sleep(5000); } finally { admin.close(); @@ -325,15 +328,18 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } conn.commit(); +ResultSet rs; TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME); ListKeyRangekeyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME); assertEquals(nRows+1, keyRanges.size()); - +rs = conn.createStatement().executeQuery(EXPLAIN SELECT * FROM + STATS_TEST_TABLE_NAME); +assertEquals(CLIENT + (nRows+1) + -CHUNK + PARALLEL 1-WAY FULL SCAN OVER + STATS_TEST_TABLE_NAME, QueryUtil.getExplainPlan(rs)); + ConnectionQueryServices services = conn.unwrap(PhoenixConnection.class).getQueryServices(); ListHRegionLocation regions = services.getAllTableRegions(STATS_TEST_TABLE_BYTES); assertEquals(1, regions.size()); -ResultSet rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); +rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); assertTrue(rs.next()); assertEquals(nRows, rs.getLong(1)); assertEquals(regions.get(0).getRegionInfo().getRegionNameAsString(), rs.getString(2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/84f63432/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
[5/5] phoenix git commit: PHOENIX-1418 Optionally display number of parallel chunks in explain plan
PHOENIX-1418 Optionally display number of parallel chunks in explain plan Conflicts: phoenix-core/src/it/java/org/apache/phoenix/end2end/StatsCollectorIT.java Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/40ecd859 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/40ecd859 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/40ecd859 Branch: refs/heads/3.2 Commit: 40ecd85900ccb1ff474d4fc8c3a7fe27bff904ca Parents: d6d9a79 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:42:19 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:48:57 2014 -0800 -- .../org/apache/phoenix/end2end/StatsCollectorIT.java| 12 +--- .../org/apache/phoenix/iterate/ParallelIterators.java | 6 +- .../java/org/apache/phoenix/query/QueryServices.java| 1 + .../org/apache/phoenix/query/QueryServicesOptions.java | 7 +++ .../org/apache/phoenix/query/QueryServicesTestImpl.java | 2 ++ 5 files changed, 24 insertions(+), 4 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/40ecd859/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 71eaf42..85b7c23 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 @@ -43,6 +43,7 @@ import org.apache.phoenix.query.ConnectionQueryServices; import org.apache.phoenix.query.KeyRange; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.util.PropertiesUtil; +import org.apache.phoenix.util.QueryUtil; import org.apache.phoenix.util.ReadOnlyProps; import org.apache.phoenix.util.TestUtil; import org.junit.BeforeClass; @@ -58,11 +59,12 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { -MapString,String props = Maps.newHashMapWithExpectedSize(3); +MapString,String props = Maps.newHashMapWithExpectedSize(5); // Must update config before starting server props.put(QueryServices.STATS_GUIDEPOST_WIDTH_BYTES_ATTRIB, Long.toString(20)); props.put(QueryServices.THREAD_POOL_SIZE_ATTRIB, Integer.toString(10)); props.put(QueryServices.QUEUE_SIZE_ATTRIB, Integer.toString(1000)); +props.put(QueryServices.EXPLAIN_CHUNK_COUNT_ATTRIB, Boolean.TRUE.toString()); setUpTestDriver(new ReadOnlyProps(props.entrySet().iterator())); } @@ -303,6 +305,7 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } // FIXME: I see the commit of the stats finishing before this with a lower timestamp that the scan timestamp, // yet without this sleep, the query finds the old data. Seems like an HBase bug and a potentially serious one. + Thread.sleep(5000); } finally { admin.close(); @@ -325,15 +328,18 @@ public class StatsCollectorIT extends BaseOwnClusterHBaseManagedTimeIT { } conn.commit(); +ResultSet rs; TestUtil.analyzeTable(conn, STATS_TEST_TABLE_NAME); ListKeyRangekeyRanges = getAllSplits(conn, STATS_TEST_TABLE_NAME); assertEquals(nRows+1, keyRanges.size()); - +rs = conn.createStatement().executeQuery(EXPLAIN SELECT * FROM + STATS_TEST_TABLE_NAME); +assertEquals(CLIENT + (nRows+1) + -CHUNK + PARALLEL 1-WAY FULL SCAN OVER + STATS_TEST_TABLE_NAME, QueryUtil.getExplainPlan(rs)); + ConnectionQueryServices services = conn.unwrap(PhoenixConnection.class).getQueryServices(); ListHRegionLocation regions = services.getAllTableRegions(STATS_TEST_TABLE_BYTES); assertEquals(1, regions.size()); -ResultSet rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); +rs = conn.createStatement().executeQuery(SELECT GUIDE_POSTS_COUNT, REGION_NAME FROM SYSTEM.STATS WHERE PHYSICAL_NAME='+STATS_TEST_TABLE_NAME+' AND REGION_NAME IS NOT NULL); assertTrue(rs.next()); assertEquals(nRows, rs.getLong(1)); assertEquals(regions.get(0).getRegionInfo().getRegionNameAsString(), rs.getString(2)); http://git-wip-us.apache.org/repos/asf/phoenix/blob/40ecd859/phoenix-core/src/main/java/org/apache/phoenix/iterate/ParallelIterators.java
[4/5] phoenix git commit: PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain)
PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d6d9a796 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d6d9a796 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d6d9a796 Branch: refs/heads/3.2 Commit: d6d9a796f7fa81dc19bb042c0ea388d15f8026f0 Parents: 46d2160 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 19:22:08 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:48:39 2014 -0800 -- .../phoenix/jdbc/PhoenixResultSetMetaData.java | 18 +++- .../jdbc/PhoenixResultSetMetadataTest.java | 45 2 files changed, 52 insertions(+), 11 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6d9a796/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java index b58d5ad..30e9862 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixResultSetMetaData.java @@ -55,9 +55,7 @@ import org.apache.phoenix.schema.PDataType; * @since 0.1 */ public class PhoenixResultSetMetaData implements ResultSetMetaData { -private static final int MIN_DISPLAY_WIDTH = 3; -private static final int MAX_DISPLAY_WIDTH = 40; -private static final int DEFAULT_DISPLAY_WIDTH = 10; +static final int DEFAULT_DISPLAY_WIDTH = 40; private final RowProjector rowProjector; private final PhoenixConnection connection; @@ -85,21 +83,19 @@ public class PhoenixResultSetMetaData implements ResultSetMetaData { @Override public int getColumnDisplaySize(int column) throws SQLException { ColumnProjector projector = rowProjector.getColumnProjector(column-1); -int displaySize = Math.max(projector.getName().length(),MIN_DISPLAY_WIDTH); PDataType type = projector.getExpression().getDataType(); if (type == null) { -return Math.min(Math.max(displaySize, QueryConstants.NULL_DISPLAY_TEXT.length()), MAX_DISPLAY_WIDTH); +return QueryConstants.NULL_DISPLAY_TEXT.length(); } if (type.isCoercibleTo(PDataType.DATE)) { -return Math.min(Math.max(displaySize, connection.getDatePattern().length()), MAX_DISPLAY_WIDTH); +return connection.getDatePattern().length(); } -if (type.isFixedWidth() projector.getExpression().getMaxLength() != null) { -return Math.min(Math.max(displaySize, projector.getExpression().getMaxLength()), MAX_DISPLAY_WIDTH); +if (projector.getExpression().getMaxLength() != null) { +return projector.getExpression().getMaxLength(); } - -return Math.min(Math.max(displaySize, DEFAULT_DISPLAY_WIDTH), MAX_DISPLAY_WIDTH); +return DEFAULT_DISPLAY_WIDTH; } - + @Override public String getColumnLabel(int column) throws SQLException { return rowProjector.getColumnProjector(column-1).getName(); http://git-wip-us.apache.org/repos/asf/phoenix/blob/d6d9a796/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java -- diff --git a/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java new file mode 100644 index 000..9153595 --- /dev/null +++ b/phoenix-core/src/test/java/org/apache/phoenix/jdbc/PhoenixResultSetMetadataTest.java @@ -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. + */ +package org.apache.phoenix.jdbc; + +import static
phoenix git commit: PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/4.0 4ed86c0cc - ece26a013 PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ece26a01 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ece26a01 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ece26a01 Branch: refs/heads/4.0 Commit: ece26a01389d9e1e145955db10125adf4ecebb82 Parents: 4ed86c0 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 22:59:31 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 22:59:31 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ece26a01/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index 5a0d998..a218c97 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -796,7 +796,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.packages.linktoeditor=true /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.code_templates_migrated=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.fieldcomment name\=fieldcomment/**\n * Comment for lt;codegt;${field}lt;/codegt;\n *//templatetemplate autoinsert\=false context\=newtype_context deleted\=false description\=Newly created files enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.newtype name\=newtype/*\n * Copyright 2010 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n *distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * License); you maynot use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicablelaw or agreed to in writing, software\n * distributed under the License is distributed on an AS IS BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n${package_declaration}\n\n${typecomment}\n${type_declaration}/template/templates +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true
phoenix git commit: PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/master 7a20d3dd7 - c8fbb8fb4 PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c8fbb8fb Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c8fbb8fb Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c8fbb8fb Branch: refs/heads/master Commit: c8fbb8fb497bb629c1555a17074443e636e917f6 Parents: 7a20d3d Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 22:59:31 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 23:00:57 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c8fbb8fb/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index 5a0d998..a218c97 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -796,7 +796,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.packages.linktoeditor=true /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.code_templates_migrated=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.fieldcomment name\=fieldcomment/**\n * Comment for lt;codegt;${field}lt;/codegt;\n *//templatetemplate autoinsert\=false context\=newtype_context deleted\=false description\=Newly created files enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.newtype name\=newtype/*\n * Copyright 2010 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n *distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * License); you maynot use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicablelaw or agreed to in writing, software\n * distributed under the License is distributed on an AS IS BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n${package_declaration}\n\n${typecomment}\n${type_declaration}/template/templates +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true
phoenix git commit: PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/4.2 8024b59f8 - aff863112 PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/aff86311 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/aff86311 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/aff86311 Branch: refs/heads/4.2 Commit: aff863112b0c94d331b67d6c908c03ba9f8dd8fc Parents: 8024b59 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 22:59:31 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 23:00:40 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/aff86311/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index 5a0d998..a218c97 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -796,7 +796,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.packages.linktoeditor=true /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.code_templates_migrated=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.fieldcomment name\=fieldcomment/**\n * Comment for lt;codegt;${field}lt;/codegt;\n *//templatetemplate autoinsert\=false context\=newtype_context deleted\=false description\=Newly created files enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.newtype name\=newtype/*\n * Copyright 2010 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n *distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * License); you maynot use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicablelaw or agreed to in writing, software\n * distributed under the License is distributed on an AS IS BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n${package_declaration}\n\n${typecomment}\n${type_declaration}/template/templates +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true
phoenix git commit: PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain)
Repository: phoenix Updated Branches: refs/heads/3.0 84f634325 - 026885adf PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/026885ad Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/026885ad Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/026885ad Branch: refs/heads/3.0 Commit: 026885adfb501bcc86370c77682e0b21664e07b8 Parents: 84f6343 Author: James Taylor jtay...@salesforce.com Authored: Thu Nov 6 22:59:31 2014 -0800 Committer: James Taylor jtay...@salesforce.com Committed: Thu Nov 6 23:01:14 2014 -0800 -- dev/eclipse_prefs_phoenix.epf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/026885ad/dev/eclipse_prefs_phoenix.epf -- diff --git a/dev/eclipse_prefs_phoenix.epf b/dev/eclipse_prefs_phoenix.epf index 5a0d998..a218c97 100644 --- a/dev/eclipse_prefs_phoenix.epf +++ b/dev/eclipse_prefs_phoenix.epf @@ -796,7 +796,7 @@ file_export_version=3.0 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.packages.linktoeditor=true /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.staticondemandthreshold=99 /instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.code_templates_migrated=true -/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.fieldcomment name\=fieldcomment/**\n * Comment for lt;codegt;${field}lt;/codegt;\n *//templatetemplate autoinsert\=false context\=newtype_context deleted\=false description\=Newly created files enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.newtype name\=newtype/*\n * Copyright 2010 The Apache Software Foundation\n *\n * Licensed to the Apache Software Foundation (ASF) under one\n * or more contributor license agreements. See the NOTICE file\n *distributed with this work for additional information\n * regarding copyright ownership. The ASF licenses this file\n * to you under the Apache License, Version 2.0 (the\n * License); you maynot use this file except in compliance\n * with the License. You may obtain a copy of the License at\n *\n * http://www.apache.org/licenses/LICENSE-2.0\n *\n * Unless required by applicablelaw or agreed to in writing, software\n * distributed under the License is distributed on an AS IS BASIS,\n * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\n * See the License for the specific language governing permissions and\n * limitations under the License.\n */\n${package_declaration}\n\n${typecomment}\n${type_declaration}/template/templates +/instance/org.eclipse.jdt.ui/org.eclipse.jdt.ui.text.custom_code_templates=?xml version\=1.0 encoding\=UTF-8 standalone\=no?templatestemplate autoinsert\=true context\=gettercomment_context deleted\=false description\=Comment for getter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.gettercomment name\=gettercomment/**\n * @return Returns the ${bare_field_name}.\n *//templatetemplate autoinsert\=true context\=settercomment_context deleted\=false description\=Comment for setter method enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.settercomment name\=settercomment/**\n * @param ${param} The ${bare_field_name} to set.\n *//templatetemplate autoinsert\=true context\=typecomment_context deleted\=false description\=Comment for created types enabled\=true id\=org.eclipse.jdt.ui.text.codetemplates.typecomment name\=typecomment/**\n * Describe your class here.\n *\n * @since 138\n *//templatetemplate a utoinsert\=true context\=fieldcomment_context deleted\=false description\=Comment for fields enabled\=true
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 [jtaylor] PHOENIX-1402 Don't recalculate stats on split [jtaylor] PHOENIX-1416 Given a schema name, DatabaseMetadata.getTables and getColumns calls erroneously match tables without schema [jtaylor] PHOENIX-1413 Add Phoenix coprocessors with configurable priority [jtaylor] PHOENIX-1394 getColumnDisplaySize() method returns incorrect value for varchar columns (Samarth Jain) [jtaylor] PHOENIX-1418 Optionally display number of parallel chunks in explain plan
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 [jtaylor] PHOENIX-1419 Update eclipse preferences file with correct header information (Samarth Jain)