git commit: ACCUMULO-1854 Remove compiler warnings
Updated Branches:
refs/heads/1.6.0-SNAPSHOT dd55dc7e2 - f8e14c794
ACCUMULO-1854 Remove compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8e14c79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8e14c79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8e14c79
Branch: refs/heads/1.6.0-SNAPSHOT
Commit: f8e14c794992bd5d8d530b50338b16436088c243
Parents: dd55dc7
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Nov 26 13:16:17 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Nov 26 13:16:17 2013 -0500
--
.../core/client/mapreduce/RangeInputSplit.java | 81 ++--
.../mapreduce/AccumuloInputFormatTest.java | 18 +++--
.../accumulo/test/functional/ExamplesIT.java| 27 ---
3 files changed, 70 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8e14c79/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 59cc8d8..98b1a32 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -20,7 +20,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.math.BigInteger;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -132,6 +131,7 @@ public class RangeInputSplit extends InputSplit implements
Writable {
/**
* This implementation of length is only an estimate, it does not provide
exact values. Do not have your code rely on this return value.
*/
+ @Override
public long getLength() throws IOException {
Text startRow = range.isInfiniteStartKey() ? new Text(new byte[]
{Byte.MIN_VALUE}) : range.getStartKey().getRow();
Text stopRow = range.isInfiniteStopKey() ? new Text(new byte[]
{Byte.MAX_VALUE}) : range.getEndKey().getRow();
@@ -151,10 +151,12 @@ public class RangeInputSplit extends InputSplit
implements Writable {
return diff + 1;
}
+ @Override
public String[] getLocations() throws IOException {
return locations;
}
+ @Override
public void readFields(DataInput in) throws IOException {
range.readFields(in);
tableName = in.readUTF();
@@ -163,42 +165,42 @@ public class RangeInputSplit extends InputSplit
implements Writable {
locations = new String[numLocs];
for (int i = 0; i numLocs; ++i)
locations[i] = in.readUTF();
-
+
if (in.readBoolean()) {
isolatedScan = in.readBoolean();
}
-
+
if (in.readBoolean()) {
offline = in.readBoolean();
}
-
+
if (in.readBoolean()) {
localIterators = in.readBoolean();
}
-
+
if (in.readBoolean()) {
mockInstance = in.readBoolean();
}
-
+
if (in.readBoolean()) {
int numColumns = in.readInt();
ListString columns = new ArrayListString(numColumns);
for (int i = 0; i numColumns; i++) {
columns.add(in.readUTF());
}
-
+
fetchedColumns = InputConfigurator.deserializeFetchedColumns(columns);
}
-
+
if (in.readBoolean()) {
String strAuths = in.readUTF();
auths = new Authorizations(strAuths.getBytes(Constants.UTF8));
}
-
+
if (in.readBoolean()) {
principal = in.readUTF();
}
-
+
if (in.readBoolean()) {
int ordinal = in.readInt();
this.tokenSource = TokenSource.values()[ordinal];
@@ -208,32 +210,33 @@ public class RangeInputSplit extends InputSplit
implements Writable {
String tokenClass = in.readUTF();
byte[] base64TokenBytes = in.readUTF().getBytes(Constants.UTF8);
byte[] tokenBytes = Base64.decodeBase64(base64TokenBytes);
-
+
this.token = AuthenticationTokenSerializer.deserialize(tokenClass,
tokenBytes);
break;
-
+
case FILE:
this.tokenFile = in.readUTF();
-
+
break;
default:
- throw new IOException(Cannot parse unknown TokenSource ordinal);
+ throw new IOException(Cannot parse unknown TokenSource ordinal);
}
}
-
+
if (in.readBoolean()) {
instanceName = in.readUTF();
}
-
+
if (in.readBoolean()) {
zooKeepers = in.readUTF();
}
-
+
if (in.readBoolean()) {
level = Level.toLevel(in.readInt());
}
}
+
[01/10] git commit: ACCUMULO-1854 Remove compiler warnings
Updated Branches:
refs/heads/master 2e4ce5e52 - c3befc23d
ACCUMULO-1854 Remove compiler warnings
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f8e14c79
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f8e14c79
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f8e14c79
Branch: refs/heads/master
Commit: f8e14c794992bd5d8d530b50338b16436088c243
Parents: dd55dc7
Author: Christopher Tubbs ctubb...@apache.org
Authored: Tue Nov 26 13:16:17 2013 -0500
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Tue Nov 26 13:16:17 2013 -0500
--
.../core/client/mapreduce/RangeInputSplit.java | 81 ++--
.../mapreduce/AccumuloInputFormatTest.java | 18 +++--
.../accumulo/test/functional/ExamplesIT.java| 27 ---
3 files changed, 70 insertions(+), 56 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f8e14c79/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
--
diff --git
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
index 59cc8d8..98b1a32 100644
---
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
+++
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/RangeInputSplit.java
@@ -20,7 +20,6 @@ import java.io.DataInput;
import java.io.DataOutput;
import java.io.IOException;
import java.math.BigInteger;
-import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashSet;
@@ -132,6 +131,7 @@ public class RangeInputSplit extends InputSplit implements
Writable {
/**
* This implementation of length is only an estimate, it does not provide
exact values. Do not have your code rely on this return value.
*/
+ @Override
public long getLength() throws IOException {
Text startRow = range.isInfiniteStartKey() ? new Text(new byte[]
{Byte.MIN_VALUE}) : range.getStartKey().getRow();
Text stopRow = range.isInfiniteStopKey() ? new Text(new byte[]
{Byte.MAX_VALUE}) : range.getEndKey().getRow();
@@ -151,10 +151,12 @@ public class RangeInputSplit extends InputSplit
implements Writable {
return diff + 1;
}
+ @Override
public String[] getLocations() throws IOException {
return locations;
}
+ @Override
public void readFields(DataInput in) throws IOException {
range.readFields(in);
tableName = in.readUTF();
@@ -163,42 +165,42 @@ public class RangeInputSplit extends InputSplit
implements Writable {
locations = new String[numLocs];
for (int i = 0; i numLocs; ++i)
locations[i] = in.readUTF();
-
+
if (in.readBoolean()) {
isolatedScan = in.readBoolean();
}
-
+
if (in.readBoolean()) {
offline = in.readBoolean();
}
-
+
if (in.readBoolean()) {
localIterators = in.readBoolean();
}
-
+
if (in.readBoolean()) {
mockInstance = in.readBoolean();
}
-
+
if (in.readBoolean()) {
int numColumns = in.readInt();
ListString columns = new ArrayListString(numColumns);
for (int i = 0; i numColumns; i++) {
columns.add(in.readUTF());
}
-
+
fetchedColumns = InputConfigurator.deserializeFetchedColumns(columns);
}
-
+
if (in.readBoolean()) {
String strAuths = in.readUTF();
auths = new Authorizations(strAuths.getBytes(Constants.UTF8));
}
-
+
if (in.readBoolean()) {
principal = in.readUTF();
}
-
+
if (in.readBoolean()) {
int ordinal = in.readInt();
this.tokenSource = TokenSource.values()[ordinal];
@@ -208,32 +210,33 @@ public class RangeInputSplit extends InputSplit
implements Writable {
String tokenClass = in.readUTF();
byte[] base64TokenBytes = in.readUTF().getBytes(Constants.UTF8);
byte[] tokenBytes = Base64.decodeBase64(base64TokenBytes);
-
+
this.token = AuthenticationTokenSerializer.deserialize(tokenClass,
tokenBytes);
break;
-
+
case FILE:
this.tokenFile = in.readUTF();
-
+
break;
default:
- throw new IOException(Cannot parse unknown TokenSource ordinal);
+ throw new IOException(Cannot parse unknown TokenSource ordinal);
}
}
-
+
if (in.readBoolean()) {
instanceName = in.readUTF();
}
-
+
if (in.readBoolean()) {
zooKeepers = in.readUTF();
}
-
+
if (in.readBoolean()) {
level = Level.toLevel(in.readInt());
}
}
+ @Override
public void
