accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r1342773 [1/3] - in /accumulo/branches/ACCUMULO-578: core/src/main/java/org/apache/accumulo/core/ core/src/main/java/org/apache/accumulo/core/conf/ core/src/main/java/org/apache/accumulo/core/master/thrift/ core/src/main/java/org/apache/acc...
Date Fri, 25 May 2012 19:00:03 GMT
Author: ecn
Date: Fri May 25 18:59:59 2012
New Revision: 1342773

URL: http://svn.apache.org/viewvc?rev=1342773&view=rev
Log:
ACCUMULO-578 checkpoint, now survived 3 billion continuious ingest, verification (with agitation)

Removed:
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/balancer/LoggerBalancer.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/balancer/LoggerUser.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/balancer/SimpleLoggerBalancer.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/balancer/TServerUsesLoggers.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/LoggerLinkType.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/LoggerStrategy.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RandomLoggerStrategy.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/RoundRobinLoggerStrategy.java
    accumulo/branches/ACCUMULO-578/server/src/test/java/org/apache/accumulo/server/master/balancer/SimpleLoggerBalancerTest.java
Modified:
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
    accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
    accumulo/branches/ACCUMULO-578/core/src/main/thrift/master.thrift
    accumulo/branches/ACCUMULO-578/core/src/main/thrift/tabletserver.thrift
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/gc/GarbageCollectWriteAheadLogs.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/LiveTServerSet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/master/Master.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/BasicServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/MasterServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/Tablet.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/DfsLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/tabletserver/log/TabletServerLogger.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/test/performance/thrift/NullTserver.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/util/AddressUtil.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/util/Initialize.java
    accumulo/branches/ACCUMULO-578/server/src/main/java/org/apache/accumulo/server/util/ZooZap.java
    accumulo/branches/ACCUMULO-578/start/src/main/java/org/apache/accumulo/start/Main.java

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java?rev=1342773&r1=1342772&r2=1342773&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java
(original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/Constants.java
Fri May 25 18:59:59 2012
@@ -63,8 +63,6 @@ public class Constants {
   public static final String ZDEAD = "/dead";
   public static final String ZDEADTSERVERS = "/dead/tservers";
   
-  public static final String ZLOGGERS = "/loggers";
-  
   public static final String ZTRACERS = "/tracers";
   
   public static final String ZPROBLEMS = "/problems";

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java?rev=1342773&r1=1342772&r2=1342773&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java
(original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/conf/Property.java
Fri May 25 18:59:59 2012
@@ -113,10 +113,6 @@ public enum Property {
   TSERV_BLOOM_LOAD_MAXCONCURRENT("tserver.bloom.load.concurrent.max", "4", PropertyType.COUNT,
       "The number of concurrent threads that will load bloom filters in the background. "
           + "Setting this to zero will make bloom filters load in the foreground."),
-  TSERV_LOGGER_TIMEOUT("tserver.logger.timeout", "30s", PropertyType.TIMEDURATION, "The time
to wait for a logger to respond to a write-ahead request"),
-  TSERV_LOGGER_COUNT("tserver.logger.count", "2", PropertyType.COUNT, "The number of loggers
that each tablet server should use."),
-  TSERV_LOGGER_STRATEGY("tserver.logger.strategy", "org.apache.accumulo.server.tabletserver.log.RoundRobinLoggerStrategy",
PropertyType.STRING,
-      "The classname used to decide which loggers to use."),
   TSERV_MONITOR_FS(
       "tserver.monitor.fs",
       "true",
@@ -330,7 +326,7 @@ public enum Property {
   }
   
   private static final EnumSet<Property> fixedProperties = EnumSet.of(Property.TSERV_CLIENTPORT,
Property.TSERV_NATIVEMAP_ENABLED,
-      Property.TSERV_SCAN_MAX_OPENFILES, Property.TSERV_LOGGER_COUNT, Property.MASTER_CLIENTPORT,
Property.GC_PORT);
+      Property.TSERV_SCAN_MAX_OPENFILES, Property.MASTER_CLIENTPORT, Property.GC_PORT);
   
   public static boolean isFixedZooPropertyKey(Property key) {
     return fixedProperties.contains(key);

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java?rev=1342773&r1=1342772&r2=1342773&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
(original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
Fri May 25 18:59:59 2012
@@ -13819,13 +13819,13 @@ import org.slf4j.LoggerFactory;
           case 4: // ARGUMENTS
             if (field.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list39 = iprot.readListBegin();
-                this.arguments = new ArrayList<ByteBuffer>(_list39.size);
-                for (int _i40 = 0; _i40 < _list39.size; ++_i40)
+                org.apache.thrift.protocol.TList _list35 = iprot.readListBegin();
+                this.arguments = new ArrayList<ByteBuffer>(_list35.size);
+                for (int _i36 = 0; _i36 < _list35.size; ++_i36)
                 {
-                  ByteBuffer _elem41;
-                  _elem41 = iprot.readBinary();
-                  this.arguments.add(_elem41);
+                  ByteBuffer _elem37;
+                  _elem37 = iprot.readBinary();
+                  this.arguments.add(_elem37);
                 }
                 iprot.readListEnd();
               }
@@ -13836,15 +13836,15 @@ import org.slf4j.LoggerFactory;
           case 5: // OPTIONS
             if (field.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map42 = iprot.readMapBegin();
-                this.options = new HashMap<String,String>(2*_map42.size);
-                for (int _i43 = 0; _i43 < _map42.size; ++_i43)
+                org.apache.thrift.protocol.TMap _map38 = iprot.readMapBegin();
+                this.options = new HashMap<String,String>(2*_map38.size);
+                for (int _i39 = 0; _i39 < _map38.size; ++_i39)
                 {
-                  String _key44;
-                  String _val45;
-                  _key44 = iprot.readString();
-                  _val45 = iprot.readString();
-                  this.options.put(_key44, _val45);
+                  String _key40;
+                  String _val41;
+                  _key40 = iprot.readString();
+                  _val41 = iprot.readString();
+                  this.options.put(_key40, _val41);
                 }
                 iprot.readMapEnd();
               }
@@ -13892,9 +13892,9 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(ARGUMENTS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING,
this.arguments.size()));
-          for (ByteBuffer _iter46 : this.arguments)
+          for (ByteBuffer _iter42 : this.arguments)
           {
-            oprot.writeBinary(_iter46);
+            oprot.writeBinary(_iter42);
           }
           oprot.writeListEnd();
         }
@@ -13904,10 +13904,10 @@ import org.slf4j.LoggerFactory;
         oprot.writeFieldBegin(OPTIONS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING,
org.apache.thrift.protocol.TType.STRING, this.options.size()));
-          for (Map.Entry<String, String> _iter47 : this.options.entrySet())
+          for (Map.Entry<String, String> _iter43 : this.options.entrySet())
           {
-            oprot.writeString(_iter47.getKey());
-            oprot.writeString(_iter47.getValue());
+            oprot.writeString(_iter43.getKey());
+            oprot.writeString(_iter43.getValue());
           }
           oprot.writeMapEnd();
         }

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java?rev=1342773&r1=1342772&r2=1342773&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
(original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
Fri May 25 18:59:59 2012
@@ -968,16 +968,16 @@ import org.slf4j.LoggerFactory;
         case 1: // TABLE_MAP
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map9 = iprot.readMapBegin();
-              this.tableMap = new HashMap<String,TableInfo>(2*_map9.size);
-              for (int _i10 = 0; _i10 < _map9.size; ++_i10)
+              org.apache.thrift.protocol.TMap _map5 = iprot.readMapBegin();
+              this.tableMap = new HashMap<String,TableInfo>(2*_map5.size);
+              for (int _i6 = 0; _i6 < _map5.size; ++_i6)
               {
-                String _key11;
-                TableInfo _val12;
-                _key11 = iprot.readString();
-                _val12 = new TableInfo();
-                _val12.read(iprot);
-                this.tableMap.put(_key11, _val12);
+                String _key7;
+                TableInfo _val8;
+                _key7 = iprot.readString();
+                _val8 = new TableInfo();
+                _val8.read(iprot);
+                this.tableMap.put(_key7, _val8);
               }
               iprot.readMapEnd();
             }
@@ -988,14 +988,14 @@ import org.slf4j.LoggerFactory;
         case 2: // T_SERVER_INFO
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list13 = iprot.readListBegin();
-              this.tServerInfo = new ArrayList<TabletServerStatus>(_list13.size);
-              for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+              org.apache.thrift.protocol.TList _list9 = iprot.readListBegin();
+              this.tServerInfo = new ArrayList<TabletServerStatus>(_list9.size);
+              for (int _i10 = 0; _i10 < _list9.size; ++_i10)
               {
-                TabletServerStatus _elem15;
-                _elem15 = new TabletServerStatus();
-                _elem15.read(iprot);
-                this.tServerInfo.add(_elem15);
+                TabletServerStatus _elem11;
+                _elem11 = new TabletServerStatus();
+                _elem11.read(iprot);
+                this.tServerInfo.add(_elem11);
               }
               iprot.readListEnd();
             }
@@ -1006,15 +1006,15 @@ import org.slf4j.LoggerFactory;
         case 3: // BAD_TSERVERS
           if (field.type == org.apache.thrift.protocol.TType.MAP) {
             {
-              org.apache.thrift.protocol.TMap _map16 = iprot.readMapBegin();
-              this.badTServers = new HashMap<String,Byte>(2*_map16.size);
-              for (int _i17 = 0; _i17 < _map16.size; ++_i17)
+              org.apache.thrift.protocol.TMap _map12 = iprot.readMapBegin();
+              this.badTServers = new HashMap<String,Byte>(2*_map12.size);
+              for (int _i13 = 0; _i13 < _map12.size; ++_i13)
               {
-                String _key18;
-                byte _val19;
-                _key18 = iprot.readString();
-                _val19 = iprot.readByte();
-                this.badTServers.put(_key18, _val19);
+                String _key14;
+                byte _val15;
+                _key14 = iprot.readString();
+                _val15 = iprot.readByte();
+                this.badTServers.put(_key14, _val15);
               }
               iprot.readMapEnd();
             }
@@ -1025,14 +1025,14 @@ import org.slf4j.LoggerFactory;
         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)
+              org.apache.thrift.protocol.TList _list16 = iprot.readListBegin();
+              this.recovery = new ArrayList<RecoveryStatus>(_list16.size);
+              for (int _i17 = 0; _i17 < _list16.size; ++_i17)
               {
-                RecoveryStatus _elem22;
-                _elem22 = new RecoveryStatus();
-                _elem22.read(iprot);
-                this.recovery.add(_elem22);
+                RecoveryStatus _elem18;
+                _elem18 = new RecoveryStatus();
+                _elem18.read(iprot);
+                this.recovery.add(_elem18);
               }
               iprot.readListEnd();
             }
@@ -1065,13 +1065,13 @@ import org.slf4j.LoggerFactory;
         case 9: // SERVERS_SHUTTING_DOWN
           if (field.type == org.apache.thrift.protocol.TType.SET) {
             {
-              org.apache.thrift.protocol.TSet _set23 = iprot.readSetBegin();
-              this.serversShuttingDown = new HashSet<String>(2*_set23.size);
-              for (int _i24 = 0; _i24 < _set23.size; ++_i24)
+              org.apache.thrift.protocol.TSet _set19 = iprot.readSetBegin();
+              this.serversShuttingDown = new HashSet<String>(2*_set19.size);
+              for (int _i20 = 0; _i20 < _set19.size; ++_i20)
               {
-                String _elem25;
-                _elem25 = iprot.readString();
-                this.serversShuttingDown.add(_elem25);
+                String _elem21;
+                _elem21 = iprot.readString();
+                this.serversShuttingDown.add(_elem21);
               }
               iprot.readSetEnd();
             }
@@ -1082,14 +1082,14 @@ import org.slf4j.LoggerFactory;
         case 10: // DEAD_TABLET_SERVERS
           if (field.type == org.apache.thrift.protocol.TType.LIST) {
             {
-              org.apache.thrift.protocol.TList _list26 = iprot.readListBegin();
-              this.deadTabletServers = new ArrayList<DeadServer>(_list26.size);
-              for (int _i27 = 0; _i27 < _list26.size; ++_i27)
+              org.apache.thrift.protocol.TList _list22 = iprot.readListBegin();
+              this.deadTabletServers = new ArrayList<DeadServer>(_list22.size);
+              for (int _i23 = 0; _i23 < _list22.size; ++_i23)
               {
-                DeadServer _elem28;
-                _elem28 = new DeadServer();
-                _elem28.read(iprot);
-                this.deadTabletServers.add(_elem28);
+                DeadServer _elem24;
+                _elem24 = new DeadServer();
+                _elem24.read(iprot);
+                this.deadTabletServers.add(_elem24);
               }
               iprot.readListEnd();
             }
@@ -1116,10 +1116,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> _iter29 : this.tableMap.entrySet())
+        for (Map.Entry<String, TableInfo> _iter25 : this.tableMap.entrySet())
         {
-          oprot.writeString(_iter29.getKey());
-          _iter29.getValue().write(oprot);
+          oprot.writeString(_iter25.getKey());
+          _iter25.getValue().write(oprot);
         }
         oprot.writeMapEnd();
       }
@@ -1129,9 +1129,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 _iter30 : this.tServerInfo)
+        for (TabletServerStatus _iter26 : this.tServerInfo)
         {
-          _iter30.write(oprot);
+          _iter26.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1141,10 +1141,10 @@ 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> _iter31 : this.badTServers.entrySet())
+        for (Map.Entry<String, Byte> _iter27 : this.badTServers.entrySet())
         {
-          oprot.writeString(_iter31.getKey());
-          oprot.writeByte(_iter31.getValue());
+          oprot.writeString(_iter27.getKey());
+          oprot.writeByte(_iter27.getValue());
         }
         oprot.writeMapEnd();
       }
@@ -1154,9 +1154,9 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(RECOVERY_FIELD_DESC);
       {
         oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT,
this.recovery.size()));
-        for (RecoveryStatus _iter32 : this.recovery)
+        for (RecoveryStatus _iter28 : this.recovery)
         {
-          _iter32.write(oprot);
+          _iter28.write(oprot);
         }
         oprot.writeListEnd();
       }
@@ -1179,9 +1179,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 _iter33 : this.serversShuttingDown)
+        for (String _iter29 : this.serversShuttingDown)
         {
-          oprot.writeString(_iter33);
+          oprot.writeString(_iter29);
         }
         oprot.writeSetEnd();
       }
@@ -1191,9 +1191,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 _iter34 : this.deadTabletServers)
+        for (DeadServer _iter30 : this.deadTabletServers)
         {
-          _iter34.write(oprot);
+          _iter30.write(oprot);
         }
         oprot.writeListEnd();
       }

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java?rev=1342773&r1=1342772&r2=1342773&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
(original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
Fri May 25 18:59:59 2012
@@ -29,7 +29,6 @@ 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);
@@ -41,7 +40,6 @@ 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;
@@ -55,7 +53,6 @@ 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"),
@@ -86,8 +83,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
@@ -163,9 +158,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, 
@@ -188,7 +180,6 @@ import org.slf4j.LoggerFactory;
     double osLoad,
     long holdTime,
     long lookups,
-    Set<String> loggers,
     long indexCacheHits,
     long indexCacheRequest,
     long dataCacheHits,
@@ -205,7 +196,6 @@ import org.slf4j.LoggerFactory;
     setHoldTimeIsSet(true);
     this.lookups = lookups;
     setLookupsIsSet(true);
-    this.loggers = loggers;
     this.indexCacheHits = indexCacheHits;
     setIndexCacheHitsIsSet(true);
     this.indexCacheRequest = indexCacheRequest;
@@ -244,13 +234,6 @@ 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;
@@ -273,7 +256,6 @@ import org.slf4j.LoggerFactory;
     this.holdTime = 0;
     setLookupsIsSet(false);
     this.lookups = 0;
-    this.loggers = null;
     setIndexCacheHitsIsSet(false);
     this.indexCacheHits = 0;
     setIndexCacheRequestIsSet(false);
@@ -435,45 +417,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;
   }
@@ -616,14 +559,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();
@@ -679,9 +614,6 @@ import org.slf4j.LoggerFactory;
     case LOOKUPS:
       return new Long(getLookups());
 
-    case LOGGERS:
-      return getLoggers();
-
     case INDEX_CACHE_HITS:
       return new Long(getIndexCacheHits());
 
@@ -717,8 +649,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:
@@ -798,15 +728,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) {
@@ -919,16 +840,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;
@@ -1045,23 +956,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();
@@ -1113,10 +1007,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> _iter7 : this.tableMap.entrySet())
+        for (Map.Entry<String, TableInfo> _iter4 : this.tableMap.entrySet())
         {
-          oprot.writeString(_iter7.getKey());
-          _iter7.getValue().write(oprot);
+          oprot.writeString(_iter4.getKey());
+          _iter4.getValue().write(oprot);
         }
         oprot.writeMapEnd();
       }
@@ -1139,18 +1033,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();
@@ -1204,14 +1086,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;

Modified: accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
URL: http://svn.apache.org/viewvc/accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java?rev=1342773&r1=1342772&r2=1342773&view=diff
==============================================================================
--- accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
(original)
+++ accumulo/branches/ACCUMULO-578/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
Fri May 25 18:59:59 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 _list35 = iprot.readListBegin();
-              this.newTablets = new ArrayList<org.apache.accumulo.core.data.thrift.TKeyExtent>(_list35.size);
-              for (int _i36 = 0; _i36 < _list35.size; ++_i36)
+              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 _elem37;
-                _elem37 = new org.apache.accumulo.core.data.thrift.TKeyExtent();
-                _elem37.read(iprot);
-                this.newTablets.add(_elem37);
+                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 _iter38 : this.newTablets)
+        for (org.apache.accumulo.core.data.thrift.TKeyExtent _iter34 : this.newTablets)
         {
-          _iter38.write(oprot);
+          _iter34.write(oprot);
         }
         oprot.writeListEnd();
       }



Mime
View raw message