Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 eb62c2040 -> f3e49f38e
PHOENIX-4745 Update Tephra version to 0.14.0-incubating Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f3e49f38 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f3e49f38 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f3e49f38 Branch: refs/heads/4.x-HBase-1.3 Commit: f3e49f38e91a00d94e7142739ecfea7fa38dd841 Parents: eb62c20 Author: James Taylor <jtay...@salesforce.com> Authored: Thu May 24 16:10:52 2018 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Thu May 24 16:52:53 2018 -0700 ---------------------------------------------------------------------- .../java/org/apache/phoenix/query/QueryServicesOptions.java | 5 ++++- pom.xml | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/f3e49f38/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java index d708785..307c5dd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java @@ -117,6 +117,7 @@ import org.apache.phoenix.trace.util.Tracing; import org.apache.phoenix.transaction.TransactionFactory; import org.apache.phoenix.util.DateUtil; import org.apache.phoenix.util.ReadOnlyProps; +import org.apache.tephra.TxConstants; @@ -440,7 +441,9 @@ public class QueryServicesOptions { .setIfUnset(UPLOAD_BINARY_DATA_TYPE_ENCODING, DEFAULT_UPLOAD_BINARY_DATA_TYPE_ENCODING) .setIfUnset(PHOENIX_ACLS_ENABLED, DEFAULT_PHOENIX_ACLS_ENABLED) .setIfUnset(LOG_LEVEL, DEFAULT_LOGGING_LEVEL) - .setIfUnset(LOG_SAMPLE_RATE, DEFAULT_LOG_SAMPLE_RATE); + .setIfUnset(LOG_SAMPLE_RATE, DEFAULT_LOG_SAMPLE_RATE) + .setIfUnset(TxConstants.TX_PRE_014_CHANGESET_KEY, Boolean.FALSE.toString()) + ; // HBase sets this to 1, so we reset it to something more appropriate. // Hopefully HBase will change this, because we can't know if a user set // it to 1, so we'll change it. http://git-wip-us.apache.org/repos/asf/phoenix/blob/f3e49f38/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 95654b0..76726f4 100644 --- a/pom.xml +++ b/pom.xml @@ -100,7 +100,7 @@ <joni.version>2.1.2</joni.version> <avatica.version>1.10.0</avatica.version> <jettyVersion>8.1.7.v20120910</jettyVersion> - <tephra.version>0.13.0-incubating</tephra.version> + <tephra.version>0.14.0-incubating</tephra.version> <spark.version>2.0.2</spark.version> <scala.version>2.11.8</scala.version> <scala.binary.version>2.11</scala.binary.version>
