PHOENIX-4668 Remove unnecessary table descriptor modification for SPL…

…IT_POLICY column (Chinmay Kulkarni)
apache · Apr 13, 2018 · bbf454b · bbf454b
1 parent d30d771
commit bbf454b
Showing 1 changed file with 0 additions and 11 deletions.
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
@@ -1140,10 +1140,6 @@ private TableDescriptor ensureTableCreated(byte[] physicalTableName, PTableType
                         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 @@ private TableDescriptor ensureTableCreated(byte[] physicalTableName, PTableType
                 }
                 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 {