phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject [1/2] phoenix git commit: PHOENIX-4668 Remove unnecessary table descriptor modification for SPLIT_POLICY column (Chinmay Kulkarni)
Date Fri, 13 Apr 2018 22:03:36 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 b28d11998 -> a816061c6


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 27c24abe14e4c0b9b6416dd4472f38b484aaf17d
Parents: b28d119
Author: James Taylor <jtaylor@salesforce.com>
Authored: Fri Apr 13 14:19:15 2018 -0700
Committer: James Taylor <jtaylor@salesforce.com>
Committed: Fri Apr 13 14:47:41 2018 -0700

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


http://git-wip-us.apache.org/repos/asf/phoenix/blob/27c24abe/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 c260845..c4a4d26 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
@@ -1128,10 +1128,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);
@@ -1148,13 +1144,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 {


Mime
View raw message