incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [21/46] Regenerated thrift code.
Date Tue, 30 Oct 2012 02:53:18 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1befa5f5/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
index f0ae7ae..7a40b20 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurResults.java
@@ -1,7 +1,8 @@
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package org.apache.blur.thrift.generated;
 
@@ -24,6 +25,15 @@ package org.apache.blur.thrift.generated;
 
 
 
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -52,6 +62,12 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
   private static final org.apache.thrift.protocol.TField EXCEPTIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("exceptions", org.apache.thrift.protocol.TType.LIST, (short)5);
   private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRUCT, (short)6);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new BlurResultsStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new BlurResultsTupleSchemeFactory());
+  }
+
   /**
    * 
    */
@@ -170,8 +186,7 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
 
   // isset id assignments
   private static final int __TOTALRESULTS_ISSET_ID = 0;
-  private BitSet __isset_bit_vector = new BitSet(1);
-
+  private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -223,8 +238,7 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
    * Performs a deep copy on <i>other</i>.
    */
   public BlurResults(BlurResults other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
+    __isset_bitfield = other.__isset_bitfield;
     this.totalResults = other.totalResults;
     if (other.isSetShardInfo()) {
       Map<String,Long> __this__shardInfo = new HashMap<String,Long>();
@@ -299,16 +313,16 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
   }
 
   public void unsetTotalResults() {
-    __isset_bit_vector.clear(__TOTALRESULTS_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TOTALRESULTS_ISSET_ID);
   }
 
   /** Returns true if field totalResults is set (has been assigned a value) and false otherwise */
   public boolean isSetTotalResults() {
-    return __isset_bit_vector.get(__TOTALRESULTS_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __TOTALRESULTS_ISSET_ID);
   }
 
   public void setTotalResultsIsSet(boolean value) {
-    __isset_bit_vector.set(__TOTALRESULTS_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TOTALRESULTS_ISSET_ID, value);
   }
 
   public int getShardInfoSize() {
@@ -768,177 +782,11 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // TOTAL_RESULTS
-          if (field.type == org.apache.thrift.protocol.TType.I64) {
-            this.totalResults = iprot.readI64();
-            setTotalResultsIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // SHARD_INFO
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map25 = iprot.readMapBegin();
-              this.shardInfo = new HashMap<String,Long>(2*_map25.size);
-              for (int _i26 = 0; _i26 < _map25.size; ++_i26)
-              {
-                String _key27; // required
-                long _val28; // required
-                _key27 = iprot.readString();
-                _val28 = iprot.readI64();
-                this.shardInfo.put(_key27, _val28);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 3: // RESULTS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list29 = iprot.readListBegin();
-              this.results = new ArrayList<BlurResult>(_list29.size);
-              for (int _i30 = 0; _i30 < _list29.size; ++_i30)
-              {
-                BlurResult _elem31; // required
-                _elem31 = new BlurResult();
-                _elem31.read(iprot);
-                this.results.add(_elem31);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 4: // FACET_COUNTS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list32 = iprot.readListBegin();
-              this.facetCounts = new ArrayList<Long>(_list32.size);
-              for (int _i33 = 0; _i33 < _list32.size; ++_i33)
-              {
-                long _elem34; // required
-                _elem34 = iprot.readI64();
-                this.facetCounts.add(_elem34);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 5: // EXCEPTIONS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list35 = iprot.readListBegin();
-              this.exceptions = new ArrayList<BlurException>(_list35.size);
-              for (int _i36 = 0; _i36 < _list35.size; ++_i36)
-              {
-                BlurException _elem37; // required
-                _elem37 = new BlurException();
-                _elem37.read(iprot);
-                this.exceptions.add(_elem37);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 6: // QUERY
-          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.query = new BlurQuery();
-            this.query.read(iprot);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    oprot.writeFieldBegin(TOTAL_RESULTS_FIELD_DESC);
-    oprot.writeI64(this.totalResults);
-    oprot.writeFieldEnd();
-    if (this.shardInfo != null) {
-      oprot.writeFieldBegin(SHARD_INFO_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, this.shardInfo.size()));
-        for (Map.Entry<String, Long> _iter38 : this.shardInfo.entrySet())
-        {
-          oprot.writeString(_iter38.getKey());
-          oprot.writeI64(_iter38.getValue());
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.results != null) {
-      oprot.writeFieldBegin(RESULTS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.results.size()));
-        for (BlurResult _iter39 : this.results)
-        {
-          _iter39.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.facetCounts != null) {
-      oprot.writeFieldBegin(FACET_COUNTS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, this.facetCounts.size()));
-        for (long _iter40 : this.facetCounts)
-        {
-          oprot.writeI64(_iter40);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.exceptions != null) {
-      oprot.writeFieldBegin(EXCEPTIONS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, this.exceptions.size()));
-        for (BlurException _iter41 : this.exceptions)
-        {
-          _iter41.write(oprot);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    if (this.query != null) {
-      oprot.writeFieldBegin(QUERY_FIELD_DESC);
-      this.query.write(oprot);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -995,6 +843,10 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    // check for sub-struct validity
+    if (query != null) {
+      query.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1008,12 +860,349 @@ public class BlurResults implements org.apache.thrift.TBase<BlurResults, BlurRes
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
+  private static class BlurResultsStandardSchemeFactory implements SchemeFactory {
+    public BlurResultsStandardScheme getScheme() {
+      return new BlurResultsStandardScheme();
+    }
+  }
+
+  private static class BlurResultsStandardScheme extends StandardScheme<BlurResults> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, BlurResults struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // TOTAL_RESULTS
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.totalResults = iprot.readI64();
+              struct.setTotalResultsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // SHARD_INFO
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              {
+                org.apache.thrift.protocol.TMap _map50 = iprot.readMapBegin();
+                struct.shardInfo = new HashMap<String,Long>(2*_map50.size);
+                for (int _i51 = 0; _i51 < _map50.size; ++_i51)
+                {
+                  String _key52; // required
+                  long _val53; // optional
+                  _key52 = iprot.readString();
+                  _val53 = iprot.readI64();
+                  struct.shardInfo.put(_key52, _val53);
+                }
+                iprot.readMapEnd();
+              }
+              struct.setShardInfoIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // RESULTS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list54 = iprot.readListBegin();
+                struct.results = new ArrayList<BlurResult>(_list54.size);
+                for (int _i55 = 0; _i55 < _list54.size; ++_i55)
+                {
+                  BlurResult _elem56; // required
+                  _elem56 = new BlurResult();
+                  _elem56.read(iprot);
+                  struct.results.add(_elem56);
+                }
+                iprot.readListEnd();
+              }
+              struct.setResultsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // FACET_COUNTS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list57 = iprot.readListBegin();
+                struct.facetCounts = new ArrayList<Long>(_list57.size);
+                for (int _i58 = 0; _i58 < _list57.size; ++_i58)
+                {
+                  long _elem59; // required
+                  _elem59 = iprot.readI64();
+                  struct.facetCounts.add(_elem59);
+                }
+                iprot.readListEnd();
+              }
+              struct.setFacetCountsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // EXCEPTIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list60 = iprot.readListBegin();
+                struct.exceptions = new ArrayList<BlurException>(_list60.size);
+                for (int _i61 = 0; _i61 < _list60.size; ++_i61)
+                {
+                  BlurException _elem62; // required
+                  _elem62 = new BlurException();
+                  _elem62.read(iprot);
+                  struct.exceptions.add(_elem62);
+                }
+                iprot.readListEnd();
+              }
+              struct.setExceptionsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 6: // QUERY
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.query = new BlurQuery();
+              struct.query.read(iprot);
+              struct.setQueryIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, BlurResults struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(TOTAL_RESULTS_FIELD_DESC);
+      oprot.writeI64(struct.totalResults);
+      oprot.writeFieldEnd();
+      if (struct.shardInfo != null) {
+        oprot.writeFieldBegin(SHARD_INFO_FIELD_DESC);
+        {
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, struct.shardInfo.size()));
+          for (Map.Entry<String, Long> _iter63 : struct.shardInfo.entrySet())
+          {
+            oprot.writeString(_iter63.getKey());
+            oprot.writeI64(_iter63.getValue());
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.results != null) {
+        oprot.writeFieldBegin(RESULTS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.results.size()));
+          for (BlurResult _iter64 : struct.results)
+          {
+            _iter64.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.facetCounts != null) {
+        oprot.writeFieldBegin(FACET_COUNTS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, struct.facetCounts.size()));
+          for (long _iter65 : struct.facetCounts)
+          {
+            oprot.writeI64(_iter65);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.exceptions != null) {
+        oprot.writeFieldBegin(EXCEPTIONS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.exceptions.size()));
+          for (BlurException _iter66 : struct.exceptions)
+          {
+            _iter66.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.query != null) {
+        oprot.writeFieldBegin(QUERY_FIELD_DESC);
+        struct.query.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class BlurResultsTupleSchemeFactory implements SchemeFactory {
+    public BlurResultsTupleScheme getScheme() {
+      return new BlurResultsTupleScheme();
+    }
+  }
+
+  private static class BlurResultsTupleScheme extends TupleScheme<BlurResults> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, BlurResults struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetTotalResults()) {
+        optionals.set(0);
+      }
+      if (struct.isSetShardInfo()) {
+        optionals.set(1);
+      }
+      if (struct.isSetResults()) {
+        optionals.set(2);
+      }
+      if (struct.isSetFacetCounts()) {
+        optionals.set(3);
+      }
+      if (struct.isSetExceptions()) {
+        optionals.set(4);
+      }
+      if (struct.isSetQuery()) {
+        optionals.set(5);
+      }
+      oprot.writeBitSet(optionals, 6);
+      if (struct.isSetTotalResults()) {
+        oprot.writeI64(struct.totalResults);
+      }
+      if (struct.isSetShardInfo()) {
+        {
+          oprot.writeI32(struct.shardInfo.size());
+          for (Map.Entry<String, Long> _iter67 : struct.shardInfo.entrySet())
+          {
+            oprot.writeString(_iter67.getKey());
+            oprot.writeI64(_iter67.getValue());
+          }
+        }
+      }
+      if (struct.isSetResults()) {
+        {
+          oprot.writeI32(struct.results.size());
+          for (BlurResult _iter68 : struct.results)
+          {
+            _iter68.write(oprot);
+          }
+        }
+      }
+      if (struct.isSetFacetCounts()) {
+        {
+          oprot.writeI32(struct.facetCounts.size());
+          for (long _iter69 : struct.facetCounts)
+          {
+            oprot.writeI64(_iter69);
+          }
+        }
+      }
+      if (struct.isSetExceptions()) {
+        {
+          oprot.writeI32(struct.exceptions.size());
+          for (BlurException _iter70 : struct.exceptions)
+          {
+            _iter70.write(oprot);
+          }
+        }
+      }
+      if (struct.isSetQuery()) {
+        struct.query.write(oprot);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, BlurResults struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(6);
+      if (incoming.get(0)) {
+        struct.totalResults = iprot.readI64();
+        struct.setTotalResultsIsSet(true);
+      }
+      if (incoming.get(1)) {
+        {
+          org.apache.thrift.protocol.TMap _map71 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          struct.shardInfo = new HashMap<String,Long>(2*_map71.size);
+          for (int _i72 = 0; _i72 < _map71.size; ++_i72)
+          {
+            String _key73; // required
+            long _val74; // optional
+            _key73 = iprot.readString();
+            _val74 = iprot.readI64();
+            struct.shardInfo.put(_key73, _val74);
+          }
+        }
+        struct.setShardInfoIsSet(true);
+      }
+      if (incoming.get(2)) {
+        {
+          org.apache.thrift.protocol.TList _list75 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.results = new ArrayList<BlurResult>(_list75.size);
+          for (int _i76 = 0; _i76 < _list75.size; ++_i76)
+          {
+            BlurResult _elem77; // required
+            _elem77 = new BlurResult();
+            _elem77.read(iprot);
+            struct.results.add(_elem77);
+          }
+        }
+        struct.setResultsIsSet(true);
+      }
+      if (incoming.get(3)) {
+        {
+          org.apache.thrift.protocol.TList _list78 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I64, iprot.readI32());
+          struct.facetCounts = new ArrayList<Long>(_list78.size);
+          for (int _i79 = 0; _i79 < _list78.size; ++_i79)
+          {
+            long _elem80; // required
+            _elem80 = iprot.readI64();
+            struct.facetCounts.add(_elem80);
+          }
+        }
+        struct.setFacetCountsIsSet(true);
+      }
+      if (incoming.get(4)) {
+        {
+          org.apache.thrift.protocol.TList _list81 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.exceptions = new ArrayList<BlurException>(_list81.size);
+          for (int _i82 = 0; _i82 < _list81.size; ++_i82)
+          {
+            BlurException _elem83; // required
+            _elem83 = new BlurException();
+            _elem83.read(iprot);
+            struct.exceptions.add(_elem83);
+          }
+        }
+        struct.setExceptionsIsSet(true);
+      }
+      if (incoming.get(5)) {
+        struct.query = new BlurQuery();
+        struct.query.read(iprot);
+        struct.setQueryIsSet(true);
+      }
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1befa5f5/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Column.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Column.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Column.java
index 6d18af9..850f546 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Column.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Column.java
@@ -1,7 +1,8 @@
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package org.apache.blur.thrift.generated;
 
@@ -24,6 +25,15 @@ package org.apache.blur.thrift.generated;
 
 
 
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -48,6 +58,12 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   private static final org.apache.thrift.protocol.TField NAME_FIELD_DESC = new org.apache.thrift.protocol.TField("name", org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField VALUE_FIELD_DESC = new org.apache.thrift.protocol.TField("value", org.apache.thrift.protocol.TType.STRING, (short)2);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ColumnStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ColumnTupleSchemeFactory());
+  }
+
   /**
    * The name of the column.
    */
@@ -125,7 +141,6 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   }
 
   // isset id assignments
-
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -354,56 +369,11 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // NAME
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.name = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // VALUE
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.value = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.name != null) {
-      oprot.writeFieldBegin(NAME_FIELD_DESC);
-      oprot.writeString(this.name);
-      oprot.writeFieldEnd();
-    }
-    if (this.value != null) {
-      oprot.writeFieldBegin(VALUE_FIELD_DESC);
-      oprot.writeString(this.value);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -432,6 +402,7 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -450,5 +421,112 @@ public class Column implements org.apache.thrift.TBase<Column, Column._Fields>,
     }
   }
 
+  private static class ColumnStandardSchemeFactory implements SchemeFactory {
+    public ColumnStandardScheme getScheme() {
+      return new ColumnStandardScheme();
+    }
+  }
+
+  private static class ColumnStandardScheme extends StandardScheme<Column> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, Column struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.name = iprot.readString();
+              struct.setNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // VALUE
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.value = iprot.readString();
+              struct.setValueIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, Column struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.name != null) {
+        oprot.writeFieldBegin(NAME_FIELD_DESC);
+        oprot.writeString(struct.name);
+        oprot.writeFieldEnd();
+      }
+      if (struct.value != null) {
+        oprot.writeFieldBegin(VALUE_FIELD_DESC);
+        oprot.writeString(struct.value);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ColumnTupleSchemeFactory implements SchemeFactory {
+    public ColumnTupleScheme getScheme() {
+      return new ColumnTupleScheme();
+    }
+  }
+
+  private static class ColumnTupleScheme extends TupleScheme<Column> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, Column struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetName()) {
+        optionals.set(0);
+      }
+      if (struct.isSetValue()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetName()) {
+        oprot.writeString(struct.name);
+      }
+      if (struct.isSetValue()) {
+        oprot.writeString(struct.value);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, Column struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.name = iprot.readString();
+        struct.setNameIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.value = iprot.readString();
+        struct.setValueIsSet(true);
+      }
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1befa5f5/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
index 6293e28..9c48485 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnDefinition.java
@@ -1,7 +1,8 @@
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package org.apache.blur.thrift.generated;
 
@@ -24,6 +25,15 @@ package org.apache.blur.thrift.generated;
 
 
 
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -49,6 +59,12 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
   private static final org.apache.thrift.protocol.TField FULL_TEXT_INDEX_FIELD_DESC = new org.apache.thrift.protocol.TField("fullTextIndex", org.apache.thrift.protocol.TType.BOOL, (short)2);
   private static final org.apache.thrift.protocol.TField ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("alternateColumnDefinitions", org.apache.thrift.protocol.TType.MAP, (short)3);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ColumnDefinitionStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ColumnDefinitionTupleSchemeFactory());
+  }
+
   public String analyzerClassName; // required
   public boolean fullTextIndex; // required
   public Map<String,AlternateColumnDefinition> alternateColumnDefinitions; // required
@@ -119,8 +135,7 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
 
   // isset id assignments
   private static final int __FULLTEXTINDEX_ISSET_ID = 0;
-  private BitSet __isset_bit_vector = new BitSet(1);
-
+  private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -157,8 +172,7 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
    * Performs a deep copy on <i>other</i>.
    */
   public ColumnDefinition(ColumnDefinition other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
+    __isset_bitfield = other.__isset_bitfield;
     if (other.isSetAnalyzerClassName()) {
       this.analyzerClassName = other.analyzerClassName;
     }
@@ -228,16 +242,16 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
   }
 
   public void unsetFullTextIndex() {
-    __isset_bit_vector.clear(__FULLTEXTINDEX_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __FULLTEXTINDEX_ISSET_ID);
   }
 
   /** Returns true if field fullTextIndex is set (has been assigned a value) and false otherwise */
   public boolean isSetFullTextIndex() {
-    return __isset_bit_vector.get(__FULLTEXTINDEX_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __FULLTEXTINDEX_ISSET_ID);
   }
 
   public void setFullTextIndexIsSet(boolean value) {
-    __isset_bit_vector.set(__FULLTEXTINDEX_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __FULLTEXTINDEX_ISSET_ID, value);
   }
 
   public int getAlternateColumnDefinitionsSize() {
@@ -430,88 +444,11 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // ANALYZER_CLASS_NAME
-          if (field.type == org.apache.thrift.protocol.TType.STRING) {
-            this.analyzerClassName = iprot.readString();
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // FULL_TEXT_INDEX
-          if (field.type == org.apache.thrift.protocol.TType.BOOL) {
-            this.fullTextIndex = iprot.readBool();
-            setFullTextIndexIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 3: // ALTERNATE_COLUMN_DEFINITIONS
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map60 = iprot.readMapBegin();
-              this.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>(2*_map60.size);
-              for (int _i61 = 0; _i61 < _map60.size; ++_i61)
-              {
-                String _key62; // required
-                AlternateColumnDefinition _val63; // required
-                _key62 = iprot.readString();
-                _val63 = new AlternateColumnDefinition();
-                _val63.read(iprot);
-                this.alternateColumnDefinitions.put(_key62, _val63);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.analyzerClassName != null) {
-      oprot.writeFieldBegin(ANALYZER_CLASS_NAME_FIELD_DESC);
-      oprot.writeString(this.analyzerClassName);
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldBegin(FULL_TEXT_INDEX_FIELD_DESC);
-    oprot.writeBool(this.fullTextIndex);
-    oprot.writeFieldEnd();
-    if (this.alternateColumnDefinitions != null) {
-      oprot.writeFieldBegin(ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.alternateColumnDefinitions.size()));
-        for (Map.Entry<String, AlternateColumnDefinition> _iter64 : this.alternateColumnDefinitions.entrySet())
-        {
-          oprot.writeString(_iter64.getKey());
-          _iter64.getValue().write(oprot);
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -544,6 +481,7 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -557,12 +495,180 @@ public class ColumnDefinition implements org.apache.thrift.TBase<ColumnDefinitio
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
+  private static class ColumnDefinitionStandardSchemeFactory implements SchemeFactory {
+    public ColumnDefinitionStandardScheme getScheme() {
+      return new ColumnDefinitionStandardScheme();
+    }
+  }
+
+  private static class ColumnDefinitionStandardScheme extends StandardScheme<ColumnDefinition> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnDefinition struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // ANALYZER_CLASS_NAME
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.analyzerClassName = iprot.readString();
+              struct.setAnalyzerClassNameIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // FULL_TEXT_INDEX
+            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
+              struct.fullTextIndex = iprot.readBool();
+              struct.setFullTextIndexIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // ALTERNATE_COLUMN_DEFINITIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              {
+                org.apache.thrift.protocol.TMap _map120 = iprot.readMapBegin();
+                struct.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>(2*_map120.size);
+                for (int _i121 = 0; _i121 < _map120.size; ++_i121)
+                {
+                  String _key122; // required
+                  AlternateColumnDefinition _val123; // optional
+                  _key122 = iprot.readString();
+                  _val123 = new AlternateColumnDefinition();
+                  _val123.read(iprot);
+                  struct.alternateColumnDefinitions.put(_key122, _val123);
+                }
+                iprot.readMapEnd();
+              }
+              struct.setAlternateColumnDefinitionsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnDefinition struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.analyzerClassName != null) {
+        oprot.writeFieldBegin(ANALYZER_CLASS_NAME_FIELD_DESC);
+        oprot.writeString(struct.analyzerClassName);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(FULL_TEXT_INDEX_FIELD_DESC);
+      oprot.writeBool(struct.fullTextIndex);
+      oprot.writeFieldEnd();
+      if (struct.alternateColumnDefinitions != null) {
+        oprot.writeFieldBegin(ALTERNATE_COLUMN_DEFINITIONS_FIELD_DESC);
+        {
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.alternateColumnDefinitions.size()));
+          for (Map.Entry<String, AlternateColumnDefinition> _iter124 : struct.alternateColumnDefinitions.entrySet())
+          {
+            oprot.writeString(_iter124.getKey());
+            _iter124.getValue().write(oprot);
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ColumnDefinitionTupleSchemeFactory implements SchemeFactory {
+    public ColumnDefinitionTupleScheme getScheme() {
+      return new ColumnDefinitionTupleScheme();
+    }
+  }
+
+  private static class ColumnDefinitionTupleScheme extends TupleScheme<ColumnDefinition> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnDefinition struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetAnalyzerClassName()) {
+        optionals.set(0);
+      }
+      if (struct.isSetFullTextIndex()) {
+        optionals.set(1);
+      }
+      if (struct.isSetAlternateColumnDefinitions()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetAnalyzerClassName()) {
+        oprot.writeString(struct.analyzerClassName);
+      }
+      if (struct.isSetFullTextIndex()) {
+        oprot.writeBool(struct.fullTextIndex);
+      }
+      if (struct.isSetAlternateColumnDefinitions()) {
+        {
+          oprot.writeI32(struct.alternateColumnDefinitions.size());
+          for (Map.Entry<String, AlternateColumnDefinition> _iter125 : struct.alternateColumnDefinitions.entrySet())
+          {
+            oprot.writeString(_iter125.getKey());
+            _iter125.getValue().write(oprot);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnDefinition struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(3);
+      if (incoming.get(0)) {
+        struct.analyzerClassName = iprot.readString();
+        struct.setAnalyzerClassNameIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.fullTextIndex = iprot.readBool();
+        struct.setFullTextIndexIsSet(true);
+      }
+      if (incoming.get(2)) {
+        {
+          org.apache.thrift.protocol.TMap _map126 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.alternateColumnDefinitions = new HashMap<String,AlternateColumnDefinition>(2*_map126.size);
+          for (int _i127 = 0; _i127 < _map126.size; ++_i127)
+          {
+            String _key128; // required
+            AlternateColumnDefinition _val129; // optional
+            _key128 = iprot.readString();
+            _val129 = new AlternateColumnDefinition();
+            _val129.read(iprot);
+            struct.alternateColumnDefinitions.put(_key128, _val129);
+          }
+        }
+        struct.setAlternateColumnDefinitionsIsSet(true);
+      }
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1befa5f5/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
index 44a2ed9..926b7a2 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnFamilyDefinition.java
@@ -1,7 +1,8 @@
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package org.apache.blur.thrift.generated;
 
@@ -24,6 +25,15 @@ package org.apache.blur.thrift.generated;
 
 
 
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -48,6 +58,12 @@ public class ColumnFamilyDefinition implements org.apache.thrift.TBase<ColumnFam
   private static final org.apache.thrift.protocol.TField DEFAULT_DEFINITION_FIELD_DESC = new org.apache.thrift.protocol.TField("defaultDefinition", org.apache.thrift.protocol.TType.STRUCT, (short)1);
   private static final org.apache.thrift.protocol.TField COLUMN_DEFINITIONS_FIELD_DESC = new org.apache.thrift.protocol.TField("columnDefinitions", org.apache.thrift.protocol.TType.MAP, (short)2);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ColumnFamilyDefinitionStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ColumnFamilyDefinitionTupleSchemeFactory());
+  }
+
   /**
    * 
    */
@@ -125,7 +141,6 @@ public class ColumnFamilyDefinition implements org.apache.thrift.TBase<ColumnFam
   }
 
   // isset id assignments
-
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -379,78 +394,11 @@ public class ColumnFamilyDefinition implements org.apache.thrift.TBase<ColumnFam
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // DEFAULT_DEFINITION
-          if (field.type == org.apache.thrift.protocol.TType.STRUCT) {
-            this.defaultDefinition = new ColumnDefinition();
-            this.defaultDefinition.read(iprot);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // COLUMN_DEFINITIONS
-          if (field.type == org.apache.thrift.protocol.TType.MAP) {
-            {
-              org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
-              this.columnDefinitions = new HashMap<String,ColumnDefinition>(2*_map65.size);
-              for (int _i66 = 0; _i66 < _map65.size; ++_i66)
-              {
-                String _key67; // required
-                ColumnDefinition _val68; // required
-                _key67 = iprot.readString();
-                _val68 = new ColumnDefinition();
-                _val68.read(iprot);
-                this.columnDefinitions.put(_key67, _val68);
-              }
-              iprot.readMapEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.defaultDefinition != null) {
-      oprot.writeFieldBegin(DEFAULT_DEFINITION_FIELD_DESC);
-      this.defaultDefinition.write(oprot);
-      oprot.writeFieldEnd();
-    }
-    if (this.columnDefinitions != null) {
-      oprot.writeFieldBegin(COLUMN_DEFINITIONS_FIELD_DESC);
-      {
-        oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, this.columnDefinitions.size()));
-        for (Map.Entry<String, ColumnDefinition> _iter69 : this.columnDefinitions.entrySet())
-        {
-          oprot.writeString(_iter69.getKey());
-          _iter69.getValue().write(oprot);
-        }
-        oprot.writeMapEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -479,6 +427,10 @@ public class ColumnFamilyDefinition implements org.apache.thrift.TBase<ColumnFam
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    // check for sub-struct validity
+    if (defaultDefinition != null) {
+      defaultDefinition.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -497,5 +449,154 @@ public class ColumnFamilyDefinition implements org.apache.thrift.TBase<ColumnFam
     }
   }
 
+  private static class ColumnFamilyDefinitionStandardSchemeFactory implements SchemeFactory {
+    public ColumnFamilyDefinitionStandardScheme getScheme() {
+      return new ColumnFamilyDefinitionStandardScheme();
+    }
+  }
+
+  private static class ColumnFamilyDefinitionStandardScheme extends StandardScheme<ColumnFamilyDefinition> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnFamilyDefinition struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // DEFAULT_DEFINITION
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.defaultDefinition = new ColumnDefinition();
+              struct.defaultDefinition.read(iprot);
+              struct.setDefaultDefinitionIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // COLUMN_DEFINITIONS
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              {
+                org.apache.thrift.protocol.TMap _map130 = iprot.readMapBegin();
+                struct.columnDefinitions = new HashMap<String,ColumnDefinition>(2*_map130.size);
+                for (int _i131 = 0; _i131 < _map130.size; ++_i131)
+                {
+                  String _key132; // required
+                  ColumnDefinition _val133; // optional
+                  _key132 = iprot.readString();
+                  _val133 = new ColumnDefinition();
+                  _val133.read(iprot);
+                  struct.columnDefinitions.put(_key132, _val133);
+                }
+                iprot.readMapEnd();
+              }
+              struct.setColumnDefinitionsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnFamilyDefinition struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.defaultDefinition != null) {
+        oprot.writeFieldBegin(DEFAULT_DEFINITION_FIELD_DESC);
+        struct.defaultDefinition.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      if (struct.columnDefinitions != null) {
+        oprot.writeFieldBegin(COLUMN_DEFINITIONS_FIELD_DESC);
+        {
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.columnDefinitions.size()));
+          for (Map.Entry<String, ColumnDefinition> _iter134 : struct.columnDefinitions.entrySet())
+          {
+            oprot.writeString(_iter134.getKey());
+            _iter134.getValue().write(oprot);
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ColumnFamilyDefinitionTupleSchemeFactory implements SchemeFactory {
+    public ColumnFamilyDefinitionTupleScheme getScheme() {
+      return new ColumnFamilyDefinitionTupleScheme();
+    }
+  }
+
+  private static class ColumnFamilyDefinitionTupleScheme extends TupleScheme<ColumnFamilyDefinition> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnFamilyDefinition struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetDefaultDefinition()) {
+        optionals.set(0);
+      }
+      if (struct.isSetColumnDefinitions()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetDefaultDefinition()) {
+        struct.defaultDefinition.write(oprot);
+      }
+      if (struct.isSetColumnDefinitions()) {
+        {
+          oprot.writeI32(struct.columnDefinitions.size());
+          for (Map.Entry<String, ColumnDefinition> _iter135 : struct.columnDefinitions.entrySet())
+          {
+            oprot.writeString(_iter135.getKey());
+            _iter135.getValue().write(oprot);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnFamilyDefinition struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.defaultDefinition = new ColumnDefinition();
+        struct.defaultDefinition.read(iprot);
+        struct.setDefaultDefinitionIsSet(true);
+      }
+      if (incoming.get(1)) {
+        {
+          org.apache.thrift.protocol.TMap _map136 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.columnDefinitions = new HashMap<String,ColumnDefinition>(2*_map136.size);
+          for (int _i137 = 0; _i137 < _map136.size; ++_i137)
+          {
+            String _key138; // required
+            ColumnDefinition _val139; // optional
+            _key138 = iprot.readString();
+            _val139 = new ColumnDefinition();
+            _val139.read(iprot);
+            struct.columnDefinitions.put(_key138, _val139);
+          }
+        }
+        struct.setColumnDefinitionsIsSet(true);
+      }
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1befa5f5/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnPreCache.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnPreCache.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnPreCache.java
index c68cfd2..482acfb 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnPreCache.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ColumnPreCache.java
@@ -1,7 +1,8 @@
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package org.apache.blur.thrift.generated;
 
@@ -24,6 +25,15 @@ package org.apache.blur.thrift.generated;
 
 
 
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -47,6 +57,12 @@ public class ColumnPreCache implements org.apache.thrift.TBase<ColumnPreCache, C
 
   private static final org.apache.thrift.protocol.TField PRE_CACHE_COLS_FIELD_DESC = new org.apache.thrift.protocol.TField("preCacheCols", org.apache.thrift.protocol.TType.LIST, (short)1);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new ColumnPreCacheStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new ColumnPreCacheTupleSchemeFactory());
+  }
+
   /**
    * This map sets what column families and columns to prefetch into block cache on shard open.
    */
@@ -114,7 +130,6 @@ public class ColumnPreCache implements org.apache.thrift.TBase<ColumnPreCache, C
   }
 
   // isset id assignments
-
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -293,61 +308,11 @@ public class ColumnPreCache implements org.apache.thrift.TBase<ColumnPreCache, C
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // PRE_CACHE_COLS
-          if (field.type == org.apache.thrift.protocol.TType.LIST) {
-            {
-              org.apache.thrift.protocol.TList _list75 = iprot.readListBegin();
-              this.preCacheCols = new ArrayList<String>(_list75.size);
-              for (int _i76 = 0; _i76 < _list75.size; ++_i76)
-              {
-                String _elem77; // required
-                _elem77 = iprot.readString();
-                this.preCacheCols.add(_elem77);
-              }
-              iprot.readListEnd();
-            }
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    if (this.preCacheCols != null) {
-      oprot.writeFieldBegin(PRE_CACHE_COLS_FIELD_DESC);
-      {
-        oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, this.preCacheCols.size()));
-        for (String _iter78 : this.preCacheCols)
-        {
-          oprot.writeString(_iter78);
-        }
-        oprot.writeListEnd();
-      }
-      oprot.writeFieldEnd();
-    }
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -368,6 +333,7 @@ public class ColumnPreCache implements org.apache.thrift.TBase<ColumnPreCache, C
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -386,5 +352,121 @@ public class ColumnPreCache implements org.apache.thrift.TBase<ColumnPreCache, C
     }
   }
 
+  private static class ColumnPreCacheStandardSchemeFactory implements SchemeFactory {
+    public ColumnPreCacheStandardScheme getScheme() {
+      return new ColumnPreCacheStandardScheme();
+    }
+  }
+
+  private static class ColumnPreCacheStandardScheme extends StandardScheme<ColumnPreCache> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, ColumnPreCache struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // PRE_CACHE_COLS
+            if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
+              {
+                org.apache.thrift.protocol.TList _list150 = iprot.readListBegin();
+                struct.preCacheCols = new ArrayList<String>(_list150.size);
+                for (int _i151 = 0; _i151 < _list150.size; ++_i151)
+                {
+                  String _elem152; // required
+                  _elem152 = iprot.readString();
+                  struct.preCacheCols.add(_elem152);
+                }
+                iprot.readListEnd();
+              }
+              struct.setPreCacheColsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, ColumnPreCache struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.preCacheCols != null) {
+        oprot.writeFieldBegin(PRE_CACHE_COLS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.preCacheCols.size()));
+          for (String _iter153 : struct.preCacheCols)
+          {
+            oprot.writeString(_iter153);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class ColumnPreCacheTupleSchemeFactory implements SchemeFactory {
+    public ColumnPreCacheTupleScheme getScheme() {
+      return new ColumnPreCacheTupleScheme();
+    }
+  }
+
+  private static class ColumnPreCacheTupleScheme extends TupleScheme<ColumnPreCache> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, ColumnPreCache struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetPreCacheCols()) {
+        optionals.set(0);
+      }
+      oprot.writeBitSet(optionals, 1);
+      if (struct.isSetPreCacheCols()) {
+        {
+          oprot.writeI32(struct.preCacheCols.size());
+          for (String _iter154 : struct.preCacheCols)
+          {
+            oprot.writeString(_iter154);
+          }
+        }
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, ColumnPreCache struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(1);
+      if (incoming.get(0)) {
+        {
+          org.apache.thrift.protocol.TList _list155 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.preCacheCols = new ArrayList<String>(_list155.size);
+          for (int _i156 = 0; _i156 < _list155.size; ++_i156)
+          {
+            String _elem157; // required
+            _elem157 = iprot.readString();
+            struct.preCacheCols.add(_elem157);
+          }
+        }
+        struct.setPreCacheColsIsSet(true);
+      }
+    }
+  }
+
 }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/1befa5f5/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/CpuTime.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/CpuTime.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/CpuTime.java
index 8b4a4f4..02f457f 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/CpuTime.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/CpuTime.java
@@ -1,7 +1,8 @@
 /**
- * Autogenerated by Thrift Compiler (0.7.0)
+ * Autogenerated by Thrift Compiler (0.9.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
+ *  @generated
  */
 package org.apache.blur.thrift.generated;
 
@@ -24,6 +25,15 @@ package org.apache.blur.thrift.generated;
 
 
 
+import org.apache.thrift.scheme.IScheme;
+import org.apache.thrift.scheme.SchemeFactory;
+import org.apache.thrift.scheme.StandardScheme;
+
+import org.apache.thrift.scheme.TupleScheme;
+import org.apache.thrift.protocol.TTupleProtocol;
+import org.apache.thrift.protocol.TProtocolException;
+import org.apache.thrift.EncodingUtils;
+import org.apache.thrift.TException;
 import java.util.List;
 import java.util.ArrayList;
 import java.util.Map;
@@ -48,6 +58,12 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
   private static final org.apache.thrift.protocol.TField CPU_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("cpuTime", org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField REAL_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("realTime", org.apache.thrift.protocol.TType.I64, (short)2);
 
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new CpuTimeStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new CpuTimeTupleSchemeFactory());
+  }
+
   /**
    * 
    */
@@ -127,8 +143,7 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
   // isset id assignments
   private static final int __CPUTIME_ISSET_ID = 0;
   private static final int __REALTIME_ISSET_ID = 1;
-  private BitSet __isset_bit_vector = new BitSet(2);
-
+  private byte __isset_bitfield = 0;
   public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
     Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
@@ -158,8 +173,7 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
    * Performs a deep copy on <i>other</i>.
    */
   public CpuTime(CpuTime other) {
-    __isset_bit_vector.clear();
-    __isset_bit_vector.or(other.__isset_bit_vector);
+    __isset_bitfield = other.__isset_bitfield;
     this.cpuTime = other.cpuTime;
     this.realTime = other.realTime;
   }
@@ -193,16 +207,16 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
   }
 
   public void unsetCpuTime() {
-    __isset_bit_vector.clear(__CPUTIME_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __CPUTIME_ISSET_ID);
   }
 
   /** Returns true if field cpuTime is set (has been assigned a value) and false otherwise */
   public boolean isSetCpuTime() {
-    return __isset_bit_vector.get(__CPUTIME_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __CPUTIME_ISSET_ID);
   }
 
   public void setCpuTimeIsSet(boolean value) {
-    __isset_bit_vector.set(__CPUTIME_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CPUTIME_ISSET_ID, value);
   }
 
   /**
@@ -222,16 +236,16 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
   }
 
   public void unsetRealTime() {
-    __isset_bit_vector.clear(__REALTIME_ISSET_ID);
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __REALTIME_ISSET_ID);
   }
 
   /** Returns true if field realTime is set (has been assigned a value) and false otherwise */
   public boolean isSetRealTime() {
-    return __isset_bit_vector.get(__REALTIME_ISSET_ID);
+    return EncodingUtils.testBit(__isset_bitfield, __REALTIME_ISSET_ID);
   }
 
   public void setRealTimeIsSet(boolean value) {
-    __isset_bit_vector.set(__REALTIME_ISSET_ID, value);
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REALTIME_ISSET_ID, value);
   }
 
   public void setFieldValue(_Fields field, Object value) {
@@ -357,54 +371,11 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
   }
 
   public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    org.apache.thrift.protocol.TField field;
-    iprot.readStructBegin();
-    while (true)
-    {
-      field = iprot.readFieldBegin();
-      if (field.type == org.apache.thrift.protocol.TType.STOP) { 
-        break;
-      }
-      switch (field.id) {
-        case 1: // CPU_TIME
-          if (field.type == org.apache.thrift.protocol.TType.I64) {
-            this.cpuTime = iprot.readI64();
-            setCpuTimeIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        case 2: // REAL_TIME
-          if (field.type == org.apache.thrift.protocol.TType.I64) {
-            this.realTime = iprot.readI64();
-            setRealTimeIsSet(true);
-          } else { 
-            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-          }
-          break;
-        default:
-          org.apache.thrift.protocol.TProtocolUtil.skip(iprot, field.type);
-      }
-      iprot.readFieldEnd();
-    }
-    iprot.readStructEnd();
-
-    // check for required fields of primitive type, which can't be checked in the validate method
-    validate();
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
   }
 
   public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    validate();
-
-    oprot.writeStructBegin(STRUCT_DESC);
-    oprot.writeFieldBegin(CPU_TIME_FIELD_DESC);
-    oprot.writeI64(this.cpuTime);
-    oprot.writeFieldEnd();
-    oprot.writeFieldBegin(REAL_TIME_FIELD_DESC);
-    oprot.writeI64(this.realTime);
-    oprot.writeFieldEnd();
-    oprot.writeFieldStop();
-    oprot.writeStructEnd();
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
   }
 
   @Override
@@ -425,6 +396,7 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
 
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
+    // check for sub-struct validity
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -438,12 +410,115 @@ public class CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields
   private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
     try {
       // it doesn't seem like you should have to do this, but java serialization is wacky, and doesn't call the default constructor.
-      __isset_bit_vector = new BitSet(1);
+      __isset_bitfield = 0;
       read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
     } catch (org.apache.thrift.TException te) {
       throw new java.io.IOException(te);
     }
   }
 
+  private static class CpuTimeStandardSchemeFactory implements SchemeFactory {
+    public CpuTimeStandardScheme getScheme() {
+      return new CpuTimeStandardScheme();
+    }
+  }
+
+  private static class CpuTimeStandardScheme extends StandardScheme<CpuTime> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, CpuTime struct) throws org.apache.thrift.TException {
+      org.apache.thrift.protocol.TField schemeField;
+      iprot.readStructBegin();
+      while (true)
+      {
+        schemeField = iprot.readFieldBegin();
+        if (schemeField.type == org.apache.thrift.protocol.TType.STOP) { 
+          break;
+        }
+        switch (schemeField.id) {
+          case 1: // CPU_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.cpuTime = iprot.readI64();
+              struct.setCpuTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // REAL_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.realTime = iprot.readI64();
+              struct.setRealTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          default:
+            org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+        }
+        iprot.readFieldEnd();
+      }
+      iprot.readStructEnd();
+
+      // check for required fields of primitive type, which can't be checked in the validate method
+      struct.validate();
+    }
+
+    public void write(org.apache.thrift.protocol.TProtocol oprot, CpuTime struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(CPU_TIME_FIELD_DESC);
+      oprot.writeI64(struct.cpuTime);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(REAL_TIME_FIELD_DESC);
+      oprot.writeI64(struct.realTime);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class CpuTimeTupleSchemeFactory implements SchemeFactory {
+    public CpuTimeTupleScheme getScheme() {
+      return new CpuTimeTupleScheme();
+    }
+  }
+
+  private static class CpuTimeTupleScheme extends TupleScheme<CpuTime> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, CpuTime struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetCpuTime()) {
+        optionals.set(0);
+      }
+      if (struct.isSetRealTime()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetCpuTime()) {
+        oprot.writeI64(struct.cpuTime);
+      }
+      if (struct.isSetRealTime()) {
+        oprot.writeI64(struct.realTime);
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, CpuTime struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.cpuTime = iprot.readI64();
+        struct.setCpuTimeIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.realTime = iprot.readI64();
+        struct.setRealTimeIsSet(true);
+      }
+    }
+  }
+
 }
 


Mime
View raw message