http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurCommandResponse.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurCommandResponse.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurCommandResponse.java index 20e2ec6..f62aa2e 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurCommandResponse.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurCommandResponse.java @@ -51,11 +51,11 @@ import java.util.Arrays; public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<BlurCommandResponse, BlurCommandResponse._Fields> { 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("BlurCommandResponse"); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ADHOC_BYTE_CODE_COMMAND_RESPONSE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("adhocByteCodeCommandResponse", 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 AD_HOC_BYTE_CODE_COMMAND_RESPONSE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("adHocByteCodeCommandResponse", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1); /** 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 { - ADHOC_BYTE_CODE_COMMAND_RESPONSE((short)1, "adhocByteCodeCommandResponse"); + AD_HOC_BYTE_CODE_COMMAND_RESPONSE((short)1, "adHocByteCodeCommandResponse"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -70,8 +70,8 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // ADHOC_BYTE_CODE_COMMAND_RESPONSE - return ADHOC_BYTE_CODE_COMMAND_RESPONSE; + case 1: // AD_HOC_BYTE_CODE_COMMAND_RESPONSE + return AD_HOC_BYTE_CODE_COMMAND_RESPONSE; default: return null; } @@ -114,8 +114,8 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_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.ADHOC_BYTE_CODE_COMMAND_RESPONSE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("adhocByteCodeCommandResponse", 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, AdhocByteCodeCommandResponse.class))); + tmpMap.put(_Fields.AD_HOC_BYTE_CODE_COMMAND_RESPONSE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("adHocByteCodeCommandResponse", 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, AdHocByteCodeCommandResponse.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurCommandResponse.class, metaDataMap); } @@ -135,9 +135,9 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 return new BlurCommandResponse(this); } - public static BlurCommandResponse adhocByteCodeCommandResponse(AdhocByteCodeCommandResponse value) { + public static BlurCommandResponse adHocByteCodeCommandResponse(AdHocByteCodeCommandResponse value) { BlurCommandResponse x = new BlurCommandResponse(); - x.setAdhocByteCodeCommandResponse(value); + x.setAdHocByteCodeCommandResponse(value); return x; } @@ -145,11 +145,11 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 @Override protected void checkType(_Fields setField, Object value) throws ClassCastException { switch (setField) { - case ADHOC_BYTE_CODE_COMMAND_RESPONSE: - if (value instanceof AdhocByteCodeCommandResponse) { + case AD_HOC_BYTE_CODE_COMMAND_RESPONSE: + if (value instanceof AdHocByteCodeCommandResponse) { break; } - throw new ClassCastException("Was expecting value of type AdhocByteCodeCommandResponse for field 'adhocByteCodeCommandResponse', but got " + value.getClass().getSimpleName()); + throw new ClassCastException("Was expecting value of type AdHocByteCodeCommandResponse for field 'adHocByteCodeCommandResponse', but got " + value.getClass().getSimpleName()); default: throw new IllegalArgumentException("Unknown field id " + setField); } @@ -160,12 +160,12 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { - case ADHOC_BYTE_CODE_COMMAND_RESPONSE: - if (field.type == ADHOC_BYTE_CODE_COMMAND_RESPONSE_FIELD_DESC.type) { - AdhocByteCodeCommandResponse adhocByteCodeCommandResponse; - adhocByteCodeCommandResponse = new AdhocByteCodeCommandResponse(); - adhocByteCodeCommandResponse.read(iprot); - return adhocByteCodeCommandResponse; + case AD_HOC_BYTE_CODE_COMMAND_RESPONSE: + if (field.type == AD_HOC_BYTE_CODE_COMMAND_RESPONSE_FIELD_DESC.type) { + AdHocByteCodeCommandResponse adHocByteCodeCommandResponse; + adHocByteCodeCommandResponse = new AdHocByteCodeCommandResponse(); + adHocByteCodeCommandResponse.read(iprot); + return adHocByteCodeCommandResponse; } else { org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type); return null; @@ -181,9 +181,9 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 @Override protected void standardSchemeWriteValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { switch (setField_) { - case ADHOC_BYTE_CODE_COMMAND_RESPONSE: - AdhocByteCodeCommandResponse adhocByteCodeCommandResponse = (AdhocByteCodeCommandResponse)value_; - adhocByteCodeCommandResponse.write(oprot); + case AD_HOC_BYTE_CODE_COMMAND_RESPONSE: + AdHocByteCodeCommandResponse adHocByteCodeCommandResponse = (AdHocByteCodeCommandResponse)value_; + adHocByteCodeCommandResponse.write(oprot); return; default: throw new IllegalStateException("Cannot write union with unknown field " + setField_); @@ -195,11 +195,11 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 _Fields setField = _Fields.findByThriftId(fieldID); if (setField != null) { switch (setField) { - case ADHOC_BYTE_CODE_COMMAND_RESPONSE: - AdhocByteCodeCommandResponse adhocByteCodeCommandResponse; - adhocByteCodeCommandResponse = new AdhocByteCodeCommandResponse(); - adhocByteCodeCommandResponse.read(iprot); - return adhocByteCodeCommandResponse; + case AD_HOC_BYTE_CODE_COMMAND_RESPONSE: + AdHocByteCodeCommandResponse adHocByteCodeCommandResponse; + adHocByteCodeCommandResponse = new AdHocByteCodeCommandResponse(); + adHocByteCodeCommandResponse.read(iprot); + return adHocByteCodeCommandResponse; default: throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } @@ -211,9 +211,9 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 @Override protected void tupleSchemeWriteValue(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { switch (setField_) { - case ADHOC_BYTE_CODE_COMMAND_RESPONSE: - AdhocByteCodeCommandResponse adhocByteCodeCommandResponse = (AdhocByteCodeCommandResponse)value_; - adhocByteCodeCommandResponse.write(oprot); + case AD_HOC_BYTE_CODE_COMMAND_RESPONSE: + AdHocByteCodeCommandResponse adHocByteCodeCommandResponse = (AdHocByteCodeCommandResponse)value_; + adHocByteCodeCommandResponse.write(oprot); return; default: throw new IllegalStateException("Cannot write union with unknown field " + setField_); @@ -223,8 +223,8 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 @Override protected org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField getFieldDesc(_Fields setField) { switch (setField) { - case ADHOC_BYTE_CODE_COMMAND_RESPONSE: - return ADHOC_BYTE_CODE_COMMAND_RESPONSE_FIELD_DESC; + case AD_HOC_BYTE_CODE_COMMAND_RESPONSE: + return AD_HOC_BYTE_CODE_COMMAND_RESPONSE_FIELD_DESC; default: throw new IllegalArgumentException("Unknown field id " + setField); } @@ -245,22 +245,22 @@ public class BlurCommandResponse extends org.apache.blur.thirdparty.thrift_0_9_0 } - public AdhocByteCodeCommandResponse getAdhocByteCodeCommandResponse() { - if (getSetField() == _Fields.ADHOC_BYTE_CODE_COMMAND_RESPONSE) { - return (AdhocByteCodeCommandResponse)getFieldValue(); + public AdHocByteCodeCommandResponse getAdHocByteCodeCommandResponse() { + if (getSetField() == _Fields.AD_HOC_BYTE_CODE_COMMAND_RESPONSE) { + return (AdHocByteCodeCommandResponse)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'adhocByteCodeCommandResponse' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new RuntimeException("Cannot get field 'adHocByteCodeCommandResponse' because union is currently set to " + getFieldDesc(getSetField()).name); } } - public void setAdhocByteCodeCommandResponse(AdhocByteCodeCommandResponse value) { + public void setAdHocByteCodeCommandResponse(AdHocByteCodeCommandResponse value) { if (value == null) throw new NullPointerException(); - setField_ = _Fields.ADHOC_BYTE_CODE_COMMAND_RESPONSE; + setField_ = _Fields.AD_HOC_BYTE_CODE_COMMAND_RESPONSE; value_ = value; } - public boolean isSetAdhocByteCodeCommandResponse() { - return setField_ == _Fields.ADHOC_BYTE_CODE_COMMAND_RESPONSE; + public boolean isSetAdHocByteCodeCommandResponse() { + return setField_ == _Fields.AD_HOC_BYTE_CODE_COMMAND_RESPONSE; }
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurPlatform.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurPlatform.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurPlatform.java index 09f2732..491acfb 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurPlatform.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/BlurPlatform.java @@ -53,13 +53,13 @@ public class BlurPlatform { public interface Iface { - public BlurCommandResponse execute(BlurCommandRequest request) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException; + public BlurCommandResponse execute(String cluster, BlurCommandRequest request) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException; } public interface AsyncIface { - public void execute(BlurCommandRequest request, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException; + public void execute(String cluster, BlurCommandRequest request, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<AsyncClient.execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException; } @@ -83,15 +83,16 @@ public class BlurPlatform { super(iprot, oprot); } - public BlurCommandResponse execute(BlurCommandRequest request) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException + public BlurCommandResponse execute(String cluster, BlurCommandRequest request) throws BlurException, org.apache.blur.thirdparty.thrift_0_9_0.TException { - send_execute(request); + send_execute(cluster, request); return recv_execute(); } - public void send_execute(BlurCommandRequest request) throws org.apache.blur.thirdparty.thrift_0_9_0.TException + public void send_execute(String cluster, BlurCommandRequest request) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { execute_args args = new execute_args(); + args.setCluster(cluster); args.setRequest(request); sendBase("execute", args); } @@ -127,23 +128,26 @@ public class BlurPlatform { super(protocolFactory, clientManager, transport); } - public void execute(BlurCommandRequest request, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void execute(String cluster, BlurCommandRequest request, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { checkReady(); - execute_call method_call = new execute_call(request, resultHandler, this, ___protocolFactory, ___transport); + execute_call method_call = new execute_call(cluster, request, resultHandler, this, ___protocolFactory, ___transport); this.___currentMethod = method_call; ___manager.call(method_call); } public static class execute_call extends org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncMethodCall { + private String cluster; private BlurCommandRequest request; - public execute_call(BlurCommandRequest request, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public execute_call(String cluster, BlurCommandRequest request, org.apache.blur.thirdparty.thrift_0_9_0.async.AsyncMethodCallback<execute_call> resultHandler, org.apache.blur.thirdparty.thrift_0_9_0.async.TAsyncClient client, org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolFactory protocolFactory, org.apache.blur.thirdparty.thrift_0_9_0.transport.TNonblockingTransport transport) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { super(client, protocolFactory, transport, resultHandler, false); + this.cluster = cluster; this.request = request; } public void write_args(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { prot.writeMessageBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessage("execute", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMessageType.CALL, 0)); execute_args args = new execute_args(); + args.setCluster(cluster); args.setRequest(request); args.write(prot); prot.writeMessageEnd(); @@ -192,7 +196,7 @@ public class BlurPlatform { public execute_result getResult(I iface, execute_args args) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { execute_result result = new execute_result(); try { - result.success = iface.execute(args.request); + result.success = iface.execute(args.cluster, args.request); } catch (BlurException ex) { result.ex = ex; } @@ -205,7 +209,8 @@ public class BlurPlatform { public static class execute_args implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<execute_args, execute_args._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("execute_args"); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField REQUEST_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("request", 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 CLUSTER_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("cluster", 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 REQUEST_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("request", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -213,11 +218,13 @@ public class BlurPlatform { schemes.put(TupleScheme.class, new execute_argsTupleSchemeFactory()); } + public String cluster; // required public BlurCommandRequest request; // 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 { - REQUEST((short)1, "request"); + CLUSTER((short)1, "cluster"), + REQUEST((short)2, "request"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -232,7 +239,9 @@ public class BlurPlatform { */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // REQUEST + case 1: // CLUSTER + return CLUSTER; + case 2: // REQUEST return REQUEST; default: return null; @@ -277,6 +286,8 @@ public class BlurPlatform { 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.CLUSTER, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("cluster", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, + new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING))); tmpMap.put(_Fields.REQUEST, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("request", 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, BlurCommandRequest.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); @@ -287,9 +298,11 @@ public class BlurPlatform { } public execute_args( + String cluster, BlurCommandRequest request) { this(); + this.cluster = cluster; this.request = request; } @@ -297,6 +310,9 @@ public class BlurPlatform { * Performs a deep copy on <i>other</i>. */ public execute_args(execute_args other) { + if (other.isSetCluster()) { + this.cluster = other.cluster; + } if (other.isSetRequest()) { this.request = new BlurCommandRequest(other.request); } @@ -308,9 +324,34 @@ public class BlurPlatform { @Override public void clear() { + this.cluster = null; this.request = null; } + public String getCluster() { + return this.cluster; + } + + public execute_args setCluster(String cluster) { + this.cluster = cluster; + return this; + } + + public void unsetCluster() { + this.cluster = null; + } + + /** Returns true if field cluster is set (has been assigned a value) and false otherwise */ + public boolean isSetCluster() { + return this.cluster != null; + } + + public void setClusterIsSet(boolean value) { + if (!value) { + this.cluster = null; + } + } + public BlurCommandRequest getRequest() { return this.request; } @@ -337,6 +378,14 @@ public class BlurPlatform { public void setFieldValue(_Fields field, Object value) { switch (field) { + case CLUSTER: + if (value == null) { + unsetCluster(); + } else { + setCluster((String)value); + } + break; + case REQUEST: if (value == null) { unsetRequest(); @@ -350,6 +399,9 @@ public class BlurPlatform { public Object getFieldValue(_Fields field) { switch (field) { + case CLUSTER: + return getCluster(); + case REQUEST: return getRequest(); @@ -364,6 +416,8 @@ public class BlurPlatform { } switch (field) { + case CLUSTER: + return isSetCluster(); case REQUEST: return isSetRequest(); } @@ -383,6 +437,15 @@ public class BlurPlatform { if (that == null) return false; + boolean this_present_cluster = true && this.isSetCluster(); + boolean that_present_cluster = true && that.isSetCluster(); + if (this_present_cluster || that_present_cluster) { + if (!(this_present_cluster && that_present_cluster)) + return false; + if (!this.cluster.equals(that.cluster)) + return false; + } + boolean this_present_request = true && this.isSetRequest(); boolean that_present_request = true && that.isSetRequest(); if (this_present_request || that_present_request) { @@ -408,6 +471,16 @@ public class BlurPlatform { int lastComparison = 0; execute_args typedOther = (execute_args)other; + lastComparison = Boolean.valueOf(isSetCluster()).compareTo(typedOther.isSetCluster()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetCluster()) { + lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.cluster, typedOther.cluster); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetRequest()).compareTo(typedOther.isSetRequest()); if (lastComparison != 0) { return lastComparison; @@ -438,6 +511,14 @@ public class BlurPlatform { StringBuilder sb = new StringBuilder("execute_args("); boolean first = true; + sb.append("cluster:"); + if (this.cluster == null) { + sb.append("null"); + } else { + sb.append(this.cluster); + } + first = false; + if (!first) sb.append(", "); sb.append("request:"); if (this.request == null) { sb.append("null"); @@ -488,7 +569,15 @@ public class BlurPlatform { break; } switch (schemeField.id) { - case 1: // REQUEST + case 1: // CLUSTER + if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) { + struct.cluster = iprot.readString(); + struct.setClusterIsSet(true); + } else { + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // REQUEST if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT) { struct.request = new BlurCommandRequest(); struct.request.read(iprot); @@ -512,6 +601,11 @@ public class BlurPlatform { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.cluster != null) { + oprot.writeFieldBegin(CLUSTER_FIELD_DESC); + oprot.writeString(struct.cluster); + oprot.writeFieldEnd(); + } if (struct.request != null) { oprot.writeFieldBegin(REQUEST_FIELD_DESC); struct.request.write(oprot); @@ -535,10 +629,16 @@ public class BlurPlatform { public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, execute_args struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetRequest()) { + if (struct.isSetCluster()) { optionals.set(0); } - oprot.writeBitSet(optionals, 1); + if (struct.isSetRequest()) { + optionals.set(1); + } + oprot.writeBitSet(optionals, 2); + if (struct.isSetCluster()) { + oprot.writeString(struct.cluster); + } if (struct.isSetRequest()) { struct.request.write(oprot); } @@ -547,8 +647,12 @@ public class BlurPlatform { @Override public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, execute_args struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(1); + BitSet incoming = iprot.readBitSet(2); if (incoming.get(0)) { + struct.cluster = iprot.readString(); + struct.setClusterIsSet(true); + } + if (incoming.get(1)) { struct.request = new BlurCommandRequest(); struct.request.read(iprot); struct.setRequestIsSet(true); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Value.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Value.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Value.java index 8b35331..0797c91 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Value.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/Value.java @@ -49,6 +49,9 @@ import java.util.Arrays; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; +/** + * Value carries serialized values. + */ public class Value implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<Value, Value._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("Value"); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ValueType.java ---------------------------------------------------------------------- diff --git a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ValueType.java b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ValueType.java index 0facd0c..857b482 100644 --- a/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ValueType.java +++ b/blur-thrift/src/main/java/org/apache/blur/thrift/generated/ValueType.java @@ -30,6 +30,9 @@ import java.util.Map; import java.util.HashMap; import org.apache.blur.thirdparty.thrift_0_9_0.TEnum; +/** + * The type of the value, this determines how the bytes are interpreted. + */ public enum ValueType implements org.apache.blur.thirdparty.thrift_0_9_0.TEnum { STRING(0), INTEGER(1), http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/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 3f970cf..c785af6 100644 --- a/distribution/src/main/scripts/interface/Blur.thrift +++ b/distribution/src/main/scripts/interface/Blur.thrift @@ -830,6 +830,9 @@ enum Level { ALL } +/** + * The type of the value, this determines how the bytes are interpreted. + */ enum ValueType { STRING, INTEGER, @@ -841,34 +844,40 @@ enum ValueType { SERIALIZABLE } +/** + * Value carries serialized values. + */ struct Value { 1:ValueType type, 2:binary value } -struct AdhocByteCodeCommandRequest { - 1:list<Value> arguments, - 2:binary instanceData, - 3:map<string,binary> classData, - 4:list<string> libraries +/** + * Carries ad hoc byte code based execution commands. + */ +struct AdHocByteCodeCommandRequest { + 1:set<string> tablesToInvoke, + 2:list<Value> arguments, + 3:binary instanceData, + 4:map<string,binary> classData, + 5:list<string> libraries } -struct AdhocByteCodeCommandResponse { +struct AdHocByteCodeCommandResponse { 1:Value result } union BlurCommandRequest { - 1:set<string> tablesToInvoke, - 2:AdhocByteCodeCommandRequest adhocByteCodeCommandRequest + 1:AdHocByteCodeCommandRequest adHocByteCodeCommandRequest } union BlurCommandResponse { - 1:AdhocByteCodeCommandResponse adhocByteCodeCommandResponse + 1:AdHocByteCodeCommandResponse adHocByteCodeCommandResponse } service BlurPlatform { - BlurCommandResponse execute(1:BlurCommandRequest request) throws (1:BlurException ex) + BlurCommandResponse execute(1:string cluster, 2:BlurCommandRequest request) throws (1:BlurException ex) } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/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 3c6af09..193f833 100644 --- a/distribution/src/main/scripts/interface/gen-html/Blur.html +++ b/distribution/src/main/scripts/interface/gen-html/Blur.html @@ -61,8 +61,8 @@ <li><a href="Blur.html#Fn_Blur_traceRequestList">traceRequestList</a></li> </ul> </td> -<td><a href="Blur.html#Struct_AdhocByteCodeCommandRequest">AdhocByteCodeCommandRequest</a><br/> -<a href="Blur.html#Struct_AdhocByteCodeCommandResponse">AdhocByteCodeCommandResponse</a><br/> +<td><a href="Blur.html#Struct_AdHocByteCodeCommandRequest">AdHocByteCodeCommandRequest</a><br/> +<a href="Blur.html#Struct_AdHocByteCodeCommandResponse">AdHocByteCodeCommandResponse</a><br/> <a href="Blur.html#Struct_BlurCommandRequest">BlurCommandRequest</a><br/> <a href="Blur.html#Struct_BlurCommandResponse">BlurCommandResponse</a><br/> <a href="Blur.html#Struct_BlurException">BlurException</a><br/> @@ -214,7 +214,8 @@ Logging level enum used to change the logging levels at runtime. <tr><td><code>ALL</code></td><td><code>7</code></td></tr> </table></div> <div class="definition"><h3 id="Enum_ValueType">Enumeration: ValueType</h3> -<br/><table class="table-bordered table-striped table-condensed"> +The type of the value, this determines how the bytes are interpreted. +<br/><br/><table class="table-bordered table-striped table-condensed"> <tr><td><code>STRING</code></td><td><code>0</code></td></tr> <tr><td><code>INTEGER</code></td><td><code>1</code></td></tr> <tr><td><code>LONG</code></td><td><code>2</code></td></tr> @@ -599,26 +600,29 @@ be family dot column, "family.column". <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> <tr><td>1</td><td>type</td><td><code><a href="Blur.html#Enum_ValueType">ValueType</a></code></td><td></td><td>default</td><td></td></tr> <tr><td>2</td><td>value</td><td><code>binary</code></td><td></td><td>default</td><td></td></tr> -</table><br/></div><div class="definition"><h3 id="Struct_AdhocByteCodeCommandRequest">Struct: AdhocByteCodeCommandRequest</h3> +</table><br/>Value carries serialized values. +<br/></div><div class="definition"><h3 id="Struct_AdHocByteCodeCommandRequest">Struct: AdHocByteCodeCommandRequest</h3> <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> -<tr><td>1</td><td>arguments</td><td><code>list<<code><a href="Blur.html#Struct_Value">Value</a></code>></code></td><td></td><td>default</td><td></td></tr> -<tr><td>2</td><td>instanceData</td><td><code>binary</code></td><td></td><td>default</td><td></td></tr> -<tr><td>3</td><td>classData</td><td><code>map<<code>string</code>, <code>binary</code>></code></td><td></td><td>default</td><td></td></tr> -<tr><td>4</td><td>libraries</td><td><code>list<<code>string</code>></code></td><td></td><td>default</td><td></td></tr> -</table><br/></div><div class="definition"><h3 id="Struct_AdhocByteCodeCommandResponse">Struct: AdhocByteCodeCommandResponse</h3> +<tr><td>1</td><td>tablesToInvoke</td><td><code>set<<code>string</code>></code></td><td></td><td>default</td><td></td></tr> +<tr><td>2</td><td>arguments</td><td><code>list<<code><a href="Blur.html#Struct_Value">Value</a></code>></code></td><td></td><td>default</td><td></td></tr> +<tr><td>3</td><td>instanceData</td><td><code>binary</code></td><td></td><td>default</td><td></td></tr> +<tr><td>4</td><td>classData</td><td><code>map<<code>string</code>, <code>binary</code>></code></td><td></td><td>default</td><td></td></tr> +<tr><td>5</td><td>libraries</td><td><code>list<<code>string</code>></code></td><td></td><td>default</td><td></td></tr> +</table><br/>Carries ad hoc byte code based execution commands. +<br/></div><div class="definition"><h3 id="Struct_AdHocByteCodeCommandResponse">Struct: AdHocByteCodeCommandResponse</h3> <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> <tr><td>1</td><td>result</td><td><code><a href="Blur.html#Struct_Value">Value</a></code></td><td></td><td>default</td><td></td></tr> </table><br/></div><div class="definition"><h3 id="Struct_BlurCommandRequest">Struct: BlurCommandRequest</h3> <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> -<tr><td>1</td><td>tablesToInvoke</td><td><code>set<<code>string</code>></code></td><td></td><td>default</td><td></td></tr> -<tr><td>2</td><td>adhocByteCodeCommandRequest</td><td><code><a href="Blur.html#Struct_AdhocByteCodeCommandRequest">AdhocByteCodeCommandRequest</a></code></td><td></td><td>default</td><td></td></tr> +<tr><td>1</td><td>adHocByteCodeCommandRequest</td><td><code><a href="Blur.html#Struct_AdHocByteCodeCommandRequest">AdHocByteCodeCommandRequest</a></code></td><td></td><td>default</td><td></td></tr> </table><br/></div><div class="definition"><h3 id="Struct_BlurCommandResponse">Struct: BlurCommandResponse</h3> <table class="table-bordered table-striped table-condensed"><thead><th>Key</th><th>Field</th><th>Type</th><th>Description</th><th>Requiredness</th><th>Default value</th></thead> -<tr><td>1</td><td>adhocByteCodeCommandResponse</td><td><code><a href="Blur.html#Struct_AdhocByteCodeCommandResponse">AdhocByteCodeCommandResponse</a></code></td><td></td><td>default</td><td></td></tr> +<tr><td>1</td><td>adHocByteCodeCommandResponse</td><td><code><a href="Blur.html#Struct_AdHocByteCodeCommandResponse">AdHocByteCodeCommandResponse</a></code></td><td></td><td>default</td><td></td></tr> </table><br/></div><hr/><h2 id="Services">Services</h2> <h3 id="Svc_BlurPlatform">Service: BlurPlatform</h3> <div class="definition"><h4 id="Fn_BlurPlatform_execute">Function: BlurPlatform.execute</h4> -<pre><code><a href="Blur.html#Struct_BlurCommandResponse">BlurCommandResponse</a></code> execute(<code><a href="Blur.html#Struct_BlurCommandRequest">BlurCommandRequest</a></code> request) +<pre><code><a href="Blur.html#Struct_BlurCommandResponse">BlurCommandResponse</a></code> execute(<code>string</code> cluster, + <code><a href="Blur.html#Struct_BlurCommandRequest">BlurCommandRequest</a></code> request) throws <code><a href="Blur.html#Struct_BlurException">BlurException</a></code> </pre></div><h3 id="Svc_Blur">Service: Blur</h3> <div class="extends"><em>extends</em> <code><a href="Blur.html#Svc_BlurPlatform">BlurPlatform</a></code></div> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/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 2b13ba3..a14ac0d 100644 --- a/distribution/src/main/scripts/interface/gen-html/index.html +++ b/distribution/src/main/scripts/interface/gen-html/index.html @@ -57,8 +57,8 @@ <li><a href="Blur.html#Fn_Blur_traceRequestList">traceRequestList</a></li> </ul> </td> -<td><a href="Blur.html#Struct_AdhocByteCodeCommandRequest">AdhocByteCodeCommandRequest</a><br/> -<a href="Blur.html#Struct_AdhocByteCodeCommandResponse">AdhocByteCodeCommandResponse</a><br/> +<td><a href="Blur.html#Struct_AdHocByteCodeCommandRequest">AdHocByteCodeCommandRequest</a><br/> +<a href="Blur.html#Struct_AdHocByteCodeCommandResponse">AdHocByteCodeCommandResponse</a><br/> <a href="Blur.html#Struct_BlurCommandRequest">BlurCommandRequest</a><br/> <a href="Blur.html#Struct_BlurCommandResponse">BlurCommandResponse</a><br/> <a href="Blur.html#Struct_BlurException">BlurException</a><br/> http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandRequest.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandRequest.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandRequest.java index 7afcfe9..015ccf3 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandRequest.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandRequest.java @@ -49,20 +49,25 @@ import java.util.Arrays; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; -public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<AdhocByteCodeCommandRequest, AdhocByteCodeCommandRequest._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("AdhocByteCodeCommandRequest"); +/** + * Carries ad hoc byte code based execution commands. + */ +public class AdHocByteCodeCommandRequest implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<AdHocByteCodeCommandRequest, AdHocByteCodeCommandRequest._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("AdHocByteCodeCommandRequest"); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ARGUMENTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("arguments", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)1); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField INSTANCE_DATA_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("instanceData", 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 CLASS_DATA_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("classData", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)3); - private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField LIBRARIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("libraries", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)4); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField TABLES_TO_INVOKE_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("tablesToInvoke", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET, (short)1); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField ARGUMENTS_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("arguments", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)2); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField INSTANCE_DATA_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("instanceData", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, (short)3); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField CLASS_DATA_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("classData", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP, (short)4); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField LIBRARIES_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("libraries", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST, (short)5); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { - schemes.put(StandardScheme.class, new AdhocByteCodeCommandRequestStandardSchemeFactory()); - schemes.put(TupleScheme.class, new AdhocByteCodeCommandRequestTupleSchemeFactory()); + schemes.put(StandardScheme.class, new AdHocByteCodeCommandRequestStandardSchemeFactory()); + schemes.put(TupleScheme.class, new AdHocByteCodeCommandRequestTupleSchemeFactory()); } + public Set<String> tablesToInvoke; // required public List<Value> arguments; // required public ByteBuffer instanceData; // required public Map<String,ByteBuffer> classData; // required @@ -70,10 +75,11 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t /** 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 { - ARGUMENTS((short)1, "arguments"), - INSTANCE_DATA((short)2, "instanceData"), - CLASS_DATA((short)3, "classData"), - LIBRARIES((short)4, "libraries"); + TABLES_TO_INVOKE((short)1, "tablesToInvoke"), + ARGUMENTS((short)2, "arguments"), + INSTANCE_DATA((short)3, "instanceData"), + CLASS_DATA((short)4, "classData"), + LIBRARIES((short)5, "libraries"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -88,13 +94,15 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // ARGUMENTS + case 1: // TABLES_TO_INVOKE + return TABLES_TO_INVOKE; + case 2: // ARGUMENTS return ARGUMENTS; - case 2: // INSTANCE_DATA + case 3: // INSTANCE_DATA return INSTANCE_DATA; - case 3: // CLASS_DATA + case 4: // CLASS_DATA return CLASS_DATA; - case 4: // LIBRARIES + case 5: // LIBRARIES return LIBRARIES; default: return null; @@ -139,6 +147,9 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t 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.TABLES_TO_INVOKE, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("tablesToInvoke", org.apache.blur.thirdparty.thrift_0_9_0.TFieldRequirementType.DEFAULT, + 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.ARGUMENTS, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("arguments", 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, Value.class)))); @@ -152,19 +163,21 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t 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.FieldValueMetaData(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING)))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(AdhocByteCodeCommandRequest.class, metaDataMap); + org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(AdHocByteCodeCommandRequest.class, metaDataMap); } - public AdhocByteCodeCommandRequest() { + public AdHocByteCodeCommandRequest() { } - public AdhocByteCodeCommandRequest( + public AdHocByteCodeCommandRequest( + Set<String> tablesToInvoke, List<Value> arguments, ByteBuffer instanceData, Map<String,ByteBuffer> classData, List<String> libraries) { this(); + this.tablesToInvoke = tablesToInvoke; this.arguments = arguments; this.instanceData = instanceData; this.classData = classData; @@ -174,7 +187,14 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t /** * Performs a deep copy on <i>other</i>. */ - public AdhocByteCodeCommandRequest(AdhocByteCodeCommandRequest other) { + public AdHocByteCodeCommandRequest(AdHocByteCodeCommandRequest other) { + if (other.isSetTablesToInvoke()) { + Set<String> __this__tablesToInvoke = new HashSet<String>(); + for (String other_element : other.tablesToInvoke) { + __this__tablesToInvoke.add(other_element); + } + this.tablesToInvoke = __this__tablesToInvoke; + } if (other.isSetArguments()) { List<Value> __this__arguments = new ArrayList<Value>(); for (Value other_element : other.arguments) { @@ -211,18 +231,58 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t } } - public AdhocByteCodeCommandRequest deepCopy() { - return new AdhocByteCodeCommandRequest(this); + public AdHocByteCodeCommandRequest deepCopy() { + return new AdHocByteCodeCommandRequest(this); } @Override public void clear() { + this.tablesToInvoke = null; this.arguments = null; this.instanceData = null; this.classData = null; this.libraries = null; } + public int getTablesToInvokeSize() { + return (this.tablesToInvoke == null) ? 0 : this.tablesToInvoke.size(); + } + + public java.util.Iterator<String> getTablesToInvokeIterator() { + return (this.tablesToInvoke == null) ? null : this.tablesToInvoke.iterator(); + } + + public void addToTablesToInvoke(String elem) { + if (this.tablesToInvoke == null) { + this.tablesToInvoke = new HashSet<String>(); + } + this.tablesToInvoke.add(elem); + } + + public Set<String> getTablesToInvoke() { + return this.tablesToInvoke; + } + + public AdHocByteCodeCommandRequest setTablesToInvoke(Set<String> tablesToInvoke) { + this.tablesToInvoke = tablesToInvoke; + return this; + } + + public void unsetTablesToInvoke() { + this.tablesToInvoke = null; + } + + /** Returns true if field tablesToInvoke is set (has been assigned a value) and false otherwise */ + public boolean isSetTablesToInvoke() { + return this.tablesToInvoke != null; + } + + public void setTablesToInvokeIsSet(boolean value) { + if (!value) { + this.tablesToInvoke = null; + } + } + public int getArgumentsSize() { return (this.arguments == null) ? 0 : this.arguments.size(); } @@ -242,7 +302,7 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t return this.arguments; } - public AdhocByteCodeCommandRequest setArguments(List<Value> arguments) { + public AdHocByteCodeCommandRequest setArguments(List<Value> arguments) { this.arguments = arguments; return this; } @@ -271,12 +331,12 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t return instanceData; } - public AdhocByteCodeCommandRequest setInstanceData(byte[] instanceData) { + public AdHocByteCodeCommandRequest setInstanceData(byte[] instanceData) { setInstanceData(instanceData == null ? (ByteBuffer)null : ByteBuffer.wrap(instanceData)); return this; } - public AdhocByteCodeCommandRequest setInstanceData(ByteBuffer instanceData) { + public AdHocByteCodeCommandRequest setInstanceData(ByteBuffer instanceData) { this.instanceData = instanceData; return this; } @@ -311,7 +371,7 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t return this.classData; } - public AdhocByteCodeCommandRequest setClassData(Map<String,ByteBuffer> classData) { + public AdHocByteCodeCommandRequest setClassData(Map<String,ByteBuffer> classData) { this.classData = classData; return this; } @@ -350,7 +410,7 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t return this.libraries; } - public AdhocByteCodeCommandRequest setLibraries(List<String> libraries) { + public AdHocByteCodeCommandRequest setLibraries(List<String> libraries) { this.libraries = libraries; return this; } @@ -372,6 +432,14 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t public void setFieldValue(_Fields field, Object value) { switch (field) { + case TABLES_TO_INVOKE: + if (value == null) { + unsetTablesToInvoke(); + } else { + setTablesToInvoke((Set<String>)value); + } + break; + case ARGUMENTS: if (value == null) { unsetArguments(); @@ -409,6 +477,9 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t public Object getFieldValue(_Fields field) { switch (field) { + case TABLES_TO_INVOKE: + return getTablesToInvoke(); + case ARGUMENTS: return getArguments(); @@ -432,6 +503,8 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t } switch (field) { + case TABLES_TO_INVOKE: + return isSetTablesToInvoke(); case ARGUMENTS: return isSetArguments(); case INSTANCE_DATA: @@ -448,15 +521,24 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t public boolean equals(Object that) { if (that == null) return false; - if (that instanceof AdhocByteCodeCommandRequest) - return this.equals((AdhocByteCodeCommandRequest)that); + if (that instanceof AdHocByteCodeCommandRequest) + return this.equals((AdHocByteCodeCommandRequest)that); return false; } - public boolean equals(AdhocByteCodeCommandRequest that) { + public boolean equals(AdHocByteCodeCommandRequest that) { if (that == null) return false; + boolean this_present_tablesToInvoke = true && this.isSetTablesToInvoke(); + boolean that_present_tablesToInvoke = true && that.isSetTablesToInvoke(); + if (this_present_tablesToInvoke || that_present_tablesToInvoke) { + if (!(this_present_tablesToInvoke && that_present_tablesToInvoke)) + return false; + if (!this.tablesToInvoke.equals(that.tablesToInvoke)) + return false; + } + boolean this_present_arguments = true && this.isSetArguments(); boolean that_present_arguments = true && that.isSetArguments(); if (this_present_arguments || that_present_arguments) { @@ -501,14 +583,24 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t return 0; } - public int compareTo(AdhocByteCodeCommandRequest other) { + public int compareTo(AdHocByteCodeCommandRequest other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AdhocByteCodeCommandRequest typedOther = (AdhocByteCodeCommandRequest)other; + AdHocByteCodeCommandRequest typedOther = (AdHocByteCodeCommandRequest)other; + lastComparison = Boolean.valueOf(isSetTablesToInvoke()).compareTo(typedOther.isSetTablesToInvoke()); + if (lastComparison != 0) { + return lastComparison; + } + if (isSetTablesToInvoke()) { + lastComparison = org.apache.blur.thirdparty.thrift_0_9_0.TBaseHelper.compareTo(this.tablesToInvoke, typedOther.tablesToInvoke); + if (lastComparison != 0) { + return lastComparison; + } + } lastComparison = Boolean.valueOf(isSetArguments()).compareTo(typedOther.isSetArguments()); if (lastComparison != 0) { return lastComparison; @@ -566,9 +658,17 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t @Override public String toString() { - StringBuilder sb = new StringBuilder("AdhocByteCodeCommandRequest("); + StringBuilder sb = new StringBuilder("AdHocByteCodeCommandRequest("); boolean first = true; + sb.append("tablesToInvoke:"); + if (this.tablesToInvoke == null) { + sb.append("null"); + } else { + sb.append(this.tablesToInvoke); + } + first = false; + if (!first) sb.append(", "); sb.append("arguments:"); if (this.arguments == null) { sb.append("null"); @@ -625,15 +725,15 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t } } - private static class AdhocByteCodeCommandRequestStandardSchemeFactory implements SchemeFactory { - public AdhocByteCodeCommandRequestStandardScheme getScheme() { - return new AdhocByteCodeCommandRequestStandardScheme(); + private static class AdHocByteCodeCommandRequestStandardSchemeFactory implements SchemeFactory { + public AdHocByteCodeCommandRequestStandardScheme getScheme() { + return new AdHocByteCodeCommandRequestStandardScheme(); } } - private static class AdhocByteCodeCommandRequestStandardScheme extends StandardScheme<AdhocByteCodeCommandRequest> { + private static class AdHocByteCodeCommandRequestStandardScheme extends StandardScheme<AdHocByteCodeCommandRequest> { - public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, AdhocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, AdHocByteCodeCommandRequest 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) @@ -643,17 +743,35 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t break; } switch (schemeField.id) { - case 1: // ARGUMENTS + case 1: // TABLES_TO_INVOKE + if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.SET) { + { + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set232 = iprot.readSetBegin(); + struct.tablesToInvoke = new HashSet<String>(2*_set232.size); + for (int _i233 = 0; _i233 < _set232.size; ++_i233) + { + String _elem234; // required + _elem234 = iprot.readString(); + struct.tablesToInvoke.add(_elem234); + } + iprot.readSetEnd(); + } + struct.setTablesToInvokeIsSet(true); + } else { + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); + } + break; + case 2: // ARGUMENTS if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) { { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list232 = iprot.readListBegin(); - struct.arguments = new ArrayList<Value>(_list232.size); - for (int _i233 = 0; _i233 < _list232.size; ++_i233) + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list235 = iprot.readListBegin(); + struct.arguments = new ArrayList<Value>(_list235.size); + for (int _i236 = 0; _i236 < _list235.size; ++_i236) { - Value _elem234; // required - _elem234 = new Value(); - _elem234.read(iprot); - struct.arguments.add(_elem234); + Value _elem237; // required + _elem237 = new Value(); + _elem237.read(iprot); + struct.arguments.add(_elem237); } iprot.readListEnd(); } @@ -662,7 +780,7 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 2: // INSTANCE_DATA + case 3: // INSTANCE_DATA if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING) { struct.instanceData = iprot.readBinary(); struct.setInstanceDataIsSet(true); @@ -670,18 +788,18 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 3: // CLASS_DATA + case 4: // CLASS_DATA if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.MAP) { { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map235 = iprot.readMapBegin(); - struct.classData = new HashMap<String,ByteBuffer>(2*_map235.size); - for (int _i236 = 0; _i236 < _map235.size; ++_i236) + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map238 = iprot.readMapBegin(); + struct.classData = new HashMap<String,ByteBuffer>(2*_map238.size); + for (int _i239 = 0; _i239 < _map238.size; ++_i239) { - String _key237; // optional - ByteBuffer _val238; // required - _key237 = iprot.readString(); - _val238 = iprot.readBinary(); - struct.classData.put(_key237, _val238); + String _key240; // optional + ByteBuffer _val241; // required + _key240 = iprot.readString(); + _val241 = iprot.readBinary(); + struct.classData.put(_key240, _val241); } iprot.readMapEnd(); } @@ -690,16 +808,16 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 4: // LIBRARIES + case 5: // LIBRARIES if (schemeField.type == org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.LIST) { { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list239 = iprot.readListBegin(); - struct.libraries = new ArrayList<String>(_list239.size); - for (int _i240 = 0; _i240 < _list239.size; ++_i240) + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list242 = iprot.readListBegin(); + struct.libraries = new ArrayList<String>(_list242.size); + for (int _i243 = 0; _i243 < _list242.size; ++_i243) { - String _elem241; // required - _elem241 = iprot.readString(); - struct.libraries.add(_elem241); + String _elem244; // required + _elem244 = iprot.readString(); + struct.libraries.add(_elem244); } iprot.readListEnd(); } @@ -719,17 +837,29 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t struct.validate(); } - public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot, AdhocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot, AdHocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); + if (struct.tablesToInvoke != null) { + oprot.writeFieldBegin(TABLES_TO_INVOKE_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.tablesToInvoke.size())); + for (String _iter245 : struct.tablesToInvoke) + { + oprot.writeString(_iter245); + } + oprot.writeSetEnd(); + } + oprot.writeFieldEnd(); + } if (struct.arguments != null) { oprot.writeFieldBegin(ARGUMENTS_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.arguments.size())); - for (Value _iter242 : struct.arguments) + for (Value _iter246 : struct.arguments) { - _iter242.write(oprot); + _iter246.write(oprot); } oprot.writeListEnd(); } @@ -744,10 +874,10 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t oprot.writeFieldBegin(CLASS_DATA_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.classData.size())); - for (Map.Entry<String, ByteBuffer> _iter243 : struct.classData.entrySet()) + for (Map.Entry<String, ByteBuffer> _iter247 : struct.classData.entrySet()) { - oprot.writeString(_iter243.getKey()); - oprot.writeBinary(_iter243.getValue()); + oprot.writeString(_iter247.getKey()); + oprot.writeBinary(_iter247.getValue()); } oprot.writeMapEnd(); } @@ -757,9 +887,9 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t oprot.writeFieldBegin(LIBRARIES_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.STRING, struct.libraries.size())); - for (String _iter244 : struct.libraries) + for (String _iter248 : struct.libraries) { - oprot.writeString(_iter244); + oprot.writeString(_iter248); } oprot.writeListEnd(); } @@ -771,37 +901,49 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t } - private static class AdhocByteCodeCommandRequestTupleSchemeFactory implements SchemeFactory { - public AdhocByteCodeCommandRequestTupleScheme getScheme() { - return new AdhocByteCodeCommandRequestTupleScheme(); + private static class AdHocByteCodeCommandRequestTupleSchemeFactory implements SchemeFactory { + public AdHocByteCodeCommandRequestTupleScheme getScheme() { + return new AdHocByteCodeCommandRequestTupleScheme(); } } - private static class AdhocByteCodeCommandRequestTupleScheme extends TupleScheme<AdhocByteCodeCommandRequest> { + private static class AdHocByteCodeCommandRequestTupleScheme extends TupleScheme<AdHocByteCodeCommandRequest> { @Override - public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdhocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdHocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); - if (struct.isSetArguments()) { + if (struct.isSetTablesToInvoke()) { optionals.set(0); } - if (struct.isSetInstanceData()) { + if (struct.isSetArguments()) { optionals.set(1); } - if (struct.isSetClassData()) { + if (struct.isSetInstanceData()) { optionals.set(2); } - if (struct.isSetLibraries()) { + if (struct.isSetClassData()) { optionals.set(3); } - oprot.writeBitSet(optionals, 4); + if (struct.isSetLibraries()) { + optionals.set(4); + } + oprot.writeBitSet(optionals, 5); + if (struct.isSetTablesToInvoke()) { + { + oprot.writeI32(struct.tablesToInvoke.size()); + for (String _iter249 : struct.tablesToInvoke) + { + oprot.writeString(_iter249); + } + } + } if (struct.isSetArguments()) { { oprot.writeI32(struct.arguments.size()); - for (Value _iter245 : struct.arguments) + for (Value _iter250 : struct.arguments) { - _iter245.write(oprot); + _iter250.write(oprot); } } } @@ -811,70 +953,83 @@ public class AdhocByteCodeCommandRequest implements org.apache.blur.thirdparty.t if (struct.isSetClassData()) { { oprot.writeI32(struct.classData.size()); - for (Map.Entry<String, ByteBuffer> _iter246 : struct.classData.entrySet()) + for (Map.Entry<String, ByteBuffer> _iter251 : struct.classData.entrySet()) { - oprot.writeString(_iter246.getKey()); - oprot.writeBinary(_iter246.getValue()); + oprot.writeString(_iter251.getKey()); + oprot.writeBinary(_iter251.getValue()); } } } if (struct.isSetLibraries()) { { oprot.writeI32(struct.libraries.size()); - for (String _iter247 : struct.libraries) + for (String _iter252 : struct.libraries) { - oprot.writeString(_iter247); + oprot.writeString(_iter252); } } } } @Override - public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdhocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdHocByteCodeCommandRequest struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; - BitSet incoming = iprot.readBitSet(4); + BitSet incoming = iprot.readBitSet(5); if (incoming.get(0)) { { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list248 = 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.arguments = new ArrayList<Value>(_list248.size); - for (int _i249 = 0; _i249 < _list248.size; ++_i249) + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set253 = 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.tablesToInvoke = new HashSet<String>(2*_set253.size); + for (int _i254 = 0; _i254 < _set253.size; ++_i254) { - Value _elem250; // required - _elem250 = new Value(); - _elem250.read(iprot); - struct.arguments.add(_elem250); + String _elem255; // required + _elem255 = iprot.readString(); + struct.tablesToInvoke.add(_elem255); } } - struct.setArgumentsIsSet(true); + struct.setTablesToInvokeIsSet(true); } if (incoming.get(1)) { + { + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list256 = 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.arguments = new ArrayList<Value>(_list256.size); + for (int _i257 = 0; _i257 < _list256.size; ++_i257) + { + Value _elem258; // required + _elem258 = new Value(); + _elem258.read(iprot); + struct.arguments.add(_elem258); + } + } + struct.setArgumentsIsSet(true); + } + if (incoming.get(2)) { struct.instanceData = iprot.readBinary(); struct.setInstanceDataIsSet(true); } - if (incoming.get(2)) { + if (incoming.get(3)) { { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map251 = 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.classData = new HashMap<String,ByteBuffer>(2*_map251.size); - for (int _i252 = 0; _i252 < _map251.size; ++_i252) + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TMap _map259 = 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.classData = new HashMap<String,ByteBuffer>(2*_map259.size); + for (int _i260 = 0; _i260 < _map259.size; ++_i260) { - String _key253; // optional - ByteBuffer _val254; // required - _key253 = iprot.readString(); - _val254 = iprot.readBinary(); - struct.classData.put(_key253, _val254); + String _key261; // optional + ByteBuffer _val262; // required + _key261 = iprot.readString(); + _val262 = iprot.readBinary(); + struct.classData.put(_key261, _val262); } } struct.setClassDataIsSet(true); } - if (incoming.get(3)) { + if (incoming.get(4)) { { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list255 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32()); - struct.libraries = new ArrayList<String>(_list255.size); - for (int _i256 = 0; _i256 < _list255.size; ++_i256) + org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList _list263 = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TList(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, iprot.readI32()); + struct.libraries = new ArrayList<String>(_list263.size); + for (int _i264 = 0; _i264 < _list263.size; ++_i264) { - String _elem257; // required - _elem257 = iprot.readString(); - struct.libraries.add(_elem257); + String _elem265; // required + _elem265 = iprot.readString(); + struct.libraries.add(_elem265); } } struct.setLibrariesIsSet(true); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandResponse.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandResponse.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandResponse.java index 9f38edd..f9dcb2f 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandResponse.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/AdhocByteCodeCommandResponse.java @@ -49,15 +49,15 @@ import java.util.Arrays; //import org.slf4j.Logger; //import org.slf4j.LoggerFactory; -public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<AdhocByteCodeCommandResponse, AdhocByteCodeCommandResponse._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("AdhocByteCodeCommandResponse"); +public class AdHocByteCodeCommandResponse implements org.apache.blur.thirdparty.thrift_0_9_0.TBase<AdHocByteCodeCommandResponse, AdHocByteCodeCommandResponse._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("AdHocByteCodeCommandResponse"); private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField RESULT_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("result", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)1); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { - schemes.put(StandardScheme.class, new AdhocByteCodeCommandResponseStandardSchemeFactory()); - schemes.put(TupleScheme.class, new AdhocByteCodeCommandResponseTupleSchemeFactory()); + schemes.put(StandardScheme.class, new AdHocByteCodeCommandResponseStandardSchemeFactory()); + schemes.put(TupleScheme.class, new AdHocByteCodeCommandResponseTupleSchemeFactory()); } public Value result; // required @@ -127,13 +127,13 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. tmpMap.put(_Fields.RESULT, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("result", 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, Value.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); - org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(AdhocByteCodeCommandResponse.class, metaDataMap); + org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(AdHocByteCodeCommandResponse.class, metaDataMap); } - public AdhocByteCodeCommandResponse() { + public AdHocByteCodeCommandResponse() { } - public AdhocByteCodeCommandResponse( + public AdHocByteCodeCommandResponse( Value result) { this(); @@ -143,14 +143,14 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. /** * Performs a deep copy on <i>other</i>. */ - public AdhocByteCodeCommandResponse(AdhocByteCodeCommandResponse other) { + public AdHocByteCodeCommandResponse(AdHocByteCodeCommandResponse other) { if (other.isSetResult()) { this.result = new Value(other.result); } } - public AdhocByteCodeCommandResponse deepCopy() { - return new AdhocByteCodeCommandResponse(this); + public AdHocByteCodeCommandResponse deepCopy() { + return new AdHocByteCodeCommandResponse(this); } @Override @@ -162,7 +162,7 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. return this.result; } - public AdhocByteCodeCommandResponse setResult(Value result) { + public AdHocByteCodeCommandResponse setResult(Value result) { this.result = result; return this; } @@ -221,12 +221,12 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. public boolean equals(Object that) { if (that == null) return false; - if (that instanceof AdhocByteCodeCommandResponse) - return this.equals((AdhocByteCodeCommandResponse)that); + if (that instanceof AdHocByteCodeCommandResponse) + return this.equals((AdHocByteCodeCommandResponse)that); return false; } - public boolean equals(AdhocByteCodeCommandResponse that) { + public boolean equals(AdHocByteCodeCommandResponse that) { if (that == null) return false; @@ -247,13 +247,13 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. return 0; } - public int compareTo(AdhocByteCodeCommandResponse other) { + public int compareTo(AdHocByteCodeCommandResponse other) { if (!getClass().equals(other.getClass())) { return getClass().getName().compareTo(other.getClass().getName()); } int lastComparison = 0; - AdhocByteCodeCommandResponse typedOther = (AdhocByteCodeCommandResponse)other; + AdHocByteCodeCommandResponse typedOther = (AdHocByteCodeCommandResponse)other; lastComparison = Boolean.valueOf(isSetResult()).compareTo(typedOther.isSetResult()); if (lastComparison != 0) { @@ -282,7 +282,7 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. @Override public String toString() { - StringBuilder sb = new StringBuilder("AdhocByteCodeCommandResponse("); + StringBuilder sb = new StringBuilder("AdHocByteCodeCommandResponse("); boolean first = true; sb.append("result:"); @@ -320,15 +320,15 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. } } - private static class AdhocByteCodeCommandResponseStandardSchemeFactory implements SchemeFactory { - public AdhocByteCodeCommandResponseStandardScheme getScheme() { - return new AdhocByteCodeCommandResponseStandardScheme(); + private static class AdHocByteCodeCommandResponseStandardSchemeFactory implements SchemeFactory { + public AdHocByteCodeCommandResponseStandardScheme getScheme() { + return new AdHocByteCodeCommandResponseStandardScheme(); } } - private static class AdhocByteCodeCommandResponseStandardScheme extends StandardScheme<AdhocByteCodeCommandResponse> { + private static class AdHocByteCodeCommandResponseStandardScheme extends StandardScheme<AdHocByteCodeCommandResponse> { - public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, AdhocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol iprot, AdHocByteCodeCommandResponse 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) @@ -358,7 +358,7 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. struct.validate(); } - public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot, AdhocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol oprot, AdHocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { struct.validate(); oprot.writeStructBegin(STRUCT_DESC); @@ -373,16 +373,16 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. } - private static class AdhocByteCodeCommandResponseTupleSchemeFactory implements SchemeFactory { - public AdhocByteCodeCommandResponseTupleScheme getScheme() { - return new AdhocByteCodeCommandResponseTupleScheme(); + private static class AdHocByteCodeCommandResponseTupleSchemeFactory implements SchemeFactory { + public AdHocByteCodeCommandResponseTupleScheme getScheme() { + return new AdHocByteCodeCommandResponseTupleScheme(); } } - private static class AdhocByteCodeCommandResponseTupleScheme extends TupleScheme<AdhocByteCodeCommandResponse> { + private static class AdHocByteCodeCommandResponseTupleScheme extends TupleScheme<AdHocByteCodeCommandResponse> { @Override - public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdhocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void write(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdHocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol oprot = (TTupleProtocol) prot; BitSet optionals = new BitSet(); if (struct.isSetResult()) { @@ -395,7 +395,7 @@ public class AdhocByteCodeCommandResponse implements org.apache.blur.thirdparty. } @Override - public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdhocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { + public void read(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocol prot, AdHocByteCodeCommandResponse struct) throws org.apache.blur.thirdparty.thrift_0_9_0.TException { TTupleProtocol iprot = (TTupleProtocol) prot; BitSet incoming = iprot.readBitSet(1); if (incoming.get(0)) {
