accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vi...@apache.org
Subject svn commit: r1353663 [2/6] - in /accumulo/branches/ACCUMULO-259: ./ bin/ conf/ conf/examples/1GB/native-standalone/ conf/examples/1GB/standalone/ conf/examples/512MB/native-standalone/ conf/examples/512MB/standalone/ core/ core/src/main/java/org/apache...
Date Mon, 25 Jun 2012 17:09:39 GMT
Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java Mon Jun 25 17:09:31 2012
@@ -26,20 +26,15 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC = new org.apache.thrift.protocol.TField("tableMap", org.apache.thrift.protocol.TType.MAP, (short)1);
   private static final org.apache.thrift.protocol.TField T_SERVER_INFO_FIELD_DESC = new org.apache.thrift.protocol.TField("tServerInfo", org.apache.thrift.protocol.TType.LIST, (short)2);
   private static final org.apache.thrift.protocol.TField BAD_TSERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("badTServers", org.apache.thrift.protocol.TType.MAP, (short)3);
-  private static final org.apache.thrift.protocol.TField RECOVERY_FIELD_DESC = new org.apache.thrift.protocol.TField("recovery", org.apache.thrift.protocol.TType.LIST, (short)4);
-  private static final org.apache.thrift.protocol.TField LOGGERS_FIELD_DESC = new org.apache.thrift.protocol.TField("loggers", org.apache.thrift.protocol.TType.LIST, (short)5);
   private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)6);
   private static final org.apache.thrift.protocol.TField GOAL_STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("goalState", org.apache.thrift.protocol.TType.I32, (short)8);
   private static final org.apache.thrift.protocol.TField UNASSIGNED_TABLETS_FIELD_DESC = new org.apache.thrift.protocol.TField("unassignedTablets", org.apache.thrift.protocol.TType.I32, (short)7);
   private static final org.apache.thrift.protocol.TField SERVERS_SHUTTING_DOWN_FIELD_DESC = new org.apache.thrift.protocol.TField("serversShuttingDown", org.apache.thrift.protocol.TType.SET, (short)9);
   private static final org.apache.thrift.protocol.TField DEAD_TABLET_SERVERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadTabletServers", org.apache.thrift.protocol.TType.LIST, (short)10);
-  private static final org.apache.thrift.protocol.TField DEAD_LOGGERS_FIELD_DESC = new org.apache.thrift.protocol.TField("deadLoggers", org.apache.thrift.protocol.TType.LIST, (short)11);
 
   public Map<String,TableInfo> tableMap;
   public List<TabletServerStatus> tServerInfo;
   public Map<String,Byte> badTServers;
-  public List<RecoveryStatus> recovery;
-  public List<LoggerStatus> loggers;
   /**
    * 
    * @see MasterState
@@ -53,15 +48,12 @@ import org.slf4j.LoggerFactory;
   public int unassignedTablets;
   public Set<String> serversShuttingDown;
   public List<DeadServer> deadTabletServers;
-  public List<DeadServer> deadLoggers;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     TABLE_MAP((short)1, "tableMap"),
     T_SERVER_INFO((short)2, "tServerInfo"),
     BAD_TSERVERS((short)3, "badTServers"),
-    RECOVERY((short)4, "recovery"),
-    LOGGERS((short)5, "loggers"),
     /**
      * 
      * @see MasterState
@@ -74,8 +66,7 @@ import org.slf4j.LoggerFactory;
     GOAL_STATE((short)8, "goalState"),
     UNASSIGNED_TABLETS((short)7, "unassignedTablets"),
     SERVERS_SHUTTING_DOWN((short)9, "serversShuttingDown"),
-    DEAD_TABLET_SERVERS((short)10, "deadTabletServers"),
-    DEAD_LOGGERS((short)11, "deadLoggers");
+    DEAD_TABLET_SERVERS((short)10, "deadTabletServers");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -96,10 +87,6 @@ import org.slf4j.LoggerFactory;
           return T_SERVER_INFO;
         case 3: // BAD_TSERVERS
           return BAD_TSERVERS;
-        case 4: // RECOVERY
-          return RECOVERY;
-        case 5: // LOGGERS
-          return LOGGERS;
         case 6: // STATE
           return STATE;
         case 8: // GOAL_STATE
@@ -110,8 +97,6 @@ import org.slf4j.LoggerFactory;
           return SERVERS_SHUTTING_DOWN;
         case 10: // DEAD_TABLET_SERVERS
           return DEAD_TABLET_SERVERS;
-        case 11: // DEAD_LOGGERS
-          return DEAD_LOGGERS;
         default:
           return null;
       }
@@ -169,12 +154,6 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
             new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE))));
-    tmpMap.put(_Fields.RECOVERY, new org.apache.thrift.meta_data.FieldMetaData("recovery", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RecoveryStatus.class))));
-    tmpMap.put(_Fields.LOGGERS, new org.apache.thrift.meta_data.FieldMetaData("loggers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, LoggerStatus.class))));
     tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, MasterState.class)));
     tmpMap.put(_Fields.GOAL_STATE, new org.apache.thrift.meta_data.FieldMetaData("goalState", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -187,9 +166,6 @@ import org.slf4j.LoggerFactory;
     tmpMap.put(_Fields.DEAD_TABLET_SERVERS, new org.apache.thrift.meta_data.FieldMetaData("deadTabletServers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
             new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DeadServer.class))));
-    tmpMap.put(_Fields.DEAD_LOGGERS, new org.apache.thrift.meta_data.FieldMetaData("deadLoggers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
-            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, DeadServer.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(MasterMonitorInfo.class, metaDataMap);
   }
@@ -201,28 +177,22 @@ import org.slf4j.LoggerFactory;
     Map<String,TableInfo> tableMap,
     List<TabletServerStatus> tServerInfo,
     Map<String,Byte> badTServers,
-    List<RecoveryStatus> recovery,
-    List<LoggerStatus> loggers,
     MasterState state,
     MasterGoalState goalState,
     int unassignedTablets,
     Set<String> serversShuttingDown,
-    List<DeadServer> deadTabletServers,
-    List<DeadServer> deadLoggers)
+    List<DeadServer> deadTabletServers)
   {
     this();
     this.tableMap = tableMap;
     this.tServerInfo = tServerInfo;
     this.badTServers = badTServers;
-    this.recovery = recovery;
-    this.loggers = loggers;
     this.state = state;
     this.goalState = goalState;
     this.unassignedTablets = unassignedTablets;
     setUnassignedTabletsIsSet(true);
     this.serversShuttingDown = serversShuttingDown;
     this.deadTabletServers = deadTabletServers;
-    this.deadLoggers = deadLoggers;
   }
 
   /**
@@ -268,20 +238,6 @@ import org.slf4j.LoggerFactory;
       }
       this.badTServers = __this__badTServers;
     }
-    if (other.isSetRecovery()) {
-      List<RecoveryStatus> __this__recovery = new ArrayList<RecoveryStatus>();
-      for (RecoveryStatus other_element : other.recovery) {
-        __this__recovery.add(new RecoveryStatus(other_element));
-      }
-      this.recovery = __this__recovery;
-    }
-    if (other.isSetLoggers()) {
-      List<LoggerStatus> __this__loggers = new ArrayList<LoggerStatus>();
-      for (LoggerStatus other_element : other.loggers) {
-        __this__loggers.add(new LoggerStatus(other_element));
-      }
-      this.loggers = __this__loggers;
-    }
     if (other.isSetState()) {
       this.state = other.state;
     }
@@ -303,13 +259,6 @@ import org.slf4j.LoggerFactory;
       }
       this.deadTabletServers = __this__deadTabletServers;
     }
-    if (other.isSetDeadLoggers()) {
-      List<DeadServer> __this__deadLoggers = new ArrayList<DeadServer>();
-      for (DeadServer other_element : other.deadLoggers) {
-        __this__deadLoggers.add(new DeadServer(other_element));
-      }
-      this.deadLoggers = __this__deadLoggers;
-    }
   }
 
   public MasterMonitorInfo deepCopy() {
@@ -321,15 +270,12 @@ import org.slf4j.LoggerFactory;
     this.tableMap = null;
     this.tServerInfo = null;
     this.badTServers = null;
-    this.recovery = null;
-    this.loggers = null;
     this.state = null;
     this.goalState = null;
     setUnassignedTabletsIsSet(false);
     this.unassignedTablets = 0;
     this.serversShuttingDown = null;
     this.deadTabletServers = null;
-    this.deadLoggers = null;
   }
 
   public int getTableMapSize() {
@@ -441,84 +387,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public int getRecoverySize() {
-    return (this.recovery == null) ? 0 : this.recovery.size();
-  }
-
-  public java.util.Iterator<RecoveryStatus> getRecoveryIterator() {
-    return (this.recovery == null) ? null : this.recovery.iterator();
-  }
-
-  public void addToRecovery(RecoveryStatus elem) {
-    if (this.recovery == null) {
-      this.recovery = new ArrayList<RecoveryStatus>();
-    }
-    this.recovery.add(elem);
-  }
-
-  public List<RecoveryStatus> getRecovery() {
-    return this.recovery;
-  }
-
-  public MasterMonitorInfo setRecovery(List<RecoveryStatus> recovery) {
-    this.recovery = recovery;
-    return this;
-  }
-
-  public void unsetRecovery() {
-    this.recovery = null;
-  }
-
-  /** Returns true if field recovery is set (has been assigned a value) and false otherwise */
-  public boolean isSetRecovery() {
-    return this.recovery != null;
-  }
-
-  public void setRecoveryIsSet(boolean value) {
-    if (!value) {
-      this.recovery = null;
-    }
-  }
-
-  public int getLoggersSize() {
-    return (this.loggers == null) ? 0 : this.loggers.size();
-  }
-
-  public java.util.Iterator<LoggerStatus> getLoggersIterator() {
-    return (this.loggers == null) ? null : this.loggers.iterator();
-  }
-
-  public void addToLoggers(LoggerStatus elem) {
-    if (this.loggers == null) {
-      this.loggers = new ArrayList<LoggerStatus>();
-    }
-    this.loggers.add(elem);
-  }
-
-  public List<LoggerStatus> getLoggers() {
-    return this.loggers;
-  }
-
-  public MasterMonitorInfo setLoggers(List<LoggerStatus> loggers) {
-    this.loggers = loggers;
-    return this;
-  }
-
-  public void unsetLoggers() {
-    this.loggers = null;
-  }
-
-  /** Returns true if field loggers is set (has been assigned a value) and false otherwise */
-  public boolean isSetLoggers() {
-    return this.loggers != null;
-  }
-
-  public void setLoggersIsSet(boolean value) {
-    if (!value) {
-      this.loggers = null;
-    }
-  }
-
   /**
    * 
    * @see MasterState
@@ -684,45 +552,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public int getDeadLoggersSize() {
-    return (this.deadLoggers == null) ? 0 : this.deadLoggers.size();
-  }
-
-  public java.util.Iterator<DeadServer> getDeadLoggersIterator() {
-    return (this.deadLoggers == null) ? null : this.deadLoggers.iterator();
-  }
-
-  public void addToDeadLoggers(DeadServer elem) {
-    if (this.deadLoggers == null) {
-      this.deadLoggers = new ArrayList<DeadServer>();
-    }
-    this.deadLoggers.add(elem);
-  }
-
-  public List<DeadServer> getDeadLoggers() {
-    return this.deadLoggers;
-  }
-
-  public MasterMonitorInfo setDeadLoggers(List<DeadServer> deadLoggers) {
-    this.deadLoggers = deadLoggers;
-    return this;
-  }
-
-  public void unsetDeadLoggers() {
-    this.deadLoggers = null;
-  }
-
-  /** Returns true if field deadLoggers is set (has been assigned a value) and false otherwise */
-  public boolean isSetDeadLoggers() {
-    return this.deadLoggers != null;
-  }
-
-  public void setDeadLoggersIsSet(boolean value) {
-    if (!value) {
-      this.deadLoggers = null;
-    }
-  }
-
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TABLE_MAP:
@@ -749,22 +578,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case RECOVERY:
-      if (value == null) {
-        unsetRecovery();
-      } else {
-        setRecovery((List<RecoveryStatus>)value);
-      }
-      break;
-
-    case LOGGERS:
-      if (value == null) {
-        unsetLoggers();
-      } else {
-        setLoggers((List<LoggerStatus>)value);
-      }
-      break;
-
     case STATE:
       if (value == null) {
         unsetState();
@@ -805,14 +618,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case DEAD_LOGGERS:
-      if (value == null) {
-        unsetDeadLoggers();
-      } else {
-        setDeadLoggers((List<DeadServer>)value);
-      }
-      break;
-
     }
   }
 
@@ -827,12 +632,6 @@ import org.slf4j.LoggerFactory;
     case BAD_TSERVERS:
       return getBadTServers();
 
-    case RECOVERY:
-      return getRecovery();
-
-    case LOGGERS:
-      return getLoggers();
-
     case STATE:
       return getState();
 
@@ -848,9 +647,6 @@ import org.slf4j.LoggerFactory;
     case DEAD_TABLET_SERVERS:
       return getDeadTabletServers();
 
-    case DEAD_LOGGERS:
-      return getDeadLoggers();
-
     }
     throw new IllegalStateException();
   }
@@ -868,10 +664,6 @@ import org.slf4j.LoggerFactory;
       return isSetTServerInfo();
     case BAD_TSERVERS:
       return isSetBadTServers();
-    case RECOVERY:
-      return isSetRecovery();
-    case LOGGERS:
-      return isSetLoggers();
     case STATE:
       return isSetState();
     case GOAL_STATE:
@@ -882,8 +674,6 @@ import org.slf4j.LoggerFactory;
       return isSetServersShuttingDown();
     case DEAD_TABLET_SERVERS:
       return isSetDeadTabletServers();
-    case DEAD_LOGGERS:
-      return isSetDeadLoggers();
     }
     throw new IllegalStateException();
   }
@@ -928,24 +718,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_recovery = true && this.isSetRecovery();
-    boolean that_present_recovery = true && that.isSetRecovery();
-    if (this_present_recovery || that_present_recovery) {
-      if (!(this_present_recovery && that_present_recovery))
-        return false;
-      if (!this.recovery.equals(that.recovery))
-        return false;
-    }
-
-    boolean this_present_loggers = true && this.isSetLoggers();
-    boolean that_present_loggers = true && that.isSetLoggers();
-    if (this_present_loggers || that_present_loggers) {
-      if (!(this_present_loggers && that_present_loggers))
-        return false;
-      if (!this.loggers.equals(that.loggers))
-        return false;
-    }
-
     boolean this_present_state = true && this.isSetState();
     boolean that_present_state = true && that.isSetState();
     if (this_present_state || that_present_state) {
@@ -991,15 +763,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_deadLoggers = true && this.isSetDeadLoggers();
-    boolean that_present_deadLoggers = true && that.isSetDeadLoggers();
-    if (this_present_deadLoggers || that_present_deadLoggers) {
-      if (!(this_present_deadLoggers && that_present_deadLoggers))
-        return false;
-      if (!this.deadLoggers.equals(that.deadLoggers))
-        return false;
-    }
-
     return true;
   }
 
@@ -1046,26 +809,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetRecovery()).compareTo(typedOther.isSetRecovery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRecovery()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.recovery, typedOther.recovery);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetLoggers()).compareTo(typedOther.isSetLoggers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLoggers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loggers, typedOther.loggers);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetState()).compareTo(typedOther.isSetState());
     if (lastComparison != 0) {
       return lastComparison;
@@ -1116,16 +859,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetDeadLoggers()).compareTo(typedOther.isSetDeadLoggers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetDeadLoggers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.deadLoggers, typedOther.deadLoggers);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     return 0;
   }
 
@@ -1200,42 +933,6 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 4: // RECOVERY
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list20 = iprot.readListBegin();
-              this.recovery = new ArrayList<RecoveryStatus>(_list20.size);
-              for (int _i21 = 0; _i21 < _list20.size; ++_i21)
-              {
-                RecoveryStatus _elem22;
-                _elem22 = new RecoveryStatus();
-                _elem22.read(iprot);
-                this.recovery.add(_elem22);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 5: // LOGGERS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
-              this.loggers = new ArrayList<LoggerStatus>(_list23.size);
-              for (int _i24 = 0; _i24 < _list23.size; ++_i24)
-              {
-                LoggerStatus _elem25;
-                _elem25 = new LoggerStatus();
-                _elem25.read(iprot);
-                this.loggers.add(_elem25);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 6: // STATE
           if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.state = MasterState.findByValue(iprot.readI32());
@@ -1261,13 +958,13 @@ import org.slf4j.LoggerFactory;
         case 9: // SERVERS_SHUTTING_DOWN
           if (field.type == org.apache.thrift.protocol.TType.SET) {
             {
-              org.apache.thrift.protocol.TSet _set26 = iprot.readSetBegin();
-              this.serversShuttingDown = new HashSet<String>(2*_set26.size);
-              for (int _i27 = 0; _i27 < _set26.size; ++_i27)
+              org.apache.thrift.protocol.TSet _set20 = iprot.readSetBegin();
+              this.serversShuttingDown = new HashSet<String>(2*_set20.size);
+              for (int _i21 = 0; _i21 < _set20.size; ++_i21)
               {
-                String _elem28;
-                _elem28 = iprot.readString();
-                this.serversShuttingDown.add(_elem28);
+                String _elem22;
+                _elem22 = iprot.readString();
+                this.serversShuttingDown.add(_elem22);
               }
               iprot.readSetEnd();
             }
@@ -1278,32 +975,14 @@ import org.slf4j.LoggerFactory;
         case 10: // DEAD_TABLET_SERVERS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list29 = iprot.readListBegin();
-              this.deadTabletServers = new ArrayList<DeadServer>(_list29.size);
-              for (int _i30 = 0; _i30 < _list29.size; ++_i30)
-              {
-                DeadServer _elem31;
-                _elem31 = new DeadServer();
-                _elem31.read(iprot);
-                this.deadTabletServers.add(_elem31);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 11: // DEAD_LOGGERS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
-              this.deadLoggers = new ArrayList<DeadServer>(_list32.size);
-              for (int _i33 = 0; _i33 < _list32.size; ++_i33)
+              org.apache.thrift.protocol.TList _list23 = iprot.readListBegin();
+              this.deadTabletServers = new ArrayList<DeadServer>(_list23.size);
+              for (int _i24 = 0; _i24 < _list23.size; ++_i24)
               {
-                DeadServer _elem34;
-                _elem34 = new DeadServer();
-                _elem34.read(iprot);
-                this.deadLoggers.add(_elem34);
+                DeadServer _elem25;
+                _elem25 = new DeadServer();
+                _elem25.read(iprot);
+                this.deadTabletServers.add(_elem25);
               }
               iprot.readListEnd();
             }
@@ -1330,10 +1009,10 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(TABLE_MAP_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.tableMap.size()));
-        for (Map.Entry<String, TableInfo> _iter35 : this.tableMap.entrySet())
+        for (Map.Entry<String, TableInfo> _iter26 : this.tableMap.entrySet())
         {
-          oprot.writeString(_iter35.getKey());
-          _iter35.getValue().write(oprot);
+          oprot.writeString(_iter26.getKey());
+          _iter26.getValue().write(oprot);
         }
         oprot.writeMapEnd();
       }
@@ -1343,9 +1022,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(T_SERVER_INFO_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.tServerInfo.size()));
-        for (TabletServerStatus _iter36 : this.tServerInfo)
+        for (TabletServerStatus _iter27 : this.tServerInfo)
         {
-          _iter36.write(oprot);
+          _iter27.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1355,39 +1034,15 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(BAD_TSERVERS_FIELD_DESC);
       {
         oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.BYTE, this.badTServers.size()));
-        for (Map.Entry<String, Byte> _iter37 : this.badTServers.entrySet())
+        for (Map.Entry<String, Byte> _iter28 : this.badTServers.entrySet())
         {
-          oprot.writeString(_iter37.getKey());
-          oprot.writeByte(_iter37.getValue());
+          oprot.writeString(_iter28.getKey());
+          oprot.writeByte(_iter28.getValue());
         }
         oprot.writeMapEnd();
       }
       oprot.writeFieldEnd();
     }
-    if (this.recovery != null) {
-      oprot.writeFieldBegin(RECOVERY_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.recovery.size()));
-        for (RecoveryStatus _iter38 : this.recovery)
-        {
-          _iter38.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.loggers != null) {
-      oprot.writeFieldBegin(LOGGERS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.loggers.size()));
-        for (LoggerStatus _iter39 : this.loggers)
-        {
-          _iter39.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
     if (this.state != null) {
       oprot.writeFieldBegin(STATE_FIELD_DESC);
       oprot.writeI32(this.state.getValue());
@@ -1405,9 +1060,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(SERVERS_SHUTTING_DOWN_FIELD_DESC);
       {
         oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, this.serversShuttingDown.size()));
-        for (String _iter40 : this.serversShuttingDown)
+        for (String _iter29 : this.serversShuttingDown)
         {
-          oprot.writeString(_iter40);
+          oprot.writeString(_iter29);
         }
         oprot.writeSetEnd();
       }
@@ -1417,21 +1072,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(DEAD_TABLET_SERVERS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.deadTabletServers.size()));
-        for (DeadServer _iter41 : this.deadTabletServers)
-        {
-          _iter41.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.deadLoggers != null) {
-      oprot.writeFieldBegin(DEAD_LOGGERS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.deadLoggers.size()));
-        for (DeadServer _iter42 : this.deadLoggers)
+        for (DeadServer _iter30 : this.deadTabletServers)
         {
-          _iter42.write(oprot);
+          _iter30.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1470,22 +1113,6 @@ import org.slf4j.LoggerFactory;
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("recovery:");
-    if (this.recovery == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.recovery);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("loggers:");
-    if (this.loggers == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.loggers);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("state:");
     if (this.state == null) {
       sb.append("null");
@@ -1521,14 +1148,6 @@ import org.slf4j.LoggerFactory;
       sb.append(this.deadTabletServers);
     }
     first = false;
-    if (!first) sb.append(", ");
-    sb.append("deadLoggers:");
-    if (this.deadLoggers == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.deadLoggers);
-    }
-    first = false;
     sb.append(")");
     return sb.toString();
   }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/RecoveryStatus.java Mon Jun 25 17:09:31 2012
@@ -23,28 +23,19 @@ import org.slf4j.LoggerFactory;
 @SuppressWarnings("all") public class RecoveryStatus implements org.apache.thrift.TBase<RecoveryStatus, RecoveryStatus._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("RecoveryStatus");
 
-  private static final org.apache.thrift.protocol.TField HOST_FIELD_DESC = new org.apache.thrift.protocol.TField("host", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField MAP_PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("mapProgress", org.apache.thrift.protocol.TType.DOUBLE, (short)3);
-  private static final org.apache.thrift.protocol.TField REDUCE_PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("reduceProgress", org.apache.thrift.protocol.TType.DOUBLE, (short)4);
   private static final org.apache.thrift.protocol.TField RUNTIME_FIELD_DESC = new org.apache.thrift.protocol.TField("runtime", org.apache.thrift.protocol.TType.I32, (short)5);
-  private static final org.apache.thrift.protocol.TField COPY_PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("copyProgress", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
+  private static final org.apache.thrift.protocol.TField PROGRESS_FIELD_DESC = new org.apache.thrift.protocol.TField("progress", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
 
-  public String host;
   public String name;
-  public double mapProgress;
-  public double reduceProgress;
   public int runtime;
-  public double copyProgress;
+  public double progress;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    HOST((short)1, "host"),
     NAME((short)2, "name"),
-    MAP_PROGRESS((short)3, "mapProgress"),
-    REDUCE_PROGRESS((short)4, "reduceProgress"),
     RUNTIME((short)5, "runtime"),
-    COPY_PROGRESS((short)6, "copyProgress");
+    PROGRESS((short)6, "progress");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -59,18 +50,12 @@ import org.slf4j.LoggerFactory;
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // HOST
-          return HOST;
         case 2: // NAME
           return NAME;
-        case 3: // MAP_PROGRESS
-          return MAP_PROGRESS;
-        case 4: // REDUCE_PROGRESS
-          return REDUCE_PROGRESS;
         case 5: // RUNTIME
           return RUNTIME;
-        case 6: // COPY_PROGRESS
-          return COPY_PROGRESS;
+        case 6: // PROGRESS
+          return PROGRESS;
         default:
           return null;
       }
@@ -111,26 +96,18 @@ import org.slf4j.LoggerFactory;
   }
 
   // isset id assignments
-  private static final int __MAPPROGRESS_ISSET_ID = 0;
-  private static final int __REDUCEPROGRESS_ISSET_ID = 1;
-  private static final int __RUNTIME_ISSET_ID = 2;
-  private static final int __COPYPROGRESS_ISSET_ID = 3;
-  private BitSet __isset_bit_vector = new BitSet(4);
+  private static final int __RUNTIME_ISSET_ID = 0;
+  private static final int __PROGRESS_ISSET_ID = 1;
+  private BitSet __isset_bit_vector = new BitSet(2);
 
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.HOST, new org.apache.thrift.meta_data.FieldMetaData("host", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     tmpMap.put(_Fields.NAME, new org.apache.thrift.meta_data.FieldMetaData("name", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.MAP_PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("mapProgress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.REDUCE_PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("reduceProgress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.RUNTIME, new org.apache.thrift.meta_data.FieldMetaData("runtime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
-    tmpMap.put(_Fields.COPY_PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("copyProgress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.PROGRESS, new org.apache.thrift.meta_data.FieldMetaData("progress", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(RecoveryStatus.class, metaDataMap);
@@ -140,24 +117,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public RecoveryStatus(
-    String host,
     String name,
-    double mapProgress,
-    double reduceProgress,
     int runtime,
-    double copyProgress)
+    double progress)
   {
     this();
-    this.host = host;
     this.name = name;
-    this.mapProgress = mapProgress;
-    setMapProgressIsSet(true);
-    this.reduceProgress = reduceProgress;
-    setReduceProgressIsSet(true);
     this.runtime = runtime;
     setRuntimeIsSet(true);
-    this.copyProgress = copyProgress;
-    setCopyProgressIsSet(true);
+    this.progress = progress;
+    setProgressIsSet(true);
   }
 
   /**
@@ -166,16 +135,11 @@ import org.slf4j.LoggerFactory;
   public RecoveryStatus(RecoveryStatus other) {
     __isset_bit_vector.clear();
     __isset_bit_vector.or(other.__isset_bit_vector);
-    if (other.isSetHost()) {
-      this.host = other.host;
-    }
     if (other.isSetName()) {
       this.name = other.name;
     }
-    this.mapProgress = other.mapProgress;
-    this.reduceProgress = other.reduceProgress;
     this.runtime = other.runtime;
-    this.copyProgress = other.copyProgress;
+    this.progress = other.progress;
   }
 
   public RecoveryStatus deepCopy() {
@@ -184,40 +148,11 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public void clear() {
-    this.host = null;
     this.name = null;
-    setMapProgressIsSet(false);
-    this.mapProgress = 0.0;
-    setReduceProgressIsSet(false);
-    this.reduceProgress = 0.0;
     setRuntimeIsSet(false);
     this.runtime = 0;
-    setCopyProgressIsSet(false);
-    this.copyProgress = 0.0;
-  }
-
-  public String getHost() {
-    return this.host;
-  }
-
-  public RecoveryStatus setHost(String host) {
-    this.host = host;
-    return this;
-  }
-
-  public void unsetHost() {
-    this.host = null;
-  }
-
-  /** Returns true if field host is set (has been assigned a value) and false otherwise */
-  public boolean isSetHost() {
-    return this.host != null;
-  }
-
-  public void setHostIsSet(boolean value) {
-    if (!value) {
-      this.host = null;
-    }
+    setProgressIsSet(false);
+    this.progress = 0.0;
   }
 
   public String getName() {
@@ -244,52 +179,6 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public double getMapProgress() {
-    return this.mapProgress;
-  }
-
-  public RecoveryStatus setMapProgress(double mapProgress) {
-    this.mapProgress = mapProgress;
-    setMapProgressIsSet(true);
-    return this;
-  }
-
-  public void unsetMapProgress() {
-    __isset_bit_vector.clear(__MAPPROGRESS_ISSET_ID);
-  }
-
-  /** Returns true if field mapProgress is set (has been assigned a value) and false otherwise */
-  public boolean isSetMapProgress() {
-    return __isset_bit_vector.get(__MAPPROGRESS_ISSET_ID);
-  }
-
-  public void setMapProgressIsSet(boolean value) {
-    __isset_bit_vector.set(__MAPPROGRESS_ISSET_ID, value);
-  }
-
-  public double getReduceProgress() {
-    return this.reduceProgress;
-  }
-
-  public RecoveryStatus setReduceProgress(double reduceProgress) {
-    this.reduceProgress = reduceProgress;
-    setReduceProgressIsSet(true);
-    return this;
-  }
-
-  public void unsetReduceProgress() {
-    __isset_bit_vector.clear(__REDUCEPROGRESS_ISSET_ID);
-  }
-
-  /** Returns true if field reduceProgress is set (has been assigned a value) and false otherwise */
-  public boolean isSetReduceProgress() {
-    return __isset_bit_vector.get(__REDUCEPROGRESS_ISSET_ID);
-  }
-
-  public void setReduceProgressIsSet(boolean value) {
-    __isset_bit_vector.set(__REDUCEPROGRESS_ISSET_ID, value);
-  }
-
   public int getRuntime() {
     return this.runtime;
   }
@@ -313,39 +202,31 @@ import org.slf4j.LoggerFactory;
     __isset_bit_vector.set(__RUNTIME_ISSET_ID, value);
   }
 
-  public double getCopyProgress() {
-    return this.copyProgress;
+  public double getProgress() {
+    return this.progress;
   }
 
-  public RecoveryStatus setCopyProgress(double copyProgress) {
-    this.copyProgress = copyProgress;
-    setCopyProgressIsSet(true);
+  public RecoveryStatus setProgress(double progress) {
+    this.progress = progress;
+    setProgressIsSet(true);
     return this;
   }
 
-  public void unsetCopyProgress() {
-    __isset_bit_vector.clear(__COPYPROGRESS_ISSET_ID);
+  public void unsetProgress() {
+    __isset_bit_vector.clear(__PROGRESS_ISSET_ID);
   }
 
-  /** Returns true if field copyProgress is set (has been assigned a value) and false otherwise */
-  public boolean isSetCopyProgress() {
-    return __isset_bit_vector.get(__COPYPROGRESS_ISSET_ID);
+  /** Returns true if field progress is set (has been assigned a value) and false otherwise */
+  public boolean isSetProgress() {
+    return __isset_bit_vector.get(__PROGRESS_ISSET_ID);
   }
 
-  public void setCopyProgressIsSet(boolean value) {
-    __isset_bit_vector.set(__COPYPROGRESS_ISSET_ID, value);
+  public void setProgressIsSet(boolean value) {
+    __isset_bit_vector.set(__PROGRESS_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case HOST:
-      if (value == null) {
-        unsetHost();
-      } else {
-        setHost((String)value);
-      }
-      break;
-
     case NAME:
       if (value == null) {
         unsetName();
@@ -354,22 +235,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case MAP_PROGRESS:
-      if (value == null) {
-        unsetMapProgress();
-      } else {
-        setMapProgress((Double)value);
-      }
-      break;
-
-    case REDUCE_PROGRESS:
-      if (value == null) {
-        unsetReduceProgress();
-      } else {
-        setReduceProgress((Double)value);
-      }
-      break;
-
     case RUNTIME:
       if (value == null) {
         unsetRuntime();
@@ -378,11 +243,11 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case COPY_PROGRESS:
+    case PROGRESS:
       if (value == null) {
-        unsetCopyProgress();
+        unsetProgress();
       } else {
-        setCopyProgress((Double)value);
+        setProgress((Double)value);
       }
       break;
 
@@ -391,23 +256,14 @@ import org.slf4j.LoggerFactory;
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case HOST:
-      return getHost();
-
     case NAME:
       return getName();
 
-    case MAP_PROGRESS:
-      return new Double(getMapProgress());
-
-    case REDUCE_PROGRESS:
-      return new Double(getReduceProgress());
-
     case RUNTIME:
       return new Integer(getRuntime());
 
-    case COPY_PROGRESS:
-      return new Double(getCopyProgress());
+    case PROGRESS:
+      return new Double(getProgress());
 
     }
     throw new IllegalStateException();
@@ -420,18 +276,12 @@ import org.slf4j.LoggerFactory;
     }
 
     switch (field) {
-    case HOST:
-      return isSetHost();
     case NAME:
       return isSetName();
-    case MAP_PROGRESS:
-      return isSetMapProgress();
-    case REDUCE_PROGRESS:
-      return isSetReduceProgress();
     case RUNTIME:
       return isSetRuntime();
-    case COPY_PROGRESS:
-      return isSetCopyProgress();
+    case PROGRESS:
+      return isSetProgress();
     }
     throw new IllegalStateException();
   }
@@ -449,15 +299,6 @@ import org.slf4j.LoggerFactory;
     if (that == null)
       return false;
 
-    boolean this_present_host = true && this.isSetHost();
-    boolean that_present_host = true && that.isSetHost();
-    if (this_present_host || that_present_host) {
-      if (!(this_present_host && that_present_host))
-        return false;
-      if (!this.host.equals(that.host))
-        return false;
-    }
-
     boolean this_present_name = true && this.isSetName();
     boolean that_present_name = true && that.isSetName();
     if (this_present_name || that_present_name) {
@@ -467,24 +308,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_mapProgress = true;
-    boolean that_present_mapProgress = true;
-    if (this_present_mapProgress || that_present_mapProgress) {
-      if (!(this_present_mapProgress && that_present_mapProgress))
-        return false;
-      if (this.mapProgress != that.mapProgress)
-        return false;
-    }
-
-    boolean this_present_reduceProgress = true;
-    boolean that_present_reduceProgress = true;
-    if (this_present_reduceProgress || that_present_reduceProgress) {
-      if (!(this_present_reduceProgress && that_present_reduceProgress))
-        return false;
-      if (this.reduceProgress != that.reduceProgress)
-        return false;
-    }
-
     boolean this_present_runtime = true;
     boolean that_present_runtime = true;
     if (this_present_runtime || that_present_runtime) {
@@ -494,12 +317,12 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_copyProgress = true;
-    boolean that_present_copyProgress = true;
-    if (this_present_copyProgress || that_present_copyProgress) {
-      if (!(this_present_copyProgress && that_present_copyProgress))
+    boolean this_present_progress = true;
+    boolean that_present_progress = true;
+    if (this_present_progress || that_present_progress) {
+      if (!(this_present_progress && that_present_progress))
         return false;
-      if (this.copyProgress != that.copyProgress)
+      if (this.progress != that.progress)
         return false;
     }
 
@@ -519,16 +342,6 @@ import org.slf4j.LoggerFactory;
     int lastComparison = 0;
     RecoveryStatus typedOther = (RecoveryStatus)other;
 
-    lastComparison = Boolean.valueOf(isSetHost()).compareTo(typedOther.isSetHost());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetHost()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.host, typedOther.host);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetName()).compareTo(typedOther.isSetName());
     if (lastComparison != 0) {
       return lastComparison;
@@ -539,26 +352,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMapProgress()).compareTo(typedOther.isSetMapProgress());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMapProgress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.mapProgress, typedOther.mapProgress);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetReduceProgress()).compareTo(typedOther.isSetReduceProgress());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetReduceProgress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.reduceProgress, typedOther.reduceProgress);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetRuntime()).compareTo(typedOther.isSetRuntime());
     if (lastComparison != 0) {
       return lastComparison;
@@ -569,12 +362,12 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetCopyProgress()).compareTo(typedOther.isSetCopyProgress());
+    lastComparison = Boolean.valueOf(isSetProgress()).compareTo(typedOther.isSetProgress());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetCopyProgress()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.copyProgress, typedOther.copyProgress);
+    if (isSetProgress()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.progress, typedOther.progress);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -596,13 +389,6 @@ import org.slf4j.LoggerFactory;
         break;
       }
       switch (field.id) {
-        case 1: // HOST
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.host = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 2: // NAME
           if (field.type == org.apache.thrift.protocol.TType.STRING) {
             this.name = iprot.readString();
@@ -610,22 +396,6 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 3: // MAP_PROGRESS
-          if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.mapProgress = iprot.readDouble();
-            setMapProgressIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 4: // REDUCE_PROGRESS
-          if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.reduceProgress = iprot.readDouble();
-            setReduceProgressIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 5: // RUNTIME
           if (field.type == org.apache.thrift.protocol.TType.I32) {
             this.runtime = iprot.readI32();
@@ -634,10 +404,10 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 6: // COPY_PROGRESS
+        case 6: // PROGRESS
           if (field.type == org.apache.thrift.protocol.TType.DOUBLE) {
-            this.copyProgress = iprot.readDouble();
-            setCopyProgressIsSet(true);
+            this.progress = iprot.readDouble();
+            setProgressIsSet(true);
           } else { 
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
@@ -657,27 +427,16 @@ import org.slf4j.LoggerFactory;
     validate();
 
     oprot.writeStructBegin(STRUCT_DESC);
-    if (this.host != null) {
-      oprot.writeFieldBegin(HOST_FIELD_DESC);
-      oprot.writeString(this.host);
-      oprot.writeFieldEnd();
-    }
     if (this.name != null) {
       oprot.writeFieldBegin(NAME_FIELD_DESC);
       oprot.writeString(this.name);
       oprot.writeFieldEnd();
     }
-    oprot.writeFieldBegin(MAP_PROGRESS_FIELD_DESC);
-    oprot.writeDouble(this.mapProgress);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(REDUCE_PROGRESS_FIELD_DESC);
-    oprot.writeDouble(this.reduceProgress);
-    oprot.writeFieldEnd();
     oprot.writeFieldBegin(RUNTIME_FIELD_DESC);
     oprot.writeI32(this.runtime);
     oprot.writeFieldEnd();
-    oprot.writeFieldBegin(COPY_PROGRESS_FIELD_DESC);
-    oprot.writeDouble(this.copyProgress);
+    oprot.writeFieldBegin(PROGRESS_FIELD_DESC);
+    oprot.writeDouble(this.progress);
     oprot.writeFieldEnd();
     oprot.writeFieldStop();
     oprot.writeStructEnd();
@@ -688,14 +447,6 @@ import org.slf4j.LoggerFactory;
     StringBuilder sb = new StringBuilder("RecoveryStatus(");
     boolean first = true;
 
-    sb.append("host:");
-    if (this.host == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.host);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("name:");
     if (this.name == null) {
       sb.append("null");
@@ -704,20 +455,12 @@ import org.slf4j.LoggerFactory;
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("mapProgress:");
-    sb.append(this.mapProgress);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("reduceProgress:");
-    sb.append(this.reduceProgress);
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("runtime:");
     sb.append(this.runtime);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("copyProgress:");
-    sb.append(this.copyProgress);
+    sb.append("progress:");
+    sb.append(this.progress);
     first = false;
     sb.append(")");
     return sb.toString();

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java Mon Jun 25 17:09:31 2012
@@ -29,11 +29,11 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField OS_LOAD_FIELD_DESC = new org.apache.thrift.protocol.TField("osLoad", org.apache.thrift.protocol.TType.DOUBLE, (short)5);
   private static final org.apache.thrift.protocol.TField HOLD_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("holdTime", org.apache.thrift.protocol.TType.I64, (short)7);
   private static final org.apache.thrift.protocol.TField LOOKUPS_FIELD_DESC = new org.apache.thrift.protocol.TField("lookups", org.apache.thrift.protocol.TType.I64, (short)8);
-  private static final org.apache.thrift.protocol.TField LOGGERS_FIELD_DESC = new org.apache.thrift.protocol.TField("loggers", org.apache.thrift.protocol.TType.SET, (short)9);
   private static final org.apache.thrift.protocol.TField INDEX_CACHE_HITS_FIELD_DESC = new org.apache.thrift.protocol.TField("indexCacheHits", org.apache.thrift.protocol.TType.I64, (short)10);
   private static final org.apache.thrift.protocol.TField INDEX_CACHE_REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("indexCacheRequest", org.apache.thrift.protocol.TType.I64, (short)11);
   private static final org.apache.thrift.protocol.TField DATA_CACHE_HITS_FIELD_DESC = new org.apache.thrift.protocol.TField("dataCacheHits", org.apache.thrift.protocol.TType.I64, (short)12);
   private static final org.apache.thrift.protocol.TField DATA_CACHE_REQUEST_FIELD_DESC = new org.apache.thrift.protocol.TField("dataCacheRequest", org.apache.thrift.protocol.TType.I64, (short)13);
+  private static final org.apache.thrift.protocol.TField LOG_SORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("logSorts", org.apache.thrift.protocol.TType.LIST, (short)14);
 
   public Map<String,TableInfo> tableMap;
   public long lastContact;
@@ -41,11 +41,11 @@ import org.slf4j.LoggerFactory;
   public double osLoad;
   public long holdTime;
   public long lookups;
-  public Set<String> loggers;
   public long indexCacheHits;
   public long indexCacheRequest;
   public long dataCacheHits;
   public long dataCacheRequest;
+  public List<RecoveryStatus> logSorts;
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -55,11 +55,11 @@ import org.slf4j.LoggerFactory;
     OS_LOAD((short)5, "osLoad"),
     HOLD_TIME((short)7, "holdTime"),
     LOOKUPS((short)8, "lookups"),
-    LOGGERS((short)9, "loggers"),
     INDEX_CACHE_HITS((short)10, "indexCacheHits"),
     INDEX_CACHE_REQUEST((short)11, "indexCacheRequest"),
     DATA_CACHE_HITS((short)12, "dataCacheHits"),
-    DATA_CACHE_REQUEST((short)13, "dataCacheRequest");
+    DATA_CACHE_REQUEST((short)13, "dataCacheRequest"),
+    LOG_SORTS((short)14, "logSorts");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -86,8 +86,6 @@ import org.slf4j.LoggerFactory;
           return HOLD_TIME;
         case 8: // LOOKUPS
           return LOOKUPS;
-        case 9: // LOGGERS
-          return LOGGERS;
         case 10: // INDEX_CACHE_HITS
           return INDEX_CACHE_HITS;
         case 11: // INDEX_CACHE_REQUEST
@@ -96,6 +94,8 @@ import org.slf4j.LoggerFactory;
           return DATA_CACHE_HITS;
         case 13: // DATA_CACHE_REQUEST
           return DATA_CACHE_REQUEST;
+        case 14: // LOG_SORTS
+          return LOG_SORTS;
         default:
           return null;
       }
@@ -163,9 +163,6 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.LOOKUPS, new org.apache.thrift.meta_data.FieldMetaData("lookups", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.LOGGERS, new org.apache.thrift.meta_data.FieldMetaData("loggers", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))));
     tmpMap.put(_Fields.INDEX_CACHE_HITS, new org.apache.thrift.meta_data.FieldMetaData("indexCacheHits", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.INDEX_CACHE_REQUEST, new org.apache.thrift.meta_data.FieldMetaData("indexCacheRequest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -174,6 +171,9 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.DATA_CACHE_REQUEST, new org.apache.thrift.meta_data.FieldMetaData("dataCacheRequest", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.LOG_SORTS, new org.apache.thrift.meta_data.FieldMetaData("logSorts", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST, 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, RecoveryStatus.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TabletServerStatus.class, metaDataMap);
   }
@@ -188,11 +188,11 @@ import org.slf4j.LoggerFactory;
     double osLoad,
     long holdTime,
     long lookups,
-    Set<String> loggers,
     long indexCacheHits,
     long indexCacheRequest,
     long dataCacheHits,
-    long dataCacheRequest)
+    long dataCacheRequest,
+    List<RecoveryStatus> logSorts)
   {
     this();
     this.tableMap = tableMap;
@@ -205,7 +205,6 @@ import org.slf4j.LoggerFactory;
     setHoldTimeIsSet(true);
     this.lookups = lookups;
     setLookupsIsSet(true);
-    this.loggers = loggers;
     this.indexCacheHits = indexCacheHits;
     setIndexCacheHitsIsSet(true);
     this.indexCacheRequest = indexCacheRequest;
@@ -214,6 +213,7 @@ import org.slf4j.LoggerFactory;
     setDataCacheHitsIsSet(true);
     this.dataCacheRequest = dataCacheRequest;
     setDataCacheRequestIsSet(true);
+    this.logSorts = logSorts;
   }
 
   /**
@@ -244,17 +244,17 @@ import org.slf4j.LoggerFactory;
     this.osLoad = other.osLoad;
     this.holdTime = other.holdTime;
     this.lookups = other.lookups;
-    if (other.isSetLoggers()) {
-      Set<String> __this__loggers = new HashSet<String>();
-      for (String other_element : other.loggers) {
-        __this__loggers.add(other_element);
-      }
-      this.loggers = __this__loggers;
-    }
     this.indexCacheHits = other.indexCacheHits;
     this.indexCacheRequest = other.indexCacheRequest;
     this.dataCacheHits = other.dataCacheHits;
     this.dataCacheRequest = other.dataCacheRequest;
+    if (other.isSetLogSorts()) {
+      List<RecoveryStatus> __this__logSorts = new ArrayList<RecoveryStatus>();
+      for (RecoveryStatus other_element : other.logSorts) {
+        __this__logSorts.add(new RecoveryStatus(other_element));
+      }
+      this.logSorts = __this__logSorts;
+    }
   }
 
   public TabletServerStatus deepCopy() {
@@ -273,7 +273,6 @@ import org.slf4j.LoggerFactory;
     this.holdTime = 0;
     setLookupsIsSet(false);
     this.lookups = 0;
-    this.loggers = null;
     setIndexCacheHitsIsSet(false);
     this.indexCacheHits = 0;
     setIndexCacheRequestIsSet(false);
@@ -282,6 +281,7 @@ import org.slf4j.LoggerFactory;
     this.dataCacheHits = 0;
     setDataCacheRequestIsSet(false);
     this.dataCacheRequest = 0;
+    this.logSorts = null;
   }
 
   public int getTableMapSize() {
@@ -435,45 +435,6 @@ import org.slf4j.LoggerFactory;
     __isset_bit_vector.set(__LOOKUPS_ISSET_ID, value);
   }
 
-  public int getLoggersSize() {
-    return (this.loggers == null) ? 0 : this.loggers.size();
-  }
-
-  public java.util.Iterator<String> getLoggersIterator() {
-    return (this.loggers == null) ? null : this.loggers.iterator();
-  }
-
-  public void addToLoggers(String elem) {
-    if (this.loggers == null) {
-      this.loggers = new HashSet<String>();
-    }
-    this.loggers.add(elem);
-  }
-
-  public Set<String> getLoggers() {
-    return this.loggers;
-  }
-
-  public TabletServerStatus setLoggers(Set<String> loggers) {
-    this.loggers = loggers;
-    return this;
-  }
-
-  public void unsetLoggers() {
-    this.loggers = null;
-  }
-
-  /** Returns true if field loggers is set (has been assigned a value) and false otherwise */
-  public boolean isSetLoggers() {
-    return this.loggers != null;
-  }
-
-  public void setLoggersIsSet(boolean value) {
-    if (!value) {
-      this.loggers = null;
-    }
-  }
-
   public long getIndexCacheHits() {
     return this.indexCacheHits;
   }
@@ -566,6 +527,45 @@ import org.slf4j.LoggerFactory;
     __isset_bit_vector.set(__DATACACHEREQUEST_ISSET_ID, value);
   }
 
+  public int getLogSortsSize() {
+    return (this.logSorts == null) ? 0 : this.logSorts.size();
+  }
+
+  public java.util.Iterator<RecoveryStatus> getLogSortsIterator() {
+    return (this.logSorts == null) ? null : this.logSorts.iterator();
+  }
+
+  public void addToLogSorts(RecoveryStatus elem) {
+    if (this.logSorts == null) {
+      this.logSorts = new ArrayList<RecoveryStatus>();
+    }
+    this.logSorts.add(elem);
+  }
+
+  public List<RecoveryStatus> getLogSorts() {
+    return this.logSorts;
+  }
+
+  public TabletServerStatus setLogSorts(List<RecoveryStatus> logSorts) {
+    this.logSorts = logSorts;
+    return this;
+  }
+
+  public void unsetLogSorts() {
+    this.logSorts = null;
+  }
+
+  /** Returns true if field logSorts is set (has been assigned a value) and false otherwise */
+  public boolean isSetLogSorts() {
+    return this.logSorts != null;
+  }
+
+  public void setLogSortsIsSet(boolean value) {
+    if (!value) {
+      this.logSorts = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case TABLE_MAP:
@@ -616,14 +616,6 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case LOGGERS:
-      if (value == null) {
-        unsetLoggers();
-      } else {
-        setLoggers((Set<String>)value);
-      }
-      break;
-
     case INDEX_CACHE_HITS:
       if (value == null) {
         unsetIndexCacheHits();
@@ -656,6 +648,14 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
+    case LOG_SORTS:
+      if (value == null) {
+        unsetLogSorts();
+      } else {
+        setLogSorts((List<RecoveryStatus>)value);
+      }
+      break;
+
     }
   }
 
@@ -679,9 +679,6 @@ import org.slf4j.LoggerFactory;
     case LOOKUPS:
       return new Long(getLookups());
 
-    case LOGGERS:
-      return getLoggers();
-
     case INDEX_CACHE_HITS:
       return new Long(getIndexCacheHits());
 
@@ -694,6 +691,9 @@ import org.slf4j.LoggerFactory;
     case DATA_CACHE_REQUEST:
       return new Long(getDataCacheRequest());
 
+    case LOG_SORTS:
+      return getLogSorts();
+
     }
     throw new IllegalStateException();
   }
@@ -717,8 +717,6 @@ import org.slf4j.LoggerFactory;
       return isSetHoldTime();
     case LOOKUPS:
       return isSetLookups();
-    case LOGGERS:
-      return isSetLoggers();
     case INDEX_CACHE_HITS:
       return isSetIndexCacheHits();
     case INDEX_CACHE_REQUEST:
@@ -727,6 +725,8 @@ import org.slf4j.LoggerFactory;
       return isSetDataCacheHits();
     case DATA_CACHE_REQUEST:
       return isSetDataCacheRequest();
+    case LOG_SORTS:
+      return isSetLogSorts();
     }
     throw new IllegalStateException();
   }
@@ -798,15 +798,6 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_loggers = true && this.isSetLoggers();
-    boolean that_present_loggers = true && that.isSetLoggers();
-    if (this_present_loggers || that_present_loggers) {
-      if (!(this_present_loggers && that_present_loggers))
-        return false;
-      if (!this.loggers.equals(that.loggers))
-        return false;
-    }
-
     boolean this_present_indexCacheHits = true;
     boolean that_present_indexCacheHits = true;
     if (this_present_indexCacheHits || that_present_indexCacheHits) {
@@ -843,6 +834,15 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
+    boolean this_present_logSorts = true && this.isSetLogSorts();
+    boolean that_present_logSorts = true && that.isSetLogSorts();
+    if (this_present_logSorts || that_present_logSorts) {
+      if (!(this_present_logSorts && that_present_logSorts))
+        return false;
+      if (!this.logSorts.equals(that.logSorts))
+        return false;
+    }
+
     return true;
   }
 
@@ -919,16 +919,6 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetLoggers()).compareTo(typedOther.isSetLoggers());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetLoggers()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.loggers, typedOther.loggers);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
     lastComparison = Boolean.valueOf(isSetIndexCacheHits()).compareTo(typedOther.isSetIndexCacheHits());
     if (lastComparison != 0) {
       return lastComparison;
@@ -969,6 +959,16 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetLogSorts()).compareTo(typedOther.isSetLogSorts());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetLogSorts()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.logSorts, typedOther.logSorts);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1045,23 +1045,6 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
-        case 9: // LOGGERS
-          if (field.type == org.apache.thrift.protocol.TType.SET) {
-            {
-              org.apache.thrift.protocol.TSet _set4 = iprot.readSetBegin();
-              this.loggers = new HashSet<String>(2*_set4.size);
-              for (int _i5 = 0; _i5 < _set4.size; ++_i5)
-              {
-                String _elem6;
-                _elem6 = iprot.readString();
-                this.loggers.add(_elem6);
-              }
-              iprot.readSetEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
         case 10: // INDEX_CACHE_HITS
           if (field.type == org.apache.thrift.protocol.TType.I64) {
             this.indexCacheHits = iprot.readI64();
@@ -1094,6 +1077,24 @@ import org.slf4j.LoggerFactory;
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
           }
           break;
+        case 14: // LOG_SORTS
+          if (field.type == org.apache.thrift.protocol.TType.LIST) {
+            {
+              org.apache.thrift.protocol.TList _list4 = iprot.readListBegin();
+              this.logSorts = new ArrayList<RecoveryStatus>(_list4.size);
+              for (int _i5 = 0; _i5 < _list4.size; ++_i5)
+              {
+                RecoveryStatus _elem6;
+                _elem6 = new RecoveryStatus();
+                _elem6.read(iprot);
+                this.logSorts.add(_elem6);
+              }
+              iprot.readListEnd();
+            }
+          } else { 
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
+          }
+          break;
         default:
           org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
       }
@@ -1139,18 +1140,6 @@ import org.slf4j.LoggerFactory;
     oprot.writeFieldBegin(LOOKUPS_FIELD_DESC);
     oprot.writeI64(this.lookups);
     oprot.writeFieldEnd();
-    if (this.loggers != null) {
-      oprot.writeFieldBegin(LOGGERS_FIELD_DESC);
-      {
-        oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, this.loggers.size()));
-        for (String _iter8 : this.loggers)
-        {
-          oprot.writeString(_iter8);
-        }
-        oprot.writeSetEnd();
-      }
-      oprot.writeFieldEnd();
-    }
     oprot.writeFieldBegin(INDEX_CACHE_HITS_FIELD_DESC);
     oprot.writeI64(this.indexCacheHits);
     oprot.writeFieldEnd();
@@ -1163,6 +1152,18 @@ import org.slf4j.LoggerFactory;
     oprot.writeFieldBegin(DATA_CACHE_REQUEST_FIELD_DESC);
     oprot.writeI64(this.dataCacheRequest);
     oprot.writeFieldEnd();
+    if (this.logSorts != null) {
+      oprot.writeFieldBegin(LOG_SORTS_FIELD_DESC);
+      {
+        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.logSorts.size()));
+        for (RecoveryStatus _iter8 : this.logSorts)
+        {
+          _iter8.write(oprot);
+        }
+        oprot.writeListEnd();
+      }
+      oprot.writeFieldEnd();
+    }
     oprot.writeFieldStop();
     oprot.writeStructEnd();
   }
@@ -1204,14 +1205,6 @@ import org.slf4j.LoggerFactory;
     sb.append(this.lookups);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("loggers:");
-    if (this.loggers == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.loggers);
-    }
-    first = false;
-    if (!first) sb.append(", ");
     sb.append("indexCacheHits:");
     sb.append(this.indexCacheHits);
     first = false;
@@ -1227,6 +1220,14 @@ import org.slf4j.LoggerFactory;
     sb.append("dataCacheRequest:");
     sb.append(this.dataCacheRequest);
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("logSorts:");
+    if (this.logSorts == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.logSorts);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }

Modified: accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1353663&r1=1353662&r2=1353663&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java (original)
+++ accumulo/branches/ACCUMULO-259/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java Mon Jun 25 17:09:31 2012
@@ -348,14 +348,14 @@ import org.slf4j.LoggerFactory;
         case 2: // NEW_TABLETS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list43 = iprot.readListBegin();
-              this.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list43.size);
-              for (int _i44 = 0; _i44 < _list43.size; ++_i44)
+              org.apache.thrift.protocol.TList _list31 = iprot.readListBegin();
+              this.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list31.size);
+              for (int _i32 = 0; _i32 < _list31.size; ++_i32)
               {
-                org.apache.accumulo.core.data.thrift.TKeyExtent _elem45;
-                _elem45 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-                _elem45.read(iprot);
-                this.newTablets.add(_elem45);
+                org.apache.accumulo.core.data.thrift.TKeyExtent _elem33;
+                _elem33 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
+                _elem33.read(iprot);
+                this.newTablets.add(_elem33);
               }
               iprot.readListEnd();
             }
@@ -387,9 +387,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(NEW_TABLETS_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.newTablets.size()));
-        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter46 : this.newTablets)
+        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter34 : this.newTablets)
         {
-          _iter46.write(oprot);
+          _iter34.write(oprot);
         }
         oprot.writeListEnd();
       }



Mime
View raw message