incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [7/27] Massive changes to the the thrift API. Getting closer to the final version, this commit also removes the controller from the architecture.
Date Sun, 18 Nov 2012 00:52:58 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java b/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
index 28498a6..3ce0c09 100644
--- a/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
+++ b/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
@@ -52,14 +52,15 @@ import org.slf4j.LoggerFactory;
 public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._Fields>, java.io.Serializable, Cloneable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QueryArgs");
 
-  private static final org.apache.thrift.protocol.TField AFTER_FIELD_DESC = new org.apache.thrift.protocol.TField("after", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)2);
-  private static final org.apache.thrift.protocol.TField FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("filter", org.apache.thrift.protocol.TType.STRING, (short)3);
-  private static final org.apache.thrift.protocol.TField NUMBER_TO_FETCH_FIELD_DESC = new org.apache.thrift.protocol.TField("numberToFetch", org.apache.thrift.protocol.TType.I32, (short)4);
-  private static final org.apache.thrift.protocol.TField SORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sort", org.apache.thrift.protocol.TType.STRUCT, (short)5);
-  private static final org.apache.thrift.protocol.TField DO_DOC_SCORES_FIELD_DESC = new org.apache.thrift.protocol.TField("doDocScores", org.apache.thrift.protocol.TType.BOOL, (short)6);
-  private static final org.apache.thrift.protocol.TField DO_MAX_SCORE_FIELD_DESC = new org.apache.thrift.protocol.TField("doMaxScore", org.apache.thrift.protocol.TType.BOOL, (short)7);
-  private static final org.apache.thrift.protocol.TField SHARD_INDEXES_FIELD_DESC = new org.apache.thrift.protocol.TField("shardIndexes", org.apache.thrift.protocol.TType.LIST, (short)8);
+  private static final org.apache.thrift.protocol.TField ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField AFTER_FIELD_DESC = new org.apache.thrift.protocol.TField("after", org.apache.thrift.protocol.TType.STRUCT, (short)2);
+  private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)3);
+  private static final org.apache.thrift.protocol.TField FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("filter", org.apache.thrift.protocol.TType.STRING, (short)4);
+  private static final org.apache.thrift.protocol.TField NUMBER_TO_FETCH_FIELD_DESC = new org.apache.thrift.protocol.TField("numberToFetch", org.apache.thrift.protocol.TType.I32, (short)5);
+  private static final org.apache.thrift.protocol.TField SORT_FIELD_DESC = new org.apache.thrift.protocol.TField("sort", org.apache.thrift.protocol.TType.STRUCT, (short)6);
+  private static final org.apache.thrift.protocol.TField DO_DOC_SCORES_FIELD_DESC = new org.apache.thrift.protocol.TField("doDocScores", org.apache.thrift.protocol.TType.BOOL, (short)7);
+  private static final org.apache.thrift.protocol.TField DO_MAX_SCORE_FIELD_DESC = new org.apache.thrift.protocol.TField("doMaxScore", org.apache.thrift.protocol.TType.BOOL, (short)8);
+  private static final org.apache.thrift.protocol.TField SHARD_INDEXES_FIELD_DESC = new org.apache.thrift.protocol.TField("shardIndexes", org.apache.thrift.protocol.TType.LIST, (short)9);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -67,6 +68,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     schemes.put(TupleScheme.class, new QueryArgsTupleSchemeFactory());
   }
 
+  public long id; // required
   public ScoreDoc after; // required
   public ByteBuffer query; // required
   public ByteBuffer filter; // required
@@ -78,14 +80,15 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    AFTER((short)1, "after"),
-    QUERY((short)2, "query"),
-    FILTER((short)3, "filter"),
-    NUMBER_TO_FETCH((short)4, "numberToFetch"),
-    SORT((short)5, "sort"),
-    DO_DOC_SCORES((short)6, "doDocScores"),
-    DO_MAX_SCORE((short)7, "doMaxScore"),
-    SHARD_INDEXES((short)8, "shardIndexes");
+    ID((short)1, "id"),
+    AFTER((short)2, "after"),
+    QUERY((short)3, "query"),
+    FILTER((short)4, "filter"),
+    NUMBER_TO_FETCH((short)5, "numberToFetch"),
+    SORT((short)6, "sort"),
+    DO_DOC_SCORES((short)7, "doDocScores"),
+    DO_MAX_SCORE((short)8, "doMaxScore"),
+    SHARD_INDEXES((short)9, "shardIndexes");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -100,21 +103,23 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // AFTER
+        case 1: // ID
+          return ID;
+        case 2: // AFTER
           return AFTER;
-        case 2: // QUERY
+        case 3: // QUERY
           return QUERY;
-        case 3: // FILTER
+        case 4: // FILTER
           return FILTER;
-        case 4: // NUMBER_TO_FETCH
+        case 5: // NUMBER_TO_FETCH
           return NUMBER_TO_FETCH;
-        case 5: // SORT
+        case 6: // SORT
           return SORT;
-        case 6: // DO_DOC_SCORES
+        case 7: // DO_DOC_SCORES
           return DO_DOC_SCORES;
-        case 7: // DO_MAX_SCORE
+        case 8: // DO_MAX_SCORE
           return DO_MAX_SCORE;
-        case 8: // SHARD_INDEXES
+        case 9: // SHARD_INDEXES
           return SHARD_INDEXES;
         default:
           return null;
@@ -156,13 +161,16 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   }
 
   // isset id assignments
-  private static final int __NUMBERTOFETCH_ISSET_ID = 0;
-  private static final int __DODOCSCORES_ISSET_ID = 1;
-  private static final int __DOMAXSCORE_ISSET_ID = 2;
+  private static final int __ID_ISSET_ID = 0;
+  private static final int __NUMBERTOFETCH_ISSET_ID = 1;
+  private static final int __DODOCSCORES_ISSET_ID = 2;
+  private static final int __DOMAXSCORE_ISSET_ID = 3;
   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);
+    tmpMap.put(_Fields.ID, new org.apache.thrift.meta_data.FieldMetaData("id", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     tmpMap.put(_Fields.AFTER, new org.apache.thrift.meta_data.FieldMetaData("after", org.apache.thrift.TFieldRequirementType.DEFAULT, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, ScoreDoc.class)));
     tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.DEFAULT, 
@@ -185,9 +193,16 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   }
 
   public QueryArgs() {
+    this.numberToFetch = 100;
+
+    this.doDocScores = true;
+
+    this.doMaxScore = false;
+
   }
 
   public QueryArgs(
+    long id,
     ScoreDoc after,
     ByteBuffer query,
     ByteBuffer filter,
@@ -198,6 +213,8 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     List<Integer> shardIndexes)
   {
     this();
+    this.id = id;
+    setIdIsSet(true);
     this.after = after;
     this.query = query;
     this.filter = filter;
@@ -216,6 +233,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
    */
   public QueryArgs(QueryArgs other) {
     __isset_bitfield = other.__isset_bitfield;
+    this.id = other.id;
     if (other.isSetAfter()) {
       this.after = new ScoreDoc(other.after);
     }
@@ -248,19 +266,44 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
 
   @Override
   public void clear() {
+    setIdIsSet(false);
+    this.id = 0;
     this.after = null;
     this.query = null;
     this.filter = null;
-    setNumberToFetchIsSet(false);
-    this.numberToFetch = 0;
+    this.numberToFetch = 100;
+
     this.sort = null;
-    setDoDocScoresIsSet(false);
-    this.doDocScores = false;
-    setDoMaxScoreIsSet(false);
+    this.doDocScores = true;
+
     this.doMaxScore = false;
+
     this.shardIndexes = null;
   }
 
+  public long getId() {
+    return this.id;
+  }
+
+  public QueryArgs setId(long id) {
+    this.id = id;
+    setIdIsSet(true);
+    return this;
+  }
+
+  public void unsetId() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
+  }
+
+  /** Returns true if field id is set (has been assigned a value) and false otherwise */
+  public boolean isSetId() {
+    return EncodingUtils.testBit(__isset_bitfield, __ID_ISSET_ID);
+  }
+
+  public void setIdIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
+  }
+
   public ScoreDoc getAfter() {
     return this.after;
   }
@@ -487,6 +530,14 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
+    case ID:
+      if (value == null) {
+        unsetId();
+      } else {
+        setId((Long)value);
+      }
+      break;
+
     case AFTER:
       if (value == null) {
         unsetAfter();
@@ -556,6 +607,9 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
+    case ID:
+      return Long.valueOf(getId());
+
     case AFTER:
       return getAfter();
 
@@ -591,6 +645,8 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     }
 
     switch (field) {
+    case ID:
+      return isSetId();
     case AFTER:
       return isSetAfter();
     case QUERY:
@@ -624,6 +680,15 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     if (that == null)
       return false;
 
+    boolean this_present_id = true;
+    boolean that_present_id = true;
+    if (this_present_id || that_present_id) {
+      if (!(this_present_id && that_present_id))
+        return false;
+      if (this.id != that.id)
+        return false;
+    }
+
     boolean this_present_after = true && this.isSetAfter();
     boolean that_present_after = true && that.isSetAfter();
     if (this_present_after || that_present_after) {
@@ -712,6 +777,16 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     int lastComparison = 0;
     QueryArgs typedOther = (QueryArgs)other;
 
+    lastComparison = Boolean.valueOf(isSetId()).compareTo(typedOther.isSetId());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetId()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.id, typedOther.id);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     lastComparison = Boolean.valueOf(isSetAfter()).compareTo(typedOther.isSetAfter());
     if (lastComparison != 0) {
       return lastComparison;
@@ -812,6 +887,10 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     StringBuilder sb = new StringBuilder("QueryArgs(");
     boolean first = true;
 
+    sb.append("id:");
+    sb.append(this.id);
+    first = false;
+    if (!first) sb.append(", ");
     sb.append("after:");
     if (this.after == null) {
       sb.append("null");
@@ -914,7 +993,15 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
           break;
         }
         switch (schemeField.id) {
-          case 1: // AFTER
+          case 1: // ID
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.id = iprot.readI64();
+              struct.setIdIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // AFTER
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.after = new ScoreDoc();
               struct.after.read(iprot);
@@ -923,7 +1010,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // QUERY
+          case 3: // QUERY
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.query = iprot.readBinary();
               struct.setQueryIsSet(true);
@@ -931,7 +1018,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // FILTER
+          case 4: // FILTER
             if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
               struct.filter = iprot.readBinary();
               struct.setFilterIsSet(true);
@@ -939,7 +1026,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // NUMBER_TO_FETCH
+          case 5: // NUMBER_TO_FETCH
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.numberToFetch = iprot.readI32();
               struct.setNumberToFetchIsSet(true);
@@ -947,7 +1034,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 5: // SORT
+          case 6: // SORT
             if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
               struct.sort = new Sort();
               struct.sort.read(iprot);
@@ -956,7 +1043,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 6: // DO_DOC_SCORES
+          case 7: // DO_DOC_SCORES
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.doDocScores = iprot.readBool();
               struct.setDoDocScoresIsSet(true);
@@ -964,7 +1051,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 7: // DO_MAX_SCORE
+          case 8: // DO_MAX_SCORE
             if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
               struct.doMaxScore = iprot.readBool();
               struct.setDoMaxScoreIsSet(true);
@@ -972,16 +1059,16 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 8: // SHARD_INDEXES
+          case 9: // SHARD_INDEXES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list100 = iprot.readListBegin();
-                struct.shardIndexes = new ArrayList<Integer>(_list100.size);
-                for (int _i101 = 0; _i101 < _list100.size; ++_i101)
+                org.apache.thrift.protocol.TList _list80 = iprot.readListBegin();
+                struct.shardIndexes = new ArrayList<Integer>(_list80.size);
+                for (int _i81 = 0; _i81 < _list80.size; ++_i81)
                 {
-                  int _elem102; // required
-                  _elem102 = iprot.readI32();
-                  struct.shardIndexes.add(_elem102);
+                  int _elem82; // required
+                  _elem82 = iprot.readI32();
+                  struct.shardIndexes.add(_elem82);
                 }
                 iprot.readListEnd();
               }
@@ -1005,6 +1092,9 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
+      oprot.writeFieldBegin(ID_FIELD_DESC);
+      oprot.writeI64(struct.id);
+      oprot.writeFieldEnd();
       if (struct.after != null) {
         oprot.writeFieldBegin(AFTER_FIELD_DESC);
         struct.after.write(oprot);
@@ -1038,9 +1128,9 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
         oprot.writeFieldBegin(SHARD_INDEXES_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.shardIndexes.size()));
-          for (int _iter103 : struct.shardIndexes)
+          for (int _iter83 : struct.shardIndexes)
           {
-            oprot.writeI32(_iter103);
+            oprot.writeI32(_iter83);
           }
           oprot.writeListEnd();
         }
@@ -1064,31 +1154,37 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     public void write(org.apache.thrift.protocol.TProtocol prot, QueryArgs struct) throws org.apache.thrift.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetAfter()) {
+      if (struct.isSetId()) {
         optionals.set(0);
       }
-      if (struct.isSetQuery()) {
+      if (struct.isSetAfter()) {
         optionals.set(1);
       }
-      if (struct.isSetFilter()) {
+      if (struct.isSetQuery()) {
         optionals.set(2);
       }
-      if (struct.isSetNumberToFetch()) {
+      if (struct.isSetFilter()) {
         optionals.set(3);
       }
-      if (struct.isSetSort()) {
+      if (struct.isSetNumberToFetch()) {
         optionals.set(4);
       }
-      if (struct.isSetDoDocScores()) {
+      if (struct.isSetSort()) {
         optionals.set(5);
       }
-      if (struct.isSetDoMaxScore()) {
+      if (struct.isSetDoDocScores()) {
         optionals.set(6);
       }
-      if (struct.isSetShardIndexes()) {
+      if (struct.isSetDoMaxScore()) {
         optionals.set(7);
       }
-      oprot.writeBitSet(optionals, 8);
+      if (struct.isSetShardIndexes()) {
+        optionals.set(8);
+      }
+      oprot.writeBitSet(optionals, 9);
+      if (struct.isSetId()) {
+        oprot.writeI64(struct.id);
+      }
       if (struct.isSetAfter()) {
         struct.after.write(oprot);
       }
@@ -1113,9 +1209,9 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       if (struct.isSetShardIndexes()) {
         {
           oprot.writeI32(struct.shardIndexes.size());
-          for (int _iter104 : struct.shardIndexes)
+          for (int _iter84 : struct.shardIndexes)
           {
-            oprot.writeI32(_iter104);
+            oprot.writeI32(_iter84);
           }
         }
       }
@@ -1124,46 +1220,50 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     @Override
     public void read(org.apache.thrift.protocol.TProtocol prot, QueryArgs struct) throws org.apache.thrift.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(8);
+      BitSet incoming = iprot.readBitSet(9);
       if (incoming.get(0)) {
+        struct.id = iprot.readI64();
+        struct.setIdIsSet(true);
+      }
+      if (incoming.get(1)) {
         struct.after = new ScoreDoc();
         struct.after.read(iprot);
         struct.setAfterIsSet(true);
       }
-      if (incoming.get(1)) {
+      if (incoming.get(2)) {
         struct.query = iprot.readBinary();
         struct.setQueryIsSet(true);
       }
-      if (incoming.get(2)) {
+      if (incoming.get(3)) {
         struct.filter = iprot.readBinary();
         struct.setFilterIsSet(true);
       }
-      if (incoming.get(3)) {
+      if (incoming.get(4)) {
         struct.numberToFetch = iprot.readI32();
         struct.setNumberToFetchIsSet(true);
       }
-      if (incoming.get(4)) {
+      if (incoming.get(5)) {
         struct.sort = new Sort();
         struct.sort.read(iprot);
         struct.setSortIsSet(true);
       }
-      if (incoming.get(5)) {
+      if (incoming.get(6)) {
         struct.doDocScores = iprot.readBool();
         struct.setDoDocScoresIsSet(true);
       }
-      if (incoming.get(6)) {
+      if (incoming.get(7)) {
         struct.doMaxScore = iprot.readBool();
         struct.setDoMaxScoreIsSet(true);
       }
-      if (incoming.get(7)) {
+      if (incoming.get(8)) {
         {
-          org.apache.thrift.protocol.TList _list105 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.shardIndexes = new ArrayList<Integer>(_list105.size);
-          for (int _i106 = 0; _i106 < _list105.size; ++_i106)
+          org.apache.thrift.protocol.TList _list85 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.shardIndexes = new ArrayList<Integer>(_list85.size);
+          for (int _i86 = 0; _i86 < _list85.size; ++_i86)
           {
-            int _elem107; // required
-            _elem107 = iprot.readI32();
-            struct.shardIndexes.add(_elem107);
+            int _elem87; // required
+            _elem87 = iprot.readI32();
+            struct.shardIndexes.add(_elem87);
           }
         }
         struct.setShardIndexesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/QuerySession.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/QuerySession.java b/interface/gen-java/org/apache/blur/thrift/generated/QuerySession.java
deleted file mode 100644
index 87a11d8..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/QuerySession.java
+++ /dev/null
@@ -1,510 +0,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;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-public class QuerySession implements org.apache.thrift.TBase<QuerySession, QuerySession._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QuerySession");
-
-  private static final org.apache.thrift.protocol.TField SESSION_FIELD_DESC = new org.apache.thrift.protocol.TField("session", org.apache.thrift.protocol.TType.STRUCT, (short)1);
-  private static final org.apache.thrift.protocol.TField QUERY_ID_FIELD_DESC = new org.apache.thrift.protocol.TField("queryId", 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 QuerySessionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new QuerySessionTupleSchemeFactory());
-  }
-
-  public Session session; // required
-  public String queryId; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    SESSION((short)1, "session"),
-    QUERY_ID((short)2, "queryId");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // SESSION
-          return SESSION;
-        case 2: // QUERY_ID
-          return QUERY_ID;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // 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);
-    tmpMap.put(_Fields.SESSION, new org.apache.thrift.meta_data.FieldMetaData("session", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, Session.class)));
-    tmpMap.put(_Fields.QUERY_ID, new org.apache.thrift.meta_data.FieldMetaData("queryId", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QuerySession.class, metaDataMap);
-  }
-
-  public QuerySession() {
-  }
-
-  public QuerySession(
-    Session session,
-    String queryId)
-  {
-    this();
-    this.session = session;
-    this.queryId = queryId;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public QuerySession(QuerySession other) {
-    if (other.isSetSession()) {
-      this.session = new Session(other.session);
-    }
-    if (other.isSetQueryId()) {
-      this.queryId = other.queryId;
-    }
-  }
-
-  public QuerySession deepCopy() {
-    return new QuerySession(this);
-  }
-
-  @Override
-  public void clear() {
-    this.session = null;
-    this.queryId = null;
-  }
-
-  public Session getSession() {
-    return this.session;
-  }
-
-  public QuerySession setSession(Session session) {
-    this.session = session;
-    return this;
-  }
-
-  public void unsetSession() {
-    this.session = null;
-  }
-
-  /** Returns true if field session is set (has been assigned a value) and false otherwise */
-  public boolean isSetSession() {
-    return this.session != null;
-  }
-
-  public void setSessionIsSet(boolean value) {
-    if (!value) {
-      this.session = null;
-    }
-  }
-
-  public String getQueryId() {
-    return this.queryId;
-  }
-
-  public QuerySession setQueryId(String queryId) {
-    this.queryId = queryId;
-    return this;
-  }
-
-  public void unsetQueryId() {
-    this.queryId = null;
-  }
-
-  /** Returns true if field queryId is set (has been assigned a value) and false otherwise */
-  public boolean isSetQueryId() {
-    return this.queryId != null;
-  }
-
-  public void setQueryIdIsSet(boolean value) {
-    if (!value) {
-      this.queryId = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case SESSION:
-      if (value == null) {
-        unsetSession();
-      } else {
-        setSession((Session)value);
-      }
-      break;
-
-    case QUERY_ID:
-      if (value == null) {
-        unsetQueryId();
-      } else {
-        setQueryId((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case SESSION:
-      return getSession();
-
-    case QUERY_ID:
-      return getQueryId();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case SESSION:
-      return isSetSession();
-    case QUERY_ID:
-      return isSetQueryId();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof QuerySession)
-      return this.equals((QuerySession)that);
-    return false;
-  }
-
-  public boolean equals(QuerySession that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_session = true && this.isSetSession();
-    boolean that_present_session = true && that.isSetSession();
-    if (this_present_session || that_present_session) {
-      if (!(this_present_session && that_present_session))
-        return false;
-      if (!this.session.equals(that.session))
-        return false;
-    }
-
-    boolean this_present_queryId = true && this.isSetQueryId();
-    boolean that_present_queryId = true && that.isSetQueryId();
-    if (this_present_queryId || that_present_queryId) {
-      if (!(this_present_queryId && that_present_queryId))
-        return false;
-      if (!this.queryId.equals(that.queryId))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(QuerySession other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    QuerySession typedOther = (QuerySession)other;
-
-    lastComparison = Boolean.valueOf(isSetSession()).compareTo(typedOther.isSetSession());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSession()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.session, typedOther.session);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetQueryId()).compareTo(typedOther.isSetQueryId());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQueryId()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryId, typedOther.queryId);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("QuerySession(");
-    boolean first = true;
-
-    sb.append("session:");
-    if (this.session == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.session);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("queryId:");
-    if (this.queryId == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.queryId);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-    if (session != null) {
-      session.validate();
-    }
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      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 QuerySessionStandardSchemeFactory implements SchemeFactory {
-    public QuerySessionStandardScheme getScheme() {
-      return new QuerySessionStandardScheme();
-    }
-  }
-
-  private static class QuerySessionStandardScheme extends StandardScheme<QuerySession> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, QuerySession 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: // SESSION
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
-              struct.session = new Session();
-              struct.session.read(iprot);
-              struct.setSessionIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // QUERY_ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.queryId = iprot.readString();
-              struct.setQueryIdIsSet(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, QuerySession struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.session != null) {
-        oprot.writeFieldBegin(SESSION_FIELD_DESC);
-        struct.session.write(oprot);
-        oprot.writeFieldEnd();
-      }
-      if (struct.queryId != null) {
-        oprot.writeFieldBegin(QUERY_ID_FIELD_DESC);
-        oprot.writeString(struct.queryId);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class QuerySessionTupleSchemeFactory implements SchemeFactory {
-    public QuerySessionTupleScheme getScheme() {
-      return new QuerySessionTupleScheme();
-    }
-  }
-
-  private static class QuerySessionTupleScheme extends TupleScheme<QuerySession> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, QuerySession struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetSession()) {
-        optionals.set(0);
-      }
-      if (struct.isSetQueryId()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetSession()) {
-        struct.session.write(oprot);
-      }
-      if (struct.isSetQueryId()) {
-        oprot.writeString(struct.queryId);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, QuerySession struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.session = new Session();
-        struct.session.read(iprot);
-        struct.setSessionIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.queryId = iprot.readString();
-        struct.setQueryIdIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java b/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
new file mode 100644
index 0000000..8c39037
--- /dev/null
+++ b/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
@@ -0,0 +1,821 @@
+/**
+ * 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;
+
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+
+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;
+import java.util.HashMap;
+import java.util.EnumMap;
+import java.util.Set;
+import java.util.HashSet;
+import java.util.EnumSet;
+import java.util.Collections;
+import java.util.BitSet;
+import java.nio.ByteBuffer;
+import java.util.Arrays;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * 
+ */
+public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QueryStatus._Fields>, java.io.Serializable, Cloneable {
+  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("QueryStatus");
+
+  private static final org.apache.thrift.protocol.TField CPU_TIMES_FIELD_DESC = new org.apache.thrift.protocol.TField("cpuTimes", org.apache.thrift.protocol.TType.MAP, (short)1);
+  private static final org.apache.thrift.protocol.TField COMPLETE_SHARDS_FIELD_DESC = new org.apache.thrift.protocol.TField("completeShards", org.apache.thrift.protocol.TType.I32, (short)2);
+  private static final org.apache.thrift.protocol.TField TOTAL_SHARDS_FIELD_DESC = new org.apache.thrift.protocol.TField("totalShards", org.apache.thrift.protocol.TType.I32, (short)3);
+  private static final org.apache.thrift.protocol.TField STATE_FIELD_DESC = new org.apache.thrift.protocol.TField("state", org.apache.thrift.protocol.TType.I32, (short)4);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new QueryStatusStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new QueryStatusTupleSchemeFactory());
+  }
+
+  /**
+   * 
+   */
+  public Map<String,CpuTime> cpuTimes; // required
+  /**
+   * 
+   */
+  public int completeShards; // required
+  /**
+   * 
+   */
+  public int totalShards; // required
+  /**
+   * 
+   * 
+   * @see QueryState
+   */
+  public QueryState state; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
+    /**
+     * 
+     */
+    CPU_TIMES((short)1, "cpuTimes"),
+    /**
+     * 
+     */
+    COMPLETE_SHARDS((short)2, "completeShards"),
+    /**
+     * 
+     */
+    TOTAL_SHARDS((short)3, "totalShards"),
+    /**
+     * 
+     * 
+     * @see QueryState
+     */
+    STATE((short)4, "state");
+
+    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+
+    static {
+      for (_Fields field : EnumSet.allOf(_Fields.class)) {
+        byName.put(field.getFieldName(), field);
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, or null if its not found.
+     */
+    public static _Fields findByThriftId(int fieldId) {
+      switch(fieldId) {
+        case 1: // CPU_TIMES
+          return CPU_TIMES;
+        case 2: // COMPLETE_SHARDS
+          return COMPLETE_SHARDS;
+        case 3: // TOTAL_SHARDS
+          return TOTAL_SHARDS;
+        case 4: // STATE
+          return STATE;
+        default:
+          return null;
+      }
+    }
+
+    /**
+     * Find the _Fields constant that matches fieldId, throwing an exception
+     * if it is not found.
+     */
+    public static _Fields findByThriftIdOrThrow(int fieldId) {
+      _Fields fields = findByThriftId(fieldId);
+      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
+      return fields;
+    }
+
+    /**
+     * Find the _Fields constant that matches name, or null if its not found.
+     */
+    public static _Fields findByName(String name) {
+      return byName.get(name);
+    }
+
+    private final short _thriftId;
+    private final String _fieldName;
+
+    _Fields(short thriftId, String fieldName) {
+      _thriftId = thriftId;
+      _fieldName = fieldName;
+    }
+
+    public short getThriftFieldId() {
+      return _thriftId;
+    }
+
+    public String getFieldName() {
+      return _fieldName;
+    }
+  }
+
+  // isset id assignments
+  private static final int __COMPLETESHARDS_ISSET_ID = 0;
+  private static final int __TOTALSHARDS_ISSET_ID = 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);
+    tmpMap.put(_Fields.CPU_TIMES, new org.apache.thrift.meta_data.FieldMetaData("cpuTimes", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
+            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
+            new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, CpuTime.class))));
+    tmpMap.put(_Fields.COMPLETE_SHARDS, new org.apache.thrift.meta_data.FieldMetaData("completeShards", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.TOTAL_SHARDS, new org.apache.thrift.meta_data.FieldMetaData("totalShards", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32)));
+    tmpMap.put(_Fields.STATE, new org.apache.thrift.meta_data.FieldMetaData("state", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, QueryState.class)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QueryStatus.class, metaDataMap);
+  }
+
+  public QueryStatus() {
+  }
+
+  public QueryStatus(
+    Map<String,CpuTime> cpuTimes,
+    int completeShards,
+    int totalShards,
+    QueryState state)
+  {
+    this();
+    this.cpuTimes = cpuTimes;
+    this.completeShards = completeShards;
+    setCompleteShardsIsSet(true);
+    this.totalShards = totalShards;
+    setTotalShardsIsSet(true);
+    this.state = state;
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public QueryStatus(QueryStatus other) {
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetCpuTimes()) {
+      Map<String,CpuTime> __this__cpuTimes = new HashMap<String,CpuTime>();
+      for (Map.Entry<String, CpuTime> other_element : other.cpuTimes.entrySet()) {
+
+        String other_element_key = other_element.getKey();
+        CpuTime other_element_value = other_element.getValue();
+
+        String __this__cpuTimes_copy_key = other_element_key;
+
+        CpuTime __this__cpuTimes_copy_value = new CpuTime(other_element_value);
+
+        __this__cpuTimes.put(__this__cpuTimes_copy_key, __this__cpuTimes_copy_value);
+      }
+      this.cpuTimes = __this__cpuTimes;
+    }
+    this.completeShards = other.completeShards;
+    this.totalShards = other.totalShards;
+    if (other.isSetState()) {
+      this.state = other.state;
+    }
+  }
+
+  public QueryStatus deepCopy() {
+    return new QueryStatus(this);
+  }
+
+  @Override
+  public void clear() {
+    this.cpuTimes = null;
+    setCompleteShardsIsSet(false);
+    this.completeShards = 0;
+    setTotalShardsIsSet(false);
+    this.totalShards = 0;
+    this.state = null;
+  }
+
+  public int getCpuTimesSize() {
+    return (this.cpuTimes == null) ? 0 : this.cpuTimes.size();
+  }
+
+  public void putToCpuTimes(String key, CpuTime val) {
+    if (this.cpuTimes == null) {
+      this.cpuTimes = new HashMap<String,CpuTime>();
+    }
+    this.cpuTimes.put(key, val);
+  }
+
+  /**
+   * 
+   */
+  public Map<String,CpuTime> getCpuTimes() {
+    return this.cpuTimes;
+  }
+
+  /**
+   * 
+   */
+  public QueryStatus setCpuTimes(Map<String,CpuTime> cpuTimes) {
+    this.cpuTimes = cpuTimes;
+    return this;
+  }
+
+  public void unsetCpuTimes() {
+    this.cpuTimes = null;
+  }
+
+  /** Returns true if field cpuTimes is set (has been assigned a value) and false otherwise */
+  public boolean isSetCpuTimes() {
+    return this.cpuTimes != null;
+  }
+
+  public void setCpuTimesIsSet(boolean value) {
+    if (!value) {
+      this.cpuTimes = null;
+    }
+  }
+
+  /**
+   * 
+   */
+  public int getCompleteShards() {
+    return this.completeShards;
+  }
+
+  /**
+   * 
+   */
+  public QueryStatus setCompleteShards(int completeShards) {
+    this.completeShards = completeShards;
+    setCompleteShardsIsSet(true);
+    return this;
+  }
+
+  public void unsetCompleteShards() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __COMPLETESHARDS_ISSET_ID);
+  }
+
+  /** Returns true if field completeShards is set (has been assigned a value) and false otherwise */
+  public boolean isSetCompleteShards() {
+    return EncodingUtils.testBit(__isset_bitfield, __COMPLETESHARDS_ISSET_ID);
+  }
+
+  public void setCompleteShardsIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __COMPLETESHARDS_ISSET_ID, value);
+  }
+
+  /**
+   * 
+   */
+  public int getTotalShards() {
+    return this.totalShards;
+  }
+
+  /**
+   * 
+   */
+  public QueryStatus setTotalShards(int totalShards) {
+    this.totalShards = totalShards;
+    setTotalShardsIsSet(true);
+    return this;
+  }
+
+  public void unsetTotalShards() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TOTALSHARDS_ISSET_ID);
+  }
+
+  /** Returns true if field totalShards is set (has been assigned a value) and false otherwise */
+  public boolean isSetTotalShards() {
+    return EncodingUtils.testBit(__isset_bitfield, __TOTALSHARDS_ISSET_ID);
+  }
+
+  public void setTotalShardsIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TOTALSHARDS_ISSET_ID, value);
+  }
+
+  /**
+   * 
+   * 
+   * @see QueryState
+   */
+  public QueryState getState() {
+    return this.state;
+  }
+
+  /**
+   * 
+   * 
+   * @see QueryState
+   */
+  public QueryStatus setState(QueryState state) {
+    this.state = state;
+    return this;
+  }
+
+  public void unsetState() {
+    this.state = null;
+  }
+
+  /** Returns true if field state is set (has been assigned a value) and false otherwise */
+  public boolean isSetState() {
+    return this.state != null;
+  }
+
+  public void setStateIsSet(boolean value) {
+    if (!value) {
+      this.state = null;
+    }
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case CPU_TIMES:
+      if (value == null) {
+        unsetCpuTimes();
+      } else {
+        setCpuTimes((Map<String,CpuTime>)value);
+      }
+      break;
+
+    case COMPLETE_SHARDS:
+      if (value == null) {
+        unsetCompleteShards();
+      } else {
+        setCompleteShards((Integer)value);
+      }
+      break;
+
+    case TOTAL_SHARDS:
+      if (value == null) {
+        unsetTotalShards();
+      } else {
+        setTotalShards((Integer)value);
+      }
+      break;
+
+    case STATE:
+      if (value == null) {
+        unsetState();
+      } else {
+        setState((QueryState)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case CPU_TIMES:
+      return getCpuTimes();
+
+    case COMPLETE_SHARDS:
+      return Integer.valueOf(getCompleteShards());
+
+    case TOTAL_SHARDS:
+      return Integer.valueOf(getTotalShards());
+
+    case STATE:
+      return getState();
+
+    }
+    throw new IllegalStateException();
+  }
+
+  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
+  public boolean isSet(_Fields field) {
+    if (field == null) {
+      throw new IllegalArgumentException();
+    }
+
+    switch (field) {
+    case CPU_TIMES:
+      return isSetCpuTimes();
+    case COMPLETE_SHARDS:
+      return isSetCompleteShards();
+    case TOTAL_SHARDS:
+      return isSetTotalShards();
+    case STATE:
+      return isSetState();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof QueryStatus)
+      return this.equals((QueryStatus)that);
+    return false;
+  }
+
+  public boolean equals(QueryStatus that) {
+    if (that == null)
+      return false;
+
+    boolean this_present_cpuTimes = true && this.isSetCpuTimes();
+    boolean that_present_cpuTimes = true && that.isSetCpuTimes();
+    if (this_present_cpuTimes || that_present_cpuTimes) {
+      if (!(this_present_cpuTimes && that_present_cpuTimes))
+        return false;
+      if (!this.cpuTimes.equals(that.cpuTimes))
+        return false;
+    }
+
+    boolean this_present_completeShards = true;
+    boolean that_present_completeShards = true;
+    if (this_present_completeShards || that_present_completeShards) {
+      if (!(this_present_completeShards && that_present_completeShards))
+        return false;
+      if (this.completeShards != that.completeShards)
+        return false;
+    }
+
+    boolean this_present_totalShards = true;
+    boolean that_present_totalShards = true;
+    if (this_present_totalShards || that_present_totalShards) {
+      if (!(this_present_totalShards && that_present_totalShards))
+        return false;
+      if (this.totalShards != that.totalShards)
+        return false;
+    }
+
+    boolean this_present_state = true && this.isSetState();
+    boolean that_present_state = true && that.isSetState();
+    if (this_present_state || that_present_state) {
+      if (!(this_present_state && that_present_state))
+        return false;
+      if (!this.state.equals(that.state))
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(QueryStatus other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    QueryStatus typedOther = (QueryStatus)other;
+
+    lastComparison = Boolean.valueOf(isSetCpuTimes()).compareTo(typedOther.isSetCpuTimes());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCpuTimes()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpuTimes, typedOther.cpuTimes);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetCompleteShards()).compareTo(typedOther.isSetCompleteShards());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCompleteShards()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.completeShards, typedOther.completeShards);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetTotalShards()).compareTo(typedOther.isSetTotalShards());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetTotalShards()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.totalShards, typedOther.totalShards);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetState()).compareTo(typedOther.isSetState());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetState()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.state, typedOther.state);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    return 0;
+  }
+
+  public _Fields fieldForId(int fieldId) {
+    return _Fields.findByThriftId(fieldId);
+  }
+
+  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
+    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
+  }
+
+  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
+    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder("QueryStatus(");
+    boolean first = true;
+
+    sb.append("cpuTimes:");
+    if (this.cpuTimes == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.cpuTimes);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("completeShards:");
+    sb.append(this.completeShards);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("totalShards:");
+    sb.append(this.totalShards);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("state:");
+    if (this.state == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.state);
+    }
+    first = false;
+    sb.append(")");
+    return sb.toString();
+  }
+
+  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 {
+    try {
+      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
+    } catch (org.apache.thrift.TException te) {
+      throw new java.io.IOException(te);
+    }
+  }
+
+  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_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 QueryStatusStandardSchemeFactory implements SchemeFactory {
+    public QueryStatusStandardScheme getScheme() {
+      return new QueryStatusStandardScheme();
+    }
+  }
+
+  private static class QueryStatusStandardScheme extends StandardScheme<QueryStatus> {
+
+    public void read(org.apache.thrift.protocol.TProtocol iprot, QueryStatus 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_TIMES
+            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
+              {
+                org.apache.thrift.protocol.TMap _map0 = iprot.readMapBegin();
+                struct.cpuTimes = new HashMap<String,CpuTime>(2*_map0.size);
+                for (int _i1 = 0; _i1 < _map0.size; ++_i1)
+                {
+                  String _key2; // required
+                  CpuTime _val3; // optional
+                  _key2 = iprot.readString();
+                  _val3 = new CpuTime();
+                  _val3.read(iprot);
+                  struct.cpuTimes.put(_key2, _val3);
+                }
+                iprot.readMapEnd();
+              }
+              struct.setCpuTimesIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // COMPLETE_SHARDS
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.completeShards = iprot.readI32();
+              struct.setCompleteShardsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // TOTAL_SHARDS
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.totalShards = iprot.readI32();
+              struct.setTotalShardsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 4: // STATE
+            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
+              struct.state = QueryState.findByValue(iprot.readI32());
+              struct.setStateIsSet(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, QueryStatus struct) throws org.apache.thrift.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.cpuTimes != null) {
+        oprot.writeFieldBegin(CPU_TIMES_FIELD_DESC);
+        {
+          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, struct.cpuTimes.size()));
+          for (Map.Entry<String, CpuTime> _iter4 : struct.cpuTimes.entrySet())
+          {
+            oprot.writeString(_iter4.getKey());
+            _iter4.getValue().write(oprot);
+          }
+          oprot.writeMapEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(COMPLETE_SHARDS_FIELD_DESC);
+      oprot.writeI32(struct.completeShards);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(TOTAL_SHARDS_FIELD_DESC);
+      oprot.writeI32(struct.totalShards);
+      oprot.writeFieldEnd();
+      if (struct.state != null) {
+        oprot.writeFieldBegin(STATE_FIELD_DESC);
+        oprot.writeI32(struct.state.getValue());
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class QueryStatusTupleSchemeFactory implements SchemeFactory {
+    public QueryStatusTupleScheme getScheme() {
+      return new QueryStatusTupleScheme();
+    }
+  }
+
+  private static class QueryStatusTupleScheme extends TupleScheme<QueryStatus> {
+
+    @Override
+    public void write(org.apache.thrift.protocol.TProtocol prot, QueryStatus struct) throws org.apache.thrift.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetCpuTimes()) {
+        optionals.set(0);
+      }
+      if (struct.isSetCompleteShards()) {
+        optionals.set(1);
+      }
+      if (struct.isSetTotalShards()) {
+        optionals.set(2);
+      }
+      if (struct.isSetState()) {
+        optionals.set(3);
+      }
+      oprot.writeBitSet(optionals, 4);
+      if (struct.isSetCpuTimes()) {
+        {
+          oprot.writeI32(struct.cpuTimes.size());
+          for (Map.Entry<String, CpuTime> _iter5 : struct.cpuTimes.entrySet())
+          {
+            oprot.writeString(_iter5.getKey());
+            _iter5.getValue().write(oprot);
+          }
+        }
+      }
+      if (struct.isSetCompleteShards()) {
+        oprot.writeI32(struct.completeShards);
+      }
+      if (struct.isSetTotalShards()) {
+        oprot.writeI32(struct.totalShards);
+      }
+      if (struct.isSetState()) {
+        oprot.writeI32(struct.state.getValue());
+      }
+    }
+
+    @Override
+    public void read(org.apache.thrift.protocol.TProtocol prot, QueryStatus struct) throws org.apache.thrift.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(4);
+      if (incoming.get(0)) {
+        {
+          org.apache.thrift.protocol.TMap _map6 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.cpuTimes = new HashMap<String,CpuTime>(2*_map6.size);
+          for (int _i7 = 0; _i7 < _map6.size; ++_i7)
+          {
+            String _key8; // required
+            CpuTime _val9; // optional
+            _key8 = iprot.readString();
+            _val9 = new CpuTime();
+            _val9.read(iprot);
+            struct.cpuTimes.put(_key8, _val9);
+          }
+        }
+        struct.setCpuTimesIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.completeShards = iprot.readI32();
+        struct.setCompleteShardsIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.totalShards = iprot.readI32();
+        struct.setTotalShardsIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.state = QueryState.findByValue(iprot.readI32());
+        struct.setStateIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/aee531c2/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/Schema.java b/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
deleted file mode 100644
index b324c0d..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/Schema.java
+++ /dev/null
@@ -1,631 +0,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;
-
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-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;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-import java.util.Collections;
-import java.util.BitSet;
-import java.nio.ByteBuffer;
-import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-/**
- * 
- */
-public class Schema implements org.apache.thrift.TBase<Schema, Schema._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Schema");
-
-  private static final org.apache.thrift.protocol.TField TABLE_FIELD_DESC = new org.apache.thrift.protocol.TField("table", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField COLUMN_FAMILIES_FIELD_DESC = new org.apache.thrift.protocol.TField("columnFamilies", 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 SchemaStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SchemaTupleSchemeFactory());
-  }
-
-  /**
-   * 
-   */
-  public String table; // required
-  /**
-   * 
-   */
-  public Map<String,Set<String>> columnFamilies; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
-    /**
-     * 
-     */
-    TABLE((short)1, "table"),
-    /**
-     * 
-     */
-    COLUMN_FAMILIES((short)2, "columnFamilies");
-
-    private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
-
-    static {
-      for (_Fields field : EnumSet.allOf(_Fields.class)) {
-        byName.put(field.getFieldName(), field);
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, or null if its not found.
-     */
-    public static _Fields findByThriftId(int fieldId) {
-      switch(fieldId) {
-        case 1: // TABLE
-          return TABLE;
-        case 2: // COLUMN_FAMILIES
-          return COLUMN_FAMILIES;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // 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);
-    tmpMap.put(_Fields.TABLE, new org.apache.thrift.meta_data.FieldMetaData("table", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.COLUMN_FAMILIES, new org.apache.thrift.meta_data.FieldMetaData("columnFamilies", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, 
-            new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING), 
-            new org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
-                new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(Schema.class, metaDataMap);
-  }
-
-  public Schema() {
-  }
-
-  public Schema(
-    String table,
-    Map<String,Set<String>> columnFamilies)
-  {
-    this();
-    this.table = table;
-    this.columnFamilies = columnFamilies;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public Schema(Schema other) {
-    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()) {
-
-        String other_element_key = other_element.getKey();
-        Set<String> other_element_value = other_element.getValue();
-
-        String __this__columnFamilies_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);
-        }
-
-        __this__columnFamilies.put(__this__columnFamilies_copy_key, __this__columnFamilies_copy_value);
-      }
-      this.columnFamilies = __this__columnFamilies;
-    }
-  }
-
-  public Schema deepCopy() {
-    return new Schema(this);
-  }
-
-  @Override
-  public void clear() {
-    this.table = null;
-    this.columnFamilies = null;
-  }
-
-  /**
-   * 
-   */
-  public String getTable() {
-    return this.table;
-  }
-
-  /**
-   * 
-   */
-  public Schema setTable(String table) {
-    this.table = table;
-    return this;
-  }
-
-  public void unsetTable() {
-    this.table = null;
-  }
-
-  /** Returns true if field table is set (has been assigned a value) and false otherwise */
-  public boolean isSetTable() {
-    return this.table != null;
-  }
-
-  public void setTableIsSet(boolean value) {
-    if (!value) {
-      this.table = null;
-    }
-  }
-
-  public int getColumnFamiliesSize() {
-    return (this.columnFamilies == null) ? 0 : this.columnFamilies.size();
-  }
-
-  public void putToColumnFamilies(String key, Set<String> val) {
-    if (this.columnFamilies == null) {
-      this.columnFamilies = new HashMap<String,Set<String>>();
-    }
-    this.columnFamilies.put(key, val);
-  }
-
-  /**
-   * 
-   */
-  public Map<String,Set<String>> getColumnFamilies() {
-    return this.columnFamilies;
-  }
-
-  /**
-   * 
-   */
-  public Schema setColumnFamilies(Map<String,Set<String>> columnFamilies) {
-    this.columnFamilies = columnFamilies;
-    return this;
-  }
-
-  public void unsetColumnFamilies() {
-    this.columnFamilies = null;
-  }
-
-  /** Returns true if field columnFamilies is set (has been assigned a value) and false otherwise */
-  public boolean isSetColumnFamilies() {
-    return this.columnFamilies != null;
-  }
-
-  public void setColumnFamiliesIsSet(boolean value) {
-    if (!value) {
-      this.columnFamilies = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case TABLE:
-      if (value == null) {
-        unsetTable();
-      } else {
-        setTable((String)value);
-      }
-      break;
-
-    case COLUMN_FAMILIES:
-      if (value == null) {
-        unsetColumnFamilies();
-      } else {
-        setColumnFamilies((Map<String,Set<String>>)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case TABLE:
-      return getTable();
-
-    case COLUMN_FAMILIES:
-      return getColumnFamilies();
-
-    }
-    throw new IllegalStateException();
-  }
-
-  /** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
-  public boolean isSet(_Fields field) {
-    if (field == null) {
-      throw new IllegalArgumentException();
-    }
-
-    switch (field) {
-    case TABLE:
-      return isSetTable();
-    case COLUMN_FAMILIES:
-      return isSetColumnFamilies();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof Schema)
-      return this.equals((Schema)that);
-    return false;
-  }
-
-  public boolean equals(Schema that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_table = true && this.isSetTable();
-    boolean that_present_table = true && that.isSetTable();
-    if (this_present_table || that_present_table) {
-      if (!(this_present_table && that_present_table))
-        return false;
-      if (!this.table.equals(that.table))
-        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))
-        return false;
-      if (!this.columnFamilies.equals(that.columnFamilies))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(Schema other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    Schema typedOther = (Schema)other;
-
-    lastComparison = Boolean.valueOf(isSetTable()).compareTo(typedOther.isSetTable());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetTable()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.table, typedOther.table);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetColumnFamilies()).compareTo(typedOther.isSetColumnFamilies());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetColumnFamilies()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columnFamilies, typedOther.columnFamilies);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("Schema(");
-    boolean first = true;
-
-    sb.append("table:");
-    if (this.table == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.table);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("columnFamilies:");
-    if (this.columnFamilies == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.columnFamilies);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  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 {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      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 SchemaStandardSchemeFactory implements SchemeFactory {
-    public SchemaStandardScheme getScheme() {
-      return new SchemaStandardScheme();
-    }
-  }
-
-  private static class SchemaStandardScheme extends StandardScheme<Schema> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, Schema 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: // TABLE
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.table = iprot.readString();
-              struct.setTableIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // COLUMN_FAMILIES
-            if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
-              {
-                org.apache.thrift.protocol.TMap _map10 = iprot.readMapBegin();
-                struct.columnFamilies = new HashMap<String,Set<String>>(2*_map10.size);
-                for (int _i11 = 0; _i11 < _map10.size; ++_i11)
-                {
-                  String _key12; // required
-                  Set<String> _val13; // optional
-                  _key12 = iprot.readString();
-                  {
-                    org.apache.thrift.protocol.TSet _set14 = iprot.readSetBegin();
-                    _val13 = new HashSet<String>(2*_set14.size);
-                    for (int _i15 = 0; _i15 < _set14.size; ++_i15)
-                    {
-                      String _elem16; // required
-                      _elem16 = iprot.readString();
-                      _val13.add(_elem16);
-                    }
-                    iprot.readSetEnd();
-                  }
-                  struct.columnFamilies.put(_key12, _val13);
-                }
-                iprot.readMapEnd();
-              }
-              struct.setColumnFamiliesIsSet(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, Schema struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.table != null) {
-        oprot.writeFieldBegin(TABLE_FIELD_DESC);
-        oprot.writeString(struct.table);
-        oprot.writeFieldEnd();
-      }
-      if (struct.columnFamilies != null) {
-        oprot.writeFieldBegin(COLUMN_FAMILIES_FIELD_DESC);
-        {
-          oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, struct.columnFamilies.size()));
-          for (Map.Entry<String, Set<String>> _iter17 : struct.columnFamilies.entrySet())
-          {
-            oprot.writeString(_iter17.getKey());
-            {
-              oprot.writeSetBegin(new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, _iter17.getValue().size()));
-              for (String _iter18 : _iter17.getValue())
-              {
-                oprot.writeString(_iter18);
-              }
-              oprot.writeSetEnd();
-            }
-          }
-          oprot.writeMapEnd();
-        }
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SchemaTupleSchemeFactory implements SchemeFactory {
-    public SchemaTupleScheme getScheme() {
-      return new SchemaTupleScheme();
-    }
-  }
-
-  private static class SchemaTupleScheme extends TupleScheme<Schema> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, Schema struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetTable()) {
-        optionals.set(0);
-      }
-      if (struct.isSetColumnFamilies()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetTable()) {
-        oprot.writeString(struct.table);
-      }
-      if (struct.isSetColumnFamilies()) {
-        {
-          oprot.writeI32(struct.columnFamilies.size());
-          for (Map.Entry<String, Set<String>> _iter19 : struct.columnFamilies.entrySet())
-          {
-            oprot.writeString(_iter19.getKey());
-            {
-              oprot.writeI32(_iter19.getValue().size());
-              for (String _iter20 : _iter19.getValue())
-              {
-                oprot.writeString(_iter20);
-              }
-            }
-          }
-        }
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, Schema struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.table = iprot.readString();
-        struct.setTableIsSet(true);
-      }
-      if (incoming.get(1)) {
-        {
-          org.apache.thrift.protocol.TMap _map21 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.SET, iprot.readI32());
-          struct.columnFamilies = new HashMap<String,Set<String>>(2*_map21.size);
-          for (int _i22 = 0; _i22 < _map21.size; ++_i22)
-          {
-            String _key23; // required
-            Set<String> _val24; // optional
-            _key23 = iprot.readString();
-            {
-              org.apache.thrift.protocol.TSet _set25 = new org.apache.thrift.protocol.TSet(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-              _val24 = new HashSet<String>(2*_set25.size);
-              for (int _i26 = 0; _i26 < _set25.size; ++_i26)
-              {
-                String _elem27; // required
-                _elem27 = iprot.readString();
-                _val24.add(_elem27);
-              }
-            }
-            struct.columnFamilies.put(_key23, _val24);
-          }
-        }
-        struct.setColumnFamiliesIsSet(true);
-      }
-    }
-  }
-
-}
-


Mime
View raw message