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/40226499 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/40226499 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/40226499 Branch: refs/heads/4.x-cdh5.12 Commit: 40226499bfab76e2920b0fc1160c25031700596f Parents: 8cda814 Author: James Taylor <jtay...@salesforce.com> Authored: Fri Apr 13 22:19:15 2018 +0100 Committer: Pedro Boado <pbo...@apache.org> Committed: Fri Apr 13 23:31:40 2018 +0100 ---------------------------------------------------------------------- .../phoenix/query/ConnectionQueryServicesImpl.java | 11 ----------- 1 file changed, 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/40226499/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 fa5d7e2..7f97c74 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 {
