You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2014/09/13 00:37:30 UTC
[01/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Repository: accumulo
Updated Branches:
refs/heads/1.5.2-SNAPSHOT 7699e1f43 -> 9b56159c1
refs/heads/1.6.1-SNAPSHOT 2519b838e -> d3e17f458
refs/heads/master 117d5c5c8 -> 541a77ff7
ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b56159c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b56159c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b56159c
Branch: refs/heads/1.5.2-SNAPSHOT
Commit: 9b56159c10f52a549aa20da12ead855a9155ade8
Parents: 7699e1f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:02:24 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:02:24 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/BatchScanner.java | 1 -
.../core/client/impl/OfflineScanner.java | 13 -------------
.../client/impl/TabletServerBatchWriter.java | 3 ---
.../accumulo/core/file/BloomFilterLayer.java | 1 -
.../accumulo/core/file/rfile/bcfile/BCFile.java | 3 ---
.../accumulo/core/file/rfile/bcfile/Chunk.java | 3 ---
.../accumulo/core/file/rfile/bcfile/TFile.java | 13 -------------
.../core/client/mock/MockConnectorTest.java | 2 --
.../simple/client/RandomBatchScanner.java | 1 -
.../examples/simple/client/RowOperations.java | 19 -------------------
.../simple/mapreduce/TeraSortIngest.java | 2 --
.../java/org/apache/accumulo/fate/TStore.java | 2 --
.../apache/accumulo/fate/zookeeper/ZooLock.java | 2 --
.../server/gc/GarbageCollectWriteAheadLogs.java | 4 ----
.../accumulo/server/metanalysis/FindTablet.java | 6 ------
.../accumulo/server/metanalysis/PrintEvents.java | 7 -------
.../apache/accumulo/server/monitor/Monitor.java | 3 ---
.../server/security/SecurityOperation.java | 5 -----
.../server/tabletserver/MemoryManager.java | 2 --
.../server/tabletserver/TabletServer.java | 3 ---
.../tabletserver/log/TabletServerLogger.java | 1 -
.../apache/accumulo/server/util/Initialize.java | 3 ---
.../org/apache/accumulo/server/util/ZooZap.java | 3 ---
.../accumulo/server/master/TestMergeState.java | 6 ------
.../start/classloader/AccumuloClassLoader.java | 5 -----
.../test/functional/SparseColumnFamilyTest.java | 6 ------
.../apache/accumulo/test/randomwalk/Module.java | 1 -
.../accumulo/test/randomwalk/bulk/Verify.java | 4 ----
28 files changed, 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index e332d3c..aa57297 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase {
* <p>
* If not set, there is not timeout. The BatchScanner will retry forever.
*
- * @param timeout
* @param timeUnit
* determines how timeout is interpreted
* @since 1.5.0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 1132e74..80d2c4a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -167,12 +167,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
}
}
- /**
- * @throws TableNotFoundException
- * @throws IOException
- * @throws AccumuloException
- *
- */
private void nextTablet() throws TableNotFoundException, AccumuloException, IOException {
Range nextRange = null;
@@ -274,13 +268,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
return new Pair<KeyExtent,String>(extent, location);
}
- /**
- * @param absFiles
- * @return
- * @throws AccumuloException
- * @throws TableNotFoundException
- * @throws IOException
- */
private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 5b24f4a..f1af7e4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -543,9 +543,6 @@ public class TabletServerBatchWriter {
/**
* Add mutations that previously failed back into the mix
- *
- * @param mutationsprivate
- * static final Logger log = Logger.getLogger(TabletServerBatchWriter.class);
*/
private synchronized void addFailedMutations(MutationSet failedMutations) throws Exception {
mutations.addAll(failedMutations);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 01485d3..af3bf5f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -286,7 +286,6 @@ public class BloomFilterLayer {
* @param range
* range of keys to check
* @return false iff key doesn't exist, true if key probably exists.
- * @throws IOException
*/
boolean probablyHasKey(Range range) throws IOException {
if (bloomFilter == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index 7d15851..aeafe4f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -145,7 +145,6 @@ public final class BCFile {
* Get the current position in file.
*
* @return The current byte offset in underlying file.
- * @throws IOException
*/
long getCurrentPos() throws IOException {
return fsOut.getPos() + fsBufferedOutput.size();
@@ -157,8 +156,6 @@ public final class BCFile {
/**
* Current size of compressed data.
- *
- * @throws IOException
*/
long getCompressedSize() throws IOException {
long ret = getCurrentPos() - posStart;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
index 345d406..abb1798 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
@@ -239,7 +239,6 @@ final class Chunk {
* The chunk buffer.
* @param offset
* Offset to chunk buffer for the beginning of chunk.
- * @param len
* @param last
* Is this the last call to flushBuffer?
*/
@@ -280,8 +279,6 @@ final class Chunk {
* Flush the internal buffer.
*
* Is this the last call to flushBuffer?
- *
- * @throws java.io.IOException
*/
private void flushBuffer() throws IOException {
if (count > 0) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
index b7a927b..7b9be44 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
@@ -544,8 +544,6 @@ public class TFile {
/**
* Check if we need to start a new data block.
- *
- * @throws IOException
*/
private void initDataBlock() throws IOException {
// for each new block, get a new appender
@@ -559,7 +557,6 @@ public class TFile {
*
* @param bForceFinish
* Force the closure regardless of the block size.
- * @throws IOException
*/
void finishDataBlock(boolean bForceFinish) throws IOException {
if (blkAppender == null) {
@@ -777,8 +774,6 @@ public class TFile {
/**
* Lazily loading the TFile index.
- *
- * @throws IOException
*/
synchronized void checkTFileDataIndex() throws IOException {
if (tfileIndex == null) {
@@ -866,7 +861,6 @@ public class TFile {
* the input key
* @param greater
* boolean flag
- * @throws IOException
*/
Location getBlockContainsKey(RawComparable key, boolean greater) throws IOException {
if (!isSorted()) {
@@ -1040,7 +1034,6 @@ public class TFile {
* Begin location of the scan.
* @param end
* End location of the scan.
- * @throws IOException
*/
Scanner(Reader reader, Location begin, Location end) throws IOException {
this.reader = reader;
@@ -1139,7 +1132,6 @@ public class TFile {
*
* @param l
* new cursor location. It must fall between the begin and end location of the scanner.
- * @throws IOException
*/
private void seekTo(Location l) throws IOException {
if (l.compareTo(beginLocation) < 0) {
@@ -1268,8 +1260,6 @@ public class TFile {
/**
* Load a compressed block for reading. Expecting blockIndex is valid.
- *
- * @throws IOException
*/
private void initBlock(int blockIndex) throws IOException {
klen = -1;
@@ -1350,7 +1340,6 @@ public class TFile {
* @param other
* user-specified key.
* @return negative if key at cursor is smaller than user key; 0 if equal; and positive if key at cursor greater than user key.
- * @throws IOException
*/
int compareCursorKeyTo(RawComparable other) throws IOException {
checkKey();
@@ -1641,7 +1630,6 @@ public class TFile {
*
* @param n
* Number of key-value pairs to skip in block.
- * @throws IOException
*/
private void inBlockAdvance(long n) throws IOException {
for (long i = 0; i < n; ++i) {
@@ -1662,7 +1650,6 @@ public class TFile {
* @param greater
* advance until we find a key greater than the input key.
* @return true if we find a equal key.
- * @throws IOException
*/
private boolean inBlockAdvance(RawComparable key, boolean greater) throws IOException {
int curBid = currentLocation.getBlockIndex();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 71352ee..e0485a6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -260,8 +260,6 @@ public class MockConnectorTest {
* Table to check
* @param count
* number of entries to expect in the table
- * @param count
- * number of rows the table should contain
*/
private void checkRemaining(Connector c, String tableName, int count) throws Exception {
Scanner scanner = c.createScanner(tableName, Constants.NO_AUTHS);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index a3bcf62..bf927e7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -114,7 +114,6 @@ public class RandomBatchScanner {
/**
* Prints a count of the number of rows mapped to false.
*
- * @param expectedRows
* @return boolean indicating "were all the rows found?"
*/
private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 2c0a58b..00ab21c 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.examples.simple.client;
-import java.io.IOException;
import java.util.Map.Entry;
import org.apache.accumulo.core.Constants;
@@ -166,12 +165,6 @@ public class RowOperations {
/**
* Deletes a row given a text object
- * @param opts
- *
- * @param row
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
*/
private static void deleteRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
deleteRow(getRow(opts, scanOpts, row));
@@ -179,8 +172,6 @@ public class RowOperations {
/**
* Deletes a row, given a Scanner of JUST that row
- *
- * @param scanner
*/
private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
Mutation deleter = null;
@@ -198,8 +189,6 @@ public class RowOperations {
/**
* Just a generic print function given an iterator. Not necessarily just for printing a single row
- *
- * @param scanner
*/
private static void printRow(Scanner scanner) {
// iterates through and prints
@@ -209,14 +198,6 @@ public class RowOperations {
/**
* Gets a scanner over one row
- * @param opts
- *
- * @param row
- * @return
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
- * @throws IOException
*/
private static Scanner getRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
// Create a scanner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index bdcf943..30bc656 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -299,8 +299,6 @@ public class TeraSortIngest extends Configured implements Tool {
/**
* Add the rowid to the row.
- *
- * @param rowId
*/
private Text getRowIdString(long rowId) {
Text paddedRowIdString = new Text();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/TStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
index 882cdbd..3adb493 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
/**
* Remove the last pushed operation from the given transaction.
- *
- * @param tid
*/
void pop(long tid);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 03e159f..960ba50 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -47,8 +47,6 @@ public class ZooLock implements Watcher {
/**
* lost the ability to monitor the lock node, and its status is unknown
- *
- * @param e
*/
void unableToMonitorLockNode(Throwable e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
index eddedc9..0992eae 100644
--- a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
@@ -285,10 +285,6 @@ public class GarbageCollectWriteAheadLogs {
return sortedWALogs;
}
- /**
- * @param name
- * @return
- */
static private boolean isUUID(String name) {
try {
UUID.fromString(name);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
index f7e5de9..41b15e6 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
@@ -49,12 +49,6 @@ public class FindTablet {
findContainingTablets(opts);
}
- /**
- * @param conn
- * @param tablePrefix
- * @param tableID
- * @param option
- */
private static void findContainingTablets(Opts opts) throws Exception {
Range range = new KeyExtent(new Text(opts.tableId), null, null).toMetadataRange();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
index 0478d83..5bb0171 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
@@ -61,13 +61,6 @@ public class PrintEvents {
printEvents(conn, opts.tableId, opts.endRow, opts.time);
}
- /**
- * @param conn
- * @param tablePrefix
- * @param tableId
- * @param endRow
- * @param time
- */
private static void printEvents(Connector conn, String tableId, String endRow, Long time) throws Exception {
Scanner scanner = conn.createScanner("tabletEvents", new Authorizations());
String metaRow = tableId + (endRow == null ? "<" : ";" + endRow);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 00bd3ca..225e249 100644
--- a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -541,9 +541,6 @@ public class Monitor {
/**
* Get the monitor lock in ZooKeeper
- *
- * @throws KeeperException
- * @throws InterruptedException
*/
private void getMonitorLock() throws KeeperException, InterruptedException {
final String zRoot = ZooUtil.getRoot(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 2d70796..e562f7c 100644
--- a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -178,11 +178,6 @@ public class SecurityOperation {
}
}
- /**
- * @param toAuth
- * @return
- * @throws AccumuloSecurityException
- */
private AuthenticationToken reassembleToken(TCredentials toAuth) throws AccumuloSecurityException {
String tokenClass = toAuth.getTokenClassName();
if (authenticator.validTokenClass(tokenClass)) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index f03b04b..5e6fecc 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -33,8 +33,6 @@ public interface MemoryManager {
/**
* Initialize the memory manager.
- *
- * @param conf
*/
void init(ServerConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 73834e3..a730d9f 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -396,10 +396,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
/**
* while a session is reserved, it cannot be canceled or removed
- *
- * @param sessionId
*/
-
synchronized Session reserveSession(long sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
index d3c09f8..a638540 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
@@ -95,7 +95,6 @@ public class TabletServerLogger {
* lock to use
* @param code
* a test/work pair
- * @throws IOException
*/
private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException {
// Get a read lock
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
index ce26ff5..0d66af8 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
@@ -238,9 +238,6 @@ public class Initialize {
return true;
}
- /**
- * @return
- */
private static boolean zookeeperAvailable() {
try {
return zoo.exists("/");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 489d4bc..78d5edd 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -32,9 +32,6 @@ public class ZooZap {
static boolean verbose = false;
- /**
- * @param args
- */
private static void message(String msg) {
if (verbose)
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
index 80b8d68..94df69c 100644
--- a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
+++ b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
@@ -176,12 +176,6 @@ public class TestMergeState {
}
- /**
- * @param state
- * @param metaDataStateStore
- * @param locations
- * @return
- */
private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) {
MergeStats stats = new MergeStats(state.mergeInfo);
stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 1e2b4b5..bcfa830 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -88,7 +88,6 @@ public class AccumuloClassLoader {
*
* @param d
* XMLDocument to search through
- * @param propertyName
*/
private static String getAccumuloClassPathStrings(Document d, String propertyName) {
NodeList pnodes = d.getElementsByTagName("property");
@@ -157,10 +156,6 @@ public class AccumuloClassLoader {
/**
* Populate the list of URLs with the items in the classpath string
- *
- * @param classpath
- * @param urls
- * @throws MalformedURLException
*/
private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException {
classpath = classpath.trim();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
index 4a0a708..af6eaee 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
@@ -98,12 +98,6 @@ public class SparseColumnFamilyTest extends FunctionalTest {
}
}
- /**
- * @param i
- * @param j
- * @param k
- * @return
- */
private Mutation nm(int row, int cf, int val) {
Mutation m = new Mutation(String.format("%06d", row));
m.put(String.format("%03d", cf), "", "" + val);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index fadcb66..61177ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -134,7 +134,6 @@ public class Module extends Node {
* Chooses a random neighbor node
*
* @return Node or null if no edges
- * @throws Exception
*/
private String randomNeighbor() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index b2299aa..aed790c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -138,10 +138,6 @@ public class Verify extends Test {
}
}
- /**
- * @param startBadEntry
- * @param lastBadEntry
- */
private static void report(Text startBadRow, Text lastBadRow, Value value) {
System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
[13/16] git commit: ACCUMULO-2645 Remove unused imports
Posted by ct...@apache.org.
ACCUMULO-2645 Remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d23cb34e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d23cb34e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d23cb34e
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: d23cb34edff1a3fdd8487d27bbe6fe5db2983f70
Parents: f64482b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:32:08 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/servlets/ScanServlet.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d23cb34e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
index 12b0871..a4f99c4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
@@ -18,21 +18,18 @@ package org.apache.accumulo.monitor.servlets;
import java.io.IOException;
import java.util.Map;
-import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-
-import org.apache.accumulo.monitor.util.celltypes.TServerLinkType;
import org.apache.accumulo.core.tabletserver.thrift.ActiveScan;
import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.monitor.Monitor.ScanStats;
import org.apache.accumulo.monitor.util.Table;
import org.apache.accumulo.monitor.util.TableRow;
import org.apache.accumulo.monitor.util.celltypes.DurationType;
-import org.apache.accumulo.monitor.util.celltypes.StringType;
+import org.apache.accumulo.monitor.util.celltypes.TServerLinkType;
public class ScanServlet extends BasicServlet {
@@ -42,7 +39,7 @@ public class ScanServlet extends BasicServlet {
protected String getTitle(HttpServletRequest req) {
return "Scans";
}
-
+
@Override
protected void pageBody(HttpServletRequest req, HttpServletResponse response, StringBuilder sb) throws IOException {
Map<String,ScanStats> scans = Monitor.getScans();
@@ -68,5 +65,5 @@ public class ScanServlet extends BasicServlet {
}
scanTable.generate(req, sb);
}
-
+
}
[02/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Posted by ct...@apache.org.
ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b56159c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b56159c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b56159c
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 9b56159c10f52a549aa20da12ead855a9155ade8
Parents: 7699e1f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:02:24 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:02:24 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/BatchScanner.java | 1 -
.../core/client/impl/OfflineScanner.java | 13 -------------
.../client/impl/TabletServerBatchWriter.java | 3 ---
.../accumulo/core/file/BloomFilterLayer.java | 1 -
.../accumulo/core/file/rfile/bcfile/BCFile.java | 3 ---
.../accumulo/core/file/rfile/bcfile/Chunk.java | 3 ---
.../accumulo/core/file/rfile/bcfile/TFile.java | 13 -------------
.../core/client/mock/MockConnectorTest.java | 2 --
.../simple/client/RandomBatchScanner.java | 1 -
.../examples/simple/client/RowOperations.java | 19 -------------------
.../simple/mapreduce/TeraSortIngest.java | 2 --
.../java/org/apache/accumulo/fate/TStore.java | 2 --
.../apache/accumulo/fate/zookeeper/ZooLock.java | 2 --
.../server/gc/GarbageCollectWriteAheadLogs.java | 4 ----
.../accumulo/server/metanalysis/FindTablet.java | 6 ------
.../accumulo/server/metanalysis/PrintEvents.java | 7 -------
.../apache/accumulo/server/monitor/Monitor.java | 3 ---
.../server/security/SecurityOperation.java | 5 -----
.../server/tabletserver/MemoryManager.java | 2 --
.../server/tabletserver/TabletServer.java | 3 ---
.../tabletserver/log/TabletServerLogger.java | 1 -
.../apache/accumulo/server/util/Initialize.java | 3 ---
.../org/apache/accumulo/server/util/ZooZap.java | 3 ---
.../accumulo/server/master/TestMergeState.java | 6 ------
.../start/classloader/AccumuloClassLoader.java | 5 -----
.../test/functional/SparseColumnFamilyTest.java | 6 ------
.../apache/accumulo/test/randomwalk/Module.java | 1 -
.../accumulo/test/randomwalk/bulk/Verify.java | 4 ----
28 files changed, 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index e332d3c..aa57297 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase {
* <p>
* If not set, there is not timeout. The BatchScanner will retry forever.
*
- * @param timeout
* @param timeUnit
* determines how timeout is interpreted
* @since 1.5.0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 1132e74..80d2c4a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -167,12 +167,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
}
}
- /**
- * @throws TableNotFoundException
- * @throws IOException
- * @throws AccumuloException
- *
- */
private void nextTablet() throws TableNotFoundException, AccumuloException, IOException {
Range nextRange = null;
@@ -274,13 +268,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
return new Pair<KeyExtent,String>(extent, location);
}
- /**
- * @param absFiles
- * @return
- * @throws AccumuloException
- * @throws TableNotFoundException
- * @throws IOException
- */
private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 5b24f4a..f1af7e4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -543,9 +543,6 @@ public class TabletServerBatchWriter {
/**
* Add mutations that previously failed back into the mix
- *
- * @param mutationsprivate
- * static final Logger log = Logger.getLogger(TabletServerBatchWriter.class);
*/
private synchronized void addFailedMutations(MutationSet failedMutations) throws Exception {
mutations.addAll(failedMutations);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 01485d3..af3bf5f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -286,7 +286,6 @@ public class BloomFilterLayer {
* @param range
* range of keys to check
* @return false iff key doesn't exist, true if key probably exists.
- * @throws IOException
*/
boolean probablyHasKey(Range range) throws IOException {
if (bloomFilter == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index 7d15851..aeafe4f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -145,7 +145,6 @@ public final class BCFile {
* Get the current position in file.
*
* @return The current byte offset in underlying file.
- * @throws IOException
*/
long getCurrentPos() throws IOException {
return fsOut.getPos() + fsBufferedOutput.size();
@@ -157,8 +156,6 @@ public final class BCFile {
/**
* Current size of compressed data.
- *
- * @throws IOException
*/
long getCompressedSize() throws IOException {
long ret = getCurrentPos() - posStart;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
index 345d406..abb1798 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
@@ -239,7 +239,6 @@ final class Chunk {
* The chunk buffer.
* @param offset
* Offset to chunk buffer for the beginning of chunk.
- * @param len
* @param last
* Is this the last call to flushBuffer?
*/
@@ -280,8 +279,6 @@ final class Chunk {
* Flush the internal buffer.
*
* Is this the last call to flushBuffer?
- *
- * @throws java.io.IOException
*/
private void flushBuffer() throws IOException {
if (count > 0) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
index b7a927b..7b9be44 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
@@ -544,8 +544,6 @@ public class TFile {
/**
* Check if we need to start a new data block.
- *
- * @throws IOException
*/
private void initDataBlock() throws IOException {
// for each new block, get a new appender
@@ -559,7 +557,6 @@ public class TFile {
*
* @param bForceFinish
* Force the closure regardless of the block size.
- * @throws IOException
*/
void finishDataBlock(boolean bForceFinish) throws IOException {
if (blkAppender == null) {
@@ -777,8 +774,6 @@ public class TFile {
/**
* Lazily loading the TFile index.
- *
- * @throws IOException
*/
synchronized void checkTFileDataIndex() throws IOException {
if (tfileIndex == null) {
@@ -866,7 +861,6 @@ public class TFile {
* the input key
* @param greater
* boolean flag
- * @throws IOException
*/
Location getBlockContainsKey(RawComparable key, boolean greater) throws IOException {
if (!isSorted()) {
@@ -1040,7 +1034,6 @@ public class TFile {
* Begin location of the scan.
* @param end
* End location of the scan.
- * @throws IOException
*/
Scanner(Reader reader, Location begin, Location end) throws IOException {
this.reader = reader;
@@ -1139,7 +1132,6 @@ public class TFile {
*
* @param l
* new cursor location. It must fall between the begin and end location of the scanner.
- * @throws IOException
*/
private void seekTo(Location l) throws IOException {
if (l.compareTo(beginLocation) < 0) {
@@ -1268,8 +1260,6 @@ public class TFile {
/**
* Load a compressed block for reading. Expecting blockIndex is valid.
- *
- * @throws IOException
*/
private void initBlock(int blockIndex) throws IOException {
klen = -1;
@@ -1350,7 +1340,6 @@ public class TFile {
* @param other
* user-specified key.
* @return negative if key at cursor is smaller than user key; 0 if equal; and positive if key at cursor greater than user key.
- * @throws IOException
*/
int compareCursorKeyTo(RawComparable other) throws IOException {
checkKey();
@@ -1641,7 +1630,6 @@ public class TFile {
*
* @param n
* Number of key-value pairs to skip in block.
- * @throws IOException
*/
private void inBlockAdvance(long n) throws IOException {
for (long i = 0; i < n; ++i) {
@@ -1662,7 +1650,6 @@ public class TFile {
* @param greater
* advance until we find a key greater than the input key.
* @return true if we find a equal key.
- * @throws IOException
*/
private boolean inBlockAdvance(RawComparable key, boolean greater) throws IOException {
int curBid = currentLocation.getBlockIndex();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 71352ee..e0485a6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -260,8 +260,6 @@ public class MockConnectorTest {
* Table to check
* @param count
* number of entries to expect in the table
- * @param count
- * number of rows the table should contain
*/
private void checkRemaining(Connector c, String tableName, int count) throws Exception {
Scanner scanner = c.createScanner(tableName, Constants.NO_AUTHS);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index a3bcf62..bf927e7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -114,7 +114,6 @@ public class RandomBatchScanner {
/**
* Prints a count of the number of rows mapped to false.
*
- * @param expectedRows
* @return boolean indicating "were all the rows found?"
*/
private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 2c0a58b..00ab21c 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.examples.simple.client;
-import java.io.IOException;
import java.util.Map.Entry;
import org.apache.accumulo.core.Constants;
@@ -166,12 +165,6 @@ public class RowOperations {
/**
* Deletes a row given a text object
- * @param opts
- *
- * @param row
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
*/
private static void deleteRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
deleteRow(getRow(opts, scanOpts, row));
@@ -179,8 +172,6 @@ public class RowOperations {
/**
* Deletes a row, given a Scanner of JUST that row
- *
- * @param scanner
*/
private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
Mutation deleter = null;
@@ -198,8 +189,6 @@ public class RowOperations {
/**
* Just a generic print function given an iterator. Not necessarily just for printing a single row
- *
- * @param scanner
*/
private static void printRow(Scanner scanner) {
// iterates through and prints
@@ -209,14 +198,6 @@ public class RowOperations {
/**
* Gets a scanner over one row
- * @param opts
- *
- * @param row
- * @return
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
- * @throws IOException
*/
private static Scanner getRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
// Create a scanner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index bdcf943..30bc656 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -299,8 +299,6 @@ public class TeraSortIngest extends Configured implements Tool {
/**
* Add the rowid to the row.
- *
- * @param rowId
*/
private Text getRowIdString(long rowId) {
Text paddedRowIdString = new Text();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/TStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
index 882cdbd..3adb493 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
/**
* Remove the last pushed operation from the given transaction.
- *
- * @param tid
*/
void pop(long tid);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 03e159f..960ba50 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -47,8 +47,6 @@ public class ZooLock implements Watcher {
/**
* lost the ability to monitor the lock node, and its status is unknown
- *
- * @param e
*/
void unableToMonitorLockNode(Throwable e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
index eddedc9..0992eae 100644
--- a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
@@ -285,10 +285,6 @@ public class GarbageCollectWriteAheadLogs {
return sortedWALogs;
}
- /**
- * @param name
- * @return
- */
static private boolean isUUID(String name) {
try {
UUID.fromString(name);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
index f7e5de9..41b15e6 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
@@ -49,12 +49,6 @@ public class FindTablet {
findContainingTablets(opts);
}
- /**
- * @param conn
- * @param tablePrefix
- * @param tableID
- * @param option
- */
private static void findContainingTablets(Opts opts) throws Exception {
Range range = new KeyExtent(new Text(opts.tableId), null, null).toMetadataRange();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
index 0478d83..5bb0171 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
@@ -61,13 +61,6 @@ public class PrintEvents {
printEvents(conn, opts.tableId, opts.endRow, opts.time);
}
- /**
- * @param conn
- * @param tablePrefix
- * @param tableId
- * @param endRow
- * @param time
- */
private static void printEvents(Connector conn, String tableId, String endRow, Long time) throws Exception {
Scanner scanner = conn.createScanner("tabletEvents", new Authorizations());
String metaRow = tableId + (endRow == null ? "<" : ";" + endRow);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 00bd3ca..225e249 100644
--- a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -541,9 +541,6 @@ public class Monitor {
/**
* Get the monitor lock in ZooKeeper
- *
- * @throws KeeperException
- * @throws InterruptedException
*/
private void getMonitorLock() throws KeeperException, InterruptedException {
final String zRoot = ZooUtil.getRoot(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 2d70796..e562f7c 100644
--- a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -178,11 +178,6 @@ public class SecurityOperation {
}
}
- /**
- * @param toAuth
- * @return
- * @throws AccumuloSecurityException
- */
private AuthenticationToken reassembleToken(TCredentials toAuth) throws AccumuloSecurityException {
String tokenClass = toAuth.getTokenClassName();
if (authenticator.validTokenClass(tokenClass)) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index f03b04b..5e6fecc 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -33,8 +33,6 @@ public interface MemoryManager {
/**
* Initialize the memory manager.
- *
- * @param conf
*/
void init(ServerConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 73834e3..a730d9f 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -396,10 +396,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
/**
* while a session is reserved, it cannot be canceled or removed
- *
- * @param sessionId
*/
-
synchronized Session reserveSession(long sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
index d3c09f8..a638540 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
@@ -95,7 +95,6 @@ public class TabletServerLogger {
* lock to use
* @param code
* a test/work pair
- * @throws IOException
*/
private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException {
// Get a read lock
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
index ce26ff5..0d66af8 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
@@ -238,9 +238,6 @@ public class Initialize {
return true;
}
- /**
- * @return
- */
private static boolean zookeeperAvailable() {
try {
return zoo.exists("/");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 489d4bc..78d5edd 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -32,9 +32,6 @@ public class ZooZap {
static boolean verbose = false;
- /**
- * @param args
- */
private static void message(String msg) {
if (verbose)
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
index 80b8d68..94df69c 100644
--- a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
+++ b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
@@ -176,12 +176,6 @@ public class TestMergeState {
}
- /**
- * @param state
- * @param metaDataStateStore
- * @param locations
- * @return
- */
private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) {
MergeStats stats = new MergeStats(state.mergeInfo);
stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 1e2b4b5..bcfa830 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -88,7 +88,6 @@ public class AccumuloClassLoader {
*
* @param d
* XMLDocument to search through
- * @param propertyName
*/
private static String getAccumuloClassPathStrings(Document d, String propertyName) {
NodeList pnodes = d.getElementsByTagName("property");
@@ -157,10 +156,6 @@ public class AccumuloClassLoader {
/**
* Populate the list of URLs with the items in the classpath string
- *
- * @param classpath
- * @param urls
- * @throws MalformedURLException
*/
private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException {
classpath = classpath.trim();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
index 4a0a708..af6eaee 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
@@ -98,12 +98,6 @@ public class SparseColumnFamilyTest extends FunctionalTest {
}
}
- /**
- * @param i
- * @param j
- * @param k
- * @return
- */
private Mutation nm(int row, int cf, int val) {
Mutation m = new Mutation(String.format("%06d", row));
m.put(String.format("%03d", cf), "", "" + val);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index fadcb66..61177ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -134,7 +134,6 @@ public class Module extends Node {
* Chooses a random neighbor node
*
* @return Node or null if no edges
- * @throws Exception
*/
private String randomNeighbor() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index b2299aa..aed790c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -138,10 +138,6 @@ public class Verify extends Test {
}
}
- /**
- * @param startBadEntry
- * @param lastBadEntry
- */
private static void report(Text startBadRow, Text lastBadRow, Value value) {
System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
[11/16] git commit: ACCUMULO-3093 Remove unused import
Posted by ct...@apache.org.
ACCUMULO-3093 Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f64482bf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f64482bf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f64482bf
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: f64482bf0f1d0bb84bc4a2e8bb62b180efe692b8
Parents: 618e0d4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:29:13 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/util/shell/commands/ScanCommand.java | 1 -
.../apache/accumulo/core/util/shell/commands/SetIterCommand.java | 4 ----
2 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f64482bf/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
index 0270e6c..e60e62f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
@@ -28,7 +28,6 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.ScannerBase;
-import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f64482bf/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
index 4be178a..64afb3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
@@ -45,14 +44,11 @@ import org.apache.accumulo.core.util.shell.Shell;
import org.apache.accumulo.core.util.shell.Shell.Command;
import org.apache.accumulo.core.util.shell.ShellCommandException;
import org.apache.accumulo.core.util.shell.ShellCommandException.ErrorCode;
-import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.accumulo.start.classloader.vfs.ContextManager;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.vfs2.FileSystemException;
public class SetIterCommand extends Command {
[10/16] git commit: ACCUMULO-3078 Re-introduce warnings suppression
for Job()
Posted by ct...@apache.org.
ACCUMULO-3078 Re-introduce warnings suppression for Job()
Adds warning suppression needed to build against the Hadoop
version declared as a dependency, by default.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/618e0d40
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/618e0d40
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/618e0d40
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 618e0d400b6c1d31f96e84accff22479ecda88b4
Parents: d8a4def
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:21:35 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/AccumuloInputFormatIT.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/618e0d40/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index b6b1086..5f33436 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -69,6 +69,7 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
conn.tableOperations().create(table);
insertData(table, currentTimeMillis());
+ @SuppressWarnings("deprecation")
Job job = new Job();
AccumuloInputFormat.setInputTableName(job, table);
AccumuloInputFormat.setZooKeeperInstance(job, new ClientConfiguration().withInstance(conn.getInstance().getInstanceName())
[08/16] git commit: ACCUMULO-2645 Remove unused imports
Posted by ct...@apache.org.
ACCUMULO-2645 Remove unused imports
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d23cb34e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d23cb34e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d23cb34e
Branch: refs/heads/master
Commit: d23cb34edff1a3fdd8487d27bbe6fe5db2983f70
Parents: f64482b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:32:08 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/monitor/servlets/ScanServlet.java | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d23cb34e/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
index 12b0871..a4f99c4 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/ScanServlet.java
@@ -18,21 +18,18 @@ package org.apache.accumulo.monitor.servlets;
import java.io.IOException;
import java.util.Map;
-import java.util.Map.Entry;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
-
-import org.apache.accumulo.monitor.util.celltypes.TServerLinkType;
import org.apache.accumulo.core.tabletserver.thrift.ActiveScan;
import org.apache.accumulo.monitor.Monitor;
import org.apache.accumulo.monitor.Monitor.ScanStats;
import org.apache.accumulo.monitor.util.Table;
import org.apache.accumulo.monitor.util.TableRow;
import org.apache.accumulo.monitor.util.celltypes.DurationType;
-import org.apache.accumulo.monitor.util.celltypes.StringType;
+import org.apache.accumulo.monitor.util.celltypes.TServerLinkType;
public class ScanServlet extends BasicServlet {
@@ -42,7 +39,7 @@ public class ScanServlet extends BasicServlet {
protected String getTitle(HttpServletRequest req) {
return "Scans";
}
-
+
@Override
protected void pageBody(HttpServletRequest req, HttpServletResponse response, StringBuilder sb) throws IOException {
Map<String,ScanStats> scans = Monitor.getScans();
@@ -68,5 +65,5 @@ public class ScanServlet extends BasicServlet {
}
scanTable.generate(req, sb);
}
-
+
}
[12/16] git commit: ACCUMULO-3078 Fix ConditionalWriterIT trace test
Posted by ct...@apache.org.
ACCUMULO-3078 Fix ConditionalWriterIT trace test
Discovered by "dead code" warning.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/22de8d52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/22de8d52
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/22de8d52
Branch: refs/heads/master
Commit: 22de8d5237ff14b9c46638df0f998368f80a5cc9
Parents: d23cb34
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:36:39 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/22de8d52/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index a24ff9e..26c53bb 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1210,7 +1210,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
Process tracer = null;
Connector conn = getConnector();
if (!conn.tableOperations().exists("trace")) {
- getStaticCluster().exec(TraceServer.class);
+ tracer = getStaticCluster().exec(TraceServer.class);
}
while (!conn.tableOperations().exists("trace")) {
UtilWaitThread.sleep(1000);
[04/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d8a4def0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8a4def0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d8a4def0
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: d8a4def0d45c73602a4bd3437c49c1a99c29817c
Parents: 2519b83 9b56159
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:10:11 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:11 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[06/16] git commit: ACCUMULO-3078 Re-introduce warnings suppression
for Job()
Posted by ct...@apache.org.
ACCUMULO-3078 Re-introduce warnings suppression for Job()
Adds warning suppression needed to build against the Hadoop
version declared as a dependency, by default.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/618e0d40
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/618e0d40
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/618e0d40
Branch: refs/heads/master
Commit: 618e0d400b6c1d31f96e84accff22479ecda88b4
Parents: d8a4def
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:21:35 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/test/functional/AccumuloInputFormatIT.java | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/618e0d40/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
index b6b1086..5f33436 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
@@ -69,6 +69,7 @@ public class AccumuloInputFormatIT extends SimpleMacIT {
conn.tableOperations().create(table);
insertData(table, currentTimeMillis());
+ @SuppressWarnings("deprecation")
Job job = new Job();
AccumuloInputFormat.setInputTableName(job, table);
AccumuloInputFormat.setZooKeeperInstance(job, new ClientConfiguration().withInstance(conn.getInstance().getInstanceName())
[03/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Posted by ct...@apache.org.
ACCUMULO-3119 Cleanup javadocs in 1.5.x branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9b56159c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9b56159c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9b56159c
Branch: refs/heads/master
Commit: 9b56159c10f52a549aa20da12ead855a9155ade8
Parents: 7699e1f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:02:24 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:02:24 2014 -0400
----------------------------------------------------------------------
.../accumulo/core/client/BatchScanner.java | 1 -
.../core/client/impl/OfflineScanner.java | 13 -------------
.../client/impl/TabletServerBatchWriter.java | 3 ---
.../accumulo/core/file/BloomFilterLayer.java | 1 -
.../accumulo/core/file/rfile/bcfile/BCFile.java | 3 ---
.../accumulo/core/file/rfile/bcfile/Chunk.java | 3 ---
.../accumulo/core/file/rfile/bcfile/TFile.java | 13 -------------
.../core/client/mock/MockConnectorTest.java | 2 --
.../simple/client/RandomBatchScanner.java | 1 -
.../examples/simple/client/RowOperations.java | 19 -------------------
.../simple/mapreduce/TeraSortIngest.java | 2 --
.../java/org/apache/accumulo/fate/TStore.java | 2 --
.../apache/accumulo/fate/zookeeper/ZooLock.java | 2 --
.../server/gc/GarbageCollectWriteAheadLogs.java | 4 ----
.../accumulo/server/metanalysis/FindTablet.java | 6 ------
.../accumulo/server/metanalysis/PrintEvents.java | 7 -------
.../apache/accumulo/server/monitor/Monitor.java | 3 ---
.../server/security/SecurityOperation.java | 5 -----
.../server/tabletserver/MemoryManager.java | 2 --
.../server/tabletserver/TabletServer.java | 3 ---
.../tabletserver/log/TabletServerLogger.java | 1 -
.../apache/accumulo/server/util/Initialize.java | 3 ---
.../org/apache/accumulo/server/util/ZooZap.java | 3 ---
.../accumulo/server/master/TestMergeState.java | 6 ------
.../start/classloader/AccumuloClassLoader.java | 5 -----
.../test/functional/SparseColumnFamilyTest.java | 6 ------
.../apache/accumulo/test/randomwalk/Module.java | 1 -
.../accumulo/test/randomwalk/bulk/Verify.java | 4 ----
28 files changed, 124 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index e332d3c..aa57297 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase {
* <p>
* If not set, there is not timeout. The BatchScanner will retry forever.
*
- * @param timeout
* @param timeUnit
* determines how timeout is interpreted
* @since 1.5.0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 1132e74..80d2c4a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -167,12 +167,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
}
}
- /**
- * @throws TableNotFoundException
- * @throws IOException
- * @throws AccumuloException
- *
- */
private void nextTablet() throws TableNotFoundException, AccumuloException, IOException {
Range nextRange = null;
@@ -274,13 +268,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
return new Pair<KeyExtent,String>(extent, location);
}
- /**
- * @param absFiles
- * @return
- * @throws AccumuloException
- * @throws TableNotFoundException
- * @throws IOException
- */
private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
index 5b24f4a..f1af7e4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchWriter.java
@@ -543,9 +543,6 @@ public class TabletServerBatchWriter {
/**
* Add mutations that previously failed back into the mix
- *
- * @param mutationsprivate
- * static final Logger log = Logger.getLogger(TabletServerBatchWriter.class);
*/
private synchronized void addFailedMutations(MutationSet failedMutations) throws Exception {
mutations.addAll(failedMutations);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index 01485d3..af3bf5f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -286,7 +286,6 @@ public class BloomFilterLayer {
* @param range
* range of keys to check
* @return false iff key doesn't exist, true if key probably exists.
- * @throws IOException
*/
boolean probablyHasKey(Range range) throws IOException {
if (bloomFilter == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index 7d15851..aeafe4f 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -145,7 +145,6 @@ public final class BCFile {
* Get the current position in file.
*
* @return The current byte offset in underlying file.
- * @throws IOException
*/
long getCurrentPos() throws IOException {
return fsOut.getPos() + fsBufferedOutput.size();
@@ -157,8 +156,6 @@ public final class BCFile {
/**
* Current size of compressed data.
- *
- * @throws IOException
*/
long getCompressedSize() throws IOException {
long ret = getCurrentPos() - posStart;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
index 345d406..abb1798 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Chunk.java
@@ -239,7 +239,6 @@ final class Chunk {
* The chunk buffer.
* @param offset
* Offset to chunk buffer for the beginning of chunk.
- * @param len
* @param last
* Is this the last call to flushBuffer?
*/
@@ -280,8 +279,6 @@ final class Chunk {
* Flush the internal buffer.
*
* Is this the last call to flushBuffer?
- *
- * @throws java.io.IOException
*/
private void flushBuffer() throws IOException {
if (count > 0) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
index b7a927b..7b9be44 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/TFile.java
@@ -544,8 +544,6 @@ public class TFile {
/**
* Check if we need to start a new data block.
- *
- * @throws IOException
*/
private void initDataBlock() throws IOException {
// for each new block, get a new appender
@@ -559,7 +557,6 @@ public class TFile {
*
* @param bForceFinish
* Force the closure regardless of the block size.
- * @throws IOException
*/
void finishDataBlock(boolean bForceFinish) throws IOException {
if (blkAppender == null) {
@@ -777,8 +774,6 @@ public class TFile {
/**
* Lazily loading the TFile index.
- *
- * @throws IOException
*/
synchronized void checkTFileDataIndex() throws IOException {
if (tfileIndex == null) {
@@ -866,7 +861,6 @@ public class TFile {
* the input key
* @param greater
* boolean flag
- * @throws IOException
*/
Location getBlockContainsKey(RawComparable key, boolean greater) throws IOException {
if (!isSorted()) {
@@ -1040,7 +1034,6 @@ public class TFile {
* Begin location of the scan.
* @param end
* End location of the scan.
- * @throws IOException
*/
Scanner(Reader reader, Location begin, Location end) throws IOException {
this.reader = reader;
@@ -1139,7 +1132,6 @@ public class TFile {
*
* @param l
* new cursor location. It must fall between the begin and end location of the scanner.
- * @throws IOException
*/
private void seekTo(Location l) throws IOException {
if (l.compareTo(beginLocation) < 0) {
@@ -1268,8 +1260,6 @@ public class TFile {
/**
* Load a compressed block for reading. Expecting blockIndex is valid.
- *
- * @throws IOException
*/
private void initBlock(int blockIndex) throws IOException {
klen = -1;
@@ -1350,7 +1340,6 @@ public class TFile {
* @param other
* user-specified key.
* @return negative if key at cursor is smaller than user key; 0 if equal; and positive if key at cursor greater than user key.
- * @throws IOException
*/
int compareCursorKeyTo(RawComparable other) throws IOException {
checkKey();
@@ -1641,7 +1630,6 @@ public class TFile {
*
* @param n
* Number of key-value pairs to skip in block.
- * @throws IOException
*/
private void inBlockAdvance(long n) throws IOException {
for (long i = 0; i < n; ++i) {
@@ -1662,7 +1650,6 @@ public class TFile {
* @param greater
* advance until we find a key greater than the input key.
* @return true if we find a equal key.
- * @throws IOException
*/
private boolean inBlockAdvance(RawComparable key, boolean greater) throws IOException {
int curBid = currentLocation.getBlockIndex();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index 71352ee..e0485a6 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -260,8 +260,6 @@ public class MockConnectorTest {
* Table to check
* @param count
* number of entries to expect in the table
- * @param count
- * number of rows the table should contain
*/
private void checkRemaining(Connector c, String tableName, int count) throws Exception {
Scanner scanner = c.createScanner(tableName, Constants.NO_AUTHS);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index a3bcf62..bf927e7 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -114,7 +114,6 @@ public class RandomBatchScanner {
/**
* Prints a count of the number of rows mapped to false.
*
- * @param expectedRows
* @return boolean indicating "were all the rows found?"
*/
private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 2c0a58b..00ab21c 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -16,7 +16,6 @@
*/
package org.apache.accumulo.examples.simple.client;
-import java.io.IOException;
import java.util.Map.Entry;
import org.apache.accumulo.core.Constants;
@@ -166,12 +165,6 @@ public class RowOperations {
/**
* Deletes a row given a text object
- * @param opts
- *
- * @param row
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
*/
private static void deleteRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
deleteRow(getRow(opts, scanOpts, row));
@@ -179,8 +172,6 @@ public class RowOperations {
/**
* Deletes a row, given a Scanner of JUST that row
- *
- * @param scanner
*/
private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
Mutation deleter = null;
@@ -198,8 +189,6 @@ public class RowOperations {
/**
* Just a generic print function given an iterator. Not necessarily just for printing a single row
- *
- * @param scanner
*/
private static void printRow(Scanner scanner) {
// iterates through and prints
@@ -209,14 +198,6 @@ public class RowOperations {
/**
* Gets a scanner over one row
- * @param opts
- *
- * @param row
- * @return
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
- * @throws IOException
*/
private static Scanner getRow(ClientOpts opts, ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
// Create a scanner
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index bdcf943..30bc656 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -299,8 +299,6 @@ public class TeraSortIngest extends Configured implements Tool {
/**
* Add the rowid to the row.
- *
- * @param rowId
*/
private Text getRowIdString(long rowId) {
Text paddedRowIdString = new Text();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/TStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
index 882cdbd..3adb493 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
/**
* Remove the last pushed operation from the given transaction.
- *
- * @param tid
*/
void pop(long tid);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 03e159f..960ba50 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -47,8 +47,6 @@ public class ZooLock implements Watcher {
/**
* lost the ability to monitor the lock node, and its status is unknown
- *
- * @param e
*/
void unableToMonitorLockNode(Throwable e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
index eddedc9..0992eae 100644
--- a/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
+++ b/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
@@ -285,10 +285,6 @@ public class GarbageCollectWriteAheadLogs {
return sortedWALogs;
}
- /**
- * @param name
- * @return
- */
static private boolean isUUID(String name) {
try {
UUID.fromString(name);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
index f7e5de9..41b15e6 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/FindTablet.java
@@ -49,12 +49,6 @@ public class FindTablet {
findContainingTablets(opts);
}
- /**
- * @param conn
- * @param tablePrefix
- * @param tableID
- * @param option
- */
private static void findContainingTablets(Opts opts) throws Exception {
Range range = new KeyExtent(new Text(opts.tableId), null, null).toMetadataRange();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
index 0478d83..5bb0171 100644
--- a/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
+++ b/server/src/main/java/org/apache/accumulo/server/metanalysis/PrintEvents.java
@@ -61,13 +61,6 @@ public class PrintEvents {
printEvents(conn, opts.tableId, opts.endRow, opts.time);
}
- /**
- * @param conn
- * @param tablePrefix
- * @param tableId
- * @param endRow
- * @param time
- */
private static void printEvents(Connector conn, String tableId, String endRow, Long time) throws Exception {
Scanner scanner = conn.createScanner("tabletEvents", new Authorizations());
String metaRow = tableId + (endRow == null ? "<" : ";" + endRow);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
index 00bd3ca..225e249 100644
--- a/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
+++ b/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
@@ -541,9 +541,6 @@ public class Monitor {
/**
* Get the monitor lock in ZooKeeper
- *
- * @throws KeeperException
- * @throws InterruptedException
*/
private void getMonitorLock() throws KeeperException, InterruptedException {
final String zRoot = ZooUtil.getRoot(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
index 2d70796..e562f7c 100644
--- a/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
+++ b/server/src/main/java/org/apache/accumulo/server/security/SecurityOperation.java
@@ -178,11 +178,6 @@ public class SecurityOperation {
}
}
- /**
- * @param toAuth
- * @return
- * @throws AccumuloSecurityException
- */
private AuthenticationToken reassembleToken(TCredentials toAuth) throws AccumuloSecurityException {
String tokenClass = toAuth.getTokenClassName();
if (authenticator.validTokenClass(tokenClass)) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index f03b04b..5e6fecc 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -33,8 +33,6 @@ public interface MemoryManager {
/**
* Initialize the memory manager.
- *
- * @param conf
*/
void init(ServerConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 73834e3..a730d9f 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -396,10 +396,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
/**
* while a session is reserved, it cannot be canceled or removed
- *
- * @param sessionId
*/
-
synchronized Session reserveSession(long sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
index d3c09f8..a638540 100644
--- a/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
+++ b/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
@@ -95,7 +95,6 @@ public class TabletServerLogger {
* lock to use
* @param code
* a test/work pair
- * @throws IOException
*/
private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException {
// Get a read lock
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
index ce26ff5..0d66af8 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
@@ -238,9 +238,6 @@ public class Initialize {
return true;
}
- /**
- * @return
- */
private static boolean zookeeperAvailable() {
try {
return zoo.exists("/");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 489d4bc..78d5edd 100644
--- a/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -32,9 +32,6 @@ public class ZooZap {
static boolean verbose = false;
- /**
- * @param args
- */
private static void message(String msg) {
if (verbose)
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
index 80b8d68..94df69c 100644
--- a/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
+++ b/server/src/test/java/org/apache/accumulo/server/master/TestMergeState.java
@@ -176,12 +176,6 @@ public class TestMergeState {
}
- /**
- * @param state
- * @param metaDataStateStore
- * @param locations
- * @return
- */
private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) {
MergeStats stats = new MergeStats(state.mergeInfo);
stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index 1e2b4b5..bcfa830 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -88,7 +88,6 @@ public class AccumuloClassLoader {
*
* @param d
* XMLDocument to search through
- * @param propertyName
*/
private static String getAccumuloClassPathStrings(Document d, String propertyName) {
NodeList pnodes = d.getElementsByTagName("property");
@@ -157,10 +156,6 @@ public class AccumuloClassLoader {
/**
* Populate the list of URLs with the items in the classpath string
- *
- * @param classpath
- * @param urls
- * @throws MalformedURLException
*/
private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException {
classpath = classpath.trim();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
index 4a0a708..af6eaee 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/SparseColumnFamilyTest.java
@@ -98,12 +98,6 @@ public class SparseColumnFamilyTest extends FunctionalTest {
}
}
- /**
- * @param i
- * @param j
- * @param k
- * @return
- */
private Mutation nm(int row, int cf, int val) {
Mutation m = new Mutation(String.format("%06d", row));
m.put(String.format("%03d", cf), "", "" + val);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index fadcb66..61177ef 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -134,7 +134,6 @@ public class Module extends Node {
* Chooses a random neighbor node
*
* @return Node or null if no edges
- * @throws Exception
*/
private String randomNeighbor() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/9b56159c/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index b2299aa..aed790c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -138,10 +138,6 @@ public class Verify extends Test {
}
}
- /**
- * @param startBadEntry
- * @param lastBadEntry
- */
private static void report(Text startBadRow, Text lastBadRow, Value value) {
System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
[07/16] git commit: ACCUMULO-3093 Remove unused import
Posted by ct...@apache.org.
ACCUMULO-3093 Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f64482bf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f64482bf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f64482bf
Branch: refs/heads/master
Commit: f64482bf0f1d0bb84bc4a2e8bb62b180efe692b8
Parents: 618e0d4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:29:13 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/util/shell/commands/ScanCommand.java | 1 -
.../apache/accumulo/core/util/shell/commands/SetIterCommand.java | 4 ----
2 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f64482bf/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
index 0270e6c..e60e62f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ScanCommand.java
@@ -28,7 +28,6 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.client.ScannerBase;
-import org.apache.accumulo.core.client.TableNotFoundException;
import org.apache.accumulo.core.conf.AccumuloConfiguration;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Range;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f64482bf/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
index 4be178a..64afb3f 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/SetIterCommand.java
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.IteratorSetting;
import org.apache.accumulo.core.client.NamespaceNotFoundException;
import org.apache.accumulo.core.client.TableNotFoundException;
-import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
import org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
@@ -45,14 +44,11 @@ import org.apache.accumulo.core.util.shell.Shell;
import org.apache.accumulo.core.util.shell.Shell.Command;
import org.apache.accumulo.core.util.shell.ShellCommandException;
import org.apache.accumulo.core.util.shell.ShellCommandException.ErrorCode;
-import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
-import org.apache.accumulo.start.classloader.vfs.ContextManager;
import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
import org.apache.commons.cli.OptionGroup;
import org.apache.commons.cli.Options;
import org.apache.commons.lang.StringUtils;
-import org.apache.commons.vfs2.FileSystemException;
public class SetIterCommand extends Command {
[09/16] git commit: ACCUMULO-3078 Fix ConditionalWriterIT trace test
Posted by ct...@apache.org.
ACCUMULO-3078 Fix ConditionalWriterIT trace test
Discovered by "dead code" warning.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/22de8d52
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/22de8d52
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/22de8d52
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: 22de8d5237ff14b9c46638df0f998368f80a5cc9
Parents: d23cb34
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 17:36:39 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:32 2014 -0400
----------------------------------------------------------------------
.../test/java/org/apache/accumulo/test/ConditionalWriterIT.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/22de8d52/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
index a24ff9e..26c53bb 100644
--- a/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
@@ -1210,7 +1210,7 @@ public class ConditionalWriterIT extends SimpleMacIT {
Process tracer = null;
Connector conn = getConnector();
if (!conn.tableOperations().exists("trace")) {
- getStaticCluster().exec(TraceServer.class);
+ tracer = getStaticCluster().exec(TraceServer.class);
}
while (!conn.tableOperations().exists("trace")) {
UtilWaitThread.sleep(1000);
[05/16] git commit: Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Posted by ct...@apache.org.
Merge branch '1.5.2-SNAPSHOT' into 1.6.1-SNAPSHOT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d8a4def0
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d8a4def0
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d8a4def0
Branch: refs/heads/master
Commit: d8a4def0d45c73602a4bd3437c49c1a99c29817c
Parents: 2519b83 9b56159
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:10:11 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:10:11 2014 -0400
----------------------------------------------------------------------
----------------------------------------------------------------------
[16/16] git commit: Merge branch '1.6.1-SNAPSHOT'
Posted by ct...@apache.org.
Merge branch '1.6.1-SNAPSHOT'
Conflicts:
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
shell/src/main/java/org/apache/accumulo/shell/commands/SetIterCommand.java
test/src/test/java/org/apache/accumulo/test/functional/AccumuloInputFormatIT.java
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/541a77ff
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/541a77ff
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/541a77ff
Branch: refs/heads/master
Commit: 541a77ff7d42906da3aa84dfd4767f6b5953f28f
Parents: 117d5c5 d3e17f4
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:32:53 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:32:53 2014 -0400
----------------------------------------------------------------------
.../apache/accumulo/core/client/BatchScanner.java | 1 -
.../accumulo/core/client/ConditionalWriter.java | 3 ---
.../core/client/ConditionalWriterConfig.java | 1 -
.../org/apache/accumulo/core/client/Instance.java | 4 ++--
.../core/client/admin/TableOperations.java | 6 ------
.../accumulo/core/client/impl/OfflineScanner.java | 13 -------------
.../accumulo/core/file/BloomFilterLayer.java | 1 -
.../accumulo/core/file/rfile/bcfile/BCFile.java | 3 ---
.../iterators/system/LocalityGroupIterator.java | 4 ----
.../core/security/VisibilityEvaluator.java | 2 +-
.../core/security/crypto/CryptoModule.java | 2 --
.../core/client/mock/MockConnectorTest.java | 2 --
.../examples/simple/client/RandomBatchScanner.java | 1 -
.../examples/simple/client/RowOperations.java | 11 -----------
.../examples/simple/mapreduce/TeraSortIngest.java | 2 --
.../main/java/org/apache/accumulo/fate/TStore.java | 2 --
.../apache/accumulo/fate/zookeeper/ZooLock.java | 2 --
.../apache/accumulo/server/init/Initialize.java | 1 -
.../server/tabletserver/MemoryManager.java | 2 --
.../org/apache/accumulo/server/util/ZooZap.java | 3 ---
.../accumulo/gc/GarbageCollectionEnvironment.java | 17 -----------------
.../apache/accumulo/gc/SimpleGarbageCollector.java | 1 -
.../gc/GarbageCollectWriteAheadLogsTest.java | 6 ------
.../org/apache/accumulo/master/TestMergeState.java | 6 ------
.../java/org/apache/accumulo/monitor/Monitor.java | 3 ---
.../accumulo/monitor/servlets/ScanServlet.java | 4 ++--
.../accumulo/tserver/log/TabletServerLogger.java | 1 -
.../start/classloader/AccumuloClassLoader.java | 5 -----
.../apache/accumulo/test/randomwalk/Module.java | 1 -
.../accumulo/test/randomwalk/bulk/Verify.java | 4 ----
.../apache/accumulo/test/ConditionalWriterIT.java | 6 +++++-
.../test/functional/AccumuloInputFormatIT.java | 3 ++-
.../test/functional/SparseColumnFamilyIT.java | 6 ------
33 files changed, 12 insertions(+), 117 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
index 1280abd,a220e62..52c6a76
--- a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriterConfig.java
@@@ -104,20 -101,7 +104,19 @@@ public class ConditionalWriterConfig
this.maxWriteThreads = maxWriteThreads;
return this;
}
-
+
+ /**
+ * Sets the Durability for the mutation, if applied.
+ * <p>
+ * <b>Default:</b> Durability.DEFAULT: use the table's durability configuration.
- * @param durability
+ * @return {@code this} to allow chaining of set methods
+ * @since 1.7.0
+ */
+ public ConditionalWriterConfig setDurability(Durability durability) {
+ this.durability = durability;
+ return this;
+ }
+
public Authorizations getAuthorizations() {
return auths;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/core/src/main/java/org/apache/accumulo/core/client/Instance.java
----------------------------------------------------------------------
diff --cc core/src/main/java/org/apache/accumulo/core/client/Instance.java
index bcdd0e5,a55312e..8a70d4c
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@@ -124,10 -124,10 +124,10 @@@ public interface Instance
/**
* Returns the AccumuloConfiguration to use when interacting with this instance.
- *
+ *
* @return the AccumuloConfiguration that specifies properties related to interacting with this instance
* @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed.
- * @see {@link InstanceOperations#getSystemConfiguration()} for client-side reading of the server-side configuration.
+ * @see InstanceOperations#getSystemConfiguration() for client-side reading of the server-side configuration.
*/
@Deprecated
AccumuloConfiguration getConfiguration();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
----------------------------------------------------------------------
diff --cc server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index 5f1e287,5cbffc3..4305e71
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@@ -392,61 -418,6 +392,60 @@@ public class Initialize
}
}
}
+ /**
+ * Create an rfile in the default tablet's directory for a new table
+ * @param volmanager The VolumeManager
+ * @param tableId TableID that is being "created"
+ * @param targetTabletDir Directory where the rfile should created in
+ * @param tableTabletDir The table_info directory for the new table
+ * @param defaultTabletDir The default_tablet directory for the new table
- * @throws IOException
+ */
+ private static void initializeTableData(VolumeManager volmanager, String tableId, String targetTabletDir, String tableTabletDir, String defaultTabletDir) throws IOException {
+ // populate the root tablet with info about the default tablet
+ // the root tablet contains the key extent and locations of all the
+ // metadata tablets
+ String initTabFile = targetTabletDir + "/00000_00000." + FileOperations.getNewFileExtension(AccumuloConfiguration.getDefaultConfiguration());
+ FileSystem fs = volmanager.getVolumeByPath(new Path(initTabFile)).getFileSystem();
+ FileSKVWriter tabletWriter = FileOperations.getInstance().openWriter(initTabFile, fs, fs.getConf(), AccumuloConfiguration.getDefaultConfiguration());
+ tabletWriter.startDefaultLocalityGroup();
+
+ Text tableExtent = new Text(KeyExtent.getMetadataEntry(new Text(tableId), MetadataSchema.TabletsSection.getRange().getEndKey().getRow()));
+
+ // table tablet's directory
+ Key tableDirKey = new Key(tableExtent, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily(),
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnQualifier(), 0);
+ tabletWriter.append(tableDirKey, new Value(defaultTabletDir.getBytes(StandardCharsets.UTF_8)));
+
+ // table tablet time
+ Key tableTimeKey = new Key(tableExtent, TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnFamily(),
+ TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnQualifier(), 0);
+ tabletWriter.append(tableTimeKey, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(StandardCharsets.UTF_8)));
+
+ // table tablet's prevrow
+ Key tablePrevRowKey = new Key(tableExtent, TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnFamily(),
+ TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnQualifier(), 0);
+ tabletWriter.append(tablePrevRowKey, KeyExtent.encodePrevEndRow(null));
+
+ // ----------] default tablet info
+ Text defaultExtent = new Text(KeyExtent.getMetadataEntry(new Text(tableId), null));
+
+ // default's directory
+ Key defaultDirKey = new Key(defaultExtent, TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnFamily(),
+ TabletsSection.ServerColumnFamily.DIRECTORY_COLUMN.getColumnQualifier(), 0);
+ tabletWriter.append(defaultDirKey, new Value(defaultTabletDir.getBytes(StandardCharsets.UTF_8)));
+
+ // default's time
+ Key defaultTimeKey = new Key(defaultExtent, TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnFamily(),
+ TabletsSection.ServerColumnFamily.TIME_COLUMN.getColumnQualifier(), 0);
+ tabletWriter.append(defaultTimeKey, new Value((TabletTime.LOGICAL_TIME_ID + "0").getBytes(StandardCharsets.UTF_8)));
+
+ // default's prevrow
+ Key defaultPrevRowKey = new Key(defaultExtent, TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnFamily(),
+ TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.getColumnQualifier(), 0);
+ tabletWriter.append(defaultPrevRowKey, KeyExtent.encodePrevEndRow(MetadataSchema.TabletsSection.getRange().getEndKey().getRow()));
+
+ tabletWriter.close();
+ }
private static void initZooKeeper(Opts opts, String uuid, String instanceNamePath, Path rootTablet) throws KeeperException, InterruptedException {
// setup basic data in zookeeper
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
----------------------------------------------------------------------
diff --cc server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index b137d21,0294ce1..7f208d8
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@@ -116,13 -101,4 +102,10 @@@ public interface GarbageCollectionEnvir
* Value to increment the still-in-use count by.
*/
void incrementInUseStat(long i);
+
+ /**
+ * Determine if the given absolute file is still pending replication
- * @param absolutePath Absolute path to a file
+ * @return True if the file still needs to be replicated
- * @throws AccumuloException
- * @throws AccumuloSecurityException
+ */
+ Iterator<Entry<String,Status>> getReplicationNeededIterator() throws AccumuloException, AccumuloSecurityException;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
----------------------------------------------------------------------
diff --cc server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
index 946b653,ce1f026..74b0919
--- a/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
+++ b/server/gc/src/test/java/org/apache/accumulo/gc/GarbageCollectWriteAheadLogsTest.java
@@@ -302,208 -268,4 +302,202 @@@ public class GarbageCollectWriteAheadLo
assertFalse(GarbageCollectWriteAheadLogs.isUUID("0" + UUID.randomUUID().toString()));
assertFalse(GarbageCollectWriteAheadLogs.isUUID(null));
}
+
+ // It was easier to do this than get the mocking working for me
+ private static class ReplicationGCWAL extends GarbageCollectWriteAheadLogs {
+
+ private List<Entry<Key,Value>> replData;
+
- /**
- * @param instance
- * @param fs
- * @param useTrash
- * @throws IOException
- */
+ ReplicationGCWAL(Instance instance, VolumeManager fs, boolean useTrash, List<Entry<Key,Value>> replData) throws IOException {
+ super(instance, fs, useTrash);
+ this.replData = replData;
+ }
+
+ @Override
+ protected Iterable<Entry<Key,Value>> getReplicationStatusForFile(Connector conn, String wal) {
+ return this.replData;
+ }
+ }
+
+ @Test
+ public void replicationEntriesAffectGC() throws Exception {
+ String file1 = UUID.randomUUID().toString(), file2 = UUID.randomUUID().toString();
+ Connector conn = createMock(Connector.class);
+
+ // Write a Status record which should prevent file1 from being deleted
+ LinkedList<Entry<Key,Value>> replData = new LinkedList<>();
+ replData.add(Maps.immutableEntry(new Key("/wals/" + file1, StatusSection.NAME.toString(), "1"), StatusUtil.fileCreatedValue(System.currentTimeMillis())));
+
+ ReplicationGCWAL replGC = new ReplicationGCWAL(instance, volMgr, false, replData);
+
+ replay(conn);
+
+ // Open (not-closed) file must be retained
+ assertTrue(replGC.neededByReplication(conn, "/wals/" + file1));
+
+ // No replication data, not needed
+ replData.clear();
+ assertFalse(replGC.neededByReplication(conn, "/wals/" + file2));
+
+ // The file is closed but not replicated, must be retained
+ replData.add(Maps.immutableEntry(new Key("/wals/" + file1, StatusSection.NAME.toString(), "1"), StatusUtil.fileClosedValue()));
+ assertTrue(replGC.neededByReplication(conn, "/wals/" + file1));
+
+ // File is closed and fully replicated, can be deleted
+ replData.clear();
+ replData.add(Maps.immutableEntry(new Key("/wals/" + file1, StatusSection.NAME.toString(), "1"),
+ ProtobufUtil.toValue(Status.newBuilder().setInfiniteEnd(true).setBegin(Long.MAX_VALUE).setClosed(true).build())));
+ assertFalse(replGC.neededByReplication(conn, "/wals/" + file1));
+ }
+
+ @Test
+ public void removeReplicationEntries() throws Exception {
+ String file1 = UUID.randomUUID().toString(), file2 = UUID.randomUUID().toString();
+
+ Instance inst = new MockInstance(testName.getMethodName());
+ Credentials creds = new Credentials("root", new PasswordToken(""));
+ Connector conn = inst.getConnector(creds.getPrincipal(), creds.getToken());
+
+ GarbageCollectWriteAheadLogs gcWALs = new GarbageCollectWriteAheadLogs(inst, volMgr, false);
+
+ ReplicationTable.create(conn);
+
+ long file1CreateTime = System.currentTimeMillis();
+ long file2CreateTime = file1CreateTime + 50;
+ BatchWriter bw = conn.createBatchWriter(ReplicationTable.NAME, new BatchWriterConfig());
+ Mutation m = new Mutation("/wals/" + file1);
+ StatusSection.add(m, new Text("1"), StatusUtil.fileCreatedValue(file1CreateTime));
+ bw.addMutation(m);
+ m = new Mutation("/wals/" + file2);
+ StatusSection.add(m, new Text("1"), StatusUtil.fileCreatedValue(file2CreateTime));
+ bw.addMutation(m);
+
+ // These WALs are potential candidates for deletion from fs
+ Map<String,Path> nameToFileMap = new HashMap<>();
+ nameToFileMap.put(file1, new Path("/wals/" + file1));
+ nameToFileMap.put(file2, new Path("/wals/" + file2));
+
+ Map<String,Path> sortedWALogs = Collections.emptyMap();
+
+ // Make the GCStatus and GcCycleStats
+ GCStatus status = new GCStatus();
+ GcCycleStats cycleStats = new GcCycleStats();
+ status.currentLog = cycleStats;
+
+ // We should iterate over two entries
+ Assert.assertEquals(2, gcWALs.removeReplicationEntries(nameToFileMap, sortedWALogs, status, creds));
+
+ // We should have noted that two files were still in use
+ Assert.assertEquals(2l, cycleStats.inUse);
+
+ // Both should have been deleted
+ Assert.assertEquals(0, nameToFileMap.size());
+ }
+
+ @Test
+ public void replicationEntriesOnlyInMetaPreventGC() throws Exception {
+ String file1 = UUID.randomUUID().toString(), file2 = UUID.randomUUID().toString();
+
+ Instance inst = new MockInstance(testName.getMethodName());
+ Credentials creds = new Credentials("root", new PasswordToken(""));
+ Connector conn = inst.getConnector(creds.getPrincipal(), creds.getToken());
+
+ GarbageCollectWriteAheadLogs gcWALs = new GarbageCollectWriteAheadLogs(inst, volMgr, false);
+
+ ReplicationTable.create(conn);
+
+ long file1CreateTime = System.currentTimeMillis();
+ long file2CreateTime = file1CreateTime + 50;
+ // Write some records to the metadata table, we haven't yet written status records to the replication table
+ BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
+ Mutation m = new Mutation(ReplicationSection.getRowPrefix() + "/wals/" + file1);
+ m.put(ReplicationSection.COLF, new Text("1"), StatusUtil.fileCreatedValue(file1CreateTime));
+ bw.addMutation(m);
+
+ m = new Mutation(ReplicationSection.getRowPrefix() + "/wals/" + file2);
+ m.put(ReplicationSection.COLF, new Text("1"), StatusUtil.fileCreatedValue(file2CreateTime));
+ bw.addMutation(m);
+
+ // These WALs are potential candidates for deletion from fs
+ Map<String,Path> nameToFileMap = new HashMap<>();
+ nameToFileMap.put(file1, new Path("/wals/" + file1));
+ nameToFileMap.put(file2, new Path("/wals/" + file2));
+
+ Map<String,Path> sortedWALogs = Collections.emptyMap();
+
+ // Make the GCStatus and GcCycleStats objects
+ GCStatus status = new GCStatus();
+ GcCycleStats cycleStats = new GcCycleStats();
+ status.currentLog = cycleStats;
+
+ // We should iterate over two entries
+ Assert.assertEquals(2, gcWALs.removeReplicationEntries(nameToFileMap, sortedWALogs, status, creds));
+
+ // We should have noted that two files were still in use
+ Assert.assertEquals(2l, cycleStats.inUse);
+
+ // Both should have been deleted
+ Assert.assertEquals(0, nameToFileMap.size());
+ }
+
+ @Test
+ public void noReplicationTableDoesntLimitMetatdataResults() throws Exception {
+ Instance inst = new MockInstance(testName.getMethodName());
+ Connector conn = inst.getConnector("root", new PasswordToken(""));
+
+ String wal = "hdfs://localhost:8020/accumulo/wal/tserver+port/123456-1234-1234-12345678";
+ BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
+ Mutation m = new Mutation(ReplicationSection.getRowPrefix() + wal);
+ m.put(ReplicationSection.COLF, new Text("1"), StatusUtil.fileCreatedValue(System.currentTimeMillis()));
+ bw.addMutation(m);
+ bw.close();
+
+ GarbageCollectWriteAheadLogs gcWALs = new GarbageCollectWriteAheadLogs(inst, volMgr, false);
+
+ Iterable<Entry<Key,Value>> data = gcWALs.getReplicationStatusForFile(conn, wal);
+ Entry<Key,Value> entry = Iterables.getOnlyElement(data);
+
+ Assert.assertEquals(ReplicationSection.getRowPrefix() + wal, entry.getKey().getRow().toString());
+ }
+
+ @Test
+ public void fetchesReplicationEntriesFromMetadataAndReplicationTables() throws Exception {
+ Instance inst = new MockInstance(testName.getMethodName());
+ Connector conn = inst.getConnector("root", new PasswordToken(""));
+ ReplicationTable.create(conn);
+
+ long walCreateTime = System.currentTimeMillis();
+ String wal = "hdfs://localhost:8020/accumulo/wal/tserver+port/123456-1234-1234-12345678";
+ BatchWriter bw = conn.createBatchWriter(MetadataTable.NAME, new BatchWriterConfig());
+ Mutation m = new Mutation(ReplicationSection.getRowPrefix() + wal);
+ m.put(ReplicationSection.COLF, new Text("1"), StatusUtil.fileCreatedValue(walCreateTime));
+ bw.addMutation(m);
+ bw.close();
+
+ bw = ReplicationTable.getBatchWriter(conn);
+ m = new Mutation(wal);
+ StatusSection.add(m, new Text("1"), StatusUtil.fileCreatedValue(walCreateTime));
+ bw.addMutation(m);
+ bw.close();
+
+ GarbageCollectWriteAheadLogs gcWALs = new GarbageCollectWriteAheadLogs(inst, volMgr, false);
+
+ Iterable<Entry<Key,Value>> iter = gcWALs.getReplicationStatusForFile(conn, wal);
+ Map<Key,Value> data = new HashMap<>();
+ for (Entry<Key,Value> e : iter) {
+ data.put(e.getKey(), e.getValue());
+ }
+
+ Assert.assertEquals(2, data.size());
+
+ // Should get one element from each table (metadata and replication)
+ for (Key k : data.keySet()) {
+ String row = k.getRow().toString();
+ if (row.startsWith(ReplicationSection.getRowPrefix())) {
+ Assert.assertTrue(row.endsWith(wal));
+ } else {
+ Assert.assertEquals(wal, row);
+ }
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --cc test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index 852fe37,aed790c..3c2be07
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@@ -139,12 -138,8 +139,8 @@@ public class Verify extends Test
}
}
- /**
- * @param startBadEntry
- * @param lastBadEntry
- */
private static void report(Text startBadRow, Text lastBadRow, Value value) {
- System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
+ System.out.println("Bad value " + new String(value.get(), StandardCharsets.UTF_8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/541a77ff/test/src/test/java/org/apache/accumulo/test/ConditionalWriterIT.java
----------------------------------------------------------------------
[14/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
Posted by ct...@apache.org.
ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3e17f45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3e17f45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3e17f45
Branch: refs/heads/master
Commit: d3e17f4582634e0f4985c1f3a92afcd67e999427
Parents: 22de8d5
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:16:09 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:16:09 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/BatchScanner.java | 1 -
.../accumulo/core/client/ConditionalWriter.java | 3 ---
.../org/apache/accumulo/core/client/Instance.java | 4 ++--
.../accumulo/core/client/admin/TableOperations.java | 6 ------
.../accumulo/core/client/impl/OfflineScanner.java | 13 -------------
.../apache/accumulo/core/file/BloomFilterLayer.java | 1 -
.../accumulo/core/file/rfile/bcfile/BCFile.java | 3 ---
.../core/iterators/system/LocalityGroupIterator.java | 4 ----
.../accumulo/core/security/VisibilityEvaluator.java | 2 +-
.../accumulo/core/security/crypto/CryptoModule.java | 2 --
.../accumulo/core/client/mock/MockConnectorTest.java | 2 --
.../examples/simple/client/RandomBatchScanner.java | 1 -
.../examples/simple/client/RowOperations.java | 11 -----------
.../examples/simple/mapreduce/TeraSortIngest.java | 2 --
.../main/java/org/apache/accumulo/fate/TStore.java | 2 --
.../org/apache/accumulo/fate/zookeeper/ZooLock.java | 2 --
.../accumulo/server/tabletserver/MemoryManager.java | 2 --
.../java/org/apache/accumulo/server/util/ZooZap.java | 3 ---
.../accumulo/gc/GarbageCollectionEnvironment.java | 14 --------------
.../apache/accumulo/gc/SimpleGarbageCollector.java | 1 -
.../org/apache/accumulo/master/TestMergeState.java | 6 ------
.../java/org/apache/accumulo/monitor/Monitor.java | 3 ---
.../org/apache/accumulo/tserver/TabletServer.java | 3 ---
.../accumulo/tserver/log/TabletServerLogger.java | 1 -
.../start/classloader/AccumuloClassLoader.java | 5 -----
.../org/apache/accumulo/test/randomwalk/Module.java | 1 -
.../apache/accumulo/test/randomwalk/bulk/Verify.java | 4 ----
.../test/functional/SparseColumnFamilyIT.java | 6 ------
28 files changed, 3 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index e332d3c..aa57297 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase {
* <p>
* If not set, there is not timeout. The BatchScanner will retry forever.
*
- * @param timeout
* @param timeUnit
* determines how timeout is interpreted
* @since 1.5.0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
index 95f73bb..f9848c4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
@@ -116,7 +116,6 @@ public interface ConditionalWriter {
* This method returns one result for each mutation passed to it. This method is thread safe. Multiple threads can safely use a single conditional writer.
* Sharing a conditional writer between multiple threads may result in batching of request to tablet servers.
*
- * @param mutations
* @return Result for each mutation submitted. The mutations may still be processing in the background when this method returns, if so the iterator will
* block.
*/
@@ -125,8 +124,6 @@ public interface ConditionalWriter {
/**
* This method has the same thread safety guarantees as @link {@link #write(Iterator)}
*
- *
- * @param mutation
* @return Result for the submitted mutation
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/Instance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index 05cc7f2..a55312e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -127,7 +127,7 @@ public interface Instance {
*
* @return the AccumuloConfiguration that specifies properties related to interacting with this instance
* @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed.
- * @see {@link InstanceOperations#getSystemConfiguration()} for client-side reading of the server-side configuration.
+ * @see InstanceOperations#getSystemConfiguration() for client-side reading of the server-side configuration.
*/
@Deprecated
AccumuloConfiguration getConfiguration();
@@ -138,7 +138,7 @@ public interface Instance {
* @param conf
* accumulo configuration
* @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed.
- * @see {@link InstanceOperations#setProperty(String, String)}
+ * @see InstanceOperations#setProperty(String, String)
*/
@Deprecated
void setConfiguration(AccumuloConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index b81eb6d..97f538d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -525,7 +525,6 @@ public interface TableOperations {
* when there is a general accumulo error
* @throws AccumuloSecurityException
* when the user does not have the proper permissions
- * @throws TableNotFoundException
* @since 1.6.0
*/
void offline(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException;
@@ -552,7 +551,6 @@ public interface TableOperations {
* when there is a general accumulo error
* @throws AccumuloSecurityException
* when the user does not have the proper permissions
- * @throws TableNotFoundException
* @since 1.6.0
*/
void online(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException;
@@ -659,8 +657,6 @@ public interface TableOperations {
* the name of the table
* @param setting
* object specifying the properties of the iterator
- * @throws AccumuloException
- * @throws TableNotFoundException
*/
void checkIteratorConflicts(String tableName, IteratorSetting setting, EnumSet<IteratorScope> scopes) throws AccumuloException, TableNotFoundException;
@@ -711,8 +707,6 @@ public interface TableOperations {
* @param tables
* a set of tables
* @return a list of disk usage objects containing linked table names and sizes
- * @throws AccumuloException
- * @throws AccumuloSecurityException
* @since 1.6.0
*/
List<DiskUsage> getDiskUsage(Set<String> tables) throws AccumuloException, AccumuloSecurityException, TableNotFoundException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 522125f..50953d5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -169,12 +169,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
}
}
- /**
- * @throws TableNotFoundException
- * @throws IOException
- * @throws AccumuloException
- *
- */
private void nextTablet() throws TableNotFoundException, AccumuloException, IOException {
Range nextRange = null;
@@ -286,13 +280,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
return new Pair<KeyExtent,String>(extent, location);
}
- /**
- * @param absFiles
- * @return
- * @throws AccumuloException
- * @throws TableNotFoundException
- * @throws IOException
- */
private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index d0e736c..7ab01fa 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -300,7 +300,6 @@ public class BloomFilterLayer {
* @param range
* range of keys to check
* @return false iff key doesn't exist, true if key probably exists.
- * @throws IOException
*/
boolean probablyHasKey(Range range) throws IOException {
if (bloomFilter == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index ca97e01..044989d 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -209,7 +209,6 @@ public final class BCFile {
* Get the current position in file.
*
* @return The current byte offset in underlying file.
- * @throws IOException
*/
long getCurrentPos() throws IOException {
return fsOut.getPos() + fsBufferedOutput.size();
@@ -221,8 +220,6 @@ public final class BCFile {
/**
* Current size of compressed data.
- *
- * @throws IOException
*/
long getCompressedSize() throws IOException {
long ret = getCurrentPos() - posStart;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
index c0045ac..71d2d8b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
@@ -41,10 +41,6 @@ public class LocalityGroupIterator extends HeapIterator implements Interruptible
private static final Collection<ByteSequence> EMPTY_CF_SET = Collections.emptySet();
public static class LocalityGroup {
- /**
- * @param localityGroup
- * @param env
- */
private LocalityGroup(LocalityGroup localityGroup, IteratorEnvironment env) {
this(localityGroup.columnFamilies, localityGroup.isDefaultLocalityGroup);
this.iterator = (InterruptibleIterator) localityGroup.iterator.deepCopy(env);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
index 725b2c7..6baa17c 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
@@ -82,7 +82,7 @@ public class VisibilityEvaluator {
* Creates a new evaluator for the authorizations found in the given
* environment.
*
- * @param environment environment containing authorizations
+ * @param env environment containing authorizations
*/
VisibilityEvaluator(Environment env) {
this.auths = env.getAuthorizationsContainer();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
index 783709a..535c141 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
@@ -48,7 +48,6 @@ public interface CryptoModule {
* the {@link CryptoModuleParameters} object that specifies how to set up the encrypted stream.
* @return the same {@link CryptoModuleParameters} object with the {@link CryptoModuleParameters#getEncryptedOutputStream()} set to a stream that is not null.
* That stream may be exactly the same stream as {@link CryptoModuleParameters#getPlaintextInputStream()} if the params object specifies no cryptography.
- * @throws IOException
*/
CryptoModuleParameters getEncryptingOutputStream(CryptoModuleParameters params) throws IOException;
@@ -70,7 +69,6 @@ public interface CryptoModule {
* the {@link CryptoModuleParameters} object that specifies how to set up the encrypted stream.
* @return the same {@link CryptoModuleParameters} object with the {@link CryptoModuleParameters#getPlaintextInputStream()} set to a stream that is not null.
* That stream may be exactly the same stream as {@link CryptoModuleParameters#getEncryptedInputStream()} if the params object specifies no cryptography.
- * @throws IOException
*/
CryptoModuleParameters getDecryptingInputStream(CryptoModuleParameters params) throws IOException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index ca57bd4..7ccae0a 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -259,8 +259,6 @@ public class MockConnectorTest {
* Table to check
* @param count
* number of entries to expect in the table
- * @param count
- * number of rows the table should contain
*/
private void checkRemaining(Connector c, String tableName, int count) throws Exception {
Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index 5fe23a5..3111c5b 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -115,7 +115,6 @@ public class RandomBatchScanner {
/**
* Prints a count of the number of rows mapped to false.
*
- * @param expectedRows
* @return boolean indicating "were all the rows found?"
*/
private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 7f19bc4..5276109 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -165,13 +165,6 @@ public class RowOperations {
/**
* Deletes a row given a text object
- *
- * @param opts
- *
- * @param row
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
*/
private static void deleteRow(ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
deleteRow(getRow(scanOpts, row));
@@ -179,8 +172,6 @@ public class RowOperations {
/**
* Deletes a row, given a Scanner of JUST that row
- *
- * @param scanner
*/
private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
Mutation deleter = null;
@@ -198,8 +189,6 @@ public class RowOperations {
/**
* Just a generic print function given an iterator. Not necessarily just for printing a single row
- *
- * @param scanner
*/
private static void printRow(Scanner scanner) {
// iterates through and prints
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index f9f2d39..fe71b85 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -275,8 +275,6 @@ public class TeraSortIngest extends Configured implements Tool {
/**
* Add the rowid to the row.
- *
- * @param rowId
*/
private Text getRowIdString(long rowId) {
Text paddedRowIdString = new Text();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/fate/src/main/java/org/apache/accumulo/fate/TStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
index 882cdbd..3adb493 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
/**
* Remove the last pushed operation from the given transaction.
- *
- * @param tid
*/
void pop(long tid);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 38559a7..c4f3489 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -47,8 +47,6 @@ public class ZooLock implements Watcher {
/**
* lost the ability to monitor the lock node, and its status is unknown
- *
- * @param e
*/
void unableToMonitorLockNode(Throwable e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index f03b04b..5e6fecc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -33,8 +33,6 @@ public interface MemoryManager {
/**
* Initialize the memory manager.
- *
- * @param conf
*/
void init(ServerConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 489d4bc..78d5edd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -32,9 +32,6 @@ public class ZooZap {
static boolean verbose = false;
- /**
- * @param args
- */
private static void message(String msg) {
if (verbose)
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index 3e36617..0294ce1 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -46,9 +46,6 @@ public interface GarbageCollectionEnvironment {
* A row to resume from if a previous invocation was stopped due to finding an extremely large number of candidates to remove which would have
* exceeded memory limitations
* @return A collection of candidates files for deletion, may not be the complete collection of files for deletion at this point in time
- * @throws TableNotFoundException
- * @throws AccumuloException
- * @throws AccumuloSecurityException
*/
List<String> getCandidates(String continuePoint) throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
@@ -56,9 +53,6 @@ public interface GarbageCollectionEnvironment {
* Fetch a list of paths for all bulk loads in progress (blip) from a given table, {@link RootTable#NAME} or {@link MetadataTable#NAME}
*
* @return The list of files for each bulk load currently in progress.
- * @throws TableNotFoundException
- * @throws AccumuloException
- * @throws AccumuloSecurityException
*/
Iterator<String> getBlipIterator() throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
@@ -66,9 +60,6 @@ public interface GarbageCollectionEnvironment {
* Fetches the references to files, {@link DataFileColumnFamily#NAME} or {@link ScanFileColumnFamily#NAME}, from tablets
*
* @return An {@link Iterator} of {@link Entry}<{@link Key}, {@link Value}> which constitute a reference to a file.
- * @throws TableNotFoundException
- * @throws AccumuloException
- * @throws AccumuloSecurityException
*/
Iterator<Entry<Key,Value>> getReferenceIterator() throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
@@ -84,10 +75,6 @@ public interface GarbageCollectionEnvironment {
*
* @param candidateMap
* A Map from relative path to absolute path for files to be deleted.
- * @throws IOException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
- * @throws TableNotFoundException
*/
void delete(SortedMap<String,String> candidateMap) throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException;
@@ -96,7 +83,6 @@ public interface GarbageCollectionEnvironment {
*
* @param tableID
* The id of the table whose directory we are to operate on
- * @throws IOException
*/
void deleteTableDirIfEmpty(String tableID) throws IOException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index a1c9673..4617299 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -590,7 +590,6 @@ public class SimpleGarbageCollector implements Iface {
* Moves a file to trash. If this garbage collector is not using trash, this method returns false and leaves the file alone. If the file is missing, this
* method returns false as opposed to throwing an exception.
*
- * @param path
* @return true if the file was moved to trash
* @throws IOException
* if the volume manager encountered a problem
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
index bea9381..29dfefb 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
@@ -179,12 +179,6 @@ public class TestMergeState {
}
- /**
- * @param state
- * @param metaDataStateStore
- * @param locations
- * @return
- */
private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) {
MergeStats stats = new MergeStats(state.mergeInfo);
stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index b0124a9..47ddaef 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -547,9 +547,6 @@ public class Monitor {
/**
* Get the monitor lock in ZooKeeper
- *
- * @throws KeeperException
- * @throws InterruptedException
*/
private void getMonitorLock() throws KeeperException, InterruptedException {
final String zRoot = ZooUtil.getRoot(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 80d5662..807bb8e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -412,10 +412,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
/**
* while a session is reserved, it cannot be canceled or removed
- *
- * @param sessionId
*/
-
synchronized Session reserveSession(long sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index d25ee75..aaf62f3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -97,7 +97,6 @@ public class TabletServerLogger {
* lock to use
* @param code
* a test/work pair
- * @throws IOException
*/
private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException {
// Get a read lock
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index b38fc47..f17147f 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -96,7 +96,6 @@ public class AccumuloClassLoader {
*
* @param d
* XMLDocument to search through
- * @param propertyName
*/
private static String getAccumuloClassPathStrings(Document d, String propertyName) {
NodeList pnodes = d.getElementsByTagName("property");
@@ -165,10 +164,6 @@ public class AccumuloClassLoader {
/**
* Populate the list of URLs with the items in the classpath string
- *
- * @param classpath
- * @param urls
- * @throws MalformedURLException
*/
private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException {
classpath = classpath.trim();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index 2568480..c71d2d0 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -134,7 +134,6 @@ public class Module extends Node {
* Chooses a random neighbor node
*
* @return Node or null if no edges
- * @throws Exception
*/
private String randomNeighbor() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index b2299aa..aed790c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -138,10 +138,6 @@ public class Verify extends Test {
}
}
- /**
- * @param startBadEntry
- * @param lastBadEntry
- */
private static void report(Text startBadRow, Text lastBadRow, Value value) {
System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
index 9d68f76..0b63d01 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
@@ -89,12 +89,6 @@ public class SparseColumnFamilyIT extends SimpleMacIT {
}
}
- /**
- * @param i
- * @param j
- * @param k
- * @return
- */
private Mutation nm(int row, int cf, int val) {
Mutation m = new Mutation(String.format("%06d", row));
m.put(String.format("%03d", cf), "", "" + val);
[15/16] git commit: ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
Posted by ct...@apache.org.
ACCUMULO-3119 Cleanup javadocs in 1.6.x branch
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d3e17f45
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d3e17f45
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d3e17f45
Branch: refs/heads/1.6.1-SNAPSHOT
Commit: d3e17f4582634e0f4985c1f3a92afcd67e999427
Parents: 22de8d5
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Sep 12 18:16:09 2014 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Sep 12 18:16:09 2014 -0400
----------------------------------------------------------------------
.../org/apache/accumulo/core/client/BatchScanner.java | 1 -
.../accumulo/core/client/ConditionalWriter.java | 3 ---
.../org/apache/accumulo/core/client/Instance.java | 4 ++--
.../accumulo/core/client/admin/TableOperations.java | 6 ------
.../accumulo/core/client/impl/OfflineScanner.java | 13 -------------
.../apache/accumulo/core/file/BloomFilterLayer.java | 1 -
.../accumulo/core/file/rfile/bcfile/BCFile.java | 3 ---
.../core/iterators/system/LocalityGroupIterator.java | 4 ----
.../accumulo/core/security/VisibilityEvaluator.java | 2 +-
.../accumulo/core/security/crypto/CryptoModule.java | 2 --
.../accumulo/core/client/mock/MockConnectorTest.java | 2 --
.../examples/simple/client/RandomBatchScanner.java | 1 -
.../examples/simple/client/RowOperations.java | 11 -----------
.../examples/simple/mapreduce/TeraSortIngest.java | 2 --
.../main/java/org/apache/accumulo/fate/TStore.java | 2 --
.../org/apache/accumulo/fate/zookeeper/ZooLock.java | 2 --
.../accumulo/server/tabletserver/MemoryManager.java | 2 --
.../java/org/apache/accumulo/server/util/ZooZap.java | 3 ---
.../accumulo/gc/GarbageCollectionEnvironment.java | 14 --------------
.../apache/accumulo/gc/SimpleGarbageCollector.java | 1 -
.../org/apache/accumulo/master/TestMergeState.java | 6 ------
.../java/org/apache/accumulo/monitor/Monitor.java | 3 ---
.../org/apache/accumulo/tserver/TabletServer.java | 3 ---
.../accumulo/tserver/log/TabletServerLogger.java | 1 -
.../start/classloader/AccumuloClassLoader.java | 5 -----
.../org/apache/accumulo/test/randomwalk/Module.java | 1 -
.../apache/accumulo/test/randomwalk/bulk/Verify.java | 4 ----
.../test/functional/SparseColumnFamilyIT.java | 6 ------
28 files changed, 3 insertions(+), 105 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
index e332d3c..aa57297 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchScanner.java
@@ -54,7 +54,6 @@ public interface BatchScanner extends ScannerBase {
* <p>
* If not set, there is not timeout. The BatchScanner will retry forever.
*
- * @param timeout
* @param timeUnit
* determines how timeout is interpreted
* @since 1.5.0
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
index 95f73bb..f9848c4 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ConditionalWriter.java
@@ -116,7 +116,6 @@ public interface ConditionalWriter {
* This method returns one result for each mutation passed to it. This method is thread safe. Multiple threads can safely use a single conditional writer.
* Sharing a conditional writer between multiple threads may result in batching of request to tablet servers.
*
- * @param mutations
* @return Result for each mutation submitted. The mutations may still be processing in the background when this method returns, if so the iterator will
* block.
*/
@@ -125,8 +124,6 @@ public interface ConditionalWriter {
/**
* This method has the same thread safety guarantees as @link {@link #write(Iterator)}
*
- *
- * @param mutation
* @return Result for the submitted mutation
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/Instance.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index 05cc7f2..a55312e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -127,7 +127,7 @@ public interface Instance {
*
* @return the AccumuloConfiguration that specifies properties related to interacting with this instance
* @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed.
- * @see {@link InstanceOperations#getSystemConfiguration()} for client-side reading of the server-side configuration.
+ * @see InstanceOperations#getSystemConfiguration() for client-side reading of the server-side configuration.
*/
@Deprecated
AccumuloConfiguration getConfiguration();
@@ -138,7 +138,7 @@ public interface Instance {
* @param conf
* accumulo configuration
* @deprecated since 1.6.0. This method makes very little sense in the context of the client API and never should have been exposed.
- * @see {@link InstanceOperations#setProperty(String, String)}
+ * @see InstanceOperations#setProperty(String, String)
*/
@Deprecated
void setConfiguration(AccumuloConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index b81eb6d..97f538d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -525,7 +525,6 @@ public interface TableOperations {
* when there is a general accumulo error
* @throws AccumuloSecurityException
* when the user does not have the proper permissions
- * @throws TableNotFoundException
* @since 1.6.0
*/
void offline(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException;
@@ -552,7 +551,6 @@ public interface TableOperations {
* when there is a general accumulo error
* @throws AccumuloSecurityException
* when the user does not have the proper permissions
- * @throws TableNotFoundException
* @since 1.6.0
*/
void online(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException;
@@ -659,8 +657,6 @@ public interface TableOperations {
* the name of the table
* @param setting
* object specifying the properties of the iterator
- * @throws AccumuloException
- * @throws TableNotFoundException
*/
void checkIteratorConflicts(String tableName, IteratorSetting setting, EnumSet<IteratorScope> scopes) throws AccumuloException, TableNotFoundException;
@@ -711,8 +707,6 @@ public interface TableOperations {
* @param tables
* a set of tables
* @return a list of disk usage objects containing linked table names and sizes
- * @throws AccumuloException
- * @throws AccumuloSecurityException
* @since 1.6.0
*/
List<DiskUsage> getDiskUsage(Set<String> tables) throws AccumuloException, AccumuloSecurityException, TableNotFoundException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 522125f..50953d5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -169,12 +169,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
}
}
- /**
- * @throws TableNotFoundException
- * @throws IOException
- * @throws AccumuloException
- *
- */
private void nextTablet() throws TableNotFoundException, AccumuloException, IOException {
Range nextRange = null;
@@ -286,13 +280,6 @@ class OfflineIterator implements Iterator<Entry<Key,Value>> {
return new Pair<KeyExtent,String>(extent, location);
}
- /**
- * @param absFiles
- * @return
- * @throws AccumuloException
- * @throws TableNotFoundException
- * @throws IOException
- */
private SortedKeyValueIterator<Key,Value> createIterator(KeyExtent extent, List<String> absFiles) throws TableNotFoundException, AccumuloException,
IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
index d0e736c..7ab01fa 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
@@ -300,7 +300,6 @@ public class BloomFilterLayer {
* @param range
* range of keys to check
* @return false iff key doesn't exist, true if key probably exists.
- * @throws IOException
*/
boolean probablyHasKey(Range range) throws IOException {
if (bloomFilter == null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
index ca97e01..044989d 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/BCFile.java
@@ -209,7 +209,6 @@ public final class BCFile {
* Get the current position in file.
*
* @return The current byte offset in underlying file.
- * @throws IOException
*/
long getCurrentPos() throws IOException {
return fsOut.getPos() + fsBufferedOutput.size();
@@ -221,8 +220,6 @@ public final class BCFile {
/**
* Current size of compressed data.
- *
- * @throws IOException
*/
long getCompressedSize() throws IOException {
long ret = getCurrentPos() - posStart;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
index c0045ac..71d2d8b 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/LocalityGroupIterator.java
@@ -41,10 +41,6 @@ public class LocalityGroupIterator extends HeapIterator implements Interruptible
private static final Collection<ByteSequence> EMPTY_CF_SET = Collections.emptySet();
public static class LocalityGroup {
- /**
- * @param localityGroup
- * @param env
- */
private LocalityGroup(LocalityGroup localityGroup, IteratorEnvironment env) {
this(localityGroup.columnFamilies, localityGroup.isDefaultLocalityGroup);
this.iterator = (InterruptibleIterator) localityGroup.iterator.deepCopy(env);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
index 725b2c7..6baa17c 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/VisibilityEvaluator.java
@@ -82,7 +82,7 @@ public class VisibilityEvaluator {
* Creates a new evaluator for the authorizations found in the given
* environment.
*
- * @param environment environment containing authorizations
+ * @param env environment containing authorizations
*/
VisibilityEvaluator(Environment env) {
this.auths = env.getAuthorizationsContainer();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
index 783709a..535c141 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/CryptoModule.java
@@ -48,7 +48,6 @@ public interface CryptoModule {
* the {@link CryptoModuleParameters} object that specifies how to set up the encrypted stream.
* @return the same {@link CryptoModuleParameters} object with the {@link CryptoModuleParameters#getEncryptedOutputStream()} set to a stream that is not null.
* That stream may be exactly the same stream as {@link CryptoModuleParameters#getPlaintextInputStream()} if the params object specifies no cryptography.
- * @throws IOException
*/
CryptoModuleParameters getEncryptingOutputStream(CryptoModuleParameters params) throws IOException;
@@ -70,7 +69,6 @@ public interface CryptoModule {
* the {@link CryptoModuleParameters} object that specifies how to set up the encrypted stream.
* @return the same {@link CryptoModuleParameters} object with the {@link CryptoModuleParameters#getPlaintextInputStream()} set to a stream that is not null.
* That stream may be exactly the same stream as {@link CryptoModuleParameters#getEncryptedInputStream()} if the params object specifies no cryptography.
- * @throws IOException
*/
CryptoModuleParameters getDecryptingInputStream(CryptoModuleParameters params) throws IOException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
index ca57bd4..7ccae0a 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/mock/MockConnectorTest.java
@@ -259,8 +259,6 @@ public class MockConnectorTest {
* Table to check
* @param count
* number of entries to expect in the table
- * @param count
- * number of rows the table should contain
*/
private void checkRemaining(Connector c, String tableName, int count) throws Exception {
Scanner scanner = c.createScanner(tableName, Authorizations.EMPTY);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
index 5fe23a5..3111c5b 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RandomBatchScanner.java
@@ -115,7 +115,6 @@ public class RandomBatchScanner {
/**
* Prints a count of the number of rows mapped to false.
*
- * @param expectedRows
* @return boolean indicating "were all the rows found?"
*/
private static boolean checkAllRowsFound(HashMap<Text,Boolean> expectedRows) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
index 7f19bc4..5276109 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/client/RowOperations.java
@@ -165,13 +165,6 @@ public class RowOperations {
/**
* Deletes a row given a text object
- *
- * @param opts
- *
- * @param row
- * @throws TableNotFoundException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
*/
private static void deleteRow(ScannerOpts scanOpts, Text row) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
deleteRow(getRow(scanOpts, row));
@@ -179,8 +172,6 @@ public class RowOperations {
/**
* Deletes a row, given a Scanner of JUST that row
- *
- * @param scanner
*/
private static void deleteRow(Scanner scanner) throws MutationsRejectedException {
Mutation deleter = null;
@@ -198,8 +189,6 @@ public class RowOperations {
/**
* Just a generic print function given an iterator. Not necessarily just for printing a single row
- *
- * @param scanner
*/
private static void printRow(Scanner scanner) {
// iterates through and prints
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
index f9f2d39..fe71b85 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/mapreduce/TeraSortIngest.java
@@ -275,8 +275,6 @@ public class TeraSortIngest extends Configured implements Tool {
/**
* Add the rowid to the row.
- *
- * @param rowId
*/
private Text getRowIdString(long rowId) {
Text paddedRowIdString = new Text();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/fate/src/main/java/org/apache/accumulo/fate/TStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/TStore.java b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
index 882cdbd..3adb493 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -56,8 +56,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
/**
* Remove the last pushed operation from the given transaction.
- *
- * @param tid
*/
void pop(long tid);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
index 38559a7..c4f3489 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooLock.java
@@ -47,8 +47,6 @@ public class ZooLock implements Watcher {
/**
* lost the ability to monitor the lock node, and its status is unknown
- *
- * @param e
*/
void unableToMonitorLockNode(Throwable e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
index f03b04b..5e6fecc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/MemoryManager.java
@@ -33,8 +33,6 @@ public interface MemoryManager {
/**
* Initialize the memory manager.
- *
- * @param conf
*/
void init(ServerConfiguration conf);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
index 489d4bc..78d5edd 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ZooZap.java
@@ -32,9 +32,6 @@ public class ZooZap {
static boolean verbose = false;
- /**
- * @param args
- */
private static void message(String msg) {
if (verbose)
System.out.println(msg);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
index 3e36617..0294ce1 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/GarbageCollectionEnvironment.java
@@ -46,9 +46,6 @@ public interface GarbageCollectionEnvironment {
* A row to resume from if a previous invocation was stopped due to finding an extremely large number of candidates to remove which would have
* exceeded memory limitations
* @return A collection of candidates files for deletion, may not be the complete collection of files for deletion at this point in time
- * @throws TableNotFoundException
- * @throws AccumuloException
- * @throws AccumuloSecurityException
*/
List<String> getCandidates(String continuePoint) throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
@@ -56,9 +53,6 @@ public interface GarbageCollectionEnvironment {
* Fetch a list of paths for all bulk loads in progress (blip) from a given table, {@link RootTable#NAME} or {@link MetadataTable#NAME}
*
* @return The list of files for each bulk load currently in progress.
- * @throws TableNotFoundException
- * @throws AccumuloException
- * @throws AccumuloSecurityException
*/
Iterator<String> getBlipIterator() throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
@@ -66,9 +60,6 @@ public interface GarbageCollectionEnvironment {
* Fetches the references to files, {@link DataFileColumnFamily#NAME} or {@link ScanFileColumnFamily#NAME}, from tablets
*
* @return An {@link Iterator} of {@link Entry}<{@link Key}, {@link Value}> which constitute a reference to a file.
- * @throws TableNotFoundException
- * @throws AccumuloException
- * @throws AccumuloSecurityException
*/
Iterator<Entry<Key,Value>> getReferenceIterator() throws TableNotFoundException, AccumuloException, AccumuloSecurityException;
@@ -84,10 +75,6 @@ public interface GarbageCollectionEnvironment {
*
* @param candidateMap
* A Map from relative path to absolute path for files to be deleted.
- * @throws IOException
- * @throws AccumuloSecurityException
- * @throws AccumuloException
- * @throws TableNotFoundException
*/
void delete(SortedMap<String,String> candidateMap) throws IOException, AccumuloException, AccumuloSecurityException, TableNotFoundException;
@@ -96,7 +83,6 @@ public interface GarbageCollectionEnvironment {
*
* @param tableID
* The id of the table whose directory we are to operate on
- * @throws IOException
*/
void deleteTableDirIfEmpty(String tableID) throws IOException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
----------------------------------------------------------------------
diff --git a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
index a1c9673..4617299 100644
--- a/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
+++ b/server/gc/src/main/java/org/apache/accumulo/gc/SimpleGarbageCollector.java
@@ -590,7 +590,6 @@ public class SimpleGarbageCollector implements Iface {
* Moves a file to trash. If this garbage collector is not using trash, this method returns false and leaves the file alone. If the file is missing, this
* method returns false as opposed to throwing an exception.
*
- * @param path
* @return true if the file was moved to trash
* @throws IOException
* if the volume manager encountered a problem
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
----------------------------------------------------------------------
diff --git a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
index bea9381..29dfefb 100644
--- a/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
+++ b/server/master/src/test/java/org/apache/accumulo/master/TestMergeState.java
@@ -179,12 +179,6 @@ public class TestMergeState {
}
- /**
- * @param state
- * @param metaDataStateStore
- * @param locations
- * @return
- */
private MergeStats scan(MockCurrentState state, MetaDataStateStore metaDataStateStore) {
MergeStats stats = new MergeStats(state.mergeInfo);
stats.getMergeInfo().setState(MergeState.WAITING_FOR_OFFLINE);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
index b0124a9..47ddaef 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/Monitor.java
@@ -547,9 +547,6 @@ public class Monitor {
/**
* Get the monitor lock in ZooKeeper
- *
- * @throws KeeperException
- * @throws InterruptedException
*/
private void getMonitorLock() throws KeeperException, InterruptedException {
final String zRoot = ZooUtil.getRoot(instance);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 80d5662..807bb8e 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -412,10 +412,7 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
/**
* while a session is reserved, it cannot be canceled or removed
- *
- * @param sessionId
*/
-
synchronized Session reserveSession(long sessionId) {
Session session = sessions.get(sessionId);
if (session != null) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index d25ee75..aaf62f3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -97,7 +97,6 @@ public class TabletServerLogger {
* lock to use
* @param code
* a test/work pair
- * @throws IOException
*/
private static void testLockAndRun(final ReadWriteLock rwlock, TestCallWithWriteLock code) throws IOException {
// Get a read lock
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
index b38fc47..f17147f 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/AccumuloClassLoader.java
@@ -96,7 +96,6 @@ public class AccumuloClassLoader {
*
* @param d
* XMLDocument to search through
- * @param propertyName
*/
private static String getAccumuloClassPathStrings(Document d, String propertyName) {
NodeList pnodes = d.getElementsByTagName("property");
@@ -165,10 +164,6 @@ public class AccumuloClassLoader {
/**
* Populate the list of URLs with the items in the classpath string
- *
- * @param classpath
- * @param urls
- * @throws MalformedURLException
*/
private static void addUrl(String classpath, ArrayList<URL> urls) throws MalformedURLException {
classpath = classpath.trim();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
index 2568480..c71d2d0 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Module.java
@@ -134,7 +134,6 @@ public class Module extends Node {
* Chooses a random neighbor node
*
* @return Node or null if no edges
- * @throws Exception
*/
private String randomNeighbor() throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
index b2299aa..aed790c 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/bulk/Verify.java
@@ -138,10 +138,6 @@ public class Verify extends Test {
}
}
- /**
- * @param startBadEntry
- * @param lastBadEntry
- */
private static void report(Text startBadRow, Text lastBadRow, Value value) {
System.out.println("Bad value " + new String(value.get(), Constants.UTF8));
System.out.println(" Range [" + startBadRow + " -> " + lastBadRow + "]");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/d3e17f45/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
index 9d68f76..0b63d01 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/SparseColumnFamilyIT.java
@@ -89,12 +89,6 @@ public class SparseColumnFamilyIT extends SimpleMacIT {
}
}
- /**
- * @param i
- * @param j
- * @param k
- * @return
- */
private Mutation nm(int row, int cf, int val) {
Mutation m = new Mutation(String.format("%06d", row));
m.put(String.format("%03d", cf), "", "" + val);