diff --git a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml index f420d912c79d..861859812b55 100644 --- a/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml +++ b/hbase-checkstyle/src/main/resources/hbase/checkstyle-suppressions.xml @@ -40,6 +40,7 @@ + diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiveManager.java similarity index 94% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiveManager.java index c51d4937a143..09db0b22c8e8 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveManager.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiveManager.java @@ -15,18 +15,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.backup.example; +package org.apache.hadoop.hbase.backup; import java.io.IOException; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ZooKeeperConnectionException; -import org.apache.hadoop.hbase.zookeeper.ZKWatcher; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.hbase.client.Connection; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.zookeeper.ZKUtil; +import org.apache.hadoop.hbase.zookeeper.ZKWatcher; import org.apache.hadoop.hbase.zookeeper.ZNodePaths; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -68,14 +68,14 @@ public HFileArchiveManager enableHFileBackup(byte[] table) throws KeeperExceptio /** * Stop retaining HFiles for the given table in the archive. HFiles will be cleaned up on the next - * pass of the {@link org.apache.hadoop.hbase.master.cleaner.HFileCleaner}, if the HFiles are retained by another - * cleaner. + * pass of the {@link org.apache.hadoop.hbase.master.cleaner.HFileCleaner}, if the HFiles are + * retained by another cleaner. * @param table name of the table for which to disable hfile retention. * @return this for chaining. * @throws KeeperException if if we can't reach zookeeper to update the hfile cleaner. */ public HFileArchiveManager disableHFileBackup(byte[] table) throws KeeperException { - disable(this.zooKeeper, table); + disable(this.zooKeeper, table); return this; } @@ -95,17 +95,16 @@ public HFileArchiveManager disableHFileBackup() throws IOException { } /** - * Perform a best effort enable of hfile retention, which relies on zookeeper communicating the // - * * change back to the hfile cleaner. + * Perform a best effort enable of hfile retention, which relies on zookeeper communicating the + * change back to the hfile cleaner. *

* No attempt is made to make sure that backups are successfully created - it is inherently an * asynchronous operation. * @param zooKeeper watcher connection to zk cluster * @param table table name on which to enable archiving - * @throws KeeperException + * @throws KeeperException if a ZooKeeper operation fails */ - private void enable(ZKWatcher zooKeeper, byte[] table) - throws KeeperException { + private void enable(ZKWatcher zooKeeper, byte[] table) throws KeeperException { LOG.debug("Ensuring archiving znode exists"); ZKUtil.createAndFailSilent(zooKeeper, archiveZnode); diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveTableMonitor.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiveTableMonitor.java similarity index 98% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveTableMonitor.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiveTableMonitor.java index a4daaf011391..fcb266b892a9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/HFileArchiveTableMonitor.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/HFileArchiveTableMonitor.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.backup.example; +package org.apache.hadoop.hbase.backup; import java.util.List; import java.util.Set; diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/LongTermArchivingHFileCleaner.java similarity index 92% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/LongTermArchivingHFileCleaner.java index 484ff5ea1748..8b315af8db12 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/LongTermArchivingHFileCleaner.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/LongTermArchivingHFileCleaner.java @@ -15,11 +15,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.backup.example; +package org.apache.hadoop.hbase.backup; import java.io.IOException; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.fs.FileStatus; import org.apache.hadoop.fs.FileSystem; @@ -27,6 +26,7 @@ import org.apache.hadoop.hbase.HBaseInterfaceAudience; import org.apache.hadoop.hbase.master.cleaner.BaseHFileCleanerDelegate; import org.apache.hadoop.hbase.util.FSUtils; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -35,7 +35,7 @@ * {@link BaseHFileCleanerDelegate} that only cleans HFiles that don't belong to a table that is * currently being archived. *

- * This only works properly if the + * This only works properly if the * {@link org.apache.hadoop.hbase.master.cleaner.TimeToLiveHFileCleaner} * is also enabled (it always should be), since it may take a little time * for the ZK notification to propagate, in which case we may accidentally @@ -53,14 +53,18 @@ public class LongTermArchivingHFileCleaner extends BaseHFileCleanerDelegate { public boolean isFileDeletable(FileStatus fStat) { try { // if its a directory, then it can be deleted - if (fStat.isDirectory()) return true; - + if (fStat.isDirectory()) { + return true; + } + Path file = fStat.getPath(); // check to see if FileStatus[] deleteStatus = FSUtils.listStatus(this.fs, file, null); // if the file doesn't exist, then it can be deleted (but should never // happen since deleted files shouldn't get passed in) - if (deleteStatus == null) return true; + if (deleteStatus == null) { + return true; + } // otherwise, we need to check the file's table and see its being archived Path family = file.getParent(); @@ -69,7 +73,8 @@ public boolean isFileDeletable(FileStatus fStat) { String tableName = table.getName(); boolean ret = !archiveTracker.keepHFiles(tableName); - LOG.debug("Archiver says to [" + (ret ? "delete" : "keep") + "] files for table:" + tableName); + LOG.debug("Archiver says to [" + (ret ? "delete" : "keep") + "] files for table:" + + tableName); return ret; } catch (IOException e) { LOG.error("Failed to lookup status of:" + fStat.getPath() + ", keeping it just incase.", e); @@ -97,13 +102,14 @@ public void setConf(Configuration config) { @Override public void stop(String reason) { - if (this.isStopped()) return; + if (this.isStopped()) { + return; + } + super.stop(reason); if (this.archiveTracker != null) { LOG.info("Stopping " + this.archiveTracker); this.archiveTracker.stop(); } - } - } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/TableHFileArchiveTracker.java similarity index 96% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/TableHFileArchiveTracker.java index 1b3b775b2a46..b75fa0f8b1b9 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/TableHFileArchiveTracker.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/TableHFileArchiveTracker.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.backup.example; +package org.apache.hadoop.hbase.backup; import java.io.IOException; import java.util.List; -import org.apache.hadoop.hbase.zookeeper.ZKWatcher; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.ZooKeeperConnectionException; -import org.apache.hadoop.hbase.zookeeper.ZKUtil; import org.apache.hadoop.hbase.zookeeper.ZKListener; +import org.apache.hadoop.hbase.zookeeper.ZKUtil; +import org.apache.hadoop.hbase.zookeeper.ZKWatcher; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.zookeeper.KeeperException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -38,7 +38,7 @@ * archive. */ @InterfaceAudience.Private -public class TableHFileArchiveTracker extends ZKListener { +public final class TableHFileArchiveTracker extends ZKListener { private static final Logger LOG = LoggerFactory.getLogger(TableHFileArchiveTracker.class); public static final String HFILE_ARCHIVE_ZNODE_PARENT = "hfilearchive"; private HFileArchiveTableMonitor monitor; @@ -67,7 +67,9 @@ public void start() throws KeeperException { @Override public void nodeCreated(String path) { // if it is the archive path - if (!path.startsWith(archiveHFileZNode)) return; + if (!path.startsWith(archiveHFileZNode)) { + return; + } LOG.debug("Archive node: " + path + " created"); // since we are already enabled, just update a single table @@ -75,7 +77,6 @@ public void nodeCreated(String path) { // the top level node has come up, so read in all the tables if (table.length() == 0) { - checkEnabledAndUpdate(); return; } @@ -90,7 +91,9 @@ public void nodeCreated(String path) { @Override public void nodeChildrenChanged(String path) { - if (!path.startsWith(archiveHFileZNode)) return; + if (!path.startsWith(archiveHFileZNode)) { + return; + } LOG.debug("Archive node: " + path + " children changed."); // a table was added to the archive @@ -134,7 +137,9 @@ private void safeStopTrackingTable(String tableZnode) throws KeeperException { @Override public void nodeDeleted(String path) { - if (!path.startsWith(archiveHFileZNode)) return; + if (!path.startsWith(archiveHFileZNode)) { + return; + } LOG.debug("Archive node: " + path + " deleted"); String table = path.substring(archiveHFileZNode.length()); @@ -260,7 +265,10 @@ public ZKWatcher getZooKeeperWatcher() { * Stop this tracker and the passed zookeeper */ public void stop() { - if (this.stopped) return; + if (this.stopped) { + return; + } + this.stopped = true; this.watcher.close(); } diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/ZKTableArchiveClient.java similarity index 98% rename from hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/ZKTableArchiveClient.java index 142788e7618a..b81063b35055 100644 --- a/hbase-server/src/main/java/org/apache/hadoop/hbase/backup/example/ZKTableArchiveClient.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/backup/ZKTableArchiveClient.java @@ -15,17 +15,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.backup.example; +package org.apache.hadoop.hbase.backup; import java.io.IOException; -import org.apache.hadoop.hbase.zookeeper.ZKWatcher; -import org.apache.yetus.audience.InterfaceAudience; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.client.ClusterConnection; import org.apache.hadoop.hbase.util.Bytes; +import org.apache.hadoop.hbase.zookeeper.ZKWatcher; import org.apache.hadoop.hbase.zookeeper.ZNodePaths; +import org.apache.yetus.audience.InterfaceAudience; import org.apache.zookeeper.KeeperException; /** @@ -110,7 +110,7 @@ public void disableHFileBackup() throws IOException, KeeperException { * @param table name of the table to check * @return true if it is, false otherwise * @throws IOException if a connection to ZooKeeper cannot be established - * @throws KeeperException + * @throws KeeperException if a ZooKeeper operation fails */ public boolean getArchivingEnabled(byte[] table) throws IOException, KeeperException { HFileArchiveManager manager = createHFileArchiveManager(); diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/AsyncClientExample.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/AsyncClientExample.java similarity index 95% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/AsyncClientExample.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/client/AsyncClientExample.java index b8b321395cf6..9f9b64f03292 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/AsyncClientExample.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/AsyncClientExample.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import static org.apache.hadoop.hbase.util.FutureUtils.addListener; @@ -28,11 +28,6 @@ import org.apache.commons.io.IOUtils; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.AsyncConnection; -import org.apache.hadoop.hbase.client.AsyncTable; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.hbase.util.Threads; import org.apache.hadoop.util.Tool; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/BufferedMutatorExample.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorExample.java similarity index 92% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/BufferedMutatorExample.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorExample.java index 9c900d7ba118..7e02384d0d79 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/BufferedMutatorExample.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/BufferedMutatorExample.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import java.io.IOException; import java.util.ArrayList; @@ -30,12 +30,6 @@ import java.util.concurrent.TimeoutException; import org.apache.hadoop.conf.Configured; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.BufferedMutator; -import org.apache.hadoop.hbase.client.BufferedMutatorParams; -import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.RetriesExhaustedWithDetailsException; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.Tool; import org.apache.hadoop.util.ToolRunner; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/ExportEndpointExample.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/ExportEndpointExample.java similarity index 85% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/ExportEndpointExample.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/client/ExportEndpointExample.java index d3ee2cc118af..8e12e3306b72 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/ExportEndpointExample.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/ExportEndpointExample.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import java.util.ArrayList; import java.util.List; @@ -24,15 +24,6 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.Admin; -import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; -import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.client.TableDescriptor; -import org.apache.hadoop.hbase.client.TableDescriptorBuilder; import org.apache.hadoop.hbase.coprocessor.Export; import org.apache.hadoop.hbase.util.Bytes; import org.apache.yetus.audience.InterfaceAudience; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/HttpProxyExample.java similarity index 97% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/client/HttpProxyExample.java index 668bf7ac36f0..f457361461b9 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/HttpProxyExample.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/HttpProxyExample.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import static org.apache.hadoop.hbase.util.FutureUtils.addListener; @@ -26,10 +26,6 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.AsyncConnection; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.ipc.NettyRpcClientConfigHelper; import org.apache.hadoop.hbase.util.Bytes; import org.apache.yetus.audience.InterfaceAudience; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/MultiThreadedClientExample.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/MultiThreadedClientExample.java similarity index 95% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/MultiThreadedClientExample.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/client/MultiThreadedClientExample.java index bacb460f3a8c..b71dea2d89f6 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/MultiThreadedClientExample.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/MultiThreadedClientExample.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import java.io.IOException; import java.util.ArrayList; @@ -35,14 +35,6 @@ import org.apache.hadoop.hbase.CellBuilderFactory; import org.apache.hadoop.hbase.CellBuilderType; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Put; -import org.apache.hadoop.hbase.client.RegionLocator; -import org.apache.hadoop.hbase.client.Result; -import org.apache.hadoop.hbase.client.ResultScanner; -import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.filter.KeyOnlyFilter; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.util.Tool; @@ -61,7 +53,7 @@ * * 

  * Usage:
- * bin/hbase org.apache.hadoop.hbase.client.example.MultiThreadedClientExample testTableName 500000
+ * bin/hbase org.apache.hadoop.hbase.client.MultiThreadedClientExample testTableName 500000
  *
* *

diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/RefreshHFilesClient.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/RefreshHFilesClient.java similarity index 95% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/RefreshHFilesClient.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/client/RefreshHFilesClient.java index 0611e71779f4..1e329eb71c6e 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/example/RefreshHFilesClient.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/client/RefreshHFilesClient.java @@ -16,7 +16,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import java.io.Closeable; import java.io.IOException; @@ -25,9 +25,6 @@ import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HConstants; import org.apache.hadoop.hbase.TableName; -import org.apache.hadoop.hbase.client.Connection; -import org.apache.hadoop.hbase.client.ConnectionFactory; -import org.apache.hadoop.hbase.client.Table; import org.apache.hadoop.hbase.client.coprocessor.Batch; import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils.BlockingRpcCallback; import org.apache.hadoop.hbase.ipc.ServerRpcController; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/BulkDeleteEndpoint.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkDeleteEndpoint.java similarity index 87% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/BulkDeleteEndpoint.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkDeleteEndpoint.java index 94550534a663..8de5bdfa7473 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/BulkDeleteEndpoint.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/BulkDeleteEndpoint.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; @@ -35,14 +35,7 @@ import org.apache.hadoop.hbase.client.Delete; import org.apache.hadoop.hbase.client.Mutation; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.coprocessor.CoprocessorException; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest; -import org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteRequest.DeleteType; -import org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse; -import org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteResponse.Builder; -import org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos.BulkDeleteService; +import org.apache.hadoop.hbase.coprocessor.example.generated.BulkDeleteProtos; import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter; import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils; import org.apache.hadoop.hbase.protobuf.ProtobufUtil; @@ -95,7 +88,8 @@ * */ @InterfaceAudience.Private -public class BulkDeleteEndpoint extends BulkDeleteService implements RegionCoprocessor { +public class BulkDeleteEndpoint extends BulkDeleteProtos.BulkDeleteService + implements RegionCoprocessor { private static final String NO_OF_VERSIONS_TO_DELETE = "noOfVersionsToDelete"; private static final Logger LOG = LoggerFactory.getLogger(BulkDeleteEndpoint.class); @@ -107,8 +101,8 @@ public Iterable getServices() { } @Override - public void delete(RpcController controller, BulkDeleteRequest request, - RpcCallback done) { + public void delete(RpcController controller, BulkDeleteProtos.BulkDeleteRequest request, + RpcCallback done) { long totalRowsDeleted = 0L; long totalVersionsDeleted = 0L; Region region = env.getRegion(); @@ -117,12 +111,13 @@ public void delete(RpcController controller, BulkDeleteRequest request, if (request.hasTimestamp()) { timestamp = request.getTimestamp(); } - DeleteType deleteType = request.getDeleteType(); + BulkDeleteProtos.BulkDeleteRequest.DeleteType deleteType = request.getDeleteType(); boolean hasMore = true; RegionScanner scanner = null; try { Scan scan = ProtobufUtil.toScan(request.getScan()); - if (scan.getFilter() == null && deleteType == DeleteType.ROW) { + if (scan.getFilter() == null && + deleteType == BulkDeleteProtos.BulkDeleteRequest.DeleteType.ROW) { // What we need is just the rowkeys. So only 1st KV from any row is enough. // Only when it is a row delete, we can apply this filter. // In other types we rely on the scan to know which all columns to be deleted. @@ -156,7 +151,7 @@ public void delete(RpcController controller, BulkDeleteRequest request, break; } totalRowsDeleted++; - if (deleteType == DeleteType.VERSION) { + if (deleteType == BulkDeleteProtos.BulkDeleteRequest.DeleteType.VERSION) { byte[] versionsDeleted = deleteArr[i].getAttribute( NO_OF_VERSIONS_TO_DELETE); if (versionsDeleted != null) { @@ -179,17 +174,18 @@ public void delete(RpcController controller, BulkDeleteRequest request, } } } - Builder responseBuilder = BulkDeleteResponse.newBuilder(); + BulkDeleteProtos.BulkDeleteResponse.Builder responseBuilder = + BulkDeleteProtos.BulkDeleteResponse.newBuilder(); responseBuilder.setRowsDeleted(totalRowsDeleted); - if (deleteType == DeleteType.VERSION) { + if (deleteType == BulkDeleteProtos.BulkDeleteRequest.DeleteType.VERSION) { responseBuilder.setVersionsDeleted(totalVersionsDeleted); } - BulkDeleteResponse result = responseBuilder.build(); + BulkDeleteProtos.BulkDeleteResponse result = responseBuilder.build(); done.run(result); } - private Delete createDeleteMutation(List deleteRow, DeleteType deleteType, - Long timestamp) { + private Delete createDeleteMutation(List deleteRow, + BulkDeleteProtos.BulkDeleteRequest.DeleteType deleteType, Long timestamp) { long ts; if (timestamp == null) { ts = HConstants.LATEST_TIMESTAMP; @@ -199,14 +195,14 @@ private Delete createDeleteMutation(List deleteRow, DeleteType deleteType, // We just need the rowkey. Get it from 1st KV. byte[] row = CellUtil.cloneRow(deleteRow.get(0)); Delete delete = new Delete(row, ts); - if (deleteType == DeleteType.FAMILY) { + if (deleteType == BulkDeleteProtos.BulkDeleteRequest.DeleteType.FAMILY) { Set families = new TreeSet<>(Bytes.BYTES_COMPARATOR); for (Cell kv : deleteRow) { if (families.add(CellUtil.cloneFamily(kv))) { delete.addFamily(CellUtil.cloneFamily(kv), ts); } } - } else if (deleteType == DeleteType.COLUMN) { + } else if (deleteType == BulkDeleteProtos.BulkDeleteRequest.DeleteType.COLUMN) { Set columns = new HashSet<>(); for (Cell kv : deleteRow) { Column column = new Column(CellUtil.cloneFamily(kv), CellUtil.cloneQualifier(kv)); @@ -217,7 +213,7 @@ private Delete createDeleteMutation(List deleteRow, DeleteType deleteType, delete.addColumns(column.family, column.qualifier, ts); } } - } else if (deleteType == DeleteType.VERSION) { + } else if (deleteType == BulkDeleteProtos.BulkDeleteRequest.DeleteType.VERSION) { // When some timestamp was passed to the delete() call only one version of the column (with // given timestamp) will be deleted. If no timestamp passed, it will delete N versions. // How many versions will get deleted depends on the Scan being passed. All the KVs that diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/DelegatingInternalScanner.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/DelegatingInternalScanner.java similarity index 96% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/DelegatingInternalScanner.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/DelegatingInternalScanner.java index ada040f2a049..f595e26503bf 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/DelegatingInternalScanner.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/DelegatingInternalScanner.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.util.List; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleMasterObserverWithMetrics.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ExampleMasterObserverWithMetrics.java similarity index 95% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleMasterObserverWithMetrics.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ExampleMasterObserverWithMetrics.java index ecc255938ad8..aaa204323aed 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleMasterObserverWithMetrics.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ExampleMasterObserverWithMetrics.java @@ -15,7 +15,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; + +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.util.Optional; @@ -23,10 +24,6 @@ import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.TableDescriptor; -import org.apache.hadoop.hbase.coprocessor.MasterCoprocessor; -import org.apache.hadoop.hbase.coprocessor.MasterCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.MasterObserver; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; import org.apache.hadoop.hbase.metrics.Counter; import org.apache.hadoop.hbase.metrics.Gauge; import org.apache.hadoop.hbase.metrics.MetricRegistry; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ExampleRegionObserverWithMetrics.java similarity index 95% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ExampleRegionObserverWithMetrics.java index ec33e0815d4c..c2078edff68b 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ExampleRegionObserverWithMetrics.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ExampleRegionObserverWithMetrics.java @@ -18,7 +18,7 @@ */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.util.List; @@ -27,10 +27,6 @@ import org.apache.hadoop.hbase.Cell; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.client.Get; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.metrics.Counter; import org.apache.hadoop.hbase.metrics.MetricRegistry; import org.apache.hadoop.hbase.metrics.Timer; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/RefreshHFilesEndpoint.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/RefreshHFilesEndpoint.java similarity index 92% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/RefreshHFilesEndpoint.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/RefreshHFilesEndpoint.java index 2cb9fd3bff30..22b229254342 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/RefreshHFilesEndpoint.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/RefreshHFilesEndpoint.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; @@ -23,9 +23,6 @@ import java.io.IOException; import java.util.Collections; import org.apache.hadoop.hbase.CoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.CoprocessorException; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils; import org.apache.hadoop.hbase.protobuf.generated.RefreshHFilesProtos; import org.apache.hadoop.hbase.regionserver.Store; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/RowCountEndpoint.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/RowCountEndpoint.java similarity index 94% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/RowCountEndpoint.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/RowCountEndpoint.java index 21d3b7a6bc53..b5db599a39f3 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/RowCountEndpoint.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/RowCountEndpoint.java @@ -16,7 +16,7 @@ * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import com.google.protobuf.RpcCallback; import com.google.protobuf.RpcController; @@ -29,10 +29,7 @@ import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.coprocessor.CoprocessorException; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.example.generated.ExampleProtos; +import org.apache.hadoop.hbase.coprocessor.generated.ExampleProtos; import org.apache.hadoop.hbase.filter.FirstKeyOnlyFilter; import org.apache.hadoop.hbase.ipc.CoprocessorRpcUtils; import org.apache.hadoop.hbase.regionserver.InternalScanner; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ScanModifyingObserver.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ScanModifyingObserver.java similarity index 88% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ScanModifyingObserver.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ScanModifyingObserver.java index 1c323d258512..94736a34587e 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ScanModifyingObserver.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ScanModifyingObserver.java @@ -14,16 +14,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.util.Optional; import org.apache.hadoop.hbase.CoprocessorEnvironment; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.util.Bytes; import org.apache.yetus.audience.InterfaceAudience; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ValueRewritingObserver.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ValueRewritingObserver.java similarity index 93% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ValueRewritingObserver.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ValueRewritingObserver.java index 988b51bb9f4d..cdfc3cffc871 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ValueRewritingObserver.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ValueRewritingObserver.java @@ -14,7 +14,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.util.List; @@ -25,10 +25,6 @@ import org.apache.hadoop.hbase.CellBuilderType; import org.apache.hadoop.hbase.CellUtil; import org.apache.hadoop.hbase.CoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.ScanType; import org.apache.hadoop.hbase.regionserver.ScannerContext; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserver.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/WriteHeavyIncrementObserver.java similarity index 97% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserver.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/WriteHeavyIncrementObserver.java index c7ebf0d20ac3..a68302eb64af 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserver.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/WriteHeavyIncrementObserver.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.math.RoundingMode; @@ -37,10 +37,6 @@ import org.apache.hadoop.hbase.client.Put; import org.apache.hadoop.hbase.client.Result; import org.apache.hadoop.hbase.client.Scan; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.regionserver.FlushLifeCycleTracker; import org.apache.hadoop.hbase.regionserver.InternalScanner; import org.apache.hadoop.hbase.regionserver.RegionScanner; diff --git a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.java b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ZooKeeperScanPolicyObserver.java similarity index 95% rename from hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.java rename to hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ZooKeeperScanPolicyObserver.java index 12d7d1799367..dbe7f6700f16 100644 --- a/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/example/ZooKeeperScanPolicyObserver.java +++ b/hbase-examples/src/main/java/org/apache/hadoop/hbase/coprocessor/ZooKeeperScanPolicyObserver.java @@ -16,7 +16,7 @@ * License for the specific language governing permissions and limitations * under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import java.util.Optional; @@ -27,10 +27,6 @@ import org.apache.curator.framework.recipes.cache.NodeCache; import org.apache.curator.retry.RetryForever; import org.apache.hadoop.hbase.CoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.ObserverContext; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessor; -import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.hadoop.hbase.coprocessor.RegionObserver; import org.apache.hadoop.hbase.regionserver.FlushLifeCycleTracker; import org.apache.hadoop.hbase.regionserver.ScanOptions; import org.apache.hadoop.hbase.regionserver.ScanType; diff --git a/hbase-examples/src/main/protobuf/Examples.proto b/hbase-examples/src/main/protobuf/Examples.proto index ed9ed079c9e6..b9c9919bae6c 100644 --- a/hbase-examples/src/main/protobuf/Examples.proto +++ b/hbase-examples/src/main/protobuf/Examples.proto @@ -17,7 +17,7 @@ */ package hbase.pb; -option java_package = "org.apache.hadoop.hbase.coprocessor.example.generated"; +option java_package = "org.apache.hadoop.hbase.coprocessor.generated"; option java_outer_classname = "ExampleProtos"; option java_generic_services = true; option java_generate_equals_and_hash = true; diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/backup/TestZooKeeperTableArchiveClient.java similarity index 96% rename from hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/backup/TestZooKeeperTableArchiveClient.java index 16f3930e3d4d..42013f2a0fa1 100644 --- a/hbase-server/src/test/java/org/apache/hadoop/hbase/backup/example/TestZooKeeperTableArchiveClient.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/backup/TestZooKeeperTableArchiveClient.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.backup.example; +package org.apache.hadoop.hbase.backup; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; @@ -269,8 +269,11 @@ public void testMultipleTables() throws Exception { for (Path file : files) { String tableName = file.getParent().getParent().getParent().getName(); // check to which table this file belongs - if (tableName.equals(otherTable)) initialCountForOtherTable++; - else if (tableName.equals(STRING_TABLE_NAME)) initialCountForPrimary++; + if (tableName.equals(otherTable)) { + initialCountForOtherTable++; + } else if (tableName.equals(STRING_TABLE_NAME)) { + initialCountForPrimary++; + } } assertTrue("Didn't archive files for:" + STRING_TABLE_NAME, initialCountForPrimary > 0); @@ -293,11 +296,13 @@ public void testMultipleTables() throws Exception { String tableName = file.getParent().getParent().getParent().getName(); // ensure we don't have files from the non-archived table assertFalse("Have a file from the non-archived table: " + file, tableName.equals(otherTable)); - if (tableName.equals(STRING_TABLE_NAME)) archivedForPrimary++; + if (tableName.equals(STRING_TABLE_NAME)) { + archivedForPrimary++; + } } - assertEquals("Not all archived files for the primary table were retained.", initialCountForPrimary, - archivedForPrimary); + assertEquals("Not all archived files for the primary table were retained.", + initialCountForPrimary, archivedForPrimary); // but we still have the archive directory assertTrue("Archive directory was deleted via archiver", fs.exists(archiveDir)); @@ -374,7 +379,10 @@ public Iterable answer(InvocationOnMock invocation) throws Throwable @SuppressWarnings("unchecked") Iterable ret = (Iterable) invocation.callRealMethod(); - if (counter[0] >= expected) finished.countDown(); + if (counter[0] >= expected) { + finished.countDown(); + } + return ret; } }).when(delegateSpy).getDeletableFiles(Mockito.anyListOf(FileStatus.class)); @@ -399,7 +407,11 @@ private List getAllFiles(FileSystem fs, Path dir) throws IOException { for (FileStatus file : files) { if (file.isDirectory()) { List subFiles = getAllFiles(fs, file.getPath()); - if (subFiles != null) allFiles.addAll(subFiles); + + if (subFiles != null) { + allFiles.addAll(subFiles); + } + continue; } allFiles.add(file.getPath()); @@ -426,7 +438,7 @@ private void loadFlushAndCompact(HRegion region, byte[] family) throws IOExcepti * Create a new hfile in the passed region * @param region region to operate on * @param columnFamily family for which to add data - * @throws IOException + * @throws IOException if doing the put or flush fails */ private void createHFileInRegion(HRegion region, byte[] columnFamily) throws IOException { // put one row in the region @@ -438,7 +450,7 @@ private void createHFileInRegion(HRegion region, byte[] columnFamily) throws IOE } /** - * @param cleaner + * @param cleaner the cleaner to use */ private void runCleaner(HFileCleaner cleaner, CountDownLatch finished, Stoppable stop) throws InterruptedException { diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientExample.java similarity index 97% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientExample.java index bee18ddd7e79..b89e8439dac2 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestAsyncClientExample.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestAsyncClientExample.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import static org.junit.Assert.assertEquals; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestHttpProxyExample.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestHttpProxyExample.java index 531f818853aa..66ed759e0966 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestHttpProxyExample.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestHttpProxyExample.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import static org.junit.Assert.assertEquals; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestRefreshHFilesClient.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestRefreshHFilesClient.java similarity index 94% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestRefreshHFilesClient.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestRefreshHFilesClient.java index b168db44b546..596b6d04d25b 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/example/TestRefreshHFilesClient.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/client/TestRefreshHFilesClient.java @@ -15,12 +15,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.client.example; +package org.apache.hadoop.hbase.client; import static org.junit.Assert.assertEquals; import org.apache.hadoop.hbase.HBaseClassTestRule; -import org.apache.hadoop.hbase.coprocessor.example.TestRefreshHFilesBase; +import org.apache.hadoop.hbase.coprocessor.TestRefreshHFilesBase; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.testclassification.ClientTests; import org.apache.hadoop.hbase.testclassification.MediumTests; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRefreshHFilesBase.java similarity index 97% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRefreshHFilesBase.java index e84929d81033..e78604d7a3ff 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesBase.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRefreshHFilesBase.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import java.io.IOException; import org.apache.hadoop.conf.Configuration; @@ -25,7 +25,6 @@ import org.apache.hadoop.hbase.MiniHBaseCluster; import org.apache.hadoop.hbase.TableName; import org.apache.hadoop.hbase.client.Table; -import org.apache.hadoop.hbase.coprocessor.CoprocessorHost; import org.apache.hadoop.hbase.master.MasterFileSystem; import org.apache.hadoop.hbase.regionserver.Region; import org.apache.hadoop.hbase.util.Bytes; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRefreshHFilesEndpoint.java similarity index 97% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRefreshHFilesEndpoint.java index e726a1182f1f..67a95e343fe5 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestRefreshHFilesEndpoint.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestRefreshHFilesEndpoint.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -29,10 +29,10 @@ import org.apache.hadoop.hbase.HBaseClassTestRule; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptor; import org.apache.hadoop.hbase.client.ColumnFamilyDescriptorBuilder; +import org.apache.hadoop.hbase.client.RefreshHFilesClient; import org.apache.hadoop.hbase.client.RegionInfo; import org.apache.hadoop.hbase.client.RetriesExhaustedException; import org.apache.hadoop.hbase.client.TableDescriptor; -import org.apache.hadoop.hbase.client.example.RefreshHFilesClient; import org.apache.hadoop.hbase.regionserver.HRegion; import org.apache.hadoop.hbase.regionserver.HStore; import org.apache.hadoop.hbase.regionserver.RegionServerServices; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestScanModifyingObserver.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestScanModifyingObserver.java index 76d9cb9da61c..95e637547ed9 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestScanModifyingObserver.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestScanModifyingObserver.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestValueReplacingCompaction.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestValueReplacingCompaction.java index 6974c2051ae2..9adbf64140c2 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestValueReplacingCompaction.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestValueReplacingCompaction.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestWriteHeavyIncrementObserver.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWriteHeavyIncrementObserver.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestWriteHeavyIncrementObserver.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWriteHeavyIncrementObserver.java index b76861d51531..f8bae76b2b56 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestWriteHeavyIncrementObserver.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWriteHeavyIncrementObserver.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestWriteHeavyIncrementObserverWithMemStoreCompaction.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWriteHeavyIncrementObserverWithMemStoreCompaction.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestWriteHeavyIncrementObserverWithMemStoreCompaction.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWriteHeavyIncrementObserverWithMemStoreCompaction.java index 60b032b42695..6851ae2fdfbb 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestWriteHeavyIncrementObserverWithMemStoreCompaction.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestWriteHeavyIncrementObserverWithMemStoreCompaction.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertEquals; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestZooKeeperScanPolicyObserver.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestZooKeeperScanPolicyObserver.java index 23c97dc6748c..7198f21b9207 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/TestZooKeeperScanPolicyObserver.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/TestZooKeeperScanPolicyObserver.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; diff --git a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/WriteHeavyIncrementObserverTestBase.java similarity index 98% rename from hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java rename to hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/WriteHeavyIncrementObserverTestBase.java index f9a5b5b5453c..199435bf139f 100644 --- a/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/example/WriteHeavyIncrementObserverTestBase.java +++ b/hbase-examples/src/test/java/org/apache/hadoop/hbase/coprocessor/WriteHeavyIncrementObserverTestBase.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package org.apache.hadoop.hbase.coprocessor.example; +package org.apache.hadoop.hbase.coprocessor; import static org.junit.Assert.assertEquals;