Repository: phoenix Updated Branches: refs/heads/4.x-cdh5.11 2a3c9c94e -> dd8f1dab0
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/83b09014 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/83b09014 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/83b09014 Branch: refs/heads/4.x-cdh5.11 Commit: 83b0901479909e51f0f01977dba7322473dc180e Parents: 2a3c9c9 Author: James Taylor <[email protected]> Authored: Fri Apr 13 14:19:15 2018 -0700 Committer: James Taylor <[email protected]> Committed: Fri Apr 13 14:39:04 2018 -0700 ---------------------------------------------------------------------- .../phoenix/query/ConnectionQueryServicesImpl.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/83b09014/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 a94c083..7ea6b42 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 @@ -1112,10 +1112,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); @@ -1132,13 +1128,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 {
