accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ctubb...@apache.org
Subject svn commit: r1429134 - in /accumulo/trunk: core/src/main/java/org/apache/accumulo/core/master/thrift/ core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ core/src/main/thrift/ server/src/main/java/org/apache/accumulo/server/monitor/ server...
Date Fri, 04 Jan 2013 21:21:29 GMT
Author: ctubbsii
Date: Fri Jan  4 21:21:28 2013
New Revision: 1429134

URL: http://svn.apache.org/viewvc?rev=1429134&view=rev
Log:
ACCUMULO-937 Added C++ namespace, --gen cpp, and renamed conflicting thrift variables and referencing code

Modified:
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
    accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
    accumulo/trunk/core/src/main/thrift/client.thrift
    accumulo/trunk/core/src/main/thrift/data.thrift
    accumulo/trunk/core/src/main/thrift/gc.thrift
    accumulo/trunk/core/src/main/thrift/master.thrift
    accumulo/trunk/core/src/main/thrift/security.thrift
    accumulo/trunk/core/src/main/thrift/tabletserver.thrift
    accumulo/trunk/core/src/main/thrift/thrift.sh
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/CompactionsType.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
    accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
    accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift
    accumulo/trunk/trace/thrift.sh

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java Fri Jan  4 21:21:28 2013
@@ -41,8 +41,8 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TField INGEST_BYTE_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("ingestByteRate", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
   private static final org.apache.thrift.protocol.TField QUERY_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("queryRate", org.apache.thrift.protocol.TType.DOUBLE, (short)7);
   private static final org.apache.thrift.protocol.TField QUERY_BYTE_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("queryByteRate", org.apache.thrift.protocol.TType.DOUBLE, (short)8);
-  private static final org.apache.thrift.protocol.TField MINOR_FIELD_DESC = new org.apache.thrift.protocol.TField("minor", org.apache.thrift.protocol.TType.STRUCT, (short)9);
-  private static final org.apache.thrift.protocol.TField MAJOR_FIELD_DESC = new org.apache.thrift.protocol.TField("major", org.apache.thrift.protocol.TType.STRUCT, (short)10);
+  private static final org.apache.thrift.protocol.TField MINORS_FIELD_DESC = new org.apache.thrift.protocol.TField("minors", org.apache.thrift.protocol.TType.STRUCT, (short)9);
+  private static final org.apache.thrift.protocol.TField MAJORS_FIELD_DESC = new org.apache.thrift.protocol.TField("majors", org.apache.thrift.protocol.TType.STRUCT, (short)10);
   private static final org.apache.thrift.protocol.TField SCANS_FIELD_DESC = new org.apache.thrift.protocol.TField("scans", org.apache.thrift.protocol.TType.STRUCT, (short)11);
   private static final org.apache.thrift.protocol.TField SCAN_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("scanRate", org.apache.thrift.protocol.TType.DOUBLE, (short)12);
 
@@ -60,8 +60,8 @@ import org.slf4j.LoggerFactory;
   public double ingestByteRate; // required
   public double queryRate; // required
   public double queryByteRate; // required
-  public Compacting minor; // required
-  public Compacting major; // required
+  public Compacting minors; // required
+  public Compacting majors; // required
   public Compacting scans; // required
   public double scanRate; // required
 
@@ -75,8 +75,8 @@ import org.slf4j.LoggerFactory;
     INGEST_BYTE_RATE((short)6, "ingestByteRate"),
     QUERY_RATE((short)7, "queryRate"),
     QUERY_BYTE_RATE((short)8, "queryByteRate"),
-    MINOR((short)9, "minor"),
-    MAJOR((short)10, "major"),
+    MINORS((short)9, "minors"),
+    MAJORS((short)10, "majors"),
     SCANS((short)11, "scans"),
     SCAN_RATE((short)12, "scanRate");
 
@@ -109,10 +109,10 @@ import org.slf4j.LoggerFactory;
           return QUERY_RATE;
         case 8: // QUERY_BYTE_RATE
           return QUERY_BYTE_RATE;
-        case 9: // MINOR
-          return MINOR;
-        case 10: // MAJOR
-          return MAJOR;
+        case 9: // MINORS
+          return MINORS;
+        case 10: // MAJORS
+          return MAJORS;
         case 11: // SCANS
           return SCANS;
         case 12: // SCAN_RATE
@@ -186,9 +186,9 @@ import org.slf4j.LoggerFactory;
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
     tmpMap.put(_Fields.QUERY_BYTE_RATE, new org.apache.thrift.meta_data.FieldMetaData("queryByteRate", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.DOUBLE)));
-    tmpMap.put(_Fields.MINOR, new org.apache.thrift.meta_data.FieldMetaData("minor", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.MINORS, new org.apache.thrift.meta_data.FieldMetaData("minors", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class)));
-    tmpMap.put(_Fields.MAJOR, new org.apache.thrift.meta_data.FieldMetaData("major", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.MAJORS, new org.apache.thrift.meta_data.FieldMetaData("majors", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class)));
     tmpMap.put(_Fields.SCANS, new org.apache.thrift.meta_data.FieldMetaData("scans", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Compacting.class)));
@@ -210,8 +210,8 @@ import org.slf4j.LoggerFactory;
     double ingestByteRate,
     double queryRate,
     double queryByteRate,
-    Compacting minor,
-    Compacting major,
+    Compacting minors,
+    Compacting majors,
     Compacting scans,
     double scanRate)
   {
@@ -232,8 +232,8 @@ import org.slf4j.LoggerFactory;
     setQueryRateIsSet(true);
     this.queryByteRate = queryByteRate;
     setQueryByteRateIsSet(true);
-    this.minor = minor;
-    this.major = major;
+    this.minors = minors;
+    this.majors = majors;
     this.scans = scans;
     this.scanRate = scanRate;
     setScanRateIsSet(true);
@@ -252,11 +252,11 @@ import org.slf4j.LoggerFactory;
     this.ingestByteRate = other.ingestByteRate;
     this.queryRate = other.queryRate;
     this.queryByteRate = other.queryByteRate;
-    if (other.isSetMinor()) {
-      this.minor = new Compacting(other.minor);
+    if (other.isSetMinors()) {
+      this.minors = new Compacting(other.minors);
     }
-    if (other.isSetMajor()) {
-      this.major = new Compacting(other.major);
+    if (other.isSetMajors()) {
+      this.majors = new Compacting(other.majors);
     }
     if (other.isSetScans()) {
       this.scans = new Compacting(other.scans);
@@ -286,8 +286,8 @@ import org.slf4j.LoggerFactory;
     this.queryRate = 0.0;
     setQueryByteRateIsSet(false);
     this.queryByteRate = 0.0;
-    this.minor = null;
-    this.major = null;
+    this.minors = null;
+    this.majors = null;
     this.scans = null;
     setScanRateIsSet(false);
     this.scanRate = 0.0;
@@ -477,51 +477,51 @@ import org.slf4j.LoggerFactory;
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __QUERYBYTERATE_ISSET_ID, value);
   }
 
-  public Compacting getMinor() {
-    return this.minor;
+  public Compacting getMinors() {
+    return this.minors;
   }
 
-  public TableInfo setMinor(Compacting minor) {
-    this.minor = minor;
+  public TableInfo setMinors(Compacting minors) {
+    this.minors = minors;
     return this;
   }
 
-  public void unsetMinor() {
-    this.minor = null;
+  public void unsetMinors() {
+    this.minors = null;
   }
 
-  /** Returns true if field minor is set (has been assigned a value) and false otherwise */
-  public boolean isSetMinor() {
-    return this.minor != null;
+  /** Returns true if field minors is set (has been assigned a value) and false otherwise */
+  public boolean isSetMinors() {
+    return this.minors != null;
   }
 
-  public void setMinorIsSet(boolean value) {
+  public void setMinorsIsSet(boolean value) {
     if (!value) {
-      this.minor = null;
+      this.minors = null;
     }
   }
 
-  public Compacting getMajor() {
-    return this.major;
+  public Compacting getMajors() {
+    return this.majors;
   }
 
-  public TableInfo setMajor(Compacting major) {
-    this.major = major;
+  public TableInfo setMajors(Compacting majors) {
+    this.majors = majors;
     return this;
   }
 
-  public void unsetMajor() {
-    this.major = null;
+  public void unsetMajors() {
+    this.majors = null;
   }
 
-  /** Returns true if field major is set (has been assigned a value) and false otherwise */
-  public boolean isSetMajor() {
-    return this.major != null;
+  /** Returns true if field majors is set (has been assigned a value) and false otherwise */
+  public boolean isSetMajors() {
+    return this.majors != null;
   }
 
-  public void setMajorIsSet(boolean value) {
+  public void setMajorsIsSet(boolean value) {
     if (!value) {
-      this.major = null;
+      this.majors = null;
     }
   }
 
@@ -638,19 +638,19 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case MINOR:
+    case MINORS:
       if (value == null) {
-        unsetMinor();
+        unsetMinors();
       } else {
-        setMinor((Compacting)value);
+        setMinors((Compacting)value);
       }
       break;
 
-    case MAJOR:
+    case MAJORS:
       if (value == null) {
-        unsetMajor();
+        unsetMajors();
       } else {
-        setMajor((Compacting)value);
+        setMajors((Compacting)value);
       }
       break;
 
@@ -699,11 +699,11 @@ import org.slf4j.LoggerFactory;
     case QUERY_BYTE_RATE:
       return Double.valueOf(getQueryByteRate());
 
-    case MINOR:
-      return getMinor();
+    case MINORS:
+      return getMinors();
 
-    case MAJOR:
-      return getMajor();
+    case MAJORS:
+      return getMajors();
 
     case SCANS:
       return getScans();
@@ -738,10 +738,10 @@ import org.slf4j.LoggerFactory;
       return isSetQueryRate();
     case QUERY_BYTE_RATE:
       return isSetQueryByteRate();
-    case MINOR:
-      return isSetMinor();
-    case MAJOR:
-      return isSetMajor();
+    case MINORS:
+      return isSetMinors();
+    case MAJORS:
+      return isSetMajors();
     case SCANS:
       return isSetScans();
     case SCAN_RATE:
@@ -835,21 +835,21 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_minor = true && this.isSetMinor();
-    boolean that_present_minor = true && that.isSetMinor();
-    if (this_present_minor || that_present_minor) {
-      if (!(this_present_minor && that_present_minor))
+    boolean this_present_minors = true && this.isSetMinors();
+    boolean that_present_minors = true && that.isSetMinors();
+    if (this_present_minors || that_present_minors) {
+      if (!(this_present_minors && that_present_minors))
         return false;
-      if (!this.minor.equals(that.minor))
+      if (!this.minors.equals(that.minors))
         return false;
     }
 
-    boolean this_present_major = true && this.isSetMajor();
-    boolean that_present_major = true && that.isSetMajor();
-    if (this_present_major || that_present_major) {
-      if (!(this_present_major && that_present_major))
+    boolean this_present_majors = true && this.isSetMajors();
+    boolean that_present_majors = true && that.isSetMajors();
+    if (this_present_majors || that_present_majors) {
+      if (!(this_present_majors && that_present_majors))
         return false;
-      if (!this.major.equals(that.major))
+      if (!this.majors.equals(that.majors))
         return false;
     }
 
@@ -967,22 +967,22 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMinor()).compareTo(typedOther.isSetMinor());
+    lastComparison = Boolean.valueOf(isSetMinors()).compareTo(typedOther.isSetMinors());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMinor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minor, typedOther.minor);
+    if (isSetMinors()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minors, typedOther.minors);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMajor()).compareTo(typedOther.isSetMajor());
+    lastComparison = Boolean.valueOf(isSetMajors()).compareTo(typedOther.isSetMajors());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMajor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.major, typedOther.major);
+    if (isSetMajors()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.majors, typedOther.majors);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1059,19 +1059,19 @@ import org.slf4j.LoggerFactory;
     sb.append(this.queryByteRate);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("minor:");
-    if (this.minor == null) {
+    sb.append("minors:");
+    if (this.minors == null) {
       sb.append("null");
     } else {
-      sb.append(this.minor);
+      sb.append(this.minors);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("major:");
-    if (this.major == null) {
+    sb.append("majors:");
+    if (this.majors == null) {
       sb.append("null");
     } else {
-      sb.append(this.major);
+      sb.append(this.majors);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -1093,11 +1093,11 @@ import org.slf4j.LoggerFactory;
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
     // check for sub-struct validity
-    if (minor != null) {
-      minor.validate();
+    if (minors != null) {
+      minors.validate();
     }
-    if (major != null) {
-      major.validate();
+    if (majors != null) {
+      majors.validate();
     }
     if (scans != null) {
       scans.validate();
@@ -1204,20 +1204,20 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 9: // MINOR
+          case 9: // MINORS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.minor = new Compacting();
-              struct.minor.read(iprot);
-              struct.setMinorIsSet(true);
+              struct.minors = new Compacting();
+              struct.minors.read(iprot);
+              struct.setMinorsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 10: // MAJOR
+          case 10: // MAJORS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.major = new Compacting();
-              struct.major.read(iprot);
-              struct.setMajorIsSet(true);
+              struct.majors = new Compacting();
+              struct.majors.read(iprot);
+              struct.setMajorsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1278,14 +1278,14 @@ import org.slf4j.LoggerFactory;
       oprot.writeFieldBegin(QUERY_BYTE_RATE_FIELD_DESC);
       oprot.writeDouble(struct.queryByteRate);
       oprot.writeFieldEnd();
-      if (struct.minor != null) {
-        oprot.writeFieldBegin(MINOR_FIELD_DESC);
-        struct.minor.write(oprot);
+      if (struct.minors != null) {
+        oprot.writeFieldBegin(MINORS_FIELD_DESC);
+        struct.minors.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.major != null) {
-        oprot.writeFieldBegin(MAJOR_FIELD_DESC);
-        struct.major.write(oprot);
+      if (struct.majors != null) {
+        oprot.writeFieldBegin(MAJORS_FIELD_DESC);
+        struct.majors.write(oprot);
         oprot.writeFieldEnd();
       }
       if (struct.scans != null) {
@@ -1338,10 +1338,10 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetQueryByteRate()) {
         optionals.set(7);
       }
-      if (struct.isSetMinor()) {
+      if (struct.isSetMinors()) {
         optionals.set(8);
       }
-      if (struct.isSetMajor()) {
+      if (struct.isSetMajors()) {
         optionals.set(9);
       }
       if (struct.isSetScans()) {
@@ -1375,11 +1375,11 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetQueryByteRate()) {
         oprot.writeDouble(struct.queryByteRate);
       }
-      if (struct.isSetMinor()) {
-        struct.minor.write(oprot);
+      if (struct.isSetMinors()) {
+        struct.minors.write(oprot);
       }
-      if (struct.isSetMajor()) {
-        struct.major.write(oprot);
+      if (struct.isSetMajors()) {
+        struct.majors.write(oprot);
       }
       if (struct.isSetScans()) {
         struct.scans.write(oprot);
@@ -1426,14 +1426,14 @@ import org.slf4j.LoggerFactory;
         struct.setQueryByteRateIsSet(true);
       }
       if (incoming.get(8)) {
-        struct.minor = new Compacting();
-        struct.minor.read(iprot);
-        struct.setMinorIsSet(true);
+        struct.minors = new Compacting();
+        struct.minors.read(iprot);
+        struct.setMinorsIsSet(true);
       }
       if (incoming.get(9)) {
-        struct.major = new Compacting();
-        struct.major.read(iprot);
-        struct.setMajorIsSet(true);
+        struct.majors = new Compacting();
+        struct.majors.read(iprot);
+        struct.setMajorsIsSet(true);
       }
       if (incoming.get(10)) {
         struct.scans = new Compacting();

Modified: accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java (original)
+++ accumulo/trunk/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java Fri Jan  4 21:21:28 2013
@@ -34,9 +34,9 @@ import org.slf4j.LoggerFactory;
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TabletStats");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = new org.apache.thrift.protocol.TField("extent", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField MAJOR_FIELD_DESC = new org.apache.thrift.protocol.TField("major", org.apache.thrift.protocol.TType.STRUCT, (short)2);
-  private static final org.apache.thrift.protocol.TField MINOR_FIELD_DESC = new org.apache.thrift.protocol.TField("minor", org.apache.thrift.protocol.TType.STRUCT, (short)3);
-  private static final org.apache.thrift.protocol.TField SPLIT_FIELD_DESC = new org.apache.thrift.protocol.TField("split", org.apache.thrift.protocol.TType.STRUCT, (short)4);
+  private static final org.apache.thrift.protocol.TField MAJORS_FIELD_DESC = new org.apache.thrift.protocol.TField("majors", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.thrift.protocol.TField MINORS_FIELD_DESC = new org.apache.thrift.protocol.TField("minors", org.apache.thrift.protocol.TType.STRUCT, (short)3);
+  private static final org.apache.thrift.protocol.TField SPLITS_FIELD_DESC = new org.apache.thrift.protocol.TField("splits", org.apache.thrift.protocol.TType.STRUCT, (short)4);
   private static final org.apache.thrift.protocol.TField NUM_ENTRIES_FIELD_DESC = new org.apache.thrift.protocol.TField("numEntries", org.apache.thrift.protocol.TType.I64, (short)5);
   private static final org.apache.thrift.protocol.TField INGEST_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("ingestRate", org.apache.thrift.protocol.TType.DOUBLE, (short)6);
   private static final org.apache.thrift.protocol.TField QUERY_RATE_FIELD_DESC = new org.apache.thrift.protocol.TField("queryRate", org.apache.thrift.protocol.TType.DOUBLE, (short)7);
@@ -49,9 +49,9 @@ import org.slf4j.LoggerFactory;
   }
 
   public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required
-  public ActionStats major; // required
-  public ActionStats minor; // required
-  public ActionStats split; // required
+  public ActionStats majors; // required
+  public ActionStats minors; // required
+  public ActionStats splits; // required
   public long numEntries; // required
   public double ingestRate; // required
   public double queryRate; // required
@@ -60,9 +60,9 @@ import org.slf4j.LoggerFactory;
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum {
     EXTENT((short)1, "extent"),
-    MAJOR((short)2, "major"),
-    MINOR((short)3, "minor"),
-    SPLIT((short)4, "split"),
+    MAJORS((short)2, "majors"),
+    MINORS((short)3, "minors"),
+    SPLITS((short)4, "splits"),
     NUM_ENTRIES((short)5, "numEntries"),
     INGEST_RATE((short)6, "ingestRate"),
     QUERY_RATE((short)7, "queryRate"),
@@ -83,12 +83,12 @@ import org.slf4j.LoggerFactory;
       switch(fieldId) {
         case 1: // EXTENT
           return EXTENT;
-        case 2: // MAJOR
-          return MAJOR;
-        case 3: // MINOR
-          return MINOR;
-        case 4: // SPLIT
-          return SPLIT;
+        case 2: // MAJORS
+          return MAJORS;
+        case 3: // MINORS
+          return MINORS;
+        case 4: // SPLITS
+          return SPLITS;
         case 5: // NUM_ENTRIES
           return NUM_ENTRIES;
         case 6: // INGEST_RATE
@@ -147,11 +147,11 @@ import org.slf4j.LoggerFactory;
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.EXTENT, new org.apache.thrift.meta_data.FieldMetaData("extent", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, org.apache.accumulo.core.data.thrift.TKeyExtent.class)));
-    tmpMap.put(_Fields.MAJOR, new org.apache.thrift.meta_data.FieldMetaData("major", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.MAJORS, new org.apache.thrift.meta_data.FieldMetaData("majors", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ActionStats.class)));
-    tmpMap.put(_Fields.MINOR, new org.apache.thrift.meta_data.FieldMetaData("minor", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.MINORS, new org.apache.thrift.meta_data.FieldMetaData("minors", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ActionStats.class)));
-    tmpMap.put(_Fields.SPLIT, new org.apache.thrift.meta_data.FieldMetaData("split", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.SPLITS, new org.apache.thrift.meta_data.FieldMetaData("splits", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ActionStats.class)));
     tmpMap.put(_Fields.NUM_ENTRIES, new org.apache.thrift.meta_data.FieldMetaData("numEntries", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
@@ -170,9 +170,9 @@ import org.slf4j.LoggerFactory;
 
   public TabletStats(
     org.apache.accumulo.core.data.thrift.TKeyExtent extent,
-    ActionStats major,
-    ActionStats minor,
-    ActionStats split,
+    ActionStats majors,
+    ActionStats minors,
+    ActionStats splits,
     long numEntries,
     double ingestRate,
     double queryRate,
@@ -180,9 +180,9 @@ import org.slf4j.LoggerFactory;
   {
     this();
     this.extent = extent;
-    this.major = major;
-    this.minor = minor;
-    this.split = split;
+    this.majors = majors;
+    this.minors = minors;
+    this.splits = splits;
     this.numEntries = numEntries;
     setNumEntriesIsSet(true);
     this.ingestRate = ingestRate;
@@ -201,14 +201,14 @@ import org.slf4j.LoggerFactory;
     if (other.isSetExtent()) {
       this.extent = new org.apache.accumulo.core.data.thrift.TKeyExtent(other.extent);
     }
-    if (other.isSetMajor()) {
-      this.major = new ActionStats(other.major);
+    if (other.isSetMajors()) {
+      this.majors = new ActionStats(other.majors);
     }
-    if (other.isSetMinor()) {
-      this.minor = new ActionStats(other.minor);
+    if (other.isSetMinors()) {
+      this.minors = new ActionStats(other.minors);
     }
-    if (other.isSetSplit()) {
-      this.split = new ActionStats(other.split);
+    if (other.isSetSplits()) {
+      this.splits = new ActionStats(other.splits);
     }
     this.numEntries = other.numEntries;
     this.ingestRate = other.ingestRate;
@@ -223,9 +223,9 @@ import org.slf4j.LoggerFactory;
   @Override
   public void clear() {
     this.extent = null;
-    this.major = null;
-    this.minor = null;
-    this.split = null;
+    this.majors = null;
+    this.minors = null;
+    this.splits = null;
     setNumEntriesIsSet(false);
     this.numEntries = 0;
     setIngestRateIsSet(false);
@@ -260,75 +260,75 @@ import org.slf4j.LoggerFactory;
     }
   }
 
-  public ActionStats getMajor() {
-    return this.major;
+  public ActionStats getMajors() {
+    return this.majors;
   }
 
-  public TabletStats setMajor(ActionStats major) {
-    this.major = major;
+  public TabletStats setMajors(ActionStats majors) {
+    this.majors = majors;
     return this;
   }
 
-  public void unsetMajor() {
-    this.major = null;
+  public void unsetMajors() {
+    this.majors = null;
   }
 
-  /** Returns true if field major is set (has been assigned a value) and false otherwise */
-  public boolean isSetMajor() {
-    return this.major != null;
+  /** Returns true if field majors is set (has been assigned a value) and false otherwise */
+  public boolean isSetMajors() {
+    return this.majors != null;
   }
 
-  public void setMajorIsSet(boolean value) {
+  public void setMajorsIsSet(boolean value) {
     if (!value) {
-      this.major = null;
+      this.majors = null;
     }
   }
 
-  public ActionStats getMinor() {
-    return this.minor;
+  public ActionStats getMinors() {
+    return this.minors;
   }
 
-  public TabletStats setMinor(ActionStats minor) {
-    this.minor = minor;
+  public TabletStats setMinors(ActionStats minors) {
+    this.minors = minors;
     return this;
   }
 
-  public void unsetMinor() {
-    this.minor = null;
+  public void unsetMinors() {
+    this.minors = null;
   }
 
-  /** Returns true if field minor is set (has been assigned a value) and false otherwise */
-  public boolean isSetMinor() {
-    return this.minor != null;
+  /** Returns true if field minors is set (has been assigned a value) and false otherwise */
+  public boolean isSetMinors() {
+    return this.minors != null;
   }
 
-  public void setMinorIsSet(boolean value) {
+  public void setMinorsIsSet(boolean value) {
     if (!value) {
-      this.minor = null;
+      this.minors = null;
     }
   }
 
-  public ActionStats getSplit() {
-    return this.split;
+  public ActionStats getSplits() {
+    return this.splits;
   }
 
-  public TabletStats setSplit(ActionStats split) {
-    this.split = split;
+  public TabletStats setSplits(ActionStats splits) {
+    this.splits = splits;
     return this;
   }
 
-  public void unsetSplit() {
-    this.split = null;
+  public void unsetSplits() {
+    this.splits = null;
   }
 
-  /** Returns true if field split is set (has been assigned a value) and false otherwise */
-  public boolean isSetSplit() {
-    return this.split != null;
+  /** Returns true if field splits is set (has been assigned a value) and false otherwise */
+  public boolean isSetSplits() {
+    return this.splits != null;
   }
 
-  public void setSplitIsSet(boolean value) {
+  public void setSplitsIsSet(boolean value) {
     if (!value) {
-      this.split = null;
+      this.splits = null;
     }
   }
 
@@ -434,27 +434,27 @@ import org.slf4j.LoggerFactory;
       }
       break;
 
-    case MAJOR:
+    case MAJORS:
       if (value == null) {
-        unsetMajor();
+        unsetMajors();
       } else {
-        setMajor((ActionStats)value);
+        setMajors((ActionStats)value);
       }
       break;
 
-    case MINOR:
+    case MINORS:
       if (value == null) {
-        unsetMinor();
+        unsetMinors();
       } else {
-        setMinor((ActionStats)value);
+        setMinors((ActionStats)value);
       }
       break;
 
-    case SPLIT:
+    case SPLITS:
       if (value == null) {
-        unsetSplit();
+        unsetSplits();
       } else {
-        setSplit((ActionStats)value);
+        setSplits((ActionStats)value);
       }
       break;
 
@@ -498,14 +498,14 @@ import org.slf4j.LoggerFactory;
     case EXTENT:
       return getExtent();
 
-    case MAJOR:
-      return getMajor();
+    case MAJORS:
+      return getMajors();
 
-    case MINOR:
-      return getMinor();
+    case MINORS:
+      return getMinors();
 
-    case SPLIT:
-      return getSplit();
+    case SPLITS:
+      return getSplits();
 
     case NUM_ENTRIES:
       return Long.valueOf(getNumEntries());
@@ -532,12 +532,12 @@ import org.slf4j.LoggerFactory;
     switch (field) {
     case EXTENT:
       return isSetExtent();
-    case MAJOR:
-      return isSetMajor();
-    case MINOR:
-      return isSetMinor();
-    case SPLIT:
-      return isSetSplit();
+    case MAJORS:
+      return isSetMajors();
+    case MINORS:
+      return isSetMinors();
+    case SPLITS:
+      return isSetSplits();
     case NUM_ENTRIES:
       return isSetNumEntries();
     case INGEST_RATE:
@@ -572,30 +572,30 @@ import org.slf4j.LoggerFactory;
         return false;
     }
 
-    boolean this_present_major = true && this.isSetMajor();
-    boolean that_present_major = true && that.isSetMajor();
-    if (this_present_major || that_present_major) {
-      if (!(this_present_major && that_present_major))
+    boolean this_present_majors = true && this.isSetMajors();
+    boolean that_present_majors = true && that.isSetMajors();
+    if (this_present_majors || that_present_majors) {
+      if (!(this_present_majors && that_present_majors))
         return false;
-      if (!this.major.equals(that.major))
+      if (!this.majors.equals(that.majors))
         return false;
     }
 
-    boolean this_present_minor = true && this.isSetMinor();
-    boolean that_present_minor = true && that.isSetMinor();
-    if (this_present_minor || that_present_minor) {
-      if (!(this_present_minor && that_present_minor))
+    boolean this_present_minors = true && this.isSetMinors();
+    boolean that_present_minors = true && that.isSetMinors();
+    if (this_present_minors || that_present_minors) {
+      if (!(this_present_minors && that_present_minors))
         return false;
-      if (!this.minor.equals(that.minor))
+      if (!this.minors.equals(that.minors))
         return false;
     }
 
-    boolean this_present_split = true && this.isSetSplit();
-    boolean that_present_split = true && that.isSetSplit();
-    if (this_present_split || that_present_split) {
-      if (!(this_present_split && that_present_split))
+    boolean this_present_splits = true && this.isSetSplits();
+    boolean that_present_splits = true && that.isSetSplits();
+    if (this_present_splits || that_present_splits) {
+      if (!(this_present_splits && that_present_splits))
         return false;
-      if (!this.split.equals(that.split))
+      if (!this.splits.equals(that.splits))
         return false;
     }
 
@@ -661,32 +661,32 @@ import org.slf4j.LoggerFactory;
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMajor()).compareTo(typedOther.isSetMajor());
+    lastComparison = Boolean.valueOf(isSetMajors()).compareTo(typedOther.isSetMajors());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMajor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.major, typedOther.major);
+    if (isSetMajors()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.majors, typedOther.majors);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetMinor()).compareTo(typedOther.isSetMinor());
+    lastComparison = Boolean.valueOf(isSetMinors()).compareTo(typedOther.isSetMinors());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetMinor()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minor, typedOther.minor);
+    if (isSetMinors()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.minors, typedOther.minors);
       if (lastComparison != 0) {
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetSplit()).compareTo(typedOther.isSetSplit());
+    lastComparison = Boolean.valueOf(isSetSplits()).compareTo(typedOther.isSetSplits());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetSplit()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.split, typedOther.split);
+    if (isSetSplits()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.splits, typedOther.splits);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -759,27 +759,27 @@ import org.slf4j.LoggerFactory;
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("major:");
-    if (this.major == null) {
+    sb.append("majors:");
+    if (this.majors == null) {
       sb.append("null");
     } else {
-      sb.append(this.major);
+      sb.append(this.majors);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("minor:");
-    if (this.minor == null) {
+    sb.append("minors:");
+    if (this.minors == null) {
       sb.append("null");
     } else {
-      sb.append(this.minor);
+      sb.append(this.minors);
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("split:");
-    if (this.split == null) {
+    sb.append("splits:");
+    if (this.splits == null) {
       sb.append("null");
     } else {
-      sb.append(this.split);
+      sb.append(this.splits);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -808,14 +808,14 @@ import org.slf4j.LoggerFactory;
     if (extent != null) {
       extent.validate();
     }
-    if (major != null) {
-      major.validate();
+    if (majors != null) {
+      majors.validate();
     }
-    if (minor != null) {
-      minor.validate();
+    if (minors != null) {
+      minors.validate();
     }
-    if (split != null) {
-      split.validate();
+    if (splits != null) {
+      splits.validate();
     }
   }
 
@@ -864,29 +864,29 @@ import org.slf4j.LoggerFactory;
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // MAJOR
+          case 2: // MAJORS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.major = new ActionStats();
-              struct.major.read(iprot);
-              struct.setMajorIsSet(true);
+              struct.majors = new ActionStats();
+              struct.majors.read(iprot);
+              struct.setMajorsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // MINOR
+          case 3: // MINORS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.minor = new ActionStats();
-              struct.minor.read(iprot);
-              struct.setMinorIsSet(true);
+              struct.minors = new ActionStats();
+              struct.minors.read(iprot);
+              struct.setMinorsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // SPLIT
+          case 4: // SPLITS
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.split = new ActionStats();
-              struct.split.read(iprot);
-              struct.setSplitIsSet(true);
+              struct.splits = new ActionStats();
+              struct.splits.read(iprot);
+              struct.setSplitsIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -943,19 +943,19 @@ import org.slf4j.LoggerFactory;
         struct.extent.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.major != null) {
-        oprot.writeFieldBegin(MAJOR_FIELD_DESC);
-        struct.major.write(oprot);
+      if (struct.majors != null) {
+        oprot.writeFieldBegin(MAJORS_FIELD_DESC);
+        struct.majors.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.minor != null) {
-        oprot.writeFieldBegin(MINOR_FIELD_DESC);
-        struct.minor.write(oprot);
+      if (struct.minors != null) {
+        oprot.writeFieldBegin(MINORS_FIELD_DESC);
+        struct.minors.write(oprot);
         oprot.writeFieldEnd();
       }
-      if (struct.split != null) {
-        oprot.writeFieldBegin(SPLIT_FIELD_DESC);
-        struct.split.write(oprot);
+      if (struct.splits != null) {
+        oprot.writeFieldBegin(SPLITS_FIELD_DESC);
+        struct.splits.write(oprot);
         oprot.writeFieldEnd();
       }
       oprot.writeFieldBegin(NUM_ENTRIES_FIELD_DESC);
@@ -991,13 +991,13 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetExtent()) {
         optionals.set(0);
       }
-      if (struct.isSetMajor()) {
+      if (struct.isSetMajors()) {
         optionals.set(1);
       }
-      if (struct.isSetMinor()) {
+      if (struct.isSetMinors()) {
         optionals.set(2);
       }
-      if (struct.isSetSplit()) {
+      if (struct.isSetSplits()) {
         optionals.set(3);
       }
       if (struct.isSetNumEntries()) {
@@ -1016,14 +1016,14 @@ import org.slf4j.LoggerFactory;
       if (struct.isSetExtent()) {
         struct.extent.write(oprot);
       }
-      if (struct.isSetMajor()) {
-        struct.major.write(oprot);
+      if (struct.isSetMajors()) {
+        struct.majors.write(oprot);
       }
-      if (struct.isSetMinor()) {
-        struct.minor.write(oprot);
+      if (struct.isSetMinors()) {
+        struct.minors.write(oprot);
       }
-      if (struct.isSetSplit()) {
-        struct.split.write(oprot);
+      if (struct.isSetSplits()) {
+        struct.splits.write(oprot);
       }
       if (struct.isSetNumEntries()) {
         oprot.writeI64(struct.numEntries);
@@ -1049,19 +1049,19 @@ import org.slf4j.LoggerFactory;
         struct.setExtentIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.major = new ActionStats();
-        struct.major.read(iprot);
-        struct.setMajorIsSet(true);
+        struct.majors = new ActionStats();
+        struct.majors.read(iprot);
+        struct.setMajorsIsSet(true);
       }
       if (incoming.get(2)) {
-        struct.minor = new ActionStats();
-        struct.minor.read(iprot);
-        struct.setMinorIsSet(true);
+        struct.minors = new ActionStats();
+        struct.minors.read(iprot);
+        struct.setMinorsIsSet(true);
       }
       if (incoming.get(3)) {
-        struct.split = new ActionStats();
-        struct.split.read(iprot);
-        struct.setSplitIsSet(true);
+        struct.splits = new ActionStats();
+        struct.splits.read(iprot);
+        struct.setSplitsIsSet(true);
       }
       if (incoming.get(4)) {
         struct.numEntries = iprot.readI64();

Modified: accumulo/trunk/core/src/main/thrift/client.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/client.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/client.thrift (original)
+++ accumulo/trunk/core/src/main/thrift/client.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.core.client.impl.thrift
+namespace cpp org.apache.accumulo.core.client.impl.thrift
 
 include "security.thrift"
 include "cloudtrace.thrift"

Modified: accumulo/trunk/core/src/main/thrift/data.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/data.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/data.thrift (original)
+++ accumulo/trunk/core/src/main/thrift/data.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.core.data.thrift
+namespace cpp org.apache.accumulo.core.data.thrift
 
 typedef i64 ScanID
 typedef i64 UpdateID

Modified: accumulo/trunk/core/src/main/thrift/gc.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/gc.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/gc.thrift (original)
+++ accumulo/trunk/core/src/main/thrift/gc.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.core.gc.thrift
+namespace cpp org.apache.accumulo.core.gc.thrift
 
 include "security.thrift"
 include "cloudtrace.thrift"

Modified: accumulo/trunk/core/src/main/thrift/master.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/master.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/master.thrift (original)
+++ accumulo/trunk/core/src/main/thrift/master.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.core.master.thrift
+namespace cpp org.apache.accumulo.core.master.thrift
 
 include "data.thrift"
 include "security.thrift"
@@ -35,8 +36,8 @@ struct TableInfo {
     6:double ingestByteRate
     7:double queryRate
     8:double queryByteRate
-    9:Compacting minor;
-    10:Compacting major;
+    9:Compacting minors;
+    10:Compacting majors;
     11:Compacting scans;
     12:double scanRate;
 }

Modified: accumulo/trunk/core/src/main/thrift/security.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/security.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/security.thrift (original)
+++ accumulo/trunk/core/src/main/thrift/security.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.core.security.thrift
+namespace cpp org.apache.accumulo.core.security.thrift
 
 enum SecurityErrorCode {
     DEFAULT_SECURITY_ERROR = 0,

Modified: accumulo/trunk/core/src/main/thrift/tabletserver.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/tabletserver.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/tabletserver.thrift (original)
+++ accumulo/trunk/core/src/main/thrift/tabletserver.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.core.tabletserver.thrift
+namespace cpp org.apache.accumulo.core.tabletserver.thrift
 
 include "data.thrift"
 include "security.thrift"
@@ -50,9 +51,9 @@ struct ActionStats {
 
 struct TabletStats {
     1:data.TKeyExtent extent
-    2:ActionStats major
-    3:ActionStats minor
-    4:ActionStats split
+    2:ActionStats majors
+    3:ActionStats minors
+    4:ActionStats splits
     5:i64 numEntries
     6:double ingestRate
     7:double queryRate

Modified: accumulo/trunk/core/src/main/thrift/thrift.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/core/src/main/thrift/thrift.sh?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/core/src/main/thrift/thrift.sh (original)
+++ accumulo/trunk/core/src/main/thrift/thrift.sh Fri Jan  4 21:21:28 2013
@@ -43,6 +43,7 @@ do
 	thrift ${THRIFT_ARGS} --gen java $f || fail unable to generate java thrift classes
 	thrift ${THRIFT_ARGS} --gen py $f || fail unable to generate python thrift classes
 	thrift ${THRIFT_ARGS} --gen rb $f || fail unable to generate ruby thrift classes
+	thrift ${THRIFT_ARGS} --gen cpp $f || fail unable to generate cpp thrift classes
 done
 find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public class /@SuppressWarnings("all") public class /'
 find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public enum /@SuppressWarnings("all") public enum /'

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/Monitor.java Fri Jan  4 21:21:28 2013
@@ -167,19 +167,19 @@ public class Monitor {
   }
   
   public static void add(TableInfo total, TableInfo more) {
-    if (total.minor == null)
-      total.minor = new Compacting();
-    if (total.major == null)
-      total.major = new Compacting();
+    if (total.minors == null)
+      total.minors = new Compacting();
+    if (total.majors == null)
+      total.majors = new Compacting();
     if (total.scans == null)
       total.scans = new Compacting();
-    if (more.minor != null) {
-      total.minor.running += more.minor.running;
-      total.minor.queued += more.minor.queued;
-    }
-    if (more.major != null) {
-      total.major.running += more.major.running;
-      total.major.queued += more.major.queued;
+    if (more.minors != null) {
+      total.minors.running += more.minors.running;
+      total.minors.queued += more.minors.queued;
+    }
+    if (more.majors != null) {
+      total.majors.running += more.majors.running;
+      total.majors.queued += more.majors.queued;
     }
     if (more.scans != null) {
       total.scans.running += more.scans.running;
@@ -198,8 +198,8 @@ public class Monitor {
   
   public static TableInfo summarizeTableStats(TabletServerStatus status) {
     TableInfo summary = new TableInfo();
-    summary.major = new Compacting();
-    summary.minor = new Compacting();
+    summary.majors = new Compacting();
+    summary.minors = new Compacting();
     summary.scans = new Compacting();
     for (TableInfo rates : status.tableMap.values()) {
       add(summary, rates);
@@ -319,7 +319,7 @@ public class Monitor {
         indexCacheRequestTracker.startingUpdates();
         dataCacheHitTracker.startingUpdates();
         dataCacheRequestTracker.startingUpdates();
-
+        
         for (TabletServerStatus server : mmi.tServerInfo) {
           TableInfo summary = Monitor.summarizeTableStats(server);
           totalIngestRate += summary.ingestRate;
@@ -330,8 +330,8 @@ public class Monitor {
           totalEntries += summary.recs;
           totalHoldTime += server.holdTime;
           totalLookups += server.lookups;
-          majorCompactions += summary.major.running;
-          minorCompactions += summary.minor.running;
+          majorCompactions += summary.majors.running;
+          minorCompactions += summary.minors.running;
           lookupRateTracker.updateTabletServer(server.name, server.lastContact, server.lookups);
           indexCacheHitTracker.updateTabletServer(server.name, server.lastContact, server.indexCacheHits);
           indexCacheRequestTracker.updateTabletServer(server.name, server.lastContact, server.indexCacheRequest);

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/TServersServlet.java Fri Jan  4 21:21:28 2013
@@ -158,8 +158,8 @@ public class TServersServlet extends Bas
         continue;
       }
       total.numEntries += info.numEntries;
-      TabletStatsKeeper.update(total.minor, info.minor);
-      TabletStatsKeeper.update(total.major, info.major);
+      TabletStatsKeeper.update(total.minors, info.minors);
+      TabletStatsKeeper.update(total.majors, info.majors);
       
       KeyExtent extent = new KeyExtent(info.extent);
       String tableId = extent.getTableId().toString();
@@ -176,36 +176,36 @@ public class TServersServlet extends Bas
       row.add(info.numEntries);
       row.add(info.ingestRate);
       row.add(info.queryRate);
-      row.add(info.minor.num != 0 ? info.minor.elapsed / info.minor.num : null);
-      row.add(stddev(info.minor.elapsed, info.minor.num, info.minor.sumDev));
-      row.add(info.minor.elapsed != 0 ? info.minor.count / info.minor.elapsed : null);
-      row.add(info.major.num != 0 ? info.major.elapsed / info.major.num : null);
-      row.add(stddev(info.major.elapsed, info.major.num, info.major.sumDev));
-      row.add(info.major.elapsed != 0 ? info.major.count / info.major.elapsed : null);
+      row.add(info.minors.num != 0 ? info.minors.elapsed / info.minors.num : null);
+      row.add(stddev(info.minors.elapsed, info.minors.num, info.minors.sumDev));
+      row.add(info.minors.elapsed != 0 ? info.minors.count / info.minors.elapsed : null);
+      row.add(info.majors.num != 0 ? info.majors.elapsed / info.majors.num : null);
+      row.add(stddev(info.majors.elapsed, info.majors.num, info.majors.sumDev));
+      row.add(info.majors.elapsed != 0 ? info.majors.count / info.majors.elapsed : null);
       perTabletResults.addRow(row);
     }
     
     // Calculate current averages oldServer adding in historical data
-    if (total.minor.num != 0)
-      currentMinorAvg = (long) (total.minor.elapsed / total.minor.num);
-    if (total.minor.elapsed != 0 && total.minor.num != 0)
-      currentMinorStdDev = stddev(total.minor.elapsed, total.minor.num, total.minor.sumDev);
-    if (total.major.num != 0)
-      currentMajorAvg = total.major.elapsed / total.major.num;
-    if (total.major.elapsed != 0 && total.major.num != 0 && total.major.elapsed > total.major.num)
-      currentMajorStdDev = stddev(total.major.elapsed, total.major.num, total.major.sumDev);
+    if (total.minors.num != 0)
+      currentMinorAvg = (long) (total.minors.elapsed / total.minors.num);
+    if (total.minors.elapsed != 0 && total.minors.num != 0)
+      currentMinorStdDev = stddev(total.minors.elapsed, total.minors.num, total.minors.sumDev);
+    if (total.majors.num != 0)
+      currentMajorAvg = total.majors.elapsed / total.majors.num;
+    if (total.majors.elapsed != 0 && total.majors.num != 0 && total.majors.elapsed > total.majors.num)
+      currentMajorStdDev = stddev(total.majors.elapsed, total.majors.num, total.majors.sumDev);
     
     // After these += operations, these variables are now total for current
     // tablets and historical tablets
-    TabletStatsKeeper.update(total.minor, historical.minor);
-    TabletStatsKeeper.update(total.major, historical.major);
-    totalElapsedForAll += total.major.elapsed + historical.split.elapsed + total.minor.elapsed;
-    
-    minorStdDev = stddev(total.minor.elapsed, total.minor.num, total.minor.sumDev);
-    minorQueueStdDev = stddev(total.minor.queueTime, total.minor.num, total.minor.queueSumDev);
-    majorStdDev = stddev(total.major.elapsed, total.major.num, total.major.sumDev);
-    majorQueueStdDev = stddev(total.major.queueTime, total.major.num, total.major.queueSumDev);
-    splitStdDev = stddev(historical.split.num, historical.split.elapsed, historical.split.sumDev);
+    TabletStatsKeeper.update(total.minors, historical.minors);
+    TabletStatsKeeper.update(total.majors, historical.majors);
+    totalElapsedForAll += total.majors.elapsed + historical.splits.elapsed + total.minors.elapsed;
+    
+    minorStdDev = stddev(total.minors.elapsed, total.minors.num, total.minors.sumDev);
+    minorQueueStdDev = stddev(total.minors.queueTime, total.minors.num, total.minors.queueSumDev);
+    majorStdDev = stddev(total.majors.elapsed, total.majors.num, total.majors.sumDev);
+    majorQueueStdDev = stddev(total.majors.queueTime, total.majors.num, total.majors.queueSumDev);
+    splitStdDev = stddev(historical.splits.num, historical.splits.elapsed, historical.splits.sumDev);
     
     doDetailTable(req, sb, address, tsStats.size(), total, historical);
     doAllTimeTable(req, sb, total, historical, majorQueueStdDev, minorQueueStdDev, totalElapsedForAll, splitStdDev, majorStdDev, minorStdDev);
@@ -237,14 +237,14 @@ public class TServersServlet extends Bas
     opHistoryDetails.addSortableColumn("Std.&nbsp;Dev.<br />Time", new SecondType(), null);
     opHistoryDetails.addSortableColumn("Percentage&nbsp;Time&nbsp;Spent", new ProgressChartType(totalElapsedForAll), null);
     
-    opHistoryDetails.addRow("Split", historical.split.num, historical.split.fail, null, null,
-        historical.split.num != 0 ? (historical.split.elapsed / historical.split.num) : null, splitStdDev, historical.split.elapsed);
-    opHistoryDetails.addRow("Major&nbsp;Compaction", total.major.num, total.major.fail,
-        total.major.num != 0 ? (total.major.queueTime / total.major.num) : null, majorQueueStdDev,
-        total.major.num != 0 ? (total.major.elapsed / total.major.num) : null, majorStdDev, total.major.elapsed);
-    opHistoryDetails.addRow("Minor&nbsp;Compaction", total.minor.num, total.minor.fail,
-        total.minor.num != 0 ? (total.minor.queueTime / total.minor.num) : null, minorQueueStdDev,
-        total.minor.num != 0 ? (total.minor.elapsed / total.minor.num) : null, minorStdDev, total.minor.elapsed);
+    opHistoryDetails.addRow("Split", historical.splits.num, historical.splits.fail, null, null,
+        historical.splits.num != 0 ? (historical.splits.elapsed / historical.splits.num) : null, splitStdDev, historical.splits.elapsed);
+    opHistoryDetails.addRow("Major&nbsp;Compaction", total.majors.num, total.majors.fail,
+        total.majors.num != 0 ? (total.majors.queueTime / total.majors.num) : null, majorQueueStdDev,
+        total.majors.num != 0 ? (total.majors.elapsed / total.majors.num) : null, majorStdDev, total.majors.elapsed);
+    opHistoryDetails.addRow("Minor&nbsp;Compaction", total.minors.num, total.minors.fail,
+        total.minors.num != 0 ? (total.minors.queueTime / total.minors.num) : null, minorQueueStdDev,
+        total.minors.num != 0 ? (total.minors.elapsed / total.minors.num) : null, minorStdDev, total.minors.elapsed);
     opHistoryDetails.generate(req, sb);
   }
   
@@ -256,7 +256,7 @@ public class TServersServlet extends Bas
     detailTable.addSortableColumn("Minor&nbsp;Compacting", new NumberType<Integer>(), null);
     detailTable.addSortableColumn("Major&nbsp;Compacting", new NumberType<Integer>(), null);
     detailTable.addSortableColumn("Splitting", new NumberType<Integer>(), null);
-    detailTable.addRow(numTablets, total.numEntries, total.minor.status, total.major.status, historical.split.status);
+    detailTable.addRow(numTablets, total.numEntries, total.minors.status, total.majors.status, historical.splits.status);
     detailTable.generate(req, sb);
   }
   

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/servlets/XMLServlet.java Fri Jan  4 21:21:28 2013
@@ -72,9 +72,9 @@ public class XMLServlet extends BasicSer
       
       TableInfo summary = Monitor.summarizeTableStats(status);
       sb.append("<compactions>\n");
-      sb.append("<major>").append("<running>").append(summary.major.running).append("</running>").append("<queued>").append(summary.major.queued)
+      sb.append("<major>").append("<running>").append(summary.majors.running).append("</running>").append("<queued>").append(summary.majors.queued)
           .append("</queued>").append("</major>\n");
-      sb.append("<minor>").append("<running>").append(summary.minor.running).append("</running>").append("<queued>").append(summary.minor.queued)
+      sb.append("<minor>").append("<running>").append(summary.minors.running).append("</running>").append("<queued>").append(summary.minors.queued)
           .append("</queued>").append("</minor>\n");
       sb.append("</compactions>\n");
       
@@ -151,7 +151,7 @@ public class XMLServlet extends BasicSer
       sb.append("<queryByteRate>").append(tableInfo.queryRate).append("</queryByteRate>\n");
       int running = 0;
       int queued = 0;
-      Compacting compacting = entry.getValue().major;
+      Compacting compacting = entry.getValue().majors;
       if (compacting != null) {
         running = compacting.running;
         queued = compacting.queued;

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/CompactionsType.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/CompactionsType.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/CompactionsType.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/monitor/util/celltypes/CompactionsType.java Fri Jan  4 21:21:28 2013
@@ -32,9 +32,9 @@ public class CompactionsType extends Cel
     if (obj == null)
       return "-";
     TableInfo summary = (TableInfo) obj;
-    Compacting c = summary.major;
+    Compacting c = summary.majors;
     if (fieldName.equals("minor"))
-      c = summary.minor;
+      c = summary.minors;
     else if (fieldName.equals("scans"))
       c = summary.scans;
     if (c == null)
@@ -48,11 +48,11 @@ public class CompactionsType extends Cel
       return -1;
     if (o2 == null)
       return 1;
-    Compacting c1 = o1.major;
-    Compacting c2 = o2.major;
+    Compacting c1 = o1.majors;
+    Compacting c2 = o2.majors;
     if (fieldName.equals("minor")) {
-      c1 = o1.minor;
-      c2 = o2.minor;
+      c1 = o1.minors;
+      c2 = o2.minors;
     } else if (fieldName.equals("scans")) {
       c1 = o1.scans;
       c2 = o2.scans;

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java Fri Jan  4 21:21:28 2013
@@ -346,6 +346,7 @@ public class TabletServer extends Abstra
       final long maxIdle = conf.getTimeInMillis(Property.TSERV_SESSION_MAXIDLE);
       
       TimerTask r = new TimerTask() {
+        @Override
         public void run() {
           sweep(maxIdle);
         }
@@ -446,6 +447,7 @@ public class TabletServer extends Abstra
       if (session != null) {
         final long removeTime = session.lastAccessTime;
         TimerTask r = new TimerTask() {
+          @Override
           public void run() {
             Session sessionToCleanup = null;
             synchronized (SessionManager.this) {
@@ -563,7 +565,8 @@ public class TabletServer extends Abstra
           }
           
           activeScans.add(new ActiveScan(mss.client, mss.user, mss.threadPoolExtent.getTableId().toString(), ct - mss.startTime, ct - mss.lastAccessTime,
-              ScanType.BATCH, state, mss.threadPoolExtent.toThrift(), Translator.translate(mss.columnSet, Translator.CT), mss.ssiList, mss.ssio, mss.auths.getAuthorizationsBB()));
+              ScanType.BATCH, state, mss.threadPoolExtent.toThrift(), Translator.translate(mss.columnSet, Translator.CT), mss.ssiList, mss.ssio, mss.auths
+                  .getAuthorizationsBB()));
         }
       }
       
@@ -842,7 +845,7 @@ public class TabletServer extends Abstra
   public AccumuloConfiguration getSystemConfiguration() {
     return serverConfig.getConfiguration();
   }
-
+  
   TransactionWatcher watcher = new TransactionWatcher();
   
   private class ThriftClientHandler extends ClientServiceHandler implements TabletClientService.Iface {
@@ -923,13 +926,13 @@ public class TabletServer extends Abstra
         
         try {
           runState.set(ScanRunState.RUNNING);
-
+          
           if (isCancelled() || scanSession == null)
             return;
           
           Thread.currentThread().setName(
               "User: " + scanSession.user + " Start: " + scanSession.startTime + " Client: " + scanSession.client + " Tablet: " + scanSession.extent);
-
+          
           Tablet tablet = onlineTablets.get(scanSession.extent);
           
           if (tablet == null) {
@@ -987,10 +990,10 @@ public class TabletServer extends Abstra
           
           TableConfiguration acuTableConf = ServerConfiguration.getTableConfiguration(instance, session.threadPoolExtent.getTableId().toString());
           long maxResultsSize = acuTableConf.getMemoryInBytes(Property.TABLE_SCAN_MAXMEM);
-
+          
           runState.set(ScanRunState.RUNNING);
           Thread.currentThread().setName("Client: " + session.client + " User: " + session.user + " Start: " + session.startTime + " Table: ");
-
+          
           long bytesAdded = 0;
           long maxScanTime = 4000;
           
@@ -1143,8 +1146,8 @@ public class TabletServer extends Abstra
         scanSession.columnSet.add(new Column(tcolumn));
       }
       
-      scanSession.scanner = tablet.createScanner(new Range(range), batchSize, scanSession.columnSet, scanSession.auths, ssiList, ssio,
-          isolated, scanSession.interruptFlag);
+      scanSession.scanner = tablet.createScanner(new Range(range), batchSize, scanSession.columnSet, scanSession.auths, ssiList, ssio, isolated,
+          scanSession.interruptFlag);
       
       long sid = sessionManager.createSession(scanSession, true);
       
@@ -1403,7 +1406,7 @@ public class TabletServer extends Abstra
       long t1 = System.currentTimeMillis();
       if (us.currentTablet != null && us.currentTablet.getExtent().equals(keyExtent))
         return;
-
+      
       if (us.currentTablet == null && (us.failures.containsKey(keyExtent) || us.authFailures.contains(keyExtent))) {
         // if there were previous failures, then do not accept additional writes
         return;
@@ -1793,6 +1796,7 @@ public class TabletServer extends Abstra
         } finally {
           if (fatal) {
             Halt.halt(1, new Runnable() {
+              @Override
               public void run() {
                 logGCInfo(getSystemConfiguration());
               }
@@ -1808,6 +1812,7 @@ public class TabletServer extends Abstra
       
       if (tabletServerLock != null && tabletServerLock.wasLockAcquired() && !tabletServerLock.isLocked()) {
         Halt.halt(1, new Runnable() {
+          @Override
           public void run() {
             log.info("Tablet server no longer holds lock during checkPermission() : " + request + ", exiting");
             logGCInfo(getSystemConfiguration());
@@ -1878,6 +1883,7 @@ public class TabletServer extends Abstra
       // Root tablet assignment must take place immediately
       if (extent.isRootTablet()) {
         new Daemon("Root Tablet Assignment") {
+          @Override
           public void run() {
             ah.run();
             if (onlineTablets.containsKey(extent)) {
@@ -1973,6 +1979,7 @@ public class TabletServer extends Abstra
       checkPermission(credentials, lock, true, "halt");
       
       Halt.halt(0, new Runnable() {
+        @Override
         public void run() {
           log.info("Master requested tablet server halt");
           logGCInfo(getSystemConfiguration());
@@ -2000,6 +2007,7 @@ public class TabletServer extends Abstra
       return statsKeeper.getTabletStats();
     }
     
+    @Override
     public List<ActiveScan> getActiveScans(TInfo tinfo, AuthInfo credentials) throws ThriftSecurityException, TException {
       
       try {
@@ -2076,8 +2084,7 @@ public class TabletServer extends Abstra
       Path logDir = new Path(Constants.getWalDirectory(acuConf), myname);
       Set<String> loggers = new HashSet<String>();
       logger.getLoggers(loggers);
-      nextFile:
-      for (String filename : filenames) {
+      nextFile: for (String filename : filenames) {
         for (String logger : loggers) {
           if (logger.contains(filename))
             continue nextFile;
@@ -2109,7 +2116,7 @@ public class TabletServer extends Abstra
               log.warn("Failed to delete walog " + source);
             if (fs.delete(new Path(Constants.getRecoveryDir(acuConf), filename), true))
               log.info("Deleted any recovery log " + filename);
-
+            
           }
         } catch (IOException e) {
           log.warn("Error attempting to delete write-ahead log " + filename + ": " + e);
@@ -2145,9 +2152,10 @@ public class TabletServer extends Abstra
   void executeSplit(Tablet tablet) {
     resourceManager.executeSplit(tablet.getExtent(), new LoggingRunnable(log, new SplitRunner(tablet)));
   }
-
+  
   private class MajorCompactor implements Runnable {
     
+    @Override
     public void run() {
       while (!majorCompactorDisabled) {
         try {
@@ -2306,6 +2314,7 @@ public class TabletServer extends Abstra
       this.saveState = saveState;
     }
     
+    @Override
     public void run() {
       
       Tablet t = null;
@@ -2398,6 +2407,7 @@ public class TabletServer extends Abstra
       this.retryAttempt = retryAttempt;
     }
     
+    @Override
     public void run() {
       log.info(clientAddress + ": got assignment from master: " + extent);
       
@@ -2517,7 +2527,7 @@ public class TabletServer extends Abstra
           
           Assignment assignment = new Assignment(extentToOpen, getTabletSession());
           TabletStateStore.setLocation(assignment);
-
+          
           synchronized (openingTablets) {
             synchronized (onlineTablets) {
               openingTablets.remove(extentToOpen);
@@ -2578,7 +2588,7 @@ public class TabletServer extends Abstra
   private final SortedSet<KeyExtent> unopenedTablets = Collections.synchronizedSortedSet(new TreeSet<KeyExtent>());
   private final SortedSet<KeyExtent> openingTablets = Collections.synchronizedSortedSet(new TreeSet<KeyExtent>());
   @SuppressWarnings("unchecked")
-  private final Map<KeyExtent,Long> recentlyUnloadedCache = (Map<KeyExtent, Long>)Collections.synchronizedMap(new LRUMap(1000));
+  private final Map<KeyExtent,Long> recentlyUnloadedCache = Collections.synchronizedMap(new LRUMap(1000));
   
   private Thread majorCompactorThread;
   
@@ -2604,7 +2614,7 @@ public class TabletServer extends Abstra
   private static ObjectName OBJECT_NAME = null;
   
   static AtomicLong seekCount = new AtomicLong(0);
-
+  
   public TabletStatsKeeper getStatsKeeper() {
     return statsKeeper;
   }
@@ -2625,7 +2635,7 @@ public class TabletServer extends Abstra
     entry.logSet = logSet;
     MetadataTable.addLogEntry(SecurityConstants.getSystemCredentials(), entry, getLock());
   }
-
+  
   private int startServer(AccumuloConfiguration conf, Property portHint, TProcessor processor, String threadName) throws UnknownHostException {
     ServerPort sp = TServerUtils.startServer(conf, portHint, processor, this.getClass().getSimpleName(), threadName, Property.TSERV_PORTSEARCH,
         Property.TSERV_MINTHREADS, Property.TSERV_THREADCHECK, Property.GENERAL_MAX_MESSAGE_SIZE);
@@ -2693,6 +2703,7 @@ public class TabletServer extends Abstra
         @Override
         public void lostLock(final LockLossReason reason) {
           Halt.halt(0, new Runnable() {
+            @Override
             public void run() {
               if (!serverStopRequested)
                 log.fatal("Lost tablet server lock (reason = " + reason + "), exiting.");
@@ -2725,7 +2736,7 @@ public class TabletServer extends Abstra
   // main loop listens for client requests
   public void run() {
     SecurityUtil.serverLogin();
-
+    
     int clientPort = 0;
     try {
       clientPort = startTabletClientService();
@@ -2740,7 +2751,7 @@ public class TabletServer extends Abstra
     announceExistence();
     
     ThreadPoolExecutor distWorkQThreadPool = new SimpleThreadPool(getSystemConfiguration().getCount(Property.TSERV_WORKQ_THREADS), "distributed work queue");
-
+    
     bulkFailedCopyQ = new DistributedWorkQueue(ZooUtil.getRoot(instance) + Constants.ZBULK_FAILED_COPYQ);
     try {
       bulkFailedCopyQ.startProcessing(new BulkFailedCopyProcessor(), distWorkQThreadPool);
@@ -2754,7 +2765,7 @@ public class TabletServer extends Abstra
       log.error("Error setting watches for recoveries");
       throw new RuntimeException(ex);
     }
-
+    
     try {
       OBJECT_NAME = new ObjectName("accumulo.server.metrics:service=TServerInfo,name=TabletServerMBean,instance=" + Thread.currentThread().getName());
       // Do this because interface not in same package.
@@ -2783,7 +2794,7 @@ public class TabletServer extends Abstra
           // connection
           masterHost = getMasterAddress();
           iface = masterConnection(masterHost);
-          TServiceClient client = (TServiceClient) iface;
+          TServiceClient client = iface;
           
           // if while loop does not execute at all and mm != null,
           // then
@@ -2887,13 +2898,8 @@ public class TabletServer extends Abstra
           return set;
         }
         
-        List<ColumnFQ> columnsToFetch = Arrays.asList(new ColumnFQ[] {
-            Constants.METADATA_DIRECTORY_COLUMN, 
-            Constants.METADATA_PREV_ROW_COLUMN,
-            Constants.METADATA_SPLIT_RATIO_COLUMN, 
-            Constants.METADATA_OLD_PREV_ROW_COLUMN, 
-            Constants.METADATA_TIME_COLUMN
-        });
+        List<ColumnFQ> columnsToFetch = Arrays.asList(new ColumnFQ[] {Constants.METADATA_DIRECTORY_COLUMN, Constants.METADATA_PREV_ROW_COLUMN,
+            Constants.METADATA_SPLIT_RATIO_COLUMN, Constants.METADATA_OLD_PREV_ROW_COLUMN, Constants.METADATA_TIME_COLUMN});
         
         if (tabletsKeyValues == null) {
           tabletsKeyValues = new TreeMap<Key,Value>();
@@ -3082,7 +3088,7 @@ public class TabletServer extends Abstra
     } catch (IOException e) {
       throw new RuntimeException(e);
     }
-
+    
     // A task that cleans up unused classloader contexts
     TimerTask contextCleaner = new TimerTask() {
       @Override
@@ -3117,7 +3123,7 @@ public class TabletServer extends Abstra
     };
     
     SimpleTimer.getInstance().schedule(contextCleaner, 60000, 60000);
-
+    
     FileSystemMonitor.start(getSystemConfiguration(), Property.TSERV_MONITOR_FS);
     
     TimerTask gcDebugTask = new TimerTask() {
@@ -3151,14 +3157,14 @@ public class TabletServer extends Abstra
       onlineTabletsCopy = new HashMap<KeyExtent,Tablet>(this.onlineTablets);
     }
     Map<String,TableInfo> tables = new HashMap<String,TableInfo>();
-
+    
     for (Entry<KeyExtent,Tablet> entry : onlineTabletsCopy.entrySet()) {
       String tableId = entry.getKey().getTableId().toString();
       TableInfo table = tables.get(tableId);
       if (table == null) {
         table = new TableInfo();
-        table.minor = new Compacting();
-        table.major = new Compacting();
+        table.minors = new Compacting();
+        table.majors = new Compacting();
         tables.put(tableId, table);
       }
       Tablet tablet = entry.getValue();
@@ -3174,13 +3180,13 @@ public class TabletServer extends Abstra
       long recsInMemory = tablet.getNumEntriesInMemory();
       table.recsInMemory += recsInMemory;
       if (tablet.minorCompactionRunning())
-        table.minor.running++;
+        table.minors.running++;
       if (tablet.minorCompactionQueued())
-        table.minor.queued++;
+        table.minors.queued++;
       if (tablet.majorCompactionRunning())
-        table.major.running++;
+        table.majors.running++;
       if (tablet.majorCompactionQueued())
-        table.major.queued++;
+        table.majors.queued++;
     }
     
     for (Entry<String,MapCounter<ScanRunState>> entry : scanCounts.entrySet()) {
@@ -3247,28 +3253,28 @@ public class TabletServer extends Abstra
       log.error("Uncaught exception in TabletServer.main, exiting", ex);
     }
   }
-
+  
   private static void ensureHdfsSyncIsEnabled(FileSystem fs) {
     if (fs instanceof DistributedFileSystem) {
       if (!fs.getConf().getBoolean("dfs.durable.sync", false) && !fs.getConf().getBoolean("dfs.support.append", false)) {
-        String msg = "Must set dfs.durable.sync OR dfs.support.append to true.  Which one needs to be set depends on your version of HDFS.  See ACCUMULO-623. \n"+
-        		"HADOOP RELEASE          VERSION           SYNC NAME             DEFAULT\n"+
-            "Apache Hadoop           0.20.205          dfs.support.append    false\n"+
-            "Apache Hadoop            0.23.x           dfs.support.append    true\n"+
-            "Apache Hadoop             1.0.x           dfs.support.append    false\n"+
-            "Apache Hadoop             1.1.x           dfs.durable.sync      true\n"+
-            "Apache Hadoop          2.0.0-2.0.2        dfs.support.append    true\n"+
-            "Cloudera CDH             3u0-3u3             ????               true\n"+
-            "Cloudera CDH               3u4            dfs.support.append    true\n"+
-            "Hortonworks HDP           `1.0            dfs.support.append    false\n"+
-            "Hortonworks HDP           `1.1            dfs.support.append    false";
+        String msg = "Must set dfs.durable.sync OR dfs.support.append to true.  Which one needs to be set depends on your version of HDFS.  See ACCUMULO-623. \n"
+            + "HADOOP RELEASE          VERSION           SYNC NAME             DEFAULT\n"
+            + "Apache Hadoop           0.20.205          dfs.support.append    false\n"
+            + "Apache Hadoop            0.23.x           dfs.support.append    true\n"
+            + "Apache Hadoop             1.0.x           dfs.support.append    false\n"
+            + "Apache Hadoop             1.1.x           dfs.durable.sync      true\n"
+            + "Apache Hadoop          2.0.0-2.0.2        dfs.support.append    true\n"
+            + "Cloudera CDH             3u0-3u3             ????               true\n"
+            + "Cloudera CDH               3u4            dfs.support.append    true\n"
+            + "Hortonworks HDP           `1.0            dfs.support.append    false\n"
+            + "Hortonworks HDP           `1.1            dfs.support.append    false";
         log.fatal(msg);
         System.exit(-1);
       }
     }
     
   }
-
+  
   /**
    * Copy local walogs into HDFS on an upgrade
    * 
@@ -3291,7 +3297,7 @@ public class TabletServer extends Abstra
         log.debug("Local walog dir " + localWalDirectory + " not found ");
         continue;
       }
-
+      
       for (FileStatus file : localfs.listStatus(new Path(localWalDirectory))) {
         String name = file.getPath().getName();
         try {
@@ -3322,7 +3328,7 @@ public class TabletServer extends Abstra
       }
     }
   }
-
+  
   public void minorCompactionFinished(CommitSession tablet, String newDatafile, int walogSeq) throws IOException {
     totalMinorCompactions++;
     logger.minorCompactionFinished(tablet, newDatafile, walogSeq);
@@ -3530,10 +3536,12 @@ public class TabletServer extends Abstra
     return 0;
   }
   
+  @Override
   protected ObjectName getObjectName() {
     return OBJECT_NAME;
   }
   
+  @Override
   protected String getMetricsPrefix() {
     return METRICS_PREFIX;
   }
@@ -3541,6 +3549,7 @@ public class TabletServer extends Abstra
   public TableConfiguration getTableConfiguration(KeyExtent extent) {
     return ServerConfiguration.getTableConfiguration(instance, extent.getTableId().toString());
   }
+  
   public DfsLogger.ServerResources getServerConfig() {
     return new DfsLogger.ServerResources() {
       
@@ -3560,5 +3569,5 @@ public class TabletServer extends Abstra
       }
     };
   }
-
+  
 }

Modified: accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java
URL: http://svn.apache.org/viewvc/accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java (original)
+++ accumulo/trunk/server/src/main/java/org/apache/accumulo/server/test/GetMasterStats.java Fri Jan  4 21:21:28 2013
@@ -103,10 +103,10 @@ public class GetMasterStats {
             out(4, "Records in Memory %d", info.recsInMemory);
             out(4, "Ingest %.2f", info.ingestRate);
             out(4, "Queries %.2f", info.queryRate);
-            out(4, "Major Compacting %d", info.major == null ? 0 : info.major.running);
-            out(4, "Queued for Major Compaction %d", info.major == null ? 0 : info.major.queued);
-            out(4, "Minor Compacting %d", info.minor == null ? 0 : info.minor.running);
-            out(4, "Queued for Minor Compaction %d", info.minor == null ? 0 : info.minor.queued);
+            out(4, "Major Compacting %d", info.majors == null ? 0 : info.majors.running);
+            out(4, "Queued for Major Compaction %d", info.majors == null ? 0 : info.majors.queued);
+            out(4, "Minor Compacting %d", info.minors == null ? 0 : info.minors.running);
+            out(4, "Queued for Minor Compaction %d", info.minors == null ? 0 : info.minors.queued);
           }
         }
         out(2, "Recoveries %d", server.logSorts.size());

Modified: accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift
URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift (original)
+++ accumulo/trunk/trace/src/main/thrift/cloudtrace.thrift Fri Jan  4 21:21:28 2013
@@ -15,6 +15,7 @@
 * limitations under the License.
 */
 namespace java org.apache.accumulo.cloudtrace.thrift
+namespace cpp org.apache.accumulo.cloudtrace.thrift
 
 struct RemoteSpan {
    1:string sender,

Modified: accumulo/trunk/trace/thrift.sh
URL: http://svn.apache.org/viewvc/accumulo/trunk/trace/thrift.sh?rev=1429134&r1=1429133&r2=1429134&view=diff
==============================================================================
--- accumulo/trunk/trace/thrift.sh (original)
+++ accumulo/trunk/trace/thrift.sh Fri Jan  4 21:21:28 2013
@@ -20,7 +20,8 @@
 
 # Generates the cloudtrace thrift code. We're explicitly using thrift0.6 because other versions
 # are not compatible
-thrift -o target -gen java src/main/thrift/cloudtrace.thrift
+thrift -o target --gen java src/main/thrift/cloudtrace.thrift
+thrift -o target --gen cpp src/main/thrift/cloudtrace.thrift
 
 # For all generated thrift code, suppress all warnings
 find target/gen-java -name '*.java' -print | xargs sed -i.orig -e 's/public class /@SuppressWarnings("all") public class /'



Mime
View raw message