phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From gr...@apache.org
Subject phoenix git commit: PHOENIX-1612 Avoid context classloader issue
Date Thu, 29 Jan 2015 15:41:07 GMT
Repository: phoenix
Updated Branches:
  refs/heads/master b12ddfa3f -> d058a41c5


PHOENIX-1612 Avoid context classloader issue

Don't create a static HColumnDescriptor to avoid creating an
HBaseConfiguration from a static context. Making this change makes
it possible to run Phoenix via an external jar file in tools like
DBVisualier (instead of having to put Phoenix directly in the
application classpath).


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d058a41c
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d058a41c
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d058a41c

Branch: refs/heads/master
Commit: d058a41c52c6a68c1581eff520c1f9e12486b89c
Parents: b12ddfa
Author: Gabriel Reid <gabrielr@ngdata.com>
Authored: Wed Jan 28 20:30:33 2015 +0100
Committer: Gabriel Reid <gabrielr@ngdata.com>
Committed: Thu Jan 29 11:04:58 2015 +0100

----------------------------------------------------------------------
 .../org/apache/phoenix/query/ConnectionQueryServicesImpl.java    | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d058a41c/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
index d545b2b..97efc43 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/ConnectionQueryServicesImpl.java
@@ -200,8 +200,6 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices
implement
     private volatile ConcurrentMap<SequenceKey,Sequence> sequenceMap = Maps.newConcurrentMap();
     private KeyValueBuilder kvBuilder;
     
-    private static final HColumnDescriptor defaultColDescriptor = new HColumnDescriptor(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES);
-    
     private PMetaData newEmptyMetaData() {
         long maxSizeBytes = props.getLong(QueryServices.MAX_CLIENT_METADATA_CACHE_SIZE_ATTRIB,
                 QueryServicesOptions.DEFAULT_MAX_CLIENT_METADATA_CACHE_SIZE);
@@ -1673,7 +1671,7 @@ public class ConnectionQueryServicesImpl extends DelegateQueryServices
implement
     }
     
     private boolean isHColumnProperty(String propName) {
-        return defaultColDescriptor.getValue(propName) != null;
+        return HColumnDescriptor.getDefaultValues().containsKey(propName);
     }
 
     private boolean isHTableProperty(String propName) {


Mime
View raw message