Updated Branches: refs/heads/master a4840274d -> 426d3c3b7
Removed old deprecated attribute. Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/4deaff2a Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/4deaff2a Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/4deaff2a Branch: refs/heads/master Commit: 4deaff2a48e3951d8f12afb07e82920590bafbf5 Parents: a484027 Author: Aaron McCurry <[email protected]> Authored: Sat Aug 24 18:57:17 2013 -0400 Committer: Aaron McCurry <[email protected]> Committed: Sat Aug 24 18:57:17 2013 -0400 ---------------------------------------------------------------------- .../org/apache/blur/manager/IndexManager.java | 1 - .../apache/blur/thrift/generated/Selector.java | 124 ++----------------- .../src/main/scripts/interface/Blur.thrift | 4 - .../main/scripts/interface/gen-html/Blur.html | 2 - .../apache/blur/thrift/generated/Selector.java | 124 ++----------------- .../main/scripts/interface/gen-js/Blur_types.js | 16 --- .../scripts/interface/gen-perl/Blur/Types.pm | 17 +-- .../main/scripts/interface/gen-rb/blur_types.rb | 3 - docs/Blur.html | 2 - 9 files changed, 19 insertions(+), 274 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java index f4ace8e..adda3ac 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java +++ b/blur-core/src/main/java/org/apache/blur/manager/IndexManager.java @@ -959,7 +959,6 @@ public class IndexManager { private void doUpdateRowMutation(RowMutation mutation, BlurIndex blurIndex) throws BlurException, IOException { FetchResult fetchResult = new FetchResult(); Selector selector = new Selector(); - selector.setAllowStaleDataIsSet(false); selector.setRowId(mutation.rowId); fetchRow(mutation.table, selector, fetchResult); if (fetchResult.exists) { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java index 3a0f81b..9213e99 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Selector.java @@ -61,7 +61,6 @@ 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 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)4); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_FAMILIES_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnFamiliesToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)5); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMNS_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnsToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)6); - 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); @@ -98,10 +97,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S */ public Map<String,Set<String>> columnsToFetch; // required /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - public boolean allowStaleData; // required - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the @@ -148,10 +143,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S */ COLUMNS_TO_FETCH((short)6, "columnsToFetch"), /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - ALLOW_STALE_DATA((short)7, "allowStaleData"), - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the @@ -195,8 +186,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return COLUMN_FAMILIES_TO_FETCH; case 6: // COLUMNS_TO_FETCH return COLUMNS_TO_FETCH; - case 7: // ALLOW_STALE_DATA - return ALLOW_STALE_DATA; case 8: // START_RECORD return START_RECORD; case 9: // MAX_RECORDS_TO_FETCH @@ -244,9 +233,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S // isset id assignments private static final int __RECORDONLY_ISSET_ID = 0; - private static final int __ALLOWSTALEDATA_ISSET_ID = 1; - private static final int __STARTRECORD_ISSET_ID = 2; - private static final int __MAXRECORDSTOFETCH_ISSET_ID = 3; + private static final int __STARTRECORD_ISSET_ID = 1; + private static final int __MAXRECORDSTOFETCH_ISSET_ID = 2; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap; static { @@ -267,8 +255,6 @@ 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.STRING), new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.SetMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, 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.ALLOW_STALE_DATA, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("allowStaleData", 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.START_RECORD, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("startRecord", 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.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, @@ -293,7 +279,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S String recordId, List<String> columnFamiliesToFetch, Map<String,Set<String>> columnsToFetch, - boolean allowStaleData, int startRecord, int maxRecordsToFetch, HighlightOptions highlightOptions) @@ -306,8 +291,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S this.recordId = recordId; this.columnFamiliesToFetch = columnFamiliesToFetch; this.columnsToFetch = columnsToFetch; - this.allowStaleData = allowStaleData; - setAllowStaleDataIsSet(true); this.startRecord = startRecord; setStartRecordIsSet(true); this.maxRecordsToFetch = maxRecordsToFetch; @@ -355,7 +338,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } this.columnsToFetch = __this__columnsToFetch; } - this.allowStaleData = other.allowStaleData; this.startRecord = other.startRecord; this.maxRecordsToFetch = other.maxRecordsToFetch; if (other.isSetHighlightOptions()) { @@ -376,8 +358,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S this.recordId = null; this.columnFamiliesToFetch = null; this.columnsToFetch = null; - setAllowStaleDataIsSet(false); - this.allowStaleData = false; this.startRecord = 0; this.maxRecordsToFetch = 1000; @@ -593,35 +573,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - public boolean isAllowStaleData() { - return this.allowStaleData; - } - - /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - public Selector setAllowStaleData(boolean allowStaleData) { - this.allowStaleData = allowStaleData; - setAllowStaleDataIsSet(true); - return this; - } - - public void unsetAllowStaleData() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ALLOWSTALEDATA_ISSET_ID); - } - - /** Returns true if field allowStaleData is set (has been assigned a value) and false otherwise */ - public boolean isSetAllowStaleData() { - return EncodingUtils.testBit(__isset_bitfield, __ALLOWSTALEDATA_ISSET_ID); - } - - public void setAllowStaleDataIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ALLOWSTALEDATA_ISSET_ID, value); - } - - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the @@ -771,14 +722,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } break; - case ALLOW_STALE_DATA: - if (value == null) { - unsetAllowStaleData(); - } else { - setAllowStaleData((Boolean)value); - } - break; - case START_RECORD: if (value == null) { unsetStartRecord(); @@ -826,9 +769,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S case COLUMNS_TO_FETCH: return getColumnsToFetch(); - case ALLOW_STALE_DATA: - return Boolean.valueOf(isAllowStaleData()); - case START_RECORD: return Integer.valueOf(getStartRecord()); @@ -861,8 +801,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return isSetColumnFamiliesToFetch(); case COLUMNS_TO_FETCH: return isSetColumnsToFetch(); - case ALLOW_STALE_DATA: - return isSetAllowStaleData(); case START_RECORD: return isSetStartRecord(); case MAX_RECORDS_TO_FETCH: @@ -940,15 +878,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return false; } - boolean this_present_allowStaleData = true; - boolean that_present_allowStaleData = true; - if (this_present_allowStaleData || that_present_allowStaleData) { - if (!(this_present_allowStaleData && that_present_allowStaleData)) - return false; - if (this.allowStaleData != that.allowStaleData) - return false; - } - boolean this_present_startRecord = true; boolean that_present_startRecord = true; if (this_present_startRecord || that_present_startRecord) { @@ -1052,16 +981,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAllowStaleData()).compareTo(typedOther.isSetAllowStaleData()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAllowStaleData()) { - lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.allowStaleData, typedOther.allowStaleData); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetStartRecord()).compareTo(typedOther.isSetStartRecord()); if (lastComparison != 0) { return lastComparison; @@ -1156,10 +1075,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } first = false; if (!first) sb.append(", "); - sb.append("allowStaleData:"); - sb.append(this.allowStaleData); - first = false; - if (!first) sb.append(", "); sb.append("startRecord:"); sb.append(this.startRecord); first = false; @@ -1303,14 +1218,6 @@ 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 7: // ALLOW_STALE_DATA - if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) { - struct.allowStaleData = iprot.readBool(); - struct.setAllowStaleDataIsSet(true); - } else { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; case 8: // START_RECORD if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) { struct.startRecord = iprot.readI32(); @@ -1401,9 +1308,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } oprot.writeFieldEnd(); } - oprot.writeFieldBegin(ALLOW_STALE_DATA_FIELD_DESC); - oprot.writeBool(struct.allowStaleData); - oprot.writeFieldEnd(); oprot.writeFieldBegin(START_RECORD_FIELD_DESC); oprot.writeI32(struct.startRecord); oprot.writeFieldEnd(); @@ -1451,19 +1355,16 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S if (struct.isSetColumnsToFetch()) { optionals.set(5); } - if (struct.isSetAllowStaleData()) { - optionals.set(6); - } if (struct.isSetStartRecord()) { - optionals.set(7); + optionals.set(6); } if (struct.isSetMaxRecordsToFetch()) { - optionals.set(8); + optionals.set(7); } if (struct.isSetHighlightOptions()) { - optionals.set(9); + optionals.set(8); } - oprot.writeBitSet(optionals, 10); + oprot.writeBitSet(optionals, 9); if (struct.isSetRecordOnly()) { oprot.writeBool(struct.recordOnly); } @@ -1501,9 +1402,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } } } - if (struct.isSetAllowStaleData()) { - oprot.writeBool(struct.allowStaleData); - } if (struct.isSetStartRecord()) { oprot.writeI32(struct.startRecord); } @@ -1518,7 +1416,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S @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(10); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.recordOnly = iprot.readBool(); struct.setRecordOnlyIsSet(true); @@ -1573,18 +1471,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S struct.setColumnsToFetchIsSet(true); } if (incoming.get(6)) { - struct.allowStaleData = iprot.readBool(); - struct.setAllowStaleDataIsSet(true); - } - if (incoming.get(7)) { struct.startRecord = iprot.readI32(); struct.setStartRecordIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(7)) { struct.maxRecordsToFetch = iprot.readI32(); struct.setMaxRecordsToFetchIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(8)) { struct.highlightOptions = new HighlightOptions(); struct.highlightOptions.read(iprot); struct.setHighlightOptionsIsSet(true); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/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 068f017..a67285e 100644 --- a/distribution/src/main/scripts/interface/Blur.thrift +++ b/distribution/src/main/scripts/interface/Blur.thrift @@ -289,10 +289,6 @@ struct Selector { */ 6:map<string,set<string>> columnsToFetch, /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - 7:bool allowStaleData, - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/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 aabbd23..28d52f3 100644 --- a/distribution/src/main/scripts/interface/gen-html/Blur.html +++ b/distribution/src/main/scripts/interface/gen-html/Blur.html @@ -258,8 +258,6 @@ The location id of the Record or Row to be fetched. </td><td>default</td><td></td></tr> <tr><td>6</td><td>columnsToFetch</td><td><code>map<<code>string</code>, <code>set<<code>string</code>></code>></code></td><td>The columns in the families to fetch. If null, fetch all. If empty, fetch none. </td><td>default</td><td></td></tr> -<tr><td>7</td><td>allowStaleData</td><td><code>bool</code></td><td>@deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. -</td><td>default</td><td></td></tr> <tr><td>8</td><td>startRecord</td><td><code>i32</code></td><td>Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 records and you want the first 100, then this value is 0. If you want records 300-400 then this value would be 300. If startRecord is beyond the end of the row, the row will be null in the http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java index 3a0f81b..9213e99 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Selector.java @@ -61,7 +61,6 @@ 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 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)4); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMN_FAMILIES_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnFamiliesToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)5); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField COLUMNS_TO_FETCH_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("columnsToFetch", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)6); - 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); @@ -98,10 +97,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S */ public Map<String,Set<String>> columnsToFetch; // required /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - public boolean allowStaleData; // required - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the @@ -148,10 +143,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S */ COLUMNS_TO_FETCH((short)6, "columnsToFetch"), /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - ALLOW_STALE_DATA((short)7, "allowStaleData"), - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the @@ -195,8 +186,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return COLUMN_FAMILIES_TO_FETCH; case 6: // COLUMNS_TO_FETCH return COLUMNS_TO_FETCH; - case 7: // ALLOW_STALE_DATA - return ALLOW_STALE_DATA; case 8: // START_RECORD return START_RECORD; case 9: // MAX_RECORDS_TO_FETCH @@ -244,9 +233,8 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S // isset id assignments private static final int __RECORDONLY_ISSET_ID = 0; - private static final int __ALLOWSTALEDATA_ISSET_ID = 1; - private static final int __STARTRECORD_ISSET_ID = 2; - private static final int __MAXRECORDSTOFETCH_ISSET_ID = 3; + private static final int __STARTRECORD_ISSET_ID = 1; + private static final int __MAXRECORDSTOFETCH_ISSET_ID = 2; private byte __isset_bitfield = 0; public static final Map<_Fields, org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData> metaDataMap; static { @@ -267,8 +255,6 @@ 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.STRING), new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.SetMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, 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.ALLOW_STALE_DATA, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("allowStaleData", 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.START_RECORD, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("startRecord", 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.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, @@ -293,7 +279,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S String recordId, List<String> columnFamiliesToFetch, Map<String,Set<String>> columnsToFetch, - boolean allowStaleData, int startRecord, int maxRecordsToFetch, HighlightOptions highlightOptions) @@ -306,8 +291,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S this.recordId = recordId; this.columnFamiliesToFetch = columnFamiliesToFetch; this.columnsToFetch = columnsToFetch; - this.allowStaleData = allowStaleData; - setAllowStaleDataIsSet(true); this.startRecord = startRecord; setStartRecordIsSet(true); this.maxRecordsToFetch = maxRecordsToFetch; @@ -355,7 +338,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } this.columnsToFetch = __this__columnsToFetch; } - this.allowStaleData = other.allowStaleData; this.startRecord = other.startRecord; this.maxRecordsToFetch = other.maxRecordsToFetch; if (other.isSetHighlightOptions()) { @@ -376,8 +358,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S this.recordId = null; this.columnFamiliesToFetch = null; this.columnsToFetch = null; - setAllowStaleDataIsSet(false); - this.allowStaleData = false; this.startRecord = 0; this.maxRecordsToFetch = 1000; @@ -593,35 +573,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - public boolean isAllowStaleData() { - return this.allowStaleData; - } - - /** - * @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - */ - public Selector setAllowStaleData(boolean allowStaleData) { - this.allowStaleData = allowStaleData; - setAllowStaleDataIsSet(true); - return this; - } - - public void unsetAllowStaleData() { - __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __ALLOWSTALEDATA_ISSET_ID); - } - - /** Returns true if field allowStaleData is set (has been assigned a value) and false otherwise */ - public boolean isSetAllowStaleData() { - return EncodingUtils.testBit(__isset_bitfield, __ALLOWSTALEDATA_ISSET_ID); - } - - public void setAllowStaleDataIsSet(boolean value) { - __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __ALLOWSTALEDATA_ISSET_ID, value); - } - - /** * Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 * records and you want the first 100, then this value is 0. If you want records 300-400 then this * value would be 300. If startRecord is beyond the end of the row, the row will be null in the @@ -771,14 +722,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } break; - case ALLOW_STALE_DATA: - if (value == null) { - unsetAllowStaleData(); - } else { - setAllowStaleData((Boolean)value); - } - break; - case START_RECORD: if (value == null) { unsetStartRecord(); @@ -826,9 +769,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S case COLUMNS_TO_FETCH: return getColumnsToFetch(); - case ALLOW_STALE_DATA: - return Boolean.valueOf(isAllowStaleData()); - case START_RECORD: return Integer.valueOf(getStartRecord()); @@ -861,8 +801,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return isSetColumnFamiliesToFetch(); case COLUMNS_TO_FETCH: return isSetColumnsToFetch(); - case ALLOW_STALE_DATA: - return isSetAllowStaleData(); case START_RECORD: return isSetStartRecord(); case MAX_RECORDS_TO_FETCH: @@ -940,15 +878,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return false; } - boolean this_present_allowStaleData = true; - boolean that_present_allowStaleData = true; - if (this_present_allowStaleData || that_present_allowStaleData) { - if (!(this_present_allowStaleData && that_present_allowStaleData)) - return false; - if (this.allowStaleData != that.allowStaleData) - return false; - } - boolean this_present_startRecord = true; boolean that_present_startRecord = true; if (this_present_startRecord || that_present_startRecord) { @@ -1052,16 +981,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S return lastComparison; } } - lastComparison = Boolean.valueOf(isSetAllowStaleData()).compareTo(typedOther.isSetAllowStaleData()); - if (lastComparison != 0) { - return lastComparison; - } - if (isSetAllowStaleData()) { - lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.allowStaleData, typedOther.allowStaleData); - if (lastComparison != 0) { - return lastComparison; - } - } lastComparison = Boolean.valueOf(isSetStartRecord()).compareTo(typedOther.isSetStartRecord()); if (lastComparison != 0) { return lastComparison; @@ -1156,10 +1075,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } first = false; if (!first) sb.append(", "); - sb.append("allowStaleData:"); - sb.append(this.allowStaleData); - first = false; - if (!first) sb.append(", "); sb.append("startRecord:"); sb.append(this.startRecord); first = false; @@ -1303,14 +1218,6 @@ 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 7: // ALLOW_STALE_DATA - if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.BOOL) { - struct.allowStaleData = iprot.readBool(); - struct.setAllowStaleDataIsSet(true); - } else { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); - } - break; case 8: // START_RECORD if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) { struct.startRecord = iprot.readI32(); @@ -1401,9 +1308,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } oprot.writeFieldEnd(); } - oprot.writeFieldBegin(ALLOW_STALE_DATA_FIELD_DESC); - oprot.writeBool(struct.allowStaleData); - oprot.writeFieldEnd(); oprot.writeFieldBegin(START_RECORD_FIELD_DESC); oprot.writeI32(struct.startRecord); oprot.writeFieldEnd(); @@ -1451,19 +1355,16 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S if (struct.isSetColumnsToFetch()) { optionals.set(5); } - if (struct.isSetAllowStaleData()) { - optionals.set(6); - } if (struct.isSetStartRecord()) { - optionals.set(7); + optionals.set(6); } if (struct.isSetMaxRecordsToFetch()) { - optionals.set(8); + optionals.set(7); } if (struct.isSetHighlightOptions()) { - optionals.set(9); + optionals.set(8); } - oprot.writeBitSet(optionals, 10); + oprot.writeBitSet(optionals, 9); if (struct.isSetRecordOnly()) { oprot.writeBool(struct.recordOnly); } @@ -1501,9 +1402,6 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S } } } - if (struct.isSetAllowStaleData()) { - oprot.writeBool(struct.allowStaleData); - } if (struct.isSetStartRecord()) { oprot.writeI32(struct.startRecord); } @@ -1518,7 +1416,7 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S @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(10); + BitSet incoming = iprot.readBitSet(9); if (incoming.get(0)) { struct.recordOnly = iprot.readBool(); struct.setRecordOnlyIsSet(true); @@ -1573,18 +1471,14 @@ public class Selector implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<S struct.setColumnsToFetchIsSet(true); } if (incoming.get(6)) { - struct.allowStaleData = iprot.readBool(); - struct.setAllowStaleDataIsSet(true); - } - if (incoming.get(7)) { struct.startRecord = iprot.readI32(); struct.setStartRecordIsSet(true); } - if (incoming.get(8)) { + if (incoming.get(7)) { struct.maxRecordsToFetch = iprot.readI32(); struct.setMaxRecordsToFetchIsSet(true); } - if (incoming.get(9)) { + if (incoming.get(8)) { struct.highlightOptions = new HighlightOptions(); struct.highlightOptions.read(iprot); struct.setHighlightOptionsIsSet(true); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/distribution/src/main/scripts/interface/gen-js/Blur_types.js ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-js/Blur_types.js b/distribution/src/main/scripts/interface/gen-js/Blur_types.js index f687938..a64f31c 100644 --- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js +++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js @@ -609,7 +609,6 @@ Selector = function(args) { this.recordId = null; this.columnFamiliesToFetch = null; this.columnsToFetch = null; - this.allowStaleData = null; this.startRecord = 0; this.maxRecordsToFetch = 1000; this.highlightOptions = null; @@ -632,9 +631,6 @@ Selector = function(args) { if (args.columnsToFetch !== undefined) { this.columnsToFetch = args.columnsToFetch; } - if (args.allowStaleData !== undefined) { - this.allowStaleData = args.allowStaleData; - } if (args.startRecord !== undefined) { this.startRecord = args.startRecord; } @@ -750,13 +746,6 @@ Selector.prototype.read = function(input) { input.skip(ftype); } break; - case 7: - if (ftype == Thrift.Type.BOOL) { - this.allowStaleData = input.readBool().value; - } else { - input.skip(ftype); - } - break; case 8: if (ftype == Thrift.Type.I32) { this.startRecord = input.readI32().value; @@ -848,11 +837,6 @@ Selector.prototype.write = function(output) { output.writeMapEnd(); output.writeFieldEnd(); } - if (this.allowStaleData !== null && this.allowStaleData !== undefined) { - output.writeFieldBegin('allowStaleData', Thrift.Type.BOOL, 7); - output.writeBool(this.allowStaleData); - output.writeFieldEnd(); - } if (this.startRecord !== null && this.startRecord !== undefined) { output.writeFieldBegin('startRecord', Thrift.Type.I32, 8); output.writeI32(this.startRecord); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm index 3683e56..58a3fa5 100644 --- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm +++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm @@ -670,7 +670,7 @@ sub write { package Blur::Selector; use base qw(Class::Accessor); -Blur::Selector->mk_accessors( qw( recordOnly locationId rowId recordId columnFamiliesToFetch columnsToFetch allowStaleData startRecord maxRecordsToFetch highlightOptions ) ); +Blur::Selector->mk_accessors( qw( recordOnly locationId rowId recordId columnFamiliesToFetch columnsToFetch startRecord maxRecordsToFetch highlightOptions ) ); sub new { my $classname = shift; @@ -682,7 +682,6 @@ sub new { $self->{recordId} = undef; $self->{columnFamiliesToFetch} = undef; $self->{columnsToFetch} = undef; - $self->{allowStaleData} = undef; $self->{startRecord} = 0; $self->{maxRecordsToFetch} = 1000; $self->{highlightOptions} = undef; @@ -705,9 +704,6 @@ sub new { if (defined $vals->{columnsToFetch}) { $self->{columnsToFetch} = $vals->{columnsToFetch}; } - if (defined $vals->{allowStaleData}) { - $self->{allowStaleData} = $vals->{allowStaleData}; - } if (defined $vals->{startRecord}) { $self->{startRecord} = $vals->{startRecord}; } @@ -815,12 +811,6 @@ sub read { $xfer += $input->skip($ftype); } last; }; - /^7$/ && do{ if ($ftype == TType::BOOL) { - $xfer += $input->readBool(\$self->{allowStaleData}); - } else { - $xfer += $input->skip($ftype); - } - last; }; /^8$/ && do{ if ($ftype == TType::I32) { $xfer += $input->readI32(\$self->{startRecord}); } else { @@ -910,11 +900,6 @@ sub write { } $xfer += $output->writeFieldEnd(); } - if (defined $self->{allowStaleData}) { - $xfer += $output->writeFieldBegin('allowStaleData', TType::BOOL, 7); - $xfer += $output->writeBool($self->{allowStaleData}); - $xfer += $output->writeFieldEnd(); - } if (defined $self->{startRecord}) { $xfer += $output->writeFieldBegin('startRecord', TType::I32, 8); $xfer += $output->writeI32($self->{startRecord}); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb index 49c61fb..70f1082 100644 --- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb +++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb @@ -243,7 +243,6 @@ module Blur RECORDID = 4 COLUMNFAMILIESTOFETCH = 5 COLUMNSTOFETCH = 6 - ALLOWSTALEDATA = 7 STARTRECORD = 8 MAXRECORDSTOFETCH = 9 HIGHLIGHTOPTIONS = 10 @@ -262,8 +261,6 @@ module Blur COLUMNFAMILIESTOFETCH => {:type => ::Thrift::Types::LIST, :name => 'columnFamiliesToFetch', :element => {:type => ::Thrift::Types::STRING}}, # The columns in the families to fetch. If null, fetch all. If empty, fetch none. COLUMNSTOFETCH => {:type => ::Thrift::Types::MAP, :name => 'columnsToFetch', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::SET, :element => {:type => ::Thrift::Types::STRING}}}, - # @deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. - ALLOWSTALEDATA => {:type => ::Thrift::Types::BOOL, :name => 'allowStaleData'}, # Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 # records and you want the first 100, then this value is 0. If you want records 300-400 then this # value would be 300. If startRecord is beyond the end of the row, the row will be null in the http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/4deaff2a/docs/Blur.html ---------------------------------------------------------------------- diff --git a/docs/Blur.html b/docs/Blur.html index d611254..be57f80 100644 --- a/docs/Blur.html +++ b/docs/Blur.html @@ -314,8 +314,6 @@ The location id of the Record or Row to be fetched. </td><td>default</td><td></td></tr> <tr><td>6</td><td>columnsToFetch</td><td><code>map<<code>string</code>, <code>set<<code>string</code>></code>></code></td><td>The columns in the families to fetch. If null, fetch all. If empty, fetch none. </td><td>default</td><td></td></tr> -<tr><td>7</td><td>allowStaleData</td><td><code>bool</code></td><td>@deprecated This value is no longer used. This allows the fetch to see the most current data that has been added to the table. -</td><td>default</td><td></td></tr> <tr><td>8</td><td>startRecord</td><td><code>i32</code></td><td>Only valid for Row fetches, the record in the row to start fetching. If the row contains 1000 records and you want the first 100, then this value is 0. If you want records 300-400 then this value would be 300. If startRecord is beyond the end of the row, the row will be null in the
