Repository: incubator-blur Updated Branches: refs/heads/blur-platform 753ab411c -> d96892e4f
http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandRequest.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandRequest.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandRequest.java index 87265a0..0847786 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandRequest.java +++ b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandRequest.java @@ -51,13 +51,11 @@ import java.util.Arrays; public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0.TUnion<BlurCommandRequest, BlurCommandRequest._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("BlurCommandRequest"); - 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 ADHOC_BYTE_CODE_COMMAND_REQUEST_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("adhocByteCodeCommandRequest", org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRUCT, (short)2); + private static final org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField AD_HOC_BYTE_CODE_COMMAND_REQUEST_FIELD_DESC = new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TField("adHocByteCodeCommandRequest", 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 { - TABLES_TO_INVOKE((short)1, "tablesToInvoke"), - ADHOC_BYTE_CODE_COMMAND_REQUEST((short)2, "adhocByteCodeCommandRequest"); + AD_HOC_BYTE_CODE_COMMAND_REQUEST((short)1, "adHocByteCodeCommandRequest"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -72,10 +70,8 @@ public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0. */ public static _Fields findByThriftId(int fieldId) { switch(fieldId) { - case 1: // TABLES_TO_INVOKE - return TABLES_TO_INVOKE; - case 2: // ADHOC_BYTE_CODE_COMMAND_REQUEST - return ADHOC_BYTE_CODE_COMMAND_REQUEST; + case 1: // AD_HOC_BYTE_CODE_COMMAND_REQUEST + return AD_HOC_BYTE_CODE_COMMAND_REQUEST; default: return null; } @@ -118,11 +114,8 @@ public class BlurCommandRequest 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.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.ADHOC_BYTE_CODE_COMMAND_REQUEST, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("adhocByteCodeCommandRequest", 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, AdhocByteCodeCommandRequest.class))); + tmpMap.put(_Fields.AD_HOC_BYTE_CODE_COMMAND_REQUEST, new org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData("adHocByteCodeCommandRequest", 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, AdHocByteCodeCommandRequest.class))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.blur.thirdparty.thrift_0_9_0.meta_data.FieldMetaData.addStructMetaDataMap(BlurCommandRequest.class, metaDataMap); } @@ -142,15 +135,9 @@ public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0. return new BlurCommandRequest(this); } - public static BlurCommandRequest tablesToInvoke(Set<String> value) { + public static BlurCommandRequest adHocByteCodeCommandRequest(AdHocByteCodeCommandRequest value) { BlurCommandRequest x = new BlurCommandRequest(); - x.setTablesToInvoke(value); - return x; - } - - public static BlurCommandRequest adhocByteCodeCommandRequest(AdhocByteCodeCommandRequest value) { - BlurCommandRequest x = new BlurCommandRequest(); - x.setAdhocByteCodeCommandRequest(value); + x.setAdHocByteCodeCommandRequest(value); return x; } @@ -158,16 +145,11 @@ public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0. @Override protected void checkType(_Fields setField, Object value) throws ClassCastException { switch (setField) { - case TABLES_TO_INVOKE: - if (value instanceof Set) { + case AD_HOC_BYTE_CODE_COMMAND_REQUEST: + if (value instanceof AdHocByteCodeCommandRequest) { break; } - throw new ClassCastException("Was expecting value of type Set<String> for field 'tablesToInvoke', but got " + value.getClass().getSimpleName()); - case ADHOC_BYTE_CODE_COMMAND_REQUEST: - if (value instanceof AdhocByteCodeCommandRequest) { - break; - } - throw new ClassCastException("Was expecting value of type AdhocByteCodeCommandRequest for field 'adhocByteCodeCommandRequest', but got " + value.getClass().getSimpleName()); + throw new ClassCastException("Was expecting value of type AdHocByteCodeCommandRequest for field 'adHocByteCodeCommandRequest', but got " + value.getClass().getSimpleName()); default: throw new IllegalArgumentException("Unknown field id " + setField); } @@ -178,31 +160,12 @@ public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0. _Fields setField = _Fields.findByThriftId(field.id); if (setField != null) { switch (setField) { - case TABLES_TO_INVOKE: - if (field.type == TABLES_TO_INVOKE_FIELD_DESC.type) { - Set<String> tablesToInvoke; - { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set258 = iprot.readSetBegin(); - tablesToInvoke = new HashSet<String>(2*_set258.size); - for (int _i259 = 0; _i259 < _set258.size; ++_i259) - { - String _elem260; // required - _elem260 = iprot.readString(); - tablesToInvoke.add(_elem260); - } - iprot.readSetEnd(); - } - return tablesToInvoke; - } else { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type); - return null; - } - case ADHOC_BYTE_CODE_COMMAND_REQUEST: - if (field.type == ADHOC_BYTE_CODE_COMMAND_REQUEST_FIELD_DESC.type) { - AdhocByteCodeCommandRequest adhocByteCodeCommandRequest; - adhocByteCodeCommandRequest = new AdhocByteCodeCommandRequest(); - adhocByteCodeCommandRequest.read(iprot); - return adhocByteCodeCommandRequest; + case AD_HOC_BYTE_CODE_COMMAND_REQUEST: + if (field.type == AD_HOC_BYTE_CODE_COMMAND_REQUEST_FIELD_DESC.type) { + AdHocByteCodeCommandRequest adHocByteCodeCommandRequest; + adHocByteCodeCommandRequest = new AdHocByteCodeCommandRequest(); + adHocByteCodeCommandRequest.read(iprot); + return adHocByteCodeCommandRequest; } else { org.apache.blur.thirdparty.thrift_0_9_0.protocol.TProtocolUtil.skip(iprot, field.type); return null; @@ -218,20 +181,9 @@ public class BlurCommandRequest 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 TABLES_TO_INVOKE: - Set<String> tablesToInvoke = (Set<String>)value_; - { - oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, tablesToInvoke.size())); - for (String _iter261 : tablesToInvoke) - { - oprot.writeString(_iter261); - } - oprot.writeSetEnd(); - } - return; - case ADHOC_BYTE_CODE_COMMAND_REQUEST: - AdhocByteCodeCommandRequest adhocByteCodeCommandRequest = (AdhocByteCodeCommandRequest)value_; - adhocByteCodeCommandRequest.write(oprot); + case AD_HOC_BYTE_CODE_COMMAND_REQUEST: + AdHocByteCodeCommandRequest adHocByteCodeCommandRequest = (AdHocByteCodeCommandRequest)value_; + adHocByteCodeCommandRequest.write(oprot); return; default: throw new IllegalStateException("Cannot write union with unknown field " + setField_); @@ -243,25 +195,11 @@ public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0. _Fields setField = _Fields.findByThriftId(fieldID); if (setField != null) { switch (setField) { - case TABLES_TO_INVOKE: - Set<String> tablesToInvoke; - { - org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet _set262 = iprot.readSetBegin(); - tablesToInvoke = new HashSet<String>(2*_set262.size); - for (int _i263 = 0; _i263 < _set262.size; ++_i263) - { - String _elem264; // required - _elem264 = iprot.readString(); - tablesToInvoke.add(_elem264); - } - iprot.readSetEnd(); - } - return tablesToInvoke; - case ADHOC_BYTE_CODE_COMMAND_REQUEST: - AdhocByteCodeCommandRequest adhocByteCodeCommandRequest; - adhocByteCodeCommandRequest = new AdhocByteCodeCommandRequest(); - adhocByteCodeCommandRequest.read(iprot); - return adhocByteCodeCommandRequest; + case AD_HOC_BYTE_CODE_COMMAND_REQUEST: + AdHocByteCodeCommandRequest adHocByteCodeCommandRequest; + adHocByteCodeCommandRequest = new AdHocByteCodeCommandRequest(); + adHocByteCodeCommandRequest.read(iprot); + return adHocByteCodeCommandRequest; default: throw new IllegalStateException("setField wasn't null, but didn't match any of the case statements!"); } @@ -273,20 +211,9 @@ public class BlurCommandRequest 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 TABLES_TO_INVOKE: - Set<String> tablesToInvoke = (Set<String>)value_; - { - oprot.writeSetBegin(new org.apache.blur.thirdparty.thrift_0_9_0.protocol.TSet(org.apache.blur.thirdparty.thrift_0_9_0.protocol.TType.STRING, tablesToInvoke.size())); - for (String _iter265 : tablesToInvoke) - { - oprot.writeString(_iter265); - } - oprot.writeSetEnd(); - } - return; - case ADHOC_BYTE_CODE_COMMAND_REQUEST: - AdhocByteCodeCommandRequest adhocByteCodeCommandRequest = (AdhocByteCodeCommandRequest)value_; - adhocByteCodeCommandRequest.write(oprot); + case AD_HOC_BYTE_CODE_COMMAND_REQUEST: + AdHocByteCodeCommandRequest adHocByteCodeCommandRequest = (AdHocByteCodeCommandRequest)value_; + adHocByteCodeCommandRequest.write(oprot); return; default: throw new IllegalStateException("Cannot write union with unknown field " + setField_); @@ -296,10 +223,8 @@ public class BlurCommandRequest 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 TABLES_TO_INVOKE: - return TABLES_TO_INVOKE_FIELD_DESC; - case ADHOC_BYTE_CODE_COMMAND_REQUEST: - return ADHOC_BYTE_CODE_COMMAND_REQUEST_FIELD_DESC; + case AD_HOC_BYTE_CODE_COMMAND_REQUEST: + return AD_HOC_BYTE_CODE_COMMAND_REQUEST_FIELD_DESC; default: throw new IllegalArgumentException("Unknown field id " + setField); } @@ -320,41 +245,22 @@ public class BlurCommandRequest extends org.apache.blur.thirdparty.thrift_0_9_0. } - public Set<String> getTablesToInvoke() { - if (getSetField() == _Fields.TABLES_TO_INVOKE) { - return (Set<String>)getFieldValue(); - } else { - throw new RuntimeException("Cannot get field 'tablesToInvoke' because union is currently set to " + getFieldDesc(getSetField()).name); - } - } - - public void setTablesToInvoke(Set<String> value) { - if (value == null) throw new NullPointerException(); - setField_ = _Fields.TABLES_TO_INVOKE; - value_ = value; - } - - public AdhocByteCodeCommandRequest getAdhocByteCodeCommandRequest() { - if (getSetField() == _Fields.ADHOC_BYTE_CODE_COMMAND_REQUEST) { - return (AdhocByteCodeCommandRequest)getFieldValue(); + public AdHocByteCodeCommandRequest getAdHocByteCodeCommandRequest() { + if (getSetField() == _Fields.AD_HOC_BYTE_CODE_COMMAND_REQUEST) { + return (AdHocByteCodeCommandRequest)getFieldValue(); } else { - throw new RuntimeException("Cannot get field 'adhocByteCodeCommandRequest' because union is currently set to " + getFieldDesc(getSetField()).name); + throw new RuntimeException("Cannot get field 'adHocByteCodeCommandRequest' because union is currently set to " + getFieldDesc(getSetField()).name); } } - public void setAdhocByteCodeCommandRequest(AdhocByteCodeCommandRequest value) { + public void setAdHocByteCodeCommandRequest(AdHocByteCodeCommandRequest value) { if (value == null) throw new NullPointerException(); - setField_ = _Fields.ADHOC_BYTE_CODE_COMMAND_REQUEST; + setField_ = _Fields.AD_HOC_BYTE_CODE_COMMAND_REQUEST; value_ = value; } - public boolean isSetTablesToInvoke() { - return setField_ == _Fields.TABLES_TO_INVOKE; - } - - - public boolean isSetAdhocByteCodeCommandRequest() { - return setField_ == _Fields.ADHOC_BYTE_CODE_COMMAND_REQUEST; + public boolean isSetAdHocByteCodeCommandRequest() { + return setField_ == _Fields.AD_HOC_BYTE_CODE_COMMAND_REQUEST; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandResponse.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandResponse.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandResponse.java index 20e2ec6..f62aa2e 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurCommandResponse.java +++ b/distribution/src/main/scripts/interface/gen-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/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurPlatform.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurPlatform.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurPlatform.java index 09f2732..491acfb 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/BlurPlatform.java +++ b/distribution/src/main/scripts/interface/gen-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/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Value.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Value.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Value.java index 8b35331..0797c91 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/Value.java +++ b/distribution/src/main/scripts/interface/gen-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/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ValueType.java ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ValueType.java b/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ValueType.java index 0facd0c..857b482 100644 --- a/distribution/src/main/scripts/interface/gen-java/org/apache/blur/thrift/generated/ValueType.java +++ b/distribution/src/main/scripts/interface/gen-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/gen-js/BlurPlatform.js ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-js/BlurPlatform.js b/distribution/src/main/scripts/interface/gen-js/BlurPlatform.js index e241493..1e3a09a 100644 --- a/distribution/src/main/scripts/interface/gen-js/BlurPlatform.js +++ b/distribution/src/main/scripts/interface/gen-js/BlurPlatform.js @@ -8,8 +8,12 @@ //HELPER FUNCTIONS AND STRUCTURES BlurPlatform_execute_args = function(args) { + this.cluster = null; this.request = null; if (args) { + if (args.cluster !== undefined) { + this.cluster = args.cluster; + } if (args.request !== undefined) { this.request = args.request; } @@ -30,6 +34,13 @@ BlurPlatform_execute_args.prototype.read = function(input) { switch (fid) { case 1: + if (ftype == Thrift.Type.STRING) { + this.cluster = input.readString().value; + } else { + input.skip(ftype); + } + break; + case 2: if (ftype == Thrift.Type.STRUCT) { this.request = new BlurCommandRequest(); this.request.read(input); @@ -37,9 +48,6 @@ BlurPlatform_execute_args.prototype.read = function(input) { input.skip(ftype); } break; - case 0: - input.skip(ftype); - break; default: input.skip(ftype); } @@ -51,8 +59,13 @@ BlurPlatform_execute_args.prototype.read = function(input) { BlurPlatform_execute_args.prototype.write = function(output) { output.writeStructBegin('BlurPlatform_execute_args'); + if (this.cluster !== null && this.cluster !== undefined) { + output.writeFieldBegin('cluster', Thrift.Type.STRING, 1); + output.writeString(this.cluster); + output.writeFieldEnd(); + } if (this.request !== null && this.request !== undefined) { - output.writeFieldBegin('request', Thrift.Type.STRUCT, 1); + output.writeFieldBegin('request', Thrift.Type.STRUCT, 2); this.request.write(output); output.writeFieldEnd(); } @@ -139,14 +152,15 @@ BlurPlatformClient = function(input, output) { this.seqid = 0; }; BlurPlatformClient.prototype = {}; -BlurPlatformClient.prototype.execute = function(request) { - this.send_execute(request); +BlurPlatformClient.prototype.execute = function(cluster, request) { + this.send_execute(cluster, request); return this.recv_execute(); }; -BlurPlatformClient.prototype.send_execute = function(request) { +BlurPlatformClient.prototype.send_execute = function(cluster, request) { this.output.writeMessageBegin('execute', Thrift.MessageType.CALL, this.seqid); var args = new BlurPlatform_execute_args(); + args.cluster = cluster; args.request = request; args.write(this.output); this.output.writeMessageEnd(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/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 d0ae63b..af82089 100644 --- a/distribution/src/main/scripts/interface/gen-js/Blur_types.js +++ b/distribution/src/main/scripts/interface/gen-js/Blur_types.js @@ -3732,12 +3732,16 @@ Value.prototype.write = function(output) { return; }; -AdhocByteCodeCommandRequest = function(args) { +AdHocByteCodeCommandRequest = function(args) { + this.tablesToInvoke = null; this.arguments = null; this.instanceData = null; this.classData = null; this.libraries = null; if (args) { + if (args.tablesToInvoke !== undefined) { + this.tablesToInvoke = args.tablesToInvoke; + } if (args.arguments !== undefined) { this.arguments = args.arguments; } @@ -3752,8 +3756,8 @@ AdhocByteCodeCommandRequest = function(args) { } } }; -AdhocByteCodeCommandRequest.prototype = {}; -AdhocByteCodeCommandRequest.prototype.read = function(input) { +AdHocByteCodeCommandRequest.prototype = {}; +AdHocByteCodeCommandRequest.prototype.read = function(input) { input.readStructBegin(); while (true) { @@ -3767,76 +3771,96 @@ AdhocByteCodeCommandRequest.prototype.read = function(input) { switch (fid) { case 1: - if (ftype == Thrift.Type.LIST) { + if (ftype == Thrift.Type.SET) { var _size232 = 0; var _rtmp3236; - this.arguments = []; + this.tablesToInvoke = []; var _etype235 = 0; - _rtmp3236 = input.readListBegin(); + _rtmp3236 = input.readSetBegin(); _etype235 = _rtmp3236.etype; _size232 = _rtmp3236.size; for (var _i237 = 0; _i237 < _size232; ++_i237) { var elem238 = null; - elem238 = new Value(); - elem238.read(input); - this.arguments.push(elem238); + elem238 = input.readString().value; + this.tablesToInvoke.push(elem238); } - input.readListEnd(); + input.readSetEnd(); } else { input.skip(ftype); } break; case 2: + if (ftype == Thrift.Type.LIST) { + var _size239 = 0; + var _rtmp3243; + this.arguments = []; + var _etype242 = 0; + _rtmp3243 = input.readListBegin(); + _etype242 = _rtmp3243.etype; + _size239 = _rtmp3243.size; + for (var _i244 = 0; _i244 < _size239; ++_i244) + { + var elem245 = null; + elem245 = new Value(); + elem245.read(input); + this.arguments.push(elem245); + } + input.readListEnd(); + } else { + input.skip(ftype); + } + break; + case 3: if (ftype == Thrift.Type.STRING) { this.instanceData = input.readString().value; } else { input.skip(ftype); } break; - case 3: + case 4: if (ftype == Thrift.Type.MAP) { - var _size239 = 0; - var _rtmp3243; + var _size246 = 0; + var _rtmp3250; this.classData = {}; - var _ktype240 = 0; - var _vtype241 = 0; - _rtmp3243 = input.readMapBegin(); - _ktype240 = _rtmp3243.ktype; - _vtype241 = _rtmp3243.vtype; - _size239 = _rtmp3243.size; - for (var _i244 = 0; _i244 < _size239; ++_i244) + var _ktype247 = 0; + var _vtype248 = 0; + _rtmp3250 = input.readMapBegin(); + _ktype247 = _rtmp3250.ktype; + _vtype248 = _rtmp3250.vtype; + _size246 = _rtmp3250.size; + for (var _i251 = 0; _i251 < _size246; ++_i251) { - if (_i244 > 0 ) { + if (_i251 > 0 ) { if (input.rstack.length > input.rpos[input.rpos.length -1] + 1) { input.rstack.pop(); } } - var key245 = null; - var val246 = null; - key245 = input.readString().value; - val246 = input.readString().value; - this.classData[key245] = val246; + var key252 = null; + var val253 = null; + key252 = input.readString().value; + val253 = input.readString().value; + this.classData[key252] = val253; } input.readMapEnd(); } else { input.skip(ftype); } break; - case 4: + case 5: if (ftype == Thrift.Type.LIST) { - var _size247 = 0; - var _rtmp3251; + var _size254 = 0; + var _rtmp3258; this.libraries = []; - var _etype250 = 0; - _rtmp3251 = input.readListBegin(); - _etype250 = _rtmp3251.etype; - _size247 = _rtmp3251.size; - for (var _i252 = 0; _i252 < _size247; ++_i252) + var _etype257 = 0; + _rtmp3258 = input.readListBegin(); + _etype257 = _rtmp3258.etype; + _size254 = _rtmp3258.size; + for (var _i259 = 0; _i259 < _size254; ++_i259) { - var elem253 = null; - elem253 = input.readString().value; - this.libraries.push(elem253); + var elem260 = null; + elem260 = input.readString().value; + this.libraries.push(elem260); } input.readListEnd(); } else { @@ -3852,51 +3876,65 @@ AdhocByteCodeCommandRequest.prototype.read = function(input) { return; }; -AdhocByteCodeCommandRequest.prototype.write = function(output) { - output.writeStructBegin('AdhocByteCodeCommandRequest'); +AdHocByteCodeCommandRequest.prototype.write = function(output) { + output.writeStructBegin('AdHocByteCodeCommandRequest'); + if (this.tablesToInvoke !== null && this.tablesToInvoke !== undefined) { + output.writeFieldBegin('tablesToInvoke', Thrift.Type.SET, 1); + output.writeSetBegin(Thrift.Type.STRING, this.tablesToInvoke.length); + for (var iter261 in this.tablesToInvoke) + { + if (this.tablesToInvoke.hasOwnProperty(iter261)) + { + iter261 = this.tablesToInvoke[iter261]; + output.writeString(iter261); + } + } + output.writeSetEnd(); + output.writeFieldEnd(); + } if (this.arguments !== null && this.arguments !== undefined) { - output.writeFieldBegin('arguments', Thrift.Type.LIST, 1); + output.writeFieldBegin('arguments', Thrift.Type.LIST, 2); output.writeListBegin(Thrift.Type.STRUCT, this.arguments.length); - for (var iter254 in this.arguments) + for (var iter262 in this.arguments) { - if (this.arguments.hasOwnProperty(iter254)) + if (this.arguments.hasOwnProperty(iter262)) { - iter254 = this.arguments[iter254]; - iter254.write(output); + iter262 = this.arguments[iter262]; + iter262.write(output); } } output.writeListEnd(); output.writeFieldEnd(); } if (this.instanceData !== null && this.instanceData !== undefined) { - output.writeFieldBegin('instanceData', Thrift.Type.STRING, 2); + output.writeFieldBegin('instanceData', Thrift.Type.STRING, 3); output.writeString(this.instanceData); output.writeFieldEnd(); } if (this.classData !== null && this.classData !== undefined) { - output.writeFieldBegin('classData', Thrift.Type.MAP, 3); + output.writeFieldBegin('classData', Thrift.Type.MAP, 4); output.writeMapBegin(Thrift.Type.STRING, Thrift.Type.STRING, Thrift.objectLength(this.classData)); - for (var kiter255 in this.classData) + for (var kiter263 in this.classData) { - if (this.classData.hasOwnProperty(kiter255)) + if (this.classData.hasOwnProperty(kiter263)) { - var viter256 = this.classData[kiter255]; - output.writeString(kiter255); - output.writeString(viter256); + var viter264 = this.classData[kiter263]; + output.writeString(kiter263); + output.writeString(viter264); } } output.writeMapEnd(); output.writeFieldEnd(); } if (this.libraries !== null && this.libraries !== undefined) { - output.writeFieldBegin('libraries', Thrift.Type.LIST, 4); + output.writeFieldBegin('libraries', Thrift.Type.LIST, 5); output.writeListBegin(Thrift.Type.STRING, this.libraries.length); - for (var iter257 in this.libraries) + for (var iter265 in this.libraries) { - if (this.libraries.hasOwnProperty(iter257)) + if (this.libraries.hasOwnProperty(iter265)) { - iter257 = this.libraries[iter257]; - output.writeString(iter257); + iter265 = this.libraries[iter265]; + output.writeString(iter265); } } output.writeListEnd(); @@ -3907,7 +3945,7 @@ AdhocByteCodeCommandRequest.prototype.write = function(output) { return; }; -AdhocByteCodeCommandResponse = function(args) { +AdHocByteCodeCommandResponse = function(args) { this.result = null; if (args) { if (args.result !== undefined) { @@ -3915,8 +3953,8 @@ AdhocByteCodeCommandResponse = function(args) { } } }; -AdhocByteCodeCommandResponse.prototype = {}; -AdhocByteCodeCommandResponse.prototype.read = function(input) { +AdHocByteCodeCommandResponse.prototype = {}; +AdHocByteCodeCommandResponse.prototype.read = function(input) { input.readStructBegin(); while (true) { @@ -3949,8 +3987,8 @@ AdhocByteCodeCommandResponse.prototype.read = function(input) { return; }; -AdhocByteCodeCommandResponse.prototype.write = function(output) { - output.writeStructBegin('AdhocByteCodeCommandResponse'); +AdHocByteCodeCommandResponse.prototype.write = function(output) { + output.writeStructBegin('AdHocByteCodeCommandResponse'); if (this.result !== null && this.result !== undefined) { output.writeFieldBegin('result', Thrift.Type.STRUCT, 1); this.result.write(output); @@ -3962,14 +4000,10 @@ AdhocByteCodeCommandResponse.prototype.write = function(output) { }; BlurCommandRequest = function(args) { - this.tablesToInvoke = null; - this.adhocByteCodeCommandRequest = null; + this.adHocByteCodeCommandRequest = null; if (args) { - if (args.tablesToInvoke !== undefined) { - this.tablesToInvoke = args.tablesToInvoke; - } - if (args.adhocByteCodeCommandRequest !== undefined) { - this.adhocByteCodeCommandRequest = args.adhocByteCodeCommandRequest; + if (args.adHocByteCodeCommandRequest !== undefined) { + this.adHocByteCodeCommandRequest = args.adHocByteCodeCommandRequest; } } }; @@ -3988,33 +4022,16 @@ BlurCommandRequest.prototype.read = function(input) { switch (fid) { case 1: - if (ftype == Thrift.Type.SET) { - var _size258 = 0; - var _rtmp3262; - this.tablesToInvoke = []; - var _etype261 = 0; - _rtmp3262 = input.readSetBegin(); - _etype261 = _rtmp3262.etype; - _size258 = _rtmp3262.size; - for (var _i263 = 0; _i263 < _size258; ++_i263) - { - var elem264 = null; - elem264 = input.readString().value; - this.tablesToInvoke.push(elem264); - } - input.readSetEnd(); - } else { - input.skip(ftype); - } - break; - case 2: if (ftype == Thrift.Type.STRUCT) { - this.adhocByteCodeCommandRequest = new AdhocByteCodeCommandRequest(); - this.adhocByteCodeCommandRequest.read(input); + this.adHocByteCodeCommandRequest = new AdHocByteCodeCommandRequest(); + this.adHocByteCodeCommandRequest.read(input); } else { input.skip(ftype); } break; + case 0: + input.skip(ftype); + break; default: input.skip(ftype); } @@ -4026,23 +4043,9 @@ BlurCommandRequest.prototype.read = function(input) { BlurCommandRequest.prototype.write = function(output) { output.writeStructBegin('BlurCommandRequest'); - if (this.tablesToInvoke !== null && this.tablesToInvoke !== undefined) { - output.writeFieldBegin('tablesToInvoke', Thrift.Type.SET, 1); - output.writeSetBegin(Thrift.Type.STRING, this.tablesToInvoke.length); - for (var iter265 in this.tablesToInvoke) - { - if (this.tablesToInvoke.hasOwnProperty(iter265)) - { - iter265 = this.tablesToInvoke[iter265]; - output.writeString(iter265); - } - } - output.writeSetEnd(); - output.writeFieldEnd(); - } - if (this.adhocByteCodeCommandRequest !== null && this.adhocByteCodeCommandRequest !== undefined) { - output.writeFieldBegin('adhocByteCodeCommandRequest', Thrift.Type.STRUCT, 2); - this.adhocByteCodeCommandRequest.write(output); + if (this.adHocByteCodeCommandRequest !== null && this.adHocByteCodeCommandRequest !== undefined) { + output.writeFieldBegin('adHocByteCodeCommandRequest', Thrift.Type.STRUCT, 1); + this.adHocByteCodeCommandRequest.write(output); output.writeFieldEnd(); } output.writeFieldStop(); @@ -4051,10 +4054,10 @@ BlurCommandRequest.prototype.write = function(output) { }; BlurCommandResponse = function(args) { - this.adhocByteCodeCommandResponse = null; + this.adHocByteCodeCommandResponse = null; if (args) { - if (args.adhocByteCodeCommandResponse !== undefined) { - this.adhocByteCodeCommandResponse = args.adhocByteCodeCommandResponse; + if (args.adHocByteCodeCommandResponse !== undefined) { + this.adHocByteCodeCommandResponse = args.adHocByteCodeCommandResponse; } } }; @@ -4074,8 +4077,8 @@ BlurCommandResponse.prototype.read = function(input) { { case 1: if (ftype == Thrift.Type.STRUCT) { - this.adhocByteCodeCommandResponse = new AdhocByteCodeCommandResponse(); - this.adhocByteCodeCommandResponse.read(input); + this.adHocByteCodeCommandResponse = new AdHocByteCodeCommandResponse(); + this.adHocByteCodeCommandResponse.read(input); } else { input.skip(ftype); } @@ -4094,9 +4097,9 @@ BlurCommandResponse.prototype.read = function(input) { BlurCommandResponse.prototype.write = function(output) { output.writeStructBegin('BlurCommandResponse'); - if (this.adhocByteCodeCommandResponse !== null && this.adhocByteCodeCommandResponse !== undefined) { - output.writeFieldBegin('adhocByteCodeCommandResponse', Thrift.Type.STRUCT, 1); - this.adhocByteCodeCommandResponse.write(output); + if (this.adHocByteCodeCommandResponse !== null && this.adHocByteCodeCommandResponse !== undefined) { + output.writeFieldBegin('adHocByteCodeCommandResponse', Thrift.Type.STRUCT, 1); + this.adHocByteCodeCommandResponse.write(output); output.writeFieldEnd(); } output.writeFieldStop(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/distribution/src/main/scripts/interface/gen-perl/Blur/BlurPlatform.pm ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-perl/Blur/BlurPlatform.pm b/distribution/src/main/scripts/interface/gen-perl/Blur/BlurPlatform.pm index d5f4f75..411ef2c 100644 --- a/distribution/src/main/scripts/interface/gen-perl/Blur/BlurPlatform.pm +++ b/distribution/src/main/scripts/interface/gen-perl/Blur/BlurPlatform.pm @@ -14,14 +14,18 @@ use Blur::Types; package Blur::BlurPlatform_execute_args; use base qw(Class::Accessor); -Blur::BlurPlatform_execute_args->mk_accessors( qw( request ) ); +Blur::BlurPlatform_execute_args->mk_accessors( qw( cluster request ) ); sub new { my $classname = shift; my $self = {}; my $vals = shift || {}; + $self->{cluster} = undef; $self->{request} = undef; if (UNIVERSAL::isa($vals,'HASH')) { + if (defined $vals->{cluster}) { + $self->{cluster} = $vals->{cluster}; + } if (defined $vals->{request}) { $self->{request} = $vals->{request}; } @@ -48,7 +52,13 @@ sub read { } SWITCH: for($fid) { - /^1$/ && do{ if ($ftype == TType::STRUCT) { + /^1$/ && do{ if ($ftype == TType::STRING) { + $xfer += $input->readString(\$self->{cluster}); + } else { + $xfer += $input->skip($ftype); + } + last; }; + /^2$/ && do{ if ($ftype == TType::STRUCT) { $self->{request} = new Blur::BlurCommandRequest(); $xfer += $self->{request}->read($input); } else { @@ -67,8 +77,13 @@ sub write { my ($self, $output) = @_; my $xfer = 0; $xfer += $output->writeStructBegin('BlurPlatform_execute_args'); + if (defined $self->{cluster}) { + $xfer += $output->writeFieldBegin('cluster', TType::STRING, 1); + $xfer += $output->writeString($self->{cluster}); + $xfer += $output->writeFieldEnd(); + } if (defined $self->{request}) { - $xfer += $output->writeFieldBegin('request', TType::STRUCT, 1); + $xfer += $output->writeFieldBegin('request', TType::STRUCT, 2); $xfer += $self->{request}->write($output); $xfer += $output->writeFieldEnd(); } @@ -165,6 +180,7 @@ use strict; sub execute{ my $self = shift; + my $cluster = shift; my $request = shift; die 'implement interface'; @@ -185,8 +201,9 @@ sub new { sub execute{ my ($self, $request) = @_; + my $cluster = ($request->{'cluster'}) ? $request->{'cluster'} : undef; my $request = ($request->{'request'}) ? $request->{'request'} : undef; - return $self->{impl}->execute($request); + return $self->{impl}->execute($cluster, $request); } package Blur::BlurPlatformClient; @@ -204,18 +221,21 @@ sub new { sub execute{ my $self = shift; + my $cluster = shift; my $request = shift; - $self->send_execute($request); + $self->send_execute($cluster, $request); return $self->recv_execute(); } sub send_execute{ my $self = shift; + my $cluster = shift; my $request = shift; $self->{output}->writeMessageBegin('execute', TMessageType::CALL, $self->{seqid}); my $args = new Blur::BlurPlatform_execute_args(); + $args->{cluster} = $cluster; $args->{request} = $request; $args->write($self->{output}); $self->{output}->writeMessageEnd(); @@ -289,7 +309,7 @@ sub process_execute { $input->readMessageEnd(); my $result = new Blur::BlurPlatform_execute_result(); eval { - $result->{success} = $self->{handler}->execute($args->request); + $result->{success} = $self->{handler}->execute($args->cluster, $args->request); }; if( UNIVERSAL::isa($@,'Blur::BlurException') ){ $result->{ex} = $@; } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/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 e7911c6..b832e95 100644 --- a/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm +++ b/distribution/src/main/scripts/interface/gen-perl/Blur/Types.pm @@ -3907,19 +3907,23 @@ sub write { return $xfer; } -package Blur::AdhocByteCodeCommandRequest; +package Blur::AdHocByteCodeCommandRequest; use base qw(Class::Accessor); -Blur::AdhocByteCodeCommandRequest->mk_accessors( qw( arguments instanceData classData libraries ) ); +Blur::AdHocByteCodeCommandRequest->mk_accessors( qw( tablesToInvoke arguments instanceData classData libraries ) ); sub new { my $classname = shift; my $self = {}; my $vals = shift || {}; + $self->{tablesToInvoke} = undef; $self->{arguments} = undef; $self->{instanceData} = undef; $self->{classData} = undef; $self->{libraries} = undef; if (UNIVERSAL::isa($vals,'HASH')) { + if (defined $vals->{tablesToInvoke}) { + $self->{tablesToInvoke} = $vals->{tablesToInvoke}; + } if (defined $vals->{arguments}) { $self->{arguments} = $vals->{arguments}; } @@ -3937,7 +3941,7 @@ sub new { } sub getName { - return 'AdhocByteCodeCommandRequest'; + return 'AdHocByteCodeCommandRequest'; } sub read { @@ -3955,18 +3959,36 @@ sub read { } SWITCH: for($fid) { - /^1$/ && do{ if ($ftype == TType::LIST) { + /^1$/ && do{ if ($ftype == TType::SET) { { my $_size206 = 0; - $self->{arguments} = []; + $self->{tablesToInvoke} = {}; my $_etype209 = 0; - $xfer += $input->readListBegin(\$_etype209, \$_size206); + $xfer += $input->readSetBegin(\$_etype209, \$_size206); for (my $_i210 = 0; $_i210 < $_size206; ++$_i210) { my $elem211 = undef; - $elem211 = new Blur::Value(); - $xfer += $elem211->read($input); - push(@{$self->{arguments}},$elem211); + $xfer += $input->readString(\$elem211); + $self->{tablesToInvoke}->{$elem211} = 1; + } + $xfer += $input->readSetEnd(); + } + } else { + $xfer += $input->skip($ftype); + } + last; }; + /^2$/ && do{ if ($ftype == TType::LIST) { + { + my $_size212 = 0; + $self->{arguments} = []; + my $_etype215 = 0; + $xfer += $input->readListBegin(\$_etype215, \$_size212); + for (my $_i216 = 0; $_i216 < $_size212; ++$_i216) + { + my $elem217 = undef; + $elem217 = new Blur::Value(); + $xfer += $elem217->read($input); + push(@{$self->{arguments}},$elem217); } $xfer += $input->readListEnd(); } @@ -3974,26 +3996,26 @@ sub read { $xfer += $input->skip($ftype); } last; }; - /^2$/ && do{ if ($ftype == TType::STRING) { + /^3$/ && do{ if ($ftype == TType::STRING) { $xfer += $input->readString(\$self->{instanceData}); } else { $xfer += $input->skip($ftype); } last; }; - /^3$/ && do{ if ($ftype == TType::MAP) { + /^4$/ && do{ if ($ftype == TType::MAP) { { - my $_size212 = 0; + my $_size218 = 0; $self->{classData} = {}; - my $_ktype213 = 0; - my $_vtype214 = 0; - $xfer += $input->readMapBegin(\$_ktype213, \$_vtype214, \$_size212); - for (my $_i216 = 0; $_i216 < $_size212; ++$_i216) + my $_ktype219 = 0; + my $_vtype220 = 0; + $xfer += $input->readMapBegin(\$_ktype219, \$_vtype220, \$_size218); + for (my $_i222 = 0; $_i222 < $_size218; ++$_i222) { - my $key217 = ''; - my $val218 = ''; - $xfer += $input->readString(\$key217); - $xfer += $input->readString(\$val218); - $self->{classData}->{$key217} = $val218; + my $key223 = ''; + my $val224 = ''; + $xfer += $input->readString(\$key223); + $xfer += $input->readString(\$val224); + $self->{classData}->{$key223} = $val224; } $xfer += $input->readMapEnd(); } @@ -4001,17 +4023,17 @@ sub read { $xfer += $input->skip($ftype); } last; }; - /^4$/ && do{ if ($ftype == TType::LIST) { + /^5$/ && do{ if ($ftype == TType::LIST) { { - my $_size219 = 0; + my $_size225 = 0; $self->{libraries} = []; - my $_etype222 = 0; - $xfer += $input->readListBegin(\$_etype222, \$_size219); - for (my $_i223 = 0; $_i223 < $_size219; ++$_i223) + my $_etype228 = 0; + $xfer += $input->readListBegin(\$_etype228, \$_size225); + for (my $_i229 = 0; $_i229 < $_size225; ++$_i229) { - my $elem224 = undef; - $xfer += $input->readString(\$elem224); - push(@{$self->{libraries}},$elem224); + my $elem230 = undef; + $xfer += $input->readString(\$elem230); + push(@{$self->{libraries}},$elem230); } $xfer += $input->readListEnd(); } @@ -4030,15 +4052,29 @@ sub read { sub write { my ($self, $output) = @_; my $xfer = 0; - $xfer += $output->writeStructBegin('AdhocByteCodeCommandRequest'); + $xfer += $output->writeStructBegin('AdHocByteCodeCommandRequest'); + if (defined $self->{tablesToInvoke}) { + $xfer += $output->writeFieldBegin('tablesToInvoke', TType::SET, 1); + { + $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{tablesToInvoke}})); + { + foreach my $iter231 (@{$self->{tablesToInvoke}}) + { + $xfer += $output->writeString($iter231); + } + } + $xfer += $output->writeSetEnd(); + } + $xfer += $output->writeFieldEnd(); + } if (defined $self->{arguments}) { - $xfer += $output->writeFieldBegin('arguments', TType::LIST, 1); + $xfer += $output->writeFieldBegin('arguments', TType::LIST, 2); { $xfer += $output->writeListBegin(TType::STRUCT, scalar(@{$self->{arguments}})); { - foreach my $iter225 (@{$self->{arguments}}) + foreach my $iter232 (@{$self->{arguments}}) { - $xfer += ${iter225}->write($output); + $xfer += ${iter232}->write($output); } } $xfer += $output->writeListEnd(); @@ -4046,19 +4082,19 @@ sub write { $xfer += $output->writeFieldEnd(); } if (defined $self->{instanceData}) { - $xfer += $output->writeFieldBegin('instanceData', TType::STRING, 2); + $xfer += $output->writeFieldBegin('instanceData', TType::STRING, 3); $xfer += $output->writeString($self->{instanceData}); $xfer += $output->writeFieldEnd(); } if (defined $self->{classData}) { - $xfer += $output->writeFieldBegin('classData', TType::MAP, 3); + $xfer += $output->writeFieldBegin('classData', TType::MAP, 4); { $xfer += $output->writeMapBegin(TType::STRING, TType::STRING, scalar(keys %{$self->{classData}})); { - while( my ($kiter226,$viter227) = each %{$self->{classData}}) + while( my ($kiter233,$viter234) = each %{$self->{classData}}) { - $xfer += $output->writeString($kiter226); - $xfer += $output->writeString($viter227); + $xfer += $output->writeString($kiter233); + $xfer += $output->writeString($viter234); } } $xfer += $output->writeMapEnd(); @@ -4066,13 +4102,13 @@ sub write { $xfer += $output->writeFieldEnd(); } if (defined $self->{libraries}) { - $xfer += $output->writeFieldBegin('libraries', TType::LIST, 4); + $xfer += $output->writeFieldBegin('libraries', TType::LIST, 5); { $xfer += $output->writeListBegin(TType::STRING, scalar(@{$self->{libraries}})); { - foreach my $iter228 (@{$self->{libraries}}) + foreach my $iter235 (@{$self->{libraries}}) { - $xfer += $output->writeString($iter228); + $xfer += $output->writeString($iter235); } } $xfer += $output->writeListEnd(); @@ -4084,9 +4120,9 @@ sub write { return $xfer; } -package Blur::AdhocByteCodeCommandResponse; +package Blur::AdHocByteCodeCommandResponse; use base qw(Class::Accessor); -Blur::AdhocByteCodeCommandResponse->mk_accessors( qw( result ) ); +Blur::AdHocByteCodeCommandResponse->mk_accessors( qw( result ) ); sub new { my $classname = shift; @@ -4102,7 +4138,7 @@ sub new { } sub getName { - return 'AdhocByteCodeCommandResponse'; + return 'AdHocByteCodeCommandResponse'; } sub read { @@ -4138,7 +4174,7 @@ sub read { sub write { my ($self, $output) = @_; my $xfer = 0; - $xfer += $output->writeStructBegin('AdhocByteCodeCommandResponse'); + $xfer += $output->writeStructBegin('AdHocByteCodeCommandResponse'); if (defined $self->{result}) { $xfer += $output->writeFieldBegin('result', TType::STRUCT, 1); $xfer += $self->{result}->write($output); @@ -4151,20 +4187,16 @@ sub write { package Blur::BlurCommandRequest; use base qw(Class::Accessor); -Blur::BlurCommandRequest->mk_accessors( qw( tablesToInvoke adhocByteCodeCommandRequest ) ); +Blur::BlurCommandRequest->mk_accessors( qw( adHocByteCodeCommandRequest ) ); sub new { my $classname = shift; my $self = {}; my $vals = shift || {}; - $self->{tablesToInvoke} = undef; - $self->{adhocByteCodeCommandRequest} = undef; + $self->{adHocByteCodeCommandRequest} = undef; if (UNIVERSAL::isa($vals,'HASH')) { - if (defined $vals->{tablesToInvoke}) { - $self->{tablesToInvoke} = $vals->{tablesToInvoke}; - } - if (defined $vals->{adhocByteCodeCommandRequest}) { - $self->{adhocByteCodeCommandRequest} = $vals->{adhocByteCodeCommandRequest}; + if (defined $vals->{adHocByteCodeCommandRequest}) { + $self->{adHocByteCodeCommandRequest} = $vals->{adHocByteCodeCommandRequest}; } } return bless ($self, $classname); @@ -4189,27 +4221,9 @@ sub read { } SWITCH: for($fid) { - /^1$/ && do{ if ($ftype == TType::SET) { - { - my $_size229 = 0; - $self->{tablesToInvoke} = {}; - my $_etype232 = 0; - $xfer += $input->readSetBegin(\$_etype232, \$_size229); - for (my $_i233 = 0; $_i233 < $_size229; ++$_i233) - { - my $elem234 = undef; - $xfer += $input->readString(\$elem234); - $self->{tablesToInvoke}->{$elem234} = 1; - } - $xfer += $input->readSetEnd(); - } - } else { - $xfer += $input->skip($ftype); - } - last; }; - /^2$/ && do{ if ($ftype == TType::STRUCT) { - $self->{adhocByteCodeCommandRequest} = new Blur::AdhocByteCodeCommandRequest(); - $xfer += $self->{adhocByteCodeCommandRequest}->read($input); + /^1$/ && do{ if ($ftype == TType::STRUCT) { + $self->{adHocByteCodeCommandRequest} = new Blur::AdHocByteCodeCommandRequest(); + $xfer += $self->{adHocByteCodeCommandRequest}->read($input); } else { $xfer += $input->skip($ftype); } @@ -4226,23 +4240,9 @@ sub write { my ($self, $output) = @_; my $xfer = 0; $xfer += $output->writeStructBegin('BlurCommandRequest'); - if (defined $self->{tablesToInvoke}) { - $xfer += $output->writeFieldBegin('tablesToInvoke', TType::SET, 1); - { - $xfer += $output->writeSetBegin(TType::STRING, scalar(@{$self->{tablesToInvoke}})); - { - foreach my $iter235 (@{$self->{tablesToInvoke}}) - { - $xfer += $output->writeString($iter235); - } - } - $xfer += $output->writeSetEnd(); - } - $xfer += $output->writeFieldEnd(); - } - if (defined $self->{adhocByteCodeCommandRequest}) { - $xfer += $output->writeFieldBegin('adhocByteCodeCommandRequest', TType::STRUCT, 2); - $xfer += $self->{adhocByteCodeCommandRequest}->write($output); + if (defined $self->{adHocByteCodeCommandRequest}) { + $xfer += $output->writeFieldBegin('adHocByteCodeCommandRequest', TType::STRUCT, 1); + $xfer += $self->{adHocByteCodeCommandRequest}->write($output); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); @@ -4252,16 +4252,16 @@ sub write { package Blur::BlurCommandResponse; use base qw(Class::Accessor); -Blur::BlurCommandResponse->mk_accessors( qw( adhocByteCodeCommandResponse ) ); +Blur::BlurCommandResponse->mk_accessors( qw( adHocByteCodeCommandResponse ) ); sub new { my $classname = shift; my $self = {}; my $vals = shift || {}; - $self->{adhocByteCodeCommandResponse} = undef; + $self->{adHocByteCodeCommandResponse} = undef; if (UNIVERSAL::isa($vals,'HASH')) { - if (defined $vals->{adhocByteCodeCommandResponse}) { - $self->{adhocByteCodeCommandResponse} = $vals->{adhocByteCodeCommandResponse}; + if (defined $vals->{adHocByteCodeCommandResponse}) { + $self->{adHocByteCodeCommandResponse} = $vals->{adHocByteCodeCommandResponse}; } } return bless ($self, $classname); @@ -4287,8 +4287,8 @@ sub read { SWITCH: for($fid) { /^1$/ && do{ if ($ftype == TType::STRUCT) { - $self->{adhocByteCodeCommandResponse} = new Blur::AdhocByteCodeCommandResponse(); - $xfer += $self->{adhocByteCodeCommandResponse}->read($input); + $self->{adHocByteCodeCommandResponse} = new Blur::AdHocByteCodeCommandResponse(); + $xfer += $self->{adHocByteCodeCommandResponse}->read($input); } else { $xfer += $input->skip($ftype); } @@ -4305,9 +4305,9 @@ sub write { my ($self, $output) = @_; my $xfer = 0; $xfer += $output->writeStructBegin('BlurCommandResponse'); - if (defined $self->{adhocByteCodeCommandResponse}) { - $xfer += $output->writeFieldBegin('adhocByteCodeCommandResponse', TType::STRUCT, 1); - $xfer += $self->{adhocByteCodeCommandResponse}->write($output); + if (defined $self->{adHocByteCodeCommandResponse}) { + $xfer += $output->writeFieldBegin('adHocByteCodeCommandResponse', TType::STRUCT, 1); + $xfer += $self->{adHocByteCodeCommandResponse}->write($output); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/distribution/src/main/scripts/interface/gen-rb/blur_platform.rb ---------------------------------------------------------------------- diff --git a/distribution/src/main/scripts/interface/gen-rb/blur_platform.rb b/distribution/src/main/scripts/interface/gen-rb/blur_platform.rb index ce63f60..6cf450c 100644 --- a/distribution/src/main/scripts/interface/gen-rb/blur_platform.rb +++ b/distribution/src/main/scripts/interface/gen-rb/blur_platform.rb @@ -12,13 +12,13 @@ module Blur class Client include ::Thrift::Client - def execute(request) - send_execute(request) + def execute(cluster, request) + send_execute(cluster, request) return recv_execute() end - def send_execute(request) - send_message('execute', Execute_args, :request => request) + def send_execute(cluster, request) + send_message('execute', Execute_args, :cluster => cluster, :request => request) end def recv_execute() @@ -37,7 +37,7 @@ module Blur args = read_args(iprot, Execute_args) result = Execute_result.new() begin - result.success = @handler.execute(args.request) + result.success = @handler.execute(args.cluster, args.request) rescue ::Blur::BlurException => ex result.ex = ex end @@ -50,9 +50,11 @@ module Blur class Execute_args include ::Thrift::Struct, ::Thrift::Struct_Union - REQUEST = 1 + CLUSTER = 1 + REQUEST = 2 FIELDS = { + CLUSTER => {:type => ::Thrift::Types::STRING, :name => 'cluster'}, REQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'request', :class => ::Blur::BlurCommandRequest} } http://git-wip-us.apache.org/repos/asf/incubator-blur/blob/d96892e4/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 e6efabe..39b7ad6 100644 --- a/distribution/src/main/scripts/interface/gen-rb/blur_types.rb +++ b/distribution/src/main/scripts/interface/gen-rb/blur_types.rb @@ -948,6 +948,7 @@ module Blur ::Thrift::Struct.generate_accessors self end + # Value carries serialized values. class Value include ::Thrift::Struct, ::Thrift::Struct_Union TYPE = 1 @@ -969,14 +970,17 @@ module Blur ::Thrift::Struct.generate_accessors self end - class AdhocByteCodeCommandRequest + # Carries ad hoc byte code based execution commands. + class AdHocByteCodeCommandRequest include ::Thrift::Struct, ::Thrift::Struct_Union - ARGUMENTS = 1 - INSTANCEDATA = 2 - CLASSDATA = 3 - LIBRARIES = 4 + TABLESTOINVOKE = 1 + ARGUMENTS = 2 + INSTANCEDATA = 3 + CLASSDATA = 4 + LIBRARIES = 5 FIELDS = { + TABLESTOINVOKE => {:type => ::Thrift::Types::SET, :name => 'tablesToInvoke', :element => {:type => ::Thrift::Types::STRING}}, ARGUMENTS => {:type => ::Thrift::Types::LIST, :name => 'arguments', :element => {:type => ::Thrift::Types::STRUCT, :class => ::Blur::Value}}, INSTANCEDATA => {:type => ::Thrift::Types::STRING, :name => 'instanceData', :binary => true}, CLASSDATA => {:type => ::Thrift::Types::MAP, :name => 'classData', :key => {:type => ::Thrift::Types::STRING}, :value => {:type => ::Thrift::Types::STRING, :binary => true}}, @@ -991,7 +995,7 @@ module Blur ::Thrift::Struct.generate_accessors self end - class AdhocByteCodeCommandResponse + class AdHocByteCodeCommandResponse include ::Thrift::Struct, ::Thrift::Struct_Union RESULT = 1 @@ -1010,21 +1014,15 @@ module Blur class BlurCommandRequest < ::Thrift::Union include ::Thrift::Struct_Union class << self - def tablesToInvoke(val) - BlurCommandRequest.new(:tablesToInvoke, val) - end - - def adhocByteCodeCommandRequest(val) - BlurCommandRequest.new(:adhocByteCodeCommandRequest, val) + def adHocByteCodeCommandRequest(val) + BlurCommandRequest.new(:adHocByteCodeCommandRequest, val) end end - TABLESTOINVOKE = 1 - ADHOCBYTECODECOMMANDREQUEST = 2 + ADHOCBYTECODECOMMANDREQUEST = 1 FIELDS = { - TABLESTOINVOKE => {:type => ::Thrift::Types::SET, :name => 'tablesToInvoke', :element => {:type => ::Thrift::Types::STRING}}, - ADHOCBYTECODECOMMANDREQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'adhocByteCodeCommandRequest', :class => ::Blur::AdhocByteCodeCommandRequest} + ADHOCBYTECODECOMMANDREQUEST => {:type => ::Thrift::Types::STRUCT, :name => 'adHocByteCodeCommandRequest', :class => ::Blur::AdHocByteCodeCommandRequest} } def struct_fields; FIELDS; end @@ -1039,15 +1037,15 @@ module Blur class BlurCommandResponse < ::Thrift::Union include ::Thrift::Struct_Union class << self - def adhocByteCodeCommandResponse(val) - BlurCommandResponse.new(:adhocByteCodeCommandResponse, val) + def adHocByteCodeCommandResponse(val) + BlurCommandResponse.new(:adHocByteCodeCommandResponse, val) end end ADHOCBYTECODECOMMANDRESPONSE = 1 FIELDS = { - ADHOCBYTECODECOMMANDRESPONSE => {:type => ::Thrift::Types::STRUCT, :name => 'adhocByteCodeCommandResponse', :class => ::Blur::AdhocByteCodeCommandResponse} + ADHOCBYTECODECOMMANDRESPONSE => {:type => ::Thrift::Types::STRUCT, :name => 'adHocByteCodeCommandResponse', :class => ::Blur::AdHocByteCodeCommandResponse} } def struct_fields; FIELDS; end
