accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject [55/61] [abbrv] accumulo git commit: ACCUMULO-722: merge trunk to sandbox
Date Thu, 03 Mar 2016 22:00:20 GMT
http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
index 862d084..6043c9b 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
   public List<org.apache.accumulo.core.data.thrift.TConstraintViolationSummary> violationSummaries;
// 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
{
     VIOLATION_SUMMARIES((short)1, "violationSummaries");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
index 00529a5..cefa5d7 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
   public List<TIteratorSetting> iterators; // 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
{
     ITERATORS((short)1, "iterators");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index 885100f..0072e61 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
@@ -39,7 +39,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>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
index 6ccc0fc..564b235 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
@@ -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>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
index 832eafe..264bcf6 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum ScanState implements org.apache.thrift.TEnum {
+@SuppressWarnings("all") public enum ScanState implements org.apache.thrift.TEnum {
   IDLE(0),
   RUNNING(1),
   QUEUED(2);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
index 582fe8d..861d4ad 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum ScanType implements org.apache.thrift.TEnum {
+@SuppressWarnings("all") public enum ScanType implements org.apache.thrift.TEnum {
   SINGLE(0),
   BATCH(1);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
index 54146d3..2a4d6a3 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
   public Map<String,String> properties; // 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"),
     NAME((short)2, "name"),
     ITERATOR_CLASS((short)3, "iteratorClass"),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index d4851d4..b29e10f 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -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");
 
@@ -10649,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"),
@@ -11355,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");
 
@@ -11809,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");
 
@@ -12270,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"),
@@ -12929,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");
@@ -13492,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"),
@@ -14327,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");
 
@@ -14840,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"),
@@ -15506,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");
 
@@ -15967,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"),
@@ -16628,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"),
@@ -17388,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"),
@@ -18263,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"),
@@ -18922,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"),
@@ -19585,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"),
@@ -20456,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");
 
@@ -20913,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");
 
@@ -21372,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");
@@ -21927,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");
 
@@ -22436,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");
 
@@ -22893,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");
 
@@ -23352,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");
@@ -23905,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>();
@@ -24264,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");
@@ -24819,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");
 
@@ -25276,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");
 
@@ -25787,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");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
index 2140c9f..cca094a 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
@@ -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");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
index bda1705..4d1581d 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
@@ -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"),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
index 714959b..4a3697d 100644
--- a/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
+++ b/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
@@ -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>();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/core/src/main/thrift/thrift.sh
----------------------------------------------------------------------
diff --git a/1.5/core/src/main/thrift/thrift.sh b/1.5/core/src/main/thrift/thrift.sh
index 9e02bf7..f8ce399 100755
--- a/1.5/core/src/main/thrift/thrift.sh
+++ b/1.5/core/src/main/thrift/thrift.sh
@@ -45,6 +45,7 @@ do
 	thrift ${THRIFT_ARGS} --gen rb $f || fail unable to generate ruby thrift classes
 done
 find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public class /@SuppressWarnings("all")
public class /'
+find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public enum /@SuppressWarnings("all")
public enum /'
 find target/gen-java -name '*.orig' -print | xargs rm -f
 # copy only files that have changed
 for d in gc master tabletserver security client/impl data

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
b/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
index 5827614..1a5339f 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.gc.thrift.GCStatus;
 import org.apache.accumulo.core.gc.thrift.GcCycleStats;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Client;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
 import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.server.security.SecurityConstants;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
b/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
index 3e0ed4c..ae89a85 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
@@ -27,7 +27,6 @@ import java.util.Set;
 import java.util.TimerTask;
 
 import org.apache.accumulo.cloudtrace.instrument.Tracer;
-import org.apache.accumulo.cloudtrace.instrument.thrift.TraceWrap;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.conf.AccumuloConfiguration;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
b/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
index 962596a..47142f9 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
@@ -70,6 +70,13 @@ public class SubmitFileForRecovery extends MasterRepo implements Repo<Master>
{
               log.error("Unable to check on the recovery status of " + file, ex);
             }
             break;
+          case NodeChildrenChanged:
+          case NodeCreated:
+          case NodeDataChanged:
+          case None:
+          default:
+            /* do nothing. */
+            break;
         }
       }
       

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
b/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
index 3624659..0142a45 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
@@ -20,10 +20,7 @@ import java.util.Iterator;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Instance;
-import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.security.thrift.AuthInfo;
-import org.apache.hadoop.io.Text;
 
 public class RootTabletStateStore extends MetaDataStateStore {
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
b/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
index 3d2ef16..3183f4f 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
@@ -46,7 +46,6 @@ import org.apache.accumulo.core.client.impl.ServerClient;
 import org.apache.accumulo.core.client.impl.Tables;
 import org.apache.accumulo.core.client.impl.thrift.ClientService;
 import org.apache.accumulo.core.client.impl.thrift.ClientService.Client;
-import org.apache.accumulo.core.client.impl.thrift.ClientService.Iface;
 import org.apache.accumulo.core.client.impl.thrift.TableOperation;
 import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
 import org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
b/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
index f7ba84b..e9630c4 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
@@ -69,7 +69,7 @@ class ExportInfo implements Serializable {
 class WriteExportFiles extends MasterRepo {
   
   private static final long serialVersionUID = 1L;
-  private ExportInfo tableInfo;
+  private final ExportInfo tableInfo;
   
   WriteExportFiles(ExportInfo tableInfo) {
     this.tableInfo = tableInfo;
@@ -98,13 +98,25 @@ class WriteExportFiles extends MasterRepo {
     
     Scanner metaScanner = conn.createScanner(Constants.METADATA_TABLE_NAME, Constants.NO_AUTHS);
     metaScanner.setRange(new KeyExtent(new Text(tableInfo.tableID), null, null).toMetadataRange());
+    
+    // scan for locations
     metaScanner.fetchColumnFamily(Constants.METADATA_CURRENT_LOCATION_COLUMN_FAMILY);
+    metaScanner.fetchColumnFamily(Constants.METADATA_FUTURE_LOCATION_COLUMN_FAMILY);
     
-    // TODO look for walogs
-    for (Entry<Key,Value> entry : metaScanner) {
+    if (metaScanner.iterator().hasNext()) {
       return 500;
     }
     
+    // use the same range to check for walogs that we used to check for hosted (or future
hosted) tablets
+    // this is done as a separate scan after we check for locations, because walogs are okay
only if there is no location
+    metaScanner.clearColumns();
+    metaScanner.fetchColumnFamily(Constants.METADATA_LOG_COLUMN_FAMILY);
+    
+    if (metaScanner.iterator().hasNext()) {
+      throw new ThriftTableOperationException(tableInfo.tableID, tableInfo.tableName, TableOperation.EXPORT,
TableOperationExceptionType.OTHER,
+          "Write ahead logs found for table");
+    }
+
     return 0;
   }
 
@@ -277,7 +289,7 @@ class WriteExportFiles extends MasterRepo {
 public class ExportTable extends MasterRepo {
   private static final long serialVersionUID = 1L;
   
-  private ExportInfo tableInfo;
+  private final ExportInfo tableInfo;
 
   public ExportTable(String tableName, String tableId, String exportDir) {
     tableInfo = new ExportInfo();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
b/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
index 6042fc4..353f905 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
@@ -119,7 +119,6 @@ public class VisServlet extends BasicServlet {
   protected void pageBody(HttpServletRequest req, HttpServletResponse response, StringBuilder
sb) throws IOException {
     StringBuffer urlsb = req.getRequestURL();
     urlsb.setLength(urlsb.lastIndexOf("/") + 1);
-    String url = urlsb.toString();
     VisualizationConfig cfg = new VisualizationConfig();
     
     String s = req.getParameter("shape");

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
b/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 1b63e48..6e303f8 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -525,6 +525,10 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
               case FINISHED:
                 state = ScanState.IDLE;
                 break;
+              case RUNNING:
+              default:
+                /* do nothing */
+                break;
             }
           }
           
@@ -547,6 +551,10 @@ public class TabletServer extends AbstractMetricsImpl implements org.apache.accu
               case FINISHED:
                 state = ScanState.IDLE;
                 break;
+              case RUNNING:
+              default:
+                /* do nothing */
+                break;
             }
           }
           

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
----------------------------------------------------------------------
diff --git a/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
b/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
index 2afc2cf..7944974 100644
--- a/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
+++ b/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
@@ -29,7 +29,6 @@ import org.apache.accumulo.core.master.thrift.TableInfo;
 import org.apache.accumulo.core.master.thrift.TabletServerStatus;
 import org.apache.accumulo.core.security.thrift.AuthInfo;
 import org.apache.accumulo.core.security.thrift.ThriftSecurityException;
-import org.apache.accumulo.core.tabletserver.thrift.TabletClientService;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Iface;
 import org.apache.accumulo.core.tabletserver.thrift.TabletClientService.Processor;
 import org.apache.accumulo.core.util.AddressUtil;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
----------------------------------------------------------------------
diff --git a/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
b/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
index 5310ed5..8b331cb 100644
--- a/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
+++ b/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.cloudtrace.instrument.Span;
 import org.apache.accumulo.cloudtrace.instrument.Trace;
 import org.apache.accumulo.cloudtrace.instrument.Tracer;
 import org.apache.accumulo.cloudtrace.thrift.TInfo;
-import org.apache.log4j.Logger;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/11546eed/1.5/trace/thrift.sh
----------------------------------------------------------------------
diff --git a/1.5/trace/thrift.sh b/1.5/trace/thrift.sh
index 629bab1..e2c4ad5 100755
--- a/1.5/trace/thrift.sh
+++ b/1.5/trace/thrift.sh
@@ -24,6 +24,7 @@ thrift -o target -gen java src/main/thrift/cloudtrace.thrift
 
 # For all generated thrift code, suppress all warnings
 find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public class /@SuppressWarnings("all")
public class /'
+find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public enum /@SuppressWarnings("all")
public enum /'
 
 # Make a directory for said thrift code if does not already exist
 mkdir -p src/main/java/org/apache/accumulo/cloudtrace/thrift


Mime
View raw message