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 2015/04/07 03:36:30 UTC
[1/3] accumulo git commit: ACCUMULO-2129 Update javadocs for
overridden methods
Repository: accumulo
Updated Branches:
refs/heads/master 5ed504c62 -> 698368f2b
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
index a9bbe55..b9b122c 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsRandomAccessContent.java
@@ -53,274 +53,172 @@ public class HdfsRandomAccessContent implements RandomAccessContent {
this.fis = this.fs.open(this.path);
}
- /**
- * @see org.apache.commons.vfs2.RandomAccessContent#close()
- */
@Override
public void close() throws IOException {
this.fis.close();
}
- /**
- * @see org.apache.commons.vfs2.RandomAccessContent#getFilePointer()
- */
@Override
public long getFilePointer() throws IOException {
return this.fis.getPos();
}
- /**
- * @see org.apache.commons.vfs2.RandomAccessContent#getInputStream()
- */
@Override
public InputStream getInputStream() throws IOException {
return this.fis;
}
- /**
- * @see org.apache.commons.vfs2.RandomAccessContent#length()
- */
@Override
public long length() throws IOException {
return this.fs.getFileStatus(this.path).getLen();
}
- /**
- * @see java.io.DataInput#readBoolean()
- */
@Override
public boolean readBoolean() throws IOException {
return this.fis.readBoolean();
}
- /**
- * @see java.io.DataInput#readByte()
- */
@Override
public byte readByte() throws IOException {
return this.fis.readByte();
}
- /**
- * @see java.io.DataInput#readChar()
- */
@Override
public char readChar() throws IOException {
return this.fis.readChar();
}
- /**
- * @see java.io.DataInput#readDouble()
- */
@Override
public double readDouble() throws IOException {
return this.fis.readDouble();
}
- /**
- * @see java.io.DataInput#readFloat()
- */
@Override
public float readFloat() throws IOException {
return this.fis.readFloat();
}
- /**
- * @see java.io.DataInput#readFully(byte[])
- */
@Override
public void readFully(final byte[] b) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataInput#readFully(byte[], int, int)
- */
@Override
public void readFully(final byte[] b, final int off, final int len) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataInput#readInt()
- */
@Override
public int readInt() throws IOException {
return this.fis.readInt();
}
- /**
- * @see java.io.DataInput#readLine()
- */
@Override
public String readLine() throws IOException {
BufferedReader d = new BufferedReader(new InputStreamReader(this.fis, Charset.forName("UTF-8")));
return d.readLine();
}
- /**
- * @see java.io.DataInput#readLong()
- */
@Override
public long readLong() throws IOException {
return this.fis.readLong();
}
- /**
- * @see java.io.DataInput#readShort()
- */
@Override
public short readShort() throws IOException {
return this.fis.readShort();
}
- /**
- * @see java.io.DataInput#readUnsignedByte()
- */
@Override
public int readUnsignedByte() throws IOException {
return this.fis.readUnsignedByte();
}
- /**
- * @see java.io.DataInput#readUnsignedShort()
- */
@Override
public int readUnsignedShort() throws IOException {
return this.fis.readUnsignedShort();
}
- /**
- * @see java.io.DataInput#readUTF()
- */
@Override
public String readUTF() throws IOException {
return this.fis.readUTF();
}
- /**
- * @see org.apache.commons.vfs2.RandomAccessContent#seek(long)
- */
@Override
public void seek(final long pos) throws IOException {
this.fis.seek(pos);
}
- /**
- * @see java.io.DataInput#skipBytes(int)
- */
@Override
public int skipBytes(final int n) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#write(byte[])
- */
@Override
public void write(final byte[] b) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#write(byte[], int, int)
- */
@Override
public void write(final byte[] b, final int off, final int len) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#write(int)
- */
@Override
public void write(final int b) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeBoolean(boolean)
- */
@Override
public void writeBoolean(final boolean v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeByte(int)
- */
@Override
public void writeByte(final int v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeBytes(java.lang.String)
- */
@Override
public void writeBytes(final String s) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeChar(int)
- */
@Override
public void writeChar(final int v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeChars(java.lang.String)
- */
@Override
public void writeChars(final String s) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeDouble(double)
- */
@Override
public void writeDouble(final double v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeFloat(float)
- */
@Override
public void writeFloat(final float v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeInt(int)
- */
@Override
public void writeInt(final int v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeLong(long)
- */
@Override
public void writeLong(final long v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeShort(int)
- */
@Override
public void writeShort(final int v) throws IOException {
throw new UnsupportedOperationException();
}
- /**
- * @see java.io.DataOutput#writeUTF(java.lang.String)
- */
@Override
public void writeUTF(final String s) throws IOException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
----------------------------------------------------------------------
diff --git a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
index d10ca01..2ba4ecf 100644
--- a/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
+++ b/start/src/test/java/org/apache/accumulo/start/classloader/vfs/providers/VfsClassLoaderTest.java
@@ -113,16 +113,19 @@ public class VfsClassLoaderTest extends AccumuloDFSBase {
private boolean fileDeleted = false;
private boolean fileCreated = false;
+ @Override
public void fileCreated(FileChangeEvent event) throws Exception {
// System.out.println(event.getFile() + " created");
this.fileCreated = true;
}
+ @Override
public void fileDeleted(FileChangeEvent event) throws Exception {
// System.out.println(event.getFile() + " deleted");
this.fileDeleted = true;
}
+ @Override
public void fileChanged(FileChangeEvent event) throws Exception {
// System.out.println(event.getFile() + " changed");
this.fileChanged = true;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java b/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
index 1ab2a8a..668b9cc 100644
--- a/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
+++ b/test/src/main/java/org/apache/accumulo/test/EstimateInMemMapOverhead.java
@@ -90,10 +90,12 @@ class TextMemoryUsageTest extends MemoryUsageTest {
}
+ @Override
void init() {
map = new TreeMap<Text,Value>();
}
+ @Override
public void addEntry(int i) {
Text key = new Text(String.format("%0" + keyLen + "d:%0" + colFamLen + "d:%0" + colQualLen + "d", i, 0, 0).getBytes());
//
@@ -107,19 +109,23 @@ class TextMemoryUsageTest extends MemoryUsageTest {
}
+ @Override
public void clear() {
map.clear();
map = null;
}
+ @Override
public int getEstimatedBytesPerEntry() {
return keyLen + colFamLen + colQualLen + dataLen;
}
+ @Override
int getNumPasses() {
return passes;
}
+ @Override
String getName() {
return "Text " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
}
@@ -151,6 +157,7 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
}
+ @Override
void init() {
imm = new InMemoryMap(false, "/tmp");
key = new Text();
@@ -160,6 +167,7 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
colv = new ColumnVisibility(String.format("%0" + colVisLen + "d", 0));
}
+ @Override
public void addEntry(int i) {
key.set(String.format("%0" + keyLen + "d", i));
@@ -177,10 +185,12 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
}
+ @Override
public int getEstimatedBytesPerEntry() {
return keyLen + colFamLen + colQualLen + dataLen + 4 + colVisLen;
}
+ @Override
public void clear() {
imm = null;
key = null;
@@ -188,10 +198,12 @@ class InMemoryMapMemoryUsageTest extends MemoryUsageTest {
colq = null;
}
+ @Override
int getNumPasses() {
return passes;
}
+ @Override
String getName() {
return "IMM " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
}
@@ -220,6 +232,7 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
}
+ @Override
void init() {
key = new Text();
@@ -232,6 +245,7 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
}
}
+ @Override
public void addEntry(int i) {
key.set(String.format("%0" + keyLen + "d", i));
@@ -248,10 +262,12 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
mutations[i] = m;
}
+ @Override
public int getEstimatedBytesPerEntry() {
return keyLen + colFamLen + colQualLen + dataLen;
}
+ @Override
public void clear() {
key = null;
colf = null;
@@ -259,10 +275,12 @@ class MutationMemoryUsageTest extends MemoryUsageTest {
mutations = null;
}
+ @Override
int getNumPasses() {
return passes;
}
+ @Override
String getName() {
return "Mutation " + keyLen + " " + colFamLen + " " + colQualLen + " " + dataLen;
}
@@ -285,25 +303,31 @@ class IntObjectMemoryUsageTest extends MemoryUsageTest {
this.passes = numPasses;
}
+ @Override
void init() {
data = new Object[passes];
}
+ @Override
void addEntry(int i) {
data[i] = new SimpleObject(i);
}
+ @Override
void clear() {}
+ @Override
int getEstimatedBytesPerEntry() {
return 4;
}
+ @Override
String getName() {
return "int obj";
}
+ @Override
int getNumPasses() {
return passes;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java b/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
index 673e61d..adafdfb 100644
--- a/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
+++ b/test/src/main/java/org/apache/accumulo/test/FaultyConditionalWriter.java
@@ -42,6 +42,7 @@ public class FaultyConditionalWriter implements ConditionalWriter {
}
+ @Override
public Iterator<Result> write(Iterator<ConditionalMutation> mutations) {
ArrayList<Result> resultList = new ArrayList<Result>();
ArrayList<ConditionalMutation> writes = new ArrayList<ConditionalMutation>();
@@ -68,6 +69,7 @@ public class FaultyConditionalWriter implements ConditionalWriter {
return resultList.iterator();
}
+ @Override
public Result write(ConditionalMutation mutation) {
return write(Collections.singleton(mutation).iterator()).next();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java b/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
index 32a178d..c05fc52 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/DropModIter.java
@@ -42,6 +42,7 @@ public class DropModIter extends SkippingIterator {
this.drop = Integer.parseInt(options.get("drop"));
}
+ @Override
protected void consume() throws IOException {
while (getSource().hasTop() && Integer.parseInt(getSource().getTopKey().getRow().toString()) % mod == drop) {
getSource().next();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
index 8d14574..6e02c23 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/Config.java
@@ -53,7 +53,7 @@ public class Config extends Test {
return new Setting(property, min, max);
}
- /* @formatter:off */
+ // @formatter:off
Setting[] settings = {
s(Property.TSERV_BLOOM_LOAD_MAXCONCURRENT, 1, 10),
s(Property.TSERV_BULK_PROCESS_THREADS, 1, 10),
@@ -102,8 +102,7 @@ public class Config extends Test {
s(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX, 10 * 1024, 10 * 1024 * 1024L),
s(Property.TABLE_FILE_REPLICATION, 0, 5),
s(Property.TABLE_FILE_MAX, 2, 50),};
-
- /* @formatter:on */
+ // @formatter:on
@Override
public void visit(State state, Environment env, Properties props) throws Exception {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
index ec4edaf..35636e4 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/conditional/Transfer.java
@@ -54,6 +54,7 @@ public class Transfer extends Test {
seq = Integer.parseInt(s);
}
+ @Override
public String toString() {
return seq + " " + bal;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java b/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
index a3bdd43..405fabb 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/RandomByteArrays.java
@@ -26,6 +26,7 @@ public class RandomByteArrays extends Stream<byte[]> {
this.random_arrays = random_arrays;
}
+ @Override
public byte[] next() {
return random_arrays.next_bytes();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java b/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
index c59cd1c..3e8d5fd 100644
--- a/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
+++ b/test/src/main/java/org/apache/accumulo/test/stress/random/Scan.java
@@ -100,6 +100,7 @@ public class Scan {
this.current = 0;
}
+ @Override
public boolean keepScanning() {
if (current < max) {
++current;
@@ -112,6 +113,7 @@ public class Scan {
// Does an infinite number of iterations
static class ContinuousLoopControl implements LoopControl {
+ @Override
public boolean keepScanning() {
return true;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java b/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
index ec89c5d..8915c0d 100644
--- a/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/MetaGetsReadersIT.java
@@ -53,6 +53,7 @@ public class MetaGetsReadersIT extends ConfigurableMacIT {
private static Thread slowScan(final Connector c, final String tableName, final AtomicBoolean stop) {
Thread thread = new Thread() {
+ @Override
public void run() {
try {
while (stop.get() == false) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java b/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
index ac24083..5da0629 100644
--- a/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/TabletServerGivesUpIT.java
@@ -52,6 +52,7 @@ public class TabletServerGivesUpIT extends ConfigurableMacIT {
// ask the tserver to do something
final AtomicReference<Exception> ex = new AtomicReference<>();
Thread splitter = new Thread() {
+ @Override
public void run() {
try {
TreeSet<Text> splits = new TreeSet<>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
----------------------------------------------------------------------
diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
index 9104d5f..2004623 100644
--- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
+++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java
@@ -46,30 +46,37 @@ public class Span extends org.apache.accumulo.core.trace.Span implements Cloudtr
return new Span(span.child(s));
}
+ @Override
public void start() {
throw new UnsupportedOperationException("can't start span");
}
+ @Override
public long accumulatedMillis() {
return getAccumulatedMillis();
}
+ @Override
public boolean running() {
return isRunning();
}
+ @Override
public String description() {
return getDescription();
}
+ @Override
public long spanId() {
return getSpanId();
}
+ @Override
public Span parent() {
throw new UnsupportedOperationException("can't get parent");
}
+ @Override
public long parentId() {
return getParentId();
}
[2/3] accumulo git commit: ACCUMULO-2129 Update javadocs for
overridden methods
Posted by ct...@apache.org.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
index 266b638..8710acd 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/SequenceFileIterator.java
@@ -39,6 +39,7 @@ public class SequenceFileIterator implements FileSKVIterator {
private Key top_key;
private boolean readValue;
+ @Override
public SequenceFileIterator deepCopy(IteratorEnvironment env) {
throw new UnsupportedOperationException("SequenceFileIterator does not yet support cloning");
}
@@ -60,18 +61,22 @@ public class SequenceFileIterator implements FileSKVIterator {
next();
}
+ @Override
public Key getTopKey() {
return top_key;
}
+ @Override
public Value getTopValue() {
return top_value;
}
+ @Override
public boolean hasTop() {
return top_key != null;
}
+ @Override
public void next() throws IOException {
boolean valid;
if (readValue)
@@ -91,6 +96,7 @@ public class SequenceFileIterator implements FileSKVIterator {
throw new UnsupportedOperationException("seek() not supported");
}
+ @Override
public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
throw new UnsupportedOperationException();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
index ef4003c..f776569 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/user/RowEncodingIterator.java
@@ -70,9 +70,6 @@ public abstract class RowEncodingIterator implements SortedKeyValueIterator<Key,
*/
public abstract Value rowEncoder(List<Key> keys, List<Value> values) throws IOException;
- /**
- * Implement deepCopy. Ensure sourceIter is copied appropriately.
- */
@Override
public abstract SortedKeyValueIterator<Key,Value> deepCopy(IteratorEnvironment env);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
index 7b8ec9e..0724f0e 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/BlockedInputStream.java
@@ -86,6 +86,7 @@ public class BlockedInputStream extends InputStream {
}
// Amount available to read
+ @Override
public int available() {
int toRet = writePos + 1 - readPos;
if (toRet < 0)
@@ -168,6 +169,7 @@ public class BlockedInputStream extends InputStream {
writePos = -1;
}
+ @Override
public boolean markSupported() {
return false;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java b/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
index ddfdefd..2d31be4 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/crypto/DiscardCloseOutputStream.java
@@ -32,6 +32,7 @@ public class DiscardCloseOutputStream extends FilterOutputStream {
super(out);
}
+ @Override
public void close() throws IOException {
// Discard
log.trace("Discarded close");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
index 25d0f32..f13f77e 100644
--- a/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
+++ b/core/src/main/java/org/apache/accumulo/core/tabletserver/log/LogEntry.java
@@ -50,6 +50,7 @@ public class LogEntry {
this.logSet = new ArrayList<String>(le.logSet);
}
+ @Override
public String toString() {
return extent.toString() + " " + filename + " (" + tabletId + ")";
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
index 7a0b6a2..3af0513 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/NamingThreadFactory.java
@@ -32,6 +32,7 @@ public class NamingThreadFactory implements ThreadFactory {
this.name = name;
}
+ @Override
public Thread newThread(Runnable r) {
return new Daemon(new LoggingRunnable(log, r), name + " " + threadNum.getAndIncrement());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/util/Stat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Stat.java b/core/src/main/java/org/apache/accumulo/core/util/Stat.java
index d2d560e..b7d4165 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Stat.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Stat.java
@@ -68,6 +68,7 @@ public class Stat {
return sd.getResult();
}
+ @Override
public String toString() {
return String.format("%,d %,d %,.2f %,d", getMin(), getMax(), getAverage(), mean.getN());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java b/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
index ec20da5..a5f6a8d 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/format/BinaryFormatter.java
@@ -26,6 +26,7 @@ import org.apache.hadoop.io.Text;
public class BinaryFormatter extends DefaultFormatter {
private static int showLength;
+ @Override
public String next() {
checkState(true);
return formatEntry(getScannerIterator().next(), isDoTimestamps());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
index 24c2bbc..a99f415 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/TestThrift1474.java
@@ -70,6 +70,7 @@ public class TestThrift1474 {
args.stopTimeoutUnit = TimeUnit.MILLISECONDS;
final TServer server = new TThreadPoolServer(args.processor(processor));
Thread thread = new Thread() {
+ @Override
public void run() {
server.serve();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
index 41084e6..6353863 100644
--- a/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/client/lexicoder/ListLexicoderTest.java
@@ -16,14 +16,14 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
-import org.apache.accumulo.core.util.TextUtil;
-import org.apache.hadoop.io.Text;
-
import java.util.ArrayList;
import java.util.List;
import java.util.TreeSet;
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoderTest;
+import org.apache.accumulo.core.util.TextUtil;
+import org.apache.hadoop.io.Text;
+
public class ListLexicoderTest extends AbstractLexicoderTest {
private List<Long> data1 = new ArrayList<Long>();
@@ -32,6 +32,7 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
private List<Long> data4 = new ArrayList<Long>();
private List<Long> data5 = new ArrayList<Long>();
+ @Override
public void setUp() {
data1.add(1l);
@@ -49,6 +50,7 @@ public class ListLexicoderTest extends AbstractLexicoderTest {
data5.add(2l);
data5.add(1l);
}
+
public void testSortOrder() {
List<List<Long>> data = new ArrayList<List<Long>>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
index 125268a..5ff5722 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/IteratorUtilTest.java
@@ -52,26 +52,32 @@ public class IteratorUtilTest {
protected SortedKeyValueIterator<Key,Value> source;
+ @Override
public WrappedIter deepCopy(IteratorEnvironment env) {
throw new UnsupportedOperationException();
}
+ @Override
public Key getTopKey() {
return source.getTopKey();
}
+ @Override
public Value getTopValue() {
return source.getTopValue();
}
+ @Override
public boolean hasTop() {
return source.hasTop();
}
+ @Override
public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
this.source = source;
}
+ @Override
public void next() throws IOException {
source.next();
}
@@ -86,6 +92,7 @@ public class IteratorUtilTest {
int amount = 1;
+ @Override
public Value getTopValue() {
Value val = super.getTopValue();
@@ -94,6 +101,7 @@ public class IteratorUtilTest {
return new Value(((orig + amount) + "").getBytes());
}
+ @Override
public void init(SortedKeyValueIterator<Key,Value> source, Map<String,String> options, IteratorEnvironment env) throws IOException {
super.init(source, options, env);
@@ -106,6 +114,7 @@ public class IteratorUtilTest {
}
static class SquaringIter extends WrappedIter {
+ @Override
public Value getTopValue() {
Value val = super.getTopValue();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
index 3aefdf1..0c4ffa2 100644
--- a/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/iterators/user/FilterTest.java
@@ -52,6 +52,7 @@ public class FilterTest {
private static final Map<String,String> EMPTY_OPTS = new HashMap<String,String>();
public static class SimpleFilter extends Filter {
+ @Override
public boolean accept(Key k, Value v) {
// System.out.println(k.getRow());
if (k.getRow().toString().endsWith("0"))
@@ -61,6 +62,7 @@ public class FilterTest {
}
public static class SimpleFilter2 extends Filter {
+ @Override
public boolean accept(Key k, Value v) {
if (k.getColumnFamily().toString().equals("a"))
return false;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
index 002c1ab..0e6e319 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/filedata/ChunkInputStream.java
@@ -30,7 +30,6 @@ import org.apache.hadoop.io.Text;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* An input stream that reads file data stored in one or more Accumulo values. Used by {@link ChunkInputFormat} to present input streams to a mapper.
*/
@@ -178,6 +177,7 @@ public class ChunkInputStream extends InputStream {
return currentVis;
}
+ @Override
public int read() throws IOException {
if (source == null)
return -1;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
index 728aa08..e429f62 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/DebugCommand.java
@@ -25,6 +25,7 @@ import org.apache.commons.cli.CommandLine;
public class DebugCommand extends Command {
+ @Override
public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
Set<String> lines = new TreeSet<String>();
lines.add("This is a test");
@@ -32,10 +33,12 @@ public class DebugCommand extends Command {
return 0;
}
+ @Override
public String description() {
return "prints a message to test extension feature";
}
+ @Override
public int numArgs() {
return 0;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
----------------------------------------------------------------------
diff --git a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
index e37acbd..14dc170 100644
--- a/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
+++ b/examples/simple/src/main/java/org/apache/accumulo/examples/simple/shell/MyAppShellExtension.java
@@ -21,6 +21,7 @@ import org.apache.accumulo.shell.ShellExtension;
public class MyAppShellExtension extends ShellExtension {
+ @Override
public String getExtensionName() {
return "MyApp";
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/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 bdcfba3..9b28d72 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/TStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/TStore.java
@@ -34,13 +34,6 @@ public interface TStore<T> extends ReadOnlyTStore<T> {
*/
long create();
- /**
- * Get the current operation for the given transaction id.
- *
- * @param tid
- * transaction id
- * @return the operation
- */
@Override
Repo<T> top(long tid);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
index 6c8a7d6..8115fd5 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/ZooStore.java
@@ -190,6 +190,7 @@ public class ZooStore<T> implements TStore<T> {
}
}
+ @Override
public void reserve(long tid) {
synchronized (this) {
reservationsWaiting++;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
index 6f1b20e..3702239 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/LoggingRunnable.java
@@ -20,7 +20,6 @@ import java.util.Date;
import org.slf4j.Logger;
-
public class LoggingRunnable implements Runnable {
private Runnable runnable;
private Logger log;
@@ -30,6 +29,7 @@ public class LoggingRunnable implements Runnable {
this.log = log;
}
+ @Override
public void run() {
try {
runnable.run();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
index 14d104b..ad82739 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/IZooReaderWriter.java
@@ -63,6 +63,7 @@ public interface IZooReaderWriter extends IZooReader {
void mkdirs(String path) throws KeeperException, InterruptedException;
+ @Override
void sync(String path) throws KeeperException, InterruptedException;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/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 76181a7..11da1ec 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
@@ -258,6 +258,7 @@ public class ZooLock implements Watcher {
asyncLock = null;
}
+ @Override
public void process(WatchedEvent event) {
synchronized (ZooLock.this) {
if (lock != null && event.getType() == EventType.NodeDeleted && event.getPath().equals(path + "/" + lock)) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
----------------------------------------------------------------------
diff --git a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
index 1286c01..e7ba7d5 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/zookeeper/ZooReaderWriter.java
@@ -63,11 +63,6 @@ public class ZooReaderWriter extends ZooReader implements IZooReaderWriter {
ZooUtil.recursiveDelete(info, zPath, policy);
}
- /**
- * Create a persistent node with the default ACL
- *
- * @return true if the node was created or altered; false if it was skipped
- */
@Override
public boolean putPersistentData(String zPath, byte[] data, NodeExistsPolicy policy) throws KeeperException, InterruptedException {
return ZooUtil.putPersistentData(info, zPath, data, policy);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
----------------------------------------------------------------------
diff --git a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
index 518ab81..2c3b813 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
+++ b/fate/src/test/java/org/apache/accumulo/fate/AgeOffStoreTest.java
@@ -32,6 +32,7 @@ public class AgeOffStoreTest {
private static class TestTimeSource implements TimeSource {
long time = 0;
+ @Override
public long currentTimeMillis() {
return time;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
----------------------------------------------------------------------
diff --git a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
index 919d5aa..2df1c5d 100644
--- a/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
+++ b/minicluster/src/main/java/org/apache/accumulo/minicluster/impl/MiniAccumuloClusterImpl.java
@@ -287,6 +287,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
for (Entry<String,String> sysProp : config.getSystemProperties().entrySet()) {
argList.add(String.format("-D%s=%s", sysProp.getKey(), sysProp.getValue()));
}
+ // @formatter:off
argList.addAll(Arrays.asList(
"-XX:+UseConcMarkSweepGC",
"-XX:CMSInitiatingOccupancyFraction=75",
@@ -295,6 +296,7 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
"-XX:+PerfDisableSharedMem",
"-XX:+AlwaysPreTouch",
Main.class.getName(), className));
+ // @formatter:on
argList.addAll(Arrays.asList(args));
ProcessBuilder builder = new ProcessBuilder(argList);
@@ -652,24 +654,18 @@ public class MiniAccumuloClusterImpl implements AccumuloCluster {
getClusterControl().killProcess(type, proc);
}
- /**
- * @return Accumulo instance name
- */
@Override
public String getInstanceName() {
return config.getInstanceName();
}
- /**
- * @return zookeeper connection string
- */
@Override
public String getZooKeepers() {
return config.getZooKeepers();
}
/**
- * Stops Accumulo and Zookeeper processes. If stop is not called, there is a shutdown hook that is setup to kill the processes. However its probably best to
+ * Stops Accumulo and Zookeeper processes. If stop is not called, there is a shutdown hook that is setup to kill the processes. However it's probably best to
* call stop in a finally block as soon as possible.
*/
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 3d5035f..7ac9962 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1009,6 +1009,8 @@
<property name="allowThrowsTagsForSubclasses" value="true" />
</module>
<module name="SingleLineJavadoc" />
+ <module name="MissingOverrideCheck" />
+ <module name="AnnotationLocation" />
</module>
</module>
</checkstyleRules>
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
index 170fe27..bae694b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/NamespaceConfiguration.java
@@ -156,9 +156,6 @@ public class NamespaceConfiguration extends ObservableConfiguration {
return key.startsWith(Property.TABLE_ITERATOR_PREFIX.getKey()) || key.startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey());
}
- /**
- * Invalidates the <code>ZooCache</code> used for storage and quick retrieval of properties for this namespace configuration.
- */
@Override
public synchronized void invalidateCache() {
if (null != propCacheAccessor) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
index 53d1e47..259f2a2 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/conf/TableConfiguration.java
@@ -123,9 +123,6 @@ public class TableConfiguration extends ObservableConfiguration {
return parent;
}
- /**
- * Invalidates the <code>ZooCache</code> used for storage and quick retrieval of properties for this table configuration.
- */
@Override
public synchronized void invalidateCache() {
if (null != propCacheAccessor) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java b/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
index f891065..d4da91a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/data/ServerColumnUpdate.java
@@ -27,6 +27,7 @@ public class ServerColumnUpdate extends ColumnUpdate {
parent = serverMutation;
}
+ @Override
public long getTimestamp() {
if (hasTimestamp())
return super.getTimestamp();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java b/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
index eb42a11..82186f8 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/fs/FileRef.java
@@ -44,6 +44,7 @@ public class FileRef implements Comparable<FileRef> {
this(path, new Path(path));
}
+ @Override
public String toString() {
return fullReference.toString();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
index 4290bd5..aa8e219 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
@@ -43,6 +43,9 @@ import org.slf4j.LoggerFactory;
/**
* A chaotic load balancer used for testing. It constantly shuffles tablets, preventing them from resting in a single location for very long. This is not
* designed for performance, do not use on production systems. I'm calling it the LokiLoadBalancer.
+ *
+ * <p>
+ * Will balance randomly, maintaining distribution
*/
public class ChaoticLoadBalancer extends TabletBalancer {
private static final Logger log = LoggerFactory.getLogger(ChaoticLoadBalancer.class);
@@ -83,9 +86,6 @@ public class ChaoticLoadBalancer extends TabletBalancer {
protected final OutstandingMigrations outstandingMigrations = new OutstandingMigrations(log);
- /**
- * Will balance randomly, maintaining distribution
- */
@Override
public long balance(SortedMap<TServerInstance,TabletServerStatus> current, Set<KeyExtent> migrations, List<TabletMigration> migrationsOut) {
Map<TServerInstance,Long> numTablets = new HashMap<TServerInstance,Long>();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
index b24b562..2e79ba9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletLocationState.java
@@ -68,6 +68,7 @@ public class TabletLocationState {
final public Collection<Collection<String>> walogs;
final public boolean chopped;
+ @Override
public String toString() {
return extent + "@(" + future + "," + current + "," + last + ")" + (chopped ? " chopped" : "");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
index e852af3..573b2eb 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/state/TabletMigration.java
@@ -29,6 +29,7 @@ public class TabletMigration {
this.newServer = after;
}
+ @Override
public String toString() {
return tablet + ": " + oldServer + " -> " + newServer;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
index f65a333..401b14c 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/replication/StatusCombiner.java
@@ -64,9 +64,6 @@ public class StatusCombiner extends TypedValueCombiner<Status> {
}
}
- /**
- * Makes a copy of the subarray of {@code b}, then passes it through {@link Status#parseFrom(byte[])}
- */
@Override
protected Status decodeUnchecked(byte[] b, int offset, int len) throws ValueFormatException {
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
index 2dbb8e7..a766b30 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/rpc/TNonblockingServerSocket.java
@@ -95,6 +95,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
}
}
+ @Override
public void listen() throws TTransportException {
// Make sure not to block on accept
if (serverSocket_ != null) {
@@ -106,6 +107,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
}
}
+ @Override
protected TNonblockingSocket acceptImpl() throws TTransportException {
if (serverSocket_ == null) {
throw new TTransportException(TTransportException.NOT_OPEN, "No underlying server socket.");
@@ -124,6 +126,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
}
}
+ @Override
public void registerSelector(Selector selector) {
try {
// Register the server socket channel, indicating an interest in
@@ -135,6 +138,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
}
}
+ @Override
public void close() {
if (serverSocket_ != null) {
try {
@@ -146,6 +150,7 @@ public class TNonblockingServerSocket extends TNonblockingServerTransport {
}
}
+ @Override
public void interrupt() {
// The thread-safeness of this is dubious, but Java documentation suggests
// that it is safe to do this from a different thread context
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
index 092b92d..a3735a9 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/Authenticator.java
@@ -40,12 +40,18 @@ public interface Authenticator {
Set<String> listUsers() throws AccumuloSecurityException;
+ /**
+ * Creates a user with no initial permissions whatsoever
+ */
void createUser(String principal, AuthenticationToken token) throws AccumuloSecurityException;
void dropUser(String user) throws AccumuloSecurityException;
void changePassword(String principal, AuthenticationToken token) throws AccumuloSecurityException;
+ /**
+ * Checks if a user exists
+ */
boolean userExists(String user) throws AccumuloSecurityException;
Set<Class<? extends AuthenticationToken>> getSupportedTokenTypes();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
index 67f25a9..ca39f3b 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/security/handler/ZKAuthenticator.java
@@ -106,9 +106,6 @@ public final class ZKAuthenticator implements Authenticator {
return new TreeSet<String>(zooCache.getChildren(ZKUserPath));
}
- /**
- * Creates a user with no permissions whatsoever
- */
@Override
public void createUser(String principal, AuthenticationToken token) throws AccumuloSecurityException {
try {
@@ -174,9 +171,6 @@ public final class ZKAuthenticator implements Authenticator {
throw new AccumuloSecurityException(principal, SecurityErrorCode.USER_DOESNT_EXIST); // user doesn't exist
}
- /**
- * Checks if a user exists
- */
@Override
public boolean userExists(String user) {
return zooCache.get(ZKUserPath + "/" + user) != null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
index c2eac02..c1a318f 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/tablets/UniqueNameAllocator.java
@@ -51,6 +51,7 @@ public class UniqueNameAllocator {
try {
byte[] max = ZooReaderWriter.getInstance().mutate(nextNamePath, null, ZooUtil.PRIVATE, new ZooReaderWriter.Mutator() {
+ @Override
public byte[] mutate(byte[] currentValue) throws Exception {
long l = Long.parseLong(new String(currentValue, UTF_8), Character.MAX_RADIX);
l += allocate;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
index 18ca881..a9ecf47 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/ChangeSecret.java
@@ -92,6 +92,7 @@ public class ChangeSecret {
String root = ZooUtil.getRoot(inst);
final List<String> ephemerals = new ArrayList<String>();
recurse(zooReader, root, new Visitor() {
+ @Override
public void visit(ZooReader zoo, String path) throws Exception {
Stat stat = zoo.getStatus(path);
if (stat.getEphemeralOwner() != 0)
@@ -115,6 +116,7 @@ public class ChangeSecret {
final String newInstanceId = UUID.randomUUID().toString();
String root = ZooUtil.getRoot(inst);
recurse(orig, root, new Visitor() {
+ @Override
public void visit(ZooReader zoo, String path) throws Exception {
String newPath = path.replace(inst.getInstanceID(), newInstanceId);
byte[] data = zoo.getData(path, null);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
index 94a80d9..f1ba8dc 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/FileSystemMonitor.java
@@ -91,6 +91,7 @@ public class FileSystemMonitor {
checkMounts(procFile);
} catch (final Exception e) {
Halt.halt(-42, new Runnable() {
+ @Override
public void run() {
log.fatal("Exception while checking mount points, halting process", e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
index 5be9344..7f57687 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/Halt.java
@@ -25,8 +25,9 @@ public class Halt {
static private final Logger log = LoggerFactory.getLogger(Halt.class);
public static void halt(final String msg) {
- //ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
+ // ACCUMULO-3651 Changed level to error and added FATAL to message for slf4j compatibility
halt(0, new Runnable() {
+ @Override
public void run() {
log.error("FATAL {}", msg);
}
@@ -35,6 +36,7 @@ public class Halt {
public static void halt(final String msg, int status) {
halt(status, new Runnable() {
+ @Override
public void run() {
log.error("FATAL {}", msg);
}
@@ -45,6 +47,7 @@ public class Halt {
try {
// give ourselves a little time to try and do something
new Daemon() {
+ @Override
public void run() {
UtilWaitThread.sleep(100);
Runtime.getRuntime().halt(status);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java b/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
index 697a058..cbe021a 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/util/time/SimpleTimer.java
@@ -38,6 +38,7 @@ public class SimpleTimer {
private static final Logger log = LoggerFactory.getLogger(SimpleTimer.class);
private static class ExceptionHandler implements Thread.UncaughtExceptionHandler {
+ @Override
public void uncaughtException(Thread t, Throwable e) {
log.warn("SimpleTimer task failed", e);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/main/scripts/generate-protobuf.sh
----------------------------------------------------------------------
diff --git a/server/base/src/main/scripts/generate-protobuf.sh b/server/base/src/main/scripts/generate-protobuf.sh
index 3fc70a1..8bfb25a 100755
--- a/server/base/src/main/scripts/generate-protobuf.sh
+++ b/server/base/src/main/scripts/generate-protobuf.sh
@@ -32,7 +32,7 @@ fail() {
exit 1
}
-# Test to see if we have thrift installed
+# Test to see if we have protoc installed
VERSION=$(protoc --version 2>/dev/null | grep -F "${REQUIRED_PROTOC_VERSION}" | wc -l)
if [[ $VERSION -ne 1 ]] ; then
# Nope: bail
@@ -50,7 +50,7 @@ mkdir -p $BUILD_DIR
protoc ${PROTOC_ARGS} src/main/protobuf/*.proto || fail unable to generate Java protocol buffer classes
-# For all generated thrift code, suppress all warnings and add the LICENSE header
+# For all generated protobuf code, suppress all warnings and add the LICENSE header
s='@SuppressWarnings({"unused"})'
find $BUILD_DIR -name '*.java' -print0 | xargs -0 sed -i.orig -e 's/\(public final class \)/'"$s"' \1/'
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
index 58760a4..8fb24dc 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/time/BaseRelativeTimeTest.java
@@ -26,6 +26,7 @@ public class BaseRelativeTimeTest {
static class BogusTime implements ProvidesTime {
public long value = 0;
+ @Override
public long currentTime() {
return value;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java b/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
index 9bde842..4b83e5f 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/util/time/SimpleTimerTest.java
@@ -45,6 +45,7 @@ public class SimpleTimerTest {
canceled = false;
}
+ @Override
public void run() {
if (canceled) {
return;
@@ -60,6 +61,7 @@ public class SimpleTimerTest {
private static class Thrower implements Runnable {
boolean wasRun = false;
+ @Override
public void run() {
wasRun = true;
throw new IllegalStateException("You shall not pass");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
index 0148129..ddf559f 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ListType.java
@@ -66,6 +66,7 @@ public class ListType extends Basic {
if (null != entry.getValue()) {
entry.getValue().doAs(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
addRows(scanner, type, trace);
return null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
index 39609c3..4bf64fe 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/ShowTrace.java
@@ -86,9 +86,10 @@ public class ShowTrace extends Basic {
long start;
if (null != entry.getValue()) {
start = entry.getValue().doAs(new PrivilegedAction<Long>() {
- public Long run() {
- return addSpans(scanner, tree, Long.MAX_VALUE);
- }
+ @Override
+ public Long run() {
+ return addSpans(scanner, tree, Long.MAX_VALUE);
+ }
});
} else {
start = addSpans(scanner, tree, Long.MAX_VALUE);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
----------------------------------------------------------------------
diff --git a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
index c15bbe3..5c58375 100644
--- a/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
+++ b/server/monitor/src/main/java/org/apache/accumulo/monitor/servlets/trace/Summary.java
@@ -171,6 +171,7 @@ public class Summary extends Basic {
final Map<String,Stats> summary = new TreeMap<String,Stats>();
if (null != pair.getValue()) {
pair.getValue().doAs(new PrivilegedAction<Void>() {
+ @Override
public Void run() {
parseSpans(scanner, summary);
return null;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
----------------------------------------------------------------------
diff --git a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
index e389679..703670f 100644
--- a/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
+++ b/server/tracer/src/test/java/org/apache/accumulo/tracer/TracerTest.java
@@ -170,6 +170,7 @@ public class TracerTest {
args.processor(new Processor<Iface>(TraceWrap.service(new Service())));
final TServer tserver = new TThreadPoolServer(args);
Thread t = new Thread() {
+ @Override
public void run() {
tserver.serve();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
index 79a1176..68ccdf0 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/ConditionalMutationSet.java
@@ -38,6 +38,7 @@ public class ConditionalMutationSet {
}
static class DuplicateFilter implements DeferFilter {
+ @Override
public void defer(List<ServerConditionalMutation> scml, List<ServerConditionalMutation> okMutations, List<ServerConditionalMutation> deferred) {
okMutations.add(scml.get(0));
for (int i = 1; i < scml.size(); i++) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
index 443ffb2..88cc4ba 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/MemKey.java
@@ -41,6 +41,7 @@ class MemKey extends Key {
this.kvCount = mc;
}
+ @Override
public String toString() {
return super.toString() + " mc=" + kvCount;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
index ba3ea42..b97b88b 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/compaction/strategies/ConfigurableCompactionStrategy.java
@@ -76,6 +76,7 @@ public class ConfigurableCompactionStrategy extends CompactionStrategy {
private int minFiles = 1;
private WriteParameters writeParams = new WriteParameters();
+ @Override
public void init(Map<String,String> options) {
Set<Entry<String,String>> es = options.entrySet();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
index 64bc2cd..16fb9bc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/constraints/UnsatisfiableConstraint.java
@@ -32,10 +32,12 @@ public class UnsatisfiableConstraint implements Constraint {
this.vDesc = violationDescription;
}
+ @Override
public List<Short> check(Environment env, Mutation mutation) {
return violations;
}
+ @Override
public String getViolationDescription(short violationCode) {
return vDesc;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
index 0c93a86..fa35cd3 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/SplitReportMessage.java
@@ -46,6 +46,7 @@ public class SplitReportMessage implements MasterMessage {
extents.put(ne2, np2);
}
+ @Override
public void send(TCredentials credentials, String serverName, MasterClientService.Iface client) throws TException, ThriftSecurityException {
TabletSplit split = new TabletSplit();
split.oldTablet = old_extent.toThrift();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
index 25db744..d40e514 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/mastermessage/TabletStatusMessage.java
@@ -34,6 +34,7 @@ public class TabletStatusMessage implements MasterMessage {
this.status = status;
}
+ @Override
public void send(TCredentials auth, String serverName, Iface client) throws TException, ThriftSecurityException {
client.reportTabletStatus(Tracer.traceInfo(), auth, serverName, status, extent.toThrift());
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index 6152500..43bd9d9 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -2115,11 +2115,6 @@ public class Tablet implements TabletCommitter {
return majCStats;
}
- /**
- * Returns a KeyExtent object representing this tablet's key range.
- *
- * @return extent
- */
@Override
public KeyExtent getExtent() {
return extent;
@@ -2441,7 +2436,7 @@ public class Tablet implements TabletCommitter {
return currentLogs.size();
}
- /* don't release the lock if this method returns true for success; instead, the caller should clean up by calling finishUpdatingLogsUsed() */
+ // don't release the lock if this method returns true for success; instead, the caller should clean up by calling finishUpdatingLogsUsed()
@Override
public boolean beginUpdatingLogsUsed(InMemoryMap memTable, Collection<DfsLogger> more, boolean mincFinish) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
----------------------------------------------------------------------
diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
index 4bc05a6..3f1af82 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/TabletCommitter.java
@@ -44,6 +44,11 @@ public interface TabletCommitter {
TableConfiguration getTableConfiguration();
+ /**
+ * Returns a KeyExtent object representing this tablet's key range.
+ *
+ * @return extent
+ */
KeyExtent getExtent();
int getLogId();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java b/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
index 49e7163..d24c4e0 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/ShellCommandException.java
@@ -36,6 +36,7 @@ public class ShellCommandException extends Exception {
return this.description;
}
+ @Override
public String toString() {
return getDescription();
}
@@ -53,6 +54,7 @@ public class ShellCommandException extends Exception {
this.command = command;
}
+ @Override
public String getMessage() {
return code + (command != null ? " (" + command + ")" : "");
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/Token.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/Token.java b/shell/src/main/java/org/apache/accumulo/shell/Token.java
index cd25ada..a533aa1 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/Token.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/Token.java
@@ -131,6 +131,7 @@ public class Token {
}
}
+ @Override
public String toString() {
return this.command.toString();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
index 37cf644..964ec41 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
@@ -31,6 +31,7 @@ import org.apache.hadoop.io.Text;
public class AddSplitsCommand extends Command {
private Option optSplitsFile, base64Opt;
+ @Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
final String tableName = OptUtil.getTableOpt(cl, shellState);
final boolean decode = cl.hasOption(base64Opt.getOpt());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
index bc58a92..daca82c 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CloneTableCommand.java
@@ -79,6 +79,7 @@ public class CloneTableCommand extends Command {
return "clones a table";
}
+ @Override
public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
registerCompletionForTables(root, completionSet);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
index 131534f..e39d862 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/CompactCommand.java
@@ -53,6 +53,7 @@ public class CompactCommand extends TableOperation {
+ "concurrent user initiated compactions specify iterators or a compaction strategy, then all but one will fail to start.";
}
+ @Override
protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException {
// compact the tables
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
index 6abcdf0..7f5b740 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DebugCommand.java
@@ -28,6 +28,7 @@ import org.apache.accumulo.shell.Token;
import org.apache.commons.cli.CommandLine;
public class DebugCommand extends Command {
+ @Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
if (cl.getArgs().length == 1) {
if (cl.getArgs()[0].equalsIgnoreCase("on")) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
index c8ab6d8..3400680 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/DeleteManyCommand.java
@@ -34,6 +34,7 @@ import org.apache.commons.cli.Options;
public class DeleteManyCommand extends ScanCommand {
private Option forceOpt;
+ @Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
final String tableName = OptUtil.getTableOpt(cl, shellState);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
index 7bcc67d..9de3e50 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ExportTableCommand.java
@@ -68,6 +68,7 @@ public class ExportTableCommand extends Command {
return "exports a table";
}
+ @Override
public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
registerCompletionForTables(root, completionSet);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
index 88a023b..4c4bdca 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FlushCommand.java
@@ -37,6 +37,7 @@ public class FlushCommand extends TableOperation {
return "flushes a tables data that is currently in memory to disk";
}
+ @Override
protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
shellState.getConnector().tableOperations().flush(tableName, startRow, endRow, wait);
Shell.log.info("Flush of table " + tableName + (wait ? " completed." : " initiated..."));
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
index 931383b..fa4ea8a 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/FormatterCommand.java
@@ -53,6 +53,7 @@ public class FormatterCommand extends ShellPluginConfigurationCommand {
return options;
}
+ @Override
protected void setPlugin(final CommandLine cl, final Shell shellState, final String tableName, final String className) throws AccumuloException,
AccumuloSecurityException {
super.setPlugin(cl, shellState, tableName, className);
@@ -61,6 +62,7 @@ public class FormatterCommand extends ShellPluginConfigurationCommand {
}
}
+ @Override
protected void removePlugin(final CommandLine cl, final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException {
super.removePlugin(cl, shellState, tableName);
if (cl.hasOption(interpeterOption.getOpt())) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
index 6d0426a..5945cc3 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/HelpCommand.java
@@ -34,6 +34,7 @@ public class HelpCommand extends Command {
private Option disablePaginationOpt;
private Option noWrapOpt;
+ @Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws ShellCommandException, IOException {
int numColumns = shellState.getReader().getTerminal().getWidth();
if (cl.hasOption(noWrapOpt.getOpt())) {
@@ -99,10 +100,12 @@ public class HelpCommand extends Command {
return 0;
}
+ @Override
public String description() {
return "provides information about the available commands";
}
+ @Override
public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> special) {
registerCompletionForCommands(root, special);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
index d899d1d..70e1c10 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ListShellIterCommand.java
@@ -78,6 +78,7 @@ public class ListShellIterCommand extends Command {
return 0;
}
+ @Override
public String description() {
return "lists iterators profiles configured in shell";
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
index 71a0338..9839aa8 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MaxRowCommand.java
@@ -29,6 +29,7 @@ public class MaxRowCommand extends ScanCommand {
private static final Logger log = LoggerFactory.getLogger(MaxRowCommand.class);
+ @Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
final String tableName = OptUtil.getTableOpt(cl, shellState);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
index bd4843d..90fcace 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/MergeCommand.java
@@ -64,6 +64,7 @@ public class MergeCommand extends Command {
} else {
final boolean finalVerbose = verbose;
final Merge merge = new Merge() {
+ @Override
protected void message(String fmt, Object... args) {
if (finalVerbose) {
try {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
index a3b0105..a9a6e19 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/OfflineCommand.java
@@ -35,6 +35,7 @@ public class OfflineCommand extends TableOperation {
return "starts the process of taking table offline";
}
+ @Override
protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
if (tableName.equals(MetadataTable.NAME)) {
Shell.log.info(" You cannot take the " + MetadataTable.NAME + " offline.");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
index 7709798..3059b52 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/ScriptCommand.java
@@ -53,6 +53,7 @@ public class ScriptCommand extends Command {
protected Option list, engine, script, file, args, out, function, object;
private static final String DEFAULT_ENGINE = "rhino";
+ @Override
public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
boolean invoke = false;
@@ -172,10 +173,12 @@ public class ScriptCommand extends Command {
return 0;
}
+ @Override
public String description() {
return "execute JSR-223 scripts";
}
+ @Override
public int numArgs() {
return 0;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
index ec1bd42..86e44e7 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/commands/TraceCommand.java
@@ -34,6 +34,7 @@ import org.apache.hadoop.io.Text;
public class TraceCommand extends DebugCommand {
+ @Override
public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
if (cl.getArgs().length == 1) {
if (cl.getArgs()[0].equalsIgnoreCase("on")) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
----------------------------------------------------------------------
diff --git a/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java b/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
index d340ca2..c11aed5 100644
--- a/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
@@ -74,6 +74,7 @@ public class MockShell extends Shell {
instance = new MockInstance();
}
+ @Override
public int start() throws IOException {
String input;
if (isVerbose())
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
index 0f2cc36..4f2577c 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileObject.java
@@ -63,17 +63,11 @@ public class HdfsFileObject extends AbstractFileObject {
this.path = p;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#canRenameTo(org.apache.commons.vfs2.FileObject)
- */
@Override
public boolean canRenameTo(final FileObject newfile) {
throw new UnsupportedOperationException();
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doAttach()
- */
@Override
protected void doAttach() throws Exception {
try {
@@ -84,9 +78,6 @@ public class HdfsFileObject extends AbstractFileObject {
}
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetAttributes()
- */
@Override
protected Map<String,Object> doGetAttributes() throws Exception {
if (null == this.stat) {
@@ -104,25 +95,16 @@ public class HdfsFileObject extends AbstractFileObject {
}
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetContentSize()
- */
@Override
protected long doGetContentSize() throws Exception {
return stat.getLen();
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetInputStream()
- */
@Override
protected InputStream doGetInputStream() throws Exception {
return this.hdfs.open(this.path);
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetLastModifiedTime()
- */
@Override
protected long doGetLastModifiedTime() throws Exception {
if (null != this.stat) {
@@ -132,9 +114,6 @@ public class HdfsFileObject extends AbstractFileObject {
}
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetRandomAccessContent (org.apache.commons.vfs2.util.RandomAccessMode)
- */
@Override
protected RandomAccessContent doGetRandomAccessContent(final RandomAccessMode mode) throws Exception {
if (mode.equals(RandomAccessMode.READWRITE)) {
@@ -143,9 +122,6 @@ public class HdfsFileObject extends AbstractFileObject {
return new HdfsRandomAccessContent(this.path, this.hdfs);
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doGetType()
- */
@Override
protected FileType doGetType() throws Exception {
try {
@@ -163,41 +139,26 @@ public class HdfsFileObject extends AbstractFileObject {
}
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsHidden()
- */
@Override
protected boolean doIsHidden() throws Exception {
return false;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsReadable()
- */
@Override
protected boolean doIsReadable() throws Exception {
return true;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsSameFile(org.apache.commons.vfs2.FileObject)
- */
@Override
protected boolean doIsSameFile(final FileObject destFile) throws FileSystemException {
throw new UnsupportedOperationException();
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doIsWriteable()
- */
@Override
protected boolean doIsWriteable() throws Exception {
return false;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doListChildren()
- */
@Override
protected String[] doListChildren() throws Exception {
if (this.doGetType() != FileType.FOLDER) {
@@ -213,9 +174,6 @@ public class HdfsFileObject extends AbstractFileObject {
return children;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doListChildrenResolved()
- */
@Override
protected FileObject[] doListChildrenResolved() throws Exception {
if (this.doGetType() != FileType.FOLDER) {
@@ -230,33 +188,21 @@ public class HdfsFileObject extends AbstractFileObject {
return fo;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doRemoveAttribute(java.lang.String)
- */
@Override
protected void doRemoveAttribute(final String attrName) throws Exception {
throw new UnsupportedOperationException();
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doSetAttribute(java.lang.String, java.lang.Object)
- */
@Override
protected void doSetAttribute(final String attrName, final Object value) throws Exception {
throw new UnsupportedOperationException();
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#doSetLastModifiedTime(long)
- */
@Override
protected boolean doSetLastModifiedTime(final long modtime) throws Exception {
throw new UnsupportedOperationException();
}
- /**
- * @see java.lang.Object#equals(java.lang.Object)
- */
@Override
public boolean equals(final Object o) {
if (null == o) {
@@ -274,10 +220,6 @@ public class HdfsFileObject extends AbstractFileObject {
return false;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileObject#exists()
- * @return boolean true if file exists, false if not
- */
@Override
public boolean exists() throws FileSystemException {
try {
@@ -290,9 +232,6 @@ public class HdfsFileObject extends AbstractFileObject {
}
}
- /**
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
return this.path.getName().toString().hashCode();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
index 9ddfab5..4006feb 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileProvider.java
@@ -47,26 +47,16 @@ public class HdfsFileProvider extends AbstractOriginatingFileProvider {
this.setFileNameParser(HttpFileNameParser.getInstance());
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractOriginatingFileProvider#doCreateFileSystem(org.apache.commons.vfs2.FileName,
- * org.apache.commons.vfs2.FileSystemOptions)
- */
@Override
protected FileSystem doCreateFileSystem(final FileName rootName, final FileSystemOptions fileSystemOptions) throws FileSystemException {
return new HdfsFileSystem(rootName, fileSystemOptions);
}
- /**
- * @see org.apache.commons.vfs2.provider.FileProvider#getCapabilities()
- */
@Override
public Collection<Capability> getCapabilities() {
return CAPABILITIES;
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileProvider#getConfigBuilder()
- */
@Override
public FileSystemConfigBuilder getConfigBuilder() {
return HdfsFileSystemConfigBuilder.getInstance();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
----------------------------------------------------------------------
diff --git a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
index 7ad68f9..26aa5c1 100644
--- a/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
+++ b/start/src/main/java/org/apache/accumulo/start/classloader/vfs/providers/HdfsFileSystem.java
@@ -49,17 +49,11 @@ public class HdfsFileSystem extends AbstractFileSystem {
super(rootName, null, fileSystemOptions);
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileSystem#addCapabilities(java.util.Collection)
- */
@Override
protected void addCapabilities(final Collection<Capability> capabilities) {
capabilities.addAll(HdfsFileProvider.CAPABILITIES);
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileSystem#close()
- */
@Override
synchronized public void close() {
try {
@@ -72,17 +66,11 @@ public class HdfsFileSystem extends AbstractFileSystem {
super.close();
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileSystem#createFile(org.apache.commons.vfs2.provider.AbstractFileName)
- */
@Override
protected FileObject createFile(final AbstractFileName name) throws Exception {
throw new FileSystemException("Operation not supported");
}
- /**
- * @see org.apache.commons.vfs2.provider.AbstractFileSystem#resolveFile(org.apache.commons.vfs2.FileName)
- */
@Override
public FileObject resolveFile(final FileName name) throws FileSystemException {
[3/3] accumulo git commit: ACCUMULO-2129 Update javadocs for
overridden methods
Posted by ct...@apache.org.
ACCUMULO-2129 Update javadocs for overridden methods
* Add missing @Override annotations
* Remove trivial javadocs on overriding implementations
* Merge implementing javadoc with interface javadoc, when appropriate
* Added some additional checkstyle rules relating to @Override annotations
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/698368f2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/698368f2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/698368f2
Branch: refs/heads/master
Commit: 698368f2b7968fa06d077e9b39e013910882d621
Parents: 5ed504c
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Apr 6 21:03:05 2015 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Apr 6 21:03:05 2015 -0400
----------------------------------------------------------------------
.../accumulo/core/bloomfilter/Filter.java | 2 +
.../accumulo/core/client/BatchDeleter.java | 4 +-
.../accumulo/core/client/BatchScanner.java | 16 +-
.../accumulo/core/client/IteratorSetting.java | 8 +-
.../accumulo/core/client/ScannerBase.java | 20 +-
.../core/client/admin/TableOperations.java | 2 +-
.../client/impl/MultiTableBatchWriterImpl.java | 4 +-
.../accumulo/core/client/impl/ScannerImpl.java | 7 +-
.../core/client/impl/ScannerOptions.java | 16 --
.../core/client/impl/TableOperationsImpl.java | 218 -------------------
.../client/impl/TabletServerBatchReader.java | 4 +-
.../core/client/impl/TimeoutTabletLocator.java | 4 -
.../core/client/lexicoder/AbstractEncoder.java | 24 +-
.../core/client/lexicoder/BytesLexicoder.java | 7 +-
.../core/client/lexicoder/ListLexicoder.java | 12 +-
.../core/client/lexicoder/UUIDLexicoder.java | 10 +-
.../core/client/mapred/AbstractInputFormat.java | 6 +-
.../client/mapred/AccumuloOutputFormat.java | 6 +-
.../client/mapreduce/AbstractInputFormat.java | 7 +-
.../client/mapreduce/AccumuloOutputFormat.java | 6 +-
.../core/client/mapreduce/InputFormatBase.java | 9 -
.../core/client/mapreduce/InputTableConfig.java | 12 -
.../client/security/tokens/DelegationToken.java | 4 +-
.../client/security/tokens/PasswordToken.java | 6 +-
.../core/conf/AccumuloConfiguration.java | 5 +-
.../accumulo/core/data/ArrayByteSequence.java | 1 +
.../apache/accumulo/core/data/ByteSequence.java | 9 +-
.../org/apache/accumulo/core/data/Column.java | 7 +-
.../accumulo/core/data/ComparableBytes.java | 1 +
.../java/org/apache/accumulo/core/data/Key.java | 13 --
.../apache/accumulo/core/data/KeyExtent.java | 12 -
.../file/blockfile/cache/CachedBlockQueue.java | 1 +
.../file/blockfile/cache/LruBlockCache.java | 6 -
.../file/blockfile/impl/CachableBlockFile.java | 9 +-
.../core/file/rfile/bcfile/CompareUtils.java | 1 +
.../core/file/rfile/bcfile/Compression.java | 1 +
.../accumulo/core/file/rfile/bcfile/Utils.java | 6 -
.../accumulo/core/iterators/DebugIterator.java | 1 +
.../core/iterators/SortedKeyValueIterator.java | 3 +-
.../core/iterators/TypedValueCombiner.java | 2 +-
.../iterators/aggregation/LongSummation.java | 4 +-
.../aggregation/NumArraySummation.java | 3 +
.../iterators/aggregation/NumSummation.java | 3 +
.../core/iterators/aggregation/StringMax.java | 3 +
.../core/iterators/aggregation/StringMin.java | 3 +
.../iterators/aggregation/StringSummation.java | 3 +
.../core/iterators/conf/ColumnUtil.java | 4 +
.../iterators/system/ColumnQualifierFilter.java | 1 +
.../core/iterators/system/CountingIterator.java | 1 +
.../core/iterators/system/DeletingIterator.java | 1 +
.../core/iterators/system/MultiIterator.java | 1 +
.../iterators/system/SequenceFileIterator.java | 6 +
.../iterators/user/RowEncodingIterator.java | 3 -
.../security/crypto/BlockedInputStream.java | 2 +
.../crypto/DiscardCloseOutputStream.java | 1 +
.../core/tabletserver/log/LogEntry.java | 1 +
.../accumulo/core/util/NamingThreadFactory.java | 1 +
.../org/apache/accumulo/core/util/Stat.java | 1 +
.../core/util/format/BinaryFormatter.java | 1 +
.../accumulo/core/client/TestThrift1474.java | 1 +
.../client/lexicoder/ListLexicoderTest.java | 10 +-
.../core/iterators/IteratorUtilTest.java | 9 +
.../core/iterators/user/FilterTest.java | 2 +
.../simple/filedata/ChunkInputStream.java | 2 +-
.../examples/simple/shell/DebugCommand.java | 3 +
.../simple/shell/MyAppShellExtension.java | 1 +
.../java/org/apache/accumulo/fate/TStore.java | 7 -
.../java/org/apache/accumulo/fate/ZooStore.java | 1 +
.../accumulo/fate/util/LoggingRunnable.java | 2 +-
.../fate/zookeeper/IZooReaderWriter.java | 1 +
.../apache/accumulo/fate/zookeeper/ZooLock.java | 1 +
.../fate/zookeeper/ZooReaderWriter.java | 5 -
.../apache/accumulo/fate/AgeOffStoreTest.java | 1 +
.../impl/MiniAccumuloClusterImpl.java | 10 +-
pom.xml | 2 +
.../server/conf/NamespaceConfiguration.java | 3 -
.../server/conf/TableConfiguration.java | 3 -
.../server/data/ServerColumnUpdate.java | 1 +
.../org/apache/accumulo/server/fs/FileRef.java | 1 +
.../master/balancer/ChaoticLoadBalancer.java | 6 +-
.../master/state/TabletLocationState.java | 1 +
.../server/master/state/TabletMigration.java | 1 +
.../server/replication/StatusCombiner.java | 3 -
.../server/rpc/TNonblockingServerSocket.java | 5 +
.../server/security/handler/Authenticator.java | 6 +
.../security/handler/ZKAuthenticator.java | 6 -
.../server/tablets/UniqueNameAllocator.java | 1 +
.../accumulo/server/util/ChangeSecret.java | 2 +
.../accumulo/server/util/FileSystemMonitor.java | 1 +
.../org/apache/accumulo/server/util/Halt.java | 5 +-
.../accumulo/server/util/time/SimpleTimer.java | 1 +
.../base/src/main/scripts/generate-protobuf.sh | 4 +-
.../server/util/time/BaseRelativeTimeTest.java | 1 +
.../server/util/time/SimpleTimerTest.java | 2 +
.../monitor/servlets/trace/ListType.java | 1 +
.../monitor/servlets/trace/ShowTrace.java | 7 +-
.../monitor/servlets/trace/Summary.java | 1 +
.../org/apache/accumulo/tracer/TracerTest.java | 1 +
.../tserver/ConditionalMutationSet.java | 1 +
.../org/apache/accumulo/tserver/MemKey.java | 1 +
.../ConfigurableCompactionStrategy.java | 1 +
.../constraints/UnsatisfiableConstraint.java | 2 +
.../mastermessage/SplitReportMessage.java | 1 +
.../mastermessage/TabletStatusMessage.java | 1 +
.../apache/accumulo/tserver/tablet/Tablet.java | 7 +-
.../tserver/tablet/TabletCommitter.java | 5 +
.../accumulo/shell/ShellCommandException.java | 2 +
.../java/org/apache/accumulo/shell/Token.java | 1 +
.../shell/commands/AddSplitsCommand.java | 1 +
.../shell/commands/CloneTableCommand.java | 1 +
.../accumulo/shell/commands/CompactCommand.java | 1 +
.../accumulo/shell/commands/DebugCommand.java | 1 +
.../shell/commands/DeleteManyCommand.java | 1 +
.../shell/commands/ExportTableCommand.java | 1 +
.../accumulo/shell/commands/FlushCommand.java | 1 +
.../shell/commands/FormatterCommand.java | 2 +
.../accumulo/shell/commands/HelpCommand.java | 3 +
.../shell/commands/ListShellIterCommand.java | 1 +
.../accumulo/shell/commands/MaxRowCommand.java | 1 +
.../accumulo/shell/commands/MergeCommand.java | 1 +
.../accumulo/shell/commands/OfflineCommand.java | 1 +
.../accumulo/shell/commands/ScriptCommand.java | 3 +
.../accumulo/shell/commands/TraceCommand.java | 1 +
.../apache/accumulo/shell/mock/MockShell.java | 1 +
.../vfs/providers/HdfsFileObject.java | 61 ------
.../vfs/providers/HdfsFileProvider.java | 10 -
.../vfs/providers/HdfsFileSystem.java | 12 -
.../vfs/providers/HdfsRandomAccessContent.java | 102 ---------
.../vfs/providers/VfsClassLoaderTest.java | 3 +
.../accumulo/test/EstimateInMemMapOverhead.java | 24 ++
.../accumulo/test/FaultyConditionalWriter.java | 2 +
.../accumulo/test/functional/DropModIter.java | 1 +
.../test/randomwalk/concurrent/Config.java | 5 +-
.../test/randomwalk/conditional/Transfer.java | 1 +
.../test/stress/random/RandomByteArrays.java | 1 +
.../accumulo/test/stress/random/Scan.java | 2 +
.../apache/accumulo/test/MetaGetsReadersIT.java | 1 +
.../accumulo/test/TabletServerGivesUpIT.java | 1 +
.../apache/accumulo/trace/instrument/Span.java | 7 +
139 files changed, 290 insertions(+), 642 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java b/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
index 12961a9..27eab69 100644
--- a/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
+++ b/core/src/main/java/org/apache/accumulo/core/bloomfilter/Filter.java
@@ -211,6 +211,7 @@ public abstract class Filter implements Writable {
// Writable interface
+ @Override
public void write(final DataOutput out) throws IOException {
out.writeInt(VERSION);
out.writeInt(this.nbHash);
@@ -226,6 +227,7 @@ public abstract class Filter implements Writable {
return VERSION;
}
+ @Override
public void readFields(final DataInput in) throws IOException {
final int ver = in.readInt();
rVersion = ver;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java b/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
index 54d49d1..0e3856e 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/BatchDeleter.java
@@ -44,8 +44,6 @@ public interface BatchDeleter extends ScannerBase {
*/
void setRanges(Collection<Range> ranges);
- /**
- * Releases any resources.
- */
+ @Override
void close();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/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 39f96f5..8be6acf 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
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.data.Range;
* If you want to lookup a few ranges and expect those ranges to contain a lot of data, then use the Scanner instead. Also, the Scanner will return data in
* sorted order, this will not.
*/
-
public interface BatchScanner extends ScannerBase {
/**
@@ -41,22 +40,15 @@ public interface BatchScanner extends ScannerBase {
*/
void setRanges(Collection<Range> ranges);
- /**
- * Cleans up and finalizes the scanner
- */
+ @Override
void close();
/**
- * Sets a timeout threshold for a server to respond. The batch scanner will accomplish as much work as possible before throwing an exception. BatchScanner
- * iterators will throw a {@link TimedOutException} when all needed servers timeout. Setting the timeout to zero or Long.MAX_VALUE and TimeUnit.MILLISECONDS
- * means no timeout.
+ * {@inheritDoc}
*
* <p>
- * If not set, there is not timeout. The BatchScanner will retry forever.
- *
- * @param timeUnit
- * determines how timeout is interpreted
- * @since 1.5.0
+ * The batch scanner will accomplish as much work as possible before throwing an exception. BatchScanner iterators will throw a {@link TimedOutException} when
+ * all needed servers timeout.
*/
@Override
void setTimeout(long timeout, TimeUnit timeUnit);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
index baf9860..e7bbbdf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
@@ -279,9 +279,6 @@ public class IteratorSetting implements Writable {
properties.clear();
}
- /**
- * @see java.lang.Object#hashCode()
- */
@Override
public int hashCode() {
final int prime = 31;
@@ -322,9 +319,6 @@ public class IteratorSetting implements Writable {
return true;
}
- /**
- * @see java.lang.Object#toString()
- */
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
@@ -372,6 +366,7 @@ public class IteratorSetting implements Writable {
/**
* @since 1.5.0
+ * @see Writable
*/
@Override
public void readFields(DataInput din) throws IOException {
@@ -388,6 +383,7 @@ public class IteratorSetting implements Writable {
/**
* @since 1.5.0
+ * @see Writable
*/
@Override
public void write(DataOutput dout) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index e49a502..667f423 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@ -65,7 +65,10 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>> {
/**
* Adds a column family to the list of columns that will be fetched by this scanner. By default when no columns have been added the scanner fetches all
- * columns.
+ * columns. To fetch multiple column families call this function multiple times.
+ *
+ * <p>
+ * This can help limit which locality groups are read on the server side.
*
* @param col
* the column family to be fetched
@@ -97,19 +100,24 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>> {
* Returns an iterator over an accumulo table. This iterator uses the options that are currently set for its lifetime, so setting options will have no effect
* on existing iterators.
*
+ * <p>
* Keys returned by the iterator are not guaranteed to be in sorted order.
*
* @return an iterator over Key,Value pairs which meet the restrictions set on the scanner
*/
+ @Override
Iterator<Entry<Key,Value>> iterator();
/**
- * This setting determines how long a scanner will automatically retry when a failure occurs. By default a scanner will retry forever.
+ * This setting determines how long a scanner will automatically retry when a failure occurs. By default, a scanner will retry forever.
*
- * Setting to zero or Long.MAX_VALUE and TimeUnit.MILLISECONDS means to retry forever.
+ * <p>
+ * Setting the timeout to zero (with any time unit) or {@link Long#MAX_VALUE} (with {@link TimeUnit#MILLISECONDS}) means no timeout.
*
+ * @param timeOut
+ * the length of the timeout
* @param timeUnit
- * determines how timeout is interpreted
+ * the units of the timeout
* @since 1.5.0
*/
void setTimeout(long timeOut, TimeUnit timeUnit);
@@ -131,9 +139,9 @@ public interface ScannerBase extends Iterable<Entry<Key,Value>> {
/**
* Returns the authorizations that have been set on the scanner
+ *
* @since 1.7.0
- * @return
- * The authorizations set on the scanner instance
+ * @return The authorizations set on the scanner instance
*/
Authorizations getAuthorizations();
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/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 41021b1..d4d5fd3 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
@@ -409,7 +409,7 @@ public interface TableOperations {
* @throws AccumuloSecurityException
* if the user does not have permission
*
- * @deprecated As of release 1.4, replaced by {@link #flush(String, Text, Text, boolean)}
+ * @deprecated since 1.4; use {@link #flush(String, Text, Text, boolean)} instead
*/
@Deprecated
void flush(String tableName) throws AccumuloException, AccumuloSecurityException;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
index 824c3ee..5d13eda 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/MultiTableBatchWriterImpl.java
@@ -138,9 +138,7 @@ public class MultiTableBatchWriterImpl implements MultiTableBatchWriter {
bw.close();
}
- /**
- * Warning: do not rely upon finalize to close this class. Finalize is not guaranteed to be called.
- */
+ // WARNING: do not rely upon finalize to close this class. Finalize is not guaranteed to be called.
@Override
protected void finalize() {
if (!closed.get()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
index 6084024..09edc4a 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerImpl.java
@@ -91,16 +91,13 @@ public class ScannerImpl extends ScannerOptions implements Scanner {
return size;
}
- /**
- * Returns an iterator over an accumulo table. This iterator uses the options that are currently set on the scanner for its lifetime. So setting options on a
- * Scanner object will have no effect on existing iterators.
- */
@Override
public synchronized Iterator<Entry<Key,Value>> iterator() {
return new ScannerIterator(context, table, authorizations, range, size, getTimeOut(), this, isolated, readaheadThreshold);
}
- @Override public Authorizations getAuthorizations() {
+ @Override
+ public Authorizations getAuthorizations() {
return authorizations;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
index 5b6d9ac..f4a6176 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/ScannerOptions.java
@@ -57,10 +57,6 @@ public class ScannerOptions implements ScannerBase {
setOptions(this, so);
}
- /**
- * Adds server-side scan iterators.
- *
- */
@Override
public synchronized void addScanIterator(IteratorSetting si) {
checkArgument(si != null, "si is null");
@@ -105,9 +101,6 @@ public class ScannerOptions implements ScannerBase {
serverSideIteratorOptions.remove(iteratorName);
}
- /**
- * Override any existing options on the given named iterator
- */
@Override
public synchronized void updateScanIteratorOption(String iteratorName, String key, String value) {
checkArgument(iteratorName != null, "iteratorName is null");
@@ -125,12 +118,6 @@ public class ScannerOptions implements ScannerBase {
opts.put(key, value);
}
- /**
- * Limit a scan to the specified column family. This can limit which locality groups are read on the server side.
- *
- * To fetch multiple column families call this function multiple times.
- */
-
@Override
public synchronized void fetchColumnFamily(Text col) {
checkArgument(col != null, "col is null");
@@ -160,9 +147,6 @@ public class ScannerOptions implements ScannerBase {
return fetchedColumns;
}
- /**
- * Clears scan iterators prior to returning a scanner to the pool.
- */
@Override
public synchronized void clearScanIterators() {
serverSideIteratorList = Collections.emptyList();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
index cb35cd2..b1cc9c6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TableOperationsImpl.java
@@ -131,11 +131,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
this.context = context;
}
- /**
- * Retrieve a list of tables in Accumulo.
- *
- * @return List of tables in accumulo
- */
@Override
public SortedSet<String> list() {
OpTimer opTimer = new OpTimer(log, Level.TRACE).start("Fetching list of tables...");
@@ -144,13 +139,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
return tableNames;
}
- /**
- * A method to check if a table exists in Accumulo.
- *
- * @param tableName
- * the name of the table
- * @return true if the table exists
- */
@Override
public boolean exists(String tableName) {
checkArgument(tableName != null, "tableName is null");
@@ -163,43 +151,17 @@ public class TableOperationsImpl extends TableOperationsHelper {
return exists;
}
- /**
- * Create a table with no special configuration
- *
- * @param tableName
- * the name of the table
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- * @throws TableExistsException
- * if the table already exists
- */
@Override
public void create(String tableName) throws AccumuloException, AccumuloSecurityException, TableExistsException {
create(tableName, new NewTableConfiguration());
}
- /**
- * @param tableName
- * the name of the table
- * @param limitVersion
- * Enables/disables the versioning iterator, which will limit the number of Key versions kept.
- */
@Override
@Deprecated
public void create(String tableName, boolean limitVersion) throws AccumuloException, AccumuloSecurityException, TableExistsException {
create(tableName, limitVersion, TimeType.MILLIS);
}
- /**
- * @param tableName
- * the name of the table
- * @param timeType
- * specifies logical or real-time based time recording for entries in the table
- * @param limitVersion
- * Enables/disables the versioning iterator, which will limit the number of Key versions kept.
- */
@Override
@Deprecated
public void create(String tableName, boolean limitVersion, TimeType timeType) throws AccumuloException, AccumuloSecurityException, TableExistsException {
@@ -214,14 +176,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
create(tableName, ntc.withoutDefaultIterators());
}
- /**
- * @param tableName
- * the name of the table
- * @param ntc
- * specifies the new table's configuration. It determines whether the versioning iterator is enabled or disabled, logical or real-time based time
- * recording for entries in the table
- *
- */
@Override
public void create(String tableName, NewTableConfiguration ntc) throws AccumuloException, AccumuloSecurityException, TableExistsException {
checkArgument(tableName != null, "tableName is null");
@@ -417,18 +371,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
- /**
- * @param tableName
- * the name of the table
- * @param partitionKeys
- * a sorted set of row key values to pre-split the table on
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- * @throws TableNotFoundException
- * if the table does not exist
- */
@Override
public void addSplits(String tableName, SortedSet<Text> partitionKeys) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
String tableId = Tables.getTableId(context.getInstance(), tableName);
@@ -576,11 +518,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * @param tableName
- * the name of the table
- * @return the split points (end-row names) for the table's current split profile
- */
@Override
public Collection<Text> listSplits(String tableName) throws TableNotFoundException, AccumuloSecurityException {
@@ -631,13 +568,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * @param tableName
- * the name of the table
- * @param maxSplits
- * specifies the maximum number of splits to return
- * @return the split points (end-row names) for the table's current split profile, grouped into fewer splits so as not to exceed maxSplits
- */
@Override
public Collection<Text> listSplits(String tableName, int maxSplits) throws TableNotFoundException, AccumuloSecurityException {
Collection<Text> endRows = listSplits(tableName);
@@ -673,18 +603,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * Delete a table
- *
- * @param tableName
- * the name of the table
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- * @throws TableNotFoundException
- * if the table does not exist
- */
@Override
public void delete(String tableName) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
checkArgument(tableName != null, "tableName is null");
@@ -734,22 +652,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
doTableFateOperation(newTableName, AccumuloException.class, FateOperation.TABLE_CLONE, args, opts);
}
- /**
- * Rename a table
- *
- * @param oldTableName
- * the old table name
- * @param newTableName
- * the new table name
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- * @throws TableNotFoundException
- * if the old table name does not exist
- * @throws TableExistsException
- * if the new table name already exists
- */
@Override
public void rename(String oldTableName, String newTableName) throws AccumuloSecurityException, TableNotFoundException, AccumuloException,
TableExistsException {
@@ -759,9 +661,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
doTableFateOperation(oldTableName, TableNotFoundException.class, FateOperation.TABLE_RENAME, args, opts);
}
- /**
- * @deprecated since 1.4 {@link #flush(String, Text, Text, boolean)}
- */
@Override
@Deprecated
public void flush(String tableName) throws AccumuloException, AccumuloSecurityException {
@@ -772,16 +671,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * Flush a table
- *
- * @param tableName
- * the name of the table
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- */
@Override
public void flush(String tableName, Text start, Text end, boolean wait) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
checkArgument(tableName != null, "tableName is null");
@@ -922,20 +811,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * Sets a property on a table
- *
- * @param tableName
- * the name of the table
- * @param property
- * the name of a per-table property
- * @param value
- * the value to set a per-table property to
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- */
@Override
public void setProperty(final String tableName, final String property, final String value) throws AccumuloException, AccumuloSecurityException {
checkArgument(tableName != null, "tableName is null");
@@ -953,18 +828,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * Removes a property from a table
- *
- * @param tableName
- * the name of the table
- * @param property
- * the name of a per-table property
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- */
@Override
public void removeProperty(final String tableName, final String property) throws AccumuloException, AccumuloSecurityException {
checkArgument(tableName != null, "tableName is null");
@@ -981,15 +844,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- * Gets properties of a table
- *
- * @param tableName
- * the name of the table
- * @return all properties visible by this table (system and per-table properties)
- * @throws TableNotFoundException
- * if the table does not exist
- */
@Override
public Iterable<Entry<String,String>> getProperties(final String tableName) throws AccumuloException, TableNotFoundException {
checkArgument(tableName != null, "tableName is null");
@@ -1017,20 +871,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
- /**
- * Sets a tables locality groups. A tables locality groups can be changed at any time.
- *
- * @param tableName
- * the name of the table
- * @param groups
- * mapping of locality group names to column families in the locality group
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- * @throws TableNotFoundException
- * if the table does not exist
- */
@Override
public void setLocalityGroups(String tableName, Map<String,Set<Text>> groups) throws AccumuloException, AccumuloSecurityException, TableNotFoundException {
// ensure locality groups do not overlap
@@ -1075,18 +915,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
}
}
- /**
- *
- * Gets the locality groups currently set for a table.
- *
- * @param tableName
- * the name of the table
- * @return mapping of locality group names to column families in the locality group
- * @throws AccumuloException
- * if a general error occurs
- * @throws TableNotFoundException
- * if the table does not exist
- */
@Override
public Map<String,Set<Text>> getLocalityGroups(String tableName) throws AccumuloException, TableNotFoundException {
AccumuloConfiguration conf = new ConfigurationCopy(this.getProperties(tableName));
@@ -1107,21 +935,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
return groups2;
}
- /**
- * @param tableName
- * the name of the table
- * @param range
- * a range to split
- * @param maxSplits
- * the maximum number of splits
- * @return the range, split into smaller ranges that fall on boundaries of the table's split points as evenly as possible
- * @throws AccumuloException
- * if a general error occurs
- * @throws AccumuloSecurityException
- * if the user does not have permission
- * @throws TableNotFoundException
- * if the table does not exist
- */
@Override
public Set<Range> splitRangeByTablets(String tableName, Range range, int maxSplits) throws AccumuloException, AccumuloSecurityException,
TableNotFoundException {
@@ -1370,15 +1183,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
offline(tableName, false);
}
- /**
- *
- * @param tableName
- * the table to take offline
- * @throws AccumuloException
- * when there is a general accumulo error
- * @throws AccumuloSecurityException
- * when the user does not have the proper permissions
- */
@Override
public void offline(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
@@ -1403,15 +1207,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
online(tableName, false);
}
- /**
- *
- * @param tableName
- * the table to take online
- * @throws AccumuloException
- * when there is a general accumulo error
- * @throws AccumuloSecurityException
- * when the user does not have the proper permissions
- */
@Override
public void online(String tableName, boolean wait) throws AccumuloSecurityException, AccumuloException, TableNotFoundException {
checkArgument(tableName != null, "tableName is null");
@@ -1430,14 +1225,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
waitForTableStateTransition(tableId, TableState.ONLINE);
}
- /**
- * Clears the tablet locator cache for a specified table
- *
- * @param tableName
- * the name of the table
- * @throws TableNotFoundException
- * if table does not exist
- */
@Override
public void clearLocatorCache(String tableName) throws TableNotFoundException {
checkArgument(tableName != null, "tableName is null");
@@ -1445,11 +1232,6 @@ public class TableOperationsImpl extends TableOperationsHelper {
tabLocator.invalidateCache();
}
- /**
- * Get a mapping of table name to internal table id.
- *
- * @return the map from table name to internal table id
- */
@Override
public Map<String,String> tableIdMap() {
return Tables.getNameToIdMap(context.getInstance());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
index ad50013..6d09936 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchReader.java
@@ -79,9 +79,7 @@ public class TabletServerBatchReader extends ScannerOptions implements BatchScan
return authorizations;
}
- /**
- * Warning: do not rely upon finalize to close this class. Finalize is not guaranteed to be called.
- */
+ // WARNING: do not rely upon finalize to close this class. Finalize is not guaranteed to be called.
@Override
protected void finalize() {
if (!queryThreadPool.isShutdown()) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java b/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
index 8a6777d..81c1ccc 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TimeoutTabletLocator.java
@@ -92,10 +92,6 @@ public class TimeoutTabletLocator extends TabletLocator {
}
}
- /**
- *
- */
-
@Override
public List<Range> binRanges(ClientContext context, List<Range> ranges, Map<String,Map<KeyExtent,List<Range>>> binnedRanges) throws AccumuloException,
AccumuloSecurityException, TableNotFoundException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
index b266e53..6ba7e02 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/AbstractEncoder.java
@@ -16,13 +16,14 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import com.google.common.base.Preconditions;
import org.apache.accumulo.core.iterators.ValueFormatException;
+import com.google.common.base.Preconditions;
+
/**
- * AbstractEncoder is an {@link org.apache.accumulo.core.client.lexicoder.Encoder} that implements all of Encoder's
- * methods validating the input, but has those methods defer logic to to a new method,
- * {@link #decodeUnchecked(byte[], int, int)}.
+ * AbstractEncoder is an {@link org.apache.accumulo.core.client.lexicoder.Encoder} that implements all of Encoder's methods validating the input, but has those
+ * methods defer logic to to a new method, {@link #decodeUnchecked(byte[], int, int)}.
+ *
* @since 1.7.0
*/
public abstract class AbstractEncoder<T> implements Encoder<T> {
@@ -32,9 +33,6 @@ public abstract class AbstractEncoder<T> implements Encoder<T> {
*/
protected abstract T decodeUnchecked(byte[] b, int offset, int len) throws ValueFormatException;
- /**
- * Calls {@link #decodeUnchecked(byte[], int, int)} as {@code decodeUnchecked(b, 0, b.length);}.
- */
@Override
public T decode(byte[] b) {
Preconditions.checkNotNull(b, "cannot decode null byte array");
@@ -42,18 +40,18 @@ public abstract class AbstractEncoder<T> implements Encoder<T> {
}
/**
- * Checks if the byte array is null, or if parameters exceed the bounds of the byte array,
- * then calls {@link #decodeUnchecked(byte[], int, int)}.
+ * Checks if the byte array is null, or if parameters exceed the bounds of the byte array, then calls {@link #decodeUnchecked(byte[], int, int)}.
*
- * @throws java.lang.NullPointerException if {@code b} is null
- * @throws java.lang.IllegalArgumentException if {@code offset + len} exceeds the length of {@code b}
+ * @throws java.lang.NullPointerException
+ * if {@code b} is null
+ * @throws java.lang.IllegalArgumentException
+ * if {@code offset + len} exceeds the length of {@code b}
*/
public T decode(byte[] b, int offset, int len) {
Preconditions.checkNotNull(b, "cannot decode null byte array");
Preconditions.checkArgument(offset >= 0, "offset %s cannot be negative", offset);
Preconditions.checkArgument(len >= 0, "length %s cannot be negative", len);
- Preconditions.checkArgument(offset + len < b.length, "offset + length %s exceeds byte array length %s",
- (offset + len), b.length);
+ Preconditions.checkArgument(offset + len < b.length, "offset + length %s exceeds byte array length %s", (offset + len), b.length);
return decodeUnchecked(b, offset, len);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
index 8e0f5e2..ae4dfbd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/BytesLexicoder.java
@@ -33,13 +33,14 @@ public class BytesLexicoder extends AbstractLexicoder<byte[]> implements Lexicod
@Override
public byte[] decode(byte[] data) {
- // overrides AbstractLexicoder since this simply returns the array
+ // overrides AbstractLexicoder since this simply returns the array; this is more flexible than the superclass behavior, since it can return null
return data;
}
/**
- * If offset == 0 and len == data.length, returns data. Otherwise, returns a new
- * byte array with contents starting at data[offset] with length len.
+ * If offset == 0 and len == data.length, returns data. Otherwise, returns a new byte array with contents starting at data[offset] with length len.
+ *
+ * {@inheritDoc}
*/
@Override
protected byte[] decodeUnchecked(byte[] data, int offset, int len) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
index a92f4c6..3c20401 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/ListLexicoder.java
@@ -16,16 +16,16 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-
-import java.util.ArrayList;
-import java.util.List;
-
import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.concat;
import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.escape;
import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.split;
import static org.apache.accumulo.core.client.lexicoder.impl.ByteUtils.unescape;
+import java.util.ArrayList;
+import java.util.List;
+
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+
/**
* A lexicoder to encode/decode a Java List to/from a byte array where the concatenation of each encoded element sorts lexicographically.
*
@@ -40,6 +40,8 @@ public class ListLexicoder<LT> extends AbstractLexicoder<List<LT>> implements Le
}
/**
+ * {@inheritDoc}
+ *
* @return a byte array containing the concatenation of each element in the list encoded.
*/
@Override
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
index 98ee467..e8e2c06 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/lexicoder/UUIDLexicoder.java
@@ -16,16 +16,16 @@
*/
package org.apache.accumulo.core.client.lexicoder;
-import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
-import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
-import org.apache.accumulo.core.iterators.ValueFormatException;
-
import java.io.ByteArrayInputStream;
import java.io.DataInputStream;
import java.io.DataOutputStream;
import java.io.IOException;
import java.util.UUID;
+import org.apache.accumulo.core.client.lexicoder.impl.AbstractLexicoder;
+import org.apache.accumulo.core.client.lexicoder.impl.FixedByteArrayOutputStream;
+import org.apache.accumulo.core.iterators.ValueFormatException;
+
/**
* A lexicoder for a UUID that maintains its lexicographic sorting order.
*
@@ -34,6 +34,8 @@ import java.util.UUID;
public class UUIDLexicoder extends AbstractLexicoder<UUID> implements Lexicoder<UUID> {
/**
+ * {@inheritDoc}
+ *
* @see <a href="http://www.ietf.org/rfc/rfc4122.txt"> RFC 4122: A Universally Unique IDentifier (UUID) URN Namespace, "Rules for Lexical Equivalence" in
* Section 3.</a>
*/
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
index 7d43e0c..1071683 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AbstractInputFormat.java
@@ -532,7 +532,11 @@ public abstract class AbstractInputFormat<K,V> implements InputFormat<K,V> {
}
/**
- * Read the metadata table to get tablets and match up ranges to them.
+ * Gets the splits of the tables that have been set on the job by reading the metadata table for the specified ranges.
+ *
+ * @return the splits from the tables based on the ranges.
+ * @throws java.io.IOException
+ * if a table set on the job doesn't exist or an error occurs initializing the tablet locator
*/
@Override
public InputSplit[] getSplits(JobConf job, int numSplits) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
index 8631a2c..8bcf2a9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapred/AccumuloOutputFormat.java
@@ -40,9 +40,9 @@ import org.apache.accumulo.core.client.mapreduce.lib.impl.OutputConfigurator;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.SecurityErrorCode;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.client.security.tokens.DelegationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
@@ -436,8 +436,8 @@ public class AccumuloOutputFormat implements OutputFormat<Text,Mutation> {
}
/**
- * Push a mutation into a table. If table is null, the defaultTable will be used. If canCreateTable is set, the table will be created if it does not exist.
- * The table name must only contain alphanumerics and underscore.
+ * Push a mutation into a table. If table is null, the defaultTable will be used. If {@link AccumuloOutputFormat#canCreateTables(JobConf)} is set, the table
+ * will be created if it does not exist. The table name must only contain alphanumerics and underscore.
*/
@Override
public void write(Text table, Mutation mutation) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
index bf18e4e..300e92b 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AbstractInputFormat.java
@@ -428,9 +428,6 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
*/
protected abstract void setupIterators(TaskAttemptContext context, Scanner scanner, String tableName, RangeInputSplit split);
- /**
- * Initialize a scanner over the given input split using this task attempt configuration.
- */
@Override
public void initialize(InputSplit inSplit, TaskAttemptContext attempt) throws IOException {
@@ -575,10 +572,8 @@ public abstract class AbstractInputFormat<K,V> extends InputFormat<K,V> {
}
/**
- * Gets the splits of the tables that have been set on the job.
+ * Gets the splits of the tables that have been set on the job by reading the metadata table for the specified ranges.
*
- * @param context
- * the configuration of the job
* @return the splits from the tables based on the ranges.
* @throws java.io.IOException
* if a table set on the job doesn't exist or an error occurs initializing the tablet locator
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
index c4ab313..5ee0962 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
@@ -40,9 +40,9 @@ import org.apache.accumulo.core.client.mapreduce.lib.impl.OutputConfigurator;
import org.apache.accumulo.core.client.mock.MockInstance;
import org.apache.accumulo.core.client.security.SecurityErrorCode;
import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
+import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.client.security.tokens.DelegationToken;
import org.apache.accumulo.core.client.security.tokens.KerberosToken;
-import org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
import org.apache.accumulo.core.data.ColumnUpdate;
import org.apache.accumulo.core.data.KeyExtent;
import org.apache.accumulo.core.data.Mutation;
@@ -436,8 +436,8 @@ public class AccumuloOutputFormat extends OutputFormat<Text,Mutation> {
}
/**
- * Push a mutation into a table. If table is null, the defaultTable will be used. If canCreateTable is set, the table will be created if it does not exist.
- * The table name must only contain alphanumerics and underscore.
+ * Push a mutation into a table. If table is null, the defaultTable will be used. If {@link AccumuloOutputFormat#canCreateTables(JobContext)} is set, the
+ * table will be created if it does not exist. The table name must only contain alphanumerics and underscore.
*/
@Override
public void write(Text table, Mutation mutation) throws IOException {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
index d81030d..76ca401 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
@@ -313,15 +313,6 @@ public abstract class InputFormatBase<K,V> extends AbstractInputFormat<K,V> {
protected abstract static class RecordReaderBase<K,V> extends AbstractRecordReader<K,V> {
- /**
- * Apply the configured iterators from the configuration to the scanner for the specified table name
- *
- * @param context
- * the Hadoop context for the configured job
- * @param scanner
- * the scanner to configure
- * @since 1.6.0
- */
@Override
protected void setupIterators(TaskAttemptContext context, Scanner scanner, String tableName, org.apache.accumulo.core.client.mapreduce.RangeInputSplit split) {
setupIterators(context, scanner, split);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
index 03473f2..257f6c9 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputTableConfig.java
@@ -241,12 +241,6 @@ public class InputTableConfig implements Writable {
return useIsolatedScanners;
}
- /**
- * Writes the state for the current object out to the specified {@link DataOutput}
- *
- * @param dataOutput
- * the output for which to write the object's state
- */
@Override
public void write(DataOutput dataOutput) throws IOException {
if (iterators != null) {
@@ -284,12 +278,6 @@ public class InputTableConfig implements Writable {
dataOutput.writeBoolean(offlineScan);
}
- /**
- * Reads the fields in the {@link DataInput} into the current object
- *
- * @param dataInput
- * the input fields to read into the current object
- */
@Override
public void readFields(DataInput dataInput) throws IOException {
// load iterators
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
index c3219ec..1c52bcf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/DelegationToken.java
@@ -142,11 +142,9 @@ public class DelegationToken extends PasswordToken {
return super.hashCode() ^ identifier.hashCode();
}
- /*
- * We assume we can cast obj to DelegationToken because the super.equals(obj) check ensures obj is of the same type as this
- */
@Override
public boolean equals(Object obj) {
+ // We assume we can cast obj to DelegationToken because the super.equals(obj) check ensures obj is of the same type as this
return super.equals(obj) && identifier.equals(((DelegationToken) obj).identifier);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
index e11c3b0..9cbf914 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/security/tokens/PasswordToken.java
@@ -103,12 +103,10 @@ public class PasswordToken implements AuthenticationToken {
return Arrays.hashCode(password);
}
- /*
- * Instances of PasswordToken should only be considered equal if they are of the same type. This check is done here to ensure that this class is equal to the
- * class of the object being checked.
- */
@Override
public boolean equals(Object obj) {
+ // Instances of PasswordToken should only be considered equal if they are of the same type.
+ // This check is done here to ensure that this class is equal to the class of the object being checked.
return this == obj || (obj != null && getClass().equals(obj.getClass()) && Arrays.equals(password, ((PasswordToken) obj).password));
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
index c259b55..6041620 100644
--- a/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/AccumuloConfiguration.java
@@ -32,7 +32,6 @@ import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* A configuration object.
*/
@@ -407,7 +406,9 @@ public abstract class AccumuloConfiguration implements Iterable<Entry<String,Str
return maxFilesPerTablet;
}
- // overridden in ZooConfiguration
+ /**
+ * Invalidates the <code>ZooCache</code> used for storage and quick retrieval of properties for this configuration.
+ */
public void invalidateCache() {}
/**
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
index 31b1204..f894dbf 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ArrayByteSequence.java
@@ -154,6 +154,7 @@ public class ArrayByteSequence extends ByteSequence implements Serializable {
return copy;
}
+ @Override
public String toString() {
return new String(data, offset, length, UTF_8);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/data/ByteSequence.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ByteSequence.java b/core/src/main/java/org/apache/accumulo/core/data/ByteSequence.java
index ce8dab0..cb15a75 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ByteSequence.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ByteSequence.java
@@ -106,14 +106,7 @@ public abstract class ByteSequence implements Comparable<ByteSequence> {
return bs1.length() - bs2.length();
}
- /**
- * Compares this byte sequence to another.
- *
- * @param obs
- * byte sequence to compare
- * @return comparison result
- * @see #compareBytes(ByteSequence, ByteSequence)
- */
+ @Override
public int compareTo(ByteSequence obs) {
if (isBackedByArray() && obs.isBackedByArray()) {
return WritableComparator.compareBytes(getBackingArray(), offset(), length(), obs.getBackingArray(), obs.offset(), obs.length());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/data/Column.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Column.java b/core/src/main/java/org/apache/accumulo/core/data/Column.java
index 294226a..d48079a 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Column.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Column.java
@@ -50,6 +50,7 @@ public class Column implements WritableComparable<Column> {
* column to compare
* @return comparison result
*/
+ @Override
public int compareTo(Column that) {
int result;
result = compareBytes(this.columnFamily, that.columnFamily);
@@ -61,6 +62,7 @@ public class Column implements WritableComparable<Column> {
return compareBytes(this.columnVisibility, that.columnVisibility);
}
+ @Override
public void readFields(DataInput in) throws IOException {
if (in.readBoolean()) {
int len = in.readInt();
@@ -210,11 +212,12 @@ public class Column implements WritableComparable<Column> {
}
/**
- * Gets a string representation of this column. The family, qualifier, and visibility are interpreted as strings using the platform default encoding; nulls
- * are interpreted as empty strings.
+ * Gets a string representation of this column. The family, qualifier, and visibility are interpreted as strings using the UTF-8 encoding; nulls are
+ * interpreted as empty strings.
*
* @return string form of column
*/
+ @Override
public String toString() {
return new String(columnFamily == null ? new byte[0] : columnFamily, UTF_8) + ":"
+ new String(columnQualifier == null ? new byte[0] : columnQualifier, UTF_8) + ":"
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java b/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
index 67e4bb1..11aaf2b 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/ComparableBytes.java
@@ -40,6 +40,7 @@ public class ComparableBytes extends BinaryComparable {
*
* @return bytes
*/
+ @Override
public byte[] getBytes() {
return data;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/data/Key.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/Key.java b/core/src/main/java/org/apache/accumulo/core/data/Key.java
index 8ebba43..f88ddaa 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/Key.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/Key.java
@@ -755,14 +755,6 @@ public class Key implements WritableComparable<Key>, Cloneable {
return result;
}
- /**
- * Compares this key with another.
- *
- * @param other
- * key to compare to
- * @return comparison result
- * @see #compareTo(Key, PartialKey)
- */
@Override
public int compareTo(Key other) {
return compareTo(other, PartialKey.ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL);
@@ -1057,11 +1049,6 @@ public class Key implements WritableComparable<Key>, Cloneable {
return new TKey(ByteBuffer.wrap(row), ByteBuffer.wrap(colFamily), ByteBuffer.wrap(colQualifier), ByteBuffer.wrap(colVisibility), timestamp);
}
- /**
- * Performs a deep copy of this key.
- *
- * @return cloned key
- */
@Override
public Object clone() throws CloneNotSupportedException {
Key r = (Key) super.clone();
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
index bc1513e..fe7f776 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
@@ -239,10 +239,6 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
setPrevEndRow(prevEndRow, true, true);
}
- /**
- * Populates the extents data fields from a DataInput object
- *
- */
@Override
public void readFields(DataInput in) throws IOException {
Text tid = new Text();
@@ -269,10 +265,6 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
check();
}
- /**
- * Writes this extent's data fields to a DataOutput object
- *
- */
@Override
public void write(DataOutput out) throws IOException {
getTableId().write(out);
@@ -395,10 +387,6 @@ public class KeyExtent implements WritableComparable<KeyExtent> {
return m;
}
- /**
- * Compares extents based on rows
- *
- */
@Override
public int compareTo(KeyExtent other) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
index d08fee1..0754f17 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlockQueue.java
@@ -115,6 +115,7 @@ public class CachedBlockQueue implements HeapSize {
*
* @return size of all elements currently in queue, in bytes
*/
+ @Override
public long heapSize() {
return heapSize;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
index 888a92f..d4b875c 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/LruBlockCache.java
@@ -291,7 +291,6 @@ public class LruBlockCache implements BlockCache, HeapSize {
* block name
* @return buffer of specified block name, or null if not in cache
*/
-
@Override
public CachedBlock getBlock(String blockName) {
CachedBlock cb = map.get(blockName);
@@ -460,11 +459,6 @@ public class LruBlockCache implements BlockCache, HeapSize {
}
}
- /**
- * Get the maximum size of this cache.
- *
- * @return max size in bytes
- */
@Override
public long getMaxSize() {
return this.maxSize;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
index 2d5c95f..54da7d9 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/impl/CachableBlockFile.java
@@ -41,7 +41,6 @@ import org.apache.hadoop.fs.Path;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/***
*
* This is a wrapper class for BCFile that includes a cache for independent caches for datablocks and metadatablocks
@@ -72,21 +71,25 @@ public class CachableBlockFile {
_bc = new BCFile.Writer(fsout, compressAlgor, conf, false, accumuloConfiguration);
}
+ @Override
public ABlockWriter prepareMetaBlock(String name) throws IOException {
_bw = new BlockWrite(_bc.prepareMetaBlock(name));
return _bw;
}
+ @Override
public ABlockWriter prepareMetaBlock(String name, String compressionName) throws IOException {
_bw = new BlockWrite(_bc.prepareMetaBlock(name, compressionName));
return _bw;
}
+ @Override
public ABlockWriter prepareDataBlock() throws IOException {
_bw = new BlockWrite(_bc.prepareDataBlock());
return _bw;
}
+ @Override
public void close() throws IOException {
_bw.close();
@@ -371,6 +374,7 @@ public class CachableBlockFile {
* NOTE: In the case of multi-read threads: This method can do redundant work where an entry is read from disk and other threads check the cache before it
* has been inserted.
*/
+ @Override
public BlockRead getMetaBlock(String blockName) throws IOException {
String _lookup = this.fileName + "M" + blockName;
return getBlock(_lookup, _iCache, new MetaBlockLoader(blockName, accumuloConfiguration));
@@ -390,6 +394,7 @@ public class CachableBlockFile {
* has been inserted.
*/
+ @Override
public BlockRead getDataBlock(int blockIndex) throws IOException {
String _lookup = this.fileName + "O" + blockIndex;
return getBlock(_lookup, _dCache, new OffsetBlockLoader(blockIndex));
@@ -402,6 +407,7 @@ public class CachableBlockFile {
return getBlock(_lookup, _dCache, new RawBlockLoader(offset, compressedSize, rawSize));
}
+ @Override
public synchronized void close() throws IOException {
if (closed)
return;
@@ -512,6 +518,7 @@ public class CachableBlockFile {
/**
* Size is the size of the bytearray that was read form the cache
*/
+ @Override
public long getRawSize() {
return size;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompareUtils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompareUtils.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompareUtils.java
index d7651e8..ac0bdb1 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompareUtils.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/CompareUtils.java
@@ -64,6 +64,7 @@ class CompareUtils {
magnitude = m;
}
+ @Override
public long magnitude() {
return magnitude;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
index 9defa1c..48a9acc 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Compression.java
@@ -225,6 +225,7 @@ public final class Compression {
private transient boolean checked = false;
private static final String defaultClazz = "org.apache.hadoop.io.compress.SnappyCodec";
+ @Override
public CompressionCodec getCodec() throws IOException {
if (!isSupported()) {
throw new IOException("SNAPPY codec class not specified. Did you forget to set property " + CONF_SNAPPY_CLASS + "?");
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
index 84b861b..fca120e 100644
--- a/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
+++ b/core/src/main/java/org/apache/accumulo/core/file/rfile/bcfile/Utils.java
@@ -316,9 +316,6 @@ public final class Utils {
return (Short.SIZE + Short.SIZE) / Byte.SIZE;
}
- /**
- * Return a string representation of the version.
- */
@Override
public String toString() {
return new StringBuilder("v").append(major).append(".").append(minor).toString();
@@ -335,9 +332,6 @@ public final class Utils {
return major == other.major;
}
- /**
- * Compare this version with another version.
- */
@Override
public int compareTo(Version that) {
if (major != that.major) {
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java
index 6c430fd..c2c7ad5 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/DebugIterator.java
@@ -35,6 +35,7 @@ public class DebugIterator extends WrappingIterator implements OptionDescriber {
public DebugIterator() {}
+ @Override
public DebugIterator deepCopy(IteratorEnvironment env) {
return new DebugIterator(this, env);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
index 7c65565..232dc2a 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/SortedKeyValueIterator.java
@@ -129,7 +129,8 @@ public interface SortedKeyValueIterator<K extends WritableComparable<?>,V extend
/**
* Creates a deep copy of this iterator as though seek had not yet been called. init should be called on an iterator before deepCopy is called. init should
* not need to be called on the copy that is returned by deepCopy; that is, when necessary init should be called in the deepCopy method on the iterator it
- * returns. The behavior is unspecified if init is called after deepCopy either on the original or the copy.
+ * returns. The behavior is unspecified if init is called after deepCopy either on the original or the copy. A proper implementation would call deepCopy on
+ * the source.
*
* @param env
* <tt>IteratorEnvironment</tt> environment in which iterator is being run.
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
index dbe2d4a..7e7fa64 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/TypedValueCombiner.java
@@ -105,7 +105,7 @@ public abstract class TypedValueCombiner<V> extends Combiner {
}
/**
- * An interface for translating from byte[] to V and back.
+ * An interface for translating from byte[] to V and back. Decodes the entire contents of the byte array.
*/
public interface Encoder<V> {
byte[] encode(V v);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
index f39b497..7692ecb 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/LongSummation.java
@@ -22,7 +22,6 @@ import org.apache.accumulo.core.data.Value;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* @deprecated since 1.4, replaced by {@link org.apache.accumulo.core.iterators.user.SummingCombiner} with
* {@link org.apache.accumulo.core.iterators.LongCombiner.Type#FIXEDLEN}
@@ -32,10 +31,12 @@ public class LongSummation implements Aggregator {
private static final Logger log = LoggerFactory.getLogger(LongSummation.class);
long sum = 0;
+ @Override
public Value aggregate() {
return new Value(longToBytes(sum));
}
+ @Override
public void collect(Value value) {
try {
sum += bytesToLong(value.get());
@@ -44,6 +45,7 @@ public class LongSummation implements Aggregator {
}
}
+ @Override
public void reset() {
sum = 0;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
index ca00337..66cd2d5 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumArraySummation.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.io.WritableUtils;
public class NumArraySummation implements Aggregator {
long[] sum = new long[0];
+ @Override
public Value aggregate() {
try {
return new Value(NumArraySummation.longArrayToBytes(sum));
@@ -41,6 +42,7 @@ public class NumArraySummation implements Aggregator {
}
}
+ @Override
public void collect(Value value) {
long[] la;
try {
@@ -86,6 +88,7 @@ public class NumArraySummation implements Aggregator {
return la;
}
+ @Override
public void reset() {
sum = new long[0];
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
index 9c28776..4d79894 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/NumSummation.java
@@ -33,6 +33,7 @@ import org.apache.hadoop.io.WritableUtils;
public class NumSummation implements Aggregator {
long sum = 0l;
+ @Override
public Value aggregate() {
try {
return new Value(NumSummation.longToBytes(sum));
@@ -41,6 +42,7 @@ public class NumSummation implements Aggregator {
}
}
+ @Override
public void collect(Value value) {
long l;
try {
@@ -81,6 +83,7 @@ public class NumSummation implements Aggregator {
return a + b;
}
+ @Override
public void reset() {
sum = 0l;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
index e086b22..3d4516d 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMax.java
@@ -27,10 +27,12 @@ public class StringMax implements Aggregator {
long max = Long.MIN_VALUE;
+ @Override
public Value aggregate() {
return new Value(Long.toString(max).getBytes());
}
+ @Override
public void collect(Value value) {
long l = Long.parseLong(new String(value.get()));
if (l > max) {
@@ -38,6 +40,7 @@ public class StringMax implements Aggregator {
}
}
+ @Override
public void reset() {
max = Long.MIN_VALUE;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
index 48855b3..7a49f81 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringMin.java
@@ -27,10 +27,12 @@ public class StringMin implements Aggregator {
long min = Long.MAX_VALUE;
+ @Override
public Value aggregate() {
return new Value(Long.toString(min).getBytes());
}
+ @Override
public void collect(Value value) {
long l = Long.parseLong(new String(value.get()));
if (l < min) {
@@ -38,6 +40,7 @@ public class StringMin implements Aggregator {
}
}
+ @Override
public void reset() {
min = Long.MAX_VALUE;
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
index 63a8297..a8b5967 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/StringSummation.java
@@ -27,14 +27,17 @@ public class StringSummation implements Aggregator {
long sum = 0;
+ @Override
public Value aggregate() {
return new Value(Long.toString(sum).getBytes());
}
+ @Override
public void collect(Value value) {
sum += Long.parseLong(new String(value.get()));
}
+ @Override
public void reset() {
sum = 0;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnUtil.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnUtil.java b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnUtil.java
index a6a3e65..89afcdb 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/conf/ColumnUtil.java
@@ -56,10 +56,12 @@ public class ColumnUtil {
hashCode = hash(key.getColumnFamilyData());
}
+ @Override
public int hashCode() {
return hashCode;
}
+ @Override
public boolean equals(Object o) {
if (o instanceof ColFamHashKey)
return equals((ColFamHashKey) o);
@@ -97,10 +99,12 @@ public class ColumnUtil {
hashValue = hash(key.getColumnFamilyData()) + hash(key.getColumnQualifierData());
}
+ @Override
public int hashCode() {
return hashValue;
}
+ @Override
public boolean equals(Object o) {
if (o instanceof ColHashKey)
return equals((ColHashKey) o);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
index 6e0f6e1..aa6426d 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/ColumnQualifierFilter.java
@@ -50,6 +50,7 @@ public class ColumnQualifierFilter extends Filter {
this.scanColumns = scanColumns;
}
+ @Override
public boolean accept(Key key, Value v) {
if (!scanColumns)
return true;
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java
index b75ce67..ab77e19 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/CountingIterator.java
@@ -29,6 +29,7 @@ public class CountingIterator extends WrappingIterator {
private long count;
+ @Override
public CountingIterator deepCopy(IteratorEnvironment env) {
return new CountingIterator(this, env);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java
index 1e7bd0d..abdb6c1 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/DeletingIterator.java
@@ -34,6 +34,7 @@ public class DeletingIterator extends WrappingIterator {
private boolean propogateDeletes;
private Key workKey = new Key();
+ @Override
public DeletingIterator deepCopy(IteratorEnvironment env) {
return new DeletingIterator(this, env);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/698368f2/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
index 26ad8e9..426ae5f 100644
--- a/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
+++ b/core/src/main/java/org/apache/accumulo/core/iterators/system/MultiIterator.java
@@ -43,6 +43,7 @@ public class MultiIterator extends HeapIterator {
private Range fence;
// deep copy with no seek/scan state
+ @Override
public MultiIterator deepCopy(IteratorEnvironment env) {
return new MultiIterator(this, env);
}