Repository: airavata Updated Branches: refs/heads/master 125098de1 -> 47f6ed33a
fixing AIRAVATA-1204 Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/47f6ed33 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/47f6ed33 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/47f6ed33 Branch: refs/heads/master Commit: 47f6ed33a5f312fe64df3944dca095ec73002ef1 Parents: 125098d Author: Chathuri Wimalasena <[email protected]> Authored: Fri Jun 6 14:28:48 2014 -0400 Committer: Chathuri Wimalasena <[email protected]> Committed: Fri Jun 6 14:28:48 2014 -0400 ---------------------------------------------------------------------- .../resources/lib/experimentModel_types.cpp | 12 ++--- .../main/resources/lib/experimentModel_types.h | 18 +++---- .../Model/Workspace/Experiment/Types.php | 16 +++--- .../samples/TestCreateLaunchExperiment.java | 15 +++++- .../ComputationalResourceScheduling.java | 54 ++++++++++---------- .../experimentModel.thrift | 2 +- 6 files changed, 65 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/47f6ed33/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp index 24434a9..0180c5e 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.cpp @@ -898,8 +898,8 @@ uint32_t ComputationalResourceScheduling::read(::apache::thrift::protocol::TProt break; case 9: if (ftype == ::apache::thrift::protocol::T_STRING) { - xfer += iprot->readString(this->ComputationalProjectAccount); - this->__isset.ComputationalProjectAccount = true; + xfer += iprot->readString(this->computationalProjectAccount); + this->__isset.computationalProjectAccount = true; } else { xfer += iprot->skip(ftype); } @@ -960,9 +960,9 @@ uint32_t ComputationalResourceScheduling::write(::apache::thrift::protocol::TPro xfer += oprot->writeI32(this->totalPhysicalMemory); xfer += oprot->writeFieldEnd(); } - if (this->__isset.ComputationalProjectAccount) { - xfer += oprot->writeFieldBegin("ComputationalProjectAccount", ::apache::thrift::protocol::T_STRING, 9); - xfer += oprot->writeString(this->ComputationalProjectAccount); + if (this->__isset.computationalProjectAccount) { + xfer += oprot->writeFieldBegin("computationalProjectAccount", ::apache::thrift::protocol::T_STRING, 9); + xfer += oprot->writeString(this->computationalProjectAccount); xfer += oprot->writeFieldEnd(); } xfer += oprot->writeFieldStop(); @@ -980,7 +980,7 @@ void swap(ComputationalResourceScheduling &a, ComputationalResourceScheduling &b swap(a.wallTimeLimit, b.wallTimeLimit); swap(a.jobStartTime, b.jobStartTime); swap(a.totalPhysicalMemory, b.totalPhysicalMemory); - swap(a.ComputationalProjectAccount, b.ComputationalProjectAccount); + swap(a.computationalProjectAccount, b.computationalProjectAccount); swap(a.__isset, b.__isset); } http://git-wip-us.apache.org/repos/asf/airavata/blob/47f6ed33/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h index 8ce11db..aeb411d 100644 --- a/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h +++ b/airavata-api/airavata-client-sdks/airavata-cpp-sdk/src/main/resources/lib/experimentModel_types.h @@ -551,7 +551,7 @@ class DataObjectType { void swap(DataObjectType &a, DataObjectType &b); typedef struct _ComputationalResourceScheduling__isset { - _ComputationalResourceScheduling__isset() : resourceHostId(false), totalCPUCount(false), nodeCount(false), numberOfThreads(false), queueName(false), wallTimeLimit(false), jobStartTime(false), totalPhysicalMemory(false), ComputationalProjectAccount(false) {} + _ComputationalResourceScheduling__isset() : resourceHostId(false), totalCPUCount(false), nodeCount(false), numberOfThreads(false), queueName(false), wallTimeLimit(false), jobStartTime(false), totalPhysicalMemory(false), computationalProjectAccount(false) {} bool resourceHostId; bool totalCPUCount; bool nodeCount; @@ -560,7 +560,7 @@ typedef struct _ComputationalResourceScheduling__isset { bool wallTimeLimit; bool jobStartTime; bool totalPhysicalMemory; - bool ComputationalProjectAccount; + bool computationalProjectAccount; } _ComputationalResourceScheduling__isset; class ComputationalResourceScheduling { @@ -569,7 +569,7 @@ class ComputationalResourceScheduling { static const char* ascii_fingerprint; // = "32AC7AC41AD3753A7224A32FD6EB4B5D"; static const uint8_t binary_fingerprint[16]; // = {0x32,0xAC,0x7A,0xC4,0x1A,0xD3,0x75,0x3A,0x72,0x24,0xA3,0x2F,0xD6,0xEB,0x4B,0x5D}; - ComputationalResourceScheduling() : resourceHostId(), totalCPUCount(0), nodeCount(0), numberOfThreads(0), queueName(), wallTimeLimit(0), jobStartTime(0), totalPhysicalMemory(0), ComputationalProjectAccount() { + ComputationalResourceScheduling() : resourceHostId(), totalCPUCount(0), nodeCount(0), numberOfThreads(0), queueName(), wallTimeLimit(0), jobStartTime(0), totalPhysicalMemory(0), computationalProjectAccount() { } virtual ~ComputationalResourceScheduling() throw() {} @@ -582,7 +582,7 @@ class ComputationalResourceScheduling { int32_t wallTimeLimit; int32_t jobStartTime; int32_t totalPhysicalMemory; - std::string ComputationalProjectAccount; + std::string computationalProjectAccount; _ComputationalResourceScheduling__isset __isset; @@ -626,9 +626,9 @@ class ComputationalResourceScheduling { __isset.totalPhysicalMemory = true; } - void __set_ComputationalProjectAccount(const std::string& val) { - ComputationalProjectAccount = val; - __isset.ComputationalProjectAccount = true; + void __set_computationalProjectAccount(const std::string& val) { + computationalProjectAccount = val; + __isset.computationalProjectAccount = true; } bool operator == (const ComputationalResourceScheduling & rhs) const @@ -665,9 +665,9 @@ class ComputationalResourceScheduling { return false; else if (__isset.totalPhysicalMemory && !(totalPhysicalMemory == rhs.totalPhysicalMemory)) return false; - if (__isset.ComputationalProjectAccount != rhs.__isset.ComputationalProjectAccount) + if (__isset.computationalProjectAccount != rhs.__isset.computationalProjectAccount) return false; - else if (__isset.ComputationalProjectAccount && !(ComputationalProjectAccount == rhs.ComputationalProjectAccount)) + else if (__isset.computationalProjectAccount && !(computationalProjectAccount == rhs.computationalProjectAccount)) return false; return true; } http://git-wip-us.apache.org/repos/asf/airavata/blob/47f6ed33/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php index 8554e04..f031ddf 100644 --- a/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php +++ b/airavata-api/airavata-client-sdks/airavata-php-sdk/src/main/resources/lib/Airavata/Model/Workspace/Experiment/Types.php @@ -909,7 +909,7 @@ class ComputationalResourceScheduling { public $wallTimeLimit = null; public $jobStartTime = null; public $totalPhysicalMemory = null; - public $ComputationalProjectAccount = null; + public $computationalProjectAccount = null; public function __construct($vals=null) { if (!isset(self::$_TSPEC)) { @@ -947,7 +947,7 @@ class ComputationalResourceScheduling { 'type' => TType::I32, ), 9 => array( - 'var' => 'ComputationalProjectAccount', + 'var' => 'computationalProjectAccount', 'type' => TType::STRING, ), ); @@ -977,8 +977,8 @@ class ComputationalResourceScheduling { if (isset($vals['totalPhysicalMemory'])) { $this->totalPhysicalMemory = $vals['totalPhysicalMemory']; } - if (isset($vals['ComputationalProjectAccount'])) { - $this->ComputationalProjectAccount = $vals['ComputationalProjectAccount']; + if (isset($vals['computationalProjectAccount'])) { + $this->computationalProjectAccount = $vals['computationalProjectAccount']; } } } @@ -1060,7 +1060,7 @@ class ComputationalResourceScheduling { break; case 9: if ($ftype == TType::STRING) { - $xfer += $input->readString($this->ComputationalProjectAccount); + $xfer += $input->readString($this->computationalProjectAccount); } else { $xfer += $input->skip($ftype); } @@ -1118,9 +1118,9 @@ class ComputationalResourceScheduling { $xfer += $output->writeI32($this->totalPhysicalMemory); $xfer += $output->writeFieldEnd(); } - if ($this->ComputationalProjectAccount !== null) { - $xfer += $output->writeFieldBegin('ComputationalProjectAccount', TType::STRING, 9); - $xfer += $output->writeString($this->ComputationalProjectAccount); + if ($this->computationalProjectAccount !== null) { + $xfer += $output->writeFieldBegin('computationalProjectAccount', TType::STRING, 9); + $xfer += $output->writeString($this->computationalProjectAccount); $xfer += $output->writeFieldEnd(); } $xfer += $output->writeFieldStop(); http://git-wip-us.apache.org/repos/asf/airavata/blob/47f6ed33/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java index ac5b196..1913c5f 100644 --- a/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java +++ b/airavata-api/airavata-client-sdks/java-client-samples/src/main/java/org/apache/airavata/client/samples/TestCreateLaunchExperiment.java @@ -42,12 +42,14 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import java.sql.Timestamp; +import java.text.Format; +import java.text.SimpleDateFormat; import java.util.*; public class TestCreateLaunchExperiment { //FIXME: Read from a config file - public static final String THRIFT_SERVER_HOST = "gw111.iu.xsede.org"; + public static final String THRIFT_SERVER_HOST = "localhost"; public static final int THRIFT_SERVER_PORT = 8930; private final static Logger logger = LoggerFactory.getLogger(TestCreateLaunchExperiment.class); private static final String DEFAULT_USER = "default.registry.user"; @@ -110,6 +112,17 @@ public class TestCreateLaunchExperiment { // } // } + List<Experiment> experimentList = getExperimentsForUser(airavata, "admin"); + Experiment experiment = experimentList.get(1); + ExperimentStatus experimentStatus = experiment.getExperimentStatus(); + long timeOfStateChange = experimentStatus.getTimeOfStateChange(); + System.out.println(timeOfStateChange); + Date date = new Date(timeOfStateChange); + Format format = new SimpleDateFormat("yyyy MM dd HH:mm:ss"); + String time1 = format.format(date); +// int count = i+1; + System.out.println(time1); + for (int i = 0; i < 50 ; i++){ long time = System.currentTimeMillis(); List<Experiment> experiments = getExperimentsForUser(airavata, "admin"); http://git-wip-us.apache.org/repos/asf/airavata/blob/47f6ed33/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ComputationalResourceScheduling.java ---------------------------------------------------------------------- diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ComputationalResourceScheduling.java b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ComputationalResourceScheduling.java index 3ba8ff9..a38cdab 100644 --- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ComputationalResourceScheduling.java +++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/experiment/ComputationalResourceScheduling.java @@ -63,7 +63,7 @@ import org.slf4j.LoggerFactory; private static final org.apache.thrift.protocol.TField WALL_TIME_LIMIT_FIELD_DESC = new org.apache.thrift.protocol.TField("wallTimeLimit", org.apache.thrift.protocol.TType.I32, (short)6); private static final org.apache.thrift.protocol.TField JOB_START_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("jobStartTime", org.apache.thrift.protocol.TType.I32, (short)7); private static final org.apache.thrift.protocol.TField TOTAL_PHYSICAL_MEMORY_FIELD_DESC = new org.apache.thrift.protocol.TField("totalPhysicalMemory", org.apache.thrift.protocol.TType.I32, (short)8); - private static final org.apache.thrift.protocol.TField COMPUTATIONAL_PROJECT_ACCOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("ComputationalProjectAccount", org.apache.thrift.protocol.TType.STRING, (short)9); + private static final org.apache.thrift.protocol.TField COMPUTATIONAL_PROJECT_ACCOUNT_FIELD_DESC = new org.apache.thrift.protocol.TField("computationalProjectAccount", org.apache.thrift.protocol.TType.STRING, (short)9); private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>(); static { @@ -79,7 +79,7 @@ import org.slf4j.LoggerFactory; private int wallTimeLimit; // optional private int jobStartTime; // optional private int totalPhysicalMemory; // optional - private String ComputationalProjectAccount; // optional + private String computationalProjectAccount; // optional /** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */ @SuppressWarnings("all") public enum _Fields implements org.apache.thrift.TFieldIdEnum { @@ -91,7 +91,7 @@ import org.slf4j.LoggerFactory; WALL_TIME_LIMIT((short)6, "wallTimeLimit"), JOB_START_TIME((short)7, "jobStartTime"), TOTAL_PHYSICAL_MEMORY((short)8, "totalPhysicalMemory"), - COMPUTATIONAL_PROJECT_ACCOUNT((short)9, "ComputationalProjectAccount"); + COMPUTATIONAL_PROJECT_ACCOUNT((short)9, "computationalProjectAccount"); private static final Map<String, _Fields> byName = new HashMap<String, _Fields>(); @@ -191,7 +191,7 @@ import org.slf4j.LoggerFactory; new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); tmpMap.put(_Fields.TOTAL_PHYSICAL_MEMORY, new org.apache.thrift.meta_data.FieldMetaData("totalPhysicalMemory", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I32))); - tmpMap.put(_Fields.COMPUTATIONAL_PROJECT_ACCOUNT, new org.apache.thrift.meta_data.FieldMetaData("ComputationalProjectAccount", org.apache.thrift.TFieldRequirementType.OPTIONAL, + tmpMap.put(_Fields.COMPUTATIONAL_PROJECT_ACCOUNT, new org.apache.thrift.meta_data.FieldMetaData("computationalProjectAccount", org.apache.thrift.TFieldRequirementType.OPTIONAL, new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING))); metaDataMap = Collections.unmodifiableMap(tmpMap); org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(ComputationalResourceScheduling.class, metaDataMap); @@ -218,7 +218,7 @@ import org.slf4j.LoggerFactory; this.jobStartTime = other.jobStartTime; this.totalPhysicalMemory = other.totalPhysicalMemory; if (other.isSetComputationalProjectAccount()) { - this.ComputationalProjectAccount = other.ComputationalProjectAccount; + this.computationalProjectAccount = other.computationalProjectAccount; } } @@ -242,7 +242,7 @@ import org.slf4j.LoggerFactory; this.jobStartTime = 0; setTotalPhysicalMemoryIsSet(false); this.totalPhysicalMemory = 0; - this.ComputationalProjectAccount = null; + this.computationalProjectAccount = null; } public String getResourceHostId() { @@ -424,25 +424,25 @@ import org.slf4j.LoggerFactory; } public String getComputationalProjectAccount() { - return this.ComputationalProjectAccount; + return this.computationalProjectAccount; } - public void setComputationalProjectAccount(String ComputationalProjectAccount) { - this.ComputationalProjectAccount = ComputationalProjectAccount; + public void setComputationalProjectAccount(String computationalProjectAccount) { + this.computationalProjectAccount = computationalProjectAccount; } public void unsetComputationalProjectAccount() { - this.ComputationalProjectAccount = null; + this.computationalProjectAccount = null; } - /** Returns true if field ComputationalProjectAccount is set (has been assigned a value) and false otherwise */ + /** Returns true if field computationalProjectAccount is set (has been assigned a value) and false otherwise */ public boolean isSetComputationalProjectAccount() { - return this.ComputationalProjectAccount != null; + return this.computationalProjectAccount != null; } public void setComputationalProjectAccountIsSet(boolean value) { if (!value) { - this.ComputationalProjectAccount = null; + this.computationalProjectAccount = null; } } @@ -670,12 +670,12 @@ import org.slf4j.LoggerFactory; return false; } - boolean this_present_ComputationalProjectAccount = true && this.isSetComputationalProjectAccount(); - boolean that_present_ComputationalProjectAccount = true && that.isSetComputationalProjectAccount(); - if (this_present_ComputationalProjectAccount || that_present_ComputationalProjectAccount) { - if (!(this_present_ComputationalProjectAccount && that_present_ComputationalProjectAccount)) + boolean this_present_computationalProjectAccount = true && this.isSetComputationalProjectAccount(); + boolean that_present_computationalProjectAccount = true && that.isSetComputationalProjectAccount(); + if (this_present_computationalProjectAccount || that_present_computationalProjectAccount) { + if (!(this_present_computationalProjectAccount && that_present_computationalProjectAccount)) return false; - if (!this.ComputationalProjectAccount.equals(that.ComputationalProjectAccount)) + if (!this.computationalProjectAccount.equals(that.computationalProjectAccount)) return false; } @@ -780,7 +780,7 @@ import org.slf4j.LoggerFactory; return lastComparison; } if (isSetComputationalProjectAccount()) { - lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.ComputationalProjectAccount, other.ComputationalProjectAccount); + lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.computationalProjectAccount, other.computationalProjectAccount); if (lastComparison != 0) { return lastComparison; } @@ -862,11 +862,11 @@ import org.slf4j.LoggerFactory; } if (isSetComputationalProjectAccount()) { if (!first) sb.append(", "); - sb.append("ComputationalProjectAccount:"); - if (this.ComputationalProjectAccount == null) { + sb.append("computationalProjectAccount:"); + if (this.computationalProjectAccount == null) { sb.append("null"); } else { - sb.append(this.ComputationalProjectAccount); + sb.append(this.computationalProjectAccount); } first = false; } @@ -981,7 +981,7 @@ import org.slf4j.LoggerFactory; break; case 9: // COMPUTATIONAL_PROJECT_ACCOUNT if (schemeField.type == org.apache.thrift.protocol.TType.STRING) { - struct.ComputationalProjectAccount = iprot.readString(); + struct.computationalProjectAccount = iprot.readString(); struct.setComputationalProjectAccountIsSet(true); } else { org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type); @@ -1044,10 +1044,10 @@ import org.slf4j.LoggerFactory; oprot.writeI32(struct.totalPhysicalMemory); oprot.writeFieldEnd(); } - if (struct.ComputationalProjectAccount != null) { + if (struct.computationalProjectAccount != null) { if (struct.isSetComputationalProjectAccount()) { oprot.writeFieldBegin(COMPUTATIONAL_PROJECT_ACCOUNT_FIELD_DESC); - oprot.writeString(struct.ComputationalProjectAccount); + oprot.writeString(struct.computationalProjectAccount); oprot.writeFieldEnd(); } } @@ -1122,7 +1122,7 @@ import org.slf4j.LoggerFactory; oprot.writeI32(struct.totalPhysicalMemory); } if (struct.isSetComputationalProjectAccount()) { - oprot.writeString(struct.ComputationalProjectAccount); + oprot.writeString(struct.computationalProjectAccount); } } @@ -1163,7 +1163,7 @@ import org.slf4j.LoggerFactory; struct.setTotalPhysicalMemoryIsSet(true); } if (incoming.get(8)) { - struct.ComputationalProjectAccount = iprot.readString(); + struct.computationalProjectAccount = iprot.readString(); struct.setComputationalProjectAccountIsSet(true); } } http://git-wip-us.apache.org/repos/asf/airavata/blob/47f6ed33/airavata-api/thrift-interface-descriptions/experimentModel.thrift ---------------------------------------------------------------------- diff --git a/airavata-api/thrift-interface-descriptions/experimentModel.thrift b/airavata-api/thrift-interface-descriptions/experimentModel.thrift index 88a4db2..1801103 100644 --- a/airavata-api/thrift-interface-descriptions/experimentModel.thrift +++ b/airavata-api/thrift-interface-descriptions/experimentModel.thrift @@ -212,7 +212,7 @@ struct ComputationalResourceScheduling { 6: optional i32 wallTimeLimit, 7: optional i32 jobStartTime, 8: optional i32 totalPhysicalMemory, - 9: optional string ComputationalProjectAccount + 9: optional string computationalProjectAccount } /**
