Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.3 5f3ef7c5d -> d525ba6a0


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/8e61260b
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8e61260b
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8e61260b

Branch: refs/heads/4.x-HBase-1.3
Commit: 8e61260bb2df936670be836ad02018c35b6842b7
Parents: 5f3ef7c
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 14:33:25 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/8e61260b/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 8b328d3..4c1902d 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
@@ -1130,10 +1130,6 @@ public class ConnectionQueryServicesImpl extends 
DelegateQueryServices implement
                         
PBoolean.INSTANCE.toObject(newDesc.getValue(MetaDataUtil.IS_LOCAL_INDEX_TABLE_PROP_BYTES))))
 {
                     newDesc.setValue(HTableDescriptor.SPLIT_POLICY, 
IndexRegionSplitPolicy.class.getName());
                 }
-                // Remove the splitPolicy attribute to prevent HBASE-12570
-                if (isMetaTable) {
-                    newDesc.remove(HTableDescriptor.SPLIT_POLICY);
-                }
                 try {
                     if (splits == null) {
                         admin.createTable(newDesc);
@@ -1150,13 +1146,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.setValue(HTableDescriptor.SPLIT_POLICY, 
MetaDataSplitPolicy.class.getName());
-                    modifyTable(physicalTableName, newDesc, true);
                 }
                 return null;
             } else {

Reply via email to