Repository: airavata Updated Branches: refs/heads/develop 55d2fe92c -> 4772b99e3
correcting parallelism typo Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/4772b99e Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/4772b99e Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/4772b99e Branch: refs/heads/develop Commit: 4772b99e344aa3055c409992de8158ae356f863e Parents: 55d2fe9 Author: smarru <[email protected]> Authored: Fri Feb 26 12:44:36 2016 -0500 Committer: smarru <[email protected]> Committed: Fri Feb 26 12:44:36 2016 -0500 ---------------------------------------------------------------------- .../airavata/compute_resource_model_types.cpp | 28 ++-- .../lib/airavata/compute_resource_model_types.h | 12 +- .../Model/AppCatalog/ComputeResource/Types.php | 22 +-- .../model/appcatalog/computeresource/ttypes.py | 22 +-- .../computeresource/ResourceJobManager.java | 142 +++++++++---------- .../compute_resource_model.thrift | 2 +- 6 files changed, 114 insertions(+), 114 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp index 0b81761..7756b6c 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.cpp @@ -166,9 +166,9 @@ void ResourceJobManager::__set_jobManagerCommands(const std::map<JobManagerComma __isset.jobManagerCommands = true; } -void ResourceJobManager::__set_parallalisimPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val) { - this->parallalisimPrefix = val; -__isset.parallalisimPrefix = true; +void ResourceJobManager::__set_parallelismPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val) { + this->parallelismPrefix = val; +__isset.parallelismPrefix = true; } uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot) { @@ -256,7 +256,7 @@ uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot) case 6: if (ftype == ::apache::thrift::protocol::T_MAP) { { - this->parallalisimPrefix.clear(); + this->parallelismPrefix.clear(); uint32_t _size9; ::apache::thrift::protocol::TType _ktype10; ::apache::thrift::protocol::TType _vtype11; @@ -268,12 +268,12 @@ uint32_t ResourceJobManager::read(::apache::thrift::protocol::TProtocol* iprot) int32_t ecast16; xfer += iprot->readI32(ecast16); _key14 = ( ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type)ecast16; - std::string& _val15 = this->parallalisimPrefix[_key14]; + std::string& _val15 = this->parallelismPrefix[_key14]; xfer += iprot->readString(_val15); } xfer += iprot->readMapEnd(); } - this->__isset.parallalisimPrefix = true; + this->__isset.parallelismPrefix = true; } else { xfer += iprot->skip(ftype); } @@ -331,12 +331,12 @@ uint32_t ResourceJobManager::write(::apache::thrift::protocol::TProtocol* oprot) } xfer += oprot->writeFieldEnd(); } - if (this->__isset.parallalisimPrefix) { - xfer += oprot->writeFieldBegin("parallalisimPrefix", ::apache::thrift::protocol::T_MAP, 6); + if (this->__isset.parallelismPrefix) { + xfer += oprot->writeFieldBegin("parallelismPrefix", ::apache::thrift::protocol::T_MAP, 6); { - xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parallalisimPrefix.size())); + xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_I32, ::apache::thrift::protocol::T_STRING, static_cast<uint32_t>(this->parallelismPrefix.size())); std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> ::const_iterator _iter18; - for (_iter18 = this->parallalisimPrefix.begin(); _iter18 != this->parallalisimPrefix.end(); ++_iter18) + for (_iter18 = this->parallelismPrefix.begin(); _iter18 != this->parallelismPrefix.end(); ++_iter18) { xfer += oprot->writeI32((int32_t)_iter18->first); xfer += oprot->writeString(_iter18->second); @@ -357,7 +357,7 @@ void swap(ResourceJobManager &a, ResourceJobManager &b) { swap(a.pushMonitoringEndpoint, b.pushMonitoringEndpoint); swap(a.jobManagerBinPath, b.jobManagerBinPath); swap(a.jobManagerCommands, b.jobManagerCommands); - swap(a.parallalisimPrefix, b.parallalisimPrefix); + swap(a.parallelismPrefix, b.parallelismPrefix); swap(a.__isset, b.__isset); } @@ -367,7 +367,7 @@ ResourceJobManager::ResourceJobManager(const ResourceJobManager& other19) { pushMonitoringEndpoint = other19.pushMonitoringEndpoint; jobManagerBinPath = other19.jobManagerBinPath; jobManagerCommands = other19.jobManagerCommands; - parallalisimPrefix = other19.parallalisimPrefix; + parallelismPrefix = other19.parallelismPrefix; __isset = other19.__isset; } ResourceJobManager& ResourceJobManager::operator=(const ResourceJobManager& other20) { @@ -376,7 +376,7 @@ ResourceJobManager& ResourceJobManager::operator=(const ResourceJobManager& othe pushMonitoringEndpoint = other20.pushMonitoringEndpoint; jobManagerBinPath = other20.jobManagerBinPath; jobManagerCommands = other20.jobManagerCommands; - parallalisimPrefix = other20.parallalisimPrefix; + parallelismPrefix = other20.parallelismPrefix; __isset = other20.__isset; return *this; } @@ -388,7 +388,7 @@ void ResourceJobManager::printTo(std::ostream& out) const { out << ", " << "pushMonitoringEndpoint="; (__isset.pushMonitoringEndpoint ? (out << to_string(pushMonitoringEndpoint)) : (out << "<null>")); out << ", " << "jobManagerBinPath="; (__isset.jobManagerBinPath ? (out << to_string(jobManagerBinPath)) : (out << "<null>")); out << ", " << "jobManagerCommands="; (__isset.jobManagerCommands ? (out << to_string(jobManagerCommands)) : (out << "<null>")); - out << ", " << "parallalisimPrefix="; (__isset.parallalisimPrefix ? (out << to_string(parallalisimPrefix)) : (out << "<null>")); + out << ", " << "parallelismPrefix="; (__isset.parallelismPrefix ? (out << to_string(parallelismPrefix)) : (out << "<null>")); out << ")"; } http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h index 3a1b23a..ff02515 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/airavata/compute_resource_model_types.h @@ -140,11 +140,11 @@ class JobSubmissionInterface; class ComputeResourceDescription; typedef struct _ResourceJobManager__isset { - _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false), parallalisimPrefix(false) {} + _ResourceJobManager__isset() : pushMonitoringEndpoint(false), jobManagerBinPath(false), jobManagerCommands(false), parallelismPrefix(false) {} bool pushMonitoringEndpoint :1; bool jobManagerBinPath :1; bool jobManagerCommands :1; - bool parallalisimPrefix :1; + bool parallelismPrefix :1; } _ResourceJobManager__isset; class ResourceJobManager { @@ -161,7 +161,7 @@ class ResourceJobManager { std::string pushMonitoringEndpoint; std::string jobManagerBinPath; std::map<JobManagerCommand::type, std::string> jobManagerCommands; - std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> parallalisimPrefix; + std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> parallelismPrefix; _ResourceJobManager__isset __isset; @@ -175,7 +175,7 @@ class ResourceJobManager { void __set_jobManagerCommands(const std::map<JobManagerCommand::type, std::string> & val); - void __set_parallalisimPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val); + void __set_parallelismPrefix(const std::map< ::apache::airavata::model::appcatalog::parallelism::ApplicationParallelismType::type, std::string> & val); bool operator == (const ResourceJobManager & rhs) const { @@ -195,9 +195,9 @@ class ResourceJobManager { return false; else if (__isset.jobManagerCommands && !(jobManagerCommands == rhs.jobManagerCommands)) return false; - if (__isset.parallalisimPrefix != rhs.__isset.parallalisimPrefix) + if (__isset.parallelismPrefix != rhs.__isset.parallelismPrefix) return false; - else if (__isset.parallalisimPrefix && !(parallalisimPrefix == rhs.parallalisimPrefix)) + else if (__isset.parallelismPrefix && !(parallelismPrefix == rhs.parallelismPrefix)) return false; return true; } http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php index f99923d..64a406c 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/AppCatalog/ComputeResource/Types.php @@ -249,7 +249,7 @@ class ResourceJobManager { /** * @var array */ - public $parallalisimPrefix = null; + public $parallelismPrefix = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -283,7 +283,7 @@ class ResourceJobManager { ), ), 6 => array( - 'var' => 'parallalisimPrefix', + 'var' => 'parallelismPrefix', 'type' => TType::MAP, 'ktype' => TType::I32, 'vtype' => TType::STRING, @@ -312,8 +312,8 @@ class ResourceJobManager { if (isset($vals['jobManagerCommands'])) { $this->jobManagerCommands = $vals['jobManagerCommands']; } - if (isset($vals['parallalisimPrefix'])) { - $this->parallalisimPrefix = $vals['parallalisimPrefix']; + if (isset($vals['parallelismPrefix'])) { + $this->parallelismPrefix = $vals['parallelismPrefix']; } } } @@ -387,7 +387,7 @@ class ResourceJobManager { break; case 6: if ($ftype == TType::MAP) { - $this->parallalisimPrefix = array(); + $this->parallelismPrefix = array(); $_size7 = 0; $_ktype8 = 0; $_vtype9 = 0; @@ -398,7 +398,7 @@ class ResourceJobManager { $val13 = ''; $xfer += $input->readI32($key12); $xfer += $input->readString($val13); - $this->parallalisimPrefix[$key12] = $val13; + $this->parallelismPrefix[$key12] = $val13; } $xfer += $input->readMapEnd(); } else { @@ -456,15 +456,15 @@ class ResourceJobManager { } $xfer += $output->writeFieldEnd(); } - if ($this->parallalisimPrefix !== null) { - if (!is_array($this->parallalisimPrefix)) { + if ($this->parallelismPrefix !== null) { + if (!is_array($this->parallelismPrefix)) { throw new TProtocolException('Bad type in structure.', TProtocolException::INVALID_DATA); } - $xfer += $output->writeFieldBegin('parallalisimPrefix', TType::MAP, 6); + $xfer += $output->writeFieldBegin('parallelismPrefix', TType::MAP, 6); { - $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallalisimPrefix)); + $output->writeMapBegin(TType::I32, TType::STRING, count($this->parallelismPrefix)); { - foreach ($this->parallalisimPrefix as $kiter16 => $viter17) + foreach ($this->parallelismPrefix as $kiter16 => $viter17) { $xfer += $output->writeI32($kiter16); $xfer += $output->writeString($viter17); http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py index 2a17da1..07cda34 100644 --- a/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py +++ b/airavata-api/airavata-client-sdks/airavata-python-sdk/src/main/resources/lib/apache/airavata/model/appcatalog/computeresource/ttypes.py @@ -288,7 +288,7 @@ class ResourceJobManager: - pushMonitoringEndpoint - jobManagerBinPath - jobManagerCommands - - parallalisimPrefix + - parallelismPrefix """ thrift_spec = ( @@ -298,16 +298,16 @@ class ResourceJobManager: (3, TType.STRING, 'pushMonitoringEndpoint', None, None, ), # 3 (4, TType.STRING, 'jobManagerBinPath', None, None, ), # 4 (5, TType.MAP, 'jobManagerCommands', (TType.I32,None,TType.STRING,None), None, ), # 5 - (6, TType.MAP, 'parallalisimPrefix', (TType.I32,None,TType.STRING,None), None, ), # 6 + (6, TType.MAP, 'parallelismPrefix', (TType.I32,None,TType.STRING,None), None, ), # 6 ) - def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None, parallalisimPrefix=None,): + def __init__(self, resourceJobManagerId=thrift_spec[1][4], resourceJobManagerType=None, pushMonitoringEndpoint=None, jobManagerBinPath=None, jobManagerCommands=None, parallelismPrefix=None,): self.resourceJobManagerId = resourceJobManagerId self.resourceJobManagerType = resourceJobManagerType self.pushMonitoringEndpoint = pushMonitoringEndpoint self.jobManagerBinPath = jobManagerBinPath self.jobManagerCommands = jobManagerCommands - self.parallalisimPrefix = parallalisimPrefix + self.parallelismPrefix = parallelismPrefix def read(self, iprot): if iprot.__class__ == TBinaryProtocol.TBinaryProtocolAccelerated and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None and fastbinary is not None: @@ -351,12 +351,12 @@ class ResourceJobManager: iprot.skip(ftype) elif fid == 6: if ftype == TType.MAP: - self.parallalisimPrefix = {} + self.parallelismPrefix = {} (_ktype8, _vtype9, _size7 ) = iprot.readMapBegin() for _i11 in xrange(_size7): _key12 = iprot.readI32() _val13 = iprot.readString() - self.parallalisimPrefix[_key12] = _val13 + self.parallelismPrefix[_key12] = _val13 iprot.readMapEnd() else: iprot.skip(ftype) @@ -394,10 +394,10 @@ class ResourceJobManager: oprot.writeString(viter15) oprot.writeMapEnd() oprot.writeFieldEnd() - if self.parallalisimPrefix is not None: - oprot.writeFieldBegin('parallalisimPrefix', TType.MAP, 6) - oprot.writeMapBegin(TType.I32, TType.STRING, len(self.parallalisimPrefix)) - for kiter16,viter17 in self.parallalisimPrefix.items(): + if self.parallelismPrefix is not None: + oprot.writeFieldBegin('parallelismPrefix', TType.MAP, 6) + oprot.writeMapBegin(TType.I32, TType.STRING, len(self.parallelismPrefix)) + for kiter16,viter17 in self.parallelismPrefix.items(): oprot.writeI32(kiter16) oprot.writeString(viter17) oprot.writeMapEnd() @@ -420,7 +420,7 @@ class ResourceJobManager: value = (value * 31) ^ hash(self.pushMonitoringEndpoint) value = (value * 31) ^ hash(self.jobManagerBinPath) value = (value * 31) ^ hash(self.jobManagerCommands) - value = (value * 31) ^ hash(self.parallalisimPrefix) + value = (value * 31) ^ hash(self.parallelismPrefix) return value def __repr__(self): http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java index 7f2fa4b..4e925db 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/appcatalog/computeresource/ResourceJobManager.java @@ -77,7 +77,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa private static final org.apache.thrift.protocol.TField PUSH_MONITORING_ENDPOINT_FIELD_DESC = new org.apache.thrift.protocol.TField("pushMonitoringEndpoint", org.apache.thrift.protocol.TType.STRING, (short)3); private static final org.apache.thrift.protocol.TField JOB_MANAGER_BIN_PATH_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerBinPath", org.apache.thrift.protocol.TType.STRING, (short)4); private static final org.apache.thrift.protocol.TField JOB_MANAGER_COMMANDS_FIELD_DESC = new org.apache.thrift.protocol.TField("jobManagerCommands", org.apache.thrift.protocol.TType.MAP, (short)5); - private static final org.apache.thrift.protocol.TField PARALLALISIM_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("parallalisimPrefix", org.apache.thrift.protocol.TType.MAP, (short)6); + private static final org.apache.thrift.protocol.TField PARALLELISM_PREFIX_FIELD_DESC = new org.apache.thrift.protocol.TField("parallelismPrefix", org.apache.thrift.protocol.TType.MAP, (short)6); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -90,7 +90,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa private String pushMonitoringEndpoint; // optional private String jobManagerBinPath; // optional private Map<JobManagerCommand,String> jobManagerCommands; // optional - private Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix; // optional + private Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallelismPrefix; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -103,7 +103,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa PUSH_MONITORING_ENDPOINT((short)3, "pushMonitoringEndpoint"), JOB_MANAGER_BIN_PATH((short)4, "jobManagerBinPath"), JOB_MANAGER_COMMANDS((short)5, "jobManagerCommands"), - PARALLALISIM_PREFIX((short)6, "parallalisimPrefix"); + PARALLELISM_PREFIX((short)6, "parallelismPrefix"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -128,8 +128,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return JOB_MANAGER_BIN_PATH; case 5: // JOB_MANAGER_COMMANDS return JOB_MANAGER_COMMANDS; - case 6: // PARALLALISIM_PREFIX - return PARALLALISIM_PREFIX; + case 6: // PARALLELISM_PREFIX + return PARALLELISM_PREFIX; default: return null; } @@ -170,7 +170,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } // isset id assignments - private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLALISIM_PREFIX}; + private static final _Fields optionals[] = {_Fields.PUSH_MONITORING_ENDPOINT,_Fields.JOB_MANAGER_BIN_PATH,_Fields.JOB_MANAGER_COMMANDS,_Fields.PARALLELISM_PREFIX}; public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap; static { Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class); @@ -186,7 +186,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, JobManagerCommand.class), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); - tmpMap.put(_Fields.PARALLALISIM_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("parallalisimPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.PARALLELISM_PREFIX, new org.apache.thrift.meta_data.FieldMetaData("parallelismPrefix", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP, new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, org.apache.airavata.model.parallelism.ApplicationParallelismType.class), new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)))); @@ -239,20 +239,20 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } this.jobManagerCommands = __this__jobManagerCommands; } - if (other.isSetParallalisimPrefix()) { - Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> __this__parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallalisimPrefix.size()); - for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> other_element : other.parallalisimPrefix.entrySet()) { + if (other.isSetParallelismPrefix()) { + Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> __this__parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(other.parallelismPrefix.size()); + for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> other_element : other.parallelismPrefix.entrySet()) { org.apache.airavata.model.parallelism.ApplicationParallelismType other_element_key = other_element.getKey(); String other_element_value = other_element.getValue(); - org.apache.airavata.model.parallelism.ApplicationParallelismType __this__parallalisimPrefix_copy_key = other_element_key; + org.apache.airavata.model.parallelism.ApplicationParallelismType __this__parallelismPrefix_copy_key = other_element_key; - String __this__parallalisimPrefix_copy_value = other_element_value; + String __this__parallelismPrefix_copy_value = other_element_value; - __this__parallalisimPrefix.put(__this__parallalisimPrefix_copy_key, __this__parallalisimPrefix_copy_value); + __this__parallelismPrefix.put(__this__parallelismPrefix_copy_key, __this__parallelismPrefix_copy_value); } - this.parallalisimPrefix = __this__parallalisimPrefix; + this.parallelismPrefix = __this__parallelismPrefix; } } @@ -268,7 +268,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa this.pushMonitoringEndpoint = null; this.jobManagerBinPath = null; this.jobManagerCommands = null; - this.parallalisimPrefix = null; + this.parallelismPrefix = null; } public String getResourceJobManagerId() { @@ -405,37 +405,37 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } } - public int getParallalisimPrefixSize() { - return (this.parallalisimPrefix == null) ? 0 : this.parallalisimPrefix.size(); + public int getParallelismPrefixSize() { + return (this.parallelismPrefix == null) ? 0 : this.parallelismPrefix.size(); } - public void putToParallalisimPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType key, String val) { - if (this.parallalisimPrefix == null) { - this.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(); + public void putToParallelismPrefix(org.apache.airavata.model.parallelism.ApplicationParallelismType key, String val) { + if (this.parallelismPrefix == null) { + this.parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(); } - this.parallalisimPrefix.put(key, val); + this.parallelismPrefix.put(key, val); } - public Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> getParallalisimPrefix() { - return this.parallalisimPrefix; + public Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> getParallelismPrefix() { + return this.parallelismPrefix; } - public void setParallalisimPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallalisimPrefix) { - this.parallalisimPrefix = parallalisimPrefix; + public void setParallelismPrefix(Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String> parallelismPrefix) { + this.parallelismPrefix = parallelismPrefix; } - public void unsetParallalisimPrefix() { - this.parallalisimPrefix = null; + public void unsetParallelismPrefix() { + this.parallelismPrefix = null; } - /** Returns true if field parallalisimPrefix is set (has been assigned a value) and false otherwise */ - public boolean isSetParallalisimPrefix() { - return this.parallalisimPrefix != null; + /** Returns true if field parallelismPrefix is set (has been assigned a value) and false otherwise */ + public boolean isSetParallelismPrefix() { + return this.parallelismPrefix != null; } - public void setParallalisimPrefixIsSet(boolean value) { + public void setParallelismPrefixIsSet(boolean value) { if (!value) { - this.parallalisimPrefix = null; + this.parallelismPrefix = null; } } @@ -481,11 +481,11 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } break; - case PARALLALISIM_PREFIX: + case PARALLELISM_PREFIX: if (value == null) { - unsetParallalisimPrefix(); + unsetParallelismPrefix(); } else { - setParallalisimPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value); + setParallelismPrefix((Map<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>)value); } break; @@ -509,8 +509,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa case JOB_MANAGER_COMMANDS: return getJobManagerCommands(); - case PARALLALISIM_PREFIX: - return getParallalisimPrefix(); + case PARALLELISM_PREFIX: + return getParallelismPrefix(); } throw new IllegalStateException(); @@ -533,8 +533,8 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return isSetJobManagerBinPath(); case JOB_MANAGER_COMMANDS: return isSetJobManagerCommands(); - case PARALLALISIM_PREFIX: - return isSetParallalisimPrefix(); + case PARALLELISM_PREFIX: + return isSetParallelismPrefix(); } throw new IllegalStateException(); } @@ -597,12 +597,12 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return false; } - boolean this_present_parallalisimPrefix = true && this.isSetParallalisimPrefix(); - boolean that_present_parallalisimPrefix = true && that.isSetParallalisimPrefix(); - if (this_present_parallalisimPrefix || that_present_parallalisimPrefix) { - if (!(this_present_parallalisimPrefix && that_present_parallalisimPrefix)) + boolean this_present_parallelismPrefix = true && this.isSetParallelismPrefix(); + boolean that_present_parallelismPrefix = true && that.isSetParallelismPrefix(); + if (this_present_parallelismPrefix || that_present_parallelismPrefix) { + if (!(this_present_parallelismPrefix && that_present_parallelismPrefix)) return false; - if (!this.parallalisimPrefix.equals(that.parallalisimPrefix)) + if (!this.parallelismPrefix.equals(that.parallelismPrefix)) return false; } @@ -638,10 +638,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa if (present_jobManagerCommands) list.add(jobManagerCommands); - boolean present_parallalisimPrefix = true && (isSetParallalisimPrefix()); - list.add(present_parallalisimPrefix); - if (present_parallalisimPrefix) - list.add(parallalisimPrefix); + boolean present_parallelismPrefix = true && (isSetParallelismPrefix()); + list.add(present_parallelismPrefix); + if (present_parallelismPrefix) + list.add(parallelismPrefix); return list.hashCode(); } @@ -704,12 +704,12 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa return lastComparison; } } - lastComparison = Boolean.valueOf(isSetParallalisimPrefix()).compareTo(other.isSetParallalisimPrefix()); + lastComparison = Boolean.valueOf(isSetParallelismPrefix()).compareTo(other.isSetParallelismPrefix()); if (lastComparison != 0) { return lastComparison; } - if (isSetParallalisimPrefix()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallalisimPrefix, other.parallalisimPrefix); + if (isSetParallelismPrefix()) { + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.parallelismPrefix, other.parallelismPrefix); if (lastComparison != 0) { return lastComparison; } @@ -779,13 +779,13 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } first = false; } - if (isSetParallalisimPrefix()) { + if (isSetParallelismPrefix()) { if (!first) sb.append(", "); - sb.append("parallalisimPrefix:"); - if (this.parallalisimPrefix == null) { + sb.append("parallelismPrefix:"); + if (this.parallelismPrefix == null) { sb.append("null"); } else { - sb.append(this.parallalisimPrefix); + sb.append(this.parallelismPrefix); } first = false; } @@ -892,22 +892,22 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } break; - case 6: // PARALLALISIM_PREFIX + case 6: // PARALLELISM_PREFIX if (schemeField.type == org.apache.thrift.protocol.TType.MAP) { { org.apache.thrift.protocol.TMap _map4 = iprot.readMapBegin(); - struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size); + struct.parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map4.size); org.apache.airavata.model.parallelism.ApplicationParallelismType _key5; String _val6; for (int _i7 = 0; _i7 < _map4.size; ++_i7) { _key5 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); _val6 = iprot.readString(); - struct.parallalisimPrefix.put(_key5, _val6); + struct.parallelismPrefix.put(_key5, _val6); } iprot.readMapEnd(); } - struct.setParallalisimPrefixIsSet(true); + struct.setParallelismPrefixIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); } @@ -964,12 +964,12 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa oprot.writeFieldEnd(); } } - if (struct.parallalisimPrefix != null) { - if (struct.isSetParallalisimPrefix()) { - oprot.writeFieldBegin(PARALLALISIM_PREFIX_FIELD_DESC); + if (struct.parallelismPrefix != null) { + if (struct.isSetParallelismPrefix()) { + oprot.writeFieldBegin(PARALLELISM_PREFIX_FIELD_DESC); { - oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.parallalisimPrefix.size())); - for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter9 : struct.parallalisimPrefix.entrySet()) + oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, struct.parallelismPrefix.size())); + for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter9 : struct.parallelismPrefix.entrySet()) { oprot.writeI32(_iter9.getKey().getValue()); oprot.writeString(_iter9.getValue()); @@ -1008,7 +1008,7 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa if (struct.isSetJobManagerCommands()) { optionals.set(2); } - if (struct.isSetParallalisimPrefix()) { + if (struct.isSetParallelismPrefix()) { optionals.set(3); } oprot.writeBitSet(optionals, 4); @@ -1028,10 +1028,10 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa } } } - if (struct.isSetParallalisimPrefix()) { + if (struct.isSetParallelismPrefix()) { { - oprot.writeI32(struct.parallalisimPrefix.size()); - for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter11 : struct.parallalisimPrefix.entrySet()) + oprot.writeI32(struct.parallelismPrefix.size()); + for (Map.Entry<org.apache.airavata.model.parallelism.ApplicationParallelismType, String> _iter11 : struct.parallelismPrefix.entrySet()) { oprot.writeI32(_iter11.getKey().getValue()); oprot.writeString(_iter11.getValue()); @@ -1074,17 +1074,17 @@ public class ResourceJobManager implements org.apache.thrift.TBase<ResourceJobMa if (incoming.get(3)) { { org.apache.thrift.protocol.TMap _map16 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.I32, org.apache.thrift.protocol.TType.STRING, iprot.readI32()); - struct.parallalisimPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size); + struct.parallelismPrefix = new HashMap<org.apache.airavata.model.parallelism.ApplicationParallelismType,String>(2*_map16.size); org.apache.airavata.model.parallelism.ApplicationParallelismType _key17; String _val18; for (int _i19 = 0; _i19 < _map16.size; ++_i19) { _key17 = org.apache.airavata.model.parallelism.ApplicationParallelismType.findByValue(iprot.readI32()); _val18 = iprot.readString(); - struct.parallalisimPrefix.put(_key17, _val18); + struct.parallelismPrefix.put(_key17, _val18); } } - struct.setParallalisimPrefixIsSet(true); + struct.setParallelismPrefixIsSet(true); } } } http://git-wip-us.apache.org/repos/asf/airavata/blob/4772b99e/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift ---------------------------------------------------------------------- diff --git a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift index 35072fe..4bbbecf 100644 --- a/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift +++ b/thrift-interface-descriptions/data-models/resource-catalog-models/compute_resource_model.thrift @@ -114,7 +114,7 @@ struct ResourceJobManager { 3: optional string pushMonitoringEndpoint, 4: optional string jobManagerBinPath, 5: optional map<JobManagerCommand, string> jobManagerCommands, - 6: optional map<parallelism_model.ApplicationParallelismType, string> parallalisimPrefix + 6: optional map<parallelism_model.ApplicationParallelismType, string> parallelismPrefix } /**
