airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From shame...@apache.org
Subject [1/4] airavata git commit: added binary subTaskModel to keep task specific data models
Date Fri, 26 Jun 2015 04:27:46 GMT
Repository: airavata
Updated Branches:
  refs/heads/master 6caf47871 -> 2c9427715


http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
index 73cdac6..5e91dfb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ExperimentStatus.java
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
  *   User friendly reason on how the state is inferred.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class ExperimentStatus implements org.apache.thrift.TBase<ExperimentStatus, ExperimentStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<ExperimentStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ExperimentStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
index 9691fc4..54291ba 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/JobStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class JobStatus implements org.apache.thrift.TBase<JobStatus, JobStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<JobStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("JobStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
index 1eca4f1..73d1fa5 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/ProcessStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class ProcessStatus implements org.apache.thrift.TBase<ProcessStatus, ProcessStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<ProcessStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ProcessStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
index 1418ed9..61b011c 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/status/TaskStatus.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class TaskStatus implements org.apache.thrift.TBase<TaskStatus, TaskStatus._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskStatus> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskStatus");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
index 61797a2..d7eb4e3 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/DataStagingTaskModel.java
@@ -58,7 +58,7 @@ import org.slf4j.LoggerFactory;
  *   A friendly description of the task, usally used to communicate information to users.
  * 
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class DataStagingTaskModel implements org.apache.thrift.TBase<DataStagingTaskModel,
DataStagingTaskModel._Fields>, java.io.Serializable, Cloneable, Comparable<DataStagingTaskModel>
{
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("DataStagingTaskModel");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
index a080b43..3bf9779 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/task/TaskModel.java
@@ -60,7 +60,7 @@ import org.slf4j.LoggerFactory;
  * taskInternalStore:
  *   A generic byte object for the Task developer to store internal serialized data into
registry catalogs.
  */
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class TaskModel implements org.apache.thrift.TBase<TaskModel, TaskModel._Fields>,
java.io.Serializable, Cloneable, Comparable<TaskModel> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TaskModel");
 
@@ -71,7 +71,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
   private static final org.apache.thrift.protocol.TField LAST_UPDATE_TIME_FIELD_DESC = new
org.apache.thrift.protocol.TField("lastUpdateTime", org.apache.thrift.protocol.TType.I64,
(short)5);
   private static final org.apache.thrift.protocol.TField TASK_STATUS_FIELD_DESC = new org.apache.thrift.protocol.TField("taskStatus",
org.apache.thrift.protocol.TType.STRUCT, (short)6);
   private static final org.apache.thrift.protocol.TField TASK_DETAIL_FIELD_DESC = new org.apache.thrift.protocol.TField("taskDetail",
org.apache.thrift.protocol.TType.STRING, (short)7);
-  private static final org.apache.thrift.protocol.TField TASK_INTERNAL_STORE_FIELD_DESC =
new org.apache.thrift.protocol.TField("taskInternalStore", org.apache.thrift.protocol.TType.BYTE,
(short)8);
+  private static final org.apache.thrift.protocol.TField SUB_TASK_MODEL_FIELD_DESC = new
org.apache.thrift.protocol.TField("subTaskModel", org.apache.thrift.protocol.TType.STRING,
(short)8);
   private static final org.apache.thrift.protocol.TField TASK_ERROR_FIELD_DESC = new org.apache.thrift.protocol.TField("taskError",
org.apache.thrift.protocol.TType.STRUCT, (short)9);
 
   private static final Map<Class<? extends IScheme>, SchemeFactory> schemes =
new HashMap<Class<? extends IScheme>, SchemeFactory>();
@@ -87,7 +87,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
   private long lastUpdateTime; // required
   private org.apache.airavata.model.status.TaskStatus taskStatus; // required
   private String taskDetail; // optional
-  private byte taskInternalStore; // optional
+  private ByteBuffer subTaskModel; // optional
   private org.apache.airavata.model.commons.ErrorModel taskError; // optional
 
   /** The set of fields this struct contains, along with convenience methods for finding
and manipulating them. */
@@ -103,7 +103,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
     LAST_UPDATE_TIME((short)5, "lastUpdateTime"),
     TASK_STATUS((short)6, "taskStatus"),
     TASK_DETAIL((short)7, "taskDetail"),
-    TASK_INTERNAL_STORE((short)8, "taskInternalStore"),
+    SUB_TASK_MODEL((short)8, "subTaskModel"),
     TASK_ERROR((short)9, "taskError");
 
     private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
@@ -133,8 +133,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
           return TASK_STATUS;
         case 7: // TASK_DETAIL
           return TASK_DETAIL;
-        case 8: // TASK_INTERNAL_STORE
-          return TASK_INTERNAL_STORE;
+        case 8: // SUB_TASK_MODEL
+          return SUB_TASK_MODEL;
         case 9: // TASK_ERROR
           return TASK_ERROR;
         default:
@@ -179,9 +179,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
   // isset id assignments
   private static final int __CREATIONTIME_ISSET_ID = 0;
   private static final int __LASTUPDATETIME_ISSET_ID = 1;
-  private static final int __TASKINTERNALSTORE_ISSET_ID = 2;
   private byte __isset_bitfield = 0;
-  private static final _Fields optionals[] = {_Fields.TASK_DETAIL,_Fields.TASK_INTERNAL_STORE,_Fields.TASK_ERROR};
+  private static final _Fields optionals[] = {_Fields.TASK_DETAIL,_Fields.SUB_TASK_MODEL,_Fields.TASK_ERROR};
   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);
@@ -199,8 +198,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.airavata.model.status.TaskStatus.class)));
     tmpMap.put(_Fields.TASK_DETAIL, new org.apache.thrift.meta_data.FieldMetaData("taskDetail",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING)));
-    tmpMap.put(_Fields.TASK_INTERNAL_STORE, new org.apache.thrift.meta_data.FieldMetaData("taskInternalStore",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
-        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.BYTE)));
+    tmpMap.put(_Fields.SUB_TASK_MODEL, new org.apache.thrift.meta_data.FieldMetaData("subTaskModel",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
+        new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
       , true)));
     tmpMap.put(_Fields.TASK_ERROR, new org.apache.thrift.meta_data.FieldMetaData("taskError",
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
         new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
org.apache.airavata.model.commons.ErrorModel.class)));
     metaDataMap = Collections.unmodifiableMap(tmpMap);
@@ -253,7 +252,9 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
     if (other.isSetTaskDetail()) {
       this.taskDetail = other.taskDetail;
     }
-    this.taskInternalStore = other.taskInternalStore;
+    if (other.isSetSubTaskModel()) {
+      this.subTaskModel = org.apache.thrift.TBaseHelper.copyBinary(other.subTaskModel);
+    }
     if (other.isSetTaskError()) {
       this.taskError = new org.apache.airavata.model.commons.ErrorModel(other.taskError);
     }
@@ -275,8 +276,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
     this.lastUpdateTime = 0;
     this.taskStatus = null;
     this.taskDetail = null;
-    setTaskInternalStoreIsSet(false);
-    this.taskInternalStore = 0;
+    this.subTaskModel = null;
     this.taskError = null;
   }
 
@@ -447,26 +447,36 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
     }
   }
 
-  public byte getTaskInternalStore() {
-    return this.taskInternalStore;
+  public byte[] getSubTaskModel() {
+    setSubTaskModel(org.apache.thrift.TBaseHelper.rightSize(subTaskModel));
+    return subTaskModel == null ? null : subTaskModel.array();
+  }
+
+  public ByteBuffer bufferForSubTaskModel() {
+    return org.apache.thrift.TBaseHelper.copyBinary(subTaskModel);
   }
 
-  public void setTaskInternalStore(byte taskInternalStore) {
-    this.taskInternalStore = taskInternalStore;
-    setTaskInternalStoreIsSet(true);
+  public void setSubTaskModel(byte[] subTaskModel) {
+    this.subTaskModel = subTaskModel == null ? (ByteBuffer)null : ByteBuffer.wrap(Arrays.copyOf(subTaskModel,
subTaskModel.length));
   }
 
-  public void unsetTaskInternalStore() {
-    __isset_bitfield = EncodingUtils.clearBit(__isset_bitfield, __TASKINTERNALSTORE_ISSET_ID);
+  public void setSubTaskModel(ByteBuffer subTaskModel) {
+    this.subTaskModel = org.apache.thrift.TBaseHelper.copyBinary(subTaskModel);
   }
 
-  /** Returns true if field taskInternalStore is set (has been assigned a value) and false
otherwise */
-  public boolean isSetTaskInternalStore() {
-    return EncodingUtils.testBit(__isset_bitfield, __TASKINTERNALSTORE_ISSET_ID);
+  public void unsetSubTaskModel() {
+    this.subTaskModel = null;
   }
 
-  public void setTaskInternalStoreIsSet(boolean value) {
-    __isset_bitfield = EncodingUtils.setBit(__isset_bitfield, __TASKINTERNALSTORE_ISSET_ID,
value);
+  /** Returns true if field subTaskModel is set (has been assigned a value) and false otherwise
*/
+  public boolean isSetSubTaskModel() {
+    return this.subTaskModel != null;
+  }
+
+  public void setSubTaskModelIsSet(boolean value) {
+    if (!value) {
+      this.subTaskModel = null;
+    }
   }
 
   public org.apache.airavata.model.commons.ErrorModel getTaskError() {
@@ -550,11 +560,11 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
       }
       break;
 
-    case TASK_INTERNAL_STORE:
+    case SUB_TASK_MODEL:
       if (value == null) {
-        unsetTaskInternalStore();
+        unsetSubTaskModel();
       } else {
-        setTaskInternalStore((Byte)value);
+        setSubTaskModel((ByteBuffer)value);
       }
       break;
 
@@ -592,8 +602,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
     case TASK_DETAIL:
       return getTaskDetail();
 
-    case TASK_INTERNAL_STORE:
-      return Byte.valueOf(getTaskInternalStore());
+    case SUB_TASK_MODEL:
+      return getSubTaskModel();
 
     case TASK_ERROR:
       return getTaskError();
@@ -623,8 +633,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
       return isSetTaskStatus();
     case TASK_DETAIL:
       return isSetTaskDetail();
-    case TASK_INTERNAL_STORE:
-      return isSetTaskInternalStore();
+    case SUB_TASK_MODEL:
+      return isSetSubTaskModel();
     case TASK_ERROR:
       return isSetTaskError();
     }
@@ -707,12 +717,12 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
         return false;
     }
 
-    boolean this_present_taskInternalStore = true && this.isSetTaskInternalStore();
-    boolean that_present_taskInternalStore = true && that.isSetTaskInternalStore();
-    if (this_present_taskInternalStore || that_present_taskInternalStore) {
-      if (!(this_present_taskInternalStore && that_present_taskInternalStore))
+    boolean this_present_subTaskModel = true && this.isSetSubTaskModel();
+    boolean that_present_subTaskModel = true && that.isSetSubTaskModel();
+    if (this_present_subTaskModel || that_present_subTaskModel) {
+      if (!(this_present_subTaskModel && that_present_subTaskModel))
         return false;
-      if (this.taskInternalStore != that.taskInternalStore)
+      if (!this.subTaskModel.equals(that.subTaskModel))
         return false;
     }
 
@@ -767,10 +777,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
     if (present_taskDetail)
       list.add(taskDetail);
 
-    boolean present_taskInternalStore = true && (isSetTaskInternalStore());
-    list.add(present_taskInternalStore);
-    if (present_taskInternalStore)
-      list.add(taskInternalStore);
+    boolean present_subTaskModel = true && (isSetSubTaskModel());
+    list.add(present_subTaskModel);
+    if (present_subTaskModel)
+      list.add(subTaskModel);
 
     boolean present_taskError = true && (isSetTaskError());
     list.add(present_taskError);
@@ -858,12 +868,12 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
         return lastComparison;
       }
     }
-    lastComparison = Boolean.valueOf(isSetTaskInternalStore()).compareTo(other.isSetTaskInternalStore());
+    lastComparison = Boolean.valueOf(isSetSubTaskModel()).compareTo(other.isSetSubTaskModel());
     if (lastComparison != 0) {
       return lastComparison;
     }
-    if (isSetTaskInternalStore()) {
-      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.taskInternalStore, other.taskInternalStore);
+    if (isSetSubTaskModel()) {
+      lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.subTaskModel, other.subTaskModel);
       if (lastComparison != 0) {
         return lastComparison;
       }
@@ -947,10 +957,14 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
       }
       first = false;
     }
-    if (isSetTaskInternalStore()) {
+    if (isSetSubTaskModel()) {
       if (!first) sb.append(", ");
-      sb.append("taskInternalStore:");
-      sb.append(this.taskInternalStore);
+      sb.append("subTaskModel:");
+      if (this.subTaskModel == null) {
+        sb.append("null");
+      } else {
+        org.apache.thrift.TBaseHelper.toString(this.subTaskModel, sb);
+      }
       first = false;
     }
     if (isSetTaskError()) {
@@ -1095,10 +1109,10 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
             break;
-          case 8: // TASK_INTERNAL_STORE
-            if (schemeField.type == org.apache.thrift.protocol.TType.BYTE) {
-              struct.taskInternalStore = iprot.readByte();
-              struct.setTaskInternalStoreIsSet(true);
+          case 8: // SUB_TASK_MODEL
+            if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+              struct.subTaskModel = iprot.readBinary();
+              struct.setSubTaskModelIsSet(true);
             } else { 
               org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
             }
@@ -1158,10 +1172,12 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
           oprot.writeFieldEnd();
         }
       }
-      if (struct.isSetTaskInternalStore()) {
-        oprot.writeFieldBegin(TASK_INTERNAL_STORE_FIELD_DESC);
-        oprot.writeByte(struct.taskInternalStore);
-        oprot.writeFieldEnd();
+      if (struct.subTaskModel != null) {
+        if (struct.isSetSubTaskModel()) {
+          oprot.writeFieldBegin(SUB_TASK_MODEL_FIELD_DESC);
+          oprot.writeBinary(struct.subTaskModel);
+          oprot.writeFieldEnd();
+        }
       }
       if (struct.taskError != null) {
         if (struct.isSetTaskError()) {
@@ -1197,7 +1213,7 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
       if (struct.isSetTaskDetail()) {
         optionals.set(0);
       }
-      if (struct.isSetTaskInternalStore()) {
+      if (struct.isSetSubTaskModel()) {
         optionals.set(1);
       }
       if (struct.isSetTaskError()) {
@@ -1207,8 +1223,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
       if (struct.isSetTaskDetail()) {
         oprot.writeString(struct.taskDetail);
       }
-      if (struct.isSetTaskInternalStore()) {
-        oprot.writeByte(struct.taskInternalStore);
+      if (struct.isSetSubTaskModel()) {
+        oprot.writeBinary(struct.subTaskModel);
       }
       if (struct.isSetTaskError()) {
         struct.taskError.write(oprot);
@@ -1237,8 +1253,8 @@ public class TaskModel implements org.apache.thrift.TBase<TaskModel,
TaskModel._
         struct.setTaskDetailIsSet(true);
       }
       if (incoming.get(1)) {
-        struct.taskInternalStore = iprot.readByte();
-        struct.setTaskInternalStoreIsSet(true);
+        struct.subTaskModel = iprot.readBinary();
+        struct.setSubTaskModelIsSet(true);
       }
       if (incoming.get(2)) {
         struct.taskError = new org.apache.airavata.model.commons.ErrorModel();

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
index 376b423..6f5e138 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Gateway.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class Gateway implements org.apache.thrift.TBase<Gateway, Gateway._Fields>,
java.io.Serializable, Cloneable, Comparable<Gateway> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Gateway");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
index 3d08a67..d53d864 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Group.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class Group implements org.apache.thrift.TBase<Group, Group._Fields>, java.io.Serializable,
Cloneable, Comparable<Group> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Group");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
index 9b036ce..91d2a24 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/Project.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class Project implements org.apache.thrift.TBase<Project, Project._Fields>,
java.io.Serializable, Cloneable, Comparable<Project> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("Project");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
index 561e5fd..3b37eeb 100644
--- a/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
+++ b/airavata-api/airavata-data-models/src/main/java/org/apache/airavata/model/workspace/User.java
@@ -51,7 +51,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 @SuppressWarnings({"cast", "rawtypes", "serial", "unchecked"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-24")
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.2)", date = "2015-6-25")
 public class User implements org.apache.thrift.TBase<User, User._Fields>, java.io.Serializable,
Cloneable, Comparable<User> {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("User");
 

http://git-wip-us.apache.org/repos/asf/airavata/blob/455b4350/thrift-interface-descriptions/airavata-api/task_model.thrift
----------------------------------------------------------------------
diff --git a/thrift-interface-descriptions/airavata-api/task_model.thrift b/thrift-interface-descriptions/airavata-api/task_model.thrift
index 43f89e9..be454a5 100644
--- a/thrift-interface-descriptions/airavata-api/task_model.thrift
+++ b/thrift-interface-descriptions/airavata-api/task_model.thrift
@@ -55,7 +55,7 @@ struct TaskModel {
     5: required i64 lastUpdateTime,
     6: required status_models.TaskStatus taskStatus,
     7: optional string taskDetail,
-    8: optional byte taskInternalStore,
+    8: optional binary subTaskModel,
     9: optional airavata_commons.ErrorModel taskError
 }
 


Mime
View raw message