fix: Do't trigger conditions for query jobs (#854)

Author: bergundy

packages/test/src/integration-tests.ts

@@ -1301,4 +1301,16 @@ export function runIntegrationTests(codec?: PayloadCodec): void {
     // Verify only one timer was scheduled
     t.is(history.events.filter(({ timerStartedEventAttributes }) => timerStartedEventAttributes != null).length, 1);
   });
+
+  test('Query does not cause condition to be triggered', async (t) => {
+    const { client } = t.context;
+    const workflowId = uuid4();
+    const handle = await client.start(workflows.queryAndCondition, {
+      taskQueue: 'test',
+      workflowId,
+    });
+    await handle.query(workflows.mutateWorkflowStateQuery);
+    // Worker did not crash
+    t.pass();
+  });
 }

packages/test/src/workflows/index.ts

@@ -56,6 +56,7 @@ export * from './patched-top-level';
 export * from './promise-all';
 export * from './promise-race';
 export * from './promise-then-promise';
+export * from './query-and-condition';
 export * from './race';
 export * from './random';
 export * from './reject-promise';

packages/test/src/workflows/query-and-condition.ts

@@ -0,0 +1,10 @@
+import * as wf from '@temporalio/workflow';
+
+export const mutateWorkflowStateQuery = wf.defineQuery<void>('mutateWorkflowState');
+
+export async function queryAndCondition(): Promise<void> {
+  let mutated = false;
+  // Not a valid query, used to verify that condition isn't triggered for query jobs
+  wf.setHandler(mutateWorkflowStateQuery, () => void (mutated = true));
+  await wf.condition(() => mutated);
+}

packages/worker/src/workflow/vm.ts

@@ -397,7 +397,10 @@ export class VMWorkflow implements Workflow {
         coresdk.workflow_activation.WorkflowActivation.fromObject({ ...activation, jobs }),
         batchIndex++
       );
-      await this.tryUnblockConditions();
+      // Only trigger conditions for non-query jobs
+      if (!jobs[0].queryWorkflow) {
+        await this.tryUnblockConditions();
+      }
     }
     const completion = this.workflowModule.concludeActivation();
     // Give unhandledRejection handler a chance to be triggered.

packages/workflow/src/worker-interface.ts

@@ -222,7 +222,10 @@ export function activate(activation: coresdk.workflow_activation.WorkflowActivat
         return;
       }
       state.activator[job.variant](variant as any /* TS can't infer this type */);
-      tryUnblockConditions();
+      // Only trigger conditions for non-query jobs
+      if (!job.queryWorkflow) {
+        tryUnblockConditions();
+      }
     }
   });
   intercept({