Repository: phoenix
Updated Branches:
  refs/heads/5.x-HBase-2.0 d30d77186 -> 2a8f0c0fe


PHOENIX-4668 Remove unnecessary table descriptor modification for SPLIT_POLICY 
column (Chinmay Kulkarni)


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

Branch: refs/heads/5.x-HBase-2.0
Commit: bbf454b3eb9d3fb38622ca757577fdb78bcdbb73
Parents: d30d771
Author: James Taylor <jtay...@salesforce.com>
Authored: Fri Apr 13 14:19:15 2018 -0700
Committer: James Taylor <jtay...@salesforce.com>
Committed: Fri Apr 13 15:07:17 2018 -0700

----------------------------------------------------------------------
 .../phoenix/query/ConnectionQueryServicesImpl.java       | 11 -----------
 1 file changed, 11 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/bbf454b3/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 446bbcf..bb94313 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
@@ -1140,10 +1140,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
                         
PBoolean.INSTANCE.toObject(newDesc.build().getValue(MetaDataUtil.IS_LOCAL_INDEX_TABLE_PROP_BYTES))))
 {
                     
newDesc.setRegionSplitPolicyClassName(IndexRegionSplitPolicy.class.getName());
                 }
-                // Remove the splitPolicy attribute to prevent HBASE-12570
-                if (isMetaTable) {
-                    
newDesc.removeValue(Bytes.toBytes(TableDescriptorBuilder.SPLIT_POLICY));
-                }
                 try {
                     if (splits == null) {
                         admin.createTable(newDesc.build());
@@ -1160,13 +1156,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
                 }
                 if (isMetaTable && !isUpgradeRequired()) {
                     
checkClientServerCompatibility(SchemaUtil.getPhysicalName(SYSTEM_CATALOG_NAME_BYTES,
 this.getProps()).getName());
-                    /*
-                     * Now we modify the table to add the split policy, since 
we know that the client and
-                     * server and compatible. This works around HBASE-12570 
which causes the cluster to be
-                     * brought down.
-                     */
-                    
newDesc.setRegionSplitPolicyClassName(MetaDataSplitPolicy.class.getName());
-                    modifyTable(physicalTableName, newDesc.build(), true);
                 }
                 return null;
             } else {

Reply via email to