incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [06/17] Adding more documentation and cleaning up the api a little bit.
Date Fri, 16 Aug 2013 20:09:05 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42c1afed/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index a95e3b9..ae38978 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -64,7 +64,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField BLOCK_CACHING_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("blockCaching", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)10);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField BLOCK_CACHING_FILE_TYPES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("blockCachingFileTypes", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, (short)11);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField READ_ONLY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("readOnly", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)12);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_PRE_CACHE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnPreCache", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)13);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField PRE_CACHE_COLS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("preCacheCols", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)13);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_PROPERTIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("tableProperties", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)14);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STRICT_TYPES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("strictTypes", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)15);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField DEFAULT_MISSING_FIELD_TYPE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("defaultMissingFieldType", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)16);
@@ -115,9 +115,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
    */
   public boolean readOnly; // required
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * This map sets what column families and columns to prefetch into block cache on shard open.
    */
-  public ColumnPreCache columnPreCache; // required
+  public List<String> preCacheCols; // required
   /**
    * The table properties that can modify the default behavior of the table.  TODO: Document all options.
    */
@@ -179,9 +179,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
      */
     READ_ONLY((short)12, "readOnly"),
     /**
-     * Sets what column families and columns to prefetch into block cache on shard open.
+     * This map sets what column families and columns to prefetch into block cache on shard open.
      */
-    COLUMN_PRE_CACHE((short)13, "columnPreCache"),
+    PRE_CACHE_COLS((short)13, "preCacheCols"),
     /**
      * The table properties that can modify the default behavior of the table.  TODO: Document all options.
      */
@@ -234,8 +234,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           return BLOCK_CACHING_FILE_TYPES;
         case 12: // READ_ONLY
           return READ_ONLY;
-        case 13: // COLUMN_PRE_CACHE
-          return COLUMN_PRE_CACHE;
+        case 13: // PRE_CACHE_COLS
+          return PRE_CACHE_COLS;
         case 14: // TABLE_PROPERTIES
           return TABLE_PROPERTIES;
         case 15: // STRICT_TYPES
@@ -315,8 +315,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))));
     tmpMap.put(_Fields.READ_ONLY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("readOnly", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.COLUMN_PRE_CACHE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columnPreCache", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, ColumnPreCache.class)));
+    tmpMap.put(_Fields.PRE_CACHE_COLS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("preCacheCols", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.ListMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, 
+            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))));
     tmpMap.put(_Fields.TABLE_PROPERTIES, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("tableProperties", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.MapMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, 
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING), 
@@ -364,7 +365,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     boolean blockCaching,
     Set<String> blockCachingFileTypes,
     boolean readOnly,
-    ColumnPreCache columnPreCache,
+    List<String> preCacheCols,
     Map<String,String> tableProperties,
     boolean strictTypes,
     String defaultMissingFieldType,
@@ -385,7 +386,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     this.blockCachingFileTypes = blockCachingFileTypes;
     this.readOnly = readOnly;
     setReadOnlyIsSet(true);
-    this.columnPreCache = columnPreCache;
+    this.preCacheCols = preCacheCols;
     this.tableProperties = tableProperties;
     this.strictTypes = strictTypes;
     setStrictTypesIsSet(true);
@@ -423,8 +424,12 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       this.blockCachingFileTypes = __this__blockCachingFileTypes;
     }
     this.readOnly = other.readOnly;
-    if (other.isSetColumnPreCache()) {
-      this.columnPreCache = new ColumnPreCache(other.columnPreCache);
+    if (other.isSetPreCacheCols()) {
+      List<String> __this__preCacheCols = new ArrayList<String>();
+      for (String other_element : other.preCacheCols) {
+        __this__preCacheCols.add(other_element);
+      }
+      this.preCacheCols = __this__preCacheCols;
     }
     if (other.isSetTableProperties()) {
       Map<String,String> __this__tableProperties = new HashMap<String,String>();
@@ -483,7 +488,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     this.blockCachingFileTypes = null;
     this.readOnly = false;
 
-    this.columnPreCache = null;
+    this.preCacheCols = null;
     this.tableProperties = null;
     this.strictTypes = false;
 
@@ -777,33 +782,48 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __READONLY_ISSET_ID, value);
   }
 
+  public int getPreCacheColsSize() {
+    return (this.preCacheCols == null) ? 0 : this.preCacheCols.size();
+  }
+
+  public java.util.Iterator<String> getPreCacheColsIterator() {
+    return (this.preCacheCols == null) ? null : this.preCacheCols.iterator();
+  }
+
+  public void addToPreCacheCols(String elem) {
+    if (this.preCacheCols == null) {
+      this.preCacheCols = new ArrayList<String>();
+    }
+    this.preCacheCols.add(elem);
+  }
+
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * This map sets what column families and columns to prefetch into block cache on shard open.
    */
-  public ColumnPreCache getColumnPreCache() {
-    return this.columnPreCache;
+  public List<String> getPreCacheCols() {
+    return this.preCacheCols;
   }
 
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * This map sets what column families and columns to prefetch into block cache on shard open.
    */
-  public TableDescriptor setColumnPreCache(ColumnPreCache columnPreCache) {
-    this.columnPreCache = columnPreCache;
+  public TableDescriptor setPreCacheCols(List<String> preCacheCols) {
+    this.preCacheCols = preCacheCols;
     return this;
   }
 
-  public void unsetColumnPreCache() {
-    this.columnPreCache = null;
+  public void unsetPreCacheCols() {
+    this.preCacheCols = null;
   }
 
-  /** Returns true if field columnPreCache is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumnPreCache() {
-    return this.columnPreCache != null;
+  /** Returns true if field preCacheCols is set (has been assigned a value) and false otherwise */
+  public boolean isSetPreCacheCols() {
+    return this.preCacheCols != null;
   }
 
-  public void setColumnPreCacheIsSet(boolean value) {
+  public void setPreCacheColsIsSet(boolean value) {
     if (!value) {
-      this.columnPreCache = null;
+      this.preCacheCols = null;
     }
   }
 
@@ -1051,11 +1071,11 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       break;
 
-    case COLUMN_PRE_CACHE:
+    case PRE_CACHE_COLS:
       if (value == null) {
-        unsetColumnPreCache();
+        unsetPreCacheCols();
       } else {
-        setColumnPreCache((ColumnPreCache)value);
+        setPreCacheCols((List<String>)value);
       }
       break;
 
@@ -1131,8 +1151,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     case READ_ONLY:
       return Boolean.valueOf(isReadOnly());
 
-    case COLUMN_PRE_CACHE:
-      return getColumnPreCache();
+    case PRE_CACHE_COLS:
+      return getPreCacheCols();
 
     case TABLE_PROPERTIES:
       return getTableProperties();
@@ -1178,8 +1198,8 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       return isSetBlockCachingFileTypes();
     case READ_ONLY:
       return isSetReadOnly();
-    case COLUMN_PRE_CACHE:
-      return isSetColumnPreCache();
+    case PRE_CACHE_COLS:
+      return isSetPreCacheCols();
     case TABLE_PROPERTIES:
       return isSetTableProperties();
     case STRICT_TYPES:
@@ -1288,12 +1308,12 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         return false;
     }
 
-    boolean this_present_columnPreCache = true && this.isSetColumnPreCache();
-    boolean that_present_columnPreCache = true && that.isSetColumnPreCache();
-    if (this_present_columnPreCache || that_present_columnPreCache) {
-      if (!(this_present_columnPreCache && that_present_columnPreCache))
+    boolean this_present_preCacheCols = true && this.isSetPreCacheCols();
+    boolean that_present_preCacheCols = true && that.isSetPreCacheCols();
+    if (this_present_preCacheCols || that_present_preCacheCols) {
+      if (!(this_present_preCacheCols && that_present_preCacheCols))
         return false;
-      if (!this.columnPreCache.equals(that.columnPreCache))
+      if (!this.preCacheCols.equals(that.preCacheCols))
         return false;
     }
 
@@ -1448,12 +1468,12 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnPreCache()).compareTo(typedOther.isSetColumnPreCache());
+    lastComparison = Boolean.valueOf(isSetPreCacheCols()).compareTo(typedOther.isSetPreCacheCols());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetColumnPreCache()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.columnPreCache, typedOther.columnPreCache);
+    if (isSetPreCacheCols()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.preCacheCols, typedOther.preCacheCols);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1584,11 +1604,11 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
     sb.append(this.readOnly);
     first = false;
     if (!first) sb.append(", ");
-    sb.append("columnPreCache:");
-    if (this.columnPreCache == null) {
+    sb.append("preCacheCols:");
+    if (this.preCacheCols == null) {
       sb.append("null");
     } else {
-      sb.append(this.columnPreCache);
+      sb.append(this.preCacheCols);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -1630,9 +1650,6 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
   public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
     // check for required fields
     // check for sub-struct validity
-    if (columnPreCache != null) {
-      columnPreCache.validate();
-    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1730,13 +1747,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 11: // BLOCK_CACHING_FILE_TYPES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set128 = iprot.readSetBegin();
-                struct.blockCachingFileTypes = new HashSet<String>(2*_set128.size);
-                for (int _i129 = 0; _i129 < _set128.size; ++_i129)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set120 = iprot.readSetBegin();
+                struct.blockCachingFileTypes = new HashSet<String>(2*_set120.size);
+                for (int _i121 = 0; _i121 < _set120.size; ++_i121)
                 {
-                  String _elem130; // required
-                  _elem130 = iprot.readString();
-                  struct.blockCachingFileTypes.add(_elem130);
+                  String _elem122; // required
+                  _elem122 = iprot.readString();
+                  struct.blockCachingFileTypes.add(_elem122);
                 }
                 iprot.readSetEnd();
               }
@@ -1753,11 +1770,20 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 13: // COLUMN_PRE_CACHE
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-              struct.columnPreCache = new ColumnPreCache();
-              struct.columnPreCache.read(iprot);
-              struct.setColumnPreCacheIsSet(true);
+          case 13: // PRE_CACHE_COLS
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
+              {
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list123 = iprot.readListBegin();
+                struct.preCacheCols = new ArrayList<String>(_list123.size);
+                for (int _i124 = 0; _i124 < _list123.size; ++_i124)
+                {
+                  String _elem125; // required
+                  _elem125 = iprot.readString();
+                  struct.preCacheCols.add(_elem125);
+                }
+                iprot.readListEnd();
+              }
+              struct.setPreCacheColsIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1765,15 +1791,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 14: // TABLE_PROPERTIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map131 = iprot.readMapBegin();
-                struct.tableProperties = new HashMap<String,String>(2*_map131.size);
-                for (int _i132 = 0; _i132 < _map131.size; ++_i132)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map126 = iprot.readMapBegin();
+                struct.tableProperties = new HashMap<String,String>(2*_map126.size);
+                for (int _i127 = 0; _i127 < _map126.size; ++_i127)
                 {
-                  String _key133; // required
-                  String _val134; // optional
-                  _key133 = iprot.readString();
-                  _val134 = iprot.readString();
-                  struct.tableProperties.put(_key133, _val134);
+                  String _key128; // required
+                  String _val129; // optional
+                  _key128 = iprot.readString();
+                  _val129 = iprot.readString();
+                  struct.tableProperties.put(_key128, _val129);
                 }
                 iprot.readMapEnd();
               }
@@ -1809,15 +1835,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 18: // DEFAULT_MISSING_FIELD_PROPS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map135 = iprot.readMapBegin();
-                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map135.size);
-                for (int _i136 = 0; _i136 < _map135.size; ++_i136)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map130 = iprot.readMapBegin();
+                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map130.size);
+                for (int _i131 = 0; _i131 < _map130.size; ++_i131)
                 {
-                  String _key137; // required
-                  String _val138; // optional
-                  _key137 = iprot.readString();
-                  _val138 = iprot.readString();
-                  struct.defaultMissingFieldProps.put(_key137, _val138);
+                  String _key132; // required
+                  String _val133; // optional
+                  _key132 = iprot.readString();
+                  _val133 = iprot.readString();
+                  struct.defaultMissingFieldProps.put(_key132, _val133);
                 }
                 iprot.readMapEnd();
               }
@@ -1874,9 +1900,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(BLOCK_CACHING_FILE_TYPES_FIELD_DESC);
         {
           oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.blockCachingFileTypes.size()));
-          for (String _iter139 : struct.blockCachingFileTypes)
+          for (String _iter134 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter139);
+            oprot.writeString(_iter134);
           }
           oprot.writeSetEnd();
         }
@@ -1885,19 +1911,26 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       oprot.writeFieldBegin(READ_ONLY_FIELD_DESC);
       oprot.writeBool(struct.readOnly);
       oprot.writeFieldEnd();
-      if (struct.columnPreCache != null) {
-        oprot.writeFieldBegin(COLUMN_PRE_CACHE_FIELD_DESC);
-        struct.columnPreCache.write(oprot);
+      if (struct.preCacheCols != null) {
+        oprot.writeFieldBegin(PRE_CACHE_COLS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.preCacheCols.size()));
+          for (String _iter135 : struct.preCacheCols)
+          {
+            oprot.writeString(_iter135);
+          }
+          oprot.writeListEnd();
+        }
         oprot.writeFieldEnd();
       }
       if (struct.tableProperties != null) {
         oprot.writeFieldBegin(TABLE_PROPERTIES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.tableProperties.size()));
-          for (Map.Entry<String, String> _iter140 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter136 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter140.getKey());
-            oprot.writeString(_iter140.getValue());
+            oprot.writeString(_iter136.getKey());
+            oprot.writeString(_iter136.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1918,10 +1951,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(DEFAULT_MISSING_FIELD_PROPS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.defaultMissingFieldProps.size()));
-          for (Map.Entry<String, String> _iter141 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter137 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter141.getKey());
-            oprot.writeString(_iter141.getValue());
+            oprot.writeString(_iter137.getKey());
+            oprot.writeString(_iter137.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1972,7 +2005,7 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetReadOnly()) {
         optionals.set(8);
       }
-      if (struct.isSetColumnPreCache()) {
+      if (struct.isSetPreCacheCols()) {
         optionals.set(9);
       }
       if (struct.isSetTableProperties()) {
@@ -2015,25 +2048,31 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetBlockCachingFileTypes()) {
         {
           oprot.writeI32(struct.blockCachingFileTypes.size());
-          for (String _iter142 : struct.blockCachingFileTypes)
+          for (String _iter138 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter142);
+            oprot.writeString(_iter138);
           }
         }
       }
       if (struct.isSetReadOnly()) {
         oprot.writeBool(struct.readOnly);
       }
-      if (struct.isSetColumnPreCache()) {
-        struct.columnPreCache.write(oprot);
+      if (struct.isSetPreCacheCols()) {
+        {
+          oprot.writeI32(struct.preCacheCols.size());
+          for (String _iter139 : struct.preCacheCols)
+          {
+            oprot.writeString(_iter139);
+          }
+        }
       }
       if (struct.isSetTableProperties()) {
         {
           oprot.writeI32(struct.tableProperties.size());
-          for (Map.Entry<String, String> _iter143 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter140 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter143.getKey());
-            oprot.writeString(_iter143.getValue());
+            oprot.writeString(_iter140.getKey());
+            oprot.writeString(_iter140.getValue());
           }
         }
       }
@@ -2049,10 +2088,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetDefaultMissingFieldProps()) {
         {
           oprot.writeI32(struct.defaultMissingFieldProps.size());
-          for (Map.Entry<String, String> _iter144 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter141 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter144.getKey());
-            oprot.writeString(_iter144.getValue());
+            oprot.writeString(_iter141.getKey());
+            oprot.writeString(_iter141.getValue());
           }
         }
       }
@@ -2092,13 +2131,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(7)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set145 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.blockCachingFileTypes = new HashSet<String>(2*_set145.size);
-          for (int _i146 = 0; _i146 < _set145.size; ++_i146)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set142 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.blockCachingFileTypes = new HashSet<String>(2*_set142.size);
+          for (int _i143 = 0; _i143 < _set142.size; ++_i143)
           {
-            String _elem147; // required
-            _elem147 = iprot.readString();
-            struct.blockCachingFileTypes.add(_elem147);
+            String _elem144; // required
+            _elem144 = iprot.readString();
+            struct.blockCachingFileTypes.add(_elem144);
           }
         }
         struct.setBlockCachingFileTypesIsSet(true);
@@ -2108,9 +2147,17 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         struct.setReadOnlyIsSet(true);
       }
       if (incoming.get(9)) {
-        struct.columnPreCache = new ColumnPreCache();
-        struct.columnPreCache.read(iprot);
-        struct.setColumnPreCacheIsSet(true);
+        {
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list145 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.preCacheCols = new ArrayList<String>(_list145.size);
+          for (int _i146 = 0; _i146 < _list145.size; ++_i146)
+          {
+            String _elem147; // required
+            _elem147 = iprot.readString();
+            struct.preCacheCols.add(_elem147);
+          }
+        }
+        struct.setPreCacheColsIsSet(true);
       }
       if (incoming.get(10)) {
         {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42c1afed/blur-thrift/src/main/java/org/apache/blur/thrift/util/StatsTable.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/StatsTable.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/StatsTable.java
index 1025445..9b52eb1 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/StatsTable.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/StatsTable.java
@@ -32,7 +32,7 @@ public class StatsTable {
     final String tableName = args[1];
 
     Iface client = BlurClient.getClient(connectionStr);
-    TableStats tableStats = client.getTableStats(tableName);
+    TableStats tableStats = client.tableStats(tableName);
     System.out.println(tableStats);
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42c1afed/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/Blur.thrift b/distribution/src/main/scripts/interface/Blur.thrift
index 6d99f7b..c5e3419 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -77,8 +77,8 @@ enum QueryState {
   * FOUND : when UUID is present<br/>
   */
 enum Status {
-    NOT_FOUND,
-    FOUND
+  NOT_FOUND,
+  FOUND
 }
 
 /**
@@ -304,7 +304,8 @@ struct FetchRecordResult {
 }
 
 /**
- * FetchResult contains the row or record fetch result based if the Selector was going to fetch the entire row or a single record.
+ * FetchResult contains the row or record fetch result based if the Selector 
+ * was going to fetch the entire row or a single record.
  */
 struct FetchResult {
   /**
@@ -330,41 +331,32 @@ struct FetchResult {
 }
 
 /**
- * The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
- */
-struct ExpertQuery {
-  /**
-   * The serialized query.
-   */
-  1:binary query,
-  /**
-   * The serialized filter.
-   */
-  2:binary filter
-}
-
-/**
  * Blur facet.
  */
 struct Facet {
+  /** The facet query. */
   1:string queryStr,
+  /** The minimum number of results before no longer processing the facet.  This 
+      is a good way to decrease the strain on the system while using many facets. For 
+      example if you set this attribute to 1000, then the shard server will stop 
+      processing the facet at the 1000 mark.  However because this is processed at 
+      the shard server level the controller will likely return more than the minimum 
+      because it sums the answers from the shard servers.
+   */
   2:i64 minimumNumberOfBlurResults = 9223372036854775807
 }
 
 /**
- *
+ * The Blur Query object that contains the query that needs to be executed along 
+ * with the query options.
  */
 struct BlurQuery {
   /**
-   *
+   * The query information.
    */
   1:SimpleQuery simpleQuery,
   /**
-   *
-   */
-  2:ExpertQuery expertQuery,
-  /**
-   *
+   * A list of Facets to execute with the given query.
    */
   3:list<Facet> facets,
   /**
@@ -372,53 +364,47 @@ struct BlurQuery {
    */
   4:Selector selector,
   /**
-   * @deprecated This value is no longer used.  This allows the query to see the most current data that has been added to the table.
-   */
-  5:bool allowStaleData = 0,
-  /**
-   *
+   * Enabled by default to use a cached result if the query matches a previous run query with the 
+   * configured amount of time.
    */
   6:bool useCacheIfPresent = 1,
   /**
-   *
+   * The starting result position, 0 by default.
    */
   7:i64 start = 0,
   /**
-   *
+   * The number of fetched results, 10 by default.
    */
   8:i32 fetch = 10, 
   /**
-   *
+   * The minimum number of results to find before returning.
    */
   9:i64 minimumNumberOfResults = 9223372036854775807,
   /**
-   *
+   * The maximum amount of time the query should execute before timing out.
    */
   10:i64 maxQueryTime = 9223372036854775807,
   /**
-   *
+   * Sets the uuid of this query, this is normal set by the client so that the status 
+   * of a running query can be found or the query can be canceled.
    */
   11:i64 uuid,
   /**
-   *
+   * Sets a user context, only used for logging at this point.
    */
   12:string userContext,
   /**
-   *
+   * Enabled by default to cache this result.  False would not cache the result.
    */
   13:bool cacheResult = 1,
   /**
-   *
+   * Sets the start time, if 0 the controller sets the time.
    */
-  14:i64 startTime = 0,
-  /**
-   *
-   */
-  15:bool modifyFileCaches = 1
+  14:i64 startTime = 0
 }
 
 /**
- *
+ * 
  */
 struct BlurResult {
   /**
@@ -426,7 +412,7 @@ struct BlurResult {
    */
   1:string locationId,
   /**
-   *
+   * 
    */
   2:double score,
   /**
@@ -600,16 +586,6 @@ struct Schema {
 /**
  *
  */
-struct ColumnPreCache {
-  /**
-   * This map sets what column families and columns to prefetch into block cache on shard open.
-   */
-  1:list<string> preCacheCols
-}
-
-/**
- *
- */
 struct TableDescriptor {
   /**
    * Is the table enabled or not, enabled by default.
@@ -649,9 +625,9 @@ struct TableDescriptor {
    */
   12:bool readOnly = 0,
   /**
-   * Sets what column families and columns to prefetch into block cache on shard open.
+   * This map sets what column families and columns to prefetch into block cache on shard open.
    */
-  13:ColumnPreCache columnPreCache,
+  13:list<string> preCacheCols
   /**
    * The table properties that can modify the default behavior of the table.  TODO: Document all options.
    */
@@ -719,21 +695,27 @@ struct ColumnDefinition {
 }
 
 /**
- *
+ * The Blur service API.  This API is the same for both controller servers as well as 
+ * shards servers.  Each of the methods are documented.
  */
 service Blur {
 
   /**
    * Returns a list of all the shard clusters.
+   * @return list of all the shard clusters.
    */
   list<string> shardClusterList() throws (1:BlurException ex)
   /**
    * Returns a list of all the shard servers for the given cluster.
-   * @param cluster the cluster name.
+   * @return list of all the shard servers within the cluster.
    */
-  list<string> shardServerList(1:string cluster) throws (1:BlurException ex)
+  list<string> shardServerList(
+    /** the cluster name. */
+    1:string cluster
+  ) throws (1:BlurException ex)
   /**
    * Returns a list of all the controller servers.
+   * @return list of all the controllers.
    */
   list<string> controllerServerList() throws (1:BlurException ex)
   /**
@@ -749,9 +731,12 @@ service Blur {
    * open and ready for queries.  However indexes are lazily closed, so if a table is being 
    * disabled then the call will return immediately with an empty map, but the indexes may
    * not be close yet.<br><br>
-   * @param table the table name.
+   * @return map of shards in a table to the shard servers.
    */
-  map<string,string> shardServerLayout(1:string table) throws (1:BlurException ex)
+  map<string,string> shardServerLayout(
+    /** the table name. */
+    1:string table
+  ) throws (1:BlurException ex)
 
   /**
    * Returns a map of the layout of the given table, where the key is the shard name and the 
@@ -760,89 +745,246 @@ service Blur {
    * open in the shard server.  So if a shard is being moved to another server and is being 
    * closed by this server it WILL be returned in the map.  The shardServerLayout method would not return 
    * the shard given the same situation.
-   * @param table the table name.
-   * @param layoutOptions the layout options.
+   * @return map of shards to a map of shard servers with the state of the shard.
    */
-  map<string,map<string,ShardState>> shardServerLayoutState(1:string table) throws (1:BlurException ex)
+  map<string,map<string,ShardState>> shardServerLayoutState(
+    /** the table name. */
+    1:string table
+  ) throws (1:BlurException ex)
+
   /**
    * Returns a list of the table names across all shard clusters.
+   * @return list of all tables in all shard clusters.
    */
   list<string> tableList() throws (1:BlurException ex)
+
   /**
    * Returns a list of the table names for the given cluster.
-   * @param cluster the cluster name.
+   * @return list of all the tables within the given shard cluster.
    */
-  list<string> tableListByCluster(1:string cluster) throws (1:BlurException ex)
+  list<string> tableListByCluster(
+    /** the cluster name. */
+    1:string cluster
+  ) throws (1:BlurException ex)
+
   /**
    * Returns a table descriptor for the given table.
-   * @param table the table name.
+   * @return the TableDescriptor.
    */
-  TableDescriptor describe(1:string table) throws (1:BlurException ex)
+  TableDescriptor describe(
+    /** the table name. */
+    1:string table
+  ) throws (1:BlurException ex)
 
   /**
-   * Executes a query against a the given table and returns the results.  If this method is executed against a controller the results will contain the aggregated results from all the shards.  If this method is executed against a shard server the results will only contain aggregated results from the shards of the given table that are being served on the shard server, if any.
-   * @param table the table name.
-   * @param blurQuery the query to execute.
+   * Executes a query against a the given table and returns the results.  If this method is 
+   * executed against a controller the results will contain the aggregated results from all 
+   * the shards.  If this method is executed against a shard server the results will only 
+   * contain aggregated results from the shards of the given table that are being served on 
+   * the shard server, if any.
+   * @return the BlurResults.
    */
-  BlurResults query(1:string table, 2:BlurQuery blurQuery) throws (1:BlurException ex)
+  BlurResults query(
+    /** the table name. */
+    1:string table, 
+    /** the query to execute. */
+    2:BlurQuery blurQuery
+  ) throws (1:BlurException ex)
 
   /**
    * Parses the given query and return the string represents the query.
-   * @param table the table name.
-   * @param simpleQuery the query to parse.
+   * @return string representation of the parsed query.
    */
-  string parseQuery(1:string table, 2:SimpleQuery simpleQuery) throws (1:BlurException ex)
+  string parseQuery(
+    /** the table name. */
+    1:string table, 
+    /** the query to parse. */
+    2:SimpleQuery simpleQuery
+  ) throws (1:BlurException ex)
 
   /**
-   * Cancels a query that is executing against the given table with the given uuid.  Note, the cancel call maybe take some time for the query actually stops executing.
-   * @param table the table name.
-   * @param uuid the uuid of the query.
+   * Cancels a query that is executing against the given table with the given uuid.  Note, the 
+   * cancel call maybe take some time for the query actually stops executing.
    */
-  void cancelQuery(1:string table, 2:i64 uuid) throws (1:BlurException ex)
+  void cancelQuery(
+    /** the table name. */
+    1:string table, 
+    /** the uuid of the query. */
+    2:i64 uuid
+  ) throws (1:BlurException ex)
 
   /**
-   * @deprecated This method should avoided, @see #queryStatusIdList and #queryStatusById.
-   * @param table the table name.
+   * Returns a list of the query ids of queries that have recently been executed for the given table.
+   * @return list of all the uuids of the queries uuids.
    */
-  list<BlurQueryStatus> currentQueries(1:string table) throws (1:BlurException ex)
+  list<i64> queryStatusIdList(
+    /** the table name. */
+    1:string table
+  ) throws (1:BlurException ex)
 
   /**
-   * Returns a list of the query ids of queries that have recently been executed for the given table.
-   * @param table the table name.
+   * Returns the query status for the given table and query uuid.
+   * @return fetches the BlurQueryStatus for the given table and uuid.
    */
-  list<i64> queryStatusIdList(1:string table) throws (1:BlurException ex)
+  BlurQueryStatus queryStatusById(
+    /** the table name. */
+    1:string table, 
+    /** the uuid of the query. */
+    2:i64 uuid
+  ) throws (1:BlurException ex)
+
   /**
-   * Returns the query status for the given table and query uuid.
-   * @param table the table name.
-   * @param uuid the uuid of the query.
+   *
    */
-  BlurQueryStatus queryStatusById(1:string table, 2:i64 uuid) throws (1:BlurException ex)
+  Schema schema(
+    /**   */
+    1:string table
+  ) throws (1:BlurException ex)
 
-  Schema schema(1:string table) throws (1:BlurException ex)
-  TableStats getTableStats(1:string table) throws (1:BlurException ex)
-  TableStats tableStats(1:string table) throws (1:BlurException ex)
-  list<string> terms(1:string table, 2:string columnFamily, 3:string columnName, 4:string startWith, 5:i16 size) throws (1:BlurException ex)
-  i64 recordFrequency(1:string table, 2:string columnFamily, 3:string columnName, 4:string value) throws (1:BlurException ex)
+  /**
+   *
+   */
+  TableStats tableStats(
+    /**   */
+    1:string table
+  ) throws (1:BlurException ex)
 
-  FetchResult fetchRow(1:string table, 2:Selector selector) throws (1:BlurException ex)
+  /**
+   *
+   */
+  list<string> terms(
+    /**   */
+    1:string table, 
+    /**   */
+    2:string columnFamily, 
+    /**   */
+    3:string columnName, 
+    /**   */
+    4:string startWith, 
+    /**   */
+    5:i16 size
+  ) throws (1:BlurException ex)
 
-  void mutate(1:RowMutation mutation) throws (1:BlurException ex)
-  void mutateBatch(1:list<RowMutation> mutations) throws (1:BlurException ex)
+  /**
+   *
+   */
+  i64 recordFrequency(
+    /**   */
+    1:string table, 
+    /**   */
+    2:string columnFamily, 
+    /**   */
+    3:string columnName, 
+    /**   */
+    4:string value
+  ) throws (1:BlurException ex)
 
-  void createTable(1:TableDescriptor tableDescriptor) throws (1:BlurException ex)
-  void enableTable(1:string table) throws (1:BlurException ex)
-  void disableTable(1:string table) throws (1:BlurException ex)
-  void removeTable(1:string table, 2:bool deleteIndexFiles) throws (1:BlurException ex)
+  /**
+   *
+   */
+  FetchResult fetchRow(
+    /**   */
+    1:string table, 
+    /**   */
+    2:Selector selector
+  ) throws (1:BlurException ex)
 
-  bool addColumnDefinition(1:string table, 2:ColumnDefinition columnDefinition) throws (1:BlurException ex)
+  /**
+   *
+   */
+  void mutate(
+    /**   */
+    1:RowMutation mutation
+  ) throws (1:BlurException ex)
 
-  void optimize(1:string table, 2:i32 numberOfSegmentsPerShard) throws (1:BlurException ex)
+  /**
+   *
+   */
+  void mutateBatch(
+    /**   */
+    1:list<RowMutation> mutations
+  ) throws (1:BlurException ex)
+
+  /**
+   * Creates a table with the given TableDescriptor.
+   */
+  void createTable(
+    /** the TableDescriptor.  */
+    1:TableDescriptor tableDescriptor
+  ) throws (1:BlurException ex)
+
+  /**
+   * Enables the given table, blocking until all shards are online.
+   * @param table 
+   */
+  void enableTable(
+    /** the table name. */
+    1:string table
+  ) throws (1:BlurException ex)
+
+  /**
+   * Disables the given table, blocking until all shards are offline.
+   * @param table the table name.
+   */
+  void disableTable(
+    /** the table name. */
+    1:string table
+  ) throws (1:BlurException ex)
+
+  /**
+   * Removes the given table, with an optional to delete the underlying index storage as well.
+   */
+  void removeTable(
+    /** the table name. */
+    1:string table, 
+    /** true to remove the index storage and false if to preserve.*/
+    2:bool deleteIndexFiles
+  ) throws (1:BlurException ex)
+
+  /**
+   * Attempts to add a column definition to the given table.
+   * @return true if successfully defined false if not.
+   */
+  bool addColumnDefinition(
+    /** the name of the table. */
+    1:string table, 
+    /** the ColumnDefinition. */
+    2:ColumnDefinition columnDefinition
+  ) throws (1:BlurException ex)
+
+  /**
+   * Will perform a forced optimize on the index in the given table.
+   */
+  void optimize(
+    /** table the name of the table. */
+    1:string table, 
+    /** the maximum of segments per shard index after the operation is completed. */
+    2:i32 numberOfSegmentsPerShard
+  ) throws (1:BlurException ex)
   
-  bool isInSafeMode(1:string cluster) throws (1:BlurException ex)
+  /**
+   * Checks to see if the given cluster is in safemode.
+   * @return boolean.
+   */
+  bool isInSafeMode(
+    /** the name of the cluster. */
+    1:string cluster
+  ) throws (1:BlurException ex)
 
+  /**
+   * Fetches the Blur configuration.
+   * @return Map of property name to value.
+   */
   map<string,string> configuration() throws (1:BlurException ex)
 
-  map<string,Metric> metrics(1:set<string> metrics) throws (1:BlurException ex)
+  /**
+   * Fetches the Blur metrics by name.  If the metrics parameter is null all the Metrics are returned.
+   * @return Map of metric name to Metric.
+   */
+  map<string,Metric> metrics(
+    /** the names of the metrics to return.  If null all are returned. */
+    1:set<string> metrics
+  ) throws (1:BlurException ex)
 
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42c1afed/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html
index 8c45baa..a5c105c 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -16,12 +16,10 @@
 <li><a href="Blur.html#Fn_Blur_configuration">configuration</a></li>
 <li><a href="Blur.html#Fn_Blur_controllerServerList">controllerServerList</a></li>
 <li><a href="Blur.html#Fn_Blur_createTable">createTable</a></li>
-<li><a href="Blur.html#Fn_Blur_currentQueries">currentQueries</a></li>
 <li><a href="Blur.html#Fn_Blur_describe">describe</a></li>
 <li><a href="Blur.html#Fn_Blur_disableTable">disableTable</a></li>
 <li><a href="Blur.html#Fn_Blur_enableTable">enableTable</a></li>
 <li><a href="Blur.html#Fn_Blur_fetchRow">fetchRow</a></li>
-<li><a href="Blur.html#Fn_Blur_getTableStats">getTableStats</a></li>
 <li><a href="Blur.html#Fn_Blur_isInSafeMode">isInSafeMode</a></li>
 <li><a href="Blur.html#Fn_Blur_metrics">metrics</a></li>
 <li><a href="Blur.html#Fn_Blur_mutate">mutate</a></li>
@@ -51,10 +49,8 @@
 <a href="Blur.html#Struct_BlurResults">BlurResults</a><br/>
 <a href="Blur.html#Struct_Column">Column</a><br/>
 <a href="Blur.html#Struct_ColumnDefinition">ColumnDefinition</a><br/>
-<a href="Blur.html#Struct_ColumnPreCache">ColumnPreCache</a><br/>
 <a href="Blur.html#Struct_CpuTime">CpuTime</a><br/>
 <a href="Blur.html#Enum_ErrorType">ErrorType</a><br/>
-<a href="Blur.html#Struct_ExpertQuery">ExpertQuery</a><br/>
 <a href="Blur.html#Struct_Facet">Facet</a><br/>
 <a href="Blur.html#Struct_FetchRecordResult">FetchRecordResult</a><br/>
 <a href="Blur.html#Struct_FetchResult">FetchResult</a><br/>
@@ -267,61 +263,59 @@ would be 100.  Used in conjunction with maxRecordsToFetch. By default this will
 </td><td>default</td><td></td></tr>
 <tr><td>5</td><td>recordResult</td><td><code><a href="Blur.html#Struct_FetchRecordResult">FetchRecordResult</a></code></td><td>The record result if a record was selected form the Selector.
 </td><td>default</td><td></td></tr>
-</table><br/>FetchResult contains the row or record fetch result based if the Selector was going to fetch the entire row or a single record.
-<br/></div><div class="definition"><h3 id="Struct_ExpertQuery">Struct: ExpertQuery</h3>
-<table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
-<tr><td>1</td><td>query</td><td><code>binary</code></td><td>The serialized query.
-</td><td>default</td><td></td></tr>
-<tr><td>2</td><td>filter</td><td><code>binary</code></td><td>The serialized filter.
-</td><td>default</td><td></td></tr>
-</table><br/>The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
+</table><br/>FetchResult contains the row or record fetch result based if the Selector
+was going to fetch the entire row or a single record.
 <br/></div><div class="definition"><h3 id="Struct_Facet">Struct: Facet</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
-<tr><td>1</td><td>queryStr</td><td><code>string</code></td><td></td><td>default</td><td></td></tr>
-<tr><td>2</td><td>minimumNumberOfBlurResults</td><td><code>i64</code></td><td></td><td>default</td><td>9223372036854775807</td></tr>
+<tr><td>1</td><td>queryStr</td><td><code>string</code></td><td>The facet query.
+</td><td>default</td><td></td></tr>
+<tr><td>2</td><td>minimumNumberOfBlurResults</td><td><code>i64</code></td><td>The minimum number of results before no longer processing the facet.  This
+is a good way to decrease the strain on the system while using many facets. For
+example if you set this attribute to 1000, then the shard server will stop
+processing the facet at the 1000 mark.  However because this is processed at
+the shard server level the controller will likely return more than the minimum
+because it sums the answers from the shard servers.
+</td><td>default</td><td>9223372036854775807</td></tr>
 </table><br/>Blur facet.
 <br/></div><div class="definition"><h3 id="Struct_BlurQuery">Struct: BlurQuery</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
-<tr><td>1</td><td>simpleQuery</td><td><code><a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a></code></td><td>
-</td><td>default</td><td></td></tr>
-<tr><td>2</td><td>expertQuery</td><td><code><a href="Blur.html#Struct_ExpertQuery">ExpertQuery</a></code></td><td>
+<tr><td>1</td><td>simpleQuery</td><td><code><a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a></code></td><td>The query information.
 </td><td>default</td><td></td></tr>
-<tr><td>3</td><td>facets</td><td><code>list&lt;<code><a href="Blur.html#Struct_Facet">Facet</a></code>&gt;</code></td><td>
+<tr><td>3</td><td>facets</td><td><code>list&lt;<code><a href="Blur.html#Struct_Facet">Facet</a></code>&gt;</code></td><td>A list of Facets to execute with the given query.
 </td><td>default</td><td></td></tr>
 <tr><td>4</td><td>selector</td><td><code><a href="Blur.html#Struct_Selector">Selector</a></code></td><td>Selector is used to fetch data in the search results, if null only location ids will be fetched.
 </td><td>default</td><td></td></tr>
-<tr><td>5</td><td>allowStaleData</td><td><code>bool</code></td><td>@deprecated This value is no longer used.  This allows the query to see the most current data that has been added to the table.
-</td><td>default</td><td>0</td></tr>
-<tr><td>6</td><td>useCacheIfPresent</td><td><code>bool</code></td><td>
+<tr><td>6</td><td>useCacheIfPresent</td><td><code>bool</code></td><td>Enabled by default to use a cached result if the query matches a previous run query with the
+configured amount of time.
 </td><td>default</td><td>1</td></tr>
-<tr><td>7</td><td>start</td><td><code>i64</code></td><td>
+<tr><td>7</td><td>start</td><td><code>i64</code></td><td>The starting result position, 0 by default.
 </td><td>default</td><td>0</td></tr>
-<tr><td>8</td><td>fetch</td><td><code>i32</code></td><td>
+<tr><td>8</td><td>fetch</td><td><code>i32</code></td><td>The number of fetched results, 10 by default.
 </td><td>default</td><td>10</td></tr>
-<tr><td>9</td><td>minimumNumberOfResults</td><td><code>i64</code></td><td>
+<tr><td>9</td><td>minimumNumberOfResults</td><td><code>i64</code></td><td>The minimum number of results to find before returning.
 </td><td>default</td><td>9223372036854775807</td></tr>
-<tr><td>10</td><td>maxQueryTime</td><td><code>i64</code></td><td>
+<tr><td>10</td><td>maxQueryTime</td><td><code>i64</code></td><td>The maximum amount of time the query should execute before timing out.
 </td><td>default</td><td>9223372036854775807</td></tr>
-<tr><td>11</td><td>uuid</td><td><code>i64</code></td><td>
+<tr><td>11</td><td>uuid</td><td><code>i64</code></td><td>Sets the uuid of this query, this is normal set by the client so that the status
+of a running query can be found or the query can be canceled.
 </td><td>default</td><td></td></tr>
-<tr><td>12</td><td>userContext</td><td><code>string</code></td><td>
+<tr><td>12</td><td>userContext</td><td><code>string</code></td><td>Sets a user context, only used for logging at this point.
 </td><td>default</td><td></td></tr>
-<tr><td>13</td><td>cacheResult</td><td><code>bool</code></td><td>
+<tr><td>13</td><td>cacheResult</td><td><code>bool</code></td><td>Enabled by default to cache this result.  False would not cache the result.
 </td><td>default</td><td>1</td></tr>
-<tr><td>14</td><td>startTime</td><td><code>i64</code></td><td>
+<tr><td>14</td><td>startTime</td><td><code>i64</code></td><td>Sets the start time, if 0 the controller sets the time.
 </td><td>default</td><td>0</td></tr>
-<tr><td>15</td><td>modifyFileCaches</td><td><code>bool</code></td><td>
-</td><td>default</td><td>1</td></tr>
-</table><br/><p/>
+</table><br/>The Blur Query object that contains the query that needs to be executed along
+with the query options.
 <br/></div><div class="definition"><h3 id="Struct_BlurResult">Struct: BlurResult</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
 <tr><td>1</td><td>locationId</td><td><code>string</code></td><td>WARNING: This is an internal only attribute and is not intended for use by clients.
 </td><td>default</td><td></td></tr>
-<tr><td>2</td><td>score</td><td><code>double</code></td><td>
+<tr><td>2</td><td>score</td><td><code>double</code></td><td> 
 </td><td>default</td><td></td></tr>
 <tr><td>3</td><td>fetchResult</td><td><code><a href="Blur.html#Struct_FetchResult">FetchResult</a></code></td><td>
 </td><td>default</td><td></td></tr>
-</table><br/><p/>
+</table><br/> 
 <br/></div><div class="definition"><h3 id="Struct_BlurResults">Struct: BlurResults</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
 <tr><td>1</td><td>totalResults</td><td><code>i64</code></td><td>
@@ -407,11 +401,6 @@ shards that are complete, etc.
 <tr><td>2</td><td>columnFamilies</td><td><code>map&lt;<code>string</code>, <code>set&lt;<code>string</code>&gt;</code>&gt;</code></td><td>
 </td><td>default</td><td></td></tr>
 </table><br/><p/>
-<br/></div><div class="definition"><h3 id="Struct_ColumnPreCache">Struct: ColumnPreCache</h3>
-<table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
-<tr><td>1</td><td>preCacheCols</td><td><code>list&lt;<code>string</code>&gt;</code></td><td>This map sets what column families and columns to prefetch into block cache on shard open.
-</td><td>default</td><td></td></tr>
-</table><br/><p/>
 <br/></div><div class="definition"><h3 id="Struct_TableDescriptor">Struct: TableDescriptor</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
 <tr><td>1</td><td>isEnabled</td><td><code>bool</code></td><td>Is the table enabled or not, enabled by default.
@@ -433,7 +422,7 @@ shards that are complete, etc.
 <tr><td>12</td><td>readOnly</td><td><code>bool</code></td><td>If a table is set to be readonly, that means that mutates through Thrift are NOT allowed.  However
 updates through MapReduce are allowed and in fact they are only allowed if the table is in readOnly mode.
 </td><td>default</td><td>0</td></tr>
-<tr><td>13</td><td>columnPreCache</td><td><code><a href="Blur.html#Struct_ColumnPreCache">ColumnPreCache</a></code></td><td>Sets what column families and columns to prefetch into block cache on shard open.
+<tr><td>13</td><td>preCacheCols</td><td><code>list&lt;<code>string</code>&gt;</code></td><td>This map sets what column families and columns to prefetch into block cache on shard open.
 </td><td>default</td><td></td></tr>
 <tr><td>14</td><td>tableProperties</td><td><code>map&lt;<code>string</code>, <code>string</code>&gt;</code></td><td>The table properties that can modify the default behavior of the table.  TODO: Document all options.
 </td><td>default</td><td></td></tr>
@@ -478,20 +467,26 @@ NOTE: This will index the column as a full text field in a default field, so tha
 </td><td>default</td><td></td></tr>
 </table><br/></div><hr/><h2 id="Services">Services</h2>
 <h3 id="Svc_Blur">Service: Blur</h3>
-<p/>
+The Blur service API.  This API is the same for both controller servers as well as
+shards servers.  Each of the methods are documented.
 <br/><div class="definition"><h4 id="Fn_Blur_shardClusterList">Function: Blur.shardClusterList</h4>
 <pre><code>list&lt;<code>string</code>&gt;</code> shardClusterList()
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of all the shard clusters.
+@return list of all the shard clusters.
 <br/></div><div class="definition"><h4 id="Fn_Blur_shardServerList">Function: Blur.shardServerList</h4>
 <pre><code>list&lt;<code>string</code>&gt;</code> shardServerList(<code>string</code> cluster)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of all the shard servers for the given cluster.
-@param cluster the cluster name.
-<br/></div><div class="definition"><h4 id="Fn_Blur_controllerServerList">Function: Blur.controllerServerList</h4>
+@return list of all the shard servers within the cluster.
+<br/><br/><h4 id="Parameters_Blur_shardServerList">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>cluster</td><td>the cluster name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_controllerServerList">Function: Blur.controllerServerList</h4>
 <pre><code>list&lt;<code>string</code>&gt;</code> controllerServerList()
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of all the controller servers.
+@return list of all the controllers.
 <br/></div><div class="definition"><h4 id="Fn_Blur_shardServerLayout">Function: Blur.shardServerLayout</h4>
 <pre><code>map&lt;<code>string</code>, <code>string</code>&gt;</code> shardServerLayout(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
@@ -507,8 +502,11 @@ matches the correct layout.  Meaning it will block until indexes that should be
 open and ready for queries.  However indexes are lazily closed, so if a table is being
 disabled then the call will return immediately with an empty map, but the indexes may
 not be close yet.<br><br>
-@param table the table name.
-<br/></div><div class="definition"><h4 id="Fn_Blur_shardServerLayoutState">Function: Blur.shardServerLayoutState</h4>
+@return map of shards in a table to the shard servers.
+<br/><br/><h4 id="Parameters_Blur_shardServerLayout">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_shardServerLayoutState">Function: Blur.shardServerLayoutState</h4>
 <pre><code>map&lt;<code>string</code>, <code>map&lt;<code>string</code>, <code><a href="Blur.html#Enum_ShardState">ShardState</a></code>&gt;</code>&gt;</code> shardServerLayoutState(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a map of the layout of the given table, where the key is the shard name and the
@@ -517,120 +515,196 @@ This method will return immediately with what shards are currently
 open in the shard server.  So if a shard is being moved to another server and is being
 closed by this server it WILL be returned in the map.  The shardServerLayout method would not return
 the shard given the same situation.
-@param table the table name.
-@param layoutOptions the layout options.
-<br/></div><div class="definition"><h4 id="Fn_Blur_tableList">Function: Blur.tableList</h4>
+@return map of shards to a map of shard servers with the state of the shard.
+<br/><br/><h4 id="Parameters_Blur_shardServerLayoutState">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_tableList">Function: Blur.tableList</h4>
 <pre><code>list&lt;<code>string</code>&gt;</code> tableList()
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of the table names across all shard clusters.
+@return list of all tables in all shard clusters.
 <br/></div><div class="definition"><h4 id="Fn_Blur_tableListByCluster">Function: Blur.tableListByCluster</h4>
 <pre><code>list&lt;<code>string</code>&gt;</code> tableListByCluster(<code>string</code> cluster)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of the table names for the given cluster.
-@param cluster the cluster name.
-<br/></div><div class="definition"><h4 id="Fn_Blur_describe">Function: Blur.describe</h4>
+@return list of all the tables within the given shard cluster.
+<br/><br/><h4 id="Parameters_Blur_tableListByCluster">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>cluster</td><td>the cluster name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_describe">Function: Blur.describe</h4>
 <pre><code><a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a></code> describe(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a table descriptor for the given table.
-@param table the table name.
-<br/></div><div class="definition"><h4 id="Fn_Blur_query">Function: Blur.query</h4>
+@return the TableDescriptor.
+<br/><br/><h4 id="Parameters_Blur_describe">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_query">Function: Blur.query</h4>
 <pre><code><a href="Blur.html#Struct_BlurResults">BlurResults</a></code> query(<code>string</code> table,
                   <code><a href="Blur.html#Struct_BlurQuery">BlurQuery</a></code> blurQuery)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre>Executes a query against a the given table and returns the results.  If this method is executed against a controller the results will contain the aggregated results from all the shards.  If this method is executed against a shard server the results will only contain aggregated results from the shards of the given table that are being served on the shard server, if any.
-@param table the table name.
-@param blurQuery the query to execute.
-<br/></div><div class="definition"><h4 id="Fn_Blur_parseQuery">Function: Blur.parseQuery</h4>
+</pre>Executes a query against a the given table and returns the results.  If this method is
+executed against a controller the results will contain the aggregated results from all
+the shards.  If this method is executed against a shard server the results will only
+contain aggregated results from the shards of the given table that are being served on
+the shard server, if any.
+@return the BlurResults.
+<br/><br/><h4 id="Parameters_Blur_query">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+<tr><td>blurQuery</td><td>the query to execute.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_parseQuery">Function: Blur.parseQuery</h4>
 <pre><code>string</code> parseQuery(<code>string</code> table,
                   <code><a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a></code> simpleQuery)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Parses the given query and return the string represents the query.
-@param table the table name.
-@param simpleQuery the query to parse.
-<br/></div><div class="definition"><h4 id="Fn_Blur_cancelQuery">Function: Blur.cancelQuery</h4>
+@return string representation of the parsed query.
+<br/><br/><h4 id="Parameters_Blur_parseQuery">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+<tr><td>simpleQuery</td><td>the query to parse.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_cancelQuery">Function: Blur.cancelQuery</h4>
 <pre><code>void</code> cancelQuery(<code>string</code> table,
                  <code>i64</code> uuid)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre>Cancels a query that is executing against the given table with the given uuid.  Note, the cancel call maybe take some time for the query actually stops executing.
-@param table the table name.
-@param uuid the uuid of the query.
-<br/></div><div class="definition"><h4 id="Fn_Blur_currentQueries">Function: Blur.currentQueries</h4>
-<pre><code>list&lt;<code><a href="Blur.html#Struct_BlurQueryStatus">BlurQueryStatus</a></code>&gt;</code> currentQueries(<code>string</code> table)
-    throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre>@deprecated This method should avoided, @see #queryStatusIdList and #queryStatusById.
-@param table the table name.
-<br/></div><div class="definition"><h4 id="Fn_Blur_queryStatusIdList">Function: Blur.queryStatusIdList</h4>
+</pre>Cancels a query that is executing against the given table with the given uuid.  Note, the
+cancel call maybe take some time for the query actually stops executing.
+<br/><br/><h4 id="Parameters_Blur_cancelQuery">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+<tr><td>uuid</td><td>the uuid of the query.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_queryStatusIdList">Function: Blur.queryStatusIdList</h4>
 <pre><code>list&lt;<code>i64</code>&gt;</code> queryStatusIdList(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns a list of the query ids of queries that have recently been executed for the given table.
-@param table the table name.
-<br/></div><div class="definition"><h4 id="Fn_Blur_queryStatusById">Function: Blur.queryStatusById</h4>
+@return list of all the uuids of the queries uuids.
+<br/><br/><h4 id="Parameters_Blur_queryStatusIdList">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_queryStatusById">Function: Blur.queryStatusById</h4>
 <pre><code><a href="Blur.html#Struct_BlurQueryStatus">BlurQueryStatus</a></code> queryStatusById(<code>string</code> table,
                                 <code>i64</code> uuid)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Returns the query status for the given table and query uuid.
-@param table the table name.
-@param uuid the uuid of the query.
-<br/></div><div class="definition"><h4 id="Fn_Blur_schema">Function: Blur.schema</h4>
+@return fetches the BlurQueryStatus for the given table and uuid.
+<br/><br/><h4 id="Parameters_Blur_queryStatusById">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+<tr><td>uuid</td><td>the uuid of the query.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_schema">Function: Blur.schema</h4>
 <pre><code><a href="Blur.html#Struct_Schema">Schema</a></code> schema(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_getTableStats">Function: Blur.getTableStats</h4>
-<pre><code><a href="Blur.html#Struct_TableStats">TableStats</a></code> getTableStats(<code>string</code> table)
-    throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_tableStats">Function: Blur.tableStats</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_tableStats">Function: Blur.tableStats</h4>
 <pre><code><a href="Blur.html#Struct_TableStats">TableStats</a></code> tableStats(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_terms">Function: Blur.terms</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_terms">Function: Blur.terms</h4>
 <pre><code>list&lt;<code>string</code>&gt;</code> terms(<code>string</code> table,
                    <code>string</code> columnFamily,
                    <code>string</code> columnName,
                    <code>string</code> startWith,
                    <code>i16</code> size)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_recordFrequency">Function: Blur.recordFrequency</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_recordFrequency">Function: Blur.recordFrequency</h4>
 <pre><code>i64</code> recordFrequency(<code>string</code> table,
                     <code>string</code> columnFamily,
                     <code>string</code> columnName,
                     <code>string</code> value)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_fetchRow">Function: Blur.fetchRow</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_fetchRow">Function: Blur.fetchRow</h4>
 <pre><code><a href="Blur.html#Struct_FetchResult">FetchResult</a></code> fetchRow(<code>string</code> table,
                      <code><a href="Blur.html#Struct_Selector">Selector</a></code> selector)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_mutate">Function: Blur.mutate</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_mutate">Function: Blur.mutate</h4>
 <pre><code>void</code> mutate(<code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code> mutation)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_mutateBatch">Function: Blur.mutateBatch</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_mutateBatch">Function: Blur.mutateBatch</h4>
 <pre><code>void</code> mutateBatch(<code>list&lt;<code><a href="Blur.html#Struct_RowMutation">RowMutation</a></code>&gt;</code> mutations)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_createTable">Function: Blur.createTable</h4>
+</pre><p/>
+<br/></div><div class="definition"><h4 id="Fn_Blur_createTable">Function: Blur.createTable</h4>
 <pre><code>void</code> createTable(<code><a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a></code> tableDescriptor)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_enableTable">Function: Blur.enableTable</h4>
+</pre>Creates a table with the given TableDescriptor.
+<br/><br/><h4 id="Parameters_Blur_createTable">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>tableDescriptor</td><td>the TableDescriptor.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_enableTable">Function: Blur.enableTable</h4>
 <pre><code>void</code> enableTable(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_disableTable">Function: Blur.disableTable</h4>
+</pre>Enables the given table, blocking until all shards are online.
+@param table
+<br/><br/><h4 id="Parameters_Blur_enableTable">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_disableTable">Function: Blur.disableTable</h4>
 <pre><code>void</code> disableTable(<code>string</code> table)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_removeTable">Function: Blur.removeTable</h4>
+</pre>Disables the given table, blocking until all shards are offline.
+@param table the table name.
+<br/><br/><h4 id="Parameters_Blur_disableTable">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_removeTable">Function: Blur.removeTable</h4>
 <pre><code>void</code> removeTable(<code>string</code> table,
                  <code>bool</code> deleteIndexFiles)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_addColumnDefinition">Function: Blur.addColumnDefinition</h4>
+</pre>Removes the given table, with an optional to delete the underlying index storage as well.
+<br/><br/><h4 id="Parameters_Blur_removeTable">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
+</td></tr>
+<tr><td>deleteIndexFiles</td><td>true to remove the index storage and false if to preserve.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_addColumnDefinition">Function: Blur.addColumnDefinition</h4>
 <pre><code>bool</code> addColumnDefinition(<code>string</code> table,
                          <code><a href="Blur.html#Struct_ColumnDefinition">ColumnDefinition</a></code> columnDefinition)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_optimize">Function: Blur.optimize</h4>
+</pre>Attempts to add a column definition to the given table.
+@return true if successfully defined false if not.
+<br/><br/><h4 id="Parameters_Blur_addColumnDefinition">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the name of the table.
+</td></tr>
+<tr><td>columnDefinition</td><td>the ColumnDefinition.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_optimize">Function: Blur.optimize</h4>
 <pre><code>void</code> optimize(<code>string</code> table,
               <code>i32</code> numberOfSegmentsPerShard)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_isInSafeMode">Function: Blur.isInSafeMode</h4>
+</pre>Will perform a forced optimize on the index in the given table.
+<br/><br/><h4 id="Parameters_Blur_optimize">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>table the name of the table.
+</td></tr>
+<tr><td>numberOfSegmentsPerShard</td><td>the maximum of segments per shard index after the operation is completed.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_isInSafeMode">Function: Blur.isInSafeMode</h4>
 <pre><code>bool</code> isInSafeMode(<code>string</code> cluster)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_configuration">Function: Blur.configuration</h4>
+</pre>Checks to see if the given cluster is in safemode.
+@return boolean.
+<br/><br/><h4 id="Parameters_Blur_isInSafeMode">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>cluster</td><td>the name of the cluster.
+</td></tr>
+</table></div><div class="definition"><h4 id="Fn_Blur_configuration">Function: Blur.configuration</h4>
 <pre><code>map&lt;<code>string</code>, <code>string</code>&gt;</code> configuration()
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div><div class="definition"><h4 id="Fn_Blur_metrics">Function: Blur.metrics</h4>
+</pre>Fetches the Blur configuration.
+@return Map of property name to value.
+<br/></div><div class="definition"><h4 id="Fn_Blur_metrics">Function: Blur.metrics</h4>
 <pre><code>map&lt;<code>string</code>, <code><a href="Blur.html#Struct_Metric">Metric</a></code>&gt;</code> metrics(<code>set&lt;<code>string</code>&gt;</code> metrics)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
-</pre></div></div></body></html>
+</pre>Fetches the Blur metrics by name.  If the metrics parameter is null all the Metrics are returned.
+@return Map of metric name to Metric.
+<br/><br/><h4 id="Parameters_Blur_metrics">Parameters</h4>
+<table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>metrics</td><td>the names of the metrics to return.  If null all are returned.
+</td></tr>
+</table></div></div></body></html>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/42c1afed/distribution/src/main/scripts/interface/gen-html/index.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/index.html b/distribution/src/main/scripts/interface/gen-html/index.html
index c12fa0d..b24e009 100644
--- a/distribution/src/main/scripts/interface/gen-html/index.html
+++ b/distribution/src/main/scripts/interface/gen-html/index.html
@@ -12,12 +12,10 @@
 <li><a href="Blur.html#Fn_Blur_configuration">configuration</a></li>
 <li><a href="Blur.html#Fn_Blur_controllerServerList">controllerServerList</a></li>
 <li><a href="Blur.html#Fn_Blur_createTable">createTable</a></li>
-<li><a href="Blur.html#Fn_Blur_currentQueries">currentQueries</a></li>
 <li><a href="Blur.html#Fn_Blur_describe">describe</a></li>
 <li><a href="Blur.html#Fn_Blur_disableTable">disableTable</a></li>
 <li><a href="Blur.html#Fn_Blur_enableTable">enableTable</a></li>
 <li><a href="Blur.html#Fn_Blur_fetchRow">fetchRow</a></li>
-<li><a href="Blur.html#Fn_Blur_getTableStats">getTableStats</a></li>
 <li><a href="Blur.html#Fn_Blur_isInSafeMode">isInSafeMode</a></li>
 <li><a href="Blur.html#Fn_Blur_metrics">metrics</a></li>
 <li><a href="Blur.html#Fn_Blur_mutate">mutate</a></li>
@@ -47,10 +45,8 @@
 <a href="Blur.html#Struct_BlurResults">BlurResults</a><br/>
 <a href="Blur.html#Struct_Column">Column</a><br/>
 <a href="Blur.html#Struct_ColumnDefinition">ColumnDefinition</a><br/>
-<a href="Blur.html#Struct_ColumnPreCache">ColumnPreCache</a><br/>
 <a href="Blur.html#Struct_CpuTime">CpuTime</a><br/>
 <a href="Blur.html#Enum_ErrorType">ErrorType</a><br/>
-<a href="Blur.html#Struct_ExpertQuery">ExpertQuery</a><br/>
 <a href="Blur.html#Struct_Facet">Facet</a><br/>
 <a href="Blur.html#Struct_FetchRecordResult">FetchRecordResult</a><br/>
 <a href="Blur.html#Struct_FetchResult">FetchResult</a><br/>


Mime
View raw message