added status field to BlurQueryStatus to indicate whether the UUID is valid or not
Signed-off-by: Aaron McCurry <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-blur/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-blur/commit/26ea6f16 Tree: http://git-wip-us.apache.org/repos/asf/incubator-blur/tree/26ea6f16 Diff: http://git-wip-us.apache.org/repos/asf/incubator-blur/diff/26ea6f16 Branch: refs/heads/0.2.0-newtypesystem Commit: 26ea6f168c168f343854e0aa6e2ead4718e95528 Parents: 8920000 Author: Rahul Challapalli <[email protected]> Authored: Tue Aug 6 00:16:33 2013 -0700 Committer: Aaron McCurry <[email protected]> Committed: Wed Aug 7 21:33:16 2013 -0400 ---------------------------------------------------------------------- .../blur/manager/status/MergerQueryStatus.java | 8 ++ .../blur/manager/status/QueryStatusManager.java | 1 + .../org/apache/blur/thrift/BlurShardServer.java | 6 +- .../blur/thrift/generated/BlurQueryStatus.java | 128 ++++++++++++++++++- .../apache/blur/thrift/generated/Status.java | 68 ++++++++++ .../src/main/scripts/interface/Blur.thrift | 13 ++ .../main/scripts/interface/gen-html/Blur.html | 10 ++ .../main/scripts/interface/gen-html/index.html | 1 + .../blur/thrift/generated/BlurQueryStatus.java | 128 ++++++++++++++++++- .../apache/blur/thrift/generated/Status.java | 68 ++++++++++ .../main/scripts/interface/gen-js/Blur_types.js | 20 +++ .../scripts/interface/gen-perl/Blur/Types.pm | 20 ++- .../main/scripts/interface/gen-rb/blur_types.rb | 15 ++- 13 files changed, 475 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java b/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java index 1d7197d..e5c98da 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java +++ b/blur-core/src/main/java/org/apache/blur/manager/status/MergerQueryStatus.java @@ -27,6 +27,7 @@ import org.apache.blur.thrift.generated.BlurException; import org.apache.blur.thrift.generated.BlurQueryStatus; import org.apache.blur.thrift.generated.CpuTime; import org.apache.blur.thrift.generated.QueryState; +import org.apache.blur.thrift.generated.Status; import org.apache.blur.utils.BlurExecutorCompletionService; import org.apache.blur.utils.ForkJoin.Merger; @@ -62,6 +63,13 @@ public class MergerQueryStatus implements Merger<List<BlurQueryStatus>> { } public static BlurQueryStatus merge(BlurQueryStatus s1, BlurQueryStatus s2) { + // Depending on the timing the status can be cleared (NOT_FOUND) on one shard server and not the other + if (s1.status == Status.NOT_FOUND) { + return s2; + } + if (s2.status == Status.NOT_FOUND) { + return s1; + } s1.completeShards = s1.completeShards + s2.completeShards; s1.totalShards = s1.totalShards + s2.totalShards; if (s1.state != s2.state) { http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java b/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java index 438e264..4ae4206 100644 --- a/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java +++ b/blur-core/src/main/java/org/apache/blur/manager/status/QueryStatusManager.java @@ -32,6 +32,7 @@ import org.apache.blur.log.LogFactory; import org.apache.blur.thrift.generated.BlurQuery; import org.apache.blur.thrift.generated.BlurQueryStatus; import org.apache.blur.thrift.generated.QueryState; +import org.apache.blur.thrift.generated.Status; import org.apache.blur.utils.GCWatcher; import org.apache.blur.utils.GCWatcher.Action; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java ---------------------------------------------------------------------- diff --git a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java index f133dc0..b944290 100644 --- a/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java +++ b/blur-core/src/main/java/org/apache/blur/thrift/BlurShardServer.java @@ -53,6 +53,7 @@ import org.apache.blur.thrift.generated.Schema; import org.apache.blur.thrift.generated.Selector; import org.apache.blur.thrift.generated.ShardState; import org.apache.blur.thrift.generated.SimpleQuery; +import org.apache.blur.thrift.generated.Status; import org.apache.blur.thrift.generated.TableStats; import org.apache.blur.utils.BlurConstants; import org.apache.blur.utils.BlurUtil; @@ -377,7 +378,10 @@ public class BlurShardServer extends TableAdmin implements Iface { throw new BException(e.getMessage(), e); } if (blurQueryStatus == null) { - throw new BException("Query status for table [" + table + "] and uuid [" + uuid + "] not found"); + blurQueryStatus = new BlurQueryStatus(); + blurQueryStatus.status = Status.NOT_FOUND; + } else { + blurQueryStatus.status = Status.FOUND; } return blurQueryStatus; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java index d7ade13..aa44d35 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurQueryStatus.java @@ -63,6 +63,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TOTAL_SHARDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("totalShards", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)4); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STATE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("state", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)5); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField UUID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("uuid", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)6); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STATUS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("status", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -100,6 +101,12 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. * The uuid of the query. */ public long uuid; // required + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + public Status status; // 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 { @@ -132,7 +139,13 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. /** * The uuid of the query. */ - UUID((short)6, "uuid"); + UUID((short)6, "uuid"), + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + STATUS((short)7, "status"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -159,6 +172,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return STATE; case 6: // UUID return UUID; + case 7: // STATUS + return STATUS; default: return null; } @@ -220,6 +235,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.EnumMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.ENUM, QueryState.class))); tmpMap.put(_Fields.UUID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("uuid", 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.I64))); + tmpMap.put(_Fields.STATUS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("status", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, + new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.EnumMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.ENUM, Status.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurQueryStatus.class, metaDataMap); } @@ -233,7 +250,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. int completeShards, int totalShards, QueryState state, - long uuid) + long uuid, + Status status) { this(); this.query = query; @@ -245,6 +263,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. this.state = state; this.uuid = uuid; setUuidIsSet(true); + this.status = status; } /** @@ -276,6 +295,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. this.state = other.state; } this.uuid = other.uuid; + if (other.isSetStatus()) { + this.status = other.status; + } } public BlurQueryStatus deepCopy() { @@ -293,6 +315,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. this.state = null; setUuidIsSet(false); this.uuid = 0; + this.status = null; } /** @@ -495,6 +518,40 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value); } + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + public Status getStatus() { + return this.status; + } + + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + public BlurQueryStatus setStatus(Status status) { + this.status = status; + return this; + } + + public void unsetStatus() { + this.status = null; + } + + /** Returns true if field status is set (has been assigned a value) and false otherwise */ + public boolean isSetStatus() { + return this.status != null; + } + + public void setStatusIsSet(boolean value) { + if (!value) { + this.status = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case QUERY: @@ -545,6 +602,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. } break; + case STATUS: + if (value == null) { + unsetStatus(); + } else { + setStatus((Status)value); + } + break; + } } @@ -568,6 +633,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. case UUID: return Long.valueOf(getUuid()); + case STATUS: + return getStatus(); + } throw new IllegalStateException(); } @@ -591,6 +659,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return isSetState(); case UUID: return isSetUuid(); + case STATUS: + return isSetStatus(); } throw new IllegalStateException(); } @@ -662,6 +732,15 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return false; } + boolean this_present_status = true && this.isSetStatus(); + boolean that_present_status = true && that.isSetStatus(); + if (this_present_status || that_present_status) { + if (!(this_present_status && that_present_status)) + return false; + if (!this.status.equals(that.status)) + return false; + } + return true; } @@ -738,6 +817,16 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return lastComparison; } } + lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStatus()) { + lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.status, typedOther.status); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -793,6 +882,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. sb.append("uuid:"); sb.append(this.uuid); first = false; + if (!first) sb.append(", "); + sb.append("status:"); + if (this.status == null) { + sb.append("null"); + } else { + sb.append(this.status); + } + first = false; sb.append(")"); return sb.toString(); } @@ -903,6 +1000,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // STATUS + if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) { + struct.status = Status.findByValue(iprot.readI32()); + struct.setStatusIsSet(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); } @@ -950,6 +1055,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. oprot.writeFieldBegin(UUID_FIELD_DESC); oprot.writeI64(struct.uuid); oprot.writeFieldEnd(); + if (struct.status != null) { + oprot.writeFieldBegin(STATUS_FIELD_DESC); + oprot.writeI32(struct.status.getValue()); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -986,7 +1096,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. if (struct.isSetUuid()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetStatus()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetQuery()) { struct.query.write(oprot); } @@ -1012,12 +1125,15 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. if (struct.isSetUuid()) { oprot.writeI64(struct.uuid); } + if (struct.isSetStatus()) { + oprot.writeI32(struct.status.getValue()); + } } @Override public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurQueryStatus struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.query = new BlurQuery(); struct.query.read(iprot); @@ -1055,6 +1171,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. struct.uuid = iprot.readI64(); struct.setUuidIsSet(true); } + if (incoming.get(6)) { + struct.status = Status.findByValue(iprot.readI32()); + struct.setStatusIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Status.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Status.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Status.java new file mode 100644 index 0000000..7c3e0c2 --- /dev/null +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Status.java @@ -0,0 +1,68 @@ +/** + * Autogenerated by Thrift Compiler (0.9.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.blur.thrift.generated; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + + + +import java.util.Map; +import java.util.HashMap; +import org.apache.blur.thirdparty.thrift_0_9_0.TEnum; + +/** + * NOT_FOUND : when UUID is not found<br/><br/> + * FOUND : when UUID is present<br/> + */ +public enum Status implements org.apache.blur.thirdparty.thrift_0_9_0.TEnum { + NOT_FOUND(0), + FOUND(1); + + private final int value; + + private Status(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static Status findByValue(int value) { + switch (value) { + case 0: + return NOT_FOUND; + case 1: + return FOUND; + default: + return null; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/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 8c4d2c2..a005b34 100644 --- a/distribution/src/main/scripts/interface/Blur.thrift +++ b/distribution/src/main/scripts/interface/Blur.thrift @@ -72,6 +72,15 @@ enum QueryState { } /** + * NOT_FOUND : when UUID is not found<br/><br/> + * FOUND : when UUID is present<br/> + */ +enum Status { + NOT_FOUND, + FOUND +} + +/** * Specifies the type of Row mutation that should occur during a mutation of a given Row.<br/><br/> * DELETE_ROW - Indicates that the entire Row is to be deleted. No changes are made if the specified row does not exist.<br/><br/> * REPLACE_ROW - Indicates that the entire Row is to be deleted, and then a new Row with the same id is to be added. If the specified row does not exist, the new row will still be created.<br/><br/> @@ -541,6 +550,10 @@ struct BlurQueryStatus { * The uuid of the query. */ 6:i64 uuid + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + */ + 7:Status status } /** http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/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 a1b31d8..e94a8cd 100644 --- a/distribution/src/main/scripts/interface/gen-html/Blur.html +++ b/distribution/src/main/scripts/interface/gen-html/Blur.html @@ -75,6 +75,7 @@ <a href="Blur.html#Struct_Selector">Selector</a><br/> <a href="Blur.html#Enum_ShardState">ShardState</a><br/> <a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a><br/> +<a href="Blur.html#Enum_Status">Status</a><br/> <a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a><br/> <a href="Blur.html#Struct_TableStats">TableStats</a><br/> </td> @@ -111,6 +112,13 @@ COMPLETE - Query is complete.<br/> <tr><td><code>COMPLETE</code></td><td><code>2</code></td></tr> <tr><td><code>BACK_PRESSURE_INTERRUPTED</code></td><td><code>3</code></td></tr> </table></div> +<div class="definition"><h3 id="Enum_Status">Enumeration: Status</h3> +NOT_FOUND : when UUID is not found<br/><br/> +FOUND : when UUID is present<br/> +<br/><br/><table class="table-bordered table-striped table-condensed"> +<tr><td><code>NOT_FOUND</code></td><td><code>0</code></td></tr> +<tr><td><code>FOUND</code></td><td><code>1</code></td></tr> +</table></div> <div class="definition"><h3 id="Enum_RowMutationType">Enumeration: RowMutationType</h3> Specifies the type of Row mutation that should occur during a mutation of a given Row.<br/><br/> DELETE_ROW - Indicates that the entire Row is to be deleted. No changes are made if the specified row does not exist.<br/><br/> @@ -375,6 +383,8 @@ the controller will aggregate all the shard server totals together. </td><td>default</td><td></td></tr> <tr><td>6</td><td>uuid</td><td><code>i64</code></td><td>The uuid of the query. </td><td>default</td><td></td></tr> +<tr><td>7</td><td>status</td><td><code><a href="Blur.html#Enum_Status">Status</a></code></td><td>The status of the query NOT_FOUND if uuid is not found else FOUND +</td><td>default</td><td></td></tr> </table><br/>The BlurQueryStatus object hold the status of BlurQueries. The state of the query (QueryState), the number of shards the query is executing against, the number of shards that are complete, etc. http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/distribution/src/main/scripts/interface/gen-html/index.html ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-html/index.html b/distribution/src/main/scripts/interface/gen-html/index.html index 8ff76b0..ca10dc9 100644 --- a/distribution/src/main/scripts/interface/gen-html/index.html +++ b/distribution/src/main/scripts/interface/gen-html/index.html @@ -71,6 +71,7 @@ <a href="Blur.html#Struct_Selector">Selector</a><br/> <a href="Blur.html#Enum_ShardState">ShardState</a><br/> <a href="Blur.html#Struct_SimpleQuery">SimpleQuery</a><br/> +<a href="Blur.html#Enum_Status">Status</a><br/> <a href="Blur.html#Struct_TableDescriptor">TableDescriptor</a><br/> <a href="Blur.html#Struct_TableStats">TableStats</a><br/> </td> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java index d7ade13..aa44d35 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurQueryStatus.java @@ -63,6 +63,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TOTAL_SHARDS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("totalShards", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)4); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STATE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("state", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)5); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField UUID_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("uuid", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I64, (short)6); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField STATUS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("status", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32, (short)7); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -100,6 +101,12 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. * The uuid of the query. */ public long uuid; // required + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + public Status status; // 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 { @@ -132,7 +139,13 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. /** * The uuid of the query. */ - UUID((short)6, "uuid"); + UUID((short)6, "uuid"), + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + STATUS((short)7, "status"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -159,6 +172,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return STATE; case 6: // UUID return UUID; + case 7: // STATUS + return STATUS; default: return null; } @@ -220,6 +235,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.EnumMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.ENUM, QueryState.class))); tmpMap.put(_Fields.UUID, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("uuid", 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.I64))); + tmpMap.put(_Fields.STATUS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("status", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, + new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.EnumMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.ENUM, Status.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurQueryStatus.class, metaDataMap); } @@ -233,7 +250,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. int completeShards, int totalShards, QueryState state, - long uuid) + long uuid, + Status status) { this(); this.query = query; @@ -245,6 +263,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. this.state = state; this.uuid = uuid; setUuidIsSet(true); + this.status = status; } /** @@ -276,6 +295,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. this.state = other.state; } this.uuid = other.uuid; + if (other.isSetStatus()) { + this.status = other.status; + } } public BlurQueryStatus deepCopy() { @@ -293,6 +315,7 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. this.state = null; setUuidIsSet(false); this.uuid = 0; + this.status = null; } /** @@ -495,6 +518,40 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __UUID_ISSET_ID, value); } + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + public Status getStatus() { + return this.status; + } + + /** + * The status of the query NOT_FOUND if uuid is not found else FOUND + * + * @see Status + */ + public BlurQueryStatus setStatus(Status status) { + this.status = status; + return this; + } + + public void unsetStatus() { + this.status = null; + } + + /** Returns true if field status is set (has been assigned a value) and false otherwise */ + public boolean isSetStatus() { + return this.status != null; + } + + public void setStatusIsSet(boolean value) { + if (!value) { + this.status = null; + } + } + public void setFieldValue(_Fields field, Object value) { switch (field) { case QUERY: @@ -545,6 +602,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. } break; + case STATUS: + if (value == null) { + unsetStatus(); + } else { + setStatus((Status)value); + } + break; + } } @@ -568,6 +633,9 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. case UUID: return Long.valueOf(getUuid()); + case STATUS: + return getStatus(); + } throw new IllegalStateException(); } @@ -591,6 +659,8 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return isSetState(); case UUID: return isSetUuid(); + case STATUS: + return isSetStatus(); } throw new IllegalStateException(); } @@ -662,6 +732,15 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return false; } + boolean this_present_status = true && this.isSetStatus(); + boolean that_present_status = true && that.isSetStatus(); + if (this_present_status || that_present_status) { + if (!(this_present_status && that_present_status)) + return false; + if (!this.status.equals(that.status)) + return false; + } + return true; } @@ -738,6 +817,16 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. return lastComparison; } } + lastComparison = Boolean.valueOf(isSetStatus()).compareTo(typedOther.isSetStatus()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetStatus()) { + lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.status, typedOther.status); + if (lastComparison != 0) { + return lastComparison; + } + } return 0; } @@ -793,6 +882,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. sb.append("uuid:"); sb.append(this.uuid); first = false; + if (!first) sb.append(", "); + sb.append("status:"); + if (this.status == null) { + sb.append("null"); + } else { + sb.append(this.status); + } + first = false; sb.append(")"); return sb.toString(); } @@ -903,6 +1000,14 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; + case 7: // STATUS + if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.I32) { + struct.status = Status.findByValue(iprot.readI32()); + struct.setStatusIsSet(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); } @@ -950,6 +1055,11 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. oprot.writeFieldBegin(UUID_FIELD_DESC); oprot.writeI64(struct.uuid); oprot.writeFieldEnd(); + if (struct.status != null) { + oprot.writeFieldBegin(STATUS_FIELD_DESC); + oprot.writeI32(struct.status.getValue()); + oprot.writeFieldEnd(); + } oprot.writeFieldStop(); oprot.writeStructEnd(); } @@ -986,7 +1096,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. if (struct.isSetUuid()) { optionals.set(5); } - oprot.writeBitSet(optionals, 6); + if (struct.isSetStatus()) { + optionals.set(6); + } + oprot.writeBitSet(optionals, 7); if (struct.isSetQuery()) { struct.query.write(oprot); } @@ -1012,12 +1125,15 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. if (struct.isSetUuid()) { oprot.writeI64(struct.uuid); } + if (struct.isSetStatus()) { + oprot.writeI32(struct.status.getValue()); + } } @Override public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, BlurQueryStatus struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(6); + BitSet incoming = iprot.readBitSet(7); if (incoming.get(0)) { struct.query = new BlurQuery(); struct.query.read(iprot); @@ -1055,6 +1171,10 @@ public class BlurQueryStatus implements org.apache.blur.thirdparty.thrift_0_9_0. struct.uuid = iprot.readI64(); struct.setUuidIsSet(true); } + if (incoming.get(6)) { + struct.status = Status.findByValue(iprot.readI32()); + struct.setStatusIsSet(true); + } } } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Status.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Status.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Status.java new file mode 100644 index 0000000..7c3e0c2 --- /dev/null +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Status.java @@ -0,0 +1,68 @@ +/** + * Autogenerated by Thrift Compiler (0.9.0) + * + * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING + * @generated + */ +package org.apache.blur.thrift.generated; + +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + + + +import java.util.Map; +import java.util.HashMap; +import org.apache.blur.thirdparty.thrift_0_9_0.TEnum; + +/** + * NOT_FOUND : when UUID is not found<br/><br/> + * FOUND : when UUID is present<br/> + */ +public enum Status implements org.apache.blur.thirdparty.thrift_0_9_0.TEnum { + NOT_FOUND(0), + FOUND(1); + + private final int value; + + private Status(int value) { + this.value = value; + } + + /** + * Get the integer value of this enum value, as defined in the Thrift IDL. + */ + public int getValue() { + return value; + } + + /** + * Find a the enum type by its integer value, as defined in the Thrift IDL. + * @return null if the value is not found. + */ + public static Status findByValue(int value) { + switch (value) { + case 0: + return NOT_FOUND; + case 1: + return FOUND; + default: + return null; + } + } +} http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/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 e759354..57e8302 100644 --- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js +++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js @@ -22,6 +22,10 @@ QueryState = { 'COMPLETE' : 2, 'BACK_PRESSURE_INTERRUPTED' : 3 }; +Status = { +'NOT_FOUND' : 0, +'FOUND' : 1 +}; RowMutationType = { 'DELETE_ROW' : 0, 'REPLACE_ROW' : 1, @@ -2144,6 +2148,7 @@ BlurQueryStatus = function(args) { this.totalShards = null; this.state = null; this.uuid = null; + this.status = null; if (args) { if (args.query !== undefined) { this.query = args.query; @@ -2163,6 +2168,9 @@ BlurQueryStatus = function(args) { if (args.uuid !== undefined) { this.uuid = args.uuid; } + if (args.status !== undefined) { + this.status = args.status; + } } }; BlurQueryStatus.prototype = {}; @@ -2245,6 +2253,13 @@ BlurQueryStatus.prototype.read = function(input) { input.skip(ftype); } break; + case 7: + if (ftype == Thrift.Type.I32) { + this.status = input.readI32().value; + } else { + input.skip(ftype); + } + break; default: input.skip(ftype); } @@ -2296,6 +2311,11 @@ BlurQueryStatus.prototype.write = function(output) { output.writeI64(this.uuid); output.writeFieldEnd(); } + if (this.status !== null && this.status !== undefined) { + output.writeFieldBegin('status', Thrift.Type.I32, 7); + output.writeI32(this.status); + output.writeFieldEnd(); + } output.writeFieldStop(); output.writeStructEnd(); return; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/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 66b61e0..02ae25c 100644 --- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm +++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm @@ -23,6 +23,9 @@ use constant RUNNING => 0; use constant INTERRUPTED => 1; use constant COMPLETE => 2; use constant BACK_PRESSURE_INTERRUPTED => 3; +package Blur::Status; +use constant NOT_FOUND => 0; +use constant FOUND => 1; package Blur::RowMutationType; use constant DELETE_ROW => 0; use constant REPLACE_ROW => 1; @@ -2306,7 +2309,7 @@ sub write { package Blur::BlurQueryStatus; use base qw(Class::Accessor); -Blur::BlurQueryStatus->mk_accessors( qw( query cpuTimes completeShards totalShards state uuid ) ); +Blur::BlurQueryStatus->mk_accessors( qw( query cpuTimes completeShards totalShards state uuid status ) ); sub new { my $classname = shift; @@ -2318,6 +2321,7 @@ sub new { $self->{totalShards} = undef; $self->{state} = undef; $self->{uuid} = undef; + $self->{status} = undef; if (UNIVERSAL::isa($vals,'HASH')) { if (defined $vals->{query}) { $self->{query} = $vals->{query}; @@ -2337,6 +2341,9 @@ sub new { if (defined $vals->{uuid}) { $self->{uuid} = $vals->{uuid}; } + if (defined $vals->{status}) { + $self->{status} = $vals->{status}; + } } return bless ($self, $classname); } @@ -2413,6 +2420,12 @@ sub read { $xfer += $input->skip($ftype); } last; }; + /^7$/ && do{ if ($ftype == TType::I32) { + $xfer += $input->readI32(\$self->{status}); + } else { + $xfer += $input->skip($ftype); + } + last; }; $xfer += $input->skip($ftype); } $xfer += $input->readFieldEnd(); @@ -2465,6 +2478,11 @@ sub write { $xfer += $output->writeI64($self->{uuid}); $xfer += $output->writeFieldEnd(); } + if (defined $self->{status}) { + $xfer += $output->writeFieldBegin('status', TType::I32, 7); + $xfer += $output->writeI32($self->{status}); + $xfer += $output->writeFieldEnd(); + } $xfer += $output->writeFieldStop(); $xfer += $output->writeStructEnd(); return $xfer; http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/26ea6f16/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 f1f37e1..5f4dcf3 100644 --- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb +++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb @@ -34,6 +34,13 @@ module Blur VALID_VALUES = Set.new([RUNNING, INTERRUPTED, COMPLETE, BACK_PRESSURE_INTERRUPTED]).freeze end + module Status + NOT_FOUND = 0 + FOUND = 1 + VALUE_MAP = {0 => "NOT_FOUND", 1 => "FOUND"} + VALID_VALUES = Set.new([NOT_FOUND, FOUND]).freeze + end + module RowMutationType DELETE_ROW = 0 REPLACE_ROW = 1 @@ -589,6 +596,7 @@ module Blur TOTALSHARDS = 4 STATE = 5 UUID = 6 + STATUS = 7 FIELDS = { # The original query. @@ -606,7 +614,9 @@ module Blur # The state of the query. e.g. RUNNING, INTERRUPTED, COMPLETE STATE => {:type => ::Thrift::Types::I32, :name => 'state', :enum_class => ::Blur::QueryState}, # The uuid of the query. - UUID => {:type => ::Thrift::Types::I64, :name => 'uuid'} + UUID => {:type => ::Thrift::Types::I64, :name => 'uuid'}, + # The status of the query NOT_FOUND if uuid is not found else FOUND + STATUS => {:type => ::Thrift::Types::I32, :name => 'status', :enum_class => ::Blur::Status} } def struct_fields; FIELDS; end @@ -615,6 +625,9 @@ module Blur unless @state.nil? || ::Blur::QueryState::VALID_VALUES.include?(@state) raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field state!') end + unless @status.nil? || ::Blur::Status::VALID_VALUES.include?(@status) + raise ::Thrift::ProtocolException.new(::Thrift::ProtocolException::UNKNOWN, 'Invalid value of field status!') + end end ::Thrift::Struct.generate_accessors self
