incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [5/6] Some more renaming in the thrift api and more documentation.
Date Mon, 19 Aug 2013 01:59:22 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SimpleQuery.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SimpleQuery.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SimpleQuery.java
deleted file mode 100644
index 4a69909..0000000
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/SimpleQuery.java
+++ /dev/null
@@ -1,892 +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;
-
-/**
- * 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.blur.thirdparty.thrift_0_9_0.TBase<SimpleQuery, SimpleQuery._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("SimpleQuery");
-
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("query", 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 ROW_QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("rowQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)2);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SCORE_TYPE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("scoreType", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)3);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ROW_FILTER_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("rowFilter", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)4);
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField RECORD_FILTER_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("recordFilter", org.apache.blur.thirdparty.thrift_0_9_0.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 query; // required
-  /**
-   * If the Row 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 rowQuery; // required
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   * 
-   * @see ScoreType
-   */
-  public ScoreType scoreType; // required
-  /**
-   * The Row filter (normal Lucene syntax), is a filter performed
-   * after the join to filter out entire Rows from the results.
-   */
-  public String rowFilter; // required
-  /**
-   * The Record filter (normal Lucene syntax), is a filter performed
-   * before the join to filter out Records from the results.
-   */
-  public String recordFilter; // 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 {
-    /**
-     * A Lucene syntax based query.
-     */
-    QUERY((short)1, "query"),
-    /**
-     * If the Row 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).
-     */
-    ROW_QUERY((short)2, "rowQuery"),
-    /**
-     * The scoring type, see the document on ScoreType for explanation of each score type.
-     * 
-     * @see ScoreType
-     */
-    SCORE_TYPE((short)3, "scoreType"),
-    /**
-     * The Row filter (normal Lucene syntax), is a filter performed
-     * after the join to filter out entire Rows from the results.
-     */
-    ROW_FILTER((short)4, "rowFilter"),
-    /**
-     * The Record filter (normal Lucene syntax), is a filter performed
-     * before the join to filter out Records from the results.
-     */
-    RECORD_FILTER((short)5, "recordFilter");
-
-    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: // ROW_QUERY
-          return ROW_QUERY;
-        case 3: // SCORE_TYPE
-          return SCORE_TYPE;
-        case 4: // ROW_FILTER
-          return ROW_FILTER;
-        case 5: // RECORD_FILTER
-          return RECORD_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 __ROWQUERY_ISSET_ID = 0;
-  private byte __isset_bitfield = 0;
-  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.QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("query", 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.ROW_QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("rowQuery", 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.BOOL)));
-    tmpMap.put(_Fields.SCORE_TYPE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("scoreType", 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, ScoreType.class)));
-    tmpMap.put(_Fields.ROW_FILTER, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("rowFilter", 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.RECORD_FILTER, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("recordFilter", 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(SimpleQuery.class, metaDataMap);
-  }
-
-  public SimpleQuery() {
-    this.rowQuery = true;
-
-    this.scoreType = org.apache.blur.thrift.generated.ScoreType.SUPER;
-
-  }
-
-  public SimpleQuery(
-    String query,
-    boolean rowQuery,
-    ScoreType scoreType,
-    String rowFilter,
-    String recordFilter)
-  {
-    this();
-    this.query = query;
-    this.rowQuery = rowQuery;
-    setRowQueryIsSet(true);
-    this.scoreType = scoreType;
-    this.rowFilter = rowFilter;
-    this.recordFilter = recordFilter;
-  }
-
-  /**
-   * Performs a deep copy on <i>other</i>.
-   */
-  public SimpleQuery(SimpleQuery other) {
-    __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetQuery()) {
-      this.query = other.query;
-    }
-    this.rowQuery = other.rowQuery;
-    if (other.isSetScoreType()) {
-      this.scoreType = other.scoreType;
-    }
-    if (other.isSetRowFilter()) {
-      this.rowFilter = other.rowFilter;
-    }
-    if (other.isSetRecordFilter()) {
-      this.recordFilter = other.recordFilter;
-    }
-  }
-
-  public SimpleQuery deepCopy() {
-    return new SimpleQuery(this);
-  }
-
-  @Override
-  public void clear() {
-    this.query = null;
-    this.rowQuery = true;
-
-    this.scoreType = org.apache.blur.thrift.generated.ScoreType.SUPER;
-
-    this.rowFilter = null;
-    this.recordFilter = null;
-  }
-
-  /**
-   * A Lucene syntax based query.
-   */
-  public String getQuery() {
-    return this.query;
-  }
-
-  /**
-   * A Lucene syntax based query.
-   */
-  public SimpleQuery setQuery(String 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;
-    }
-  }
-
-  /**
-   * If the Row 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 isRowQuery() {
-    return this.rowQuery;
-  }
-
-  /**
-   * If the Row 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 setRowQuery(boolean rowQuery) {
-    this.rowQuery = rowQuery;
-    setRowQueryIsSet(true);
-    return this;
-  }
-
-  public void unsetRowQuery() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ROWQUERY_ISSET_ID);
-  }
-
-  /** Returns true if field rowQuery is set (has been assigned a value) and false otherwise */
-  public boolean isSetRowQuery() {
-    return EncodingUtils.testBit(__isset_bitfield, __ROWQUERY_ISSET_ID);
-  }
-
-  public void setRowQueryIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ROWQUERY_ISSET_ID, value);
-  }
-
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   * 
-   * @see ScoreType
-   */
-  public ScoreType getScoreType() {
-    return this.scoreType;
-  }
-
-  /**
-   * The scoring type, see the document on ScoreType for explanation of each score type.
-   * 
-   * @see ScoreType
-   */
-  public SimpleQuery setScoreType(ScoreType scoreType) {
-    this.scoreType = scoreType;
-    return this;
-  }
-
-  public void unsetScoreType() {
-    this.scoreType = null;
-  }
-
-  /** Returns true if field scoreType is set (has been assigned a value) and false otherwise */
-  public boolean isSetScoreType() {
-    return this.scoreType != null;
-  }
-
-  public void setScoreTypeIsSet(boolean value) {
-    if (!value) {
-      this.scoreType = null;
-    }
-  }
-
-  /**
-   * The Row filter (normal Lucene syntax), is a filter performed
-   * after the join to filter out entire Rows from the results.
-   */
-  public String getRowFilter() {
-    return this.rowFilter;
-  }
-
-  /**
-   * The Row filter (normal Lucene syntax), is a filter performed
-   * after the join to filter out entire Rows from the results.
-   */
-  public SimpleQuery setRowFilter(String rowFilter) {
-    this.rowFilter = rowFilter;
-    return this;
-  }
-
-  public void unsetRowFilter() {
-    this.rowFilter = null;
-  }
-
-  /** Returns true if field rowFilter is set (has been assigned a value) and false otherwise */
-  public boolean isSetRowFilter() {
-    return this.rowFilter != null;
-  }
-
-  public void setRowFilterIsSet(boolean value) {
-    if (!value) {
-      this.rowFilter = null;
-    }
-  }
-
-  /**
-   * The Record filter (normal Lucene syntax), is a filter performed
-   * before the join to filter out Records from the results.
-   */
-  public String getRecordFilter() {
-    return this.recordFilter;
-  }
-
-  /**
-   * The Record filter (normal Lucene syntax), is a filter performed
-   * before the join to filter out Records from the results.
-   */
-  public SimpleQuery setRecordFilter(String recordFilter) {
-    this.recordFilter = recordFilter;
-    return this;
-  }
-
-  public void unsetRecordFilter() {
-    this.recordFilter = null;
-  }
-
-  /** Returns true if field recordFilter is set (has been assigned a value) and false otherwise */
-  public boolean isSetRecordFilter() {
-    return this.recordFilter != null;
-  }
-
-  public void setRecordFilterIsSet(boolean value) {
-    if (!value) {
-      this.recordFilter = null;
-    }
-  }
-
-  public void setFieldValue(_Fields field, Object value) {
-    switch (field) {
-    case QUERY:
-      if (value == null) {
-        unsetQuery();
-      } else {
-        setQuery((String)value);
-      }
-      break;
-
-    case ROW_QUERY:
-      if (value == null) {
-        unsetRowQuery();
-      } else {
-        setRowQuery((Boolean)value);
-      }
-      break;
-
-    case SCORE_TYPE:
-      if (value == null) {
-        unsetScoreType();
-      } else {
-        setScoreType((ScoreType)value);
-      }
-      break;
-
-    case ROW_FILTER:
-      if (value == null) {
-        unsetRowFilter();
-      } else {
-        setRowFilter((String)value);
-      }
-      break;
-
-    case RECORD_FILTER:
-      if (value == null) {
-        unsetRecordFilter();
-      } else {
-        setRecordFilter((String)value);
-      }
-      break;
-
-    }
-  }
-
-  public Object getFieldValue(_Fields field) {
-    switch (field) {
-    case QUERY:
-      return getQuery();
-
-    case ROW_QUERY:
-      return Boolean.valueOf(isRowQuery());
-
-    case SCORE_TYPE:
-      return getScoreType();
-
-    case ROW_FILTER:
-      return getRowFilter();
-
-    case RECORD_FILTER:
-      return getRecordFilter();
-
-    }
-    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 ROW_QUERY:
-      return isSetRowQuery();
-    case SCORE_TYPE:
-      return isSetScoreType();
-    case ROW_FILTER:
-      return isSetRowFilter();
-    case RECORD_FILTER:
-      return isSetRecordFilter();
-    }
-    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_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_rowQuery = true;
-    boolean that_present_rowQuery = true;
-    if (this_present_rowQuery || that_present_rowQuery) {
-      if (!(this_present_rowQuery && that_present_rowQuery))
-        return false;
-      if (this.rowQuery != that.rowQuery)
-        return false;
-    }
-
-    boolean this_present_scoreType = true && this.isSetScoreType();
-    boolean that_present_scoreType = true && that.isSetScoreType();
-    if (this_present_scoreType || that_present_scoreType) {
-      if (!(this_present_scoreType && that_present_scoreType))
-        return false;
-      if (!this.scoreType.equals(that.scoreType))
-        return false;
-    }
-
-    boolean this_present_rowFilter = true && this.isSetRowFilter();
-    boolean that_present_rowFilter = true && that.isSetRowFilter();
-    if (this_present_rowFilter || that_present_rowFilter) {
-      if (!(this_present_rowFilter && that_present_rowFilter))
-        return false;
-      if (!this.rowFilter.equals(that.rowFilter))
-        return false;
-    }
-
-    boolean this_present_recordFilter = true && this.isSetRecordFilter();
-    boolean that_present_recordFilter = true && that.isSetRecordFilter();
-    if (this_present_recordFilter || that_present_recordFilter) {
-      if (!(this_present_recordFilter && that_present_recordFilter))
-        return false;
-      if (!this.recordFilter.equals(that.recordFilter))
-        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(isSetQuery()).compareTo(typedOther.isSetQuery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetQuery()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.query, typedOther.query);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRowQuery()).compareTo(typedOther.isSetRowQuery());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRowQuery()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.rowQuery, typedOther.rowQuery);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetScoreType()).compareTo(typedOther.isSetScoreType());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetScoreType()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.scoreType, typedOther.scoreType);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRowFilter()).compareTo(typedOther.isSetRowFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRowFilter()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.rowFilter, typedOther.rowFilter);
-      if (lastComparison != 0) {
-        return lastComparison;
-      }
-    }
-    lastComparison = Boolean.valueOf(isSetRecordFilter()).compareTo(typedOther.isSetRecordFilter());
-    if (lastComparison != 0) {
-      return lastComparison;
-    }
-    if (isSetRecordFilter()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.recordFilter, typedOther.recordFilter);
-      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("SimpleQuery(");
-    boolean first = true;
-
-    sb.append("query:");
-    if (this.query == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.query);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("rowQuery:");
-    sb.append(this.rowQuery);
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("scoreType:");
-    if (this.scoreType == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.scoreType);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("rowFilter:");
-    if (this.rowFilter == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.rowFilter);
-    }
-    first = false;
-    if (!first) sb.append(", ");
-    sb.append("recordFilter:");
-    if (this.recordFilter == null) {
-      sb.append("null");
-    } else {
-      sb.append(this.recordFilter);
-    }
-    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 {
-      // 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.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 SimpleQueryStandardSchemeFactory implements SchemeFactory {
-    public SimpleQueryStandardScheme getScheme() {
-      return new SimpleQueryStandardScheme();
-    }
-  }
-
-  private static class SimpleQueryStandardScheme extends StandardScheme<SimpleQuery> {
-
-    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, SimpleQuery 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: // QUERY
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
-              struct.query = iprot.readString();
-              struct.setQueryIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 2: // ROW_QUERY
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) {
-              struct.rowQuery = iprot.readBool();
-              struct.setRowQueryIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 3: // SCORE_TYPE
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) {
-              struct.scoreType = ScoreType.findByValue(iprot.readI32());
-              struct.setScoreTypeIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 4: // ROW_FILTER
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
-              struct.rowFilter = iprot.readString();
-              struct.setRowFilterIsSet(true);
-            } else { 
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
-            }
-            break;
-          case 5: // RECORD_FILTER
-            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) {
-              struct.recordFilter = iprot.readString();
-              struct.setRecordFilterIsSet(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, SimpleQuery struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      struct.validate();
-
-      oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.query != null) {
-        oprot.writeFieldBegin(QUERY_FIELD_DESC);
-        oprot.writeString(struct.query);
-        oprot.writeFieldEnd();
-      }
-      oprot.writeFieldBegin(ROW_QUERY_FIELD_DESC);
-      oprot.writeBool(struct.rowQuery);
-      oprot.writeFieldEnd();
-      if (struct.scoreType != null) {
-        oprot.writeFieldBegin(SCORE_TYPE_FIELD_DESC);
-        oprot.writeI32(struct.scoreType.getValue());
-        oprot.writeFieldEnd();
-      }
-      if (struct.rowFilter != null) {
-        oprot.writeFieldBegin(ROW_FILTER_FIELD_DESC);
-        oprot.writeString(struct.rowFilter);
-        oprot.writeFieldEnd();
-      }
-      if (struct.recordFilter != null) {
-        oprot.writeFieldBegin(RECORD_FILTER_FIELD_DESC);
-        oprot.writeString(struct.recordFilter);
-        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.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, SimpleQuery struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      TTupleProtocol oprot = (TTupleProtocol) prot;
-      BitSet optionals = new BitSet();
-      if (struct.isSetQuery()) {
-        optionals.set(0);
-      }
-      if (struct.isSetRowQuery()) {
-        optionals.set(1);
-      }
-      if (struct.isSetScoreType()) {
-        optionals.set(2);
-      }
-      if (struct.isSetRowFilter()) {
-        optionals.set(3);
-      }
-      if (struct.isSetRecordFilter()) {
-        optionals.set(4);
-      }
-      oprot.writeBitSet(optionals, 5);
-      if (struct.isSetQuery()) {
-        oprot.writeString(struct.query);
-      }
-      if (struct.isSetRowQuery()) {
-        oprot.writeBool(struct.rowQuery);
-      }
-      if (struct.isSetScoreType()) {
-        oprot.writeI32(struct.scoreType.getValue());
-      }
-      if (struct.isSetRowFilter()) {
-        oprot.writeString(struct.rowFilter);
-      }
-      if (struct.isSetRecordFilter()) {
-        oprot.writeString(struct.recordFilter);
-      }
-    }
-
-    @Override
-    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, SimpleQuery struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
-      TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(5);
-      if (incoming.get(0)) {
-        struct.query = iprot.readString();
-        struct.setQueryIsSet(true);
-      }
-      if (incoming.get(1)) {
-        struct.rowQuery = iprot.readBool();
-        struct.setRowQueryIsSet(true);
-      }
-      if (incoming.get(2)) {
-        struct.scoreType = ScoreType.findByValue(iprot.readI32());
-        struct.setScoreTypeIsSet(true);
-      }
-      if (incoming.get(3)) {
-        struct.rowFilter = iprot.readString();
-        struct.setRowFilterIsSet(true);
-      }
-      if (incoming.get(4)) {
-        struct.recordFilter = iprot.readString();
-        struct.setRecordFilterIsSet(true);
-      }
-    }
-  }
-
-}
-

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/util/BlurThriftHelper.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/BlurThriftHelper.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/BlurThriftHelper.java
index c952f95..1f2c4d8 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/BlurThriftHelper.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/BlurThriftHelper.java
@@ -27,7 +27,7 @@ import org.apache.blur.thrift.generated.Row;
 import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.RowMutationType;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 public class BlurThriftHelper {
 
@@ -37,11 +37,11 @@ public class BlurThriftHelper {
     return selector;
   }
 
-  public static BlurQuery newSimpleQuery(String query) {
+  public static BlurQuery newSimpleQuery(String queryStr) {
     BlurQuery blurQuery = new BlurQuery();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    simpleQuery.setQuery(query);
-    blurQuery.setSimpleQuery(simpleQuery);
+    Query query = new Query();
+    query.setQuery(queryStr);
+    blurQuery.setQuery(query);
     blurQuery.setSelector(new Selector());
     return blurQuery;
   }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
index 2ab1219..88cf16d 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/CreateInsertQueryRepeating.java
@@ -34,7 +34,7 @@ import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.RowMutation;
 import org.apache.blur.thrift.generated.RowMutationType;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.TableDescriptor;
 
 /**
@@ -180,10 +180,10 @@ public class CreateInsertQueryRepeating {
 
   private static long hits(Iface client, String table, String queryStr, boolean superQuery) throws BlurException, TException {
     BlurQuery bq = new BlurQuery();
-    SimpleQuery sq = new SimpleQuery();
+    Query sq = new Query();
     sq.query = queryStr;
     sq.rowQuery = superQuery;
-    bq.simpleQuery = sq;
+    bq.query = sq;
     BlurResults query = client.query(table, bq);
     return query.totalResults;
   }
@@ -194,10 +194,10 @@ public class CreateInsertQueryRepeating {
     BlurQuery bq = new BlurQuery();
     bq.fetch = 10;
     for (int i = 1; i <= times; i++) {
-      SimpleQuery sq = new SimpleQuery();
+      Query sq = new Query();
       sq.query = "numberField:" + random.nextInt(1000);
       sq.rowQuery = true;
-      bq.simpleQuery = sq;
+      bq.query = sq;
       client.query(table, bq);
       if (i % 1000 == 0) {
         System.out.println("queries: " + i + " times " + df.format((i / ((System.currentTimeMillis() - start + 0.0) / 1000))) + " queries/s");

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
index dd14be3..479212f 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTable.java
@@ -31,7 +31,7 @@ import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.Schema;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 
 public class RandomSearchTable {
@@ -59,8 +59,8 @@ public class RandomSearchTable {
       String query = generateQuery(builder, random, sampleOfTerms, numberOfTermsPerQuery);
       System.out.println(query);
       final BlurQuery blurQuery = new BlurQuery();
-      blurQuery.simpleQuery = new SimpleQuery();
-      blurQuery.simpleQuery.query = query;
+      blurQuery.query = new Query();
+      blurQuery.query.query = query;
       long start = System.nanoTime();
 
       Iface client = BlurClient.getClient(connectionStr);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
index 896dd38..053ebe6 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/RandomSearchTableContinuously.java
@@ -32,7 +32,7 @@ import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResults;
 import org.apache.blur.thrift.generated.Schema;
 import org.apache.blur.thrift.generated.Selector;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 import org.apache.blur.thrift.generated.Blur.Iface;
 
 
@@ -86,8 +86,8 @@ public class RandomSearchTableContinuously {
       builder.setLength(0);
       String query = generateQuery(builder, random, sampleOfTerms, numberOfTermsPerQuery);
       final BlurQuery blurQuery = new BlurQuery();
-      blurQuery.simpleQuery = new SimpleQuery();
-      blurQuery.simpleQuery.query = query;
+      blurQuery.query = new Query();
+      blurQuery.query.query = query;
       blurQuery.cacheResult = false;
       blurQuery.selector = new Selector();
       long qs = System.nanoTime();
@@ -102,9 +102,9 @@ public class RandomSearchTableContinuously {
 
   private static long getCount(Iface client, String tableName) throws BlurException, TException {
     BlurQuery bq = new BlurQuery();
-    bq.simpleQuery = new SimpleQuery();
-    bq.simpleQuery.query = "*";
-    bq.simpleQuery.rowQuery = false;
+    bq.query = new Query();
+    bq.query.query = "*";
+    bq.query.rowQuery = false;
     bq.cacheResult = false;
     bq.useCacheIfPresent = false;
     BlurResults results = client.query(tableName, bq);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleAsyncQueryExample.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleAsyncQueryExample.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleAsyncQueryExample.java
index 9338263..1dd9938 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleAsyncQueryExample.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleAsyncQueryExample.java
@@ -28,23 +28,23 @@ import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.blur.thrift.generated.BlurResults;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 public class SimpleAsyncQueryExample {
 
   public static void main(String[] args) throws BlurException, TException, IOException, InterruptedException {
     String connectionStr = args[0];
     String tableName = args[1];
-    String query = args[2];
+    String queryStr = args[2];
 
     AsyncClientPool pool = new AsyncClientPool(10, 30000);
 
     AsyncIface asyncIface = pool.getClient(Blur.AsyncIface.class, connectionStr);
 
     final BlurQuery blurQuery = new BlurQuery();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    blurQuery.setSimpleQuery(simpleQuery);
-    simpleQuery.setQuery(query);
+    Query query = new Query();
+    query.setQuery(queryStr);
+    blurQuery.setQuery(query);
 
     asyncIface.query(tableName, blurQuery, new AsyncMethodCallback<Blur.AsyncClient.query_call>() {
       @Override

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleQueryExample.java
----------------------------------------------------------------------
diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleQueryExample.java b/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleQueryExample.java
index 5d819a4..2e267ee 100644
--- a/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleQueryExample.java
+++ b/blur-thrift/src/main/java/org/apache/blur/thrift/util/SimpleQueryExample.java
@@ -25,21 +25,21 @@ import org.apache.blur.thrift.generated.BlurException;
 import org.apache.blur.thrift.generated.BlurQuery;
 import org.apache.blur.thrift.generated.BlurResult;
 import org.apache.blur.thrift.generated.BlurResults;
-import org.apache.blur.thrift.generated.SimpleQuery;
+import org.apache.blur.thrift.generated.Query;
 
 public class SimpleQueryExample {
 
   public static void main(String[] args) throws BlurException, TException, IOException {
     String connectionStr = args[0];
     String tableName = args[1];
-    String query = args[2];
+    String queryStr = args[2];
 
     Iface client = BlurClient.getClient(connectionStr);
 
     final BlurQuery blurQuery = new BlurQuery();
-    SimpleQuery simpleQuery = new SimpleQuery();
-    blurQuery.setSimpleQuery(simpleQuery);
-    simpleQuery.setQuery(query);
+    Query query = new Query();
+    blurQuery.setQuery(query);
+    query.setQuery(queryStr);
     BlurResults results = client.query(tableName, blurQuery);
     System.out.println("Total Results: " + results.totalResults);
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/Blur.thrift b/distribution/src/main/scripts/interface/Blur.thrift
index f2af79b..068f017 100644
--- a/distribution/src/main/scripts/interface/Blur.thrift
+++ b/distribution/src/main/scripts/interface/Blur.thrift
@@ -205,10 +205,10 @@ struct Row {
 }
 
 /**
- * The SimpleQuery object holds the query string (normal Lucene syntax), 
+ * The Query object holds the query string (normal Lucene syntax), 
  * filters and type of scoring (used when super query is on).
  */
-struct SimpleQuery {
+struct Query {
   /**
    * A Lucene syntax based query.
    */
@@ -224,7 +224,8 @@ struct SimpleQuery {
   3:ScoreType scoreType = ScoreType.SUPER, 
   /**
    * The Row filter (normal Lucene syntax), is a filter performed 
-   * after the join to filter out entire Rows from the results.
+   * after the join to filter out entire Rows from the results.  This
+   * field is ignored when rowQuery is false.
    */
   4:string rowFilter,
   /**
@@ -240,12 +241,12 @@ struct SimpleQuery {
 struct HighlightOptions {
   /**
    * The original query is required if used in the Blur.fetchRow call.  If 
-   * the highlightOptions is used in a call to Blur.query then the SimpleQuery 
-   * passed into the call via the BlurQuery will be used if this simpleQuery is 
+   * the highlightOptions is used in a call to Blur.query then the Query 
+   * passed into the call via the BlurQuery will be used if this query is 
    * null.  So that means if you use highlighting from the query call you can 
    * leave this attribute null and it will default to the normal behavior.
    */
-  1:SimpleQuery simpleQuery,
+  1:Query query,
 
   /**
    * The pre tag is the tag that marks the beginning of the highlighting.
@@ -386,7 +387,7 @@ struct BlurQuery {
   /**
    * The query information.
    */
-  1:SimpleQuery simpleQuery,
+  1:Query query,
   /**
    * A list of Facets to execute with the given query.
    */
@@ -832,7 +833,7 @@ service Blur {
     /** the table name. */
     1:string table, 
     /** the query to parse. */
-    2:SimpleQuery simpleQuery
+    2:Query query
   ) throws (1:BlurException ex)
 
   /**

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/distribution/src/main/scripts/interface/gen-html/Blur.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/Blur.html b/distribution/src/main/scripts/interface/gen-html/Blur.html
index 95deb84..aabbd23 100644
--- a/distribution/src/main/scripts/interface/gen-html/Blur.html
+++ b/distribution/src/main/scripts/interface/gen-html/Blur.html
@@ -60,6 +60,7 @@
 <a href="Blur.html#Struct_FetchRowResult">FetchRowResult</a><br/>
 <a href="Blur.html#Struct_HighlightOptions">HighlightOptions</a><br/>
 <a href="Blur.html#Struct_Metric">Metric</a><br/>
+<a href="Blur.html#Struct_Query">Query</a><br/>
 <a href="Blur.html#Enum_QueryState">QueryState</a><br/>
 <a href="Blur.html#Struct_Record">Record</a><br/>
 <a href="Blur.html#Struct_RecordMutation">RecordMutation</a><br/>
@@ -71,7 +72,6 @@
 <a href="Blur.html#Enum_ScoreType">ScoreType</a><br/>
 <a href="Blur.html#Struct_Selector">Selector</a><br/>
 <a href="Blur.html#Enum_ShardState">ShardState</a><br/>
-<a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a><br/>
 <a href="Blur.html#Enum_Status">Status</a><br/>
 <a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a><br/>
 <a href="Blur.html#Struct_TableStats">TableStats</a><br/>
@@ -212,7 +212,7 @@ reflect the paged records from the selector.
 through records of a row, this count will reflect the entire row.
 </td><td>default</td><td></td></tr>
 </table><br/>Rows contain a list of records.
-<br/></div><div class="definition"><h3 id="Struct_SimpleQuery">Struct: SimpleQuery</h3>
+<br/></div><div class="definition"><h3 id="Struct_Query">Struct: Query</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>string</code></td><td>A Lucene syntax based query.
 </td><td>default</td><td></td></tr>
@@ -222,18 +222,19 @@ Records (joining records in some cases) and the result will be Rows (groupings o
 <tr><td>3</td><td>scoreType</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>rowFilter</td><td><code>string</code></td><td>The Row filter (normal Lucene syntax), is a filter performed
-after the join to filter out entire Rows from the results.
+after the join to filter out entire Rows from the results.  This
+field is ignored when rowQuery is false.
 </td><td>default</td><td></td></tr>
 <tr><td>5</td><td>recordFilter</td><td><code>string</code></td><td>The Record 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),
+</table><br/>The Query 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_HighlightOptions">Struct: HighlightOptions</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>simpleQuery</td><td><code><a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a></code></td><td>The original query is required if used in the Blur.fetchRow call.  If
-the highlightOptions is used in a call to Blur.query then the SimpleQuery
-passed into the call via the BlurQuery will be used if this simpleQuery is
+<tr><td>1</td><td>query</td><td><code><a href="Blur.html#Struct_Query">Query</a></code></td><td>The original query is required if used in the Blur.fetchRow call.  If
+the highlightOptions is used in a call to Blur.query then the Query
+passed into the call via the BlurQuery will be used if this query is
 null.  So that means if you use highlighting from the query call you can
 leave this attribute null and it will default to the normal behavior.
 </td><td>default</td><td></td></tr>
@@ -312,7 +313,7 @@ because it sums the answers from the shard servers.
 </table><br/>Blur facet.
 <br/></div><div class="definition"><h3 id="Struct_BlurQuery">Struct: BlurQuery</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>simpleQuery</td><td><code><a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a></code></td><td>The query information.
+<tr><td>1</td><td>query</td><td><code><a href="Blur.html#Struct_Query">Query</a></code></td><td>The query information.
 </td><td>default</td><td></td></tr>
 <tr><td>3</td><td>facets</td><td><code>list&lt;<code><a href="Blur.html#Struct_Facet">Facet</a></code>&gt;</code></td><td>A list of Facets to execute with the given query.
 </td><td>default</td><td></td></tr>
@@ -581,14 +582,14 @@ shards servers.  Each of the methods are documented.
 </td></tr>
 </table></div><div class="definition"><h4 id="Fn_Blur_parseQuery">Function: Blur.parseQuery</h4>
 <pre><code>string</code> parseQuery(<code>string</code> table,
-                  <code><a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a></code> simpleQuery)
+                  <code><a href="Blur.html#Struct_Query">Query</a></code> query)
     throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code>
 </pre>Parses the given query and return the string represents the query.
 @return string representation of the parsed query.
 <br/><br/><h4 id="Parameters_Blur_parseQuery">Parameters</h4>
 <table class="table-bordered table-striped table-condensed"><thead><th>Name</th><th>Description</th></thead><tr><td>table</td><td>the table name.
 </td></tr>
-<tr><td>simpleQuery</td><td>the query to parse.
+<tr><td>query</td><td>the query to parse.
 </td></tr>
 </table></div><div class="definition"><h4 id="Fn_Blur_tableStats">Function: Blur.tableStats</h4>
 <pre><code><a href="Blur.html#Struct_TableStats">TableStats</a></code> tableStats(<code>string</code> table)

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/distribution/src/main/scripts/interface/gen-html/index.html
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-html/index.html b/distribution/src/main/scripts/interface/gen-html/index.html
index b08b52b..a4ce5b1 100644
--- a/distribution/src/main/scripts/interface/gen-html/index.html
+++ b/distribution/src/main/scripts/interface/gen-html/index.html
@@ -56,6 +56,7 @@
 <a href="Blur.html#Struct_FetchRowResult">FetchRowResult</a><br/>
 <a href="Blur.html#Struct_HighlightOptions">HighlightOptions</a><br/>
 <a href="Blur.html#Struct_Metric">Metric</a><br/>
+<a href="Blur.html#Struct_Query">Query</a><br/>
 <a href="Blur.html#Enum_QueryState">QueryState</a><br/>
 <a href="Blur.html#Struct_Record">Record</a><br/>
 <a href="Blur.html#Struct_RecordMutation">RecordMutation</a><br/>
@@ -67,7 +68,6 @@
 <a href="Blur.html#Enum_ScoreType">ScoreType</a><br/>
 <a href="Blur.html#Struct_Selector">Selector</a><br/>
 <a href="Blur.html#Enum_ShardState">ShardState</a><br/>
-<a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a><br/>
 <a href="Blur.html#Enum_Status">Status</a><br/>
 <a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a><br/>
 <a href="Blur.html#Struct_TableStats">TableStats</a><br/>

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/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 ac24fd2..3fc53fc 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
@@ -133,9 +133,9 @@ public class Blur {
      * 
      * @param table the table name.
      * 
-     * @param simpleQuery the query to parse.
+     * @param query the query to parse.
      */
-    public String parseQuery(String table, SimpleQuery simpleQuery) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public String parseQuery(String table, Query query) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     /**
      * Gets the table stats for the given table.
@@ -371,7 +371,7 @@ public class Blur {
 
     public void schema(String table, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.schema_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
-    public void parseQuery(String table, SimpleQuery simpleQuery, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
+    public void parseQuery(String table, Query query, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
     public void tableStats(String table, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.tableStats_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException;
 
@@ -662,17 +662,17 @@ 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, "schema failed: unknown result");
     }
 
-    public String parseQuery(String table, SimpleQuery simpleQuery) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public String parseQuery(String table, Query query) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
-      send_parseQuery(table, simpleQuery);
+      send_parseQuery(table, query);
       return recv_parseQuery();
     }
 
-    public void send_parseQuery(String table, SimpleQuery simpleQuery) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
+    public void send_parseQuery(String table, Query query) throws org.apache.blur.thirdparty.thrift_0_9_0.TException
     {
       parseQuery_args args = new parseQuery_args();
       args.setTable(table);
-      args.setSimpleQuery(simpleQuery);
+      args.setQuery(query);
       sendBase("parseQuery", args);
     }
 
@@ -1563,27 +1563,27 @@ public class Blur {
       }
     }
 
-    public void parseQuery(String table, SimpleQuery simpleQuery, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+    public void parseQuery(String table, Query query, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       checkReady();
-      parseQuery_call method_call = new parseQuery_call(table, simpleQuery, resultHandler, this, ___protocolFactory, ___transport);
+      parseQuery_call method_call = new parseQuery_call(table, query, resultHandler, this, ___protocolFactory, ___transport);
       this.___currentMethod = method_call;
       ___manager.call(method_call);
     }
 
     public static class parseQuery_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall {
       private String table;
-      private SimpleQuery simpleQuery;
-      public parseQuery_call(String table, SimpleQuery simpleQuery, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      private Query query;
+      public parseQuery_call(String table, Query query, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<parseQuery_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         super(client, protocolFactory, transport, resultHandler, false);
         this.table = table;
-        this.simpleQuery = simpleQuery;
+        this.query = query;
       }
 
       public void write_args(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         prot.writeMessageBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessage("parseQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessageType.CALL, 0));
         parseQuery_args args = new parseQuery_args();
         args.setTable(table);
-        args.setSimpleQuery(simpleQuery);
+        args.setQuery(query);
         args.write(prot);
         prot.writeMessageEnd();
       }
@@ -2616,7 +2616,7 @@ public class Blur {
       public parseQuery_result getResult(I iface, parseQuery_args args) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
         parseQuery_result result = new parseQuery_result();
         try {
-          result.success = iface.parseQuery(args.table, args.simpleQuery);
+          result.success = iface.parseQuery(args.table, args.query);
         } catch (BlurException ex) {
           result.ex = ex;
         }
@@ -10384,7 +10384,7 @@ public class Blur {
     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("parseQuery_args");
 
     private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("table", 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 SIMPLE_QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("simpleQuery", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2);
+    private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("query", 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 {
@@ -10399,7 +10399,7 @@ public class Blur {
     /**
      * the query to parse.
      */
-    public SimpleQuery simpleQuery; // required
+    public Query query; // 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 {
@@ -10410,7 +10410,7 @@ public class Blur {
       /**
        * the query to parse.
        */
-      SIMPLE_QUERY((short)2, "simpleQuery");
+      QUERY((short)2, "query");
 
       private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -10427,8 +10427,8 @@ public class Blur {
         switch(fieldId) {
           case 1: // TABLE
             return TABLE;
-          case 2: // SIMPLE_QUERY
-            return SIMPLE_QUERY;
+          case 2: // QUERY
+            return QUERY;
           default:
             return null;
         }
@@ -10474,8 +10474,8 @@ public class Blur {
       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.TABLE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("table", 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.SIMPLE_QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("simpleQuery", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, SimpleQuery.class)));
+      tmpMap.put(_Fields.QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("query", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+          new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, Query.class)));
       metaDataMap = Collections.unmodifiableMap(tmpMap);
       org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(parseQuery_args.class, metaDataMap);
     }
@@ -10485,11 +10485,11 @@ public class Blur {
 
     public parseQuery_args(
       String table,
-      SimpleQuery simpleQuery)
+      Query query)
     {
       this();
       this.table = table;
-      this.simpleQuery = simpleQuery;
+      this.query = query;
     }
 
     /**
@@ -10499,8 +10499,8 @@ public class Blur {
       if (other.isSetTable()) {
         this.table = other.table;
       }
-      if (other.isSetSimpleQuery()) {
-        this.simpleQuery = new SimpleQuery(other.simpleQuery);
+      if (other.isSetQuery()) {
+        this.query = new Query(other.query);
       }
     }
 
@@ -10511,7 +10511,7 @@ public class Blur {
     @Override
     public void clear() {
       this.table = null;
-      this.simpleQuery = null;
+      this.query = null;
     }
 
     /**
@@ -10547,30 +10547,30 @@ public class Blur {
     /**
      * the query to parse.
      */
-    public SimpleQuery getSimpleQuery() {
-      return this.simpleQuery;
+    public Query getQuery() {
+      return this.query;
     }
 
     /**
      * the query to parse.
      */
-    public parseQuery_args setSimpleQuery(SimpleQuery simpleQuery) {
-      this.simpleQuery = simpleQuery;
+    public parseQuery_args setQuery(Query query) {
+      this.query = query;
       return this;
     }
 
-    public void unsetSimpleQuery() {
-      this.simpleQuery = null;
+    public void unsetQuery() {
+      this.query = null;
     }
 
-    /** Returns true if field simpleQuery is set (has been assigned a value) and false otherwise */
-    public boolean isSetSimpleQuery() {
-      return this.simpleQuery != 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 setSimpleQueryIsSet(boolean value) {
+    public void setQueryIsSet(boolean value) {
       if (!value) {
-        this.simpleQuery = null;
+        this.query = null;
       }
     }
 
@@ -10584,11 +10584,11 @@ public class Blur {
         }
         break;
 
-      case SIMPLE_QUERY:
+      case QUERY:
         if (value == null) {
-          unsetSimpleQuery();
+          unsetQuery();
         } else {
-          setSimpleQuery((SimpleQuery)value);
+          setQuery((Query)value);
         }
         break;
 
@@ -10600,8 +10600,8 @@ public class Blur {
       case TABLE:
         return getTable();
 
-      case SIMPLE_QUERY:
-        return getSimpleQuery();
+      case QUERY:
+        return getQuery();
 
       }
       throw new IllegalStateException();
@@ -10616,8 +10616,8 @@ public class Blur {
       switch (field) {
       case TABLE:
         return isSetTable();
-      case SIMPLE_QUERY:
-        return isSetSimpleQuery();
+      case QUERY:
+        return isSetQuery();
       }
       throw new IllegalStateException();
     }
@@ -10644,12 +10644,12 @@ public class Blur {
           return false;
       }
 
-      boolean this_present_simpleQuery = true && this.isSetSimpleQuery();
-      boolean that_present_simpleQuery = true && that.isSetSimpleQuery();
-      if (this_present_simpleQuery || that_present_simpleQuery) {
-        if (!(this_present_simpleQuery && that_present_simpleQuery))
+      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.simpleQuery.equals(that.simpleQuery))
+        if (!this.query.equals(that.query))
           return false;
       }
 
@@ -10679,12 +10679,12 @@ public class Blur {
           return lastComparison;
         }
       }
-      lastComparison = Boolean.valueOf(isSetSimpleQuery()).compareTo(typedOther.isSetSimpleQuery());
+      lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
       if (lastComparison != 0) {
         return lastComparison;
       }
-      if (isSetSimpleQuery()) {
-        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.simpleQuery, typedOther.simpleQuery);
+      if (isSetQuery()) {
+        lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.query, typedOther.query);
         if (lastComparison != 0) {
           return lastComparison;
         }
@@ -10717,11 +10717,11 @@ public class Blur {
       }
       first = false;
       if (!first) sb.append(", ");
-      sb.append("simpleQuery:");
-      if (this.simpleQuery == null) {
+      sb.append("query:");
+      if (this.query == null) {
         sb.append("null");
       } else {
-        sb.append(this.simpleQuery);
+        sb.append(this.query);
       }
       first = false;
       sb.append(")");
@@ -10731,8 +10731,8 @@ public class Blur {
     public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       // check for required fields
       // check for sub-struct validity
-      if (simpleQuery != null) {
-        simpleQuery.validate();
+      if (query != null) {
+        query.validate();
       }
     }
 
@@ -10778,11 +10778,11 @@ public class Blur {
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
               break;
-            case 2: // SIMPLE_QUERY
+            case 2: // QUERY
               if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-                struct.simpleQuery = new SimpleQuery();
-                struct.simpleQuery.read(iprot);
-                struct.setSimpleQueryIsSet(true);
+                struct.query = new Query();
+                struct.query.read(iprot);
+                struct.setQueryIsSet(true);
               } else { 
                 org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
               }
@@ -10807,9 +10807,9 @@ public class Blur {
           oprot.writeString(struct.table);
           oprot.writeFieldEnd();
         }
-        if (struct.simpleQuery != null) {
-          oprot.writeFieldBegin(SIMPLE_QUERY_FIELD_DESC);
-          struct.simpleQuery.write(oprot);
+        if (struct.query != null) {
+          oprot.writeFieldBegin(QUERY_FIELD_DESC);
+          struct.query.write(oprot);
           oprot.writeFieldEnd();
         }
         oprot.writeFieldStop();
@@ -10833,15 +10833,15 @@ public class Blur {
         if (struct.isSetTable()) {
           optionals.set(0);
         }
-        if (struct.isSetSimpleQuery()) {
+        if (struct.isSetQuery()) {
           optionals.set(1);
         }
         oprot.writeBitSet(optionals, 2);
         if (struct.isSetTable()) {
           oprot.writeString(struct.table);
         }
-        if (struct.isSetSimpleQuery()) {
-          struct.simpleQuery.write(oprot);
+        if (struct.isSetQuery()) {
+          struct.query.write(oprot);
         }
       }
 
@@ -10854,9 +10854,9 @@ public class Blur {
           struct.setTableIsSet(true);
         }
         if (incoming.get(1)) {
-          struct.simpleQuery = new SimpleQuery();
-          struct.simpleQuery.read(iprot);
-          struct.setSimpleQueryIsSet(true);
+          struct.query = new Query();
+          struct.query.read(iprot);
+          struct.setQueryIsSet(true);
         }
       }
     }

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/795468e3/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
----------------------------------------------------------------------
diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
index d541ec8..ca6a790 100644
--- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
+++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQuery.java
@@ -56,7 +56,7 @@ import java.util.Arrays;
 public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<BlurQuery, BlurQuery._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("BlurQuery");
 
-  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SIMPLE_QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("simpleQuery", 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 QUERY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("query", 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 FACETS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("facets", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)3);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField SELECTOR_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("selector", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)4);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField USE_CACHE_IF_PRESENT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("useCacheIfPresent", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)6);
@@ -78,7 +78,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   /**
    * The query information.
    */
-  public SimpleQuery simpleQuery; // required
+  public Query query; // required
   /**
    * A list of Facets to execute with the given query.
    */
@@ -131,7 +131,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     /**
      * The query information.
      */
-    SIMPLE_QUERY((short)1, "simpleQuery"),
+    QUERY((short)1, "query"),
     /**
      * A list of Facets to execute with the given query.
      */
@@ -192,8 +192,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
      */
     public static _Fields findByThriftId(int fieldId) {
       switch(fieldId) {
-        case 1: // SIMPLE_QUERY
-          return SIMPLE_QUERY;
+        case 1: // QUERY
+          return QUERY;
         case 3: // FACETS
           return FACETS;
         case 4: // SELECTOR
@@ -268,8 +268,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   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.SIMPLE_QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("simpleQuery", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
-        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, SimpleQuery.class)));
+    tmpMap.put(_Fields.QUERY, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("query", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
+        new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, Query.class)));
     tmpMap.put(_Fields.FACETS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("facets", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, 
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.ListMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, 
             new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.StructMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, Facet.class))));
@@ -315,7 +315,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   }
 
   public BlurQuery(
-    SimpleQuery simpleQuery,
+    Query query,
     List<Facet> facets,
     Selector selector,
     boolean useCacheIfPresent,
@@ -329,7 +329,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     long startTime)
   {
     this();
-    this.simpleQuery = simpleQuery;
+    this.query = query;
     this.facets = facets;
     this.selector = selector;
     this.useCacheIfPresent = useCacheIfPresent;
@@ -356,8 +356,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
    */
   public BlurQuery(BlurQuery other) {
     __isset_bitfield = other.__isset_bitfield;
-    if (other.isSetSimpleQuery()) {
-      this.simpleQuery = new SimpleQuery(other.simpleQuery);
+    if (other.isSetQuery()) {
+      this.query = new Query(other.query);
     }
     if (other.isSetFacets()) {
       List<Facet> __this__facets = new ArrayList<Facet>();
@@ -388,7 +388,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   @Override
   public void clear() {
-    this.simpleQuery = null;
+    this.query = null;
     this.facets = null;
     this.selector = null;
     this.useCacheIfPresent = true;
@@ -413,30 +413,30 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   /**
    * The query information.
    */
-  public SimpleQuery getSimpleQuery() {
-    return this.simpleQuery;
+  public Query getQuery() {
+    return this.query;
   }
 
   /**
    * The query information.
    */
-  public BlurQuery setSimpleQuery(SimpleQuery simpleQuery) {
-    this.simpleQuery = simpleQuery;
+  public BlurQuery setQuery(Query query) {
+    this.query = query;
     return this;
   }
 
-  public void unsetSimpleQuery() {
-    this.simpleQuery = null;
+  public void unsetQuery() {
+    this.query = null;
   }
 
-  /** Returns true if field simpleQuery is set (has been assigned a value) and false otherwise */
-  public boolean isSetSimpleQuery() {
-    return this.simpleQuery != 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 setSimpleQueryIsSet(boolean value) {
+  public void setQueryIsSet(boolean value) {
     if (!value) {
-      this.simpleQuery = null;
+      this.query = null;
     }
   }
 
@@ -783,11 +783,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
-    case SIMPLE_QUERY:
+    case QUERY:
       if (value == null) {
-        unsetSimpleQuery();
+        unsetQuery();
       } else {
-        setSimpleQuery((SimpleQuery)value);
+        setQuery((Query)value);
       }
       break;
 
@@ -884,8 +884,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
 
   public Object getFieldValue(_Fields field) {
     switch (field) {
-    case SIMPLE_QUERY:
-      return getSimpleQuery();
+    case QUERY:
+      return getQuery();
 
     case FACETS:
       return getFacets();
@@ -931,8 +931,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     }
 
     switch (field) {
-    case SIMPLE_QUERY:
-      return isSetSimpleQuery();
+    case QUERY:
+      return isSetQuery();
     case FACETS:
       return isSetFacets();
     case SELECTOR:
@@ -972,12 +972,12 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     if (that == null)
       return false;
 
-    boolean this_present_simpleQuery = true && this.isSetSimpleQuery();
-    boolean that_present_simpleQuery = true && that.isSetSimpleQuery();
-    if (this_present_simpleQuery || that_present_simpleQuery) {
-      if (!(this_present_simpleQuery && that_present_simpleQuery))
+    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.simpleQuery.equals(that.simpleQuery))
+      if (!this.query.equals(that.query))
         return false;
     }
 
@@ -1096,12 +1096,12 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     int lastComparison = 0;
     BlurQuery typedOther = (BlurQuery)other;
 
-    lastComparison = Boolean.valueOf(isSetSimpleQuery()).compareTo(typedOther.isSetSimpleQuery());
+    lastComparison = Boolean.valueOf(isSetQuery()).compareTo(typedOther.isSetQuery());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetSimpleQuery()) {
-      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.simpleQuery, typedOther.simpleQuery);
+    if (isSetQuery()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.query, typedOther.query);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -1236,11 +1236,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     StringBuilder sb = new StringBuilder("BlurQuery(");
     boolean first = true;
 
-    sb.append("simpleQuery:");
-    if (this.simpleQuery == null) {
+    sb.append("query:");
+    if (this.query == null) {
       sb.append("null");
     } else {
-      sb.append(this.simpleQuery);
+      sb.append(this.query);
     }
     first = false;
     if (!first) sb.append(", ");
@@ -1306,8 +1306,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
   public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
     // check for required fields
     // check for sub-struct validity
-    if (simpleQuery != null) {
-      simpleQuery.validate();
+    if (query != null) {
+      query.validate();
     }
     if (selector != null) {
       selector.validate();
@@ -1350,11 +1350,11 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
           break;
         }
         switch (schemeField.id) {
-          case 1: // SIMPLE_QUERY
+          case 1: // QUERY
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
-              struct.simpleQuery = new SimpleQuery();
-              struct.simpleQuery.read(iprot);
-              struct.setSimpleQueryIsSet(true);
+              struct.query = new Query();
+              struct.query.read(iprot);
+              struct.setQueryIsSet(true);
             } else { 
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1474,9 +1474,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       struct.validate();
 
       oprot.writeStructBegin(STRUCT_DESC);
-      if (struct.simpleQuery != null) {
-        oprot.writeFieldBegin(SIMPLE_QUERY_FIELD_DESC);
-        struct.simpleQuery.write(oprot);
+      if (struct.query != null) {
+        oprot.writeFieldBegin(QUERY_FIELD_DESC);
+        struct.query.write(oprot);
         oprot.writeFieldEnd();
       }
       if (struct.facets != null) {
@@ -1543,7 +1543,7 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
     public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurQuery struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol oprot = (TTupleProtocol) prot;
       BitSet optionals = new BitSet();
-      if (struct.isSetSimpleQuery()) {
+      if (struct.isSetQuery()) {
         optionals.set(0);
       }
       if (struct.isSetFacets()) {
@@ -1580,8 +1580,8 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
         optionals.set(11);
       }
       oprot.writeBitSet(optionals, 12);
-      if (struct.isSetSimpleQuery()) {
-        struct.simpleQuery.write(oprot);
+      if (struct.isSetQuery()) {
+        struct.query.write(oprot);
       }
       if (struct.isSetFacets()) {
         {
@@ -1629,9 +1629,9 @@ public class BlurQuery implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<
       TTupleProtocol iprot = (TTupleProtocol) prot;
       BitSet incoming = iprot.readBitSet(12);
       if (incoming.get(0)) {
-        struct.simpleQuery = new SimpleQuery();
-        struct.simpleQuery.read(iprot);
-        struct.setSimpleQueryIsSet(true);
+        struct.query = new Query();
+        struct.query.read(iprot);
+        struct.setQueryIsSet(true);
       }
       if (incoming.get(1)) {
         {


Mime
View raw message