incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [3/8] Working on https://issues.apache.org/jira/browse/BLUR-42. Not tested yet, and no cancel implementation.
Date Tue, 29 Jan 2013 15:01:02 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ClassDefinition.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ClassDefinition.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ClassDefinition.java
index 446578b..1a0046d 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ClassDefinition.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ClassDefinition.java
@@ -449,15 +449,15 @@ public class ClassDefinition implements org.apache.thrift.TBase<ClassDefinition,
           case 2: // ARGUMENTS
             if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
               {
-                org.apache.thrift.protocol.TMap _map18 = iprot.readMapBegin();
-                struct.arguments = new HashMap<String,ByteBuffer>(2*_map18.size);
-                for (int _i19 = 0; _i19 < _map18.size; ++_i19)
+                org.apache.thrift.protocol.TMap _map8 = iprot.readMapBegin();
+                struct.arguments = new HashMap<String,ByteBuffer>(2*_map8.size);
+                for (int _i9 = 0; _i9 < _map8.size; ++_i9)
                 {
-                  String _key20; // required
-                  ByteBuffer _val21; // optional
-                  _key20 = iprot.readString();
-                  _val21 = iprot.readBinary();
-                  struct.arguments.put(_key20, _val21);
+                  String _key10; // required
+                  ByteBuffer _val11; // optional
+                  _key10 = iprot.readString();
+                  _val11 = iprot.readBinary();
+                  struct.arguments.put(_key10, _val11);
                 }
                 iprot.readMapEnd();
               }
@@ -490,10 +490,10 @@ public class ClassDefinition implements org.apache.thrift.TBase<ClassDefinition,
         oprot.writeFieldBegin(ARGUMENTS_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.arguments.size()));
-          for (Map.Entry<String, ByteBuffer> _iter22 : struct.arguments.entrySet())
+          for (Map.Entry<String, ByteBuffer> _iter12 : struct.arguments.entrySet())
           {
-            oprot.writeString(_iter22.getKey());
-            oprot.writeBinary(_iter22.getValue());
+            oprot.writeString(_iter12.getKey());
+            oprot.writeBinary(_iter12.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -530,10 +530,10 @@ public class ClassDefinition implements org.apache.thrift.TBase<ClassDefinition,
       if (struct.isSetArguments()) {
         {
           oprot.writeI32(struct.arguments.size());
-          for (Map.Entry<String, ByteBuffer> _iter23 : struct.arguments.entrySet())
+          for (Map.Entry<String, ByteBuffer> _iter13 : struct.arguments.entrySet())
           {
-            oprot.writeString(_iter23.getKey());
-            oprot.writeBinary(_iter23.getValue());
+            oprot.writeString(_iter13.getKey());
+            oprot.writeBinary(_iter13.getValue());
           }
         }
       }
@@ -549,15 +549,15 @@ public class ClassDefinition implements org.apache.thrift.TBase<ClassDefinition,
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TMap _map24 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.arguments = new HashMap<String,ByteBuffer>(2*_map24.size);
-          for (int _i25 = 0; _i25 < _map24.size; ++_i25)
+          org.apache.thrift.protocol.TMap _map14 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.arguments = new HashMap<String,ByteBuffer>(2*_map14.size);
+          for (int _i15 = 0; _i15 < _map14.size; ++_i15)
           {
-            String _key26; // required
-            ByteBuffer _val27; // optional
-            _key26 = iprot.readString();
-            _val27 = iprot.readBinary();
-            struct.arguments.put(_key26, _val27);
+            String _key16; // required
+            ByteBuffer _val17; // optional
+            _key16 = iprot.readString();
+            _val17 = iprot.readBinary();
+            struct.arguments.put(_key16, _val17);
           }
         }
         struct.setArgumentsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/CpuTime.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/CpuTime.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/CpuTime.java
deleted file mode 100644
index 02f457f..0000000
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/CpuTime.java
+++ /dev/null
@@ -1,524 +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 CpuTime implements org.apache.thrift.TBase<CpuTime, CpuTime._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("CpuTime");
-
-  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());
-  }
-
-  /**
-   * 
-   */
-  public long cpuTime; // required
-  /**
-   * 
-   */
-  public long realTime; // 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_TIME((short)1, "cpuTime"),
-    /**
-     * 
-     */
-    REAL_TIME((short)2, "realTime");
-
-    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_TIME
-          return CPU_TIME;
-        case 2: // REAL_TIME
-          return REAL_TIME;
-        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 __CPUTIME_ISSET_ID = 0;
-  private static final int __REALTIME_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_TIME, new org.apache.thrift.meta_data.FieldMetaData("cpuTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    tmpMap.put(_Fields.REAL_TIME, new org.apache.thrift.meta_data.FieldMetaData("realTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(CpuTime.class, metaDataMap);
-  }
-
-  public CpuTime() {
-  }
-
-  public CpuTime(
-    long cpuTime,
-    long realTime)
-  {
-    this();
-    this.cpuTime = cpuTime;
-    setCpuTimeIsSet(true);
-    this.realTime = realTime;
-    setRealTimeIsSet(true);
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public CpuTime(CpuTime other) {
-    __isset_bitfield = other.__isset_bitfield;
-    this.cpuTime = other.cpuTime;
-    this.realTime = other.realTime;
-  }
-
-  public CpuTime deepCopy() {
-    return new CpuTime(this);
-  }
-
-  @Override
-  public void clear() {
-    setCpuTimeIsSet(false);
-    this.cpuTime = 0;
-    setRealTimeIsSet(false);
-    this.realTime = 0;
-  }
-
-  /**
-   * 
-   */
-  public long getCpuTime() {
-    return this.cpuTime;
-  }
-
-  /**
-   * 
-   */
-  public CpuTime setCpuTime(long cpuTime) {
-    this.cpuTime = cpuTime;
-    setCpuTimeIsSet(true);
-    return this;
-  }
-
-  public void unsetCpuTime() {
-    __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 EncodingUtils.testBit(__isset_bitfield, __CPUTIME_ISSET_ID);
-  }
-
-  public void setCpuTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CPUTIME_ISSET_ID, value);
-  }
-
-  /**
-   * 
-   */
-  public long getRealTime() {
-    return this.realTime;
-  }
-
-  /**
-   * 
-   */
-  public CpuTime setRealTime(long realTime) {
-    this.realTime = realTime;
-    setRealTimeIsSet(true);
-    return this;
-  }
-
-  public void unsetRealTime() {
-    __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 EncodingUtils.testBit(__isset_bitfield, __REALTIME_ISSET_ID);
-  }
-
-  public void setRealTimeIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __REALTIME_ISSET_ID, value);
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case CPU_TIME:
-      if (value == null) {
-        unsetCpuTime();
-      } else {
-        setCpuTime((Long)value);
-      }
-      break;
-
-    case REAL_TIME:
-      if (value == null) {
-        unsetRealTime();
-      } else {
-        setRealTime((Long)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case CPU_TIME:
-      return Long.valueOf(getCpuTime());
-
-    case REAL_TIME:
-      return Long.valueOf(getRealTime());
-
-    }
-    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_TIME:
-      return isSetCpuTime();
-    case REAL_TIME:
-      return isSetRealTime();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof CpuTime)
-      return this.equals((CpuTime)that);
-    return false;
-  }
-
-  public boolean equals(CpuTime that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_cpuTime = true;
-    boolean that_present_cpuTime = true;
-    if (this_present_cpuTime || that_present_cpuTime) {
-      if (!(this_present_cpuTime && that_present_cpuTime))
-        return false;
-      if (this.cpuTime != that.cpuTime)
-        return false;
-    }
-
-    boolean this_present_realTime = true;
-    boolean that_present_realTime = true;
-    if (this_present_realTime || that_present_realTime) {
-      if (!(this_present_realTime && that_present_realTime))
-        return false;
-      if (this.realTime != that.realTime)
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(CpuTime other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    CpuTime typedOther = (CpuTime)other;
-
-    lastComparison = Boolean.valueOf(isSetCpuTime()).compareTo(typedOther.isSetCpuTime());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetCpuTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpuTime, typedOther.cpuTime);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRealTime()).compareTo(typedOther.isSetRealTime());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRealTime()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.realTime, typedOther.realTime);
-      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("CpuTime(");
-    boolean first = true;
-
-    sb.append("cpuTime:");
-    sb.append(this.cpuTime);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("realTime:");
-    sb.append(this.realTime);
-    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 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);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Document.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Document.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Document.java
index 014af5a..28a0172 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Document.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Document.java
@@ -370,14 +370,14 @@ public class Document implements org.apache.thrift.TBase<Document, Document._Fie
           case 1: // FIELDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list94 = iprot.readListBegin();
-                struct.fields = new ArrayList<Field>(_list94.size);
-                for (int _i95 = 0; _i95 < _list94.size; ++_i95)
+                org.apache.thrift.protocol.TList _list84 = iprot.readListBegin();
+                struct.fields = new ArrayList<Field>(_list84.size);
+                for (int _i85 = 0; _i85 < _list84.size; ++_i85)
                 {
-                  Field _elem96; // required
-                  _elem96 = new Field();
-                  _elem96.read(iprot);
-                  struct.fields.add(_elem96);
+                  Field _elem86; // required
+                  _elem86 = new Field();
+                  _elem86.read(iprot);
+                  struct.fields.add(_elem86);
                 }
                 iprot.readListEnd();
               }
@@ -405,9 +405,9 @@ public class Document implements org.apache.thrift.TBase<Document, Document._Fie
         oprot.writeFieldBegin(FIELDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.fields.size()));
-          for (Field _iter97 : struct.fields)
+          for (Field _iter87 : struct.fields)
           {
-            _iter97.write(oprot);
+            _iter87.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -438,9 +438,9 @@ public class Document implements org.apache.thrift.TBase<Document, Document._Fie
       if (struct.isSetFields()) {
         {
           oprot.writeI32(struct.fields.size());
-          for (Field _iter98 : struct.fields)
+          for (Field _iter88 : struct.fields)
           {
-            _iter98.write(oprot);
+            _iter88.write(oprot);
           }
         }
       }
@@ -452,14 +452,14 @@ public class Document implements org.apache.thrift.TBase<Document, Document._Fie
       BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list99 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.fields = new ArrayList<Field>(_list99.size);
-          for (int _i100 = 0; _i100 < _list99.size; ++_i100)
+          org.apache.thrift.protocol.TList _list89 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.fields = new ArrayList<Field>(_list89.size);
+          for (int _i90 = 0; _i90 < _list89.size; ++_i90)
           {
-            Field _elem101; // required
-            _elem101 = new Field();
-            _elem101.read(iprot);
-            struct.fields.add(_elem101);
+            Field _elem91; // required
+            _elem91 = new Field();
+            _elem91.read(iprot);
+            struct.fields.add(_elem91);
           }
         }
         struct.setFieldsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
index 2989759..e68046b 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryArgs.java
@@ -52,7 +52,7 @@ 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 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 ID_FIELD_DESC = new org.apache.thrift.protocol.TField("id", org.apache.thrift.protocol.TType.STRING, (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.STRUCT, (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);
@@ -70,9 +70,9 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   }
 
   /**
-   * Unique id for controlling the given query.
+   * Unique id for controlling the given query, leave null for server side assignment.
    */
-  public long id; // required
+  public String id; // required
   /**
    * If after is left null then the first N (where N is numberToFetch)
    * ScoreDocs are fetched.  If after is not null then the first N
@@ -119,7 +119,7 @@ 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 {
     /**
-     * Unique id for controlling the given query.
+     * Unique id for controlling the given query, leave null for server side assignment.
      */
     ID((short)1, "id"),
     /**
@@ -238,17 +238,16 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   }
 
   // isset id assignments
-  private static final int __ID_ISSET_ID = 0;
-  private static final int __NUMBERTOFETCH_ISSET_ID = 1;
-  private static final int __AGGREGATERESULTS_ISSET_ID = 2;
-  private static final int __DODOCSCORES_ISSET_ID = 3;
-  private static final int __DOMAXSCORE_ISSET_ID = 4;
+  private static final int __NUMBERTOFETCH_ISSET_ID = 0;
+  private static final int __AGGREGATERESULTS_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)));
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
     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, 
@@ -284,7 +283,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   }
 
   public QueryArgs(
-    long id,
+    String id,
     ScoreDoc after,
     Query query,
     ByteBuffer filter,
@@ -297,7 +296,6 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   {
     this();
     this.id = id;
-    setIdIsSet(true);
     this.after = after;
     this.query = query;
     this.filter = filter;
@@ -318,7 +316,9 @@ 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.isSetId()) {
+      this.id = other.id;
+    }
     if (other.isSetAfter()) {
       this.after = new ScoreDoc(other.after);
     }
@@ -351,8 +351,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
 
   @Override
   public void clear() {
-    setIdIsSet(false);
-    this.id = 0;
+    this.id = null;
     this.after = null;
     this.query = null;
     this.filter = null;
@@ -369,32 +368,33 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   }
 
   /**
-   * Unique id for controlling the given query.
+   * Unique id for controlling the given query, leave null for server side assignment.
    */
-  public long getId() {
+  public String getId() {
     return this.id;
   }
 
   /**
-   * Unique id for controlling the given query.
+   * Unique id for controlling the given query, leave null for server side assignment.
    */
-  public QueryArgs setId(long id) {
+  public QueryArgs setId(String id) {
     this.id = id;
-    setIdIsSet(true);
     return this;
   }
 
   public void unsetId() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ID_ISSET_ID);
+    this.id = null;
   }
 
   /** 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);
+    return this.id != null;
   }
 
   public void setIdIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ID_ISSET_ID, value);
+    if (!value) {
+      this.id = null;
+    }
   }
 
   /**
@@ -706,7 +706,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       if (value == null) {
         unsetId();
       } else {
-        setId((Long)value);
+        setId((String)value);
       }
       break;
 
@@ -788,7 +788,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
   public Object getFieldValue(_Fields field) {
     switch (field) {
     case ID:
-      return Long.valueOf(getId());
+      return getId();
 
     case AFTER:
       return getAfter();
@@ -865,12 +865,12 @@ 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;
+    boolean this_present_id = true && this.isSetId();
+    boolean that_present_id = true && that.isSetId();
     if (this_present_id || that_present_id) {
       if (!(this_present_id && that_present_id))
         return false;
-      if (this.id != that.id)
+      if (!this.id.equals(that.id))
         return false;
     }
 
@@ -1092,7 +1092,11 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
     boolean first = true;
 
     sb.append("id:");
-    sb.append(this.id);
+    if (this.id == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.id);
+    }
     first = false;
     if (!first) sb.append(", ");
     sb.append("after:");
@@ -1205,8 +1209,8 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
         }
         switch (schemeField.id) {
           case 1: // ID
-            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
-              struct.id = iprot.readI64();
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.id = iprot.readString();
               struct.setIdIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
@@ -1282,13 +1286,13 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
           case 10: // SHARD_INDEXES
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list70 = iprot.readListBegin();
-                struct.shardIndexes = new ArrayList<Integer>(_list70.size);
-                for (int _i71 = 0; _i71 < _list70.size; ++_i71)
+                org.apache.thrift.protocol.TList _list60 = iprot.readListBegin();
+                struct.shardIndexes = new ArrayList<Integer>(_list60.size);
+                for (int _i61 = 0; _i61 < _list60.size; ++_i61)
                 {
-                  int _elem72; // required
-                  _elem72 = iprot.readI32();
-                  struct.shardIndexes.add(_elem72);
+                  int _elem62; // required
+                  _elem62 = iprot.readI32();
+                  struct.shardIndexes.add(_elem62);
                 }
                 iprot.readListEnd();
               }
@@ -1312,9 +1316,11 @@ 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.id != null) {
+        oprot.writeFieldBegin(ID_FIELD_DESC);
+        oprot.writeString(struct.id);
+        oprot.writeFieldEnd();
+      }
       if (struct.after != null) {
         oprot.writeFieldBegin(AFTER_FIELD_DESC);
         struct.after.write(oprot);
@@ -1351,9 +1357,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 _iter73 : struct.shardIndexes)
+          for (int _iter63 : struct.shardIndexes)
           {
-            oprot.writeI32(_iter73);
+            oprot.writeI32(_iter63);
           }
           oprot.writeListEnd();
         }
@@ -1409,7 +1415,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       }
       oprot.writeBitSet(optionals, 10);
       if (struct.isSetId()) {
-        oprot.writeI64(struct.id);
+        oprot.writeString(struct.id);
       }
       if (struct.isSetAfter()) {
         struct.after.write(oprot);
@@ -1438,9 +1444,9 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       if (struct.isSetShardIndexes()) {
         {
           oprot.writeI32(struct.shardIndexes.size());
-          for (int _iter74 : struct.shardIndexes)
+          for (int _iter64 : struct.shardIndexes)
           {
-            oprot.writeI32(_iter74);
+            oprot.writeI32(_iter64);
           }
         }
       }
@@ -1451,7 +1457,7 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(10);
       if (incoming.get(0)) {
-        struct.id = iprot.readI64();
+        struct.id = iprot.readString();
         struct.setIdIsSet(true);
       }
       if (incoming.get(1)) {
@@ -1491,13 +1497,13 @@ public class QueryArgs implements org.apache.thrift.TBase<QueryArgs, QueryArgs._
       }
       if (incoming.get(9)) {
         {
-          org.apache.thrift.protocol.TList _list75 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.shardIndexes = new ArrayList<Integer>(_list75.size);
-          for (int _i76 = 0; _i76 < _list75.size; ++_i76)
+          org.apache.thrift.protocol.TList _list65 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.shardIndexes = new ArrayList<Integer>(_list65.size);
+          for (int _i66 = 0; _i66 < _list65.size; ++_i66)
           {
-            int _elem77; // required
-            _elem77 = iprot.readI32();
-            struct.shardIndexes.add(_elem77);
+            int _elem67; // required
+            _elem67 = iprot.readI32();
+            struct.shardIndexes.add(_elem67);
           }
         }
         struct.setShardIndexesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
index 8c39037..c36099c 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/QueryStatus.java
@@ -50,15 +50,19 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 /**
- * 
+ * Contains the query status information for a query on a server.
  */
 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 org.apache.thrift.protocol.TField START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("startTime", org.apache.thrift.protocol.TType.I64, (short)1);
+  private static final org.apache.thrift.protocol.TField END_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("endTime", org.apache.thrift.protocol.TType.I64, (short)2);
+  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)3);
+  private static final org.apache.thrift.protocol.TField USER_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("userTime", org.apache.thrift.protocol.TType.I64, (short)4);
+  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)5);
+  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)6);
+  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)7);
+  private static final org.apache.thrift.protocol.TField QUERY_ARGS_FIELD_DESC = new org.apache.thrift.protocol.TField("queryArgs", org.apache.thrift.protocol.TType.STRUCT, (short)8);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -67,44 +71,76 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   }
 
   /**
-   * 
+   * The startTime as set on the server, this is when the query has started executing.  This could be different depending on the server.
    */
-  public Map<String,CpuTime> cpuTimes; // required
+  public long startTime; // required
   /**
-   * 
+   * The endTime as set on the server, this is when the query has stopped executing.  This could be different depending on the server.
+   */
+  public long endTime; // required
+  /**
+   * The amount cpu time spent executing the given query.
+   */
+  public long cpuTime; // required
+  /**
+   * The total amount of time spent executing the query.
+   */
+  public long userTime; // required
+  /**
+   * The number of shards that this server has completed.
    */
   public int completeShards; // required
   /**
-   * 
+   * The number of shards that this server has to complete.
    */
   public int totalShards; // required
   /**
-   * 
+   * The state of the query.  This could be different depending on the server.
    * 
    * @see QueryState
    */
   public QueryState state; // required
+  /**
+   * The query that is executing.
+   */
+  public QueryArgs queryArgs; // 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 {
     /**
-     * 
+     * The startTime as set on the server, this is when the query has started executing.  This could be different depending on the server.
      */
-    CPU_TIMES((short)1, "cpuTimes"),
+    START_TIME((short)1, "startTime"),
     /**
-     * 
+     * The endTime as set on the server, this is when the query has stopped executing.  This could be different depending on the server.
      */
-    COMPLETE_SHARDS((short)2, "completeShards"),
+    END_TIME((short)2, "endTime"),
     /**
-     * 
+     * The amount cpu time spent executing the given query.
      */
-    TOTAL_SHARDS((short)3, "totalShards"),
+    CPU_TIME((short)3, "cpuTime"),
     /**
-     * 
+     * The total amount of time spent executing the query.
+     */
+    USER_TIME((short)4, "userTime"),
+    /**
+     * The number of shards that this server has completed.
+     */
+    COMPLETE_SHARDS((short)5, "completeShards"),
+    /**
+     * The number of shards that this server has to complete.
+     */
+    TOTAL_SHARDS((short)6, "totalShards"),
+    /**
+     * The state of the query.  This could be different depending on the server.
      * 
      * @see QueryState
      */
-    STATE((short)4, "state");
+    STATE((short)7, "state"),
+    /**
+     * The query that is executing.
+     */
+    QUERY_ARGS((short)8, "queryArgs");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -119,14 +155,22 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // CPU_TIMES
-          return CPU_TIMES;
-        case 2: // COMPLETE_SHARDS
+        case 1: // START_TIME
+          return START_TIME;
+        case 2: // END_TIME
+          return END_TIME;
+        case 3: // CPU_TIME
+          return CPU_TIME;
+        case 4: // USER_TIME
+          return USER_TIME;
+        case 5: // COMPLETE_SHARDS
           return COMPLETE_SHARDS;
-        case 3: // TOTAL_SHARDS
+        case 6: // TOTAL_SHARDS
           return TOTAL_SHARDS;
-        case 4: // STATE
+        case 7: // STATE
           return STATE;
+        case 8: // QUERY_ARGS
+          return QUERY_ARGS;
         default:
           return null;
       }
@@ -167,22 +211,32 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   }
 
   // isset id assignments
-  private static final int __COMPLETESHARDS_ISSET_ID = 0;
-  private static final int __TOTALSHARDS_ISSET_ID = 1;
+  private static final int __STARTTIME_ISSET_ID = 0;
+  private static final int __ENDTIME_ISSET_ID = 1;
+  private static final int __CPUTIME_ISSET_ID = 2;
+  private static final int __USERTIME_ISSET_ID = 3;
+  private static final int __COMPLETESHARDS_ISSET_ID = 4;
+  private static final int __TOTALSHARDS_ISSET_ID = 5;
   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.START_TIME, new org.apache.thrift.meta_data.FieldMetaData("startTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.END_TIME, new org.apache.thrift.meta_data.FieldMetaData("endTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.CPU_TIME, new org.apache.thrift.meta_data.FieldMetaData("cpuTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
+    tmpMap.put(_Fields.USER_TIME, new org.apache.thrift.meta_data.FieldMetaData("userTime", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
     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)));
+    tmpMap.put(_Fields.QUERY_ARGS, new org.apache.thrift.meta_data.FieldMetaData("queryArgs", org.apache.thrift.TFieldRequirementType.DEFAULT, 
+        new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, QueryArgs.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(QueryStatus.class, metaDataMap);
   }
@@ -191,18 +245,30 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   }
 
   public QueryStatus(
-    Map<String,CpuTime> cpuTimes,
+    long startTime,
+    long endTime,
+    long cpuTime,
+    long userTime,
     int completeShards,
     int totalShards,
-    QueryState state)
+    QueryState state,
+    QueryArgs queryArgs)
   {
     this();
-    this.cpuTimes = cpuTimes;
+    this.startTime = startTime;
+    setStartTimeIsSet(true);
+    this.endTime = endTime;
+    setEndTimeIsSet(true);
+    this.cpuTime = cpuTime;
+    setCpuTimeIsSet(true);
+    this.userTime = userTime;
+    setUserTimeIsSet(true);
     this.completeShards = completeShards;
     setCompleteShardsIsSet(true);
     this.totalShards = totalShards;
     setTotalShardsIsSet(true);
     this.state = state;
+    this.queryArgs = queryArgs;
   }
 
   /**
@@ -210,26 +276,18 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
    */
   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.startTime = other.startTime;
+    this.endTime = other.endTime;
+    this.cpuTime = other.cpuTime;
+    this.userTime = other.userTime;
     this.completeShards = other.completeShards;
     this.totalShards = other.totalShards;
     if (other.isSetState()) {
       this.state = other.state;
     }
+    if (other.isSetQueryArgs()) {
+      this.queryArgs = new QueryArgs(other.queryArgs);
+    }
   }
 
   public QueryStatus deepCopy() {
@@ -238,64 +296,147 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
 
   @Override
   public void clear() {
-    this.cpuTimes = null;
+    setStartTimeIsSet(false);
+    this.startTime = 0;
+    setEndTimeIsSet(false);
+    this.endTime = 0;
+    setCpuTimeIsSet(false);
+    this.cpuTime = 0;
+    setUserTimeIsSet(false);
+    this.userTime = 0;
     setCompleteShardsIsSet(false);
     this.completeShards = 0;
     setTotalShardsIsSet(false);
     this.totalShards = 0;
     this.state = null;
+    this.queryArgs = null;
   }
 
-  public int getCpuTimesSize() {
-    return (this.cpuTimes == null) ? 0 : this.cpuTimes.size();
+  /**
+   * The startTime as set on the server, this is when the query has started executing.  This could be different depending on the server.
+   */
+  public long getStartTime() {
+    return this.startTime;
   }
 
-  public void putToCpuTimes(String key, CpuTime val) {
-    if (this.cpuTimes == null) {
-      this.cpuTimes = new HashMap<String,CpuTime>();
-    }
-    this.cpuTimes.put(key, val);
+  /**
+   * The startTime as set on the server, this is when the query has started executing.  This could be different depending on the server.
+   */
+  public QueryStatus setStartTime(long startTime) {
+    this.startTime = startTime;
+    setStartTimeIsSet(true);
+    return this;
+  }
+
+  public void unsetStartTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+  }
+
+  /** Returns true if field startTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetStartTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __STARTTIME_ISSET_ID);
+  }
+
+  public void setStartTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __STARTTIME_ISSET_ID, value);
   }
 
   /**
-   * 
+   * The endTime as set on the server, this is when the query has stopped executing.  This could be different depending on the server.
    */
-  public Map<String,CpuTime> getCpuTimes() {
-    return this.cpuTimes;
+  public long getEndTime() {
+    return this.endTime;
   }
 
   /**
-   * 
+   * The endTime as set on the server, this is when the query has stopped executing.  This could be different depending on the server.
    */
-  public QueryStatus setCpuTimes(Map<String,CpuTime> cpuTimes) {
-    this.cpuTimes = cpuTimes;
+  public QueryStatus setEndTime(long endTime) {
+    this.endTime = endTime;
+    setEndTimeIsSet(true);
     return this;
   }
 
-  public void unsetCpuTimes() {
-    this.cpuTimes = null;
+  public void unsetEndTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
-  /** Returns true if field cpuTimes is set (has been assigned a value) and false otherwise */
-  public boolean isSetCpuTimes() {
-    return this.cpuTimes != null;
+  /** Returns true if field endTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetEndTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __ENDTIME_ISSET_ID);
   }
 
-  public void setCpuTimesIsSet(boolean value) {
-    if (!value) {
-      this.cpuTimes = null;
-    }
+  public void setEndTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ENDTIME_ISSET_ID, value);
   }
 
   /**
-   * 
+   * The amount cpu time spent executing the given query.
+   */
+  public long getCpuTime() {
+    return this.cpuTime;
+  }
+
+  /**
+   * The amount cpu time spent executing the given query.
+   */
+  public QueryStatus setCpuTime(long cpuTime) {
+    this.cpuTime = cpuTime;
+    setCpuTimeIsSet(true);
+    return this;
+  }
+
+  public void unsetCpuTime() {
+    __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 EncodingUtils.testBit(__isset_bitfield, __CPUTIME_ISSET_ID);
+  }
+
+  public void setCpuTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __CPUTIME_ISSET_ID, value);
+  }
+
+  /**
+   * The total amount of time spent executing the query.
+   */
+  public long getUserTime() {
+    return this.userTime;
+  }
+
+  /**
+   * The total amount of time spent executing the query.
+   */
+  public QueryStatus setUserTime(long userTime) {
+    this.userTime = userTime;
+    setUserTimeIsSet(true);
+    return this;
+  }
+
+  public void unsetUserTime() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __USERTIME_ISSET_ID);
+  }
+
+  /** Returns true if field userTime is set (has been assigned a value) and false otherwise */
+  public boolean isSetUserTime() {
+    return EncodingUtils.testBit(__isset_bitfield, __USERTIME_ISSET_ID);
+  }
+
+  public void setUserTimeIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __USERTIME_ISSET_ID, value);
+  }
+
+  /**
+   * The number of shards that this server has completed.
    */
   public int getCompleteShards() {
     return this.completeShards;
   }
 
   /**
-   * 
+   * The number of shards that this server has completed.
    */
   public QueryStatus setCompleteShards(int completeShards) {
     this.completeShards = completeShards;
@@ -317,14 +458,14 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   }
 
   /**
-   * 
+   * The number of shards that this server has to complete.
    */
   public int getTotalShards() {
     return this.totalShards;
   }
 
   /**
-   * 
+   * The number of shards that this server has to complete.
    */
   public QueryStatus setTotalShards(int totalShards) {
     this.totalShards = totalShards;
@@ -346,7 +487,7 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   }
 
   /**
-   * 
+   * The state of the query.  This could be different depending on the server.
    * 
    * @see QueryState
    */
@@ -355,7 +496,7 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   }
 
   /**
-   * 
+   * The state of the query.  This could be different depending on the server.
    * 
    * @see QueryState
    */
@@ -379,13 +520,67 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     }
   }
 
+  /**
+   * The query that is executing.
+   */
+  public QueryArgs getQueryArgs() {
+    return this.queryArgs;
+  }
+
+  /**
+   * The query that is executing.
+   */
+  public QueryStatus setQueryArgs(QueryArgs queryArgs) {
+    this.queryArgs = queryArgs;
+    return this;
+  }
+
+  public void unsetQueryArgs() {
+    this.queryArgs = null;
+  }
+
+  /** Returns true if field queryArgs is set (has been assigned a value) and false otherwise */
+  public boolean isSetQueryArgs() {
+    return this.queryArgs != null;
+  }
+
+  public void setQueryArgsIsSet(boolean value) {
+    if (!value) {
+      this.queryArgs = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case CPU_TIMES:
+    case START_TIME:
       if (value == null) {
-        unsetCpuTimes();
+        unsetStartTime();
       } else {
-        setCpuTimes((Map<String,CpuTime>)value);
+        setStartTime((Long)value);
+      }
+      break;
+
+    case END_TIME:
+      if (value == null) {
+        unsetEndTime();
+      } else {
+        setEndTime((Long)value);
+      }
+      break;
+
+    case CPU_TIME:
+      if (value == null) {
+        unsetCpuTime();
+      } else {
+        setCpuTime((Long)value);
+      }
+      break;
+
+    case USER_TIME:
+      if (value == null) {
+        unsetUserTime();
+      } else {
+        setUserTime((Long)value);
       }
       break;
 
@@ -413,13 +608,30 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
       }
       break;
 
+    case QUERY_ARGS:
+      if (value == null) {
+        unsetQueryArgs();
+      } else {
+        setQueryArgs((QueryArgs)value);
+      }
+      break;
+
     }
   }
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case CPU_TIMES:
-      return getCpuTimes();
+    case START_TIME:
+      return Long.valueOf(getStartTime());
+
+    case END_TIME:
+      return Long.valueOf(getEndTime());
+
+    case CPU_TIME:
+      return Long.valueOf(getCpuTime());
+
+    case USER_TIME:
+      return Long.valueOf(getUserTime());
 
     case COMPLETE_SHARDS:
       return Integer.valueOf(getCompleteShards());
@@ -430,6 +642,9 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     case STATE:
       return getState();
 
+    case QUERY_ARGS:
+      return getQueryArgs();
+
     }
     throw new IllegalStateException();
   }
@@ -441,14 +656,22 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     }
 
     switch (field) {
-    case CPU_TIMES:
-      return isSetCpuTimes();
+    case START_TIME:
+      return isSetStartTime();
+    case END_TIME:
+      return isSetEndTime();
+    case CPU_TIME:
+      return isSetCpuTime();
+    case USER_TIME:
+      return isSetUserTime();
     case COMPLETE_SHARDS:
       return isSetCompleteShards();
     case TOTAL_SHARDS:
       return isSetTotalShards();
     case STATE:
       return isSetState();
+    case QUERY_ARGS:
+      return isSetQueryArgs();
     }
     throw new IllegalStateException();
   }
@@ -466,12 +689,39 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     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))
+    boolean this_present_startTime = true;
+    boolean that_present_startTime = true;
+    if (this_present_startTime || that_present_startTime) {
+      if (!(this_present_startTime && that_present_startTime))
         return false;
-      if (!this.cpuTimes.equals(that.cpuTimes))
+      if (this.startTime != that.startTime)
+        return false;
+    }
+
+    boolean this_present_endTime = true;
+    boolean that_present_endTime = true;
+    if (this_present_endTime || that_present_endTime) {
+      if (!(this_present_endTime && that_present_endTime))
+        return false;
+      if (this.endTime != that.endTime)
+        return false;
+    }
+
+    boolean this_present_cpuTime = true;
+    boolean that_present_cpuTime = true;
+    if (this_present_cpuTime || that_present_cpuTime) {
+      if (!(this_present_cpuTime && that_present_cpuTime))
+        return false;
+      if (this.cpuTime != that.cpuTime)
+        return false;
+    }
+
+    boolean this_present_userTime = true;
+    boolean that_present_userTime = true;
+    if (this_present_userTime || that_present_userTime) {
+      if (!(this_present_userTime && that_present_userTime))
+        return false;
+      if (this.userTime != that.userTime)
         return false;
     }
 
@@ -502,6 +752,15 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
         return false;
     }
 
+    boolean this_present_queryArgs = true && this.isSetQueryArgs();
+    boolean that_present_queryArgs = true && that.isSetQueryArgs();
+    if (this_present_queryArgs || that_present_queryArgs) {
+      if (!(this_present_queryArgs && that_present_queryArgs))
+        return false;
+      if (!this.queryArgs.equals(that.queryArgs))
+        return false;
+    }
+
     return true;
   }
 
@@ -518,12 +777,42 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     int lastComparison = 0;
     QueryStatus typedOther = (QueryStatus)other;
 
-    lastComparison = Boolean.valueOf(isSetCpuTimes()).compareTo(typedOther.isSetCpuTimes());
+    lastComparison = Boolean.valueOf(isSetStartTime()).compareTo(typedOther.isSetStartTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetStartTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.startTime, typedOther.startTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetEndTime()).compareTo(typedOther.isSetEndTime());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetCpuTimes()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpuTimes, typedOther.cpuTimes);
+    if (isSetEndTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.endTime, typedOther.endTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetCpuTime()).compareTo(typedOther.isSetCpuTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetCpuTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.cpuTime, typedOther.cpuTime);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetUserTime()).compareTo(typedOther.isSetUserTime());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetUserTime()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.userTime, typedOther.userTime);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -558,6 +847,16 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetQueryArgs()).compareTo(typedOther.isSetQueryArgs());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetQueryArgs()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryArgs, typedOther.queryArgs);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -578,12 +877,20 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     StringBuilder sb = new StringBuilder("QueryStatus(");
     boolean first = true;
 
-    sb.append("cpuTimes:");
-    if (this.cpuTimes == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.cpuTimes);
-    }
+    sb.append("startTime:");
+    sb.append(this.startTime);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("endTime:");
+    sb.append(this.endTime);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("cpuTime:");
+    sb.append(this.cpuTime);
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("userTime:");
+    sb.append(this.userTime);
     first = false;
     if (!first) sb.append(", ");
     sb.append("completeShards:");
@@ -601,6 +908,14 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
       sb.append(this.state);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("queryArgs:");
+    if (this.queryArgs == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.queryArgs);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -608,6 +923,9 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
   public void validate() throws org.apache.thrift.TException {
     // check for required fields
     // check for sub-struct validity
+    if (queryArgs != null) {
+      queryArgs.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -646,28 +964,39 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
           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);
+          case 1: // START_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.startTime = iprot.readI64();
+              struct.setStartTimeIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 2: // COMPLETE_SHARDS
+          case 2: // END_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.endTime = iprot.readI64();
+              struct.setEndTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 3: // 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 4: // USER_TIME
+            if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
+              struct.userTime = iprot.readI64();
+              struct.setUserTimeIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 5: // COMPLETE_SHARDS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.completeShards = iprot.readI32();
               struct.setCompleteShardsIsSet(true);
@@ -675,7 +1004,7 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 3: // TOTAL_SHARDS
+          case 6: // TOTAL_SHARDS
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.totalShards = iprot.readI32();
               struct.setTotalShardsIsSet(true);
@@ -683,7 +1012,7 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 4: // STATE
+          case 7: // STATE
             if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
               struct.state = QueryState.findByValue(iprot.readI32());
               struct.setStateIsSet(true);
@@ -691,6 +1020,15 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 8: // QUERY_ARGS
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRUCT) {
+              struct.queryArgs = new QueryArgs();
+              struct.queryArgs.read(iprot);
+              struct.setQueryArgsIsSet(true);
+            } else { 
+              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -706,19 +1044,18 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
       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(START_TIME_FIELD_DESC);
+      oprot.writeI64(struct.startTime);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(END_TIME_FIELD_DESC);
+      oprot.writeI64(struct.endTime);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(CPU_TIME_FIELD_DESC);
+      oprot.writeI64(struct.cpuTime);
+      oprot.writeFieldEnd();
+      oprot.writeFieldBegin(USER_TIME_FIELD_DESC);
+      oprot.writeI64(struct.userTime);
+      oprot.writeFieldEnd();
       oprot.writeFieldBegin(COMPLETE_SHARDS_FIELD_DESC);
       oprot.writeI32(struct.completeShards);
       oprot.writeFieldEnd();
@@ -730,6 +1067,11 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
         oprot.writeI32(struct.state.getValue());
         oprot.writeFieldEnd();
       }
+      if (struct.queryArgs != null) {
+        oprot.writeFieldBegin(QUERY_ARGS_FIELD_DESC);
+        struct.queryArgs.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -748,28 +1090,42 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
     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()) {
+      if (struct.isSetStartTime()) {
         optionals.set(0);
       }
-      if (struct.isSetCompleteShards()) {
+      if (struct.isSetEndTime()) {
         optionals.set(1);
       }
-      if (struct.isSetTotalShards()) {
+      if (struct.isSetCpuTime()) {
         optionals.set(2);
       }
-      if (struct.isSetState()) {
+      if (struct.isSetUserTime()) {
         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()) {
+        optionals.set(4);
+      }
+      if (struct.isSetTotalShards()) {
+        optionals.set(5);
+      }
+      if (struct.isSetState()) {
+        optionals.set(6);
+      }
+      if (struct.isSetQueryArgs()) {
+        optionals.set(7);
+      }
+      oprot.writeBitSet(optionals, 8);
+      if (struct.isSetStartTime()) {
+        oprot.writeI64(struct.startTime);
+      }
+      if (struct.isSetEndTime()) {
+        oprot.writeI64(struct.endTime);
+      }
+      if (struct.isSetCpuTime()) {
+        oprot.writeI64(struct.cpuTime);
+      }
+      if (struct.isSetUserTime()) {
+        oprot.writeI64(struct.userTime);
       }
       if (struct.isSetCompleteShards()) {
         oprot.writeI32(struct.completeShards);
@@ -780,40 +1136,48 @@ public class QueryStatus implements org.apache.thrift.TBase<QueryStatus, QuerySt
       if (struct.isSetState()) {
         oprot.writeI32(struct.state.getValue());
       }
+      if (struct.isSetQueryArgs()) {
+        struct.queryArgs.write(oprot);
+      }
     }
 
     @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);
+      BitSet incoming = iprot.readBitSet(8);
       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);
+        struct.startTime = iprot.readI64();
+        struct.setStartTimeIsSet(true);
       }
       if (incoming.get(1)) {
+        struct.endTime = iprot.readI64();
+        struct.setEndTimeIsSet(true);
+      }
+      if (incoming.get(2)) {
+        struct.cpuTime = iprot.readI64();
+        struct.setCpuTimeIsSet(true);
+      }
+      if (incoming.get(3)) {
+        struct.userTime = iprot.readI64();
+        struct.setUserTimeIsSet(true);
+      }
+      if (incoming.get(4)) {
         struct.completeShards = iprot.readI32();
         struct.setCompleteShardsIsSet(true);
       }
-      if (incoming.get(2)) {
+      if (incoming.get(5)) {
         struct.totalShards = iprot.readI32();
         struct.setTotalShardsIsSet(true);
       }
-      if (incoming.get(3)) {
+      if (incoming.get(6)) {
         struct.state = QueryState.findByValue(iprot.readI32());
         struct.setStateIsSet(true);
       }
+      if (incoming.get(7)) {
+        struct.queryArgs = new QueryArgs();
+        struct.queryArgs.read(iprot);
+        struct.setQueryArgsIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
index a440de6..b07f1c2 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ScoreDoc.java
@@ -526,13 +526,13 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc, ScoreDoc._Fie
           case 4: // FIELDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list62 = iprot.readListBegin();
-                struct.fields = new ArrayList<ByteBuffer>(_list62.size);
-                for (int _i63 = 0; _i63 < _list62.size; ++_i63)
+                org.apache.thrift.protocol.TList _list52 = iprot.readListBegin();
+                struct.fields = new ArrayList<ByteBuffer>(_list52.size);
+                for (int _i53 = 0; _i53 < _list52.size; ++_i53)
                 {
-                  ByteBuffer _elem64; // required
-                  _elem64 = iprot.readBinary();
-                  struct.fields.add(_elem64);
+                  ByteBuffer _elem54; // required
+                  _elem54 = iprot.readBinary();
+                  struct.fields.add(_elem54);
                 }
                 iprot.readListEnd();
               }
@@ -566,9 +566,9 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc, ScoreDoc._Fie
         oprot.writeFieldBegin(FIELDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, struct.fields.size()));
-          for (ByteBuffer _iter65 : struct.fields)
+          for (ByteBuffer _iter55 : struct.fields)
           {
-            oprot.writeBinary(_iter65);
+            oprot.writeBinary(_iter55);
           }
           oprot.writeListEnd();
         }
@@ -611,9 +611,9 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc, ScoreDoc._Fie
       if (struct.isSetFields()) {
         {
           oprot.writeI32(struct.fields.size());
-          for (ByteBuffer _iter66 : struct.fields)
+          for (ByteBuffer _iter56 : struct.fields)
           {
-            oprot.writeBinary(_iter66);
+            oprot.writeBinary(_iter56);
           }
         }
       }
@@ -633,13 +633,13 @@ public class ScoreDoc implements org.apache.thrift.TBase<ScoreDoc, ScoreDoc._Fie
       }
       if (incoming.get(2)) {
         {
-          org.apache.thrift.protocol.TList _list67 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
-          struct.fields = new ArrayList<ByteBuffer>(_list67.size);
-          for (int _i68 = 0; _i68 < _list67.size; ++_i68)
+          org.apache.thrift.protocol.TList _list57 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRING, iprot.readI32());
+          struct.fields = new ArrayList<ByteBuffer>(_list57.size);
+          for (int _i58 = 0; _i58 < _list57.size; ++_i58)
           {
-            ByteBuffer _elem69; // required
-            _elem69 = iprot.readBinary();
-            struct.fields.add(_elem69);
+            ByteBuffer _elem59; // required
+            _elem59 = iprot.readBinary();
+            struct.fields.add(_elem59);
           }
         }
         struct.setFieldsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ShardLayout.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ShardLayout.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ShardLayout.java
index 04ab0c0..22fa214 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ShardLayout.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ShardLayout.java
@@ -467,13 +467,13 @@ public class ShardLayout implements org.apache.thrift.TBase<ShardLayout, ShardLa
           case 2: // SHARDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list110 = iprot.readListBegin();
-                struct.shards = new ArrayList<Integer>(_list110.size);
-                for (int _i111 = 0; _i111 < _list110.size; ++_i111)
+                org.apache.thrift.protocol.TList _list100 = iprot.readListBegin();
+                struct.shards = new ArrayList<Integer>(_list100.size);
+                for (int _i101 = 0; _i101 < _list100.size; ++_i101)
                 {
-                  int _elem112; // required
-                  _elem112 = iprot.readI32();
-                  struct.shards.add(_elem112);
+                  int _elem102; // required
+                  _elem102 = iprot.readI32();
+                  struct.shards.add(_elem102);
                 }
                 iprot.readListEnd();
               }
@@ -506,9 +506,9 @@ public class ShardLayout implements org.apache.thrift.TBase<ShardLayout, ShardLa
         oprot.writeFieldBegin(SHARDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, struct.shards.size()));
-          for (int _iter113 : struct.shards)
+          for (int _iter103 : struct.shards)
           {
-            oprot.writeI32(_iter113);
+            oprot.writeI32(_iter103);
           }
           oprot.writeListEnd();
         }
@@ -545,9 +545,9 @@ public class ShardLayout implements org.apache.thrift.TBase<ShardLayout, ShardLa
       if (struct.isSetShards()) {
         {
           oprot.writeI32(struct.shards.size());
-          for (int _iter114 : struct.shards)
+          for (int _iter104 : struct.shards)
           {
-            oprot.writeI32(_iter114);
+            oprot.writeI32(_iter104);
           }
         }
       }
@@ -563,13 +563,13 @@ public class ShardLayout implements org.apache.thrift.TBase<ShardLayout, ShardLa
       }
       if (incoming.get(1)) {
         {
-          org.apache.thrift.protocol.TList _list115 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
-          struct.shards = new ArrayList<Integer>(_list115.size);
-          for (int _i116 = 0; _i116 < _list115.size; ++_i116)
+          org.apache.thrift.protocol.TList _list105 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.I32, iprot.readI32());
+          struct.shards = new ArrayList<Integer>(_list105.size);
+          for (int _i106 = 0; _i106 < _list105.size; ++_i106)
           {
-            int _elem117; // required
-            _elem117 = iprot.readI32();
-            struct.shards.add(_elem117);
+            int _elem107; // required
+            _elem107 = iprot.readI32();
+            struct.shards.add(_elem107);
           }
         }
         struct.setShardsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/a2585810/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Sort.java b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
index d8647f5..bfdb8e4 100644
--- a/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
+++ b/src/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Sort.java
@@ -358,14 +358,14 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
           case 1: // FIELDS
             if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
               {
-                org.apache.thrift.protocol.TList _list54 = iprot.readListBegin();
-                struct.fields = new ArrayList<SortField>(_list54.size);
-                for (int _i55 = 0; _i55 < _list54.size; ++_i55)
+                org.apache.thrift.protocol.TList _list44 = iprot.readListBegin();
+                struct.fields = new ArrayList<SortField>(_list44.size);
+                for (int _i45 = 0; _i45 < _list44.size; ++_i45)
                 {
-                  SortField _elem56; // required
-                  _elem56 = new SortField();
-                  _elem56.read(iprot);
-                  struct.fields.add(_elem56);
+                  SortField _elem46; // required
+                  _elem46 = new SortField();
+                  _elem46.read(iprot);
+                  struct.fields.add(_elem46);
                 }
                 iprot.readListEnd();
               }
@@ -393,9 +393,9 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
         oprot.writeFieldBegin(FIELDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.fields.size()));
-          for (SortField _iter57 : struct.fields)
+          for (SortField _iter47 : struct.fields)
           {
-            _iter57.write(oprot);
+            _iter47.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -426,9 +426,9 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
       if (struct.isSetFields()) {
         {
           oprot.writeI32(struct.fields.size());
-          for (SortField _iter58 : struct.fields)
+          for (SortField _iter48 : struct.fields)
           {
-            _iter58.write(oprot);
+            _iter48.write(oprot);
           }
         }
       }
@@ -440,14 +440,14 @@ public class Sort implements org.apache.thrift.TBase<Sort, Sort._Fields>, java.i
       BitSet incoming = iprot.readBitSet(1);
       if (incoming.get(0)) {
         {
-          org.apache.thrift.protocol.TList _list59 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
-          struct.fields = new ArrayList<SortField>(_list59.size);
-          for (int _i60 = 0; _i60 < _list59.size; ++_i60)
+          org.apache.thrift.protocol.TList _list49 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
+          struct.fields = new ArrayList<SortField>(_list49.size);
+          for (int _i50 = 0; _i50 < _list49.size; ++_i50)
           {
-            SortField _elem61; // required
-            _elem61 = new SortField();
-            _elem61.read(iprot);
-            struct.fields.add(_elem61);
+            SortField _elem51; // required
+            _elem51 = new SortField();
+            _elem51.read(iprot);
+            struct.fields.add(_elem51);
           }
         }
         struct.setFieldsIsSet(true);


Mime
View raw message