Upgrade shared.thrift to latest

andrewjdawson2016 · andrewjdawson2016 · commit c54cc340346d · 2019-09-19T14:18:28.000-07:00
diff --git a/src/main/java/com/uber/cadence/internal/replay/DecisionContext.java b/src/main/java/com/uber/cadence/internal/replay/DecisionContext.java
@@ -17,7 +17,6 @@
 
 package com.uber.cadence.internal.replay;
 
-import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.WorkflowType;
 import com.uber.cadence.converter.DataConverter;
@@ -69,8 +68,6 @@ public interface DecisionContext extends ReplayAware {
 
   Duration getDecisionTaskTimeout();
 
-  ChildPolicy getChildPolicy();
-
   /**
    * Used to dynamically schedule an activity for execution
    *
diff --git a/src/main/java/com/uber/cadence/internal/replay/DecisionContextImpl.java b/src/main/java/com/uber/cadence/internal/replay/DecisionContextImpl.java
@@ -17,7 +17,6 @@
 
 package com.uber.cadence.internal.replay;
 
-import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.DecisionTaskFailedCause;
 import com.uber.cadence.DecisionTaskFailedEventAttributes;
 import com.uber.cadence.HistoryEvent;
@@ -135,11 +134,6 @@ public Duration getDecisionTaskTimeout() {
     return Duration.ofSeconds(workflowContext.getDecisionTaskTimeoutSeconds());
   }
 
-  @Override
-  public ChildPolicy getChildPolicy() {
-    return workflowContext.getChildPolicy();
-  }
-
   @Override
   public String getTaskList() {
     return workflowContext.getTaskList();
diff --git a/src/main/java/com/uber/cadence/internal/replay/WorkflowContext.java b/src/main/java/com/uber/cadence/internal/replay/WorkflowContext.java
@@ -120,10 +120,6 @@ private WorkflowExecutionStartedEventAttributes getWorkflowStartedEventAttribute
     return startedAttributes;
   }
 
-  public ChildPolicy getChildPolicy() {
-    return startedAttributes.getChildPolicy();
-  }
-
   void setCurrentRunId(String currentRunId) {
     this.currentRunId = currentRunId;
   }
diff --git a/src/main/java/com/uber/cadence/internal/replay/WorkflowDecisionContext.java b/src/main/java/com/uber/cadence/internal/replay/WorkflowDecisionContext.java
@@ -18,7 +18,6 @@
 package com.uber.cadence.internal.replay;
 
 import com.google.common.base.Strings;
-import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.ChildWorkflowExecutionCanceledEventAttributes;
 import com.uber.cadence.ChildWorkflowExecutionCompletedEventAttributes;
 import com.uber.cadence.ChildWorkflowExecutionFailedCause;
@@ -126,15 +125,6 @@ Consumer<Exception> startChildWorkflow(
       attributes.setTaskStartToCloseTimeoutSeconds(
           (int) parameters.getTaskStartToCloseTimeoutSeconds());
     }
-    if (parameters.getChildPolicy() == null) {
-      // TODO: Child policy from a parent as soon as it is available in the WorkflowExecutionStarted
-      // event
-      // Or when server accepts null
-      //            attributes.setChildPolicy(workflowContext.getChildPolicy());
-      attributes.setChildPolicy(ChildPolicy.TERMINATE);
-    } else {
-      attributes.setChildPolicy(parameters.getChildPolicy());
-    }
     String taskList = parameters.getTaskList();
     TaskList tl = new TaskList();
     if (taskList != null && !taskList.isEmpty()) {
diff --git a/src/main/java/com/uber/cadence/internal/sync/DeterministicRunnerImpl.java b/src/main/java/com/uber/cadence/internal/sync/DeterministicRunnerImpl.java
@@ -17,7 +17,6 @@
 
 package com.uber.cadence.internal.sync;
 
-import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.WorkflowExecution;
 import com.uber.cadence.WorkflowType;
 import com.uber.cadence.converter.DataConverter;
@@ -546,11 +545,6 @@ public Duration getDecisionTaskTimeout() {
       throw new UnsupportedOperationException("not implemented");
     }
 
-    @Override
-    public ChildPolicy getChildPolicy() {
-      return ChildPolicy.TERMINATE;
-    }
-
     @Override
     public Consumer<Exception> scheduleActivityTask(
         ExecuteActivityParameters parameters, BiConsumer<byte[], Exception> callback) {
diff --git a/src/main/java/com/uber/cadence/internal/sync/WorkflowInfoImpl.java b/src/main/java/com/uber/cadence/internal/sync/WorkflowInfoImpl.java
@@ -17,7 +17,6 @@
 
 package com.uber.cadence.internal.sync;
 
-import com.uber.cadence.ChildPolicy;
 import com.uber.cadence.internal.replay.DecisionContext;
 import com.uber.cadence.workflow.WorkflowInfo;
 import java.time.Duration;
@@ -59,9 +58,4 @@ public String getTaskList() {
   public Duration getExecutionStartToCloseTimeout() {
     return context.getExecutionStartToCloseTimeout();
   }
-
-  @Override
-  public ChildPolicy getChildPolicy() {
-    return context.getChildPolicy();
-  }
 }
diff --git a/src/main/java/com/uber/cadence/internal/testservice/StateMachines.java b/src/main/java/com/uber/cadence/internal/testservice/StateMachines.java
@@ -437,7 +437,6 @@ private static void initiateChildWorkflow(
         new StartChildWorkflowExecutionInitiatedEventAttributes()
             .setControl(d.getControl())
             .setInput(d.getInput())
-            .setChildPolicy(d.getChildPolicy())
             .setDecisionTaskCompletedEventId(decisionTaskCompletedEventId)
             .setDomain(d.getDomain() == null ? ctx.getDomain() : d.getDomain())
             .setExecutionStartToCloseTimeoutSeconds(d.getExecutionStartToCloseTimeoutSeconds())
diff --git a/src/main/java/com/uber/cadence/internal/testservice/TestWorkflowMutableStateImpl.java b/src/main/java/com/uber/cadence/internal/testservice/TestWorkflowMutableStateImpl.java
@@ -526,10 +526,6 @@ private void validateStartChildExecutionAttributes(
       throw new BadRequestError("Required field WorkflowType is not set on decision.");
     }
 
-    if (a.getChildPolicy() == null) {
-      throw new BadRequestError("Required field ChildPolicy is not set on decision.");
-    }
-
     // Inherit tasklist from parent workflow execution if not provided on decision
     if (a.getTaskList() == null || a.getTaskList().getName().isEmpty()) {
       a.setTaskList(startRequest.getTaskList());
diff --git a/src/main/java/com/uber/cadence/internal/testservice/TestWorkflowService.java b/src/main/java/com/uber/cadence/internal/testservice/TestWorkflowService.java
@@ -598,8 +598,7 @@ public String continueAsNew(
             .setWorkflowIdReusePolicy(previousRunStartRequest.getWorkflowIdReusePolicy())
             .setIdentity(identity)
             .setRetryPolicy(previousRunStartRequest.getRetryPolicy())
-            .setCronSchedule(previousRunStartRequest.getCronSchedule())
-            .setChildPolicy(previousRunStartRequest.getChildPolicy());
+            .setCronSchedule(previousRunStartRequest.getCronSchedule());
     if (a.isSetInput()) {
       startRequest.setInput(a.getInput());
     }
diff --git a/src/main/java/com/uber/cadence/workflow/WorkflowInfo.java b/src/main/java/com/uber/cadence/workflow/WorkflowInfo.java
@@ -17,7 +17,6 @@
 
 package com.uber.cadence.workflow;
 
-import com.uber.cadence.ChildPolicy;
 import java.time.Duration;
 
 public interface WorkflowInfo {
@@ -33,6 +32,4 @@ public interface WorkflowInfo {
   String getTaskList();
 
   Duration getExecutionStartToCloseTimeout();
-
-  ChildPolicy getChildPolicy();
 }
diff --git a/src/main/thrift/shared.thrift b/src/main/thrift/shared.thrift
@@ -114,6 +114,13 @@ enum TimeoutType {
   HEARTBEAT,
 }
 
+enum ParentClosePolicy {
+	ABANDON,
+	REQUEST_CANCEL,
+	TERMINATE,
+}
+
+
 // whenever this list of decision is changed
 // do change the mutableStateBuilder.go
 // function shouldBufferEvent
@@ -217,6 +224,9 @@ enum ChildWorkflowExecutionFailedCause {
   WORKFLOW_ALREADY_RUNNING,
 }
 
+// TODO: when migrating to gRPC, add a running / none status,
+//  currently, customer is using null / nil as an indication
+//  that workflow is still running
 enum WorkflowExecutionCloseStatus {
   COMPLETED,
   FAILED,
@@ -226,17 +236,16 @@ enum WorkflowExecutionCloseStatus {
   TIMED_OUT,
 }
 
-enum ChildPolicy {
-  TERMINATE,
-  REQUEST_CANCEL,
-  ABANDON,
-}
-
 enum QueryTaskCompletedType {
   COMPLETED,
   FAILED,
 }
 
+enum QueryResultType {
+  ANSWERED,
+  FAILED,
+}
+
 enum PendingActivityState {
   SCHEDULED,
   STARTED,
@@ -288,6 +297,13 @@ enum EncodingType {
   ThriftRW,
 }
 
+enum QueryRejectCondition {
+  // NOT_OPEN indicates that query should be rejected if workflow is not open
+  NOT_OPEN
+  // NOT_COMPLETED_CLEANLY indicates that query should be rejected if workflow did not complete cleanly
+  NOT_COMPLETED_CLEANLY
+}
+
 struct DataBlob {
   10: optional EncodingType EncodingType
   20: optional binary Data
@@ -334,7 +350,7 @@ struct WorkflowExecutionConfiguration {
   10: optional TaskList taskList
   20: optional i32 executionStartToCloseTimeoutSeconds
   30: optional i32 taskStartToCloseTimeoutSeconds
-  40: optional ChildPolicy childPolicy
+//  40: optional ChildPolicy childPolicy -- Removed but reserve the IDL order number
 }
 
 struct TransientDecisionInfo {
@@ -435,7 +451,8 @@ struct StartChildWorkflowExecutionDecisionAttributes {
   50: optional binary input
   60: optional i32 executionStartToCloseTimeoutSeconds
   70: optional i32 taskStartToCloseTimeoutSeconds
-  80: optional ChildPolicy childPolicy
+//  80: optional ChildPolicy childPolicy -- Removed but reserve the IDL order number
+  81: optional ParentClosePolicy parentClosePolicy
   90: optional binary control
   100: optional WorkflowIdReusePolicy workflowIdReusePolicy
   110: optional RetryPolicy retryPolicy
@@ -471,7 +488,7 @@ struct WorkflowExecutionStartedEventAttributes {
   30: optional binary input
   40: optional i32 executionStartToCloseTimeoutSeconds
   50: optional i32 taskStartToCloseTimeoutSeconds
-  52: optional ChildPolicy childPolicy
+//  52: optional ChildPolicy childPolicy -- Removed but reserve the IDL order number
   54: optional string continuedExecutionRunId
   55: optional ContinueAsNewInitiator initiator
   56: optional string continuedFailureReason
@@ -763,7 +780,8 @@ struct StartChildWorkflowExecutionInitiatedEventAttributes {
   50:  optional binary input
   60:  optional i32 executionStartToCloseTimeoutSeconds
   70:  optional i32 taskStartToCloseTimeoutSeconds
-  80:  optional ChildPolicy childPolicy
+//  80:  optional ChildPolicy childPolicy -- Removed but reserve the IDL order number
+  81:  optional ParentClosePolicy parentClosePolicy
   90:  optional binary control
   100: optional i64 (js.type = "Long") decisionTaskCompletedEventId
   110: optional WorkflowIdReusePolicy workflowIdReusePolicy
@@ -893,6 +911,7 @@ struct History {
 
 struct WorkflowExecutionFilter {
   10: optional string workflowId
+  20: optional string runId
 }
 
 struct WorkflowTypeFilter {
@@ -917,9 +936,11 @@ struct DomainInfo {
 struct DomainConfiguration {
   10: optional i32 workflowExecutionRetentionPeriodInDays
   20: optional bool emitMetric
-  30: optional string archivalBucketName
-  50: optional ArchivalStatus archivalStatus
   70: optional BadBinaries badBinaries
+  80: optional ArchivalStatus historyArchivalStatus
+  90: optional string historyArchivalURI
+  100: optional ArchivalStatus visibilityArchivalStatus
+  110: optional string visibilityArchivalURI
 }
 
 struct BadBinaries{
@@ -959,9 +980,11 @@ struct RegisterDomainRequest {
   // A key-value map for any customized purpose
   80: optional map<string,string> data
   90: optional string securityToken
-  100: optional ArchivalStatus archivalStatus
-  110: optional string archivalBucketName
   120: optional bool isGlobalDomain
+  130: optional ArchivalStatus historyArchivalStatus
+  140: optional string historyArchivalURI
+  150: optional ArchivalStatus visibilityArchivalStatus
+  160: optional string visibilityArchivalURI
 }
 
 struct ListDomainsRequest {
@@ -1020,7 +1043,7 @@ struct StartWorkflowExecutionRequest {
   80: optional string identity
   90: optional string requestId
   100: optional WorkflowIdReusePolicy workflowIdReusePolicy
-  110: optional ChildPolicy childPolicy
+//  110: optional ChildPolicy childPolicy -- Removed but reserve the IDL order number
   120: optional RetryPolicy retryPolicy
   130: optional string cronSchedule
   140: optional Memo memo
@@ -1053,6 +1076,7 @@ struct PollForDecisionTaskResponse {
   90: optional TaskList WorkflowExecutionTaskList
   100:  optional i64 (js.type = "Long") scheduledTimestamp
   110:  optional i64 (js.type = "Long") startedTimestamp
+  120:  optional list<WorkflowQuery> queries
 }
 
 struct StickyExecutionAttributes {
@@ -1069,6 +1093,7 @@ struct RespondDecisionTaskCompletedRequest {
   60: optional bool returnNewDecisionTask
   70: optional bool forceCreateNewDecisionTask
   80: optional string binaryChecksum
+  90: optional list<WorkflowQueryResult> queryResults
 }
 
 struct RespondDecisionTaskCompletedResponse {
@@ -1288,6 +1313,18 @@ struct ListWorkflowExecutionsResponse {
   20: optional binary nextPageToken
 }
 
+struct ListArchivedWorkflowExecutionsRequest {
+  10: optional string domain
+  20: optional i32 pageSize
+  30: optional binary nextPageToken
+  40: optional string query
+}
+
+struct ListArchivedWorkflowExecutionsResponse {
+  10: optional list<WorkflowExecutionInfo> executions
+  20: optional binary nextPageToken
+}
+
 struct CountWorkflowExecutionsRequest {
   10: optional string domain
   20: optional string query
@@ -1305,10 +1342,17 @@ struct QueryWorkflowRequest {
   10: optional string domain
   20: optional WorkflowExecution execution
   30: optional WorkflowQuery query
+  // QueryRejectCondition can used to reject the query if workflow state does not satisify condition
+  40: optional QueryRejectCondition queryRejectCondition
+}
+
+struct QueryRejected {
+  10: optional WorkflowExecutionCloseStatus closeStatus
 }
 
 struct QueryWorkflowResponse {
   10: optional binary queryResult
+  20: optional QueryRejected queryRejected
 }
 
 struct WorkflowQuery {
@@ -1333,6 +1377,13 @@ struct RespondQueryTaskCompletedRequest {
   40: optional string errorMessage
 }
 
+struct WorkflowQueryResult {
+  10: optional QueryResultType resultType
+  20: optional binary answer
+  30: optional string errorReason
+  40: optional binary errorDetails
+}
+
 struct DescribeWorkflowExecutionRequest {
   10: optional string domain
   20: optional WorkflowExecution execution
@@ -1351,13 +1402,15 @@ struct PendingActivityInfo {
   100: optional i64 (js.type = "Long") expirationTimestamp
   110: optional string lastFailureReason
   120: optional string lastWorkerIdentity
+  130: optional binary lastFailureDetails
 }
 
 struct PendingChildExecutionInfo {
   10: optional string workflowID
   20: optional string runID
   30: optional string workflowTypName
   40: optional i64 (js.type = "Long") initiatedID
+  50: optional ParentClosePolicy parentClosePolicy
 }
 
 struct DescribeWorkflowExecutionResponse {
@@ -1399,6 +1452,16 @@ struct DescribeHistoryHostRequest {
   30: optional WorkflowExecution    executionForHost
 }
 
+struct RemoveTaskRequest {
+  10: optional i32                      shardID
+  20: optional i32                      type
+  30: optional i64 (js.type = "Long")   taskID
+}
+
+struct CloseShardRequest {
+  10: optional i32               shardID
+}
+
 struct DescribeHistoryHostResponse{
   10: optional i32                  numberOfShards
   20: optional list<i32>            shardIDs

Original file line number	Diff line number	Diff line change
`@@ -120,10 +120,6 @@ private WorkflowExecutionStartedEventAttributes getWorkflowStartedEventAttribute`
`120`	`120`	`return startedAttributes;`
`121`	`121`	`}`
`122`	`122`
`123`		`- public ChildPolicy getChildPolicy() {`
`124`		`- return startedAttributes.getChildPolicy();`
`125`		`- }`
`126`		`-`
`127`	`123`	`void setCurrentRunId(String currentRunId) {`
`128`	`124`	`this.currentRunId = currentRunId;`
`129`	`125`	`}`