accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1381572 [2/2] - in /accumulo/branches/ACCUMULO-722/1.5: ./ core/ core/src/main/java/org/apache/accumulo/core/client/ core/src/main/java/org/apache/accumulo/core/client/admin/ core/src/main/java/org/apache/accumulo/core/client/impl/ core/sr...
Date Thu, 06 Sep 2012 12:22:50 GMT
Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java Thu Sep  6 12:22:47 2012
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
   public List<org.apache.accumulo.core.data.thrift.TKeyExtent> newTablets; // 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 {
     OLD_TABLET((short)1, "oldTablet"),
     NEW_TABLETS((short)2, "newTablets");
 

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/AuthInfo.java Thu Sep  6 12:22:47 2012
@@ -45,7 +45,7 @@ import org.slf4j.LoggerFactory;
   public String instanceId; // 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 {
     USER((short)1, "user"),
     PASSWORD((short)2, "password"),
     INSTANCE_ID((short)3, "instanceId");

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/SecurityErrorCode.java Thu Sep  6 12:22:47 2012
@@ -11,7 +11,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-public enum SecurityErrorCode implements org.apache.thrift.TEnum {
+@SuppressWarnings("all") public enum SecurityErrorCode implements org.apache.thrift.TEnum {
   DEFAULT_SECURITY_ERROR(0),
   BAD_CREDENTIALS(1),
   PERMISSION_DENIED(2),

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/security/thrift/ThriftSecurityException.java Thu Sep  6 12:22:47 2012
@@ -47,7 +47,7 @@ import org.slf4j.LoggerFactory;
   public SecurityErrorCode code; // 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 {
     USER((short)1, "user"),
     /**
      * 

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java Thu Sep  6 12:22:47 2012
@@ -55,7 +55,7 @@ import org.slf4j.LoggerFactory;
   public double queueSumDev; // 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 {
     STATUS((short)1, "status"),
     ELAPSED((short)2, "elapsed"),
     NUM((short)3, "num"),

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java Thu Sep  6 12:22:47 2012
@@ -69,7 +69,7 @@ import org.slf4j.LoggerFactory;
   public Map<String,Map<String,String>> ssio; // 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 {
     CLIENT((short)2, "client"),
     USER((short)3, "user"),
     TABLE_ID((short)4, "tableId"),

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ConstraintViolationException.java Thu Sep  6 12:22:47 2012
@@ -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>();

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/IteratorConfig.java Thu Sep  6 12:22:47 2012
@@ -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>();

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java Thu Sep  6 12:22:47 2012
@@ -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>();

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NotServingTabletException.java Thu Sep  6 12:22:47 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-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanState.java Thu Sep  6 12:22:47 2012
@@ -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);

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ScanType.java Thu Sep  6 12:22:47 2012
@@ -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);
 

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TIteratorSetting.java Thu Sep  6 12:22:47 2012
@@ -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"),

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java Thu Sep  6 12:22:47 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");
 
@@ -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");

Modified: accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletMutations.java Thu Sep  6 12:22:47 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-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java Thu Sep  6 12:22:47 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-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java Thu Sep  6 12:22:47 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-722/1.5/core/src/main/thrift/thrift.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/core/src/main/thrift/thrift.sh?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/core/src/main/thrift/thrift.sh (original)
+++ accumulo/branches/ACCUMULO-722/1.5/core/src/main/thrift/thrift.sh Thu Sep  6 12:22:47 2012
@@ -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

Propchange: accumulo/branches/ACCUMULO-722/1.5/server/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/server:r1381162-1381567,1381570-1381571

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java Thu Sep  6 12:22:47 2012
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.gc.thrif
 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;

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java Thu Sep  6 12:22:47 2012
@@ -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;

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/recovery/SubmitFileForRecovery.java Thu Sep  6 12:22:47 2012
@@ -70,6 +70,13 @@ public class SubmitFileForRecovery exten
               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;
         }
       }
       

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/state/RootTabletStateStore.java Thu Sep  6 12:22:47 2012
@@ -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 {
   

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/BulkImport.java Thu Sep  6 12:22:47 2012
@@ -46,7 +46,6 @@ import org.apache.accumulo.core.client.i
 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;

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/master/tableOps/ExportTable.java Thu Sep  6 12:22:47 2012
@@ -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 MasterRep
     
     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 MasterRep
 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();

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/monitor/servlets/VisServlet.java Thu Sep  6 12:22:47 2012
@@ -119,7 +119,6 @@ public class VisServlet extends BasicSer
   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");

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Thu Sep  6 12:22:47 2012
@@ -525,6 +525,10 @@ public class TabletServer extends Abstra
               case FINISHED:
                 state = ScanState.IDLE;
                 break;
+              case RUNNING:
+              default:
+                /* do nothing */
+                break;
             }
           }
           
@@ -547,6 +551,10 @@ public class TabletServer extends Abstra
               case FINISHED:
                 state = ScanState.IDLE;
                 break;
+              case RUNNING:
+              default:
+                /* do nothing */
+                break;
             }
           }
           

Modified: accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/server/src/main/java/org/apache/accumulo/server/test/functional/ZombieTServer.java Thu Sep  6 12:22:47 2012
@@ -29,7 +29,6 @@ import org.apache.accumulo.core.master.t
 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;

Propchange: accumulo/branches/ACCUMULO-722/1.5/src/
------------------------------------------------------------------------------
  Merged /accumulo/trunk/src:r1381162-1381567,1381570-1381571

Modified: accumulo/branches/ACCUMULO-722/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java (original)
+++ accumulo/branches/ACCUMULO-722/1.5/trace/src/main/java/org/apache/accumulo/cloudtrace/instrument/thrift/TraceWrap.java Thu Sep  6 12:22:47 2012
@@ -25,7 +25,6 @@ import org.apache.accumulo.cloudtrace.in
 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;
 
 
 /**

Modified: accumulo/branches/ACCUMULO-722/1.5/trace/thrift.sh
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-722/1.5/trace/thrift.sh?rev=1381572&r1=1381571&r2=1381572&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-722/1.5/trace/thrift.sh (original)
+++ accumulo/branches/ACCUMULO-722/1.5/trace/thrift.sh Thu Sep  6 12:22:47 2012
@@ -24,6 +24,7 @@ thrift -o target -gen java src/main/thri
 
 # 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