[05/50] [abbrv] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/39b92bf9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/39b92bf9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/39b92bf9 Branch: refs/heads/4.14-HBase-1.3 Commit: 39b92bf9e8d9cae46b1fa230d91ac04a8e49e629 Parents: 72fa874 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:20:52 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:20:52 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/39b92bf9/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
[12/22] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/39b92bf9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/39b92bf9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/39b92bf9 Branch: refs/heads/omid2 Commit: 39b92bf9e8d9cae46b1fa230d91ac04a8e49e629 Parents: 72fa874 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:20:52 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:20:52 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/39b92bf9/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
[02/22] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d38822ed Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d38822ed Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d38822ed Branch: refs/heads/omid2 Commit: d38822ed7cc6a39578a2423556a036c5d48d8540 Parents: 4082c73 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:50:25 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Tue May 8 20:50:25 2018 +0530 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d38822ed/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
[03/22] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7e5c3871 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7e5c3871 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7e5c3871 Branch: refs/heads/omid2 Commit: 7e5c3871dc55e00d800c8a2cf17f44d45cb8a194 Parents: d38822e Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:13 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Wed May 9 18:13:13 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7e5c3871/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
[4/5] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/84106f48 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/84106f48 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/84106f48 Branch: refs/heads/4.x-cdh5.14 Commit: 84106f48bd084555c495ef7f55e557031c983b65 Parents: 7856a00 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 18:51:55 2018 +0100 Committer: Pedro Boado Committed: Sun May 13 10:46:05 2018 +0100 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/84106f48/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
[4/5] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/84106f48 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/84106f48 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/84106f48 Branch: refs/heads/4.x-cdh5.12 Commit: 84106f48bd084555c495ef7f55e557031c983b65 Parents: 7856a00 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 18:51:55 2018 +0100 Committer: Pedro Boado Committed: Sun May 13 10:46:05 2018 +0100 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/84106f48/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
[4/5] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/84106f48 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/84106f48 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/84106f48 Branch: refs/heads/4.x-cdh5.13 Commit: 84106f48bd084555c495ef7f55e557031c983b65 Parents: 7856a00 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 18:51:55 2018 +0100 Committer: Pedro Boado Committed: Sun May 13 10:46:05 2018 +0100 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/84106f48/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
[3/3] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/84106f48 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/84106f48 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/84106f48 Branch: refs/heads/4.x-cdh5.11 Commit: 84106f48bd084555c495ef7f55e557031c983b65 Parents: 7856a00 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 18:51:55 2018 +0100 Committer: Pedro Boado Committed: Sun May 13 10:46:05 2018 +0100 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/84106f48/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/5.x-HBase-2.0 ded15dc42 -> e05f2bcea PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/e05f2bce Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/e05f2bce Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/e05f2bce Branch: refs/heads/5.x-HBase-2.0 Commit: e05f2bceae498573f124d12e5c570af9ca02cf7e Parents: ded15dc Author: Rajeshbabu Chintaguntla Authored: Sat May 12 03:00:49 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Sat May 12 03:00:49 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java| 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/e05f2bce/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index cccf1c9..d34514d 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -37,9 +37,7 @@ import org.apache.hadoop.hbase.DoNotRetryIOException; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.NotServingRegionException; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.ClusterConnection; import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; @@ -366,7 +364,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 faacf0469 -> 829f3fcc8 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/829f3fcc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/829f3fcc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/829f3fcc Branch: refs/heads/4.x-HBase-0.98 Commit: 829f3fcc82c6a00910db5b21b85aea90f9f0afbf Parents: faacf04 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:39:31 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:39:31 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/829f3fcc/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 106adb1..fe27ab4 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -351,8 +351,8 @@ public class ServerUtil { HConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -410,7 +410,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 e6119229c -> c63d563c1 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c63d563c Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c63d563c Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c63d563c Branch: refs/heads/4.x-HBase-1.1 Commit: c63d563c1b7bb7affbfcd0e81ea23c4a436bf396 Parents: e611922 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:23:03 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:23:03 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c63d563c/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 5d2a94c..66bfca3 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 141686ab5 -> 64b77450a PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/64b77450 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/64b77450 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/64b77450 Branch: refs/heads/4.x-HBase-1.2 Commit: 64b77450a8ca45686f7e7d0abf14231dccda2d32 Parents: 141686a Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:21:55 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:21:55 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/64b77450/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 72fa8749e -> 39b92bf9e PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/39b92bf9 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/39b92bf9 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/39b92bf9 Branch: refs/heads/4.x-HBase-1.3 Commit: 39b92bf9e8d9cae46b1fa230d91ac04a8e49e629 Parents: 72fa874 Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:20:52 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:20:52 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/39b92bf9/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/master 0c8349e3c -> 56f109603 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/56f10960 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/56f10960 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/56f10960 Branch: refs/heads/master Commit: 56f109603cec93f3904366d4bb23415981947ae0 Parents: 0c8349e Author: Rajeshbabu Chintaguntla Authored: Fri May 11 23:19:21 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Fri May 11 23:19:21 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/56f10960/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 9190373..891839a 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -346,8 +346,8 @@ public class ServerUtil { ClusterConnection connection = null; if((connection = connections.get(connectionType)) == null) { synchronized (CoprocessorHConnectionTableFactory.class) { -if(connections.get(connectionType) == null) { -connection = new CoprocessorHConnection(conf, server); +if((connection = connections.get(connectionType)) == null) { +connection = new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); connections.put(connectionType, connection); return connection; } @@ -405,7 +405,7 @@ public class ServerUtil { } public static Configuration getIndexWriterConfigurationWithCustomThreads(Configuration conf) { -Configuration clonedConfig = PropertiesUtil.cloneConfig(conf); +Configuration clonedConfig = getIndexWriterConnection(conf); setHTableThreads(clonedConfig); return clonedConfig; }
[02/13] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5ee89b44 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5ee89b44 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5ee89b44 Branch: refs/heads/4.x-cdh5.14 Commit: 5ee89b440e4394b043674a2a0379339ef14789c6 Parents: 90dc5ef Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:38 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5ee89b44/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
[04/13] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/90dc5ef4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/90dc5ef4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/90dc5ef4 Branch: refs/heads/4.x-cdh5.14 Commit: 90dc5ef487d467d169551ce7410ec8a6bc8c7dbd Parents: dde1054 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:37:50 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/90dc5ef4/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
[04/13] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/90dc5ef4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/90dc5ef4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/90dc5ef4 Branch: refs/heads/4.x-cdh5.13 Commit: 90dc5ef487d467d169551ce7410ec8a6bc8c7dbd Parents: dde1054 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:37:50 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/90dc5ef4/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
[02/13] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5ee89b44 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5ee89b44 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5ee89b44 Branch: refs/heads/4.x-cdh5.13 Commit: 5ee89b440e4394b043674a2a0379339ef14789c6 Parents: 90dc5ef Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:38 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5ee89b44/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
[04/13] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/90dc5ef4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/90dc5ef4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/90dc5ef4 Branch: refs/heads/4.x-cdh5.12 Commit: 90dc5ef487d467d169551ce7410ec8a6bc8c7dbd Parents: dde1054 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:37:50 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/90dc5ef4/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
[02/13] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5ee89b44 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5ee89b44 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5ee89b44 Branch: refs/heads/4.x-cdh5.12 Commit: 5ee89b440e4394b043674a2a0379339ef14789c6 Parents: 90dc5ef Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:38 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5ee89b44/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
[01/10] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-cdh5.11 8ed7eb0f5 -> 810ed4e37 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5ee89b44 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5ee89b44 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5ee89b44 Branch: refs/heads/4.x-cdh5.11 Commit: 5ee89b440e4394b043674a2a0379339ef14789c6 Parents: 90dc5ef Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:38 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/5ee89b44/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
[02/10] phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/90dc5ef4 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/90dc5ef4 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/90dc5ef4 Branch: refs/heads/4.x-cdh5.11 Commit: 90dc5ef487d467d169551ce7410ec8a6bc8c7dbd Parents: dde1054 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:37:50 2018 +0530 Committer: James Taylor Committed: Wed May 9 13:27:36 2018 -0700 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/90dc5ef4/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 9178f569c -> 6f52b737d PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/6f52b737 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/6f52b737 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/6f52b737 Branch: refs/heads/4.x-HBase-1.1 Commit: 6f52b737d8902800692f62ded13dffa0355465c9 Parents: 9178f56 Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:38 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Wed May 9 18:13:38 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/6f52b737/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 451bc52..5d2a94c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 d38822ed7 -> 7e5c3871d PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/7e5c3871 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/7e5c3871 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/7e5c3871 Branch: refs/heads/4.x-HBase-1.3 Commit: 7e5c3871dc55e00d800c8a2cf17f44d45cb8a194 Parents: d38822e Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:13:13 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Wed May 9 18:13:13 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/7e5c3871/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/master ea06a10a3 -> 637cedbd4 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/637cedbd Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/637cedbd Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/637cedbd Branch: refs/heads/master Commit: 637cedbd40b4eacb2189fc3d88b49671dce44eca Parents: ea06a10 Author: Rajeshbabu Chintaguntla Authored: Wed May 9 18:12:42 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Wed May 9 18:12:42 2018 +0530 -- .../src/main/java/org/apache/phoenix/util/ServerUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/637cedbd/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index d80b6fc..9190373 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -26,6 +26,7 @@ import java.io.IOException; import java.sql.SQLException; import java.util.HashMap; import java.util.Map; +import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ExecutorService; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -66,8 +67,6 @@ import org.apache.phoenix.hbase.index.write.IndexWriterUtils; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.schema.StaleRegionBoundaryCacheException; -import org.jboss.netty.util.internal.ConcurrentHashMap; - @SuppressWarnings("deprecation") public class ServerUtil {
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.3 4082c73ee -> d38822ed7 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d38822ed Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d38822ed Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d38822ed Branch: refs/heads/4.x-HBase-1.3 Commit: d38822ed7cc6a39578a2423556a036c5d48d8540 Parents: 4082c73 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:50:25 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Tue May 8 20:50:25 2018 +0530 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d38822ed/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.2 b792c06c5 -> 292ec36a3 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/292ec36a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/292ec36a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/292ec36a Branch: refs/heads/4.x-HBase-1.2 Commit: 292ec36a3d8e854e6b0375797cf478e241576aeb Parents: b792c06 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:49:43 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Tue May 8 20:49:43 2018 +0530 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/292ec36a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 2dab076..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 35d202019 -> 9178f569c PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9178f569 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9178f569 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9178f569 Branch: refs/heads/4.x-HBase-1.1 Commit: 9178f569ca50a3ec90fffd5fa8de46cda9f5cafc Parents: 35d2020 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:37:50 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Tue May 8 20:37:50 2018 +0530 -- phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java | 1 - 1 file changed, 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9178f569/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 5097245..451bc52 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern;
phoenix git commit: PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu)
Repository: phoenix Updated Branches: refs/heads/master 0675fe545 -> ea06a10a3 PHOENIX-4685 Properly handle connection caching for Phoenix inside RegionServers-addendum(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/ea06a10a Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/ea06a10a Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/ea06a10a Branch: refs/heads/master Commit: ea06a10a35af8eb0773b077cbbe704275bb7869c Parents: 0675fe5 Author: Rajeshbabu Chintaguntla Authored: Tue May 8 20:32:04 2018 +0530 Committer: Rajeshbabu Chintaguntla Committed: Tue May 8 20:32:04 2018 +0530 -- .../java/org/apache/phoenix/util/ServerUtil.java | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/phoenix/blob/ea06a10a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java -- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java index 1043fd2..d80b6fc 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/util/ServerUtil.java @@ -27,7 +27,6 @@ import java.sql.SQLException; import java.util.HashMap; import java.util.Map; import java.util.concurrent.ExecutorService; -import java.util.function.Function; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -345,16 +344,17 @@ public class ServerUtil { new ConcurrentHashMap(); public static ClusterConnection getConnection(final ConnectionType connectionType, final Configuration conf, final HRegionServer server) throws IOException { -return connections.computeIfAbsent(connectionType, new Function() { -@Override -public ClusterConnection apply(ConnectionType t) { -try { -return new CoprocessorHConnection(getTypeSpecificConfiguration(connectionType, conf), server); -} catch (IOException e) { - throw new RuntimeException(e); +ClusterConnection connection = null; +if((connection = connections.get(connectionType)) == null) { +synchronized (CoprocessorHConnectionTableFactory.class) { +if(connections.get(connectionType) == null) { +connection = new CoprocessorHConnection(conf, server); +connections.put(connectionType, connection); +return connection; } } -}); +} +return connection; } public static Configuration getTypeSpecificConfiguration(ConnectionType connectionType, Configuration conf) {