incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [18/50] [abbrv] git commit: Removal of Simple and Expert Query objects.
Date Wed, 07 Nov 2012 02:26:55 GMT
Removal of Simple and Expert Query objects.


Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/8d86073c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/8d86073c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/8d86073c

Branch: refs/heads/0.2-dev-removing-old-thrift
Commit: 8d86073c36fcbe66dbf44eb95571277397598da4
Parents: 06bb66e
Author: Aaron McCurry <amccurry@gmail.com>
Authored: Tue Nov 6 21:01:12 2012 -0500
Committer: Aaron McCurry <amccurry@gmail.com>
Committed: Tue Nov 6 21:01:12 2012 -0500

----------------------------------------------------------------------
 interface/Blur.thrift                              |   40 -
 interface/gen-html/Blur.html                       |   22 -
 interface/gen-html/index.html                      |    2 -
 .../apache/blur/thrift/generated/ExpertQuery.java  |  554 ---------
 .../apache/blur/thrift/generated/SimpleQuery.java  |  879 ---------------
 interface/gen-perl/Blur/Types.pm                   |  203 ----
 interface/gen-rb/blur_types.rb                     |   54 -
 .../java/org/apache/blur/manager/IndexManager.java |   11 -
 .../apache/blur/thrift/generated/ExpertQuery.java  |  554 ---------
 .../apache/blur/thrift/generated/SimpleQuery.java  |  879 ---------------
 10 files changed, 0 insertions(+), 3198 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/interface/Blur.thrift b/interface/Blur.thrift
index 2c19a09..d97d4e6 100644
--- a/interface/Blur.thrift
+++ b/interface/Blur.thrift
@@ -232,46 +232,6 @@ struct FetchResult {
 }
 
 /**
- * The SimpleQuery object holds the query string (normal Lucene syntax), filters and type of scoring (used when super query is on).
- */
-struct SimpleQuery {
-  /**
-   * A Lucene syntax based query.
-   */
-  1:string queryStr,
-  /**
-   * If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-   */
-  2:bool superQueryOn = 1,
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   */
-  3:ScoreType type = ScoreType.SUPER, 
-  /**
-   * The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-   */
-  4:string postSuperFilter,
-  /**
-   * The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-   */
-  5:string preSuperFilter
-}
-
-/**
- * The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
- */
-struct ExpertQuery {
-  /**
-   * The serialized query.
-   */
-  1:binary query,
-  /**
-   * The serialized filter.
-   */
-  2:binary filter
-}
-
-/**
  * Blur facet.
  */
 struct Facet {

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/interface/gen-html/Blur.html b/interface/gen-html/Blur.html
index c17558b..a1cf0b4 100644
--- a/interface/gen-html/Blur.html
+++ b/interface/gen-html/Blur.html
@@ -57,7 +57,6 @@
 <a href="Blur.html#Struct_CpuTime">CpuTime</a><br/>
 <a href="Blur.html#Struct_DocLocation">DocLocation</a><br/>
 <a href="Blur.html#Struct_Document">Document</a><br/>
-<a href="Blur.html#Struct_ExpertQuery">ExpertQuery</a><br/>
 <a href="Blur.html#Struct_Facet">Facet</a><br/>
 <a href="Blur.html#Struct_FetchRecordResult">FetchRecordResult</a><br/>
 <a href="Blur.html#Struct_FetchResult">FetchResult</a><br/>
@@ -76,7 +75,6 @@
 <a href="Blur.html#Enum_ScoreType">ScoreType</a><br/>
 <a href="Blur.html#Struct_Selector">Selector</a><br/>
 <a href="Blur.html#Struct_Session">Session</a><br/>
-<a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a><br/>
 <a href="Blur.html#Struct_Sort">Sort</a><br/>
 <a href="Blur.html#Struct_SortField">SortField</a><br/>
 <a href="Blur.html#Enum_SortType">SortType</a><br/>
@@ -236,26 +234,6 @@ through records of a row, this count will reflect the entire row.
 <tr><td>5</td><td>recordResult</td><td><code><a href="Blur.html#Struct_FetchRecordResult">FetchRecordResult</a></code></td><td>The record result if a record was selected form the Selector.
 </td><td>default</td><td></td></tr>
 </table><br/>FetchResult contains the row or record fetch result based if the Selector was going to fetch the entire row or a single record.
-<br/></div><div class="definition"><h3 id="Struct_SimpleQuery">Struct: SimpleQuery</h3>
-<table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
-<tr><td>1</td><td>queryStr</td><td><code>string</code></td><td>A Lucene syntax based query.
-</td><td>default</td><td></td></tr>
-<tr><td>2</td><td>superQueryOn</td><td><code>bool</code></td><td>If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-</td><td>default</td><td>1</td></tr>
-<tr><td>3</td><td>type</td><td><code><a href="Blur.html#Enum_ScoreType">ScoreType</a></code></td><td>The scoring type, see the document on ScoreType for explanation of each score type.
-</td><td>default</td><td>UNKNOWN</td></tr>
-<tr><td>4</td><td>postSuperFilter</td><td><code>string</code></td><td>The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-</td><td>default</td><td></td></tr>
-<tr><td>5</td><td>preSuperFilter</td><td><code>string</code></td><td>The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-</td><td>default</td><td></td></tr>
-</table><br/>The SimpleQuery object holds the query string (normal Lucene syntax), filters and type of scoring (used when super query is on).
-<br/></div><div class="definition"><h3 id="Struct_ExpertQuery">Struct: ExpertQuery</h3>
-<table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
-<tr><td>1</td><td>query</td><td><code>binary</code></td><td>The serialized query.
-</td><td>default</td><td></td></tr>
-<tr><td>2</td><td>filter</td><td><code>binary</code></td><td>The serialized filter.
-</td><td>default</td><td></td></tr>
-</table><br/>The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
 <br/></div><div class="definition"><h3 id="Struct_Facet">Struct: Facet</h3>
 <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead>
 <tr><td>1</td><td>queryStr</td><td><code>string</code></td><td></td><td>default</td><td></td></tr>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/gen-html/index.html
----------------------------------------------------------------------
diff --git a/interface/gen-html/index.html b/interface/gen-html/index.html
index a832ad2..97e56f5 100644
--- a/interface/gen-html/index.html
+++ b/interface/gen-html/index.html
@@ -53,7 +53,6 @@
 <a href="Blur.html#Struct_CpuTime">CpuTime</a><br/>
 <a href="Blur.html#Struct_DocLocation">DocLocation</a><br/>
 <a href="Blur.html#Struct_Document">Document</a><br/>
-<a href="Blur.html#Struct_ExpertQuery">ExpertQuery</a><br/>
 <a href="Blur.html#Struct_Facet">Facet</a><br/>
 <a href="Blur.html#Struct_FetchRecordResult">FetchRecordResult</a><br/>
 <a href="Blur.html#Struct_FetchResult">FetchResult</a><br/>
@@ -72,7 +71,6 @@
 <a href="Blur.html#Enum_ScoreType">ScoreType</a><br/>
 <a href="Blur.html#Struct_Selector">Selector</a><br/>
 <a href="Blur.html#Struct_Session">Session</a><br/>
-<a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a><br/>
 <a href="Blur.html#Struct_Sort">Sort</a><br/>
 <a href="Blur.html#Struct_SortField">SortField</a><br/>
 <a href="Blur.html#Enum_SortType">SortType</a><br/>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/gen-java/org/apache/blur/thrift/generated/ExpertQuery.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/ExpertQuery.java b/interface/gen-java/org/apache/blur/thrift/generated/ExpertQuery.java
deleted file mode 100644
index a9f823e..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/ExpertQuery.java
+++ /dev/null
@@ -1,554 +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;
-
-/**
- * The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
- */
-public class ExpertQuery implements org.apache.thrift.TBase<ExpertQuery, ExpertQuery._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExpertQuery");
-
-  private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)1);
-  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)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ExpertQueryStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ExpertQueryTupleSchemeFactory());
-  }
-
-  /**
-   * The serialized query.
-   */
-  public ByteBuffer query; // required
-  /**
-   * The serialized filter.
-   */
-  public ByteBuffer filter; // 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 serialized query.
-     */
-    QUERY((short)1, "query"),
-    /**
-     * The serialized filter.
-     */
-    FILTER((short)2, "filter");
-
-    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: // QUERY
-          return QUERY;
-        case 2: // FILTER
-          return FILTER;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.FILTER, new org.apache.thrift.meta_data.FieldMetaData("filter", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExpertQuery.class, metaDataMap);
-  }
-
-  public ExpertQuery() {
-  }
-
-  public ExpertQuery(
-    ByteBuffer query,
-    ByteBuffer filter)
-  {
-    this();
-    this.query = query;
-    this.filter = filter;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ExpertQuery(ExpertQuery other) {
-    if (other.isSetQuery()) {
-      this.query = org.apache.thrift.TBaseHelper.copyBinary(other.query);
-;
-    }
-    if (other.isSetFilter()) {
-      this.filter = org.apache.thrift.TBaseHelper.copyBinary(other.filter);
-;
-    }
-  }
-
-  public ExpertQuery deepCopy() {
-    return new ExpertQuery(this);
-  }
-
-  @Override
-  public void clear() {
-    this.query = null;
-    this.filter = null;
-  }
-
-  /**
-   * The serialized query.
-   */
-  public byte[] getQuery() {
-    setQuery(org.apache.thrift.TBaseHelper.rightSize(query));
-    return query == null ? null : query.array();
-  }
-
-  public ByteBuffer bufferForQuery() {
-    return query;
-  }
-
-  /**
-   * The serialized query.
-   */
-  public ExpertQuery setQuery(byte[] query) {
-    setQuery(query == null ? (ByteBuffer)null : ByteBuffer.wrap(query));
-    return this;
-  }
-
-  public ExpertQuery setQuery(ByteBuffer query) {
-    this.query = query;
-    return this;
-  }
-
-  public void unsetQuery() {
-    this.query = null;
-  }
-
-  /** Returns true if field query is set (has been assigned a value) and false otherwise */
-  public boolean isSetQuery() {
-    return this.query != null;
-  }
-
-  public void setQueryIsSet(boolean value) {
-    if (!value) {
-      this.query = null;
-    }
-  }
-
-  /**
-   * The serialized filter.
-   */
-  public byte[] getFilter() {
-    setFilter(org.apache.thrift.TBaseHelper.rightSize(filter));
-    return filter == null ? null : filter.array();
-  }
-
-  public ByteBuffer bufferForFilter() {
-    return filter;
-  }
-
-  /**
-   * The serialized filter.
-   */
-  public ExpertQuery setFilter(byte[] filter) {
-    setFilter(filter == null ? (ByteBuffer)null : ByteBuffer.wrap(filter));
-    return this;
-  }
-
-  public ExpertQuery setFilter(ByteBuffer filter) {
-    this.filter = filter;
-    return this;
-  }
-
-  public void unsetFilter() {
-    this.filter = null;
-  }
-
-  /** Returns true if field filter is set (has been assigned a value) and false otherwise */
-  public boolean isSetFilter() {
-    return this.filter != null;
-  }
-
-  public void setFilterIsSet(boolean value) {
-    if (!value) {
-      this.filter = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUERY:
-      if (value == null) {
-        unsetQuery();
-      } else {
-        setQuery((ByteBuffer)value);
-      }
-      break;
-
-    case FILTER:
-      if (value == null) {
-        unsetFilter();
-      } else {
-        setFilter((ByteBuffer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUERY:
-      return getQuery();
-
-    case FILTER:
-      return getFilter();
-
-    }
-    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 QUERY:
-      return isSetQuery();
-    case FILTER:
-      return isSetFilter();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ExpertQuery)
-      return this.equals((ExpertQuery)that);
-    return false;
-  }
-
-  public boolean equals(ExpertQuery that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_query = true && this.isSetQuery();
-    boolean that_present_query = true && that.isSetQuery();
-    if (this_present_query || that_present_query) {
-      if (!(this_present_query && that_present_query))
-        return false;
-      if (!this.query.equals(that.query))
-        return false;
-    }
-
-    boolean this_present_filter = true && this.isSetFilter();
-    boolean that_present_filter = true && that.isSetFilter();
-    if (this_present_filter || that_present_filter) {
-      if (!(this_present_filter && that_present_filter))
-        return false;
-      if (!this.filter.equals(that.filter))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(ExpertQuery other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    ExpertQuery typedOther = (ExpertQuery)other;
-
-    lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQuery()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.query, typedOther.query);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFilter()).compareTo(typedOther.isSetFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFilter()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filter, typedOther.filter);
-      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("ExpertQuery(");
-    boolean first = true;
-
-    sb.append("query:");
-    if (this.query == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.query, sb);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("filter:");
-    if (this.filter == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.filter, sb);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ExpertQueryStandardSchemeFactory implements SchemeFactory {
-    public ExpertQueryStandardScheme getScheme() {
-      return new ExpertQueryStandardScheme();
-    }
-  }
-
-  private static class ExpertQueryStandardScheme extends StandardScheme<ExpertQuery> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ExpertQuery 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: // QUERY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.query = iprot.readBinary();
-              struct.setQueryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.filter = iprot.readBinary();
-              struct.setFilterIsSet(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, ExpertQuery struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.query != null) {
-        oprot.writeFieldBegin(QUERY_FIELD_DESC);
-        oprot.writeBinary(struct.query);
-        oprot.writeFieldEnd();
-      }
-      if (struct.filter != null) {
-        oprot.writeFieldBegin(FILTER_FIELD_DESC);
-        oprot.writeBinary(struct.filter);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ExpertQueryTupleSchemeFactory implements SchemeFactory {
-    public ExpertQueryTupleScheme getScheme() {
-      return new ExpertQueryTupleScheme();
-    }
-  }
-
-  private static class ExpertQueryTupleScheme extends TupleScheme<ExpertQuery> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ExpertQuery struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetQuery()) {
-        optionals.set(0);
-      }
-      if (struct.isSetFilter()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetQuery()) {
-        oprot.writeBinary(struct.query);
-      }
-      if (struct.isSetFilter()) {
-        oprot.writeBinary(struct.filter);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ExpertQuery struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.query = iprot.readBinary();
-        struct.setQueryIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.filter = iprot.readBinary();
-        struct.setFilterIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/gen-java/org/apache/blur/thrift/generated/SimpleQuery.java
----------------------------------------------------------------------
diff --git a/interface/gen-java/org/apache/blur/thrift/generated/SimpleQuery.java b/interface/gen-java/org/apache/blur/thrift/generated/SimpleQuery.java
deleted file mode 100644
index 2b1892b..0000000
--- a/interface/gen-java/org/apache/blur/thrift/generated/SimpleQuery.java
+++ /dev/null
@@ -1,879 +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;
-
-/**
- * The SimpleQuery object holds the query string (normal Lucene syntax), filters and type of scoring (used when super query is on).
- */
-public class SimpleQuery implements org.apache.thrift.TBase<SimpleQuery, SimpleQuery._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("SimpleQuery");
-
-  private static final org.apache.thrift.protocol.TField QUERY_STR_FIELD_DESC = new org.apache.thrift.protocol.TField("queryStr", org.apache.thrift.protocol.TType.STRING, (short)1);
-  private static final org.apache.thrift.protocol.TField SUPER_QUERY_ON_FIELD_DESC = new org.apache.thrift.protocol.TField("superQueryOn", org.apache.thrift.protocol.TType.BOOL, (short)2);
-  private static final org.apache.thrift.protocol.TField TYPE_FIELD_DESC = new org.apache.thrift.protocol.TField("type", org.apache.thrift.protocol.TType.I32, (short)3);
-  private static final org.apache.thrift.protocol.TField POST_SUPER_FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("postSuperFilter", org.apache.thrift.protocol.TType.STRING, (short)4);
-  private static final org.apache.thrift.protocol.TField PRE_SUPER_FILTER_FIELD_DESC = new org.apache.thrift.protocol.TField("preSuperFilter", org.apache.thrift.protocol.TType.STRING, (short)5);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new SimpleQueryStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new SimpleQueryTupleSchemeFactory());
-  }
-
-  /**
-   * A Lucene syntax based query.
-   */
-  public String queryStr; // required
-  /**
-   * If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-   */
-  public boolean superQueryOn; // required
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   * 
-   * @see ScoreType
-   */
-  public ScoreType type; // required
-  /**
-   * The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-   */
-  public String postSuperFilter; // required
-  /**
-   * The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-   */
-  public String preSuperFilter; // 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 {
-    /**
-     * A Lucene syntax based query.
-     */
-    QUERY_STR((short)1, "queryStr"),
-    /**
-     * If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-     */
-    SUPER_QUERY_ON((short)2, "superQueryOn"),
-    /**
-     * The scoring type, see the document on ScoreType for explanation of each score type.
-     * 
-     * @see ScoreType
-     */
-    TYPE((short)3, "type"),
-    /**
-     * The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-     */
-    POST_SUPER_FILTER((short)4, "postSuperFilter"),
-    /**
-     * The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-     */
-    PRE_SUPER_FILTER((short)5, "preSuperFilter");
-
-    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: // QUERY_STR
-          return QUERY_STR;
-        case 2: // SUPER_QUERY_ON
-          return SUPER_QUERY_ON;
-        case 3: // TYPE
-          return TYPE;
-        case 4: // POST_SUPER_FILTER
-          return POST_SUPER_FILTER;
-        case 5: // PRE_SUPER_FILTER
-          return PRE_SUPER_FILTER;
-        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 __SUPERQUERYON_ISSET_ID = 0;
-  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.QUERY_STR, new org.apache.thrift.meta_data.FieldMetaData("queryStr", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.SUPER_QUERY_ON, new org.apache.thrift.meta_data.FieldMetaData("superQueryOn", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BOOL)));
-    tmpMap.put(_Fields.TYPE, new org.apache.thrift.meta_data.FieldMetaData("type", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, ScoreType.class)));
-    tmpMap.put(_Fields.POST_SUPER_FILTER, new org.apache.thrift.meta_data.FieldMetaData("postSuperFilter", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.PRE_SUPER_FILTER, new org.apache.thrift.meta_data.FieldMetaData("preSuperFilter", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(SimpleQuery.class, metaDataMap);
-  }
-
-  public SimpleQuery() {
-    this.superQueryOn = true;
-
-    this.type = org.apache.blur.thrift.generated.ScoreType.SUPER;
-
-  }
-
-  public SimpleQuery(
-    String queryStr,
-    boolean superQueryOn,
-    ScoreType type,
-    String postSuperFilter,
-    String preSuperFilter)
-  {
-    this();
-    this.queryStr = queryStr;
-    this.superQueryOn = superQueryOn;
-    setSuperQueryOnIsSet(true);
-    this.type = type;
-    this.postSuperFilter = postSuperFilter;
-    this.preSuperFilter = preSuperFilter;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SimpleQuery(SimpleQuery other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetQueryStr()) {
-      this.queryStr = other.queryStr;
-    }
-    this.superQueryOn = other.superQueryOn;
-    if (other.isSetType()) {
-      this.type = other.type;
-    }
-    if (other.isSetPostSuperFilter()) {
-      this.postSuperFilter = other.postSuperFilter;
-    }
-    if (other.isSetPreSuperFilter()) {
-      this.preSuperFilter = other.preSuperFilter;
-    }
-  }
-
-  public SimpleQuery deepCopy() {
-    return new SimpleQuery(this);
-  }
-
-  @Override
-  public void clear() {
-    this.queryStr = null;
-    this.superQueryOn = true;
-
-    this.type = org.apache.blur.thrift.generated.ScoreType.SUPER;
-
-    this.postSuperFilter = null;
-    this.preSuperFilter = null;
-  }
-
-  /**
-   * A Lucene syntax based query.
-   */
-  public String getQueryStr() {
-    return this.queryStr;
-  }
-
-  /**
-   * A Lucene syntax based query.
-   */
-  public SimpleQuery setQueryStr(String queryStr) {
-    this.queryStr = queryStr;
-    return this;
-  }
-
-  public void unsetQueryStr() {
-    this.queryStr = null;
-  }
-
-  /** Returns true if field queryStr is set (has been assigned a value) and false otherwise */
-  public boolean isSetQueryStr() {
-    return this.queryStr != null;
-  }
-
-  public void setQueryStrIsSet(boolean value) {
-    if (!value) {
-      this.queryStr = null;
-    }
-  }
-
-  /**
-   * If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-   */
-  public boolean isSuperQueryOn() {
-    return this.superQueryOn;
-  }
-
-  /**
-   * If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-   */
-  public SimpleQuery setSuperQueryOn(boolean superQueryOn) {
-    this.superQueryOn = superQueryOn;
-    setSuperQueryOnIsSet(true);
-    return this;
-  }
-
-  public void unsetSuperQueryOn() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __SUPERQUERYON_ISSET_ID);
-  }
-
-  /** Returns true if field superQueryOn is set (has been assigned a value) and false otherwise */
-  public boolean isSetSuperQueryOn() {
-    return EncodingUtils.testBit(__isset_bitfield, __SUPERQUERYON_ISSET_ID);
-  }
-
-  public void setSuperQueryOnIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __SUPERQUERYON_ISSET_ID, value);
-  }
-
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   * 
-   * @see ScoreType
-   */
-  public ScoreType getType() {
-    return this.type;
-  }
-
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   * 
-   * @see ScoreType
-   */
-  public SimpleQuery setType(ScoreType type) {
-    this.type = type;
-    return this;
-  }
-
-  public void unsetType() {
-    this.type = null;
-  }
-
-  /** Returns true if field type is set (has been assigned a value) and false otherwise */
-  public boolean isSetType() {
-    return this.type != null;
-  }
-
-  public void setTypeIsSet(boolean value) {
-    if (!value) {
-      this.type = null;
-    }
-  }
-
-  /**
-   * The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-   */
-  public String getPostSuperFilter() {
-    return this.postSuperFilter;
-  }
-
-  /**
-   * The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-   */
-  public SimpleQuery setPostSuperFilter(String postSuperFilter) {
-    this.postSuperFilter = postSuperFilter;
-    return this;
-  }
-
-  public void unsetPostSuperFilter() {
-    this.postSuperFilter = null;
-  }
-
-  /** Returns true if field postSuperFilter is set (has been assigned a value) and false otherwise */
-  public boolean isSetPostSuperFilter() {
-    return this.postSuperFilter != null;
-  }
-
-  public void setPostSuperFilterIsSet(boolean value) {
-    if (!value) {
-      this.postSuperFilter = null;
-    }
-  }
-
-  /**
-   * The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-   */
-  public String getPreSuperFilter() {
-    return this.preSuperFilter;
-  }
-
-  /**
-   * The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-   */
-  public SimpleQuery setPreSuperFilter(String preSuperFilter) {
-    this.preSuperFilter = preSuperFilter;
-    return this;
-  }
-
-  public void unsetPreSuperFilter() {
-    this.preSuperFilter = null;
-  }
-
-  /** Returns true if field preSuperFilter is set (has been assigned a value) and false otherwise */
-  public boolean isSetPreSuperFilter() {
-    return this.preSuperFilter != null;
-  }
-
-  public void setPreSuperFilterIsSet(boolean value) {
-    if (!value) {
-      this.preSuperFilter = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUERY_STR:
-      if (value == null) {
-        unsetQueryStr();
-      } else {
-        setQueryStr((String)value);
-      }
-      break;
-
-    case SUPER_QUERY_ON:
-      if (value == null) {
-        unsetSuperQueryOn();
-      } else {
-        setSuperQueryOn((Boolean)value);
-      }
-      break;
-
-    case TYPE:
-      if (value == null) {
-        unsetType();
-      } else {
-        setType((ScoreType)value);
-      }
-      break;
-
-    case POST_SUPER_FILTER:
-      if (value == null) {
-        unsetPostSuperFilter();
-      } else {
-        setPostSuperFilter((String)value);
-      }
-      break;
-
-    case PRE_SUPER_FILTER:
-      if (value == null) {
-        unsetPreSuperFilter();
-      } else {
-        setPreSuperFilter((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUERY_STR:
-      return getQueryStr();
-
-    case SUPER_QUERY_ON:
-      return Boolean.valueOf(isSuperQueryOn());
-
-    case TYPE:
-      return getType();
-
-    case POST_SUPER_FILTER:
-      return getPostSuperFilter();
-
-    case PRE_SUPER_FILTER:
-      return getPreSuperFilter();
-
-    }
-    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 QUERY_STR:
-      return isSetQueryStr();
-    case SUPER_QUERY_ON:
-      return isSetSuperQueryOn();
-    case TYPE:
-      return isSetType();
-    case POST_SUPER_FILTER:
-      return isSetPostSuperFilter();
-    case PRE_SUPER_FILTER:
-      return isSetPreSuperFilter();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof SimpleQuery)
-      return this.equals((SimpleQuery)that);
-    return false;
-  }
-
-  public boolean equals(SimpleQuery that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_queryStr = true && this.isSetQueryStr();
-    boolean that_present_queryStr = true && that.isSetQueryStr();
-    if (this_present_queryStr || that_present_queryStr) {
-      if (!(this_present_queryStr && that_present_queryStr))
-        return false;
-      if (!this.queryStr.equals(that.queryStr))
-        return false;
-    }
-
-    boolean this_present_superQueryOn = true;
-    boolean that_present_superQueryOn = true;
-    if (this_present_superQueryOn || that_present_superQueryOn) {
-      if (!(this_present_superQueryOn && that_present_superQueryOn))
-        return false;
-      if (this.superQueryOn != that.superQueryOn)
-        return false;
-    }
-
-    boolean this_present_type = true && this.isSetType();
-    boolean that_present_type = true && that.isSetType();
-    if (this_present_type || that_present_type) {
-      if (!(this_present_type && that_present_type))
-        return false;
-      if (!this.type.equals(that.type))
-        return false;
-    }
-
-    boolean this_present_postSuperFilter = true && this.isSetPostSuperFilter();
-    boolean that_present_postSuperFilter = true && that.isSetPostSuperFilter();
-    if (this_present_postSuperFilter || that_present_postSuperFilter) {
-      if (!(this_present_postSuperFilter && that_present_postSuperFilter))
-        return false;
-      if (!this.postSuperFilter.equals(that.postSuperFilter))
-        return false;
-    }
-
-    boolean this_present_preSuperFilter = true && this.isSetPreSuperFilter();
-    boolean that_present_preSuperFilter = true && that.isSetPreSuperFilter();
-    if (this_present_preSuperFilter || that_present_preSuperFilter) {
-      if (!(this_present_preSuperFilter && that_present_preSuperFilter))
-        return false;
-      if (!this.preSuperFilter.equals(that.preSuperFilter))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(SimpleQuery other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    SimpleQuery typedOther = (SimpleQuery)other;
-
-    lastComparison = Boolean.valueOf(isSetQueryStr()).compareTo(typedOther.isSetQueryStr());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQueryStr()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.queryStr, typedOther.queryStr);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetSuperQueryOn()).compareTo(typedOther.isSetSuperQueryOn());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetSuperQueryOn()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.superQueryOn, typedOther.superQueryOn);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetType()).compareTo(typedOther.isSetType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetType()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.type, typedOther.type);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPostSuperFilter()).compareTo(typedOther.isSetPostSuperFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPostSuperFilter()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.postSuperFilter, typedOther.postSuperFilter);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetPreSuperFilter()).compareTo(typedOther.isSetPreSuperFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetPreSuperFilter()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.preSuperFilter, typedOther.preSuperFilter);
-      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("SimpleQuery(");
-    boolean first = true;
-
-    sb.append("queryStr:");
-    if (this.queryStr == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.queryStr);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("superQueryOn:");
-    sb.append(this.superQueryOn);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("type:");
-    if (this.type == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.type);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("postSuperFilter:");
-    if (this.postSuperFilter == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.postSuperFilter);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("preSuperFilter:");
-    if (this.preSuperFilter == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.preSuperFilter);
-    }
-    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 SimpleQueryStandardSchemeFactory implements SchemeFactory {
-    public SimpleQueryStandardScheme getScheme() {
-      return new SimpleQueryStandardScheme();
-    }
-  }
-
-  private static class SimpleQueryStandardScheme extends StandardScheme<SimpleQuery> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, SimpleQuery 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: // QUERY_STR
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.queryStr = iprot.readString();
-              struct.setQueryStrIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // SUPER_QUERY_ON
-            if (schemeField.type == org.apache.thrift.protocol.TType.BOOL) {
-              struct.superQueryOn = iprot.readBool();
-              struct.setSuperQueryOnIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // TYPE
-            if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
-              struct.type = ScoreType.findByValue(iprot.readI32());
-              struct.setTypeIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // POST_SUPER_FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.postSuperFilter = iprot.readString();
-              struct.setPostSuperFilterIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // PRE_SUPER_FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.preSuperFilter = iprot.readString();
-              struct.setPreSuperFilterIsSet(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, SimpleQuery struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.queryStr != null) {
-        oprot.writeFieldBegin(QUERY_STR_FIELD_DESC);
-        oprot.writeString(struct.queryStr);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(SUPER_QUERY_ON_FIELD_DESC);
-      oprot.writeBool(struct.superQueryOn);
-      oprot.writeFieldEnd();
-      if (struct.type != null) {
-        oprot.writeFieldBegin(TYPE_FIELD_DESC);
-        oprot.writeI32(struct.type.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.postSuperFilter != null) {
-        oprot.writeFieldBegin(POST_SUPER_FILTER_FIELD_DESC);
-        oprot.writeString(struct.postSuperFilter);
-        oprot.writeFieldEnd();
-      }
-      if (struct.preSuperFilter != null) {
-        oprot.writeFieldBegin(PRE_SUPER_FILTER_FIELD_DESC);
-        oprot.writeString(struct.preSuperFilter);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class SimpleQueryTupleSchemeFactory implements SchemeFactory {
-    public SimpleQueryTupleScheme getScheme() {
-      return new SimpleQueryTupleScheme();
-    }
-  }
-
-  private static class SimpleQueryTupleScheme extends TupleScheme<SimpleQuery> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, SimpleQuery struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetQueryStr()) {
-        optionals.set(0);
-      }
-      if (struct.isSetSuperQueryOn()) {
-        optionals.set(1);
-      }
-      if (struct.isSetType()) {
-        optionals.set(2);
-      }
-      if (struct.isSetPostSuperFilter()) {
-        optionals.set(3);
-      }
-      if (struct.isSetPreSuperFilter()) {
-        optionals.set(4);
-      }
-      oprot.writeBitSet(optionals, 5);
-      if (struct.isSetQueryStr()) {
-        oprot.writeString(struct.queryStr);
-      }
-      if (struct.isSetSuperQueryOn()) {
-        oprot.writeBool(struct.superQueryOn);
-      }
-      if (struct.isSetType()) {
-        oprot.writeI32(struct.type.getValue());
-      }
-      if (struct.isSetPostSuperFilter()) {
-        oprot.writeString(struct.postSuperFilter);
-      }
-      if (struct.isSetPreSuperFilter()) {
-        oprot.writeString(struct.preSuperFilter);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, SimpleQuery struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.queryStr = iprot.readString();
-        struct.setQueryStrIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.superQueryOn = iprot.readBool();
-        struct.setSuperQueryOnIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.type = ScoreType.findByValue(iprot.readI32());
-        struct.setTypeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.postSuperFilter = iprot.readString();
-        struct.setPostSuperFilterIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.preSuperFilter = iprot.readString();
-        struct.setPreSuperFilterIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/gen-perl/Blur/Types.pm
----------------------------------------------------------------------
diff --git a/interface/gen-perl/Blur/Types.pm b/interface/gen-perl/Blur/Types.pm
index 46476b3..1c7afe0 100644
--- a/interface/gen-perl/Blur/Types.pm
+++ b/interface/gen-perl/Blur/Types.pm
@@ -929,209 +929,6 @@ sub write {
   return $xfer;
 }
 
-package Blur::SimpleQuery;
-use base qw(Class::Accessor);
-Blur::SimpleQuery->mk_accessors( qw( queryStr superQueryOn type postSuperFilter preSuperFilter ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{queryStr} = undef;
-  $self->{superQueryOn} = 1;
-  $self->{type} = 0;
-  $self->{postSuperFilter} = undef;
-  $self->{preSuperFilter} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{queryStr}) {
-      $self->{queryStr} = $vals->{queryStr};
-    }
-    if (defined $vals->{superQueryOn}) {
-      $self->{superQueryOn} = $vals->{superQueryOn};
-    }
-    if (defined $vals->{type}) {
-      $self->{type} = $vals->{type};
-    }
-    if (defined $vals->{postSuperFilter}) {
-      $self->{postSuperFilter} = $vals->{postSuperFilter};
-    }
-    if (defined $vals->{preSuperFilter}) {
-      $self->{preSuperFilter} = $vals->{preSuperFilter};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'SimpleQuery';
-}
-
-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->{queryStr});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::BOOL) {
-        $xfer += $input->readBool(\$self->{superQueryOn});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^3$/ && do{      if ($ftype == TType::I32) {
-        $xfer += $input->readI32(\$self->{type});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^4$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{postSuperFilter});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^5$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{preSuperFilter});
-      } 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('SimpleQuery');
-  if (defined $self->{queryStr}) {
-    $xfer += $output->writeFieldBegin('queryStr', TType::STRING, 1);
-    $xfer += $output->writeString($self->{queryStr});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{superQueryOn}) {
-    $xfer += $output->writeFieldBegin('superQueryOn', TType::BOOL, 2);
-    $xfer += $output->writeBool($self->{superQueryOn});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{type}) {
-    $xfer += $output->writeFieldBegin('type', TType::I32, 3);
-    $xfer += $output->writeI32($self->{type});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{postSuperFilter}) {
-    $xfer += $output->writeFieldBegin('postSuperFilter', TType::STRING, 4);
-    $xfer += $output->writeString($self->{postSuperFilter});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{preSuperFilter}) {
-    $xfer += $output->writeFieldBegin('preSuperFilter', TType::STRING, 5);
-    $xfer += $output->writeString($self->{preSuperFilter});
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
-package Blur::ExpertQuery;
-use base qw(Class::Accessor);
-Blur::ExpertQuery->mk_accessors( qw( query filter ) );
-
-sub new {
-  my $classname = shift;
-  my $self      = {};
-  my $vals      = shift || {};
-  $self->{query} = undef;
-  $self->{filter} = undef;
-  if (UNIVERSAL::isa($vals,'HASH')) {
-    if (defined $vals->{query}) {
-      $self->{query} = $vals->{query};
-    }
-    if (defined $vals->{filter}) {
-      $self->{filter} = $vals->{filter};
-    }
-  }
-  return bless ($self, $classname);
-}
-
-sub getName {
-  return 'ExpertQuery';
-}
-
-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->{query});
-      } else {
-        $xfer += $input->skip($ftype);
-      }
-      last; };
-      /^2$/ && do{      if ($ftype == TType::STRING) {
-        $xfer += $input->readString(\$self->{filter});
-      } 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('ExpertQuery');
-  if (defined $self->{query}) {
-    $xfer += $output->writeFieldBegin('query', TType::STRING, 1);
-    $xfer += $output->writeString($self->{query});
-    $xfer += $output->writeFieldEnd();
-  }
-  if (defined $self->{filter}) {
-    $xfer += $output->writeFieldBegin('filter', TType::STRING, 2);
-    $xfer += $output->writeString($self->{filter});
-    $xfer += $output->writeFieldEnd();
-  }
-  $xfer += $output->writeFieldStop();
-  $xfer += $output->writeStructEnd();
-  return $xfer;
-}
-
 package Blur::Facet;
 use base qw(Class::Accessor);
 Blur::Facet->mk_accessors( qw( queryStr minimumNumberOfBlurResults ) );

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/interface/gen-rb/blur_types.rb
----------------------------------------------------------------------
diff --git a/interface/gen-rb/blur_types.rb b/interface/gen-rb/blur_types.rb
index 8f7018a..4e8cd56 100644
--- a/interface/gen-rb/blur_types.rb
+++ b/interface/gen-rb/blur_types.rb
@@ -290,60 +290,6 @@ module Blur
     ::Thrift::Struct.generate_accessors self
   end
 
-  # The SimpleQuery object holds the query string (normal Lucene syntax), filters and type of scoring (used when super query is on).
-  class SimpleQuery
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    QUERYSTR = 1
-    SUPERQUERYON = 2
-    TYPE = 3
-    POSTSUPERFILTER = 4
-    PRESUPERFILTER = 5
-
-    FIELDS = {
-      # A Lucene syntax based query.
-      QUERYSTR => {:type => ::Thrift::Types::STRING, :name => 'queryStr'},
-      # If the super query is on, meaning the query will be perform against all the records (joining records in some cases) and the result will be Rows (groupings of Record).
-      SUPERQUERYON => {:type => ::Thrift::Types::BOOL, :name => 'superQueryOn', :default => true},
-      # The scoring type, see the document on ScoreType for explanation of each score type.
-      TYPE => {:type => ::Thrift::Types::I32, :name => 'type', :default =>       0, :enum_class => ::Blur::ScoreType},
-      # The post super filter (normal Lucene syntax), is a filter performed after the join to filter out entire rows from the results.
-      POSTSUPERFILTER => {:type => ::Thrift::Types::STRING, :name => 'postSuperFilter'},
-      # The pre super filter (normal Lucene syntax), is a filter performed before the join to filter out records from the results.
-      PRESUPERFILTER => {:type => ::Thrift::Types::STRING, :name => 'preSuperFilter'}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-      unless @type.nil? || ::Blur::ScoreType::VALID_VALUES.include?(@type)
-        raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field type!')
-      end
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
-  # The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
-  class ExpertQuery
-    include ::Thrift::Struct, ::Thrift::Struct_Union
-    QUERY = 1
-    FILTER = 2
-
-    FIELDS = {
-      # The serialized query.
-      QUERY => {:type => ::Thrift::Types::STRING, :name => 'query', :binary => true},
-      # The serialized filter.
-      FILTER => {:type => ::Thrift::Types::STRING, :name => 'filter', :binary => true}
-    }
-
-    def struct_fields; FIELDS; end
-
-    def validate
-    end
-
-    ::Thrift::Struct.generate_accessors self
-  end
-
   # Blur facet.
   class Facet
     include ::Thrift::Struct, ::Thrift::Struct_Union

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
----------------------------------------------------------------------
diff --git a/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java b/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
index bd00f3a..3eb2c63 100644
--- a/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
+++ b/src/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java
@@ -43,7 +43,6 @@ import org.apache.blur.metrics.BlurMetrics;
 import org.apache.blur.metrics.QueryMetrics;
 import org.apache.blur.thrift.BException;
 import org.apache.blur.thrift.generated.BlurException;
-import org.apache.blur.thrift.generated.ExpertQuery;
 import org.apache.blur.thrift.generated.FetchResult;
 import org.apache.blur.thrift.generated.FetchRowResult;
 import org.apache.blur.thrift.generated.Schema;
@@ -70,9 +69,7 @@ import org.apache.lucene.index.Terms;
 import org.apache.lucene.index.TermsEnum;
 import org.apache.lucene.search.BooleanClause.Occur;
 import org.apache.lucene.search.BooleanQuery;
-import org.apache.lucene.search.Filter;
 import org.apache.lucene.search.IndexSearcher;
-import org.apache.lucene.search.Query;
 import org.apache.lucene.search.TermQuery;
 import org.apache.lucene.search.TopDocs;
 import org.apache.lucene.util.Bits;
@@ -270,14 +267,6 @@ public class IndexManager {
     return split[0];
   }
 
-  private Filter getFilter(ExpertQuery expertQuery) throws BException {
-    throw new BException("Expert query not supported", new Throwable());
-  }
-
-  private Query getQuery(ExpertQuery expertQuery) throws BException {
-    throw new BException("Expert query not supported", new Throwable());
-  }
-
   private ScoreType getScoreType(ScoreType type) {
     if (type == null) {
       return ScoreType.SUPER;

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/8d86073c/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ExpertQuery.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ExpertQuery.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ExpertQuery.java
deleted file mode 100644
index a9f823e..0000000
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ExpertQuery.java
+++ /dev/null
@@ -1,554 +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;
-
-/**
- * The expert query allows for submission of a serialized query and filter object to be executed against all the queries.
- */
-public class ExpertQuery implements org.apache.thrift.TBase<ExpertQuery, ExpertQuery._Fields>, java.io.Serializable, Cloneable {
-  private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExpertQuery");
-
-  private static final org.apache.thrift.protocol.TField QUERY_FIELD_DESC = new org.apache.thrift.protocol.TField("query", org.apache.thrift.protocol.TType.STRING, (short)1);
-  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)2);
-
-  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
-  static {
-    schemes.put(StandardScheme.class, new ExpertQueryStandardSchemeFactory());
-    schemes.put(TupleScheme.class, new ExpertQueryTupleSchemeFactory());
-  }
-
-  /**
-   * The serialized query.
-   */
-  public ByteBuffer query; // required
-  /**
-   * The serialized filter.
-   */
-  public ByteBuffer filter; // 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 serialized query.
-     */
-    QUERY((short)1, "query"),
-    /**
-     * The serialized filter.
-     */
-    FILTER((short)2, "filter");
-
-    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: // QUERY
-          return QUERY;
-        case 2: // FILTER
-          return FILTER;
-        default:
-          return null;
-      }
-    }
-
-    /**
-     * Find the _Fields constant that matches fieldId, throwing an exception
-     * if it is not found.
-     */
-    public static _Fields findByThriftIdOrThrow(int fieldId) {
-      _Fields fields = findByThriftId(fieldId);
-      if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
-      return fields;
-    }
-
-    /**
-     * Find the _Fields constant that matches name, or null if its not found.
-     */
-    public static _Fields findByName(String name) {
-      return byName.get(name);
-    }
-
-    private final short _thriftId;
-    private final String _fieldName;
-
-    _Fields(short thriftId, String fieldName) {
-      _thriftId = thriftId;
-      _fieldName = fieldName;
-    }
-
-    public short getThriftFieldId() {
-      return _thriftId;
-    }
-
-    public String getFieldName() {
-      return _fieldName;
-    }
-  }
-
-  // isset id assignments
-  public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
-  static {
-    Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
-    tmpMap.put(_Fields.QUERY, new org.apache.thrift.meta_data.FieldMetaData("query", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    tmpMap.put(_Fields.FILTER, new org.apache.thrift.meta_data.FieldMetaData("filter", org.apache.thrift.TFieldRequirementType.DEFAULT, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING        , true)));
-    metaDataMap = Collections.unmodifiableMap(tmpMap);
-    org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ExpertQuery.class, metaDataMap);
-  }
-
-  public ExpertQuery() {
-  }
-
-  public ExpertQuery(
-    ByteBuffer query,
-    ByteBuffer filter)
-  {
-    this();
-    this.query = query;
-    this.filter = filter;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public ExpertQuery(ExpertQuery other) {
-    if (other.isSetQuery()) {
-      this.query = org.apache.thrift.TBaseHelper.copyBinary(other.query);
-;
-    }
-    if (other.isSetFilter()) {
-      this.filter = org.apache.thrift.TBaseHelper.copyBinary(other.filter);
-;
-    }
-  }
-
-  public ExpertQuery deepCopy() {
-    return new ExpertQuery(this);
-  }
-
-  @Override
-  public void clear() {
-    this.query = null;
-    this.filter = null;
-  }
-
-  /**
-   * The serialized query.
-   */
-  public byte[] getQuery() {
-    setQuery(org.apache.thrift.TBaseHelper.rightSize(query));
-    return query == null ? null : query.array();
-  }
-
-  public ByteBuffer bufferForQuery() {
-    return query;
-  }
-
-  /**
-   * The serialized query.
-   */
-  public ExpertQuery setQuery(byte[] query) {
-    setQuery(query == null ? (ByteBuffer)null : ByteBuffer.wrap(query));
-    return this;
-  }
-
-  public ExpertQuery setQuery(ByteBuffer query) {
-    this.query = query;
-    return this;
-  }
-
-  public void unsetQuery() {
-    this.query = null;
-  }
-
-  /** Returns true if field query is set (has been assigned a value) and false otherwise */
-  public boolean isSetQuery() {
-    return this.query != null;
-  }
-
-  public void setQueryIsSet(boolean value) {
-    if (!value) {
-      this.query = null;
-    }
-  }
-
-  /**
-   * The serialized filter.
-   */
-  public byte[] getFilter() {
-    setFilter(org.apache.thrift.TBaseHelper.rightSize(filter));
-    return filter == null ? null : filter.array();
-  }
-
-  public ByteBuffer bufferForFilter() {
-    return filter;
-  }
-
-  /**
-   * The serialized filter.
-   */
-  public ExpertQuery setFilter(byte[] filter) {
-    setFilter(filter == null ? (ByteBuffer)null : ByteBuffer.wrap(filter));
-    return this;
-  }
-
-  public ExpertQuery setFilter(ByteBuffer filter) {
-    this.filter = filter;
-    return this;
-  }
-
-  public void unsetFilter() {
-    this.filter = null;
-  }
-
-  /** Returns true if field filter is set (has been assigned a value) and false otherwise */
-  public boolean isSetFilter() {
-    return this.filter != null;
-  }
-
-  public void setFilterIsSet(boolean value) {
-    if (!value) {
-      this.filter = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUERY:
-      if (value == null) {
-        unsetQuery();
-      } else {
-        setQuery((ByteBuffer)value);
-      }
-      break;
-
-    case FILTER:
-      if (value == null) {
-        unsetFilter();
-      } else {
-        setFilter((ByteBuffer)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUERY:
-      return getQuery();
-
-    case FILTER:
-      return getFilter();
-
-    }
-    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 QUERY:
-      return isSetQuery();
-    case FILTER:
-      return isSetFilter();
-    }
-    throw new IllegalStateException();
-  }
-
-  @Override
-  public boolean equals(Object that) {
-    if (that == null)
-      return false;
-    if (that instanceof ExpertQuery)
-      return this.equals((ExpertQuery)that);
-    return false;
-  }
-
-  public boolean equals(ExpertQuery that) {
-    if (that == null)
-      return false;
-
-    boolean this_present_query = true && this.isSetQuery();
-    boolean that_present_query = true && that.isSetQuery();
-    if (this_present_query || that_present_query) {
-      if (!(this_present_query && that_present_query))
-        return false;
-      if (!this.query.equals(that.query))
-        return false;
-    }
-
-    boolean this_present_filter = true && this.isSetFilter();
-    boolean that_present_filter = true && that.isSetFilter();
-    if (this_present_filter || that_present_filter) {
-      if (!(this_present_filter && that_present_filter))
-        return false;
-      if (!this.filter.equals(that.filter))
-        return false;
-    }
-
-    return true;
-  }
-
-  @Override
-  public int hashCode() {
-    return 0;
-  }
-
-  public int compareTo(ExpertQuery other) {
-    if (!getClass().equals(other.getClass())) {
-      return getClass().getName().compareTo(other.getClass().getName());
-    }
-
-    int lastComparison = 0;
-    ExpertQuery typedOther = (ExpertQuery)other;
-
-    lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQuery()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.query, typedOther.query);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetFilter()).compareTo(typedOther.isSetFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetFilter()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.filter, typedOther.filter);
-      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("ExpertQuery(");
-    boolean first = true;
-
-    sb.append("query:");
-    if (this.query == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.query, sb);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("filter:");
-    if (this.filter == null) {
-      sb.append("null");
-    } else {
-      org.apache.thrift.TBaseHelper.toString(this.filter, sb);
-    }
-    first = false;
-    sb.append(")");
-    return sb.toString();
-  }
-
-  public void validate() throws org.apache.thrift.TException {
-    // check for required fields
-    // check for sub-struct validity
-  }
-
-  private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
-    try {
-      write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
-    try {
-      read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
-    } catch (org.apache.thrift.TException te) {
-      throw new java.io.IOException(te);
-    }
-  }
-
-  private static class ExpertQueryStandardSchemeFactory implements SchemeFactory {
-    public ExpertQueryStandardScheme getScheme() {
-      return new ExpertQueryStandardScheme();
-    }
-  }
-
-  private static class ExpertQueryStandardScheme extends StandardScheme<ExpertQuery> {
-
-    public void read(org.apache.thrift.protocol.TProtocol iprot, ExpertQuery 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: // QUERY
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.query = iprot.readBinary();
-              struct.setQueryIsSet(true);
-            } else { 
-              org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // FILTER
-            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
-              struct.filter = iprot.readBinary();
-              struct.setFilterIsSet(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, ExpertQuery struct) throws org.apache.thrift.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.query != null) {
-        oprot.writeFieldBegin(QUERY_FIELD_DESC);
-        oprot.writeBinary(struct.query);
-        oprot.writeFieldEnd();
-      }
-      if (struct.filter != null) {
-        oprot.writeFieldBegin(FILTER_FIELD_DESC);
-        oprot.writeBinary(struct.filter);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldStop();
-      oprot.writeStructEnd();
-    }
-
-  }
-
-  private static class ExpertQueryTupleSchemeFactory implements SchemeFactory {
-    public ExpertQueryTupleScheme getScheme() {
-      return new ExpertQueryTupleScheme();
-    }
-  }
-
-  private static class ExpertQueryTupleScheme extends TupleScheme<ExpertQuery> {
-
-    @Override
-    public void write(org.apache.thrift.protocol.TProtocol prot, ExpertQuery struct) throws org.apache.thrift.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetQuery()) {
-        optionals.set(0);
-      }
-      if (struct.isSetFilter()) {
-        optionals.set(1);
-      }
-      oprot.writeBitSet(optionals, 2);
-      if (struct.isSetQuery()) {
-        oprot.writeBinary(struct.query);
-      }
-      if (struct.isSetFilter()) {
-        oprot.writeBinary(struct.filter);
-      }
-    }
-
-    @Override
-    public void read(org.apache.thrift.protocol.TProtocol prot, ExpertQuery struct) throws org.apache.thrift.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(2);
-      if (incoming.get(0)) {
-        struct.query = iprot.readBinary();
-        struct.setQueryIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.filter = iprot.readBinary();
-        struct.setFilterIsSet(true);
-      }
-    }
-  }
-
-}
-


Mime
View raw message