incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [4/6] Sorry for the huge commit, I was trying to unit test the cancel query method. I found a problem with how I was dealing with exception handling in the controller. So I created a enum type ErrorType in thrift and added to BlurException. So that's
Date Sun, 30 Jun 2013 02:10:37 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BackPressureException.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BackPressureException.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BackPressureException.java
deleted file mode 100644
index 8a253c7..0000000
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BackPressureException.java
+++ /dev/null
@@ -1,420 +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.blur.thirdparty.thrift_0_9_0.scheme.IScheme;
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.SchemeFactory;
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.StandardScheme;
-
-import org.apache.blur.thirdparty.thrift_0_9_0.scheme.TupleScheme;
-import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TTupleProtocol;
-import org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolException;
-import org.apache.blur.thirdparty.thrift_0_9_0.EncodingUtils;
-import org.apache.blur.thirdparty.thrift_0_9_0.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;
-
-/**
- * BackPressureException that carries a message.
- */
-public class BackPressureException extends TException implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<BackPressureException, BackPressureException._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct STRUCT_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TStruct("BackPressureException");
-
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField MESSAGE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("message", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new BackPressureExceptionStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new BackPressureExceptionTupleSchemeFactory());
-  }
-
-  /**
-   * The message in the exception.
-   */
-  public String message; // required
-
-  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
-  public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
-    /**
-     * The message in the exception.
-     */
-    MESSAGE((short)1, "message");
-
-    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: // MESSAGE
-          return MESSAGE;
-        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.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.MESSAGE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("message", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BackPressureException.class, metaDataMap);
-  }
-
-  public BackPressureException() {
-  }
-
-  public BackPressureException(
-    String message)
-  {
-    this();
-    this.message = message;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public BackPressureException(BackPressureException other) {
-    if (other.isSetMessage()) {
-      this.message = other.message;
-    }
-  }
-
-  public BackPressureException deepCopy() {
-    return new BackPressureException(this);
-  }
-
-  @Override
-  public void clear() {
-    this.message = null;
-  }
-
-  /**
-   * The message in the exception.
-   */
-  public String getMessage() {
-    return this.message;
-  }
-
-  /**
-   * The message in the exception.
-   */
-  public BackPressureException setMessage(String message) {
-    this.message = message;
-    return this;
-  }
-
-  public void unsetMessage() {
-    this.message = null;
-  }
-
-  /** Returns true if field message is set (has been assigned a value) and false otherwise */
-  public boolean isSetMessage() {
-    return this.message != null;
-  }
-
-  public void setMessageIsSet(boolean value) {
-    if (!value) {
-      this.message = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case MESSAGE:
-      if (value == null) {
-        unsetMessage();
-      } else {
-        setMessage((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case MESSAGE:
-      return getMessage();
-
-    }
-    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 MESSAGE:
-      return isSetMessage();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof BackPressureException)
-      return this.equals((BackPressureException)that);
-    return false;
-  }
-
-  public boolean equals(BackPressureException that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_message = true && this.isSetMessage();
-    boolean that_present_message = true && that.isSetMessage();
-    if (this_present_message || that_present_message) {
-      if (!(this_present_message && that_present_message))
-        return false;
-      if (!this.message.equals(that.message))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(BackPressureException other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    BackPressureException typedOther = (BackPressureException)other;
-
-    lastComparison = Boolean.valueOf(isSetMessage()).compareTo(typedOther.isSetMessage());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetMessage()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.message, typedOther.message);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    return 0;
-  }
-
-  public _Fields fieldForId(int fieldId) {
-    return _Fields.findByThriftId(fieldId);
-  }
-
-  public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
-  }
-
-  public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-    schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
-  }
-
-  @Override
-  public String toString() {
-    StringBuilder sb = new StringBuilder("BackPressureException(");
-    boolean first = true;
-
-    sb.append("message:");
-    if (this.message == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.message);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.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.blur.thirdparty.thrift_0_9_0.protocol.TCompactProtocol(new org.apache.blur.thirdparty.thrift_0_9_0.transport.TIOStreamTransport(out)));
-    } catch (org.apache.blur.thirdparty.thrift_0_9_0.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.blur.thirdparty.thrift_0_9_0.protocol.TCompactProtocol(new org.apache.blur.thirdparty.thrift_0_9_0.transport.TIOStreamTransport(in)));
-    } catch (org.apache.blur.thirdparty.thrift_0_9_0.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class BackPressureExceptionStandardSchemeFactory implements SchemeFactory {
-    public BackPressureExceptionStandardScheme getScheme() {
-      return new BackPressureExceptionStandardScheme();
-    }
-  }
-
-  private static class BackPressureExceptionStandardScheme extends StandardScheme<BackPressureException> {
-
-    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, BackPressureException struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField schemeField;
-      iprot.readStructBegin();
-      while (true)
-      {
-        schemeField = iprot.readFieldBegin();
-        if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STOP) { 
-          break;
-        }
-        switch (schemeField.id) {
-          case 1: // MESSAGE
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
-              struct.message = iprot.readString();
-              struct.setMessageIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          default:
-            org.apache.blur.thirdparty.thrift_0_9_0.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.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot, BackPressureException struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.message != null) {
-        oprot.writeFieldBegin(MESSAGE_FIELD_DESC);
-        oprot.writeString(struct.message);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class BackPressureExceptionTupleSchemeFactory implements SchemeFactory {
-    public BackPressureExceptionTupleScheme getScheme() {
-      return new BackPressureExceptionTupleScheme();
-    }
-  }
-
-  private static class BackPressureExceptionTupleScheme extends TupleScheme<BackPressureException> {
-
-    @Override
-    public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BackPressureException struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetMessage()) {
-        optionals.set(0);
-      }
-      oprot.writeBitSet(optionals, 1);
-      if (struct.isSetMessage()) {
-        oprot.writeString(struct.message);
-      }
-    }
-
-    @Override
-    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BackPressureException struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(1);
-      if (incoming.get(0)) {
-        struct.message = iprot.readString();
-        struct.setMessageIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
index 170b6f6..88b8357 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Blur.java
@@ -136,7 +136,7 @@ public class Blur {
      * @param table
      * @param blurQuery
      */
-    public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * Parses the given query and return the string represents the query.
@@ -194,7 +194,7 @@ public class Blur {
 
     public long recordFrequency(String table, String columnFamily, String columnName, String value) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
-    public FetchResult fetchRow(String table, Selector selector) throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public FetchResult fetchRow(String table, Selector selector) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     public void mutate(RowMutation mutation) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
@@ -507,7 +507,7 @@ public class Blur {
       throw new org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException(org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException.MISSING_RESULT, "describe failed: unknown result");
     }
 
-    public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public BlurResults query(String table, BlurQuery blurQuery) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       send_query(table, blurQuery);
       return recv_query();
@@ -521,7 +521,7 @@ public class Blur {
       sendBase("query", args);
     }
 
-    public BlurResults recv_query() throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public BlurResults recv_query() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       query_result result = new query_result();
       receiveBase(result, "query");
@@ -531,9 +531,6 @@ public class Blur {
       if (result.ex != null) {
         throw result.ex;
       }
-      if (result.bpex != null) {
-        throw result.bpex;
-      }
       throw new org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException(org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException.MISSING_RESULT, "query failed: unknown result");
     }
 
@@ -804,7 +801,7 @@ public class Blur {
       throw new org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException(org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException.MISSING_RESULT, "recordFrequency failed: unknown result");
     }
 
-    public FetchResult fetchRow(String table, Selector selector) throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public FetchResult fetchRow(String table, Selector selector) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       send_fetchRow(table, selector);
       return recv_fetchRow();
@@ -818,7 +815,7 @@ public class Blur {
       sendBase("fetchRow", args);
     }
 
-    public FetchResult recv_fetchRow() throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public FetchResult recv_fetchRow() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       fetchRow_result result = new fetchRow_result();
       receiveBase(result, "fetchRow");
@@ -828,9 +825,6 @@ public class Blur {
       if (result.ex != null) {
         throw result.ex;
       }
-      if (result.bpex != null) {
-        throw result.bpex;
-      }
       throw new org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException(org.apache.blur.thirdparty.thrift_0_9_0.TApplicationException.MISSING_RESULT, "fetchRow failed: unknown result");
     }
 
@@ -1364,7 +1358,7 @@ public class Blur {
         prot.writeMessageEnd();
       }
 
-      public BlurResults getResult() throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      public BlurResults getResult() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
         if (getState() != org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -1749,7 +1743,7 @@ public class Blur {
         prot.writeMessageEnd();
       }
 
-      public FetchResult getResult() throws BlurException, BackPressureException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      public FetchResult getResult() throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException {
         if (getState() != org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall.State.RESPONSE_READ) {
           throw new IllegalStateException("Method call not finished!");
         }
@@ -2339,8 +2333,6 @@ public class Blur {
           result.success = iface.query(args.table, args.blurQuery);
         } catch (BlurException ex) {
           result.ex = ex;
-        } catch (BackPressureException bpex) {
-          result.bpex = bpex;
         }
         return result;
       }
@@ -2606,8 +2598,6 @@ public class Blur {
           result.success = iface.fetchRow(args.table, args.selector);
         } catch (BlurException ex) {
           result.ex = ex;
-        } catch (BackPressureException bpex) {
-          result.bpex = bpex;
         }
         return result;
       }
@@ -9918,7 +9908,6 @@ public class Blur {
 
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SUCCESS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("success", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)0);
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField EX_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("ex", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField BPEX_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("bpex", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -9928,13 +9917,11 @@ public class Blur {
 
     public BlurResults success; // required
     public BlurException ex; // required
-    public BackPressureException bpex; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      EX((short)1, "ex"),
-      BPEX((short)2, "bpex");
+      EX((short)1, "ex");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -9953,8 +9940,6 @@ public class Blur {
             return SUCCESS;
           case 1: // EX
             return EX;
-          case 2: // BPEX
-            return BPEX;
           default:
             return null;
         }
@@ -10002,8 +9987,6 @@ public class Blur {
           new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, BlurResults.class)));
       tmpMap.put(_Fields.EX, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("ex", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
           new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT)));
-      tmpMap.put(_Fields.BPEX, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("bpex", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(query_result.class, metaDataMap);
     }
@@ -10013,13 +9996,11 @@ public class Blur {
 
     public query_result(
       BlurResults success,
-      BlurException ex,
-      BackPressureException bpex)
+      BlurException ex)
     {
       this();
       this.success = success;
       this.ex = ex;
-      this.bpex = bpex;
     }
 
     /**
@@ -10032,9 +10013,6 @@ public class Blur {
       if (other.isSetEx()) {
         this.ex = new BlurException(other.ex);
       }
-      if (other.isSetBpex()) {
-        this.bpex = new BackPressureException(other.bpex);
-      }
     }
 
     public query_result deepCopy() {
@@ -10045,7 +10023,6 @@ public class Blur {
     public void clear() {
       this.success = null;
       this.ex = null;
-      this.bpex = null;
     }
 
     public BlurResults getSuccess() {
@@ -10096,30 +10073,6 @@ public class Blur {
       }
     }
 
-    public BackPressureException getBpex() {
-      return this.bpex;
-    }
-
-    public query_result setBpex(BackPressureException bpex) {
-      this.bpex = bpex;
-      return this;
-    }
-
-    public void unsetBpex() {
-      this.bpex = null;
-    }
-
-    /** Returns true if field bpex is set (has been assigned a value) and false otherwise */
-    public boolean isSetBpex() {
-      return this.bpex != null;
-    }
-
-    public void setBpexIsSet(boolean value) {
-      if (!value) {
-        this.bpex = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -10138,14 +10091,6 @@ public class Blur {
         }
         break;
 
-      case BPEX:
-        if (value == null) {
-          unsetBpex();
-        } else {
-          setBpex((BackPressureException)value);
-        }
-        break;
-
       }
     }
 
@@ -10157,9 +10102,6 @@ public class Blur {
       case EX:
         return getEx();
 
-      case BPEX:
-        return getBpex();
-
       }
       throw new IllegalStateException();
     }
@@ -10175,8 +10117,6 @@ public class Blur {
         return isSetSuccess();
       case EX:
         return isSetEx();
-      case BPEX:
-        return isSetBpex();
       }
       throw new IllegalStateException();
     }
@@ -10212,15 +10152,6 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_bpex = true && this.isSetBpex();
-      boolean that_present_bpex = true && that.isSetBpex();
-      if (this_present_bpex || that_present_bpex) {
-        if (!(this_present_bpex && that_present_bpex))
-          return false;
-        if (!this.bpex.equals(that.bpex))
-          return false;
-      }
-
       return true;
     }
 
@@ -10257,16 +10188,6 @@ public class Blur {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetBpex()).compareTo(typedOther.isSetBpex());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetBpex()) {
-        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.bpex, typedOther.bpex);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -10302,14 +10223,6 @@ public class Blur {
         sb.append(this.ex);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("bpex:");
-      if (this.bpex == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.bpex);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -10374,15 +10287,6 @@ public class Blur {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // BPEX
-              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-                struct.bpex = new BackPressureException();
-                struct.bpex.read(iprot);
-                struct.setBpexIsSet(true);
-              } else { 
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -10408,11 +10312,6 @@ public class Blur {
           struct.ex.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.bpex != null) {
-          oprot.writeFieldBegin(BPEX_FIELD_DESC);
-          struct.bpex.write(oprot);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -10437,25 +10336,19 @@ public class Blur {
         if (struct.isSetEx()) {
           optionals.set(1);
         }
-        if (struct.isSetBpex()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetSuccess()) {
           struct.success.write(oprot);
         }
         if (struct.isSetEx()) {
           struct.ex.write(oprot);
         }
-        if (struct.isSetBpex()) {
-          struct.bpex.write(oprot);
-        }
       }
 
       @Override
       public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, query_result struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.success = new BlurResults();
           struct.success.read(iprot);
@@ -10466,11 +10359,6 @@ public class Blur {
           struct.ex.read(iprot);
           struct.setExIsSet(true);
         }
-        if (incoming.get(2)) {
-          struct.bpex = new BackPressureException();
-          struct.bpex.read(iprot);
-          struct.setBpexIsSet(true);
-        }
       }
     }
 
@@ -20117,7 +20005,6 @@ public class Blur {
 
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SUCCESS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("success", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)0);
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField EX_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("ex", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1);
-    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField BPEX_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("bpex", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2);
 
     private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
     static {
@@ -20127,13 +20014,11 @@ public class Blur {
 
     public FetchResult success; // required
     public BlurException ex; // required
-    public BackPressureException bpex; // required
 
     /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
     public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
       SUCCESS((short)0, "success"),
-      EX((short)1, "ex"),
-      BPEX((short)2, "bpex");
+      EX((short)1, "ex");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -20152,8 +20037,6 @@ public class Blur {
             return SUCCESS;
           case 1: // EX
             return EX;
-          case 2: // BPEX
-            return BPEX;
           default:
             return null;
         }
@@ -20201,8 +20084,6 @@ public class Blur {
           new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, FetchResult.class)));
       tmpMap.put(_Fields.EX, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("ex", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
           new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT)));
-      tmpMap.put(_Fields.BPEX, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("bpex", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(fetchRow_result.class, metaDataMap);
     }
@@ -20212,13 +20093,11 @@ public class Blur {
 
     public fetchRow_result(
       FetchResult success,
-      BlurException ex,
-      BackPressureException bpex)
+      BlurException ex)
     {
       this();
       this.success = success;
       this.ex = ex;
-      this.bpex = bpex;
     }
 
     /**
@@ -20231,9 +20110,6 @@ public class Blur {
       if (other.isSetEx()) {
         this.ex = new BlurException(other.ex);
       }
-      if (other.isSetBpex()) {
-        this.bpex = new BackPressureException(other.bpex);
-      }
     }
 
     public fetchRow_result deepCopy() {
@@ -20244,7 +20120,6 @@ public class Blur {
     public void clear() {
       this.success = null;
       this.ex = null;
-      this.bpex = null;
     }
 
     public FetchResult getSuccess() {
@@ -20295,30 +20170,6 @@ public class Blur {
       }
     }
 
-    public BackPressureException getBpex() {
-      return this.bpex;
-    }
-
-    public fetchRow_result setBpex(BackPressureException bpex) {
-      this.bpex = bpex;
-      return this;
-    }
-
-    public void unsetBpex() {
-      this.bpex = null;
-    }
-
-    /** Returns true if field bpex is set (has been assigned a value) and false otherwise */
-    public boolean isSetBpex() {
-      return this.bpex != null;
-    }
-
-    public void setBpexIsSet(boolean value) {
-      if (!value) {
-        this.bpex = null;
-      }
-    }
-
     public void setFieldValue(_Fields field, Object value) {
       switch (field) {
       case SUCCESS:
@@ -20337,14 +20188,6 @@ public class Blur {
         }
         break;
 
-      case BPEX:
-        if (value == null) {
-          unsetBpex();
-        } else {
-          setBpex((BackPressureException)value);
-        }
-        break;
-
       }
     }
 
@@ -20356,9 +20199,6 @@ public class Blur {
       case EX:
         return getEx();
 
-      case BPEX:
-        return getBpex();
-
       }
       throw new IllegalStateException();
     }
@@ -20374,8 +20214,6 @@ public class Blur {
         return isSetSuccess();
       case EX:
         return isSetEx();
-      case BPEX:
-        return isSetBpex();
       }
       throw new IllegalStateException();
     }
@@ -20411,15 +20249,6 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_bpex = true && this.isSetBpex();
-      boolean that_present_bpex = true && that.isSetBpex();
-      if (this_present_bpex || that_present_bpex) {
-        if (!(this_present_bpex && that_present_bpex))
-          return false;
-        if (!this.bpex.equals(that.bpex))
-          return false;
-      }
-
       return true;
     }
 
@@ -20456,16 +20285,6 @@ public class Blur {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetBpex()).compareTo(typedOther.isSetBpex());
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-      if (isSetBpex()) {
-        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.bpex, typedOther.bpex);
-        if (lastComparison != 0) {
-          return lastComparison;
-        }
-      }
       return 0;
     }
 
@@ -20501,14 +20320,6 @@ public class Blur {
         sb.append(this.ex);
       }
       first = false;
-      if (!first) sb.append(", ");
-      sb.append("bpex:");
-      if (this.bpex == null) {
-        sb.append("null");
-      } else {
-        sb.append(this.bpex);
-      }
-      first = false;
       sb.append(")");
       return sb.toString();
     }
@@ -20573,15 +20384,6 @@ public class Blur {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // BPEX
-              if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-                struct.bpex = new BackPressureException();
-                struct.bpex.read(iprot);
-                struct.setBpexIsSet(true);
-              } else { 
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-              }
-              break;
             default:
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
           }
@@ -20607,11 +20409,6 @@ public class Blur {
           struct.ex.write(oprot);
           oprot.writeFieldEnd();
         }
-        if (struct.bpex != null) {
-          oprot.writeFieldBegin(BPEX_FIELD_DESC);
-          struct.bpex.write(oprot);
-          oprot.writeFieldEnd();
-        }
         oprot.writeFieldStop();
         oprot.writeStructEnd();
       }
@@ -20636,25 +20433,19 @@ public class Blur {
         if (struct.isSetEx()) {
           optionals.set(1);
         }
-        if (struct.isSetBpex()) {
-          optionals.set(2);
-        }
-        oprot.writeBitSet(optionals, 3);
+        oprot.writeBitSet(optionals, 2);
         if (struct.isSetSuccess()) {
           struct.success.write(oprot);
         }
         if (struct.isSetEx()) {
           struct.ex.write(oprot);
         }
-        if (struct.isSetBpex()) {
-          struct.bpex.write(oprot);
-        }
       }
 
       @Override
       public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, fetchRow_result struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         TTupleProtocol iprot = (TTupleProtocol) prot;
-        BitSet incoming = iprot.readBitSet(3);
+        BitSet incoming = iprot.readBitSet(2);
         if (incoming.get(0)) {
           struct.success = new FetchResult();
           struct.success.read(iprot);
@@ -20665,11 +20456,6 @@ public class Blur {
           struct.ex.read(iprot);
           struct.setExIsSet(true);
         }
-        if (incoming.get(2)) {
-          struct.bpex = new BackPressureException();
-          struct.bpex.read(iprot);
-          struct.setBpexIsSet(true);
-        }
       }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurException.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurException.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurException.java
index 6c79258..d4d120d 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurException.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurException.java
@@ -58,6 +58,7 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
 
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField MESSAGE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("message", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)1);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STACK_TRACE_STR_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("stackTraceStr", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ERROR_TYPE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("errorType", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)3);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -73,6 +74,11 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
    * The original stack trace (if any).
    */
   public String stackTraceStr; // required
+  /**
+   * 
+   * @see ErrorType
+   */
+  public ErrorType errorType; // required
 
   /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
   public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
@@ -83,7 +89,12 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
     /**
      * The original stack trace (if any).
      */
-    STACK_TRACE_STR((short)2, "stackTraceStr");
+    STACK_TRACE_STR((short)2, "stackTraceStr"),
+    /**
+     * 
+     * @see ErrorType
+     */
+    ERROR_TYPE((short)3, "errorType");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -102,6 +113,8 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
           return MESSAGE;
         case 2: // STACK_TRACE_STR
           return STACK_TRACE_STR;
+        case 3: // ERROR_TYPE
+          return ERROR_TYPE;
         default:
           return null;
       }
@@ -149,6 +162,8 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
     tmpMap.put(_Fields.STACK_TRACE_STR, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("stackTraceStr", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)));
+    tmpMap.put(_Fields.ERROR_TYPE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("errorType", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.EnumMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.ENUM, ErrorType.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurException.class, metaDataMap);
   }
@@ -158,11 +173,13 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
 
   public BlurException(
     String message,
-    String stackTraceStr)
+    String stackTraceStr,
+    ErrorType errorType)
   {
     this();
     this.message = message;
     this.stackTraceStr = stackTraceStr;
+    this.errorType = errorType;
   }
 
   /**
@@ -175,6 +192,9 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
     if (other.isSetStackTraceStr()) {
       this.stackTraceStr = other.stackTraceStr;
     }
+    if (other.isSetErrorType()) {
+      this.errorType = other.errorType;
+    }
   }
 
   public BlurException deepCopy() {
@@ -185,6 +205,7 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
   public void clear() {
     this.message = null;
     this.stackTraceStr = null;
+    this.errorType = null;
   }
 
   /**
@@ -247,6 +268,38 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
     }
   }
 
+  /**
+   * 
+   * @see ErrorType
+   */
+  public ErrorType getErrorType() {
+    return this.errorType;
+  }
+
+  /**
+   * 
+   * @see ErrorType
+   */
+  public BlurException setErrorType(ErrorType errorType) {
+    this.errorType = errorType;
+    return this;
+  }
+
+  public void unsetErrorType() {
+    this.errorType = null;
+  }
+
+  /** Returns true if field errorType is set (has been assigned a value) and false otherwise */
+  public boolean isSetErrorType() {
+    return this.errorType != null;
+  }
+
+  public void setErrorTypeIsSet(boolean value) {
+    if (!value) {
+      this.errorType = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case MESSAGE:
@@ -265,6 +318,14 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
       }
       break;
 
+    case ERROR_TYPE:
+      if (value == null) {
+        unsetErrorType();
+      } else {
+        setErrorType((ErrorType)value);
+      }
+      break;
+
     }
   }
 
@@ -276,6 +337,9 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
     case STACK_TRACE_STR:
       return getStackTraceStr();
 
+    case ERROR_TYPE:
+      return getErrorType();
+
     }
     throw new IllegalStateException();
   }
@@ -291,6 +355,8 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
       return isSetMessage();
     case STACK_TRACE_STR:
       return isSetStackTraceStr();
+    case ERROR_TYPE:
+      return isSetErrorType();
     }
     throw new IllegalStateException();
   }
@@ -326,6 +392,15 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
         return false;
     }
 
+    boolean this_present_errorType = true && this.isSetErrorType();
+    boolean that_present_errorType = true && that.isSetErrorType();
+    if (this_present_errorType || that_present_errorType) {
+      if (!(this_present_errorType && that_present_errorType))
+        return false;
+      if (!this.errorType.equals(that.errorType))
+        return false;
+    }
+
     return true;
   }
 
@@ -362,6 +437,16 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetErrorType()).compareTo(typedOther.isSetErrorType());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetErrorType()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.errorType, typedOther.errorType);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -397,6 +482,14 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
       sb.append(this.stackTraceStr);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("errorType:");
+    if (this.errorType == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.errorType);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -456,6 +549,14 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 3: // ERROR_TYPE
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) {
+              struct.errorType = ErrorType.findByValue(iprot.readI32());
+              struct.setErrorTypeIsSet(true);
+            } else { 
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
           default:
             org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
         }
@@ -481,6 +582,11 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
         oprot.writeString(struct.stackTraceStr);
         oprot.writeFieldEnd();
       }
+      if (struct.errorType != null) {
+        oprot.writeFieldBegin(ERROR_TYPE_FIELD_DESC);
+        oprot.writeI32(struct.errorType.getValue());
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -505,19 +611,25 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
       if (struct.isSetStackTraceStr()) {
         optionals.set(1);
       }
-      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetErrorType()) {
+        optionals.set(2);
+      }
+      oprot.writeBitSet(optionals, 3);
       if (struct.isSetMessage()) {
         oprot.writeString(struct.message);
       }
       if (struct.isSetStackTraceStr()) {
         oprot.writeString(struct.stackTraceStr);
       }
+      if (struct.isSetErrorType()) {
+        oprot.writeI32(struct.errorType.getValue());
+      }
     }
 
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurException struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
+      BitSet incoming = iprot.readBitSet(3);
       if (incoming.get(0)) {
         struct.message = iprot.readString();
         struct.setMessageIsSet(true);
@@ -526,6 +638,10 @@ public class BlurException extends TException implements org.apache.blur.thirdpa
         struct.stackTraceStr = iprot.readString();
         struct.setStackTraceStrIsSet(true);
       }
+      if (incoming.get(2)) {
+        struct.errorType = ErrorType.findByValue(iprot.readI32());
+        struct.setErrorTypeIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ErrorType.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ErrorType.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ErrorType.java
new file mode 100644
index 0000000..85a2970
--- /dev/null
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ErrorType.java
@@ -0,0 +1,70 @@
+/**
+ * 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 java.util.Map;
+import java.util.HashMap;
+import org.apache.blur.thirdparty.thrift_0_9_0.TEnum;
+
+public enum ErrorType implements org.apache.blur.thirdparty.thrift_0_9_0.TEnum {
+  UNKNOWN(0),
+  QUERY_CANCEL(1),
+  QUERY_TIMEOUT(2),
+  BACK_PRESSURE(3);
+
+  private final int value;
+
+  private ErrorType(int value) {
+    this.value = value;
+  }
+
+  /**
+   * Get the integer value of this enum value, as defined in the Thrift IDL.
+   */
+  public int getValue() {
+    return value;
+  }
+
+  /**
+   * Find a the enum type by its integer value, as defined in the Thrift IDL.
+   * @return null if the value is not found.
+   */
+  public static ErrorType findByValue(int value) { 
+    switch (value) {
+      case 0:
+        return UNKNOWN;
+      case 1:
+        return QUERY_CANCEL;
+      case 2:
+        return QUERY_TIMEOUT;
+      case 3:
+        return BACK_PRESSURE;
+      default:
+        return null;
+    }
+  }
+}

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-js/Blur.js
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-js/Blur.js b/distribution/src/main/scripts/interface/gen-js/Blur.js
index 553e5a7..68b9aa0 100644
--- a/distribution/src/main/scripts/interface/gen-js/Blur.js
+++ b/distribution/src/main/scripts/interface/gen-js/Blur.js
@@ -1201,15 +1201,10 @@ Blur_query_args.prototype.write = function(output) {
 Blur_query_result = function(args) {
   this.success = null;
   this.ex = null;
-  this.bpex = null;
   if (args instanceof BlurException) {
     this.ex = args;
     return;
   }
-  if (args instanceof BackPressureException) {
-    this.bpex = args;
-    return;
-  }
   if (args) {
     if (args.success !== undefined) {
       this.success = args.success;
@@ -1217,9 +1212,6 @@ Blur_query_result = function(args) {
     if (args.ex !== undefined) {
       this.ex = args.ex;
     }
-    if (args.bpex !== undefined) {
-      this.bpex = args.bpex;
-    }
   }
 };
 Blur_query_result.prototype = {};
@@ -1252,14 +1244,6 @@ Blur_query_result.prototype.read = function(input) {
         input.skip(ftype);
       }
       break;
-      case 2:
-      if (ftype == Thrift.Type.STRUCT) {
-        this.bpex = new BackPressureException();
-        this.bpex.read(input);
-      } else {
-        input.skip(ftype);
-      }
-      break;
       default:
         input.skip(ftype);
     }
@@ -1281,11 +1265,6 @@ Blur_query_result.prototype.write = function(output) {
     this.ex.write(output);
     output.writeFieldEnd();
   }
-  if (this.bpex !== null && this.bpex !== undefined) {
-    output.writeFieldBegin('bpex', Thrift.Type.STRUCT, 2);
-    this.bpex.write(output);
-    output.writeFieldEnd();
-  }
   output.writeFieldStop();
   output.writeStructEnd();
   return;
@@ -2805,15 +2784,10 @@ Blur_fetchRow_args.prototype.write = function(output) {
 Blur_fetchRow_result = function(args) {
   this.success = null;
   this.ex = null;
-  this.bpex = null;
   if (args instanceof BlurException) {
     this.ex = args;
     return;
   }
-  if (args instanceof BackPressureException) {
-    this.bpex = args;
-    return;
-  }
   if (args) {
     if (args.success !== undefined) {
       this.success = args.success;
@@ -2821,9 +2795,6 @@ Blur_fetchRow_result = function(args) {
     if (args.ex !== undefined) {
       this.ex = args.ex;
     }
-    if (args.bpex !== undefined) {
-      this.bpex = args.bpex;
-    }
   }
 };
 Blur_fetchRow_result.prototype = {};
@@ -2856,14 +2827,6 @@ Blur_fetchRow_result.prototype.read = function(input) {
         input.skip(ftype);
       }
       break;
-      case 2:
-      if (ftype == Thrift.Type.STRUCT) {
-        this.bpex = new BackPressureException();
-        this.bpex.read(input);
-      } else {
-        input.skip(ftype);
-      }
-      break;
       default:
         input.skip(ftype);
     }
@@ -2885,11 +2848,6 @@ Blur_fetchRow_result.prototype.write = function(output) {
     this.ex.write(output);
     output.writeFieldEnd();
   }
-  if (this.bpex !== null && this.bpex !== undefined) {
-    output.writeFieldBegin('bpex', Thrift.Type.STRUCT, 2);
-    this.bpex.write(output);
-    output.writeFieldEnd();
-  }
   output.writeFieldStop();
   output.writeStructEnd();
   return;
@@ -4489,9 +4447,6 @@ BlurClient.prototype.recv_query = function() {
   if (null !== result.ex) {
     throw result.ex;
   }
-  if (null !== result.bpex) {
-    throw result.bpex;
-  }
   if (null !== result.success) {
     return result.success;
   }
@@ -4907,9 +4862,6 @@ BlurClient.prototype.recv_fetchRow = function() {
   if (null !== result.ex) {
     throw result.ex;
   }
-  if (null !== result.bpex) {
-    throw result.bpex;
-  }
   if (null !== result.success) {
     return result.success;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-js/Blur_types.js
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-js/Blur_types.js b/distribution/src/main/scripts/interface/gen-js/Blur_types.js
index 413d728..6316e8d 100644
--- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js
+++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js
@@ -4,6 +4,12 @@
 // DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 //
 
+ErrorType = {
+'UNKNOWN' : 0,
+'QUERY_CANCEL' : 1,
+'QUERY_TIMEOUT' : 2,
+'BACK_PRESSURE' : 3
+};
 ScoreType = {
 'SUPER' : 0,
 'AGGREGATE' : 1,
@@ -38,6 +44,7 @@ ShardState = {
 BlurException = function(args) {
   this.message = null;
   this.stackTraceStr = null;
+  this.errorType = null;
   if (args) {
     if (args.message !== undefined) {
       this.message = args.message;
@@ -45,6 +52,9 @@ BlurException = function(args) {
     if (args.stackTraceStr !== undefined) {
       this.stackTraceStr = args.stackTraceStr;
     }
+    if (args.errorType !== undefined) {
+      this.errorType = args.errorType;
+    }
   }
 };
 Thrift.inherits(BlurException, Thrift.TException);
@@ -76,6 +86,13 @@ BlurException.prototype.read = function(input) {
         input.skip(ftype);
       }
       break;
+      case 3:
+      if (ftype == Thrift.Type.I32) {
+        this.errorType = input.readI32().value;
+      } else {
+        input.skip(ftype);
+      }
+      break;
       default:
         input.skip(ftype);
     }
@@ -97,58 +114,9 @@ BlurException.prototype.write = function(output) {
     output.writeString(this.stackTraceStr);
     output.writeFieldEnd();
   }
-  output.writeFieldStop();
-  output.writeStructEnd();
-  return;
-};
-
-BackPressureException = function(args) {
-  this.message = null;
-  if (args) {
-    if (args.message !== undefined) {
-      this.message = args.message;
-    }
-  }
-};
-Thrift.inherits(BackPressureException, Thrift.TException);
-BackPressureException.prototype.name = 'BackPressureException';
-BackPressureException.prototype.read = function(input) {
-  input.readStructBegin();
-  while (true)
-  {
-    var ret = input.readFieldBegin();
-    var fname = ret.fname;
-    var ftype = ret.ftype;
-    var fid = ret.fid;
-    if (ftype == Thrift.Type.STOP) {
-      break;
-    }
-    switch (fid)
-    {
-      case 1:
-      if (ftype == Thrift.Type.STRING) {
-        this.message = input.readString().value;
-      } else {
-        input.skip(ftype);
-      }
-      break;
-      case 0:
-        input.skip(ftype);
-        break;
-      default:
-        input.skip(ftype);
-    }
-    input.readFieldEnd();
-  }
-  input.readStructEnd();
-  return;
-};
-
-BackPressureException.prototype.write = function(output) {
-  output.writeStructBegin('BackPressureException');
-  if (this.message !== null && this.message !== undefined) {
-    output.writeFieldBegin('message', Thrift.Type.STRING, 1);
-    output.writeString(this.message);
+  if (this.errorType !== null && this.errorType !== undefined) {
+    output.writeFieldBegin('errorType', Thrift.Type.I32, 3);
+    output.writeI32(this.errorType);
     output.writeFieldEnd();
   }
   output.writeFieldStop();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
index 16493ba..225d00e 100644
--- a/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
+++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Blur.pm
@@ -1381,7 +1381,6 @@ sub new {
   my $vals      = shift || {};
   $self->{success} = undef;
   $self->{ex} = undef;
-  $self->{bpex} = undef;
   if (UNIVERSAL::isa($vals,'HASH')) {
     if (defined $vals->{success}) {
       $self->{success} = $vals->{success};
@@ -1389,9 +1388,6 @@ sub new {
     if (defined $vals->{ex}) {
       $self->{ex} = $vals->{ex};
     }
-    if (defined $vals->{bpex}) {
-      $self->{bpex} = $vals->{bpex};
-    }
   }
   return bless ($self, $classname);
 }
@@ -1429,13 +1425,6 @@ sub read {
         $xfer += $input->skip($ftype);
       }
       last; };
-      /^2$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{bpex} = new Blur::BackPressureException();
-        $xfer += $self->{bpex}->read($input);
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
         $xfer += $input->skip($ftype);
     }
     $xfer += $input->readFieldEnd();
@@ -1458,11 +1447,6 @@ sub write {
     $xfer += $self->{ex}->write($output);
     $xfer += $output->writeFieldEnd();
   }
-  if (defined $self->{bpex}) {
-    $xfer += $output->writeFieldBegin('bpex', TType::STRUCT, 2);
-    $xfer += $self->{bpex}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
   $xfer += $output->writeFieldStop();
   $xfer += $output->writeStructEnd();
   return $xfer;
@@ -3202,7 +3186,6 @@ sub new {
   my $vals      = shift || {};
   $self->{success} = undef;
   $self->{ex} = undef;
-  $self->{bpex} = undef;
   if (UNIVERSAL::isa($vals,'HASH')) {
     if (defined $vals->{success}) {
       $self->{success} = $vals->{success};
@@ -3210,9 +3193,6 @@ sub new {
     if (defined $vals->{ex}) {
       $self->{ex} = $vals->{ex};
     }
-    if (defined $vals->{bpex}) {
-      $self->{bpex} = $vals->{bpex};
-    }
   }
   return bless ($self, $classname);
 }
@@ -3250,13 +3230,6 @@ sub read {
         $xfer += $input->skip($ftype);
       }
       last; };
-      /^2$/ && do{      if ($ftype == TType::STRUCT) {
-        $self->{bpex} = new Blur::BackPressureException();
-        $xfer += $self->{bpex}->read($input);
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
         $xfer += $input->skip($ftype);
     }
     $xfer += $input->readFieldEnd();
@@ -3279,11 +3252,6 @@ sub write {
     $xfer += $self->{ex}->write($output);
     $xfer += $output->writeFieldEnd();
   }
-  if (defined $self->{bpex}) {
-    $xfer += $output->writeFieldBegin('bpex', TType::STRUCT, 2);
-    $xfer += $self->{bpex}->write($output);
-    $xfer += $output->writeFieldEnd();
-  }
   $xfer += $output->writeFieldStop();
   $xfer += $output->writeStructEnd();
   return $xfer;
@@ -5608,9 +5576,6 @@ sub recv_query{
   if (defined $result->{ex}) {
     die $result->{ex};
   }
-  if (defined $result->{bpex}) {
-    die $result->{bpex};
-  }
   die "query failed: unknown result";
 }
 sub parseQuery{
@@ -6147,9 +6112,6 @@ sub recv_fetchRow{
   if (defined $result->{ex}) {
     die $result->{ex};
   }
-  if (defined $result->{bpex}) {
-    die $result->{bpex};
-  }
   die "fetchRow failed: unknown result";
 }
 sub mutate{
@@ -6774,8 +6736,6 @@ sub process_query {
       $result->{success} = $self->{handler}->query($args->table, $args->blurQuery);
     }; if( UNIVERSAL::isa($@,'Blur::BlurException') ){ 
       $result->{ex} = $@;
-        }; if( UNIVERSAL::isa($@,'Blur::BackPressureException') ){ 
-      $result->{bpex} = $@;
     }
     $output->writeMessageBegin('query', TMessageType::REPLY, $seqid);
     $result->write($output);
@@ -6963,8 +6923,6 @@ sub process_fetchRow {
       $result->{success} = $self->{handler}->fetchRow($args->table, $args->selector);
     }; if( UNIVERSAL::isa($@,'Blur::BlurException') ){ 
       $result->{ex} = $@;
-        }; if( UNIVERSAL::isa($@,'Blur::BackPressureException') ){ 
-      $result->{bpex} = $@;
     }
     $output->writeMessageBegin('fetchRow', TMessageType::REPLY, $seqid);
     $result->write($output);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
index e80b25c..41ff965 100644
--- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
+++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm
@@ -8,6 +8,11 @@ use strict;
 use warnings;
 use Thrift;
 
+package Blur::ErrorType;
+use constant UNKNOWN => 0;
+use constant QUERY_CANCEL => 1;
+use constant QUERY_TIMEOUT => 2;
+use constant BACK_PRESSURE => 3;
 package Blur::ScoreType;
 use constant SUPER => 0;
 use constant AGGREGATE => 1;
@@ -37,7 +42,7 @@ use constant CLOSING_ERROR => 5;
 package Blur::BlurException;
 use base qw(Thrift::TException);
 use base qw(Class::Accessor);
-Blur::BlurException->mk_accessors( qw( message stackTraceStr ) );
+Blur::BlurException->mk_accessors( qw( message stackTraceStr errorType ) );
 
 sub new {
   my $classname = shift;
@@ -45,6 +50,7 @@ sub new {
   my $vals      = shift || {};
   $self->{message} = undef;
   $self->{stackTraceStr} = undef;
+  $self->{errorType} = undef;
   if (UNIVERSAL::isa($vals,'HASH')) {
     if (defined $vals->{message}) {
       $self->{message} = $vals->{message};
@@ -52,6 +58,9 @@ sub new {
     if (defined $vals->{stackTraceStr}) {
       $self->{stackTraceStr} = $vals->{stackTraceStr};
     }
+    if (defined $vals->{errorType}) {
+      $self->{errorType} = $vals->{errorType};
+    }
   }
   return bless ($self, $classname);
 }
@@ -87,6 +96,12 @@ sub read {
         $xfer += $input->skip($ftype);
       }
       last; };
+      /^3$/ && do{      if ($ftype == TType::I32) {
+        $xfer += $input->readI32(\$self->{errorType});
+      } else {
+        $xfer += $input->skip($ftype);
+      }
+      last; };
         $xfer += $input->skip($ftype);
     }
     $xfer += $input->readFieldEnd();
@@ -109,69 +124,9 @@ sub write {
     $xfer += $output->writeString($self->{stackTraceStr});
     $xfer += $output->writeFieldEnd();
   }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
-package Blur::BackPressureException;
-use base qw(Thrift::TException);
-use base qw(Class::Accessor);
-Blur::BackPressureException->mk_accessors( qw( message ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{message} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{message}) {
-      $self->{message} = $vals->{message};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'BackPressureException';
-}
-
-sub read {
-  my ($self, $input) = @_;
-  my $xfer  = 0;
-  my $fname;
-  my $ftype = 0;
-  my $fid   = 0;
-  $xfer += $input->readStructBegin(\$fname);
-  while (1) 
-  {
-    $xfer += $input->readFieldBegin(\$fname, \$ftype, \$fid);
-    if ($ftype == TType::STOP) {
-      last;
-    }
-    SWITCH: for($fid)
-    {
-      /^1$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{message});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-        $xfer += $input->skip($ftype);
-    }
-    $xfer += $input->readFieldEnd();
-  }
-  $xfer += $input->readStructEnd();
-  return $xfer;
-}
-
-sub write {
-  my ($self, $output) = @_;
-  my $xfer   = 0;
-  $xfer += $output->writeStructBegin('BackPressureException');
-  if (defined $self->{message}) {
-    $xfer += $output->writeFieldBegin('message', TType::STRING, 1);
-    $xfer += $output->writeString($self->{message});
+  if (defined $self->{errorType}) {
+    $xfer += $output->writeFieldBegin('errorType', TType::I32, 3);
+    $xfer += $output->writeI32($self->{errorType});
     $xfer += $output->writeFieldEnd();
   }
   $xfer += $output->writeFieldStop();

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-rb/blur.rb
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-rb/blur.rb b/distribution/src/main/scripts/interface/gen-rb/blur.rb
index 021b760..2a277c7 100644
--- a/distribution/src/main/scripts/interface/gen-rb/blur.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur.rb
@@ -153,7 +153,6 @@ module Blur
         result = receive_message(Query_result)
         return result.success unless result.success.nil?
         raise result.ex unless result.ex.nil?
-        raise result.bpex unless result.bpex.nil?
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'query failed: unknown result')
       end
 
@@ -329,7 +328,6 @@ module Blur
         result = receive_message(FetchRow_result)
         return result.success unless result.success.nil?
         raise result.ex unless result.ex.nil?
-        raise result.bpex unless result.bpex.nil?
         raise ::Thrift::ApplicationException.new(::Thrift::ApplicationException::MISSING_RESULT, 'fetchRow failed: unknown result')
       end
 
@@ -586,8 +584,6 @@ module Blur
           result.success = @handler.query(args.table, args.blurQuery)
         rescue ::Blur::BlurException => ex
           result.ex = ex
-        rescue ::Blur::BackPressureException => bpex
-          result.bpex = bpex
         end
         write_result(result, oprot, 'query', seqid)
       end
@@ -709,8 +705,6 @@ module Blur
           result.success = @handler.fetchRow(args.table, args.selector)
         rescue ::Blur::BlurException => ex
           result.ex = ex
-        rescue ::Blur::BackPressureException => bpex
-          result.bpex = bpex
         end
         write_result(result, oprot, 'fetchRow', seqid)
       end
@@ -1120,12 +1114,10 @@ module Blur
       include ::Thrift::Struct, ::Thrift::Struct_Union
       SUCCESS = 0
       EX = 1
-      BPEX = 2
 
       FIELDS = {
         SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Blur::BlurResults},
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException},
-        BPEX => {:type => ::Thrift::Types::STRUCT, :name => 'bpex', :class => ::Blur::BackPressureException}
+        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
       }
 
       def struct_fields; FIELDS; end
@@ -1516,12 +1508,10 @@ module Blur
       include ::Thrift::Struct, ::Thrift::Struct_Union
       SUCCESS = 0
       EX = 1
-      BPEX = 2
 
       FIELDS = {
         SUCCESS => {:type => ::Thrift::Types::STRUCT, :name => 'success', :class => ::Blur::FetchResult},
-        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException},
-        BPEX => {:type => ::Thrift::Types::STRUCT, :name => 'bpex', :class => ::Blur::BackPressureException}
+        EX => {:type => ::Thrift::Types::STRUCT, :name => 'ex', :class => ::Blur::BlurException}
       }
 
       def struct_fields; FIELDS; end

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7a01385e/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
index b4f6773..da30041 100644
--- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
+++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb
@@ -7,6 +7,15 @@
 require 'thrift'
 
 module Blur
+  module ErrorType
+    UNKNOWN = 0
+    QUERY_CANCEL = 1
+    QUERY_TIMEOUT = 2
+    BACK_PRESSURE = 3
+    VALUE_MAP = {0 => "UNKNOWN", 1 => "QUERY_CANCEL", 2 => "QUERY_TIMEOUT", 3 => "BACK_PRESSURE"}
+    VALID_VALUES = Set.new([UNKNOWN, QUERY_CANCEL, QUERY_TIMEOUT, BACK_PRESSURE]).freeze
+  end
+
   module ScoreType
     SUPER = 0
     AGGREGATE = 1
@@ -59,40 +68,22 @@ module Blur
     include ::Thrift::Struct, ::Thrift::Struct_Union
     MESSAGE = 1
     STACKTRACESTR = 2
+    ERRORTYPE = 3
 
     FIELDS = {
       # The message in the exception.
       MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'},
       # The original stack trace (if any).
-      STACKTRACESTR => {:type => ::Thrift::Types::STRING, :name => 'stackTraceStr'}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # BackPressureException that carries a message.
-  class BackPressureException < ::Thrift::Exception
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    def initialize(message=nil)
-      super()
-      self.message = message
-    end
-
-    MESSAGE = 1
-
-    FIELDS = {
-      # The message in the exception.
-      MESSAGE => {:type => ::Thrift::Types::STRING, :name => 'message'}
+      STACKTRACESTR => {:type => ::Thrift::Types::STRING, :name => 'stackTraceStr'},
+      ERRORTYPE => {:type => ::Thrift::Types::I32, :name => 'errorType', :enum_class => ::Blur::ErrorType}
     }
 
     def struct_fields; FIELDS; end
 
     def validate
+      unless @errorType.nil? || ::Blur::ErrorType::VALID_VALUES.include?(@errorType)
+        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field errorType!')
+      end
     end
 
     ::Thrift::Struct.generate_accessors self


Mime
View raw message