merge master
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/da260160 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/da260160 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/da260160 Branch: refs/heads/txn Commit: da260160bcb748177ff89a51966aa730b853fe4b Parents: 746c6d8 27a152e Author: Thomas D'Silva <[email protected]> Authored: Tue Nov 17 14:17:56 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Tue Nov 17 14:17:56 2015 -0800 ---------------------------------------------------------------------- bin/pherf-cluster.py | 83 ++++ bin/pherf-standalone.py | 71 ++++ bin/phoenix_utils.py | 35 ++ bin/psql.py | 2 +- bin/queryserver.py | 2 +- bin/sqlline-thin.py | 30 +- bin/sqlline.py | 2 +- bin/traceserver.py | 4 +- dev/make_rc.sh | 6 +- .../org/apache/phoenix/end2end/ArrayIT.java | 26 ++ .../org/apache/phoenix/end2end/DateTimeIT.java | 34 ++ .../org/apache/phoenix/end2end/QueryMoreIT.java | 33 ++ .../apache/phoenix/jdbc/PhoenixResultSet.java | 7 + .../org/apache/phoenix/query/QueryServices.java | 12 + .../phoenix/query/QueryServicesOptions.java | 16 + .../org/apache/phoenix/schema/PTableImpl.java | 2 +- phoenix-pherf/README.md | 2 +- phoenix-pherf/cluster/pherf.sh | 33 -- phoenix-pherf/config/pherf.properties | 2 +- phoenix-pherf/pom.xml | 13 +- .../apache/phoenix/pherf/ResultBaseTestIT.java | 9 +- .../apache/phoenix/pherf/PherfConstants.java | 2 +- .../apache/phoenix/pherf/result/ResultUtil.java | 12 + .../phoenix/pherf/rules/RulesApplier.java | 2 +- .../apache/phoenix/pherf/ResultBaseTest.java | 16 +- phoenix-pherf/standalone/pherf.sh | 28 -- .../java/org/apache/phoenix/pig/BasePigIT.java | 83 ++++ .../phoenix/pig/PhoenixHBaseLoaderIT.java | 423 ++++++++----------- .../phoenix/pig/PhoenixHBaseStorerIT.java | 43 +- .../phoenix/pig/udf/ReserveNSequenceTestIT.java | 62 +-- .../queryserver/client/ThinClientUtil.java | 11 +- phoenix-server/pom.xml | 1 - .../src/build/query-server-runnable.xml | 8 +- .../phoenix/end2end/QueryServerBasicsIT.java | 4 +- .../apache/phoenix/queryserver/server/Main.java | 89 ++-- phoenix-spark/src/it/resources/setup.sql | 4 +- .../apache/phoenix/spark/PhoenixSparkIT.scala | 7 + .../org/apache/phoenix/spark/PhoenixRDD.scala | 3 +- phoenix-tracing-webapp/pom.xml | 2 - .../src/build/trace-server-runnable.xml | 8 +- pom.xml | 3 +- 41 files changed, 764 insertions(+), 471 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/da260160/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 d4bd5fa,df8cdc3..5f42ff8 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServices.java @@@ -173,8 -172,18 +173,20 @@@ public interface QueryServices extends 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"; + + // queryserver configuration keys + public static final String QUERY_SERVER_SERIALIZATION_ATTRIB = "phoenix.queryserver.serialization"; + public static final String QUERY_SERVER_META_FACTORY_ATTRIB = "phoenix.queryserver.metafactory.class"; + public static final String QUERY_SERVER_HTTP_PORT_ATTRIB = "phoenix.queryserver.http.port"; + public static final String QUERY_SERVER_ENV_LOGGING_ATTRIB = "phoenix.queryserver.envvars.logging.disabled"; + public static final String QUERY_SERVER_ENV_LOGGING_SKIPWORDS_ATTRIB = "phoenix.queryserver.envvars.logging.skipwords"; + public static final String QUERY_SERVER_KEYTAB_FILENAME_ATTRIB = "phoenix.queryserver.keytab.file"; + public static final String QUERY_SERVER_KERBEROS_PRINCIPAL_ATTRIB = "phoenix.queryserver.kerberos.principal"; + public static final String QUERY_SERVER_DNS_NAMESERVER_ATTRIB = "phoenix.queryserver.dns.nameserver"; + public static final String QUERY_SERVER_DNS_INTERFACE_ATTRIB = "phoenix.queryserver.dns.interface"; + public static final String QUERY_SERVER_HBASE_SECURITY_CONF_ATTRIB = "hbase.security.authentication"; + /** * Get executor service used for parallel scans */ http://git-wip-us.apache.org/repos/asf/phoenix/blob/da260160/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/da260160/phoenix-core/src/main/java/org/apache/phoenix/schema/PTableImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/da260160/pom.xml ---------------------------------------------------------------------- diff --cc pom.xml index c8e891d,3eb1f7c..148bb51 --- a/pom.xml +++ b/pom.xml @@@ -110,9 -110,8 +110,9 @@@ <collections.version>3.2.1</collections.version> <jodatime.version>2.7</jodatime.version> <joni.version>2.1.2</joni.version> - <calcite.version>1.3.0-incubating</calcite.version> + <calcite.version>1.5.0</calcite.version> <jettyVersion>8.1.7.v20120910</jettyVersion> + <tephra.version>0.6.3</tephra.version> <!-- Test Dependencies --> <mockito-all.version>1.8.5</mockito-all.version>
