diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/Server.java hbase-server/src/main/java/org/apache/hadoop/hbase/Server.java index 6b79f80..6f3585f 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/Server.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/Server.java @@ -41,7 +41,7 @@ public interface Server extends Abortable, Stoppable { ZooKeeperWatcher getZooKeeper(); /** - * Returns a reference to the servers' cluster connection. + * Returns a reference to the servers' cluster connection.estor * * Important note: this method returns a reference to Connection which is managed * by Server itself, so callers must NOT attempt to close connection obtained. diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java index 555417a..fff62ac 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactSplitThread.java @@ -52,7 +52,7 @@ import com.google.common.base.Preconditions; * Compact region on request and then run split if appropriate */ @InterfaceAudience.Private -public class CompactSplitThread implements CompactionRequestor, PropagatingConfigurationObserver { +public class CompactSplitThread implements PropagatingConfigurationObserver { static final Log LOG = LogFactory.getLog(CompactSplitThread.class); // Configuration key for the large compaction threads. @@ -250,25 +250,21 @@ public class CompactSplitThread implements CompactionRequestor, PropagatingConfi } } - @Override public synchronized List requestCompaction(final HRegion r, final String why) throws IOException { return requestCompaction(r, why, null); } - @Override public synchronized List requestCompaction(final HRegion r, final String why, List> requests) throws IOException { return requestCompaction(r, why, Store.NO_PRIORITY, requests); } - @Override public synchronized CompactionRequest requestCompaction(final HRegion r, final Store s, final String why, CompactionRequest request) throws IOException { return requestCompaction(r, s, why, Store.NO_PRIORITY, request); } - @Override public synchronized List requestCompaction(final HRegion r, final String why, int p, List> requests) throws IOException { return requestCompactionInternal(r, why, p, requests, true); diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionRequestor.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionRequestor.java deleted file mode 100644 index 93a73e9..0000000 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/CompactionRequestor.java +++ /dev/null @@ -1,96 +0,0 @@ -/** - * - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.apache.hadoop.hbase.regionserver; - -import java.io.IOException; -import java.util.List; - -import org.apache.hadoop.hbase.classification.InterfaceAudience; -import org.apache.hadoop.hbase.regionserver.compactions.CompactionRequest; -import org.apache.hadoop.hbase.util.Pair; - -@InterfaceAudience.Private -public interface CompactionRequestor { - /** - * @param r Region to compact - * @param why Why compaction was requested -- used in debug messages - * @return The created {@link CompactionRequest CompactionRequests} or an empty list if no - * compactions were started - * @throws IOException - */ - List requestCompaction(final HRegion r, final String why) - throws IOException; - - /** - * @param r Region to compact - * @param why Why compaction was requested -- used in debug messages - * @param requests custom compaction requests. Each compaction must specify the store on which it - * is acting. Can be null in which case a compaction will be attempted on all - * stores for the region. - * @return The created {@link CompactionRequest CompactionRequests} or an empty list if no - * compactions were started - * @throws IOException - */ - List requestCompaction( - final HRegion r, final String why, List> requests - ) - throws IOException; - - /** - * @param r Region to compact - * @param s Store within region to compact - * @param why Why compaction was requested -- used in debug messages - * @param request custom compaction request for the {@link HRegion} and {@link Store}. Custom - * request must be null or be constructed with matching region and store. - * @return The created {@link CompactionRequest} or null if no compaction was started. - * @throws IOException - */ - CompactionRequest requestCompaction( - final HRegion r, final Store s, final String why, CompactionRequest request - ) throws IOException; - - /** - * @param r Region to compact - * @param why Why compaction was requested -- used in debug messages - * @param pri Priority of this compaction. minHeap. <=0 is critical - * @param requests custom compaction requests. Each compaction must specify the store on which it - * is acting. Can be null in which case a compaction will be attempted on all - * stores for the region. - * @return The created {@link CompactionRequest CompactionRequests} or an empty list if no - * compactions were started. - * @throws IOException - */ - List requestCompaction( - final HRegion r, final String why, int pri, List> requests - ) throws IOException; - - /** - * @param r Region to compact - * @param s Store within region to compact - * @param why Why compaction was requested -- used in debug messages - * @param pri Priority of this compaction. minHeap. <=0 is critical - * @param request custom compaction request to run. {@link Store} and {@link HRegion} for the - * request must match the region and store specified here. - * @return The created {@link CompactionRequest} or null if no compaction was started - * @throws IOException - */ - CompactionRequest requestCompaction( - final HRegion r, final Store s, final String why, int pri, CompactionRequest request - ) throws IOException; -} diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java index 5d66933..f657286 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java @@ -2416,11 +2416,6 @@ public class HRegionServer extends HasThread implements return serverName; } - @Override - public CompactionRequestor getCompactionRequester() { - return this.compactSplitThread; - } - public RegionServerCoprocessorHost getRegionServerCoprocessorHost(){ return this.rsHost; } diff --git hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java index 3565195..73967ac 100644 --- hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java +++ hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/RegionServerServices.java @@ -53,11 +53,6 @@ public interface RegionServerServices WAL getWAL(HRegionInfo regionInfo) throws IOException; /** - * @return Implementation of {@link CompactionRequestor} or null. - */ - CompactionRequestor getCompactionRequester(); - - /** * @return Implementation of {@link FlushRequester} or null. */ FlushRequester getFlushRequester(); diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java index e6e98f2..899cbf9 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/MockRegionServerServices.java @@ -38,7 +38,6 @@ import org.apache.hadoop.hbase.master.TableLockManager; import org.apache.hadoop.hbase.master.TableLockManager.NullTableLockManager; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.quotas.RegionServerQuotaManager; -import org.apache.hadoop.hbase.regionserver.CompactionRequestor; import org.apache.hadoop.hbase.regionserver.FlushRequester; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HeapMemoryManager; @@ -143,12 +142,7 @@ public class MockRegionServerServices implements RegionServerServices { public FlushRequester getFlushRequester() { return null; } - - @Override - public CompactionRequestor getCompactionRequester() { - return null; - } - + @Override public ClusterConnection getConnection() { return null; diff --git hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java index 0fc33db..ae7285e 100644 --- hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java +++ hbase-server/src/test/java/org/apache/hadoop/hbase/master/MockRegionServer.java @@ -91,7 +91,6 @@ import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest; import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse; import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionStateTransition.TransitionCode; import org.apache.hadoop.hbase.quotas.RegionServerQuotaManager; -import org.apache.hadoop.hbase.regionserver.CompactionRequestor; import org.apache.hadoop.hbase.regionserver.FlushRequester; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HeapMemoryManager; @@ -304,12 +303,6 @@ ClientProtos.ClientService.BlockingInterface, RegionServerServices { } @Override - public CompactionRequestor getCompactionRequester() { - // TODO Auto-generated method stub - return null; - } - - @Override public FlushRequester getFlushRequester() { // TODO Auto-generated method stub return null; @@ -620,4 +613,4 @@ ClientProtos.ClientService.BlockingInterface, RegionServerServices { public HeapMemoryManager getHeapMemoryManager() { return null; } -} \ No newline at end of file +}