This is an automated email from the ASF dual-hosted git repository. larsh pushed a commit to branch 4.x-HBase-1.4 in repository https://gitbox.apache.org/repos/asf/phoenix.git
The following commit(s) were added to refs/heads/4.x-HBase-1.4 by this push: new d99b57c PHOENIX-5499 Upgrading from 4.14.3 client to 4.15.0 client should remove parent->child links from SYSTEM.CATALOG. d99b57c is described below commit d99b57cef03ff31d5b0f4a9de775aa8bf3f5b850 Author: Lars Hofhansl <la...@apache.org> AuthorDate: Sat Oct 5 13:39:14 2019 -0700 PHOENIX-5499 Upgrading from 4.14.3 client to 4.15.0 client should remove parent->child links from SYSTEM.CATALOG. --- .../src/main/java/org/apache/phoenix/execute/MutationState.java | 6 +++++- .../src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 856c6bc55..434d1f7 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -161,7 +161,11 @@ public class MutationState implements SQLCloseable { } public MutationState(MutationState mutationState) { - this(mutationState.maxSize, mutationState.maxSizeBytes, mutationState.connection, true, mutationState + this(mutationState, mutationState.connection); + } + + public MutationState(MutationState mutationState, PhoenixConnection connection) { + this(mutationState.maxSize, mutationState.maxSizeBytes, connection, true, mutationState .getPhoenixTransactionContext()); } diff --git a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java index d668758..988a7c6 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java @@ -372,7 +372,7 @@ public class PhoenixConnection implements Connection, MetaDataMutated, SQLClosea this.isRequestLevelMetricsEnabled = JDBCUtil.isCollectingRequestLevelMetricsEnabled(url, info, this.services.getProps()); this.mutationState = mutationState == null ? newMutationState(maxSize, - maxSizeBytes) : new MutationState(mutationState); + maxSizeBytes) : new MutationState(mutationState, this); this.metaData = metaData; this.metaData.pruneTables(pruner); this.metaData.pruneFunctions(pruner);