Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 9f2a1ed1a -> 8bb6148b2
PHOENIX-1855 Remove calls to RegionServerService.getCatalogTracker() in local indexing(Rajeshbabu) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/8bb6148b Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/8bb6148b Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/8bb6148b Branch: refs/heads/4.x-HBase-0.98 Commit: 8bb6148b26eb0cbf9b8328f49ec5029ede3cb979 Parents: 9f2a1ed Author: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Authored: Thu Apr 30 10:34:05 2015 +0530 Committer: Rajeshbabu Chintaguntla <rajeshb...@apache.org> Committed: Thu Apr 30 10:34:05 2015 +0530 ---------------------------------------------------------------------- .../hadoop/hbase/regionserver/LocalIndexSplitter.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/8bb6148b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexSplitter.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexSplitter.java b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexSplitter.java index 2ac61cb..66b9a87 100644 --- a/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexSplitter.java +++ b/phoenix-core/src/main/java/org/apache/hadoop/hbase/regionserver/LocalIndexSplitter.java @@ -28,6 +28,7 @@ import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.catalog.MetaEditor; import org.apache.hadoop.hbase.catalog.MetaReader; +import org.apache.hadoop.hbase.client.HBaseAdmin; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.coprocessor.BaseRegionObserver; @@ -73,7 +74,13 @@ public class LocalIndexSplitter extends BaseRegionObserver { .getValue(MetaDataUtil.IS_LOCAL_INDEX_TABLE_PROP_BYTES)))) { TableName indexTable = TableName.valueOf(MetaDataUtil.getLocalIndexPhysicalName(tableDesc.getName())); - if (!MetaReader.tableExists(rss.getCatalogTracker(), indexTable)) return; + HBaseAdmin admin = null; + try { + admin = new HBaseAdmin(rss.getConfiguration()); + if (!admin.tableExists(indexTable)) return; + } finally { + if (admin != null) admin.close(); + } HRegion indexRegion = IndexUtil.getIndexRegion(environment); if (indexRegion == null) {