incubator-blur-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From amccu...@apache.org
Subject [06/10] First commit for highlighting, I had to cleanup the types and field creation to have the indexex be setup correctly for highlighting.
Date Thu, 06 Jun 2013 03:00:15 GMT
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
new file mode 100644
index 0000000..634d9e6
--- /dev/null
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/HighlightOptions.java
@@ -0,0 +1,557 @@
+/**
+ * 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 HighlightOptions controls how the data is fetched and returned.
+ */
+public class HighlightOptions implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<HighlightOptions, HighlightOptions._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("HighlightOptions");
+
+  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 ONLY_MATCHING_RECORDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("onlyMatchingRecords", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)2);
+
+  private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
+  static {
+    schemes.put(StandardScheme.class, new HighlightOptionsStandardSchemeFactory());
+    schemes.put(TupleScheme.class, new HighlightOptionsTupleSchemeFactory());
+  }
+
+  /**
+   * 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
+   * 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.
+   */
+  public SimpleQuery simpleQuery; // required
+  /**
+   * Only returns the records within a Row that matched in the query.  If the BlurQuery
+   * is not a superQuery then this option is not used.  Enabled by default.
+   */
+  public boolean onlyMatchingRecords; // required
+
+  /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
+  public enum _Fields implements org.apache.blur.thirdparty.thrift_0_9_0.TFieldIdEnum {
+    /**
+     * The 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
+     * 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.
+     */
+    SIMPLE_QUERY((short)1, "simpleQuery"),
+    /**
+     * Only returns the records within a Row that matched in the query.  If the BlurQuery
+     * is not a superQuery then this option is not used.  Enabled by default.
+     */
+    ONLY_MATCHING_RECORDS((short)2, "onlyMatchingRecords");
+
+    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: // SIMPLE_QUERY
+          return SIMPLE_QUERY;
+        case 2: // ONLY_MATCHING_RECORDS
+          return ONLY_MATCHING_RECORDS;
+        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 __ONLYMATCHINGRECORDS_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.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.ONLY_MATCHING_RECORDS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("onlyMatchingRecords", 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)));
+    metaDataMap = Collections.unmodifiableMap(tmpMap);
+    org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(HighlightOptions.class, metaDataMap);
+  }
+
+  public HighlightOptions() {
+    this.onlyMatchingRecords = true;
+
+  }
+
+  public HighlightOptions(
+    SimpleQuery simpleQuery,
+    boolean onlyMatchingRecords)
+  {
+    this();
+    this.simpleQuery = simpleQuery;
+    this.onlyMatchingRecords = onlyMatchingRecords;
+    setOnlyMatchingRecordsIsSet(true);
+  }
+
+  /**
+   * Performs a deep copy on <i>other</i>.
+   */
+  public HighlightOptions(HighlightOptions other) {
+    __isset_bitfield = other.__isset_bitfield;
+    if (other.isSetSimpleQuery()) {
+      this.simpleQuery = new SimpleQuery(other.simpleQuery);
+    }
+    this.onlyMatchingRecords = other.onlyMatchingRecords;
+  }
+
+  public HighlightOptions deepCopy() {
+    return new HighlightOptions(this);
+  }
+
+  @Override
+  public void clear() {
+    this.simpleQuery = null;
+    this.onlyMatchingRecords = true;
+
+  }
+
+  /**
+   * 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
+   * 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.
+   */
+  public SimpleQuery getSimpleQuery() {
+    return this.simpleQuery;
+  }
+
+  /**
+   * 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
+   * 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.
+   */
+  public HighlightOptions setSimpleQuery(SimpleQuery simpleQuery) {
+    this.simpleQuery = simpleQuery;
+    return this;
+  }
+
+  public void unsetSimpleQuery() {
+    this.simpleQuery = null;
+  }
+
+  /** Returns true if field simpleQuery is set (has been assigned a value) and false otherwise */
+  public boolean isSetSimpleQuery() {
+    return this.simpleQuery != null;
+  }
+
+  public void setSimpleQueryIsSet(boolean value) {
+    if (!value) {
+      this.simpleQuery = null;
+    }
+  }
+
+  /**
+   * Only returns the records within a Row that matched in the query.  If the BlurQuery
+   * is not a superQuery then this option is not used.  Enabled by default.
+   */
+  public boolean isOnlyMatchingRecords() {
+    return this.onlyMatchingRecords;
+  }
+
+  /**
+   * Only returns the records within a Row that matched in the query.  If the BlurQuery
+   * is not a superQuery then this option is not used.  Enabled by default.
+   */
+  public HighlightOptions setOnlyMatchingRecords(boolean onlyMatchingRecords) {
+    this.onlyMatchingRecords = onlyMatchingRecords;
+    setOnlyMatchingRecordsIsSet(true);
+    return this;
+  }
+
+  public void unsetOnlyMatchingRecords() {
+    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ONLYMATCHINGRECORDS_ISSET_ID);
+  }
+
+  /** Returns true if field onlyMatchingRecords is set (has been assigned a value) and false otherwise */
+  public boolean isSetOnlyMatchingRecords() {
+    return EncodingUtils.testBit(__isset_bitfield, __ONLYMATCHINGRECORDS_ISSET_ID);
+  }
+
+  public void setOnlyMatchingRecordsIsSet(boolean value) {
+    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ONLYMATCHINGRECORDS_ISSET_ID, value);
+  }
+
+  public void setFieldValue(_Fields field, Object value) {
+    switch (field) {
+    case SIMPLE_QUERY:
+      if (value == null) {
+        unsetSimpleQuery();
+      } else {
+        setSimpleQuery((SimpleQuery)value);
+      }
+      break;
+
+    case ONLY_MATCHING_RECORDS:
+      if (value == null) {
+        unsetOnlyMatchingRecords();
+      } else {
+        setOnlyMatchingRecords((Boolean)value);
+      }
+      break;
+
+    }
+  }
+
+  public Object getFieldValue(_Fields field) {
+    switch (field) {
+    case SIMPLE_QUERY:
+      return getSimpleQuery();
+
+    case ONLY_MATCHING_RECORDS:
+      return Boolean.valueOf(isOnlyMatchingRecords());
+
+    }
+    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 SIMPLE_QUERY:
+      return isSetSimpleQuery();
+    case ONLY_MATCHING_RECORDS:
+      return isSetOnlyMatchingRecords();
+    }
+    throw new IllegalStateException();
+  }
+
+  @Override
+  public boolean equals(Object that) {
+    if (that == null)
+      return false;
+    if (that instanceof HighlightOptions)
+      return this.equals((HighlightOptions)that);
+    return false;
+  }
+
+  public boolean equals(HighlightOptions that) {
+    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))
+        return false;
+      if (!this.simpleQuery.equals(that.simpleQuery))
+        return false;
+    }
+
+    boolean this_present_onlyMatchingRecords = true;
+    boolean that_present_onlyMatchingRecords = true;
+    if (this_present_onlyMatchingRecords || that_present_onlyMatchingRecords) {
+      if (!(this_present_onlyMatchingRecords && that_present_onlyMatchingRecords))
+        return false;
+      if (this.onlyMatchingRecords != that.onlyMatchingRecords)
+        return false;
+    }
+
+    return true;
+  }
+
+  @Override
+  public int hashCode() {
+    return 0;
+  }
+
+  public int compareTo(HighlightOptions other) {
+    if (!getClass().equals(other.getClass())) {
+      return getClass().getName().compareTo(other.getClass().getName());
+    }
+
+    int lastComparison = 0;
+    HighlightOptions typedOther = (HighlightOptions)other;
+
+    lastComparison = Boolean.valueOf(isSetSimpleQuery()).compareTo(typedOther.isSetSimpleQuery());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetSimpleQuery()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.simpleQuery, typedOther.simpleQuery);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
+    lastComparison = Boolean.valueOf(isSetOnlyMatchingRecords()).compareTo(typedOther.isSetOnlyMatchingRecords());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetOnlyMatchingRecords()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.onlyMatchingRecords, typedOther.onlyMatchingRecords);
+      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("HighlightOptions(");
+    boolean first = true;
+
+    sb.append("simpleQuery:");
+    if (this.simpleQuery == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.simpleQuery);
+    }
+    first = false;
+    if (!first) sb.append(", ");
+    sb.append("onlyMatchingRecords:");
+    sb.append(this.onlyMatchingRecords);
+    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
+    if (simpleQuery != null) {
+      simpleQuery.validate();
+    }
+  }
+
+  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 HighlightOptionsStandardSchemeFactory implements SchemeFactory {
+    public HighlightOptionsStandardScheme getScheme() {
+      return new HighlightOptionsStandardScheme();
+    }
+  }
+
+  private static class HighlightOptionsStandardScheme extends StandardScheme<HighlightOptions> {
+
+    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, HighlightOptions 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: // SIMPLE_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);
+            } else { 
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+            }
+            break;
+          case 2: // ONLY_MATCHING_RECORDS
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) {
+              struct.onlyMatchingRecords = iprot.readBool();
+              struct.setOnlyMatchingRecordsIsSet(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, HighlightOptions struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      struct.validate();
+
+      oprot.writeStructBegin(STRUCT_DESC);
+      if (struct.simpleQuery != null) {
+        oprot.writeFieldBegin(SIMPLE_QUERY_FIELD_DESC);
+        struct.simpleQuery.write(oprot);
+        oprot.writeFieldEnd();
+      }
+      oprot.writeFieldBegin(ONLY_MATCHING_RECORDS_FIELD_DESC);
+      oprot.writeBool(struct.onlyMatchingRecords);
+      oprot.writeFieldEnd();
+      oprot.writeFieldStop();
+      oprot.writeStructEnd();
+    }
+
+  }
+
+  private static class HighlightOptionsTupleSchemeFactory implements SchemeFactory {
+    public HighlightOptionsTupleScheme getScheme() {
+      return new HighlightOptionsTupleScheme();
+    }
+  }
+
+  private static class HighlightOptionsTupleScheme extends TupleScheme<HighlightOptions> {
+
+    @Override
+    public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, HighlightOptions struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      TTupleProtocol oprot = (TTupleProtocol) prot;
+      BitSet optionals = new BitSet();
+      if (struct.isSetSimpleQuery()) {
+        optionals.set(0);
+      }
+      if (struct.isSetOnlyMatchingRecords()) {
+        optionals.set(1);
+      }
+      oprot.writeBitSet(optionals, 2);
+      if (struct.isSetSimpleQuery()) {
+        struct.simpleQuery.write(oprot);
+      }
+      if (struct.isSetOnlyMatchingRecords()) {
+        oprot.writeBool(struct.onlyMatchingRecords);
+      }
+    }
+
+    @Override
+    public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, HighlightOptions struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
+      TTupleProtocol iprot = (TTupleProtocol) prot;
+      BitSet incoming = iprot.readBitSet(2);
+      if (incoming.get(0)) {
+        struct.simpleQuery = new SimpleQuery();
+        struct.simpleQuery.read(iprot);
+        struct.setSimpleQueryIsSet(true);
+      }
+      if (incoming.get(1)) {
+        struct.onlyMatchingRecords = iprot.readBool();
+        struct.setOnlyMatchingRecordsIsSet(true);
+      }
+    }
+  }
+
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
index 4ba25ac..d2564dd 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Record.java
@@ -58,6 +58,7 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField RECORD_ID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("recordId", 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 FAMILY_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("family", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)2);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMNS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columns", 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 HIGHLIGHTED_COLUMNS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("highlightedColumns", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)4);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -77,6 +78,10 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
    * A list of columns, multiple columns with the same name are allowed.
    */
   public List<Column> columns; // required
+  /**
+   * A list of the highlighted columns.
+   */
+  public List<Column> highlightedColumns; // 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 {
@@ -91,7 +96,11 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
     /**
      * A list of columns, multiple columns with the same name are allowed.
      */
-    COLUMNS((short)3, "columns");
+    COLUMNS((short)3, "columns"),
+    /**
+     * A list of the highlighted columns.
+     */
+    HIGHLIGHTED_COLUMNS((short)4, "highlightedColumns");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -112,6 +121,8 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
           return FAMILY;
         case 3: // COLUMNS
           return COLUMNS;
+        case 4: // HIGHLIGHTED_COLUMNS
+          return HIGHLIGHTED_COLUMNS;
         default:
           return null;
       }
@@ -162,6 +173,9 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
     tmpMap.put(_Fields.COLUMNS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("columns", 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, Column.class))));
+    tmpMap.put(_Fields.HIGHLIGHTED_COLUMNS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("highlightedColumns", 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, Column.class))));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(Record.class, metaDataMap);
   }
@@ -172,12 +186,14 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
   public Record(
     String recordId,
     String family,
-    List<Column> columns)
+    List<Column> columns,
+    List<Column> highlightedColumns)
   {
     this();
     this.recordId = recordId;
     this.family = family;
     this.columns = columns;
+    this.highlightedColumns = highlightedColumns;
   }
 
   /**
@@ -197,6 +213,13 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       }
       this.columns = __this__columns;
     }
+    if (other.isSetHighlightedColumns()) {
+      List<Column> __this__highlightedColumns = new ArrayList<Column>();
+      for (Column other_element : other.highlightedColumns) {
+        __this__highlightedColumns.add(new Column(other_element));
+      }
+      this.highlightedColumns = __this__highlightedColumns;
+    }
   }
 
   public Record deepCopy() {
@@ -208,6 +231,7 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
     this.recordId = null;
     this.family = null;
     this.columns = null;
+    this.highlightedColumns = null;
   }
 
   /**
@@ -315,6 +339,51 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
     }
   }
 
+  public int getHighlightedColumnsSize() {
+    return (this.highlightedColumns == null) ? 0 : this.highlightedColumns.size();
+  }
+
+  public java.util.Iterator<Column> getHighlightedColumnsIterator() {
+    return (this.highlightedColumns == null) ? null : this.highlightedColumns.iterator();
+  }
+
+  public void addToHighlightedColumns(Column elem) {
+    if (this.highlightedColumns == null) {
+      this.highlightedColumns = new ArrayList<Column>();
+    }
+    this.highlightedColumns.add(elem);
+  }
+
+  /**
+   * A list of the highlighted columns.
+   */
+  public List<Column> getHighlightedColumns() {
+    return this.highlightedColumns;
+  }
+
+  /**
+   * A list of the highlighted columns.
+   */
+  public Record setHighlightedColumns(List<Column> highlightedColumns) {
+    this.highlightedColumns = highlightedColumns;
+    return this;
+  }
+
+  public void unsetHighlightedColumns() {
+    this.highlightedColumns = null;
+  }
+
+  /** Returns true if field highlightedColumns is set (has been assigned a value) and false otherwise */
+  public boolean isSetHighlightedColumns() {
+    return this.highlightedColumns != null;
+  }
+
+  public void setHighlightedColumnsIsSet(boolean value) {
+    if (!value) {
+      this.highlightedColumns = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case RECORD_ID:
@@ -341,6 +410,14 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       }
       break;
 
+    case HIGHLIGHTED_COLUMNS:
+      if (value == null) {
+        unsetHighlightedColumns();
+      } else {
+        setHighlightedColumns((List<Column>)value);
+      }
+      break;
+
     }
   }
 
@@ -355,6 +432,9 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
     case COLUMNS:
       return getColumns();
 
+    case HIGHLIGHTED_COLUMNS:
+      return getHighlightedColumns();
+
     }
     throw new IllegalStateException();
   }
@@ -372,6 +452,8 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       return isSetFamily();
     case COLUMNS:
       return isSetColumns();
+    case HIGHLIGHTED_COLUMNS:
+      return isSetHighlightedColumns();
     }
     throw new IllegalStateException();
   }
@@ -416,6 +498,15 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
         return false;
     }
 
+    boolean this_present_highlightedColumns = true && this.isSetHighlightedColumns();
+    boolean that_present_highlightedColumns = true && that.isSetHighlightedColumns();
+    if (this_present_highlightedColumns || that_present_highlightedColumns) {
+      if (!(this_present_highlightedColumns && that_present_highlightedColumns))
+        return false;
+      if (!this.highlightedColumns.equals(that.highlightedColumns))
+        return false;
+    }
+
     return true;
   }
 
@@ -462,6 +553,16 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetHighlightedColumns()).compareTo(typedOther.isSetHighlightedColumns());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetHighlightedColumns()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.highlightedColumns, typedOther.highlightedColumns);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -505,6 +606,14 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       sb.append(this.columns);
     }
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("highlightedColumns:");
+    if (this.highlightedColumns == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.highlightedColumns);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -583,6 +692,25 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 4: // HIGHLIGHTED_COLUMNS
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
+              {
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list3 = iprot.readListBegin();
+                struct.highlightedColumns = new ArrayList<Column>(_list3.size);
+                for (int _i4 = 0; _i4 < _list3.size; ++_i4)
+                {
+                  Column _elem5; // required
+                  _elem5 = new Column();
+                  _elem5.read(iprot);
+                  struct.highlightedColumns.add(_elem5);
+                }
+                iprot.readListEnd();
+              }
+              struct.setHighlightedColumnsIsSet(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);
         }
@@ -612,9 +740,21 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
         oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.columns.size()));
-          for (Column _iter3 : struct.columns)
+          for (Column _iter6 : struct.columns)
+          {
+            _iter6.write(oprot);
+          }
+          oprot.writeListEnd();
+        }
+        oprot.writeFieldEnd();
+      }
+      if (struct.highlightedColumns != null) {
+        oprot.writeFieldBegin(HIGHLIGHTED_COLUMNS_FIELD_DESC);
+        {
+          oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.highlightedColumns.size()));
+          for (Column _iter7 : struct.highlightedColumns)
           {
-            _iter3.write(oprot);
+            _iter7.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -647,7 +787,10 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       if (struct.isSetColumns()) {
         optionals.set(2);
       }
-      oprot.writeBitSet(optionals, 3);
+      if (struct.isSetHighlightedColumns()) {
+        optionals.set(3);
+      }
+      oprot.writeBitSet(optionals, 4);
       if (struct.isSetRecordId()) {
         oprot.writeString(struct.recordId);
       }
@@ -657,9 +800,18 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       if (struct.isSetColumns()) {
         {
           oprot.writeI32(struct.columns.size());
-          for (Column _iter4 : struct.columns)
+          for (Column _iter8 : struct.columns)
           {
-            _iter4.write(oprot);
+            _iter8.write(oprot);
+          }
+        }
+      }
+      if (struct.isSetHighlightedColumns()) {
+        {
+          oprot.writeI32(struct.highlightedColumns.size());
+          for (Column _iter9 : struct.highlightedColumns)
+          {
+            _iter9.write(oprot);
           }
         }
       }
@@ -668,7 +820,7 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, Record struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(3);
+      BitSet incoming = iprot.readBitSet(4);
       if (incoming.get(0)) {
         struct.recordId = iprot.readString();
         struct.setRecordIdIsSet(true);
@@ -679,18 +831,32 @@ public class Record implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Rec
       }
       if (incoming.get(2)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list5 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.columns = new ArrayList<Column>(_list5.size);
-          for (int _i6 = 0; _i6 < _list5.size; ++_i6)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list10 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.columns = new ArrayList<Column>(_list10.size);
+          for (int _i11 = 0; _i11 < _list10.size; ++_i11)
           {
-            Column _elem7; // required
-            _elem7 = new Column();
-            _elem7.read(iprot);
-            struct.columns.add(_elem7);
+            Column _elem12; // required
+            _elem12 = new Column();
+            _elem12.read(iprot);
+            struct.columns.add(_elem12);
           }
         }
         struct.setColumnsIsSet(true);
       }
+      if (incoming.get(3)) {
+        {
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list13 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.highlightedColumns = new ArrayList<Column>(_list13.size);
+          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+          {
+            Column _elem15; // required
+            _elem15 = new Column();
+            _elem15.read(iprot);
+            struct.highlightedColumns.add(_elem15);
+          }
+        }
+        struct.setHighlightedColumnsIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
index c983db5..10c24b3 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Row.java
@@ -567,14 +567,14 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
           case 2: // RECORDS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list8 = iprot.readListBegin();
-                struct.records = new ArrayList<Record>(_list8.size);
-                for (int _i9 = 0; _i9 < _list8.size; ++_i9)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list16 = iprot.readListBegin();
+                struct.records = new ArrayList<Record>(_list16.size);
+                for (int _i17 = 0; _i17 < _list16.size; ++_i17)
                 {
-                  Record _elem10; // required
-                  _elem10 = new Record();
-                  _elem10.read(iprot);
-                  struct.records.add(_elem10);
+                  Record _elem18; // required
+                  _elem18 = new Record();
+                  _elem18.read(iprot);
+                  struct.records.add(_elem18);
                 }
                 iprot.readListEnd();
               }
@@ -615,9 +615,9 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
         oprot.writeFieldBegin(RECORDS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.records.size()));
-          for (Record _iter11 : struct.records)
+          for (Record _iter19 : struct.records)
           {
-            _iter11.write(oprot);
+            _iter19.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -660,9 +660,9 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
       if (struct.isSetRecords()) {
         {
           oprot.writeI32(struct.records.size());
-          for (Record _iter12 : struct.records)
+          for (Record _iter20 : struct.records)
           {
-            _iter12.write(oprot);
+            _iter20.write(oprot);
           }
         }
       }
@@ -681,14 +681,14 @@ public class Row implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Row, R
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list13 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.records = new ArrayList<Record>(_list13.size);
-          for (int _i14 = 0; _i14 < _list13.size; ++_i14)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list21 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.records = new ArrayList<Record>(_list21.size);
+          for (int _i22 = 0; _i22 < _list21.size; ++_i22)
           {
-            Record _elem15; // required
-            _elem15 = new Record();
-            _elem15.read(iprot);
-            struct.records.add(_elem15);
+            Record _elem23; // required
+            _elem23 = new Record();
+            _elem23.read(iprot);
+            struct.records.add(_elem23);
           }
         }
         struct.setRecordsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
index ce8f65f..173b3f2 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/RowMutation.java
@@ -842,14 +842,14 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
           case 5: // RECORD_MUTATIONS
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list84 = iprot.readListBegin();
-                struct.recordMutations = new ArrayList<RecordMutation>(_list84.size);
-                for (int _i85 = 0; _i85 < _list84.size; ++_i85)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list92 = iprot.readListBegin();
+                struct.recordMutations = new ArrayList<RecordMutation>(_list92.size);
+                for (int _i93 = 0; _i93 < _list92.size; ++_i93)
                 {
-                  RecordMutation _elem86; // required
-                  _elem86 = new RecordMutation();
-                  _elem86.read(iprot);
-                  struct.recordMutations.add(_elem86);
+                  RecordMutation _elem94; // required
+                  _elem94 = new RecordMutation();
+                  _elem94.read(iprot);
+                  struct.recordMutations.add(_elem94);
                 }
                 iprot.readListEnd();
               }
@@ -903,9 +903,9 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
         oprot.writeFieldBegin(RECORD_MUTATIONS_FIELD_DESC);
         {
           oprot.writeListBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, struct.recordMutations.size()));
-          for (RecordMutation _iter87 : struct.recordMutations)
+          for (RecordMutation _iter95 : struct.recordMutations)
           {
-            _iter87.write(oprot);
+            _iter95.write(oprot);
           }
           oprot.writeListEnd();
         }
@@ -966,9 +966,9 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
       if (struct.isSetRecordMutations()) {
         {
           oprot.writeI32(struct.recordMutations.size());
-          for (RecordMutation _iter88 : struct.recordMutations)
+          for (RecordMutation _iter96 : struct.recordMutations)
           {
-            _iter88.write(oprot);
+            _iter96.write(oprot);
           }
         }
       }
@@ -999,14 +999,14 @@ public class RowMutation implements org.apache.blur.thirdparty.thrift_0_9_0.TBas
       }
       if (incoming.get(4)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list89 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
-          struct.recordMutations = new ArrayList<RecordMutation>(_list89.size);
-          for (int _i90 = 0; _i90 < _list89.size; ++_i90)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list97 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, iprot.readI32());
+          struct.recordMutations = new ArrayList<RecordMutation>(_list97.size);
+          for (int _i98 = 0; _i98 < _list97.size; ++_i98)
           {
-            RecordMutation _elem91; // required
-            _elem91 = new RecordMutation();
-            _elem91.read(iprot);
-            struct.recordMutations.add(_elem91);
+            RecordMutation _elem99; // required
+            _elem99 = new RecordMutation();
+            _elem99.read(iprot);
+            struct.recordMutations.add(_elem99);
           }
         }
         struct.setRecordMutationsIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
index 95c2b0e..fb24f58 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Schema.java
@@ -479,25 +479,25 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
           case 2: // COLUMN_FAMILIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map102 = iprot.readMapBegin();
-                struct.columnFamilies = new HashMap<String,Set<String>>(2*_map102.size);
-                for (int _i103 = 0; _i103 < _map102.size; ++_i103)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map110 = iprot.readMapBegin();
+                struct.columnFamilies = new HashMap<String,Set<String>>(2*_map110.size);
+                for (int _i111 = 0; _i111 < _map110.size; ++_i111)
                 {
-                  String _key104; // required
-                  Set<String> _val105; // optional
-                  _key104 = iprot.readString();
+                  String _key112; // required
+                  Set<String> _val113; // optional
+                  _key112 = iprot.readString();
                   {
-                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set106 = iprot.readSetBegin();
-                    _val105 = new HashSet<String>(2*_set106.size);
-                    for (int _i107 = 0; _i107 < _set106.size; ++_i107)
+                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set114 = iprot.readSetBegin();
+                    _val113 = new HashSet<String>(2*_set114.size);
+                    for (int _i115 = 0; _i115 < _set114.size; ++_i115)
                     {
-                      String _elem108; // required
-                      _elem108 = iprot.readString();
-                      _val105.add(_elem108);
+                      String _elem116; // required
+                      _elem116 = iprot.readString();
+                      _val113.add(_elem116);
                     }
                     iprot.readSetEnd();
                   }
-                  struct.columnFamilies.put(_key104, _val105);
+                  struct.columnFamilies.put(_key112, _val113);
                 }
                 iprot.readMapEnd();
               }
@@ -530,14 +530,14 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
         oprot.writeFieldBegin(COLUMN_FAMILIES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, struct.columnFamilies.size()));
-          for (Map.Entry<String, Set<String>> _iter109 : struct.columnFamilies.entrySet())
+          for (Map.Entry<String, Set<String>> _iter117 : struct.columnFamilies.entrySet())
           {
-            oprot.writeString(_iter109.getKey());
+            oprot.writeString(_iter117.getKey());
             {
-              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter109.getValue().size()));
-              for (String _iter110 : _iter109.getValue())
+              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter117.getValue().size()));
+              for (String _iter118 : _iter117.getValue())
               {
-                oprot.writeString(_iter110);
+                oprot.writeString(_iter118);
               }
               oprot.writeSetEnd();
             }
@@ -577,14 +577,14 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       if (struct.isSetColumnFamilies()) {
         {
           oprot.writeI32(struct.columnFamilies.size());
-          for (Map.Entry<String, Set<String>> _iter111 : struct.columnFamilies.entrySet())
+          for (Map.Entry<String, Set<String>> _iter119 : struct.columnFamilies.entrySet())
           {
-            oprot.writeString(_iter111.getKey());
+            oprot.writeString(_iter119.getKey());
             {
-              oprot.writeI32(_iter111.getValue().size());
-              for (String _iter112 : _iter111.getValue())
+              oprot.writeI32(_iter119.getValue().size());
+              for (String _iter120 : _iter119.getValue())
               {
-                oprot.writeString(_iter112);
+                oprot.writeString(_iter120);
               }
             }
           }
@@ -602,24 +602,24 @@ public class Schema implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Sch
       }
       if (incoming.get(1)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map113 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, iprot.readI32());
-          struct.columnFamilies = new HashMap<String,Set<String>>(2*_map113.size);
-          for (int _i114 = 0; _i114 < _map113.size; ++_i114)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map121 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, iprot.readI32());
+          struct.columnFamilies = new HashMap<String,Set<String>>(2*_map121.size);
+          for (int _i122 = 0; _i122 < _map121.size; ++_i122)
           {
-            String _key115; // required
-            Set<String> _val116; // optional
-            _key115 = iprot.readString();
+            String _key123; // required
+            Set<String> _val124; // optional
+            _key123 = iprot.readString();
             {
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set117 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-              _val116 = new HashSet<String>(2*_set117.size);
-              for (int _i118 = 0; _i118 < _set117.size; ++_i118)
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set125 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+              _val124 = new HashSet<String>(2*_set125.size);
+              for (int _i126 = 0; _i126 < _set125.size; ++_i126)
               {
-                String _elem119; // required
-                _elem119 = iprot.readString();
-                _val116.add(_elem119);
+                String _elem127; // required
+                _elem127 = iprot.readString();
+                _val124.add(_elem127);
               }
             }
-            struct.columnFamilies.put(_key115, _val116);
+            struct.columnFamilies.put(_key123, _val124);
           }
         }
         struct.setColumnFamiliesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
index 231102f..90da051 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java
@@ -64,6 +64,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ALLOW_STALE_DATA_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("allowStaleData", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL, (short)7);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField START_RECORD_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("startRecord", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)8);
   private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField MAX_RECORDS_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("maxRecordsToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)9);
+  private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField HIGHLIGHT_OPTIONS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("highlightOptions", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)10);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
   static {
@@ -114,6 +115,10 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
    * records in the row, be careful.
    */
   public int maxRecordsToFetch; // required
+  /**
+   * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
+   */
+  public HighlightOptions highlightOptions; // 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 {
@@ -159,7 +164,11 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
      * would be 100.  Used in conjunction with maxRecordsToFetch. By default this will fetch all the
      * records in the row, be careful.
      */
-    MAX_RECORDS_TO_FETCH((short)9, "maxRecordsToFetch");
+    MAX_RECORDS_TO_FETCH((short)9, "maxRecordsToFetch"),
+    /**
+     * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
+     */
+    HIGHLIGHT_OPTIONS((short)10, "highlightOptions");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
 
@@ -192,6 +201,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           return START_RECORD;
         case 9: // MAX_RECORDS_TO_FETCH
           return MAX_RECORDS_TO_FETCH;
+        case 10: // HIGHLIGHT_OPTIONS
+          return HIGHLIGHT_OPTIONS;
         default:
           return null;
       }
@@ -262,6 +273,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32)));
     tmpMap.put(_Fields.MAX_RECORDS_TO_FETCH, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("maxRecordsToFetch", 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.I32)));
+    tmpMap.put(_Fields.HIGHLIGHT_OPTIONS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("highlightOptions", 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, HighlightOptions.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
     org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(Selector.class, metaDataMap);
   }
@@ -282,7 +295,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     Map<String,Set<String>> columnsToFetch,
     boolean allowStaleData,
     int startRecord,
-    int maxRecordsToFetch)
+    int maxRecordsToFetch,
+    HighlightOptions highlightOptions)
   {
     this();
     this.recordOnly = recordOnly;
@@ -298,6 +312,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     setStartRecordIsSet(true);
     this.maxRecordsToFetch = maxRecordsToFetch;
     setMaxRecordsToFetchIsSet(true);
+    this.highlightOptions = highlightOptions;
   }
 
   /**
@@ -343,6 +358,9 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     this.allowStaleData = other.allowStaleData;
     this.startRecord = other.startRecord;
     this.maxRecordsToFetch = other.maxRecordsToFetch;
+    if (other.isSetHighlightOptions()) {
+      this.highlightOptions = new HighlightOptions(other.highlightOptions);
+    }
   }
 
   public Selector deepCopy() {
@@ -364,6 +382,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
 
     this.maxRecordsToFetch = 2147483647;
 
+    this.highlightOptions = null;
   }
 
   /**
@@ -672,6 +691,36 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __MAXRECORDSTOFETCH_ISSET_ID, value);
   }
 
+  /**
+   * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
+   */
+  public HighlightOptions getHighlightOptions() {
+    return this.highlightOptions;
+  }
+
+  /**
+   * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
+   */
+  public Selector setHighlightOptions(HighlightOptions highlightOptions) {
+    this.highlightOptions = highlightOptions;
+    return this;
+  }
+
+  public void unsetHighlightOptions() {
+    this.highlightOptions = null;
+  }
+
+  /** Returns true if field highlightOptions is set (has been assigned a value) and false otherwise */
+  public boolean isSetHighlightOptions() {
+    return this.highlightOptions != null;
+  }
+
+  public void setHighlightOptionsIsSet(boolean value) {
+    if (!value) {
+      this.highlightOptions = null;
+    }
+  }
+
   public void setFieldValue(_Fields field, Object value) {
     switch (field) {
     case RECORD_ONLY:
@@ -746,6 +795,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       }
       break;
 
+    case HIGHLIGHT_OPTIONS:
+      if (value == null) {
+        unsetHighlightOptions();
+      } else {
+        setHighlightOptions((HighlightOptions)value);
+      }
+      break;
+
     }
   }
 
@@ -778,6 +835,9 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     case MAX_RECORDS_TO_FETCH:
       return Integer.valueOf(getMaxRecordsToFetch());
 
+    case HIGHLIGHT_OPTIONS:
+      return getHighlightOptions();
+
     }
     throw new IllegalStateException();
   }
@@ -807,6 +867,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       return isSetStartRecord();
     case MAX_RECORDS_TO_FETCH:
       return isSetMaxRecordsToFetch();
+    case HIGHLIGHT_OPTIONS:
+      return isSetHighlightOptions();
     }
     throw new IllegalStateException();
   }
@@ -905,6 +967,15 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         return false;
     }
 
+    boolean this_present_highlightOptions = true && this.isSetHighlightOptions();
+    boolean that_present_highlightOptions = true && that.isSetHighlightOptions();
+    if (this_present_highlightOptions || that_present_highlightOptions) {
+      if (!(this_present_highlightOptions && that_present_highlightOptions))
+        return false;
+      if (!this.highlightOptions.equals(that.highlightOptions))
+        return false;
+    }
+
     return true;
   }
 
@@ -1011,6 +1082,16 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         return lastComparison;
       }
     }
+    lastComparison = Boolean.valueOf(isSetHighlightOptions()).compareTo(typedOther.isSetHighlightOptions());
+    if (lastComparison != 0) {
+      return lastComparison;
+    }
+    if (isSetHighlightOptions()) {
+      lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.highlightOptions, typedOther.highlightOptions);
+      if (lastComparison != 0) {
+        return lastComparison;
+      }
+    }
     return 0;
   }
 
@@ -1086,6 +1167,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
     sb.append("maxRecordsToFetch:");
     sb.append(this.maxRecordsToFetch);
     first = false;
+    if (!first) sb.append(", ");
+    sb.append("highlightOptions:");
+    if (this.highlightOptions == null) {
+      sb.append("null");
+    } else {
+      sb.append(this.highlightOptions);
+    }
+    first = false;
     sb.append(")");
     return sb.toString();
   }
@@ -1093,6 +1182,9 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
   public void validate() throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
     // check for required fields
     // check for sub-struct validity
+    if (highlightOptions != null) {
+      highlightOptions.validate();
+    }
   }
 
   private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
@@ -1166,13 +1258,13 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           case 5: // COLUMN_FAMILIES_TO_FETCH
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set16 = iprot.readSetBegin();
-                struct.columnFamiliesToFetch = new HashSet<String>(2*_set16.size);
-                for (int _i17 = 0; _i17 < _set16.size; ++_i17)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set24 = iprot.readSetBegin();
+                struct.columnFamiliesToFetch = new HashSet<String>(2*_set24.size);
+                for (int _i25 = 0; _i25 < _set24.size; ++_i25)
                 {
-                  String _elem18; // required
-                  _elem18 = iprot.readString();
-                  struct.columnFamiliesToFetch.add(_elem18);
+                  String _elem26; // required
+                  _elem26 = iprot.readString();
+                  struct.columnFamiliesToFetch.add(_elem26);
                 }
                 iprot.readSetEnd();
               }
@@ -1184,25 +1276,25 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
           case 6: // COLUMNS_TO_FETCH
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map19 = iprot.readMapBegin();
-                struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map19.size);
-                for (int _i20 = 0; _i20 < _map19.size; ++_i20)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map27 = iprot.readMapBegin();
+                struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map27.size);
+                for (int _i28 = 0; _i28 < _map27.size; ++_i28)
                 {
-                  String _key21; // required
-                  Set<String> _val22; // optional
-                  _key21 = iprot.readString();
+                  String _key29; // required
+                  Set<String> _val30; // optional
+                  _key29 = iprot.readString();
                   {
-                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set23 = iprot.readSetBegin();
-                    _val22 = new HashSet<String>(2*_set23.size);
-                    for (int _i24 = 0; _i24 < _set23.size; ++_i24)
+                    org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set31 = iprot.readSetBegin();
+                    _val30 = new HashSet<String>(2*_set31.size);
+                    for (int _i32 = 0; _i32 < _set31.size; ++_i32)
                     {
-                      String _elem25; // required
-                      _elem25 = iprot.readString();
-                      _val22.add(_elem25);
+                      String _elem33; // required
+                      _elem33 = iprot.readString();
+                      _val30.add(_elem33);
                     }
                     iprot.readSetEnd();
                   }
-                  struct.columnsToFetch.put(_key21, _val22);
+                  struct.columnsToFetch.put(_key29, _val30);
                 }
                 iprot.readMapEnd();
               }
@@ -1235,6 +1327,15 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
               org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
+          case 10: // HIGHLIGHT_OPTIONS
+            if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) {
+              struct.highlightOptions = new HighlightOptions();
+              struct.highlightOptions.read(iprot);
+              struct.setHighlightOptionsIsSet(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);
         }
@@ -1272,9 +1373,9 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         oprot.writeFieldBegin(COLUMN_FAMILIES_TO_FETCH_FIELD_DESC);
         {
           oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.columnFamiliesToFetch.size()));
-          for (String _iter26 : struct.columnFamiliesToFetch)
+          for (String _iter34 : struct.columnFamiliesToFetch)
           {
-            oprot.writeString(_iter26);
+            oprot.writeString(_iter34);
           }
           oprot.writeSetEnd();
         }
@@ -1284,14 +1385,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         oprot.writeFieldBegin(COLUMNS_TO_FETCH_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, struct.columnsToFetch.size()));
-          for (Map.Entry<String, Set<String>> _iter27 : struct.columnsToFetch.entrySet())
+          for (Map.Entry<String, Set<String>> _iter35 : struct.columnsToFetch.entrySet())
           {
-            oprot.writeString(_iter27.getKey());
+            oprot.writeString(_iter35.getKey());
             {
-              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter27.getValue().size()));
-              for (String _iter28 : _iter27.getValue())
+              oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, _iter35.getValue().size()));
+              for (String _iter36 : _iter35.getValue())
               {
-                oprot.writeString(_iter28);
+                oprot.writeString(_iter36);
               }
               oprot.writeSetEnd();
             }
@@ -1309,6 +1410,11 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       oprot.writeFieldBegin(MAX_RECORDS_TO_FETCH_FIELD_DESC);
       oprot.writeI32(struct.maxRecordsToFetch);
       oprot.writeFieldEnd();
+      if (struct.highlightOptions != null) {
+        oprot.writeFieldBegin(HIGHLIGHT_OPTIONS_FIELD_DESC);
+        struct.highlightOptions.write(oprot);
+        oprot.writeFieldEnd();
+      }
       oprot.writeFieldStop();
       oprot.writeStructEnd();
     }
@@ -1354,7 +1460,10 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.isSetMaxRecordsToFetch()) {
         optionals.set(8);
       }
-      oprot.writeBitSet(optionals, 9);
+      if (struct.isSetHighlightOptions()) {
+        optionals.set(9);
+      }
+      oprot.writeBitSet(optionals, 10);
       if (struct.isSetRecordOnly()) {
         oprot.writeBool(struct.recordOnly);
       }
@@ -1370,23 +1479,23 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.isSetColumnFamiliesToFetch()) {
         {
           oprot.writeI32(struct.columnFamiliesToFetch.size());
-          for (String _iter29 : struct.columnFamiliesToFetch)
+          for (String _iter37 : struct.columnFamiliesToFetch)
           {
-            oprot.writeString(_iter29);
+            oprot.writeString(_iter37);
           }
         }
       }
       if (struct.isSetColumnsToFetch()) {
         {
           oprot.writeI32(struct.columnsToFetch.size());
-          for (Map.Entry<String, Set<String>> _iter30 : struct.columnsToFetch.entrySet())
+          for (Map.Entry<String, Set<String>> _iter38 : struct.columnsToFetch.entrySet())
           {
-            oprot.writeString(_iter30.getKey());
+            oprot.writeString(_iter38.getKey());
             {
-              oprot.writeI32(_iter30.getValue().size());
-              for (String _iter31 : _iter30.getValue())
+              oprot.writeI32(_iter38.getValue().size());
+              for (String _iter39 : _iter38.getValue())
               {
-                oprot.writeString(_iter31);
+                oprot.writeString(_iter39);
               }
             }
           }
@@ -1401,12 +1510,15 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       if (struct.isSetMaxRecordsToFetch()) {
         oprot.writeI32(struct.maxRecordsToFetch);
       }
+      if (struct.isSetHighlightOptions()) {
+        struct.highlightOptions.write(oprot);
+      }
     }
 
     @Override
     public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, Selector struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException {
       TTupleProtocol iprot = (TTupleProtocol) prot;
-      BitSet incoming = iprot.readBitSet(9);
+      BitSet incoming = iprot.readBitSet(10);
       if (incoming.get(0)) {
         struct.recordOnly = iprot.readBool();
         struct.setRecordOnlyIsSet(true);
@@ -1425,37 +1537,37 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
       }
       if (incoming.get(4)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set32 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.columnFamiliesToFetch = new HashSet<String>(2*_set32.size);
-          for (int _i33 = 0; _i33 < _set32.size; ++_i33)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set40 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.columnFamiliesToFetch = new HashSet<String>(2*_set40.size);
+          for (int _i41 = 0; _i41 < _set40.size; ++_i41)
           {
-            String _elem34; // required
-            _elem34 = iprot.readString();
-            struct.columnFamiliesToFetch.add(_elem34);
+            String _elem42; // required
+            _elem42 = iprot.readString();
+            struct.columnFamiliesToFetch.add(_elem42);
           }
         }
         struct.setColumnFamiliesToFetchIsSet(true);
       }
       if (incoming.get(5)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map35 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, iprot.readI32());
-          struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map35.size);
-          for (int _i36 = 0; _i36 < _map35.size; ++_i36)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map43 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, iprot.readI32());
+          struct.columnsToFetch = new HashMap<String,Set<String>>(2*_map43.size);
+          for (int _i44 = 0; _i44 < _map43.size; ++_i44)
           {
-            String _key37; // required
-            Set<String> _val38; // optional
-            _key37 = iprot.readString();
+            String _key45; // required
+            Set<String> _val46; // optional
+            _key45 = iprot.readString();
             {
-              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set39 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-              _val38 = new HashSet<String>(2*_set39.size);
-              for (int _i40 = 0; _i40 < _set39.size; ++_i40)
+              org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set47 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+              _val46 = new HashSet<String>(2*_set47.size);
+              for (int _i48 = 0; _i48 < _set47.size; ++_i48)
               {
-                String _elem41; // required
-                _elem41 = iprot.readString();
-                _val38.add(_elem41);
+                String _elem49; // required
+                _elem49 = iprot.readString();
+                _val46.add(_elem49);
               }
             }
-            struct.columnsToFetch.put(_key37, _val38);
+            struct.columnsToFetch.put(_key45, _val46);
           }
         }
         struct.setColumnsToFetchIsSet(true);
@@ -1472,6 +1584,11 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S
         struct.maxRecordsToFetch = iprot.readI32();
         struct.setMaxRecordsToFetchIsSet(true);
       }
+      if (incoming.get(9)) {
+        struct.highlightOptions = new HighlightOptions();
+        struct.highlightOptions.read(iprot);
+        struct.setHighlightOptionsIsSet(true);
+      }
     }
   }
 

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
----------------------------------------------------------------------
diff --git a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
index 6d9b0e4..e87e120 100644
--- a/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
+++ b/src/blur-thrift/src/main/java/org/apache/blur/thrift/generated/TableDescriptor.java
@@ -1634,13 +1634,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 11: // BLOCK_CACHING_FILE_TYPES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set158 = iprot.readSetBegin();
-                struct.blockCachingFileTypes = new HashSet<String>(2*_set158.size);
-                for (int _i159 = 0; _i159 < _set158.size; ++_i159)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set166 = iprot.readSetBegin();
+                struct.blockCachingFileTypes = new HashSet<String>(2*_set166.size);
+                for (int _i167 = 0; _i167 < _set166.size; ++_i167)
                 {
-                  String _elem160; // required
-                  _elem160 = iprot.readString();
-                  struct.blockCachingFileTypes.add(_elem160);
+                  String _elem168; // required
+                  _elem168 = iprot.readString();
+                  struct.blockCachingFileTypes.add(_elem168);
                 }
                 iprot.readSetEnd();
               }
@@ -1669,15 +1669,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
           case 14: // TABLE_PROPERTIES
             if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) {
               {
-                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map161 = iprot.readMapBegin();
-                struct.tableProperties = new HashMap<String,String>(2*_map161.size);
-                for (int _i162 = 0; _i162 < _map161.size; ++_i162)
+                org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map169 = iprot.readMapBegin();
+                struct.tableProperties = new HashMap<String,String>(2*_map169.size);
+                for (int _i170 = 0; _i170 < _map169.size; ++_i170)
                 {
-                  String _key163; // required
-                  String _val164; // optional
-                  _key163 = iprot.readString();
-                  _val164 = iprot.readString();
-                  struct.tableProperties.put(_key163, _val164);
+                  String _key171; // required
+                  String _val172; // optional
+                  _key171 = iprot.readString();
+                  _val172 = iprot.readString();
+                  struct.tableProperties.put(_key171, _val172);
                 }
                 iprot.readMapEnd();
               }
@@ -1747,9 +1747,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(BLOCK_CACHING_FILE_TYPES_FIELD_DESC);
         {
           oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.blockCachingFileTypes.size()));
-          for (String _iter165 : struct.blockCachingFileTypes)
+          for (String _iter173 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter165);
+            oprot.writeString(_iter173);
           }
           oprot.writeSetEnd();
         }
@@ -1767,10 +1767,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
         oprot.writeFieldBegin(TABLE_PROPERTIES_FIELD_DESC);
         {
           oprot.writeMapBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, struct.tableProperties.size()));
-          for (Map.Entry<String, String> _iter166 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter174 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter166.getKey());
-            oprot.writeString(_iter166.getValue());
+            oprot.writeString(_iter174.getKey());
+            oprot.writeString(_iter174.getValue());
           }
           oprot.writeMapEnd();
         }
@@ -1870,9 +1870,9 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetBlockCachingFileTypes()) {
         {
           oprot.writeI32(struct.blockCachingFileTypes.size());
-          for (String _iter167 : struct.blockCachingFileTypes)
+          for (String _iter175 : struct.blockCachingFileTypes)
           {
-            oprot.writeString(_iter167);
+            oprot.writeString(_iter175);
           }
         }
       }
@@ -1885,10 +1885,10 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       if (struct.isSetTableProperties()) {
         {
           oprot.writeI32(struct.tableProperties.size());
-          for (Map.Entry<String, String> _iter168 : struct.tableProperties.entrySet())
+          for (Map.Entry<String, String> _iter176 : struct.tableProperties.entrySet())
           {
-            oprot.writeString(_iter168.getKey());
-            oprot.writeString(_iter168.getValue());
+            oprot.writeString(_iter176.getKey());
+            oprot.writeString(_iter176.getValue());
           }
         }
       }
@@ -1941,13 +1941,13 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(10)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set169 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.blockCachingFileTypes = new HashSet<String>(2*_set169.size);
-          for (int _i170 = 0; _i170 < _set169.size; ++_i170)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set177 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.blockCachingFileTypes = new HashSet<String>(2*_set177.size);
+          for (int _i178 = 0; _i178 < _set177.size; ++_i178)
           {
-            String _elem171; // required
-            _elem171 = iprot.readString();
-            struct.blockCachingFileTypes.add(_elem171);
+            String _elem179; // required
+            _elem179 = iprot.readString();
+            struct.blockCachingFileTypes.add(_elem179);
           }
         }
         struct.setBlockCachingFileTypesIsSet(true);
@@ -1963,15 +1963,15 @@ public class TableDescriptor implements org.apache.blur.thirdparty.thrift_0_9_0.
       }
       if (incoming.get(13)) {
         {
-          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map172 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
-          struct.tableProperties = new HashMap<String,String>(2*_map172.size);
-          for (int _i173 = 0; _i173 < _map172.size; ++_i173)
+          org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map180 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32());
+          struct.tableProperties = new HashMap<String,String>(2*_map180.size);
+          for (int _i181 = 0; _i181 < _map180.size; ++_i181)
           {
-            String _key174; // required
-            String _val175; // optional
-            _key174 = iprot.readString();
-            _val175 = iprot.readString();
-            struct.tableProperties.put(_key174, _val175);
+            String _key182; // required
+            String _val183; // optional
+            _key182 = iprot.readString();
+            _val183 = iprot.readString();
+            struct.tableProperties.put(_key182, _val183);
           }
         }
         struct.setTablePropertiesIsSet(true);

http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/7bbf19d8/src/distribution/src/main/scripts/interface/Blur.thrift
----------------------------------------------------------------------
diff --git a/src/distribution/src/main/scripts/interface/Blur.thrift b/src/distribution/src/main/scripts/interface/Blur.thrift
index 163c440..3f1c4ff 100644
--- a/src/distribution/src/main/scripts/interface/Blur.thrift
+++ b/src/distribution/src/main/scripts/interface/Blur.thrift
@@ -131,7 +131,12 @@ struct Record {
   /**
    * A list of columns, multiple columns with the same name are allowed.
    */
-  3:list<Column> columns
+  3:list<Column> columns,
+
+  /**
+   * A list of the highlighted columns.
+   */
+  4:list<Column> highlightedColumns
 }
 
 /**
@@ -156,7 +161,50 @@ struct Row {
   3:i32 recordCount
 }
 
+/**
+ * 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 HighlightOptions controls how the data is fetched and returned.
+ */
+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 
+   * 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,
+  /**
+   * Only returns the records within a Row that matched in the query.  If the BlurQuery 
+   * is not a superQuery then this option is not used.  Enabled by default.
+   */
+  2:bool onlyMatchingRecords = true
+}
 
 /**
  * Select carries the request for information to be retrieved from the stored columns.
@@ -204,7 +252,11 @@ struct Selector {
    * would be 100.  Used in conjunction with maxRecordsToFetch. By default this will fetch all the 
    * records in the row, be careful.
    */
-  9:i32 maxRecordsToFetch = 2147483647
+  9:i32 maxRecordsToFetch = 2147483647,
+  /**
+   * The HighlightOptions object controls how the data is highlighted.  If null no highlighting will occur.
+   */
+  10:HighlightOptions highlightOptions
 }
 
 /**
@@ -258,32 +310,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 {


Mime
View raw message