Merge operation recorders #199
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
maxdml
reviewed
Dec 5, 2025
Collaborator
maxdml
left a comment
maxdml
left a comment
There was a problem hiding this comment.
Thanks @shirzady1934 for the PR.
Comment on lines
+254
to
+255
| isGetResult: true, | ||
| stepName: "DBOS.getResult", |
Collaborator
There was a problem hiding this comment.
We should be able to use the stepName to determine whether this is a get result step (no need for isGetResult). (We also don't need the on conflict cause.)
Comment on lines
+1264
to
+1267
| conflictClause := "" | ||
| if input.isGetResult { | ||
| conflictClause = "ON CONFLICT DO NOTHING" | ||
| } |
Collaborator
There was a problem hiding this comment.
We don't want that -- this was a bug in record child result and we should absolutely let conflicts return errors (which are caught later in this function)
Comment on lines
+380
to
+395
| require.Eventually(t, func() bool { | ||
| args := append([]string{"workflow", "list", "--queue", "example-queue"}, baseArgs...) | ||
| cmd := exec.Command(cliPath, args...) | ||
| cmd.Env = append(os.Environ(), "DBOS_SYSTEM_DATABASE_URL="+getDatabaseURL(dbRole)) | ||
|
|
||
| output, err := cmd.CombinedOutput() | ||
| if err != nil { | ||
| return false | ||
| } | ||
| var workflows []dbos.WorkflowStatus | ||
| err = json.Unmarshal(output, &workflows) | ||
| if err != nil { | ||
| return false | ||
| } | ||
| return len(workflows) >= 10 | ||
| }, 5*time.Second, 500*time.Millisecond, "Should find at least 10 workflows in the queue") |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR addresses issue #148 by refactoring the system database to merge the functionality of
recordChildGetResultintorecordOperationResult.The
recordOperationResultfunction has been updated to handle the parent-child relationship by accepting achildWorkflowID. TherecordChildGetResultfunction has been removed, and its call sites have been updated to use the newrecordOperationResult.During the development process, a few other issue were identified and resolved a bug in the dynamic SQL query construction in the refactored
recordOperationResultfunction was fixed.Additionally, this PR addresses a race condition in the CLI integration tests that was causing flaky test runs. The tests were failing because they were checking for queued workflows before the parent workflow had finished enqueueing them. A polling mechanism has been added to wait until the expected number of workflows are present in the queue before proceeding with the assertions.