incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [15/17] Fixed BLUR-205
Date Fri, 16 Aug 2013 20:09:14 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
index 95c2b0e..5d14c60 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
@@ -50,13 +50,13 @@ import java.util.Arrays;
 //import org.slf4j.LoggerFactory;
 
 /**
- * 
+ * The current schema of the table.
  */
 public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Schema, Schema._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("Schema");
 
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("table", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_FAMILIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnFamilies", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)2);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField FAMILIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("families", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)2);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -65,24 +65,24 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
   }
 
   /**
-   * 
+   * The table name.
    */
   public String table; // required
   /**
-   * 
+   * Families and the column definitions within them.
    */
-  public Map<String,Set<String>> columnFamilies; // required
+  public Map<String,Map<String,ColumnDefinition>> families; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
     /**
-     * 
+     * The table name.
      */
     TABLE((short)1, "table"),
     /**
-     * 
+     * Families and the column definitions within them.
      */
-    COLUMN_FAMILIES((short)2, "columnFamilies");
+    FAMILIES((short)2, "families");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -99,8 +99,8 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       switch(fieldId) {
         case 1: // TABLE
           return TABLE;
-        case 2: // COLUMN_FAMILIES
-          return COLUMN_FAMILIES;
+        case 2: // FAMILIES
+          return FAMILIES;
         default:
           return null;
       }
@@ -146,11 +146,12 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
     Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
     tmpMap.put(_Fields.TABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("table", 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.STRING)));
-    tmpMap.put(_Fields.COLUMN_FAMILIES, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columnFamilies", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+    tmpMap.put(_Fields.FAMILIES, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("families", 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), 
-            new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.SetMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, 
-                new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)))));
+            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), 
+                new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, ColumnDefinition.class)))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(Schema.class, metaDataMap);
   }
@@ -160,11 +161,11 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
 
   public Schema(
     String table,
-    Map<String,Set<String>> columnFamilies)
+    Map<String,Map<String,ColumnDefinition>> families)
   {
     this();
     this.table = table;
-    this.columnFamilies = columnFamilies;
+    this.families = families;
   }
 
   /**
@@ -174,23 +175,31 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
     if (other.isSetTable()) {
       this.table = other.table;
     }
-    if (other.isSetColumnFamilies()) {
-      Map<String,Set<String>> __this__columnFamilies = new HashMap<String,Set<String>>();
-      for (Map.Entry<String, Set<String>> other_element : other.columnFamilies.entrySet()) {
+    if (other.isSetFamilies()) {
+      Map<String,Map<String,ColumnDefinition>> __this__families = new HashMap<String,Map<String,ColumnDefinition>>();
+      for (Map.Entry<String, Map<String,ColumnDefinition>> other_element : other.families.entrySet()) {
 
         String other_element_key = other_element.getKey();
-        Set<String> other_element_value = other_element.getValue();
+        Map<String,ColumnDefinition> other_element_value = other_element.getValue();
 
-        String __this__columnFamilies_copy_key = other_element_key;
+        String __this__families_copy_key = other_element_key;
 
-        Set<String> __this__columnFamilies_copy_value = new HashSet<String>();
-        for (String other_element_value_element : other_element_value) {
-          __this__columnFamilies_copy_value.add(other_element_value_element);
+        Map<String,ColumnDefinition> __this__families_copy_value = new HashMap<String,ColumnDefinition>();
+        for (Map.Entry<String, ColumnDefinition> other_element_value_element : other_element_value.entrySet()) {
+
+          String other_element_value_element_key = other_element_value_element.getKey();
+          ColumnDefinition other_element_value_element_value = other_element_value_element.getValue();
+
+          String __this__families_copy_value_copy_key = other_element_value_element_key;
+
+          ColumnDefinition __this__families_copy_value_copy_value = new ColumnDefinition(other_element_value_element_value);
+
+          __this__families_copy_value.put(__this__families_copy_value_copy_key, __this__families_copy_value_copy_value);
         }
 
-        __this__columnFamilies.put(__this__columnFamilies_copy_key, __this__columnFamilies_copy_value);
+        __this__families.put(__this__families_copy_key, __this__families_copy_value);
       }
-      this.columnFamilies = __this__columnFamilies;
+      this.families = __this__families;
     }
   }
 
@@ -201,18 +210,18 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
   @Override
   public void clear() {
     this.table = null;
-    this.columnFamilies = null;
+    this.families = null;
   }
 
   /**
-   * 
+   * The table name.
    */
   public String getTable() {
     return this.table;
   }
 
   /**
-   * 
+   * The table name.
    */
   public Schema setTable(String table) {
     this.table = table;
@@ -234,44 +243,44 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
     }
   }
 
-  public int getColumnFamiliesSize() {
-    return (this.columnFamilies == null) ? 0 : this.columnFamilies.size();
+  public int getFamiliesSize() {
+    return (this.families == null) ? 0 : this.families.size();
   }
 
-  public void putToColumnFamilies(String key, Set<String> val) {
-    if (this.columnFamilies == null) {
-      this.columnFamilies = new HashMap<String,Set<String>>();
+  public void putToFamilies(String key, Map<String,ColumnDefinition> val) {
+    if (this.families == null) {
+      this.families = new HashMap<String,Map<String,ColumnDefinition>>();
     }
-    this.columnFamilies.put(key, val);
+    this.families.put(key, val);
   }
 
   /**
-   * 
+   * Families and the column definitions within them.
    */
-  public Map<String,Set<String>> getColumnFamilies() {
-    return this.columnFamilies;
+  public Map<String,Map<String,ColumnDefinition>> getFamilies() {
+    return this.families;
   }
 
   /**
-   * 
+   * Families and the column definitions within them.
    */
-  public Schema setColumnFamilies(Map<String,Set<String>> columnFamilies) {
-    this.columnFamilies = columnFamilies;
+  public Schema setFamilies(Map<String,Map<String,ColumnDefinition>> families) {
+    this.families = families;
     return this;
   }
 
-  public void unsetColumnFamilies() {
-    this.columnFamilies = null;
+  public void unsetFamilies() {
+    this.families = null;
   }
 
-  /** Returns true if field columnFamilies is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumnFamilies() {
-    return this.columnFamilies != null;
+  /** Returns true if field families is set (has been assigned a value) and false otherwise */
+  public boolean isSetFamilies() {
+    return this.families != null;
   }
 
-  public void setColumnFamiliesIsSet(boolean value) {
+  public void setFamiliesIsSet(boolean value) {
     if (!value) {
-      this.columnFamilies = null;
+      this.families = null;
     }
   }
 
@@ -285,11 +294,11 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       }
       break;
 
-    case COLUMN_FAMILIES:
+    case FAMILIES:
       if (value == null) {
-        unsetColumnFamilies();
+        unsetFamilies();
       } else {
-        setColumnFamilies((Map<String,Set<String>>)value);
+        setFamilies((Map<String,Map<String,ColumnDefinition>>)value);
       }
       break;
 
@@ -301,8 +310,8 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
     case TABLE:
       return getTable();
 
-    case COLUMN_FAMILIES:
-      return getColumnFamilies();
+    case FAMILIES:
+      return getFamilies();
 
     }
     throw new IllegalStateException();
@@ -317,8 +326,8 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
     switch (field) {
     case TABLE:
       return isSetTable();
-    case COLUMN_FAMILIES:
-      return isSetColumnFamilies();
+    case FAMILIES:
+      return isSetFamilies();
     }
     throw new IllegalStateException();
   }
@@ -345,12 +354,12 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
         return false;
     }
 
-    boolean this_present_columnFamilies = true && this.isSetColumnFamilies();
-    boolean that_present_columnFamilies = true && that.isSetColumnFamilies();
-    if (this_present_columnFamilies || that_present_columnFamilies) {
-      if (!(this_present_columnFamilies && that_present_columnFamilies))
+    boolean this_present_families = true && this.isSetFamilies();
+    boolean that_present_families = true && that.isSetFamilies();
+    if (this_present_families || that_present_families) {
+      if (!(this_present_families && that_present_families))
         return false;
-      if (!this.columnFamilies.equals(that.columnFamilies))
+      if (!this.families.equals(that.families))
         return false;
     }
 
@@ -380,12 +389,12 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetColumnFamilies()).compareTo(typedOther.isSetColumnFamilies());
+    lastComparison = Boolean.valueOf(isSetFamilies()).compareTo(typedOther.isSetFamilies());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetColumnFamilies()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.columnFamilies, typedOther.columnFamilies);
+    if (isSetFamilies()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.families, typedOther.families);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -418,11 +427,11 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
     }
     first = false;
     if (!first) sb.append(", ");
-    sb.append("columnFamilies:");
-    if (this.columnFamilies == null) {
+    sb.append("families:");
+    if (this.families == null) {
       sb.append("null");
     } else {
-      sb.append(this.columnFamilies);
+      sb.append(this.families);
     }
     first = false;
     sb.append(")");
@@ -476,32 +485,35 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // COLUMN_FAMILIES
+          case 2: // FAMILIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map102 = iprot.readMapBegin();
-                struct.columnFamilies = new HashMap<String,Set<String>>(2*_map102.size);
-                for (int _i103 = 0; _i103 < _map102.size; ++_i103)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map112 = iprot.readMapBegin();
+                struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map112.size);
+                for (int _i113 = 0; _i113 < _map112.size; ++_i113)
                 {
-                  String _key104; // required
-                  Set<String> _val105; // optional
-                  _key104 = iprot.readString();
+                  String _key114; // required
+                  Map<String,ColumnDefinition> _val115; // optional
+                  _key114 = iprot.readString();
                   {
-                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set106 = iprot.readSetBegin();
-                    _val105 = new HashSet<String>(2*_set106.size);
-                    for (int _i107 = 0; _i107 < _set106.size; ++_i107)
+                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map116 = iprot.readMapBegin();
+                    _val115 = new HashMap<String,ColumnDefinition>(2*_map116.size);
+                    for (int _i117 = 0; _i117 < _map116.size; ++_i117)
                     {
-                      String _elem108; // required
-                      _elem108 = iprot.readString();
-                      _val105.add(_elem108);
+                      String _key118; // required
+                      ColumnDefinition _val119; // optional
+                      _key118 = iprot.readString();
+                      _val119 = new ColumnDefinition();
+                      _val119.read(iprot);
+                      _val115.put(_key118, _val119);
                     }
-                    iprot.readSetEnd();
+                    iprot.readMapEnd();
                   }
-                  struct.columnFamilies.put(_key104, _val105);
+                  struct.families.put(_key114, _val115);
                 }
                 iprot.readMapEnd();
               }
-              struct.setColumnFamiliesIsSet(true);
+              struct.setFamiliesIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -526,20 +538,21 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
         oprot.writeString(struct.table);
         oprot.writeFieldEnd();
       }
-      if (struct.columnFamilies != null) {
-        oprot.writeFieldBegin(COLUMN_FAMILIES_FIELD_DESC);
+      if (struct.families != null) {
+        oprot.writeFieldBegin(FAMILIES_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.SET, struct.columnFamilies.size()));
-          for (Map.Entry<String, Set<String>> _iter109 : struct.columnFamilies.entrySet())
+          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.MAP, struct.families.size()));
+          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter120 : struct.families.entrySet())
           {
-            oprot.writeString(_iter109.getKey());
+            oprot.writeString(_iter120.getKey());
             {
-              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter109.getValue().size()));
-              for (String _iter110 : _iter109.getValue())
+              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.STRUCT, _iter120.getValue().size()));
+              for (Map.Entry<String, ColumnDefinition> _iter121 : _iter120.getValue().entrySet())
               {
-                oprot.writeString(_iter110);
+                oprot.writeString(_iter121.getKey());
+                _iter121.getValue().write(oprot);
               }
-              oprot.writeSetEnd();
+              oprot.writeMapEnd();
             }
           }
           oprot.writeMapEnd();
@@ -567,24 +580,25 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       if (struct.isSetTable()) {
         optionals.set(0);
       }
-      if (struct.isSetColumnFamilies()) {
+      if (struct.isSetFamilies()) {
         optionals.set(1);
       }
       oprot.writeBitSet(optionals, 2);
       if (struct.isSetTable()) {
         oprot.writeString(struct.table);
       }
-      if (struct.isSetColumnFamilies()) {
+      if (struct.isSetFamilies()) {
         {
-          oprot.writeI32(struct.columnFamilies.size());
-          for (Map.Entry<String, Set<String>> _iter111 : struct.columnFamilies.entrySet())
+          oprot.writeI32(struct.families.size());
+          for (Map.Entry<String, Map<String,ColumnDefinition>> _iter122 : struct.families.entrySet())
           {
-            oprot.writeString(_iter111.getKey());
+            oprot.writeString(_iter122.getKey());
             {
-              oprot.writeI32(_iter111.getValue().size());
-              for (String _iter112 : _iter111.getValue())
+              oprot.writeI32(_iter122.getValue().size());
+              for (Map.Entry<String, ColumnDefinition> _iter123 : _iter122.getValue().entrySet())
               {
-                oprot.writeString(_iter112);
+                oprot.writeString(_iter123.getKey());
+                _iter123.getValue().write(oprot);
               }
             }
           }
@@ -602,27 +616,30 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map113 = 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.SET, iprot.readI32());
-          struct.columnFamilies = new HashMap<String,Set<String>>(2*_map113.size);
-          for (int _i114 = 0; _i114 < _map113.size; ++_i114)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map124 = 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.MAP, iprot.readI32());
+          struct.families = new HashMap<String,Map<String,ColumnDefinition>>(2*_map124.size);
+          for (int _i125 = 0; _i125 < _map124.size; ++_i125)
           {
-            String _key115; // required
-            Set<String> _val116; // optional
-            _key115 = iprot.readString();
+            String _key126; // required
+            Map<String,ColumnDefinition> _val127; // optional
+            _key126 = iprot.readString();
             {
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set117 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-              _val116 = new HashSet<String>(2*_set117.size);
-              for (int _i118 = 0; _i118 < _set117.size; ++_i118)
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map128 = 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.STRUCT, iprot.readI32());
+              _val127 = new HashMap<String,ColumnDefinition>(2*_map128.size);
+              for (int _i129 = 0; _i129 < _map128.size; ++_i129)
               {
-                String _elem119; // required
-                _elem119 = iprot.readString();
-                _val116.add(_elem119);
+                String _key130; // required
+                ColumnDefinition _val131; // optional
+                _key130 = iprot.readString();
+                _val131 = new ColumnDefinition();
+                _val131.read(iprot);
+                _val127.put(_key130, _val131);
               }
             }
-            struct.columnFamilies.put(_key115, _val116);
+            struct.families.put(_key126, _val127);
           }
         }
-        struct.setColumnFamiliesIsSet(true);
+        struct.setFamiliesIsSet(true);
       }
     }
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/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 4078631..33baab0 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
@@ -1747,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 _set120 = iprot.readSetBegin();
-                struct.blockCachingFileTypes = new HashSet<String>(2*_set120.size);
-                for (int _i121 = 0; _i121 < _set120.size; ++_i121)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set132 = iprot.readSetBegin();
+                struct.blockCachingFileTypes = new HashSet<String>(2*_set132.size);
+                for (int _i133 = 0; _i133 < _set132.size; ++_i133)
                 {
-                  String _elem122; // required
-                  _elem122 = iprot.readString();
-                  struct.blockCachingFileTypes.add(_elem122);
+                  String _elem134; // required
+                  _elem134 = iprot.readString();
+                  struct.blockCachingFileTypes.add(_elem134);
                 }
                 iprot.readSetEnd();
               }
@@ -1773,13 +1773,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           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)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list135 = iprot.readListBegin();
+                struct.preCacheCols = new ArrayList<String>(_list135.size);
+                for (int _i136 = 0; _i136 < _list135.size; ++_i136)
                 {
-                  String _elem125; // required
-                  _elem125 = iprot.readString();
-                  struct.preCacheCols.add(_elem125);
+                  String _elem137; // required
+                  _elem137 = iprot.readString();
+                  struct.preCacheCols.add(_elem137);
                 }
                 iprot.readListEnd();
               }
@@ -1791,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 _map126 = iprot.readMapBegin();
-                struct.tableProperties = new HashMap<String,String>(2*_map126.size);
-                for (int _i127 = 0; _i127 < _map126.size; ++_i127)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map138 = iprot.readMapBegin();
+                struct.tableProperties = new HashMap<String,String>(2*_map138.size);
+                for (int _i139 = 0; _i139 < _map138.size; ++_i139)
                 {
-                  String _key128; // required
-                  String _val129; // optional
-                  _key128 = iprot.readString();
-                  _val129 = iprot.readString();
-                  struct.tableProperties.put(_key128, _val129);
+                  String _key140; // required
+                  String _val141; // optional
+                  _key140 = iprot.readString();
+                  _val141 = iprot.readString();
+                  struct.tableProperties.put(_key140, _val141);
                 }
                 iprot.readMapEnd();
               }
@@ -1835,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 _map130 = iprot.readMapBegin();
-                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map130.size);
-                for (int _i131 = 0; _i131 < _map130.size; ++_i131)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map142 = iprot.readMapBegin();
+                struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map142.size);
+                for (int _i143 = 0; _i143 < _map142.size; ++_i143)
                 {
-                  String _key132; // required
-                  String _val133; // optional
-                  _key132 = iprot.readString();
-                  _val133 = iprot.readString();
-                  struct.defaultMissingFieldProps.put(_key132, _val133);
+                  String _key144; // required
+                  String _val145; // optional
+                  _key144 = iprot.readString();
+                  _val145 = iprot.readString();
+                  struct.defaultMissingFieldProps.put(_key144, _val145);
                 }
                 iprot.readMapEnd();
               }
@@ -1900,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 _iter134 : struct.blockCachingFileTypes)
+          for (String _iter146 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter134);
+            oprot.writeString(_iter146);
           }
           oprot.writeSetEnd();
         }
@@ -1915,9 +1915,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         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)
+          for (String _iter147 : struct.preCacheCols)
           {
-            oprot.writeString(_iter135);
+            oprot.writeString(_iter147);
           }
           oprot.writeListEnd();
         }
@@ -1927,10 +1927,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         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> _iter136 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter148 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter136.getKey());
-            oprot.writeString(_iter136.getValue());
+            oprot.writeString(_iter148.getKey());
+            oprot.writeString(_iter148.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1951,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> _iter137 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter149 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter137.getKey());
-            oprot.writeString(_iter137.getValue());
+            oprot.writeString(_iter149.getKey());
+            oprot.writeString(_iter149.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -2048,9 +2048,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetBlockCachingFileTypes()) {
         {
           oprot.writeI32(struct.blockCachingFileTypes.size());
-          for (String _iter138 : struct.blockCachingFileTypes)
+          for (String _iter150 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter138);
+            oprot.writeString(_iter150);
           }
         }
       }
@@ -2060,19 +2060,19 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetPreCacheCols()) {
         {
           oprot.writeI32(struct.preCacheCols.size());
-          for (String _iter139 : struct.preCacheCols)
+          for (String _iter151 : struct.preCacheCols)
           {
-            oprot.writeString(_iter139);
+            oprot.writeString(_iter151);
           }
         }
       }
       if (struct.isSetTableProperties()) {
         {
           oprot.writeI32(struct.tableProperties.size());
-          for (Map.Entry<String, String> _iter140 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter152 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter140.getKey());
-            oprot.writeString(_iter140.getValue());
+            oprot.writeString(_iter152.getKey());
+            oprot.writeString(_iter152.getValue());
           }
         }
       }
@@ -2088,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> _iter141 : struct.defaultMissingFieldProps.entrySet())
+          for (Map.Entry<String, String> _iter153 : struct.defaultMissingFieldProps.entrySet())
           {
-            oprot.writeString(_iter141.getKey());
-            oprot.writeString(_iter141.getValue());
+            oprot.writeString(_iter153.getKey());
+            oprot.writeString(_iter153.getValue());
           }
         }
       }
@@ -2131,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 _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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set154 = 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*_set154.size);
+          for (int _i155 = 0; _i155 < _set154.size; ++_i155)
           {
-            String _elem144; // required
-            _elem144 = iprot.readString();
-            struct.blockCachingFileTypes.add(_elem144);
+            String _elem156; // required
+            _elem156 = iprot.readString();
+            struct.blockCachingFileTypes.add(_elem156);
           }
         }
         struct.setBlockCachingFileTypesIsSet(true);
@@ -2148,28 +2148,28 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(9)) {
         {
-          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)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list157 = 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>(_list157.size);
+          for (int _i158 = 0; _i158 < _list157.size; ++_i158)
           {
-            String _elem147; // required
-            _elem147 = iprot.readString();
-            struct.preCacheCols.add(_elem147);
+            String _elem159; // required
+            _elem159 = iprot.readString();
+            struct.preCacheCols.add(_elem159);
           }
         }
         struct.setPreCacheColsIsSet(true);
       }
       if (incoming.get(10)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map148 = 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, iprot.readI32());
-          struct.tableProperties = new HashMap<String,String>(2*_map148.size);
-          for (int _i149 = 0; _i149 < _map148.size; ++_i149)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map160 = 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, iprot.readI32());
+          struct.tableProperties = new HashMap<String,String>(2*_map160.size);
+          for (int _i161 = 0; _i161 < _map160.size; ++_i161)
           {
-            String _key150; // required
-            String _val151; // optional
-            _key150 = iprot.readString();
-            _val151 = iprot.readString();
-            struct.tableProperties.put(_key150, _val151);
+            String _key162; // required
+            String _val163; // optional
+            _key162 = iprot.readString();
+            _val163 = iprot.readString();
+            struct.tableProperties.put(_key162, _val163);
           }
         }
         struct.setTablePropertiesIsSet(true);
@@ -2188,15 +2188,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(14)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map152 = 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, iprot.readI32());
-          struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map152.size);
-          for (int _i153 = 0; _i153 < _map152.size; ++_i153)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map164 = 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, iprot.readI32());
+          struct.defaultMissingFieldProps = new HashMap<String,String>(2*_map164.size);
+          for (int _i165 = 0; _i165 < _map164.size; ++_i165)
           {
-            String _key154; // required
-            String _val155; // optional
-            _key154 = iprot.readString();
-            _val155 = iprot.readString();
-            struct.defaultMissingFieldProps.put(_key154, _val155);
+            String _key166; // required
+            String _val167; // optional
+            _key166 = iprot.readString();
+            _val167 = iprot.readString();
+            struct.defaultMissingFieldProps.put(_key166, _val167);
           }
         }
         struct.setDefaultMissingFieldPropsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
index 5b59bc3..ebdb62c 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
@@ -26,12 +26,12 @@ import java.util.Set;
 
 import org.apache.blur.thirdparty.thrift_0_9_0.TException;
 import org.apache.blur.thrift.BlurClient;
+import org.apache.blur.thrift.generated.Blur.Iface;
 import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.SimpleQuery;
-import org.apache.blur.thrift.generated.Blur.Iface;
 
 
 public class RandomSearchTable {
@@ -109,8 +109,8 @@ public class RandomSearchTable {
     Iface client = BlurClient.getClient(connectionStr);
     Schema schema = client.schema(tableName);
     Set<String> fields = new HashSet<String>();
-    for (String cf : schema.columnFamilies.keySet()) {
-      for (String field : schema.columnFamilies.get(cf)) {
+    for (String cf : schema.families.keySet()) {
+      for (String field : schema.families.get(cf).keySet()) {
         fields.add(cf + "." + field);
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
index 03c3839..5b27ace 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
@@ -150,8 +150,8 @@ public class RandomSearchTableContinuously {
     Iface client = BlurClient.getClient(connectionStr);
     Schema schema = client.schema(tableName);
     Set<String> fields = new HashSet<String>();
-    for (String cf : schema.columnFamilies.keySet()) {
-      for (String field : schema.columnFamilies.get(cf)) {
+    for (String cf : schema.families.keySet()) {
+      for (String field : schema.families.get(cf).keySet()) {
         fields.add(cf + "." + field);
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/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 8ae2d99..70e5765 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -570,17 +570,57 @@ struct TableStats {
 }
 
 /**
- *
+ * The ColumnDefinition defines how a given Column should be interpreted (indexed/stored)
+ */
+struct ColumnDefinition {
+  /**
+   * Required. The family the this column existing within.
+   */
+  1:string family,
+  /**
+   * Required. The column name.
+   */
+  2:string columnName,
+  /**
+   * If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+   */
+  3:string subColumnName,
+  /**
+   * If this column should be searchable without having to specify the name of the column in the query.  
+   * NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+   */
+  4:bool fieldLessIndexed,
+  /**
+   * The field type for the column.  The built in types are:
+   * <ul>
+   * <li>text - Full text indexing.</li>
+   * <li>string - Indexed string literal</li>
+   * <li>int - Converted to an integer and indexed numerically.</li>
+   * <li>long - Converted to an long and indexed numerically.</li>
+   * <li>float - Converted to an float and indexed numerically.</li>
+   * <li>double - Converted to an double and indexed numerically.</li>
+   * <li>stored - Not indexed, only stored.</li>
+   * </ul>
+   */
+  5:string fieldType,
+  /**
+   * For any custom field types, you can pass in configuration properties.
+   */
+  6:map<string, string> properties
+}
+
+/**
+ * The current schema of the table.
  */
 struct Schema {
   /**
-   *
+   * The table name.
    */
   1:string table,
   /**
-   *
+   * Families and the column definitions within them.
    */
-  2:map<string,set<string>> columnFamilies
+  2:map<string,map<string,ColumnDefinition>> families
 }
 
 /**
@@ -665,46 +705,6 @@ struct Metric {
 }
 
 /**
- * The ColumnDefinition defines how a given Column should be interpreted (indexed/stored)
- */
-struct ColumnDefinition {
-  /**
-   * Required. The family the this column existing within.
-   */
-  1:string family,
-  /**
-   * Required. The column name.
-   */
-  2:string columnName,
-  /**
-   * If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
-   */
-  3:string subColumnName,
-  /**
-   * If this column should be searchable without having to specify the name of the column in the query.  
-   * NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
-   */
-  4:bool fieldLessIndexing,
-  /**
-   * The field type for the column.  The built in types are:
-   * <ul>
-   * <li>text - Full text indexing.</li>
-   * <li>string - Indexed string literal</li>
-   * <li>int - Converted to an integer and indexed numerically.</li>
-   * <li>long - Converted to an long and indexed numerically.</li>
-   * <li>float - Converted to an float and indexed numerically.</li>
-   * <li>double - Converted to an double and indexed numerically.</li>
-   * <li>stored - Not indexed, only stored.</li>
-   * </ul>
-   */
-  5:string fieldType,
-  /**
-   * For any custom field types, you can pass in configuration properties.
-   */
-  6:map<string, string> properties
-}
-
-/**
  * The Blur service API.  This API is the same for both controller servers as well as 
  * shards servers.  Each of the methods are documented.
  */

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/72a0be2d/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 d95ddcb..6fbfd55 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -394,13 +394,38 @@ shards that are complete, etc.
 <tr><td>5</td><td>queries</td><td><code>i64</code></td><td>
 </td><td>default</td><td></td></tr>
 </table><br/><p/>
+<br/></div><div class="definition"><h3 id="Struct_ColumnDefinition">Struct: ColumnDefinition</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>family</td><td><code>string</code></td><td>Required. The family the this column existing within.
+</td><td>default</td><td></td></tr>
+<tr><td>2</td><td>columnName</td><td><code>string</code></td><td>Required. The column name.
+</td><td>default</td><td></td></tr>
+<tr><td>3</td><td>subColumnName</td><td><code>string</code></td><td>If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
+</td><td>default</td><td></td></tr>
+<tr><td>4</td><td>fieldLessIndexed</td><td><code>bool</code></td><td>If this column should be searchable without having to specify the name of the column in the query.
+NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
+</td><td>default</td><td></td></tr>
+<tr><td>5</td><td>fieldType</td><td><code>string</code></td><td>The field type for the column.  The built in types are:
+<ul>
+<li>text - Full text indexing.</li>
+<li>string - Indexed string literal</li>
+<li>int - Converted to an integer and indexed numerically.</li>
+<li>long - Converted to an long and indexed numerically.</li>
+<li>float - Converted to an float and indexed numerically.</li>
+<li>double - Converted to an double and indexed numerically.</li>
+<li>stored - Not indexed, only stored.</li>
+</ul>
+</td><td>default</td><td></td></tr>
+<tr><td>6</td><td>properties</td><td><code>map&lt;<code>string</code>, <code>string</code>&gt;</code></td><td>For any custom field types, you can pass in configuration properties.
+</td><td>default</td><td></td></tr>
+</table><br/>The ColumnDefinition defines how a given Column should be interpreted (indexed/stored)
 <br/></div><div class="definition"><h3 id="Struct_Schema">Struct: Schema</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>table</td><td><code>string</code></td><td>
+<tr><td>1</td><td>table</td><td><code>string</code></td><td>The table name.
 </td><td>default</td><td></td></tr>
-<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>
+<tr><td>2</td><td>families</td><td><code>map&lt;<code>string</code>, <code>map&lt;<code>string</code>, <code><a href="Blur.html#Struct_ColumnDefinition">ColumnDefinition</a></code>&gt;</code>&gt;</code></td><td>Families and the column definitions within them.
 </td><td>default</td><td></td></tr>
-</table><br/><p/>
+</table><br/>The current schema of the table.
 <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>enabled</td><td><code>bool</code></td><td>Is the table enabled or not, enabled by default.
@@ -446,31 +471,6 @@ updates through MapReduce are allowed and in fact they are only allowed if the t
 <tr><td>4</td><td>doubleMap</td><td><code>map&lt;<code>string</code>, <code>double</code>&gt;</code></td><td>map of double values emitted by the Metric.
 </td><td>default</td><td></td></tr>
 </table><br/>The Metric will hold all the information for a given Metric.
-<br/></div><div class="definition"><h3 id="Struct_ColumnDefinition">Struct: ColumnDefinition</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>family</td><td><code>string</code></td><td>Required. The family the this column existing within.
-</td><td>default</td><td></td></tr>
-<tr><td>2</td><td>columnName</td><td><code>string</code></td><td>Required. The column name.
-</td><td>default</td><td></td></tr>
-<tr><td>3</td><td>subColumnName</td><td><code>string</code></td><td>If this column definition is for a sub column then provide the sub column name.  Otherwise leave this field null.
-</td><td>default</td><td></td></tr>
-<tr><td>4</td><td>fieldLessIndexing</td><td><code>bool</code></td><td>If this column should be searchable without having to specify the name of the column in the query.
-NOTE: This will index the column as a full text field in a default field, so that means it's going to be indexed twice.
-</td><td>default</td><td></td></tr>
-<tr><td>5</td><td>fieldType</td><td><code>string</code></td><td>The field type for the column.  The built in types are:
-<ul>
-<li>text - Full text indexing.</li>
-<li>string - Indexed string literal</li>
-<li>int - Converted to an integer and indexed numerically.</li>
-<li>long - Converted to an long and indexed numerically.</li>
-<li>float - Converted to an float and indexed numerically.</li>
-<li>double - Converted to an double and indexed numerically.</li>
-<li>stored - Not indexed, only stored.</li>
-</ul>
-</td><td>default</td><td></td></tr>
-<tr><td>6</td><td>properties</td><td><code>map&lt;<code>string</code>, <code>string</code>&gt;</code></td><td>For any custom field types, you can pass in configuration properties.
-</td><td>default</td><td></td></tr>
-</table><br/>The ColumnDefinition defines how a given Column should be interpreted (indexed/stored)
 <br/></div><hr/><h2 id="Services">Services</h2>
 <h3 id="Svc_Blur">Service: Blur</h3>
 The Blur service API.  This API is the same for both controller servers as well as


Mime
View raw message