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 [5/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/tabletserver/thrift/TabletClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java Sat Sep 29 05:42:59 2012
@@ -2306,7 +2306,7 @@ import org.slf4j.LoggerFactory;
public boolean isolated; // 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)11, "tinfo"),
CREDENTIALS((short)1, "credentials"),
EXTENT((short)2, "extent"),
@@ -3916,7 +3916,7 @@ import org.slf4j.LoggerFactory;
public TooManyFilesException tmfe; // 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"),
NSTE((short)2, "nste"),
@@ -4573,7 +4573,7 @@ import org.slf4j.LoggerFactory;
public long scanID; // 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"),
SCAN_ID((short)1, "scanID");
@@ -5031,7 +5031,7 @@ import org.slf4j.LoggerFactory;
public TooManyFilesException tmfe; // 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"),
NSSI((short)1, "nssi"),
NSTE((short)2, "nste"),
@@ -5688,7 +5688,7 @@ import org.slf4j.LoggerFactory;
public long scanID; // 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"),
SCAN_ID((short)1, "scanID");
@@ -6154,7 +6154,7 @@ import org.slf4j.LoggerFactory;
public boolean waitForWrites; // 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)8, "tinfo"),
CREDENTIALS((short)1, "credentials"),
BATCH((short)2, "batch"),
@@ -7559,7 +7559,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");
@@ -8016,7 +8016,7 @@ import org.slf4j.LoggerFactory;
public long scanID; // 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"),
SCAN_ID((short)1, "scanID");
@@ -8470,7 +8470,7 @@ import org.slf4j.LoggerFactory;
public NoSuchScanIDException nssi; // 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"),
NSSI((short)1, "nssi");
@@ -8927,7 +8927,7 @@ import org.slf4j.LoggerFactory;
public long scanID; // 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"),
SCAN_ID((short)1, "scanID");
@@ -9379,7 +9379,7 @@ import org.slf4j.LoggerFactory;
public NoSuchScanIDException nssi; // 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 {
NSSI((short)1, "nssi");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -9736,7 +9736,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");
@@ -10193,7 +10193,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");
@@ -10514,8 +10514,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);
@@ -10651,7 +10649,7 @@ import org.slf4j.LoggerFactory;
public List<org.apache.accumulo.core.data.thrift.TMutation> mutations; // 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"),
UPDATE_ID((short)2, "updateID"),
KEY_EXTENT((short)3, "keyExtent"),
@@ -11357,7 +11355,7 @@ import org.slf4j.LoggerFactory;
public long updateID; // 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"),
UPDATE_ID((short)1, "updateID");
@@ -11811,7 +11809,7 @@ import org.slf4j.LoggerFactory;
public NoSuchScanIDException nssi; // 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"),
NSSI((short)1, "nssi");
@@ -12272,7 +12270,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.data.thrift.TMutation mutation; // 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"),
KEY_EXTENT((short)2, "keyExtent"),
@@ -12931,7 +12929,7 @@ import org.slf4j.LoggerFactory;
public ConstraintViolationException cve; // 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"),
NSTE((short)2, "nste"),
CVE((short)3, "cve");
@@ -13494,7 +13492,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)3, "tinfo"),
CREDENTIALS((short)1, "credentials"),
TID((short)4, "tid"),
@@ -14329,7 +14327,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");
@@ -14842,7 +14840,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer splitPoint; // 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"),
EXTENT((short)2, "extent"),
@@ -15508,7 +15506,7 @@ import org.slf4j.LoggerFactory;
public NotServingTabletException nste; // 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"),
NSTE((short)2, "nste");
@@ -15969,7 +15967,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // 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"),
LOCK((short)4, "lock"),
@@ -16630,7 +16628,7 @@ import org.slf4j.LoggerFactory;
public boolean save; // 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"),
LOCK((short)4, "lock"),
@@ -17390,7 +17388,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer endRow; // 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"),
LOCK((short)3, "lock"),
@@ -18265,7 +18263,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // 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"),
LOCK((short)3, "lock"),
@@ -18924,7 +18922,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // 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"),
LOCK((short)3, "lock"),
@@ -19587,7 +19585,7 @@ import org.slf4j.LoggerFactory;
public ByteBuffer endRow; // 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"),
LOCK((short)3, "lock"),
@@ -20458,7 +20456,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)3, "tinfo"),
CREDENTIALS((short)1, "credentials");
@@ -20915,7 +20913,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");
@@ -21374,7 +21372,7 @@ import org.slf4j.LoggerFactory;
public String tableId; // 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"),
TABLE_ID((short)2, "tableId");
@@ -21929,7 +21927,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");
@@ -22438,7 +22436,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");
@@ -22895,7 +22893,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");
@@ -23354,7 +23352,7 @@ import org.slf4j.LoggerFactory;
public String lock; // 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"),
LOCK((short)2, "lock");
@@ -23907,7 +23905,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>();
@@ -24266,7 +24264,7 @@ import org.slf4j.LoggerFactory;
public String lock; // 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"),
LOCK((short)2, "lock");
@@ -24821,7 +24819,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");
@@ -25278,7 +25276,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");
@@ -25789,7 +25787,7 @@ import org.slf4j.LoggerFactory;
public List<String> filenames; // 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"),
FILENAMES((short)3, "filenames");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java Sat Sep 29 05:42:59 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
public List<org.apache.accumulo.core.data.thrift.TMutation> mutations; // 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 {
TABLET_ID((short)1, "tabletID"),
SEQ((short)2, "seq"),
MUTATIONS((short)3, "mutations");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java Sat Sep 29 05:42:59 2012
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
public long splitCreationTime; // 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 {
EXTENT((short)1, "extent"),
MAJOR((short)2, "major"),
MINOR((short)3, "minor"),
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java Sat Sep 29 05:42:59 2012
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // 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 {
EXTENT((short)1, "extent");
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/trace/TraceFormatter.java Sat Sep 29 05:42:59 2012
@@ -81,19 +81,19 @@ public class TraceFormatter implements F
SimpleDateFormat dateFormatter = new SimpleDateFormat(DATE_FORMAT);
RemoteSpan span = getRemoteSpan(next);
result.append("----------------------\n");
- result.append(String.format(" %12s:%s\n", "name", span.description));
- result.append(String.format(" %12s:%s\n", "trace", Long.toHexString(span.traceId)));
- result.append(String.format(" %12s:%s\n", "loc", span.svc + "@" + span.sender));
- result.append(String.format(" %12s:%s\n", "span", Long.toHexString(span.spanId)));
- result.append(String.format(" %12s:%s\n", "parent", Long.toHexString(span.parentId)));
- result.append(String.format(" %12s:%s\n", "start", dateFormatter.format(span.start)));
- result.append(String.format(" %12s:%s\n", "ms", span.stop - span.start));
+ result.append(String.format(" %12s:%s%n", "name", span.description));
+ result.append(String.format(" %12s:%s%n", "trace", Long.toHexString(span.traceId)));
+ result.append(String.format(" %12s:%s%n", "loc", span.svc + "@" + span.sender));
+ result.append(String.format(" %12s:%s%n", "span", Long.toHexString(span.spanId)));
+ result.append(String.format(" %12s:%s%n", "parent", Long.toHexString(span.parentId)));
+ result.append(String.format(" %12s:%s%n", "start", dateFormatter.format(span.start)));
+ result.append(String.format(" %12s:%s%n", "ms", span.stop - span.start));
for (Entry<String,String> entry : span.data.entrySet()) {
- result.append(String.format(" %12s:%s\n", entry.getKey(), entry.getValue()));
+ result.append(String.format(" %12s:%s%n", entry.getKey(), entry.getValue()));
}
if (printTimeStamps) {
- result.append(String.format(" %-12s:%d\n", "timestamp", next.getKey().getTimestamp()));
+ result.append(String.format(" %-12s:%d%n", "timestamp", next.getKey().getTimestamp()));
}
return result.toString();
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ColumnFQ.java Sat Sep 29 05:42:59 2012
@@ -60,18 +60,39 @@ public class ColumnFQ implements Compara
return new Column(TextUtil.getBytes(colf), TextUtil.getBytes(colq), null);
}
+ public void fetch(ScannerBase sb) {
+ sb.fetchColumn(colf, colq);
+ }
+
+ public void put(Mutation m, Value v) {
+ m.put(colf, colq, v);
+ }
+
+ public void putDelete(Mutation m) {
+ m.putDelete(colf, colq);
+ }
+
+ /**
+ * @deprecated since 1.5, use {@link #fetch(ScannerBase)} instead
+ */
public static void fetch(ScannerBase sb, ColumnFQ cfq) {
sb.fetchColumn(cfq.colf, cfq.colq);
}
+ /**
+ * @deprecated since 1.5, use {@link #put(Mutation, Value)} instead
+ */
public static void put(Mutation m, ColumnFQ cfq, Value v) {
m.put(cfq.colf, cfq.colq, v);
}
+ /**
+ * @deprecated since 1.5, use {@link #putDelete(Mutation)} instead
+ */
public static void putDelete(Mutation m, ColumnFQ cfq) {
m.putDelete(cfq.colf, cfq.colq);
}
-
+
@Override
public boolean equals(Object o) {
if (!(o instanceof ColumnFQ))
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/Merge.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/Merge.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/Merge.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/Merge.java Sat Sep 29 05:42:59 2012
@@ -243,7 +243,7 @@ public class Merge {
}
scanner.setRange(new KeyExtent(new Text(tableId), end, start).toMetadataRange());
scanner.fetchColumnFamily(Constants.METADATA_DATAFILE_COLUMN_FAMILY);
- ColumnFQ.fetch(scanner, Constants.METADATA_PREV_ROW_COLUMN);
+ Constants.METADATA_PREV_ROW_COLUMN.fetch(scanner);
final Iterator<Entry<Key,Value>> iterator = scanner.iterator();
Iterator<Size> result = new Iterator<Size>() {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/MetadataTable.java Sat Sep 29 05:42:59 2012
@@ -211,7 +211,7 @@ public class MetadataTable {
if (columns != null) {
for (ColumnFQ column : columns)
- ColumnFQ.fetch(scanner, column);
+ column.fetch(scanner);
}
scanner.setRange(new Range(new Key(startRow), true, new Key(endRow).followingKey(PartialKey.ROW), false));
@@ -236,7 +236,7 @@ public class MetadataTable {
Scanner scanner = instance.getConnector(credentials.user, credentials.password).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_CURRENT_LOCATION_COLUMN_FAMILY);
// position at first entry in metadata table for given table
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/StopWatch.java Sat Sep 29 05:42:59 2012
@@ -75,7 +75,7 @@ public class StopWatch<K extends Enum<K>
public synchronized void print() {
for (K timer : totalTime.keySet()) {
- System.out.printf("%20s : %,6.4f secs\n", timer.toString(), get(timer) / 1000.0);
+ System.out.printf("%20s : %,6.4f secs%n", timer.toString(), get(timer) / 1000.0);
}
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/TableDiskUsage.java Sat Sep 29 05:42:59 2012
@@ -204,7 +204,7 @@ public class TableDiskUsage {
}
for (Entry<TreeSet<String>,Long> entry : usage.entrySet())
- System.out.printf("%,24d %s\n", entry.getValue(), entry.getKey());
+ System.out.printf("%,24d %s%n", entry.getValue(), entry.getKey());
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/ThriftUtil.java Sat Sep 29 05:42:59 2012
@@ -97,8 +97,13 @@ public class ThriftUtil {
static public <T extends TServiceClient> T getClient(TServiceClientFactory<T> factory, String address, Property property, Property timeoutProperty,
AccumuloConfiguration configuration) throws TTransportException {
+ return getClient(factory, address, property, configuration.getTimeInMillis(timeoutProperty), configuration);
+ }
+
+ static public <T extends TServiceClient> T getClient(TServiceClientFactory<T> factory, String address, Property property, long timeout,
+ AccumuloConfiguration configuration) throws TTransportException {
int port = configuration.getPort(property);
- TTransport transport = ThriftTransportPool.getInstance().getTransport(address, port, configuration.getTimeInMillis(timeoutProperty));
+ TTransport transport = ThriftTransportPool.getInstance().getTransport(address, port, timeout);
return createClient(factory, transport);
}
@@ -112,6 +117,10 @@ public class ThriftUtil {
return getClient(new TabletClientService.Client.Factory(), address, Property.TSERV_CLIENTPORT, Property.GENERAL_RPC_TIMEOUT, conf);
}
+ static public TabletClientService.Client getTServerClient(String address, AccumuloConfiguration conf, long timeout) throws TTransportException {
+ return getClient(new TabletClientService.Client.Factory(), address, Property.TSERV_CLIENTPORT, timeout, conf);
+ }
+
public static void execute(String address, AccumuloConfiguration conf, ClientExec<TabletClientService.Client> exec) throws AccumuloException,
AccumuloSecurityException {
while (true) {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/format/DeleterFormatter.java Sat Sep 29 05:42:59 2012
@@ -88,7 +88,7 @@ public class DeleterFormatter extends De
log.trace(cvs.toString());
}
}
- shellState.getReader().printString(String.format("[%s] %s\n", delete ? "DELETED" : "SKIPPED", entryStr));
+ shellState.getReader().printString(String.format("[%s] %s%n", delete ? "DELETED" : "SKIPPED", entryStr));
} catch (IOException e) {
log.error("Cannot write to console", e);
throw new RuntimeException(e);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java Sat Sep 29 05:42:59 2012
@@ -88,6 +88,7 @@ import org.apache.accumulo.core.util.she
import org.apache.accumulo.core.util.shell.commands.EGrepCommand;
import org.apache.accumulo.core.util.shell.commands.ExecfileCommand;
import org.apache.accumulo.core.util.shell.commands.ExitCommand;
+import org.apache.accumulo.core.util.shell.commands.ExportTableCommand;
import org.apache.accumulo.core.util.shell.commands.FlushCommand;
import org.apache.accumulo.core.util.shell.commands.FormatterCommand;
import org.apache.accumulo.core.util.shell.commands.GetAuthsCommand;
@@ -99,8 +100,10 @@ import org.apache.accumulo.core.util.she
import org.apache.accumulo.core.util.shell.commands.HiddenCommand;
import org.apache.accumulo.core.util.shell.commands.HistoryCommand;
import org.apache.accumulo.core.util.shell.commands.ImportDirectoryCommand;
+import org.apache.accumulo.core.util.shell.commands.ImportTableCommand;
import org.apache.accumulo.core.util.shell.commands.InfoCommand;
import org.apache.accumulo.core.util.shell.commands.InsertCommand;
+import org.apache.accumulo.core.util.shell.commands.InterpreterCommand;
import org.apache.accumulo.core.util.shell.commands.ListIterCommand;
import org.apache.accumulo.core.util.shell.commands.ListScansCommand;
import org.apache.accumulo.core.util.shell.commands.MaxRowCommand;
@@ -289,7 +292,7 @@ public class Shell extends ShellOptions
rootToken = new Token();
Command[] dataCommands = {new DeleteCommand(), new DeleteManyCommand(), new DeleteRowsCommand(), new EGrepCommand(), new FormatterCommand(),
- new GrepCommand(), new ImportDirectoryCommand(), new InsertCommand(), new MaxRowCommand(), new ScanCommand()};
+ new InterpreterCommand(), new GrepCommand(), new ImportDirectoryCommand(), new InsertCommand(), new MaxRowCommand(), new ScanCommand()};
Command[] debuggingCommands = {new ClasspathCommand(), new DebugCommand(), new ListScansCommand(), new TraceCommand()};
Command[] execCommands = {new ExecfileCommand(), new HistoryCommand()};
Command[] exitCommands = {new ByeCommand(), new ExitCommand(), new QuitCommand()};
@@ -301,7 +304,8 @@ public class Shell extends ShellOptions
Command[] stateCommands = {new AuthenticateCommand(), new ClsCommand(), new ClearCommand(), new NoTableCommand(), new SleepCommand(), new TableCommand(),
new UserCommand(), new WhoAmICommand()};
Command[] tableCommands = {new CloneTableCommand(), new ConfigCommand(), new CreateTableCommand(), new DeleteTableCommand(), new DropTableCommand(),
- new DUCommand(), new OfflineCommand(), new OnlineCommand(), new RenameTableCommand(), new TablesCommand()};
+ new DUCommand(), new ExportTableCommand(), new ImportTableCommand(), new OfflineCommand(), new OnlineCommand(), new RenameTableCommand(),
+ new TablesCommand()};
Command[] tableControlCommands = {new AddSplitsCommand(), new CompactCommand(), new ConstraintCommand(), new FlushCommand(), new GetGroupsCommand(),
new GetSplitsCommand(), new MergeCommand(), new SetGroupsCommand()};
Command[] userCommands = {new CreateUserCommand(), new DeleteUserCommand(), new DropUserCommand(), new GetAuthsCommand(), new PasswdCommand(),
@@ -437,7 +441,7 @@ public class Shell extends ShellOptions
if (disableAuthTimeout)
sb.append("- Authorization timeout: disabled\n");
else
- sb.append("- Authorization timeout: ").append(String.format("%.2fs\n", authTimeout / 1000.0));
+ sb.append("- Authorization timeout: ").append(String.format("%.2fs%n", authTimeout / 1000.0));
sb.append("- Debug: ").append(isDebuggingEnabled() ? "on" : "off").append("\n");
if (!scanIteratorOptions.isEmpty()) {
for (Entry<String,List<IteratorSetting>> entry : scanIteratorOptions.entrySet()) {
@@ -809,12 +813,6 @@ public class Shell extends ShellOptions
}
}
- public final void printRecords(Iterable<Entry<Key,Value>> scanner, boolean printTimestamps, boolean paginate) throws IOException {
- Class<? extends Formatter> formatterClass = getFormatter();
-
- printRecords(scanner, printTimestamps, paginate, formatterClass);
- }
-
public final void printRecords(Iterable<Entry<Key,Value>> scanner, boolean printTimestamps, boolean paginate, Class<? extends Formatter> formatterClass)
throws IOException {
printLines(FormatterFactory.getFormatter(formatterClass, scanner, printTimestamps), paginate);
@@ -841,12 +839,12 @@ public class Shell extends ShellOptions
printException(cve, "");
int COL1 = 50, COL2 = 14;
int col3 = Math.max(1, Math.min(Integer.MAX_VALUE, reader.getTermwidth() - COL1 - COL2 - 6));
- logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
- logError(String.format("%-" + COL1 + "s | %" + COL2 + "s | %-" + col3 + "s\n", "Constraint class", "Violation code", "Violation Description"));
- logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+ logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+ logError(String.format("%-" + COL1 + "s | %" + COL2 + "s | %-" + col3 + "s%n", "Constraint class", "Violation code", "Violation Description"));
+ logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
for (TConstraintViolationSummary cvs : cve.violationSummaries)
- logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s\n", cvs.constrainClass, cvs.violationCode, cvs.violationDescription));
- logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s\n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
+ logError(String.format("%-" + COL1 + "s | %" + COL2 + "d | %-" + col3 + "s%n", cvs.constrainClass, cvs.violationCode, cvs.violationDescription));
+ logError(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%" + col3 + "s%n", repeat("-", COL1), repeat("-", COL2), repeat("-", col3)));
}
public final void printException(Exception e) {
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AboutCommand.java Sat Sep 29 05:42:59 2012
@@ -33,10 +33,11 @@ public class AboutCommand extends Comman
}
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws IOException {
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
shellState.printInfo();
- if (cl.hasOption(verboseOption.getOpt()))
+ if (cl.hasOption(verboseOption.getOpt())) {
shellState.printVerboseInfo();
+ }
return 0;
}
@@ -47,7 +48,7 @@ public class AboutCommand extends Comman
@Override
public Options getOptions() {
- Options opts = new Options();
+ final Options opts = new Options();
verboseOption = new Option("v", "verbose", false, "display detailed session information");
opts.addOption(verboseOption);
return opts;
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveScanIterator.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveScanIterator.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveScanIterator.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ActiveScanIterator.java Sat Sep 29 05:42:59 2012
@@ -33,25 +33,26 @@ class ActiveScanIterator implements Iter
private Iterator<String> scansIter;
private void readNext() {
- List<String> scans = new ArrayList<String>();
+ final List<String> scans = new ArrayList<String>();
while (tsIter.hasNext()) {
- String tserver = tsIter.next();
+ final String tserver = tsIter.next();
try {
- List<ActiveScan> asl = instanceOps.getActiveScans(tserver);
+ final List<ActiveScan> asl = instanceOps.getActiveScans(tserver);
- for (ActiveScan as : asl)
+ for (ActiveScan as : asl) {
scans.add(String.format("%21s |%21s |%9s |%9s |%7s |%6s |%8s |%8s |%10s |%10s |%10s | %s", tserver, as.getClient(),
Duration.format(as.getAge(), "", "-"), Duration.format(as.getLastContactTime(), "", "-"), as.getState(), as.getType(), as.getUser(),
as.getTable(), as.getColumns(), (as.getType() == ScanType.SINGLE ? as.getExtent() : "N/A"), as.getSsiList(), as.getSsio()));
-
+ }
} catch (Exception e) {
scans.add(tserver + " ERROR " + e.getMessage());
}
- if (scans.size() > 0)
+ if (scans.size() > 0) {
break;
+ }
}
scansIter = scans.iterator();
@@ -61,7 +62,7 @@ class ActiveScanIterator implements Iter
this.instanceOps = instanceOps;
this.tsIter = tservers.iterator();
- String header = String.format(" %-21s| %-21s| %-9s| %-9s| %-7s| %-6s| %-8s| %-8s| %-10s| %-10s| %-10s | %s", "TABLET SERVER", "CLIENT", "AGE", "LAST",
+ final String header = String.format(" %-21s| %-21s| %-9s| %-9s| %-7s| %-6s| %-8s| %-8s| %-10s| %-10s| %-10s | %s", "TABLET SERVER", "CLIENT", "AGE", "LAST",
"STATE", "TYPE", "USER", "TABLE", "COLUMNS", "TABLET", "ITERATORS", "ITERATOR OPTIONS");
scansIter = Collections.singletonList(header).iterator();
@@ -74,7 +75,7 @@ class ActiveScanIterator implements Iter
@Override
public String next() {
- String next = scansIter.next();
+ final String next = scansIter.next();
if (!scansIter.hasNext())
readNext();
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java Sat Sep 29 05:42:59 2012
@@ -32,33 +32,35 @@ import org.apache.hadoop.io.Text;
public class AddSplitsCommand extends Command {
private Option optSplitsFile, base64Opt;
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
- String tableName = OptUtil.getTableOpt(cl, shellState);
- boolean decode = cl.hasOption(base64Opt.getOpt());
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
+ final String tableName = OptUtil.getTableOpt(cl, shellState);
+ final boolean decode = cl.hasOption(base64Opt.getOpt());
- TreeSet<Text> splits = new TreeSet<Text>();
+ final TreeSet<Text> splits = new TreeSet<Text>();
if (cl.hasOption(optSplitsFile.getOpt())) {
- String f = cl.getOptionValue(optSplitsFile.getOpt());
+ final String f = cl.getOptionValue(optSplitsFile.getOpt());
String line;
java.util.Scanner file = new java.util.Scanner(new File(f));
while (file.hasNextLine()) {
line = file.nextLine();
- if (!line.isEmpty())
+ if (!line.isEmpty()) {
splits.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
+ }
}
} else {
- if (cl.getArgList().isEmpty())
+ if (cl.getArgList().isEmpty()) {
throw new MissingArgumentException("No split points specified");
-
+ }
for (String s : cl.getArgs()) {
splits.add(new Text(s.getBytes(Shell.CHARSET)));
}
}
- if (!shellState.getConnector().tableOperations().exists(tableName))
+ if (!shellState.getConnector().tableOperations().exists(tableName)) {
throw new TableNotFoundException(null, tableName, null);
+ }
shellState.getConnector().tableOperations().addSplits(tableName, splits);
return 0;
@@ -71,7 +73,7 @@ public class AddSplitsCommand extends Co
@Override
public Options getOptions() {
- Options o = new Options();
+ final Options o = new Options();
optSplitsFile = new Option("sf", "splits-file", true, "file with a newline-separated list of rows to split the table with");
optSplitsFile.setArgName("filename");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AuthenticateCommand.java Sat Sep 29 05:42:59 2012
@@ -29,15 +29,15 @@ import org.apache.commons.cli.CommandLin
public class AuthenticateCommand extends Command {
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
- String user = cl.getArgs()[0];
- String p = shellState.readMaskedLine("Enter current password for '" + user + "': ", '*');
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, IOException {
+ final String user = cl.getArgs()[0];
+ final String p = shellState.readMaskedLine("Enter current password for '" + user + "': ", '*');
if (p == null) {
shellState.getReader().printNewline();
return 0;
} // user canceled
- byte[] password = p.getBytes();
- boolean valid = shellState.getConnector().securityOperations().authenticateUser(user, password);
+ final byte[] password = p.getBytes();
+ final boolean valid = shellState.getConnector().securityOperations().authenticateUser(user, password);
shellState.getReader().printString((valid ? "V" : "Not v") + "alid\n");
return 0;
}
@@ -53,7 +53,7 @@ public class AuthenticateCommand extends
}
@Override
- public void registerCompletion(Token root, Map<Command.CompletionSet,Set<String>> completionSet) {
+ public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
registerCompletionForUsers(root, completionSet);
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClasspathCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClasspathCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClasspathCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClasspathCommand.java Sat Sep 29 05:42:59 2012
@@ -23,7 +23,7 @@ import org.apache.commons.cli.CommandLin
public class ClasspathCommand extends Command {
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) {
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) {
AccumuloClassLoader.printClassPath();
return 0;
}
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClearCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClearCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClearCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ClearCommand.java Sat Sep 29 05:42:59 2012
@@ -29,11 +29,11 @@ public class ClearCommand extends Comman
}
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws IOException {
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
// custom clear screen, so I don't have to redraw the prompt twice
- if (!shellState.getReader().getTerminal().isANSISupported())
+ if (!shellState.getReader().getTerminal().isANSISupported()) {
throw new IOException("Terminal does not support ANSI commands");
-
+ }
// send the ANSI code to clear the screen
shellState.getReader().printString(((char) 27) + "[2J");
shellState.getReader().flushConsole();
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CloneTableCommand.java Sat Sep 29 05:42:59 2012
@@ -39,11 +39,11 @@ public class CloneTableCommand extends C
private Option noFlushOption;
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
TableExistsException {
- HashMap<String,String> props = new HashMap<String,String>();
- HashSet<String> exclude = new HashSet<String>();
+ final HashMap<String,String> props = new HashMap<String,String>();
+ final HashSet<String> exclude = new HashSet<String>();
boolean flush = true;
if (cl.hasOption(setPropsOption.getOpt())) {
@@ -56,8 +56,9 @@ public class CloneTableCommand extends C
if (cl.hasOption(excludePropsOption.getOpt())) {
String[] keys = cl.getOptionValue(excludePropsOption.getOpt()).split(",");
- for (String key : keys)
+ for (String key : keys) {
exclude.add(key);
+ }
}
if (cl.hasOption(noFlushOption.getOpt())) {
@@ -78,13 +79,13 @@ public class CloneTableCommand extends C
return "clones a table";
}
- public void registerCompletion(Token root, Map<Command.CompletionSet,Set<String>> completionSet) {
+ public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
registerCompletionForTables(root, completionSet);
}
@Override
public Options getOptions() {
- Options o = new Options();
+ final Options o = new Options();
setPropsOption = new Option("s", "set", true, "set initial properties before the table comes online. Expects <prop>=<value>{,<prop>=<value>}");
o.addOption(setPropsOption);
excludePropsOption = new Option("e", "exclude", true, "exclude properties that should not be copied from source table. Expects <prop>{,<prop>}");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CompactCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CompactCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CompactCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CompactCommand.java Sat Sep 29 05:42:59 2012
@@ -38,12 +38,12 @@ public class CompactCommand extends Tabl
return "sets all tablets for a table to major compact as soon as possible (based on current time)";
}
- protected void doTableOp(Shell shellState, String tableName) throws AccumuloException, AccumuloSecurityException {
+ protected void doTableOp(final Shell shellState, final String tableName) throws AccumuloException, AccumuloSecurityException {
// compact the tables
try {
- if (wait)
+ if (wait) {
Shell.log.info("Compacting table ...");
-
+ }
shellState.getConnector().tableOperations().compact(tableName, startRow, endRow, flush, wait);
Shell.log.info("Compaction of table " + tableName + " " + (wait ? "completed" : "started") + " for given range");
@@ -53,7 +53,7 @@ public class CompactCommand extends Tabl
}
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
flush = !cl.hasOption(noFlushOption.getOpt());
startRow = OptUtil.getStartRow(cl);
endRow = OptUtil.getEndRow(cl);
@@ -64,7 +64,7 @@ public class CompactCommand extends Tabl
@Override
public Options getOptions() {
- Options opts = super.getOptions();
+ final Options opts = super.getOptions();
opts.addOption(OptUtil.startRowOpt());
opts.addOption(OptUtil.endRowOpt());
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConfigCommand.java Sat Sep 29 05:42:59 2012
@@ -18,6 +18,7 @@ package org.apache.accumulo.core.util.sh
import java.io.IOException;
import java.util.ArrayList;
+import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -47,116 +48,121 @@ public class ConfigCommand extends Comma
private ConsoleReader reader;
@Override
- public void registerCompletion(Token root, Map<Command.CompletionSet,Set<String>> completionSet) {
- Token cmd = new Token(getName());
- Token sub = new Token("-" + setOpt.getOpt());
+ public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> completionSet) {
+ final Token cmd = new Token(getName());
+ final Token sub = new Token("-" + setOpt.getOpt());
for (Property p : Property.values()) {
- if (!(p.getKey().endsWith(".")))
+ if (!(p.getKey().endsWith("."))) {
sub.addSubcommand(new Token(p.toString()));
+ }
}
cmd.addSubcommand(sub);
root.addSubcommand(cmd);
}
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, TableNotFoundException,
IOException, ClassNotFoundException {
reader = shellState.getReader();
- String tableName = cl.getOptionValue(tableOpt.getOpt());
- if (tableName != null && !shellState.getConnector().tableOperations().exists(tableName))
+ final String tableName = cl.getOptionValue(tableOpt.getOpt());
+ if (tableName != null && !shellState.getConnector().tableOperations().exists(tableName)) {
throw new TableNotFoundException(null, tableName, null);
-
+ }
if (cl.hasOption(deleteOpt.getOpt())) {
// delete property from table
String property = cl.getOptionValue(deleteOpt.getOpt());
- if (property.contains("="))
+ if (property.contains("=")) {
throw new BadArgumentException("Invalid '=' operator in delete operation.", fullCommand, fullCommand.indexOf('='));
+ }
if (tableName != null) {
- if (!Property.isValidTablePropertyKey(property))
+ if (!Property.isValidTablePropertyKey(property)) {
Shell.log.warn("Invalid per-table property : " + property + ", still removing from zookeeper if it's there.");
-
+ }
shellState.getConnector().tableOperations().removeProperty(tableName, property);
Shell.log.debug("Successfully deleted table configuration option.");
} else {
- if (!Property.isValidZooPropertyKey(property))
+ if (!Property.isValidZooPropertyKey(property)) {
Shell.log.warn("Invalid per-table property : " + property + ", still removing from zookeeper if it's there.");
+ }
shellState.getConnector().instanceOperations().removeProperty(property);
Shell.log.debug("Successfully deleted system configuration option");
}
} else if (cl.hasOption(setOpt.getOpt())) {
// set property on table
String property = cl.getOptionValue(setOpt.getOpt()), value = null;
- if (!property.contains("="))
+ if (!property.contains("=")) {
throw new BadArgumentException("Missing '=' operator in set operation.", fullCommand, fullCommand.indexOf(property));
-
- String pair[] = property.split("=", 2);
+ }
+ final String pair[] = property.split("=", 2);
property = pair[0];
value = pair[1];
if (tableName != null) {
- if (!Property.isValidTablePropertyKey(property))
+ if (!Property.isValidTablePropertyKey(property)) {
throw new BadArgumentException("Invalid per-table property.", fullCommand, fullCommand.indexOf(property));
-
- if (property.equals(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY.getKey()))
+ }
+ if (property.equals(Property.TABLE_DEFAULT_SCANTIME_VISIBILITY.getKey())) {
new ColumnVisibility(value); // validate that it is a valid expression
-
+ }
shellState.getConnector().tableOperations().setProperty(tableName, property, value);
Shell.log.debug("Successfully set table configuration option.");
} else {
- if (!Property.isValidZooPropertyKey(property))
+ if (!Property.isValidZooPropertyKey(property)) {
throw new BadArgumentException("Property cannot be modified in zookeeper", fullCommand, fullCommand.indexOf(property));
-
+ }
shellState.getConnector().instanceOperations().setProperty(property, value);
Shell.log.debug("Successfully set system configuration option");
}
} else {
// display properties
- TreeMap<String,String> systemConfig = new TreeMap<String,String>();
+ final TreeMap<String,String> systemConfig = new TreeMap<String,String>();
systemConfig.putAll(shellState.getConnector().instanceOperations().getSystemConfiguration());
- TreeMap<String,String> siteConfig = new TreeMap<String,String>();
+ final TreeMap<String,String> siteConfig = new TreeMap<String,String>();
siteConfig.putAll(shellState.getConnector().instanceOperations().getSiteConfiguration());
- TreeMap<String,String> defaults = new TreeMap<String,String>();
- for (Entry<String,String> defaultEntry : AccumuloConfiguration.getDefaultConfiguration())
+ final TreeMap<String,String> defaults = new TreeMap<String,String>();
+ for (Entry<String,String> defaultEntry : AccumuloConfiguration.getDefaultConfiguration()) {
defaults.put(defaultEntry.getKey(), defaultEntry.getValue());
-
+ }
Iterable<Entry<String,String>> acuconf = shellState.getConnector().instanceOperations().getSystemConfiguration().entrySet();
- if (tableName != null)
+ if (tableName != null) {
acuconf = shellState.getConnector().tableOperations().getProperties(tableName);
-
- TreeMap<String,String> sortedConf = new TreeMap<String,String>();
+ }
+ final TreeMap<String,String> sortedConf = new TreeMap<String,String>();
for (Entry<String,String> propEntry : acuconf) {
sortedConf.put(propEntry.getKey(), propEntry.getValue());
}
for (Entry<String,String> propEntry : acuconf) {
- String key = propEntry.getKey();
+ final String key = propEntry.getKey();
// only show properties with similar names to that
// specified, or all of them if none specified
- if (cl.hasOption(filterOpt.getOpt()) && !key.contains(cl.getOptionValue(filterOpt.getOpt())))
+ if (cl.hasOption(filterOpt.getOpt()) && !key.contains(cl.getOptionValue(filterOpt.getOpt()))) {
continue;
- if (tableName != null && !Property.isValidTablePropertyKey(key))
+ }
+ if (tableName != null && !Property.isValidTablePropertyKey(key)) {
continue;
+ }
COL2 = Math.max(COL2, propEntry.getKey().length() + 3);
}
- ArrayList<String> output = new ArrayList<String>();
+ final ArrayList<String> output = new ArrayList<String>();
printConfHeader(output);
for (Entry<String,String> propEntry : sortedConf.entrySet()) {
- String key = propEntry.getKey();
+ final String key = propEntry.getKey();
// only show properties with similar names to that
// specified, or all of them if none specified
- if (cl.hasOption(filterOpt.getOpt()) && !key.contains(cl.getOptionValue(filterOpt.getOpt())))
+ if (cl.hasOption(filterOpt.getOpt()) && !key.contains(cl.getOptionValue(filterOpt.getOpt()))) {
continue;
-
- if (tableName != null && !Property.isValidTablePropertyKey(key))
+ }
+ if (tableName != null && !Property.isValidTablePropertyKey(key)) {
continue;
-
- String siteVal = siteConfig.get(key);
- String sysVal = systemConfig.get(key);
+ }
+ final String siteVal = siteConfig.get(key);
+ final String sysVal = systemConfig.get(key);
String curVal = propEntry.getValue();
String dfault = defaults.get(key);
boolean printed = false;
@@ -180,8 +186,9 @@ public class ConfigCommand extends Comma
}
// show per-table value only if it is different (overridden)
- if (tableName != null && !curVal.equals(sysVal))
+ if (tableName != null && !curVal.equals(sysVal)) {
printConfLine(output, "table", printed ? " @override" : key, curVal);
+ }
}
printConfFooter(output);
shellState.printLines(output.iterator(), !cl.hasOption(disablePaginationOpt.getOpt()));
@@ -189,20 +196,21 @@ public class ConfigCommand extends Comma
return 0;
}
- private void printConfHeader(ArrayList<String> output) {
+ private void printConfHeader(List<String> output) {
printConfFooter(output);
output.add(String.format("%-" + COL1 + "s | %-" + COL2 + "s | %s", "SCOPE", "NAME", "VALUE"));
printConfFooter(output);
}
- private void printConfLine(ArrayList<String> output, String s1, String s2, String s3) {
- if (s2.length() < COL2)
+ private void printConfLine(List<String> output, String s1, String s2, String s3) {
+ if (s2.length() < COL2) {
s2 += " " + Shell.repeat(".", COL2 - s2.length() - 1);
+ }
output.add(String.format("%-" + COL1 + "s | %-" + COL2 + "s | %s", s1, s2,
s3.replace("\n", "\n" + Shell.repeat(" ", COL1 + 1) + "|" + Shell.repeat(" ", COL2 + 2) + "|" + " ")));
}
- private void printConfFooter(ArrayList<String> output) {
+ private void printConfFooter(List<String> output) {
int col3 = Math.max(1, Math.min(Integer.MAX_VALUE, reader.getTermwidth() - COL1 - COL2 - 6));
output.add(String.format("%" + COL1 + "s-+-%" + COL2 + "s-+-%-" + col3 + "s", Shell.repeat("-", COL1), Shell.repeat("-", COL2), Shell.repeat("-", col3)));
}
@@ -214,8 +222,8 @@ public class ConfigCommand extends Comma
@Override
public Options getOptions() {
- Options o = new Options();
- OptionGroup og = new OptionGroup();
+ final Options o = new Options();
+ final OptionGroup og = new OptionGroup();
tableOpt = new Option(Shell.tableOption, "table", true, "table to display/set/delete properties for");
deleteOpt = new Option("d", "delete", true, "delete a per-table property");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConstraintCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConstraintCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConstraintCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/ConstraintCommand.java Sat Sep 29 05:42:59 2012
@@ -28,16 +28,17 @@ import org.apache.commons.cli.Options;
public class ConstraintCommand extends Command {
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws Exception {
- String tableName = OptUtil.getTableOpt(cl, shellState);
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws Exception {
+ final String tableName = OptUtil.getTableOpt(cl, shellState);
int i;
switch (OptUtil.getAldOpt(cl)) {
case ADD:
for (String constraint : cl.getArgs()) {
- if (!shellState.getConnector().instanceOperations().testClassLoad(constraint, Constraint.class.getName()))
+ if (!shellState.getConnector().instanceOperations().testClassLoad(constraint, Constraint.class.getName())) {
throw new ShellCommandException(ErrorCode.INITIALIZATION_FAILURE, "Servers are unable to load " + constraint + " as type "
+ Constraint.class.getName());
+ }
i = shellState.getConnector().tableOperations().addConstraint(tableName, constraint);
shellState.getReader().printString("Added constraint " + constraint + " to table " + tableName + " with number " + i + "\n");
}
@@ -50,8 +51,9 @@ public class ConstraintCommand extends C
}
break;
case LIST:
- for (Entry<String,Integer> property : shellState.getConnector().tableOperations().listConstraints(tableName).entrySet())
+ for (Entry<String,Integer> property : shellState.getConnector().tableOperations().listConstraints(tableName).entrySet()) {
shellState.getReader().printString(property.toString() + "\n");
+ }
}
return 0;
@@ -74,7 +76,7 @@ public class ConstraintCommand extends C
@Override
public Options getOptions() {
- Options o = new Options();
+ final Options o = new Options();
o.addOptionGroup(OptUtil.addListDeleteGroup("constraint"));
o.addOption(OptUtil.tableOpt("table to add, delete, or list constraints for"));
return o;
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateTableCommand.java Sat Sep 29 05:42:59 2012
@@ -19,6 +19,7 @@ package org.apache.accumulo.core.util.sh
import java.io.File;
import java.io.IOException;
import java.util.Map.Entry;
+import java.util.Scanner;
import java.util.SortedSet;
import java.util.TreeSet;
@@ -52,67 +53,72 @@ public class CreateTableCommand extends
private Option createTableOptFormatter;
public static String testTable;
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, AccumuloSecurityException, TableExistsException,
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, AccumuloSecurityException, TableExistsException,
TableNotFoundException, IOException, ClassNotFoundException {
- String testTableName = cl.getArgs()[0];
+ final String testTableName = cl.getArgs()[0];
if (!testTableName.matches(Constants.VALID_TABLE_NAME_REGEX)) {
shellState.getReader().printString("Only letters, numbers and underscores are allowed for use in table names. \n");
throw new IllegalArgumentException();
}
- String tableName = cl.getArgs()[0];
- if (shellState.getConnector().tableOperations().exists(tableName))
+ final String tableName = cl.getArgs()[0];
+ if (shellState.getConnector().tableOperations().exists(tableName)) {
throw new TableExistsException(null, tableName, null);
-
- SortedSet<Text> partitions = new TreeSet<Text>();
- boolean decode = cl.hasOption(base64Opt.getOpt());
+ }
+ final SortedSet<Text> partitions = new TreeSet<Text>();
+ final boolean decode = cl.hasOption(base64Opt.getOpt());
if (cl.hasOption(createTableOptSplit.getOpt())) {
- String f = cl.getOptionValue(createTableOptSplit.getOpt());
+ final String f = cl.getOptionValue(createTableOptSplit.getOpt());
String line;
- java.util.Scanner file = new java.util.Scanner(new File(f));
+ Scanner file = new Scanner(new File(f));
while (file.hasNextLine()) {
line = file.nextLine();
- if (!line.isEmpty())
+ if (!line.isEmpty()) {
partitions.add(decode ? new Text(Base64.decodeBase64(line.getBytes())) : new Text(line));
+ }
}
} else if (cl.hasOption(createTableOptCopySplits.getOpt())) {
- String oldTable = cl.getOptionValue(createTableOptCopySplits.getOpt());
- if (!shellState.getConnector().tableOperations().exists(oldTable))
+ final String oldTable = cl.getOptionValue(createTableOptCopySplits.getOpt());
+ if (!shellState.getConnector().tableOperations().exists(oldTable)) {
throw new TableNotFoundException(null, oldTable, null);
+ }
partitions.addAll(shellState.getConnector().tableOperations().getSplits(oldTable));
}
if (cl.hasOption(createTableOptCopyConfig.getOpt())) {
- String oldTable = cl.getOptionValue(createTableOptCopyConfig.getOpt());
- if (!shellState.getConnector().tableOperations().exists(oldTable))
+ final String oldTable = cl.getOptionValue(createTableOptCopyConfig.getOpt());
+ if (!shellState.getConnector().tableOperations().exists(oldTable)) {
throw new TableNotFoundException(null, oldTable, null);
+ }
}
TimeType timeType = TimeType.MILLIS;
- if (cl.hasOption(createTableOptTimeLogical.getOpt()))
+ if (cl.hasOption(createTableOptTimeLogical.getOpt())) {
timeType = TimeType.LOGICAL;
+ }
// create table
shellState.getConnector().tableOperations().create(tableName, true, timeType);
- if (partitions.size() > 0)
+ if (partitions.size() > 0) {
shellState.getConnector().tableOperations().addSplits(tableName, partitions);
-
+ }
shellState.setTableName(tableName); // switch shell to new table
// context
if (cl.hasOption(createTableNoDefaultIters.getOpt())) {
- for (String key : IteratorUtil.generateInitialTableProperties().keySet())
+ for (String key : IteratorUtil.generateInitialTableProperties().keySet()) {
shellState.getConnector().tableOperations().removeProperty(tableName, key);
+ }
}
// Copy options if flag was set
if (cl.hasOption(createTableOptCopyConfig.getOpt())) {
if (shellState.getConnector().tableOperations().exists(tableName)) {
- Iterable<Entry<String,String>> configuration = shellState.getConnector().tableOperations()
+ final Iterable<Entry<String,String>> configuration = shellState.getConnector().tableOperations()
.getProperties(cl.getOptionValue(createTableOptCopyConfig.getOpt()));
for (Entry<String,String> entry : configuration) {
if (Property.isValidTablePropertyKey(entry.getKey())) {
@@ -132,7 +138,7 @@ public class CreateTableCommand extends
// Load custom formatter if set
if (cl.hasOption(createTableOptFormatter.getOpt())) {
- String formatterClass = cl.getOptionValue(createTableOptFormatter.getOpt());
+ final String formatterClass = cl.getOptionValue(createTableOptFormatter.getOpt());
shellState.getConnector().tableOperations().setProperty(tableName, Property.TABLE_FORMATTER_CLASS.toString(), formatterClass);
}
@@ -152,7 +158,7 @@ public class CreateTableCommand extends
@Override
public Options getOptions() {
- Options o = new Options();
+ final Options o = new Options();
createTableOptCopyConfig = new Option("cc", "copy-config", true, "table to copy configuration from");
createTableOptCopySplits = new Option("cs", "copy-splits", true, "table to copy current splits from");
@@ -171,11 +177,11 @@ public class CreateTableCommand extends
// Splits and CopySplits are put in an optionsgroup to make them
// mutually exclusive
- OptionGroup splitOrCopySplit = new OptionGroup();
+ final OptionGroup splitOrCopySplit = new OptionGroup();
splitOrCopySplit.addOption(createTableOptSplit);
splitOrCopySplit.addOption(createTableOptCopySplits);
- OptionGroup timeGroup = new OptionGroup();
+ final OptionGroup timeGroup = new OptionGroup();
timeGroup.addOption(createTableOptTimeLogical);
timeGroup.addOption(createTableOptTimeMillis);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/CreateUserCommand.java Sat Sep 29 05:42:59 2012
@@ -33,34 +33,33 @@ import org.apache.commons.cli.Options;
public class CreateUserCommand extends Command {
private Option scanOptAuths;
- static Authorizations parseAuthorizations(String field) {
- if (field == null || field.isEmpty())
+ static Authorizations parseAuthorizations(final String field) {
+ if (field == null || field.isEmpty()) {
return Constants.NO_AUTHS;
+ }
return new Authorizations(field.split(","));
}
@Override
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws AccumuloException, TableNotFoundException, AccumuloSecurityException,
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws AccumuloException, TableNotFoundException, AccumuloSecurityException,
TableExistsException, IOException {
- String user = cl.getArgs()[0];
- String password = null;
- String passwordConfirm = null;
-
- password = shellState.readMaskedLine("Enter new password for '" + user + "': ", '*');
+ final String user = cl.getArgs()[0];
+
+ final String password = shellState.readMaskedLine("Enter new password for '" + user + "': ", '*');
if (password == null) {
shellState.getReader().printNewline();
return 0;
} // user canceled
- passwordConfirm = shellState.readMaskedLine("Please confirm new password for '" + user + "': ", '*');
+ String passwordConfirm = shellState.readMaskedLine("Please confirm new password for '" + user + "': ", '*');
if (passwordConfirm == null) {
shellState.getReader().printNewline();
return 0;
} // user canceled
- if (!password.equals(passwordConfirm))
+ if (!password.equals(passwordConfirm)) {
throw new IllegalArgumentException("Passwords do not match");
-
- Authorizations authorizations = parseAuthorizations(cl.hasOption(scanOptAuths.getOpt()) ? cl.getOptionValue(scanOptAuths.getOpt()) : "");
+ }
+ final Authorizations authorizations = parseAuthorizations(cl.hasOption(scanOptAuths.getOpt()) ? cl.getOptionValue(scanOptAuths.getOpt()) : "");
shellState.getConnector().securityOperations().createUser(user, password.getBytes(), authorizations);
Shell.log.debug("Created user " + user + " with" + (authorizations.isEmpty() ? " no" : "") + " initial scan authorizations"
+ (!authorizations.isEmpty() ? " " + authorizations : ""));
@@ -79,7 +78,7 @@ public class CreateUserCommand extends C
@Override
public Options getOptions() {
- Options o = new Options();
+ final Options o = new Options();
scanOptAuths = new Option("s", "scan-authorizations", true, "scan authorizations");
scanOptAuths.setArgName("comma-separated-authorizations");
o.addOption(scanOptAuths);
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DUCommand.java Sat Sep 29 05:42:59 2012
@@ -37,16 +37,18 @@ public class DUCommand extends Command {
private Option optTablePattern;
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws IOException, TableNotFoundException {
+ public int execute(final String fullCommand, final CommandLine cl, Shell shellState) throws IOException, TableNotFoundException {
- SortedSet<String> tablesToFlush = new TreeSet<String>(Arrays.asList(cl.getArgs()));
+ final SortedSet<String> tablesToFlush = new TreeSet<String>(Arrays.asList(cl.getArgs()));
if (cl.hasOption(optTablePattern.getOpt())) {
- for (String table : shellState.getConnector().tableOperations().list())
- if (table.matches(cl.getOptionValue(optTablePattern.getOpt())))
+ for (String table : shellState.getConnector().tableOperations().list()) {
+ if (table.matches(cl.getOptionValue(optTablePattern.getOpt()))) {
tablesToFlush.add(table);
+ }
+ }
}
try {
- AccumuloConfiguration acuConf = new ConfigurationCopy(shellState.getConnector().instanceOperations().getSystemConfiguration());
+ final AccumuloConfiguration acuConf = new ConfigurationCopy(shellState.getConnector().instanceOperations().getSystemConfiguration());
TableDiskUsage.printDiskUsage(acuConf, tablesToFlush, FileSystem.get(new Configuration()), shellState.getConnector());
} catch (Exception ex) {
throw new RuntimeException(ex);
@@ -61,7 +63,7 @@ public class DUCommand extends Command {
@Override
public Options getOptions() {
- Options o = new Options();
+ final Options o = new Options();
optTablePattern = new Option("p", "pattern", true, "regex pattern of table names");
optTablePattern.setArgName("pattern");
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java?rev=1391754&r1=1391753&r2=1391754&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/util/shell/commands/DebugCommand.java Sat Sep 29 05:42:59 2012
@@ -28,14 +28,15 @@ import org.apache.accumulo.core.util.she
import org.apache.commons.cli.CommandLine;
public class DebugCommand extends Command {
- public int execute(String fullCommand, CommandLine cl, Shell shellState) throws IOException {
+ public int execute(final String fullCommand, final CommandLine cl, final Shell shellState) throws IOException {
if (cl.getArgs().length == 1) {
- if (cl.getArgs()[0].equalsIgnoreCase("on"))
+ if (cl.getArgs()[0].equalsIgnoreCase("on")) {
Shell.setDebugging(true);
- else if (cl.getArgs()[0].equalsIgnoreCase("off"))
+ } else if (cl.getArgs()[0].equalsIgnoreCase("off")) {
Shell.setDebugging(false);
- else
+ } else {
throw new BadArgumentException("Argument must be 'on' or 'off'", fullCommand, fullCommand.indexOf(cl.getArgs()[0]));
+ }
} else if (cl.getArgs().length == 0) {
shellState.getReader().printString(Shell.isDebuggingEnabled() ? "on\n" : "off\n");
} else {
@@ -52,8 +53,8 @@ public class DebugCommand extends Comman
}
@Override
- public void registerCompletion(Token root, Map<Command.CompletionSet,Set<String>> special) {
- Token debug_command = new Token(getName());
+ public void registerCompletion(final Token root, final Map<Command.CompletionSet,Set<String>> special) {
+ final Token debug_command = new Token(getName());
debug_command.addSubcommand(Arrays.asList(new String[] {"on", "off"}));
root.addSubcommand(debug_command);
}