merge master
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/30bfa730 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/30bfa730 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/30bfa730 Branch: refs/heads/txn Commit: 30bfa7304bf5038cb23db40e42aae61a0d57ee03 Parents: b14e885 ef2fa43 Author: Thomas D'Silva <[email protected]> Authored: Wed Nov 11 14:10:45 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Wed Nov 11 14:10:45 2015 -0800 ---------------------------------------------------------------------- .../example/EndToEndCoveredIndexingIT.java | 1633 +++++++++--------- .../EndtoEndIndexingWithCompressionIT.java | 31 +- .../phoenix/mapreduce/CsvBulkLoadToolIT.java | 5 + .../apache/phoenix/mapreduce/IndexToolIT.java | 5 + .../phoenix/exception/SQLExceptionCode.java | 5 +- .../phoenix/index/PhoenixIndexMetaData.java | 1 - .../org/apache/phoenix/query/QueryServices.java | 1 + .../phoenix/query/QueryServicesOptions.java | 7 + .../java/org/apache/phoenix/util/QueryUtil.java | 13 +- .../org/apache/phoenix/util/ServerUtil.java | 15 +- .../phoenix/query/QueryServicesTestImpl.java | 6 +- .../phoenix/pig/udf/ReserveNSequenceTestIT.java | 86 +- .../phoenix/pig/udf/ReserveNSequence.java | 88 +- pom.xml | 4 +- 14 files changed, 1019 insertions(+), 881 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/30bfa730/phoenix-core/src/main/java/org/apache/phoenix/exception/SQLExceptionCode.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/30bfa730/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixIndexMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/30bfa730/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java index 088dccc,3a71f23..d4bd5fa --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java @@@ -171,8 -170,8 +171,9 @@@ public interface QueryServices extends public static final String COLLECT_REQUEST_LEVEL_METRICS = "phoenix.query.request.metrics.enabled"; public static final String ALLOW_VIEWS_ADD_NEW_CF_BASE_TABLE = "phoenix.view.allowNewColumnFamily"; public static final String RETURN_SEQUENCE_VALUES_ATTRIB = "phoenix.sequence.returnValues"; + public static final String EXTRA_JDBC_ARGUMENTS_ATTRIB = "phoenix.jdbc.extra.arguments"; + public static final String MAX_VERSIONS_TRANSACTIONAL_ATTRIB = "phoenix.transactions.maxVersions"; /** * Get executor service used for parallel scans http://git-wip-us.apache.org/repos/asf/phoenix/blob/30bfa730/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java ---------------------------------------------------------------------- diff --cc phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java index dce8a2a,fddf4c7..8da1fab --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java @@@ -201,9 -200,9 +202,10 @@@ public class QueryServicesOptions public static final boolean DEFAULT_ALLOW_USER_DEFINED_FUNCTIONS = false; public static final boolean DEFAULT_REQUEST_LEVEL_METRICS_ENABLED = false; public static final boolean DEFAULT_ALLOW_VIEWS_ADD_NEW_CF_BASE_TABLE = true; + public static final int DEFAULT_MAX_VERSIONS_TRANSACTIONAL = Integer.MAX_VALUE; public static final boolean DEFAULT_RETURN_SEQUENCE_VALUES = false; + public static final String DEFAULT_EXTRA_JDBC_ARGUMENTS = ""; private final Configuration config; http://git-wip-us.apache.org/repos/asf/phoenix/blob/30bfa730/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/30bfa730/pom.xml ----------------------------------------------------------------------
