You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by vi...@apache.org on 2012/09/29 07:43:13 UTC
svn commit: r1391754 [3/11] - in /accumulo/branches/ACCUMULO-259: ./
assemble/ conf/ conf/examples/1GB/native-standalone/
conf/examples/1GB/standalone/ conf/examples/2GB/native-standalone/
conf/examples/2GB/standalone/ conf/examples/3GB/native-standalo...
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java Sat Sep 29 05:42:59 2012
@@ -2067,7 +2067,7 @@ import org.slf4j.LoggerFactory;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -2314,7 +2314,7 @@ import org.slf4j.LoggerFactory;
public String success; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -2665,7 +2665,7 @@ import org.slf4j.LoggerFactory;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -2912,7 +2912,7 @@ import org.slf4j.LoggerFactory;
public String success; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -3263,7 +3263,7 @@ import org.slf4j.LoggerFactory;
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
;
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -3510,7 +3510,7 @@ import org.slf4j.LoggerFactory;
public String success; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -3875,7 +3875,7 @@ import org.slf4j.LoggerFactory;
public boolean setTime; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)1, "tinfo"),
CREDENTIALS((short)2, "credentials"),
TID((short)3, "tid"),
@@ -4869,7 +4869,7 @@ import org.slf4j.LoggerFactory;
public ThriftTableOperationException tope; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
SEC((short)1, "sec"),
TOPE((short)2, "tope");
@@ -5476,7 +5476,7 @@ import org.slf4j.LoggerFactory;
public long tid; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)1, "tinfo"),
TID((short)2, "tid");
@@ -5928,7 +5928,7 @@ import org.slf4j.LoggerFactory;
public boolean success; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -6174,8 +6174,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -6280,7 +6278,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.AuthInfo credentials; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
CREDENTIALS((short)1, "credentials");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -6635,7 +6633,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -6996,7 +6994,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer password; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)4, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -7660,7 +7658,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
SEC((short)1, "sec");
@@ -7981,8 +7979,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -8114,7 +8110,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.AuthInfo credentials; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)2, "tinfo"),
CREDENTIALS((short)1, "credentials");
@@ -8571,7 +8567,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
SEC((short)1, "sec");
@@ -9084,7 +9080,7 @@ import org.slf4j.LoggerFactory;
public List<ByteBuffer> authorizations; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)5, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -9898,7 +9894,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -10257,7 +10253,7 @@ import org.slf4j.LoggerFactory;
public String user; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)3, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user");
@@ -10810,7 +10806,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -11171,7 +11167,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer password; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)4, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -11833,7 +11829,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -12194,7 +12190,7 @@ import org.slf4j.LoggerFactory;
public List<ByteBuffer> authorizations; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)4, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -12899,7 +12895,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -13258,7 +13254,7 @@ import org.slf4j.LoggerFactory;
public String user; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)3, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user");
@@ -13813,7 +13809,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
SEC((short)1, "sec");
@@ -14326,7 +14322,7 @@ import org.slf4j.LoggerFactory;
public byte sysPerm; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)4, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -14978,7 +14974,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
SEC((short)1, "sec");
@@ -15299,8 +15295,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -15438,7 +15432,7 @@ import org.slf4j.LoggerFactory;
public byte tblPerm; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)5, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -16190,7 +16184,7 @@ import org.slf4j.LoggerFactory;
public ThriftTableOperationException tope; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
SEC((short)1, "sec"),
TOPE((short)2, "tope");
@@ -16586,8 +16580,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
@@ -16748,7 +16740,7 @@ import org.slf4j.LoggerFactory;
public byte permission; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)4, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -17398,7 +17390,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -17759,7 +17751,7 @@ import org.slf4j.LoggerFactory;
public byte permission; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)4, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -18409,7 +18401,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.security.thrift.ThriftSecurityException sec; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -18772,7 +18764,7 @@ import org.slf4j.LoggerFactory;
public byte permission; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)5, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -19522,7 +19514,7 @@ import org.slf4j.LoggerFactory;
public ThriftTableOperationException tope; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec"),
TOPE((short)2, "tope");
@@ -19985,7 +19977,7 @@ import org.slf4j.LoggerFactory;
public byte permission; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)5, "tinfo"),
CREDENTIALS((short)1, "credentials"),
USER((short)2, "user"),
@@ -20735,7 +20727,7 @@ import org.slf4j.LoggerFactory;
public ThriftTableOperationException tope; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SEC((short)1, "sec"),
TOPE((short)2, "tope");
@@ -21194,7 +21186,7 @@ import org.slf4j.LoggerFactory;
public ConfigurationType type; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
/**
*
* @see ConfigurationType
@@ -21559,7 +21551,7 @@ import org.slf4j.LoggerFactory;
public Map<String,String> success; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -21975,7 +21967,7 @@ import org.slf4j.LoggerFactory;
public String tableName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TABLE_NAME((short)2, "tableName");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -22330,7 +22322,7 @@ import org.slf4j.LoggerFactory;
public ThriftTableOperationException tope; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success"),
TOPE((short)1, "tope");
@@ -22850,7 +22842,7 @@ import org.slf4j.LoggerFactory;
public String interfaceMatch; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TINFO((short)1, "tinfo"),
CLASS_NAME((short)2, "className"),
INTERFACE_MATCH((short)3, "interfaceMatch");
@@ -23401,7 +23393,7 @@ import org.slf4j.LoggerFactory;
public boolean success; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SUCCESS((short)0, "success");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -23647,8 +23639,6 @@ import org.slf4j.LoggerFactory;
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
try {
- // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
- __isset_bit_vector = new BitSet(1);
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
} catch (org.apache.thrift.TException te) {
throw new java.io.IOException(te);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java Sat Sep 29 05:42:59 2012
@@ -11,7 +11,7 @@ import java.util.Map;
import java.util.HashMap;
import org.apache.thrift.TEnum;
-public enum ConfigurationType implements org.apache.thrift.TEnum {
+@SuppressWarnings("all") public enum ConfigurationType implements org.apache.thrift.TEnum {
CURRENT(0),
SITE(1),
DEFAULT(2);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperation.java Sat Sep 29 05:42:59 2012
@@ -11,7 +11,7 @@ import java.util.Map;
import java.util.HashMap;
import org.apache.thrift.TEnum;
-public enum TableOperation implements org.apache.thrift.TEnum {
+@SuppressWarnings("all") public enum TableOperation implements org.apache.thrift.TEnum {
CREATE(0),
DELETE(1),
RENAME(2),
@@ -25,7 +25,9 @@ public enum TableOperation implements or
MERGE(10),
DELETE_RANGE(11),
BULK_IMPORT(12),
- COMPACT(13);
+ COMPACT(13),
+ IMPORT(14),
+ EXPORT(15);
private final int value;
@@ -74,6 +76,10 @@ public enum TableOperation implements or
return BULK_IMPORT;
case 13:
return COMPACT;
+ case 14:
+ return IMPORT;
+ case 15:
+ return EXPORT;
default:
return null;
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TableOperationExceptionType.java Sat Sep 29 05:42:59 2012
@@ -11,7 +11,7 @@ import java.util.Map;
import java.util.HashMap;
import org.apache.thrift.TEnum;
-public enum TableOperationExceptionType implements org.apache.thrift.TEnum {
+@SuppressWarnings("all") public enum TableOperationExceptionType implements org.apache.thrift.TEnum {
EXISTS(0),
NOTFOUND(1),
OFFLINE(2),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTableOperationException.java Sat Sep 29 05:42:59 2012
@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
public String description; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TABLE_ID((short)1, "tableId"),
TABLE_NAME((short)2, "tableName"),
/**
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloFileOutputFormat.java Sat Sep 29 05:42:59 2012
@@ -46,7 +46,6 @@ import org.apache.hadoop.mapreduce.lib.o
public class AccumuloFileOutputFormat extends FileOutputFormat<Key,Value> {
private static final String PREFIX = AccumuloOutputFormat.class.getSimpleName();
public static final String FILE_TYPE = PREFIX + ".file_type";
- public static final String BLOCK_SIZE = PREFIX + ".block_size";
private static final String INSTANCE_HAS_BEEN_SET = PREFIX + ".instanceConfigured";
private static final String INSTANCE_NAME = PREFIX + ".instanceName";
@@ -61,7 +60,6 @@ public class AccumuloFileOutputFormat ex
if (extension == null || extension.isEmpty())
extension = RFile.EXTENSION;
- handleBlockSize(job.getConfiguration());
final Path file = this.getDefaultWorkFile(job, "." + extension);
return new RecordWriter<Key,Value>() {
@@ -84,28 +82,16 @@ public class AccumuloFileOutputFormat ex
};
}
- protected static void handleBlockSize(Configuration conf) {
- int blockSize;
- if (conf.getBoolean(INSTANCE_HAS_BEEN_SET, false)) {
- blockSize = (int) new ZooKeeperInstance(conf.get(INSTANCE_NAME), conf.get(ZOOKEEPERS)).getConfiguration().getMemoryInBytes(
- Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE);
- } else {
- blockSize = getBlockSize(conf);
- }
- conf.setInt("io.seqfile.compress.blocksize", blockSize);
-
- }
-
public static void setFileType(Configuration conf, String type) {
conf.set(FILE_TYPE, type);
}
+ /**
+ * @deprecated since 1.5, use {@link #setCompressedBlockSize(Configuration, long)} instead
+ */
public static void setBlockSize(Configuration conf, int blockSize) {
- conf.setInt(BLOCK_SIZE, blockSize);
- }
-
- private static int getBlockSize(Configuration conf) {
- return conf.getInt(BLOCK_SIZE, (int) AccumuloConfiguration.getDefaultConfiguration().getMemoryInBytes(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE));
+ long bs = blockSize;
+ setCompressedBlockSize(conf, bs);
}
/**
@@ -130,4 +116,24 @@ public class AccumuloFileOutputFormat ex
protected static Instance getInstance(Configuration conf) {
return new ZooKeeperInstance(conf.get(INSTANCE_NAME), conf.get(ZOOKEEPERS));
}
+
+ public static void setReplication(Configuration conf, int replication) {
+ conf.setInt(Property.TABLE_FILE_REPLICATION.getKey(), replication);
+ }
+
+ public static void setDFSBlockSize(Configuration conf, long blockSize) {
+ conf.setLong(Property.TABLE_FILE_BLOCK_SIZE.getKey(), blockSize);
+ }
+
+ public static void setCompressedBlockSize(Configuration conf, long cblockSize) {
+ conf.setLong(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), cblockSize);
+ }
+
+ public static void setCompressedBlockSizeIndex(Configuration conf, long cblockSizeIndex) {
+ conf.setLong(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE_INDEX.getKey(), cblockSizeIndex);
+ }
+
+ public static void setCompressionType(Configuration conf, String compression) {
+ conf.set(Property.TABLE_FILE_COMPRESSION_TYPE.getKey(), compression);
+ }
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/AccumuloOutputFormat.java Sat Sep 29 05:42:59 2012
@@ -19,10 +19,12 @@ package org.apache.accumulo.core.client.
import java.io.IOException;
import java.util.HashMap;
import java.util.HashSet;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.client.AccumuloException;
import org.apache.accumulo.core.client.AccumuloSecurityException;
import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -90,6 +92,7 @@ public class AccumuloOutputFormat extend
private static final String MAX_MUTATION_BUFFER_SIZE = PREFIX + ".maxmemory";
private static final String MAX_LATENCY = PREFIX + ".maxlatency";
private static final String NUM_WRITE_THREADS = PREFIX + ".writethreads";
+ private static final String TIMEOUT = PREFIX + ".timeout";
private static final long DEFAULT_MAX_MUTATION_BUFFER_SIZE = 50 * 1024 * 1024; // 50MB
private static final int DEFAULT_MAX_LATENCY = 60 * 1000; // 1 minute
@@ -156,18 +159,38 @@ public class AccumuloOutputFormat extend
conf.set(INSTANCE_NAME, instanceName);
}
+ /**
+ * see {@link BatchWriterConfig#setMaxMemory(long)}
+ */
+
public static void setMaxMutationBufferSize(Configuration conf, long numberOfBytes) {
conf.setLong(MAX_MUTATION_BUFFER_SIZE, numberOfBytes);
}
+ /**
+ * see {@link BatchWriterConfig#setMaxLatency(long, TimeUnit)}
+ */
+
public static void setMaxLatency(Configuration conf, int numberOfMilliseconds) {
conf.setInt(MAX_LATENCY, numberOfMilliseconds);
}
+ /**
+ * see {@link BatchWriterConfig#setMaxWriteThreads(int)}
+ */
+
public static void setMaxWriteThreads(Configuration conf, int numberOfThreads) {
conf.setInt(NUM_WRITE_THREADS, numberOfThreads);
}
+ /**
+ * see {@link BatchWriterConfig#setTimeout(long, TimeUnit)}
+ */
+
+ public static void setTimeout(Configuration conf, long time, TimeUnit timeUnit) {
+ conf.setLong(TIMEOUT, timeUnit.toMillis(time));
+ }
+
public static void setLogLevel(Configuration conf, Level level) {
ArgumentChecker.notNull(level);
conf.setInt(LOGLEVEL, level.toInt());
@@ -223,6 +246,10 @@ public class AccumuloOutputFormat extend
return conf.getInt(NUM_WRITE_THREADS, DEFAULT_NUM_WRITE_THREADS);
}
+ protected static long getTimeout(Configuration conf) {
+ return conf.getLong(TIMEOUT, Long.MAX_VALUE);
+ }
+
protected static Level getLogLevel(Configuration conf) {
if (conf.get(LOGLEVEL) != null)
return Level.toLevel(conf.getInt(LOGLEVEL, Level.INFO.toInt()));
@@ -263,7 +290,9 @@ public class AccumuloOutputFormat extend
if (!simulate) {
this.conn = getInstance(conf).getConnector(getUsername(conf), getPassword(conf));
- mtbw = conn.createMultiTableBatchWriter(getMaxMutationBufferSize(conf), getMaxLatency(conf), getMaxWriteThreads(conf));
+ mtbw = conn.createMultiTableBatchWriter(new BatchWriterConfig().setMaxMemory(getMaxMutationBufferSize(conf))
+ .setMaxLatency(getMaxLatency(conf), TimeUnit.MILLISECONDS).setMaxWriteThreads(getMaxWriteThreads(conf))
+ .setTimeout(getTimeout(conf), TimeUnit.MILLISECONDS));
}
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mapreduce/InputFormatBase.java Sat Sep 29 05:42:59 2012
@@ -23,11 +23,8 @@ import java.io.DataInputStream;
import java.io.DataOutput;
import java.io.DataOutputStream;
import java.io.IOException;
-import java.io.UnsupportedEncodingException;
import java.math.BigInteger;
import java.net.InetAddress;
-import java.net.URLDecoder;
-import java.net.URLEncoder;
import java.nio.ByteBuffer;
import java.util.ArrayList;
import java.util.Collection;
@@ -72,7 +69,6 @@ import org.apache.accumulo.core.security
import org.apache.accumulo.core.security.TablePermission;
import org.apache.accumulo.core.security.thrift.AuthInfo;
import org.apache.accumulo.core.util.ArgumentChecker;
-import org.apache.accumulo.core.util.ColumnFQ;
import org.apache.accumulo.core.util.Pair;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.accumulo.core.util.UtilWaitThread;
@@ -142,7 +138,6 @@ public abstract class InputFormatBase<K,
// Used for specifying the iterators to be applied
private static final String ITERATORS = PREFIX + ".iterators";
- private static final String ITERATORS_OPTIONS = PREFIX + ".iterators.options";
private static final String ITERATORS_DELIM = ",";
private static final String READ_OFFLINE = PREFIX + ".read.offline";
@@ -213,7 +208,7 @@ public abstract class InputFormatBase<K,
} catch (IOException ioe) {
throw new RuntimeException(ioe);
}
-
+
}
/**
@@ -260,17 +255,24 @@ public abstract class InputFormatBase<K,
*/
public static void setRanges(Configuration conf, Collection<Range> ranges) {
ArgumentChecker.notNull(ranges);
- ArrayList<String> rangeStrings = new ArrayList<String>(ranges.size());
try {
+ FileSystem fs = FileSystem.get(conf);
+ Path file = new Path(fs.getWorkingDirectory(), conf.get("mapred.job.name") + System.currentTimeMillis() + ".ranges");
+ conf.set(RANGES, file.toString());
+ FSDataOutputStream fos = fs.create(file, false);
+ fs.setPermission(file, new FsPermission(FsAction.ALL, FsAction.NONE, FsAction.NONE));
+ fs.deleteOnExit(file);
+
+ fos.writeInt(ranges.size());
for (Range r : ranges) {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- r.write(new DataOutputStream(baos));
- rangeStrings.add(new String(Base64.encodeBase64(baos.toByteArray())));
+ r.write(fos);
}
- } catch (IOException ex) {
- throw new IllegalArgumentException("Unable to encode ranges to Base64", ex);
+ fos.close();
+
+ DistributedCache.addCacheFile(file.toUri(), conf);
+ } catch (IOException e) {
+ throw new RuntimeException("Unable to write ranges to file", e);
}
- conf.setStrings(RANGES, rangeStrings.toArray(new String[0]));
}
/**
@@ -382,32 +384,25 @@ public abstract class InputFormatBase<K,
// First check to see if anything has been set already
String iterators = conf.get(ITERATORS);
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+ String newIter;
+ try {
+ cfg.write(new DataOutputStream(baos));
+ newIter = new String(Base64.encodeBase64(baos.toByteArray()));
+ baos.close();
+ } catch (IOException e) {
+ throw new IllegalArgumentException("unable to serialize IteratorSetting");
+ }
+
// No iterators specified yet, create a new string
if (iterators == null || iterators.isEmpty()) {
- iterators = new AccumuloIterator(cfg.getPriority(), cfg.getIteratorClass(), cfg.getName()).toString();
+ iterators = newIter;
} else {
// append the next iterator & reset
- iterators = iterators.concat(ITERATORS_DELIM + new AccumuloIterator(cfg.getPriority(), cfg.getIteratorClass(), cfg.getName()).toString());
+ iterators = iterators.concat(ITERATORS_DELIM + newIter);
}
// Store the iterators w/ the job
conf.set(ITERATORS, iterators);
- for (Entry<String,String> entry : cfg.getOptions().entrySet()) {
- if (entry.getValue() == null)
- continue;
-
- String iteratorOptions = conf.get(ITERATORS_OPTIONS);
-
- // No options specified yet, create a new string
- if (iteratorOptions == null || iteratorOptions.isEmpty()) {
- iteratorOptions = new AccumuloIteratorOption(cfg.getName(), entry.getKey(), entry.getValue()).toString();
- } else {
- // append the next option & reset
- iteratorOptions = iteratorOptions.concat(ITERATORS_DELIM + new AccumuloIteratorOption(cfg.getName(), entry.getKey(), entry.getValue()));
- }
-
- // Store the options w/ the job
- conf.set(ITERATORS_OPTIONS, iteratorOptions);
- }
}
/**
@@ -490,7 +485,7 @@ public abstract class InputFormatBase<K,
*/
protected static Authorizations getAuthorizations(Configuration conf) {
String authString = conf.get(AUTHORIZATIONS);
- return authString == null ? Constants.NO_AUTHS : new Authorizations(authString.split(","));
+ return authString == null ? Constants.NO_AUTHS : new Authorizations(authString.getBytes());
}
/**
@@ -542,12 +537,21 @@ public abstract class InputFormatBase<K,
*/
protected static List<Range> getRanges(Configuration conf) throws IOException {
ArrayList<Range> ranges = new ArrayList<Range>();
- for (String rangeString : conf.getStringCollection(RANGES)) {
- ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(rangeString.getBytes()));
- Range range = new Range();
- range.readFields(new DataInputStream(bais));
- ranges.add(range);
+ FileSystem fs = FileSystem.get(conf);
+ String rangePath = conf.get(RANGES);
+ if (rangePath == null)
+ return ranges;
+ Path file = new Path(rangePath);
+
+ FSDataInputStream fdis = fs.open(file);
+ int numRanges = fdis.readInt();
+ while (numRanges > 0) {
+ Range r = new Range();
+ r.readFields(fdis);
+ ranges.add(r);
+ numRanges--;
}
+ fdis.close();
return ranges;
}
@@ -618,7 +622,7 @@ public abstract class InputFormatBase<K,
if (!usesLocalIterators(conf)) {
// validate that any scan-time iterators can be loaded by the the tablet servers
- for (AccumuloIterator iter : getIterators(conf)) {
+ for (IteratorSetting iter : getIterators(conf)) {
if (!c.instanceOperations().testClassLoad(iter.getIteratorClass(), SortedKeyValueIterator.class.getName()))
throw new AccumuloException("Servers are unable to load " + iter.getIteratorClass() + " as a " + SortedKeyValueIterator.class.getName());
}
@@ -657,45 +661,26 @@ public abstract class InputFormatBase<K,
* @return a list of iterators
* @see #addIterator(Configuration, IteratorSetting)
*/
- protected static List<AccumuloIterator> getIterators(Configuration conf) {
+ protected static List<IteratorSetting> getIterators(Configuration conf) {
String iterators = conf.get(ITERATORS);
// If no iterators are present, return an empty list
if (iterators == null || iterators.isEmpty())
- return new ArrayList<AccumuloIterator>();
+ return new ArrayList<IteratorSetting>();
// Compose the set of iterators encoded in the job configuration
StringTokenizer tokens = new StringTokenizer(conf.get(ITERATORS), ITERATORS_DELIM);
- List<AccumuloIterator> list = new ArrayList<AccumuloIterator>();
- while (tokens.hasMoreTokens()) {
- String itstring = tokens.nextToken();
- list.add(new AccumuloIterator(itstring));
- }
- return list;
- }
-
- /**
- * Gets a list of the iterator options specified on this configuration.
- *
- * @param conf
- * the Hadoop configuration object
- * @return a list of iterator options
- * @see #addIterator(Configuration, IteratorSetting)
- */
- protected static List<AccumuloIteratorOption> getIteratorOptions(Configuration conf) {
- String iteratorOptions = conf.get(ITERATORS_OPTIONS);
-
- // If no options are present, return an empty list
- if (iteratorOptions == null || iteratorOptions.isEmpty())
- return new ArrayList<AccumuloIteratorOption>();
-
- // Compose the set of options encoded in the job configuration
- StringTokenizer tokens = new StringTokenizer(conf.get(ITERATORS_OPTIONS), ITERATORS_DELIM);
- List<AccumuloIteratorOption> list = new ArrayList<AccumuloIteratorOption>();
- while (tokens.hasMoreTokens()) {
- String optionString = tokens.nextToken();
- list.add(new AccumuloIteratorOption(optionString));
+ List<IteratorSetting> list = new ArrayList<IteratorSetting>();
+ try {
+ while (tokens.hasMoreTokens()) {
+ String itstring = tokens.nextToken();
+ ByteArrayInputStream bais = new ByteArrayInputStream(Base64.decodeBase64(itstring.getBytes()));
+ list.add(new IteratorSetting(new DataInputStream(bais)));
+ bais.close();
+ }
+ } catch (IOException e) {
+ throw new IllegalArgumentException("couldn't decode iterator settings");
}
return list;
}
@@ -715,18 +700,9 @@ public abstract class InputFormatBase<K,
* @throws AccumuloException
*/
protected void setupIterators(Configuration conf, Scanner scanner) throws AccumuloException {
- List<AccumuloIterator> iterators = getIterators(conf);
- List<AccumuloIteratorOption> options = getIteratorOptions(conf);
-
- Map<String,IteratorSetting> scanIterators = new HashMap<String,IteratorSetting>();
- for (AccumuloIterator iterator : iterators) {
- scanIterators.put(iterator.getIteratorName(), new IteratorSetting(iterator.getPriority(), iterator.getIteratorName(), iterator.getIteratorClass()));
- }
- for (AccumuloIteratorOption option : options) {
- scanIterators.get(option.iteratorName).addOption(option.getKey(), option.getValue());
- }
- for (AccumuloIterator iterator : iterators) {
- scanner.addScanIterator(scanIterators.get(iterator.getIteratorName()));
+ List<IteratorSetting> iterators = getIterators(conf);
+ for (IteratorSetting iterator : iterators) {
+ scanner.addScanIterator(iterator);
}
}
@@ -858,7 +834,7 @@ public abstract class InputFormatBase<K,
Range metadataRange = new Range(new KeyExtent(new Text(tableId), startRow, null).getMetadataEntry(), true, null, false);
Scanner scanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
- ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN);
+ Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner);
scanner.fetchColumnFamily(Constants.METADATA_LAST_LOCATION_COLUMN_FAMILY);
scanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
scanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY);
@@ -1078,13 +1054,13 @@ public abstract class InputFormatBase<K,
if (currentKey == null)
return 0f;
if (range.getStartKey() != null && range.getEndKey() != null) {
- if (range.getStartKey().compareTo(range.getEndKey(), PartialKey.ROW) != 0) {
+ if (!range.getStartKey().equals(range.getEndKey(), PartialKey.ROW)) {
// just look at the row progress
return getProgress(range.getStartKey().getRowData(), range.getEndKey().getRowData(), currentKey.getRowData());
- } else if (range.getStartKey().compareTo(range.getEndKey(), PartialKey.ROW_COLFAM) != 0) {
+ } else if (!range.getStartKey().equals(range.getEndKey(), PartialKey.ROW_COLFAM)) {
// just look at the column family progress
return getProgress(range.getStartKey().getColumnFamilyData(), range.getEndKey().getColumnFamilyData(), currentKey.getColumnFamilyData());
- } else if (range.getStartKey().compareTo(range.getEndKey(), PartialKey.ROW_COLFAM_COLQUAL) != 0) {
+ } else if (!range.getStartKey().equals(range.getEndKey(), PartialKey.ROW_COLFAM_COLQUAL)) {
// just look at the column qualifier progress
return getProgress(range.getStartKey().getColumnQualifierData(), range.getEndKey().getColumnQualifierData(), currentKey.getColumnQualifierData());
}
@@ -1143,101 +1119,4 @@ public abstract class InputFormatBase<K,
out.writeUTF(locations[i]);
}
}
-
- /**
- * The Class IteratorSetting. Encapsulates specifics for an Accumulo iterator's name & priority.
- */
- static class AccumuloIterator {
-
- private static final String FIELD_SEP = ":";
-
- private int priority;
- private String iteratorClass;
- private String iteratorName;
-
- public AccumuloIterator(int priority, String iteratorClass, String iteratorName) {
- this.priority = priority;
- this.iteratorClass = iteratorClass;
- this.iteratorName = iteratorName;
- }
-
- // Parses out a setting given an string supplied from an earlier toString() call
- public AccumuloIterator(String iteratorSetting) {
- // Parse the string to expand the iterator
- StringTokenizer tokenizer = new StringTokenizer(iteratorSetting, FIELD_SEP);
- priority = Integer.parseInt(tokenizer.nextToken());
- iteratorClass = tokenizer.nextToken();
- iteratorName = tokenizer.nextToken();
- }
-
- public int getPriority() {
- return priority;
- }
-
- public String getIteratorClass() {
- return iteratorClass;
- }
-
- public String getIteratorName() {
- return iteratorName;
- }
-
- @Override
- public String toString() {
- return new String(priority + FIELD_SEP + iteratorClass + FIELD_SEP + iteratorName);
- }
-
- }
-
- /**
- * The Class AccumuloIteratorOption. Encapsulates specifics for an Accumulo iterator's optional configuration details - associated via the iteratorName.
- */
- static class AccumuloIteratorOption {
- private static final String FIELD_SEP = ":";
-
- private String iteratorName;
- private String key;
- private String value;
-
- public AccumuloIteratorOption(String iteratorName, String key, String value) {
- this.iteratorName = iteratorName;
- this.key = key;
- this.value = value;
- }
-
- // Parses out an option given a string supplied from an earlier toString() call
- public AccumuloIteratorOption(String iteratorOption) {
- StringTokenizer tokenizer = new StringTokenizer(iteratorOption, FIELD_SEP);
- this.iteratorName = tokenizer.nextToken();
- try {
- this.key = URLDecoder.decode(tokenizer.nextToken(), "UTF-8");
- this.value = URLDecoder.decode(tokenizer.nextToken(), "UTF-8");
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
- public String getIteratorName() {
- return iteratorName;
- }
-
- public String getKey() {
- return key;
- }
-
- public String getValue() {
- return value;
- }
-
- @Override
- public String toString() {
- try {
- return new String(iteratorName + FIELD_SEP + URLEncoder.encode(key, "UTF-8") + FIELD_SEP + URLEncoder.encode(value, "UTF-8"));
- } catch (UnsupportedEncodingException e) {
- throw new RuntimeException(e);
- }
- }
-
- }
-
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockBatchScanner.java Sat Sep 29 05:42:59 2012
@@ -91,5 +91,4 @@ public class MockBatchScanner extends Mo
@Override
public void close() {}
-
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockConnector.java Sat Sep 29 05:42:59 2012
@@ -16,9 +16,12 @@
*/
package org.apache.accumulo.core.client.mock;
+import java.util.concurrent.TimeUnit;
+
import org.apache.accumulo.core.client.BatchDeleter;
import org.apache.accumulo.core.client.BatchScanner;
import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.Instance;
import org.apache.accumulo.core.client.MultiTableBatchWriter;
@@ -61,6 +64,13 @@ public class MockConnector extends Conne
}
@Override
+ public BatchDeleter createBatchDeleter(String tableName, Authorizations authorizations, int numQueryThreads, BatchWriterConfig config)
+ throws TableNotFoundException {
+ return createBatchDeleter(tableName, authorizations, numQueryThreads, config.getMaxMemory(), config.getMaxLatency(TimeUnit.MILLISECONDS),
+ config.getMaxWriteThreads());
+ }
+
+ @Override
public BatchWriter createBatchWriter(String tableName, long maxMemory, long maxLatency, int maxWriteThreads) throws TableNotFoundException {
if (acu.tables.get(tableName) == null)
throw new TableNotFoundException(tableName, tableName, "no such table");
@@ -68,11 +78,21 @@ public class MockConnector extends Conne
}
@Override
+ public BatchWriter createBatchWriter(String tableName, BatchWriterConfig config) throws TableNotFoundException {
+ return createBatchWriter(tableName, config.getMaxMemory(), config.getMaxLatency(TimeUnit.MILLISECONDS), config.getMaxWriteThreads());
+ }
+
+ @Override
public MultiTableBatchWriter createMultiTableBatchWriter(long maxMemory, long maxLatency, int maxWriteThreads) {
return new MockMultiTableBatchWriter(acu);
}
@Override
+ public MultiTableBatchWriter createMultiTableBatchWriter(BatchWriterConfig config) {
+ return createMultiTableBatchWriter(config.getMaxMemory(), config.getMaxLatency(TimeUnit.MILLISECONDS), config.getMaxWriteThreads());
+ }
+
+ @Override
public Scanner createScanner(String tableName, Authorizations authorizations) throws TableNotFoundException {
MockTable table = acu.tables.get(tableName);
if (table == null)
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockScanner.java Sat Sep 29 05:42:59 2012
@@ -19,6 +19,7 @@ package org.apache.accumulo.core.client.
import java.io.IOException;
import java.util.Iterator;
import java.util.Map.Entry;
+import java.util.concurrent.TimeUnit;
import org.apache.accumulo.core.client.Scanner;
import org.apache.accumulo.core.data.Key;
@@ -31,7 +32,6 @@ import org.apache.accumulo.core.security
public class MockScanner extends MockScannerBase implements Scanner {
- int timeOut = 0;
int batchSize = 0;
Range range = new Range();
@@ -41,12 +41,18 @@ public class MockScanner extends MockSca
@Override
public void setTimeOut(int timeOut) {
- this.timeOut = timeOut;
+ if (timeOut == Integer.MAX_VALUE)
+ setTimeout(Long.MAX_VALUE, TimeUnit.MILLISECONDS);
+ else
+ setTimeout(timeOut, TimeUnit.SECONDS);
}
@Override
public int getTimeOut() {
- return timeOut;
+ long timeout = getTimeout(TimeUnit.SECONDS);
+ if (timeout >= Integer.MAX_VALUE)
+ return Integer.MAX_VALUE;
+ return (int) timeout;
}
@Override
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/client/mock/MockTableOperations.java Sat Sep 29 05:42:59 2012
@@ -227,4 +227,14 @@ public class MockTableOperations extends
return FindMax.findMax(new MockScanner(table, auths), startRow, startInclusive, endRow, endInclusive);
}
+
+ @Override
+ public void importTable(String tableName, String exportDir) throws TableExistsException, AccumuloException, AccumuloSecurityException {
+ throw new NotImplementedException();
+ }
+
+ @Override
+ public void exportTable(String tableName, String exportDir) throws TableNotFoundException, AccumuloException, AccumuloSecurityException {
+ throw new NotImplementedException();
+ }
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/DefaultConfiguration.java Sat Sep 29 05:42:59 2012
@@ -30,7 +30,7 @@ public class DefaultConfiguration extend
private static DefaultConfiguration instance = null;
private static Logger log = Logger.getLogger(DefaultConfiguration.class);
- public static DefaultConfiguration getInstance() {
+ synchronized public static DefaultConfiguration getInstance() {
if (instance == null) {
instance = new DefaultConfiguration();
ConfigSanityCheck.validate(instance);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/Property.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/Property.java Sat Sep 29 05:42:59 2012
@@ -21,6 +21,8 @@ import java.util.HashSet;
import java.util.Set;
import org.apache.accumulo.core.file.rfile.RFile;
+import org.apache.accumulo.core.util.format.DefaultFormatter;
+import org.apache.accumulo.core.util.interpret.DefaultScanInterpreter;
import org.apache.accumulo.start.classloader.AccumuloClassLoader;
public enum Property {
@@ -280,8 +282,10 @@ public enum Property {
+ "For example table.group.group1=x,y,z sets the column families for a group called group1. Once configured, "
+ "group1 can be enabled by adding it to the list of groups in the " + TABLE_LOCALITY_GROUPS.getKey() + " property.<br />"
+ "Additional group options may be specified for a named group by setting table.group.<name>.opt.<key>=<value>."),
- TABLE_FORMATTER_CLASS("table.formatter", "org.apache.accumulo.core.util.format.DefaultFormatter", PropertyType.STRING,
- "The Formatter class to apply on results in the shell");
+ TABLE_FORMATTER_CLASS("table.formatter", DefaultFormatter.class.getName(), PropertyType.STRING,
+ "The Formatter class to apply on results in the shell"),
+ TABLE_INTERPRETER_CLASS("table.interepreter", DefaultScanInterpreter.class.getName(), PropertyType.STRING,
+ "The ScanInterpreter class to apply on scan arguments in the shell");
private String key, defaultValue, description;
private PropertyType type;
@@ -315,17 +319,14 @@ public enum Property {
private static HashSet<String> validTableProperties = null;
- public static boolean isValidTablePropertyKey(String key) {
- if (validTableProperties == null) {
- synchronized (Property.class) {
- if (validTableProperties == null) {
- HashSet<String> tmp = new HashSet<String>();
- for (Property p : Property.values())
- if (!p.getType().equals(PropertyType.PREFIX) && p.getKey().startsWith(Property.TABLE_PREFIX.getKey()))
- tmp.add(p.getKey());
- validTableProperties = tmp;
+ public synchronized static boolean isValidTablePropertyKey(String key) {
+ if (validTableProperties == null) {
+ validTableProperties = new HashSet<String>();
+ for (Property p : Property.values()) {
+ if (!p.getType().equals(PropertyType.PREFIX) && p.getKey().startsWith(Property.TABLE_PREFIX.getKey())) {
+ validTableProperties.add(p.getKey());
+ }
}
- }
}
return validTableProperties.contains(key) || key.startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey())
@@ -356,4 +357,15 @@ public enum Property {
return prop;
return null;
}
+
+ /**
+ *
+ * @param key
+ * @return true if this is a property whose value is expected to be a java class
+ */
+ public static boolean isClassProperty(String key) {
+ return (key.startsWith(Property.TABLE_CONSTRAINT_PREFIX.getKey()) && key.substring(Property.TABLE_CONSTRAINT_PREFIX.getKey().length()).split("\\.").length == 1)
+ || (key.startsWith(Property.TABLE_ITERATOR_PREFIX.getKey()) && key.substring(Property.TABLE_ITERATOR_PREFIX.getKey().length()).split("\\.").length == 2)
+ || key.equals(Property.TABLE_LOAD_BALANCER.getKey());
+ }
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/conf/SiteConfiguration.java Sat Sep 29 05:42:59 2012
@@ -35,7 +35,7 @@ public class SiteConfiguration extends A
SiteConfiguration.parent = parent;
}
- public static SiteConfiguration getInstance(AccumuloConfiguration parent) {
+ synchronized public static SiteConfiguration getInstance(AccumuloConfiguration parent) {
if (instance == null) {
instance = new SiteConfiguration(parent);
ConfigSanityCheck.validate(instance);
@@ -43,7 +43,7 @@ public class SiteConfiguration extends A
return instance;
}
- private static Configuration getXmlConfig() {
+ synchronized private static Configuration getXmlConfig() {
String configFile = System.getProperty("org.apache.accumulo.config.file", "accumulo-site.xml");
if (xmlConfig == null) {
xmlConfig = new Configuration(false);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/KeyExtent.java Sat Sep 29 05:42:59 2012
@@ -42,7 +42,6 @@ import java.util.WeakHashMap;
import org.apache.accumulo.core.Constants;
import org.apache.accumulo.core.data.thrift.TKeyExtent;
import org.apache.accumulo.core.util.ByteBufferUtil;
-import org.apache.accumulo.core.util.ColumnFQ;
import org.apache.accumulo.core.util.TextUtil;
import org.apache.hadoop.io.BinaryComparable;
import org.apache.hadoop.io.Text;
@@ -396,7 +395,7 @@ public class KeyExtent implements Writab
public static Mutation getPrevRowUpdateMutation(KeyExtent ke) {
Mutation m = new Mutation(ke.getMetadataEntry());
- ColumnFQ.put(m, Constants.METADATA_PREV_ROW_COLUMN, encodePrevEndRow(ke.getPrevEndRow()));
+ Constants.METADATA_PREV_ROW_COLUMN.put(m, encodePrevEndRow(ke.getPrevEndRow()));
return m;
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Range.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Range.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Range.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Range.java Sat Sep 29 05:42:59 2012
@@ -364,7 +364,7 @@ public class Range implements WritableCo
startKeysEqual = true;
} else if (currentRange.infiniteStartKey) {
startKeysEqual = false;
- } else if (currentRange.start.compareTo(range.start) == 0) {
+ } else if (currentRange.start.equals(range.start)) {
startKeysEqual = true;
} else {
startKeysEqual = false;
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Value.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Value.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Value.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/Value.java Sat Sep 29 05:42:59 2012
@@ -199,12 +199,13 @@ public class Value implements WritableCo
@Override
public String toString() {
+ String retValue = "";
try {
- return new String(get(), Constants.VALUE_ENCODING);
+ retValue = new String(get(), Constants.VALUE_ENCODING);
} catch (UnsupportedEncodingException e) {
log.error(e.toString());
- return null;
}
+ return retValue;
}
/**
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java Sat Sep 29 05:42:59 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public MultiScanResult result; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SCAN_ID((short)1, "scanID"),
RESULT((short)2, "result");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialScan.java Sat Sep 29 05:42:59 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public ScanResult result; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
SCAN_ID((short)1, "scanID"),
RESULT((short)2, "result");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/IterInfo.java Sat Sep 29 05:42:59 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
public String iterName; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
PRIORITY((short)1, "priority"),
CLASS_NAME((short)2, "className"),
ITER_NAME((short)3, "iterName");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MapFileInfo.java Sat Sep 29 05:42:59 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
public long estimatedSize; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
ESTIMATED_SIZE((short)1, "estimatedSize");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java Sat Sep 29 05:42:59 2012
@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
public boolean more; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
RESULTS((short)1, "results"),
FAILURES((short)2, "failures"),
FULL_SCANS((short)3, "fullScans"),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/ScanResult.java Sat Sep 29 05:42:59 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public boolean more; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
RESULTS((short)1, "results"),
MORE((short)2, "more");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TColumn.java Sat Sep 29 05:42:59 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer columnVisibility; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
COLUMN_FAMILY((short)1, "columnFamily"),
COLUMN_QUALIFIER((short)2, "columnQualifier"),
COLUMN_VISIBILITY((short)3, "columnVisibility");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TConstraintViolationSummary.java Sat Sep 29 05:42:59 2012
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
public long numberOfViolatingMutations; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
CONSTRAIN_CLASS((short)1, "constrainClass"),
VIOLATION_CODE((short)2, "violationCode"),
VIOLATION_DESCRIPTION((short)3, "violationDescription"),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java Sat Sep 29 05:42:59 2012
@@ -49,7 +49,7 @@ import org.slf4j.LoggerFactory;
public long timestamp; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
ROW((short)1, "row"),
COL_FAMILY((short)2, "colFamily"),
COL_QUALIFIER((short)3, "colQualifier"),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyExtent.java Sat Sep 29 05:42:59 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer prevEndRow; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
TABLE((short)1, "table"),
END_ROW((short)2, "endRow"),
PREV_END_ROW((short)3, "prevEndRow");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TKeyValue.java Sat Sep 29 05:42:59 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer value; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
KEY((short)1, "key"),
VALUE((short)2, "value");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TMutation.java Sat Sep 29 05:42:59 2012
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
public int entries; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
ROW((short)1, "row"),
DATA((short)2, "data"),
VALUES((short)3, "values"),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java Sat Sep 29 05:42:59 2012
@@ -51,7 +51,7 @@ import org.slf4j.LoggerFactory;
public boolean infiniteStopKey; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
START((short)1, "start"),
STOP((short)2, "stop"),
START_KEY_INCLUSIVE((short)3, "startKeyInclusive"),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java Sat Sep 29 05:42:59 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
public List<TKeyExtent> authorizationFailures; // required
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
- public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
FAILED_EXTENTS((short)1, "failedExtents"),
VIOLATION_SUMMARIES((short)2, "violationSummaries"),
AUTHORIZATION_FAILURES((short)3, "authorizationFailures");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/BloomFilterLayer.java Sat Sep 29 05:42:59 2012
@@ -440,7 +440,7 @@ public class BloomFilterLayer {
long t2 = System.currentTimeMillis();
- out.printf("write rate %6.2f\n", vals.size() / ((t2 - t1) / 1000.0));
+ out.printf("write rate %6.2f%n", vals.size() / ((t2 - t1) / 1000.0));
bmfw.close();
@@ -468,7 +468,7 @@ public class BloomFilterLayer {
t2 = System.currentTimeMillis();
- out.printf("random lookup rate : %6.2f\n", 5000 / ((t2 - t1) / 1000.0));
+ out.printf("random lookup rate : %6.2f%n", 5000 / ((t2 - t1) / 1000.0));
out.println("hits = " + hits);
int count = 0;
@@ -495,7 +495,7 @@ public class BloomFilterLayer {
t2 = System.currentTimeMillis();
- out.printf("existant lookup rate %6.2f\n", 500 / ((t2 - t1) / 1000.0));
+ out.printf("existant lookup rate %6.2f%n", 500 / ((t2 - t1) / 1000.0));
out.println("expected hits 500. Receive hits: " + count);
bmfr.close();
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/FileUtil.java Sat Sep 29 05:42:59 2012
@@ -338,7 +338,7 @@ public class FileUtil {
long t2 = System.currentTimeMillis();
- log.debug(String.format("Found midPoint from indexes in %6.2f secs.\n", ((t2 - t1) / 1000.0)));
+ log.debug(String.format("Found midPoint from indexes in %6.2f secs.%n", ((t2 - t1) / 1000.0)));
ret.put(.5, mmfi.getTopKey());
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/file/blockfile/ABlockReader.java Sat Sep 29 05:42:59 2012
@@ -37,10 +37,17 @@ public interface ABlockReader extends Da
/**
* An indexable block supports seeking, getting a position, and associating an arbitrary index with the block
*
- * @return
+ * @return true, if the block is indexable; otherwise false.
*/
public boolean isIndexable();
+
public void seek(int position);
+
+ /** Get the file position.
+
+ * @return the file position.
+ */
public int getPosition();
+
<T> T getIndex(Class<T> clazz);
}