PHOENIX-2119 Do not copy underlying HBase configuration properties when connection properties are supplied
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9e2b4339 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9e2b4339 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9e2b4339 Branch: refs/heads/calcite Commit: 9e2b4339242588f36a71a3920b36b2e2c7867d2d Parents: d8e5a73 Author: James Taylor <jtay...@salesforce.com> Authored: Tue Feb 16 12:55:21 2016 -0800 Committer: James Taylor <jtay...@salesforce.com> Committed: Wed Feb 17 09:14:12 2016 -0800 ---------------------------------------------------------------------- .../main/java/org/apache/phoenix/jdbc/PhoenixConnection.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9e2b4339/phoenix-core/src/main/java/org/apache/phoenix/jdbc/PhoenixConnection.java ---------------------------------------------------------------------- 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 82bf31a..215d815 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 @@ -58,8 +58,6 @@ import java.util.concurrent.LinkedBlockingQueue; import javax.annotation.Nonnull; import javax.annotation.Nullable; -import co.cask.tephra.TransactionContext; - import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.client.Consistency; import org.apache.htrace.Sampler; @@ -76,7 +74,6 @@ import org.apache.phoenix.iterate.ParallelIteratorFactory; import org.apache.phoenix.iterate.TableResultIterator; import org.apache.phoenix.iterate.TableResultIteratorFactory; import org.apache.phoenix.jdbc.PhoenixStatement.PhoenixStatementParser; -import org.apache.phoenix.monitoring.GlobalClientMetrics; import org.apache.phoenix.parse.PFunction; import org.apache.phoenix.query.ConnectionQueryServices; import org.apache.phoenix.query.DelegateConnectionQueryServices; @@ -119,6 +116,8 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableMap.Builder; import com.google.common.collect.Lists; +import co.cask.tephra.TransactionContext; + /** * @@ -304,7 +303,7 @@ public class PhoenixConnection implements Connection, MetaDataMutated, SQLClosea private static Properties filterKnownNonProperties(Properties info) { Properties prunedProperties = info; for (String property : PhoenixRuntime.CONNECTION_PROPERTIES) { - if (info.contains(property)) { + if (info.containsKey(property)) { if (prunedProperties == info) { prunedProperties = PropertiesUtil.deepCopy(info); }
