[auto-bump] [no-release-notes] dependency by angelamayxie by coffeegoddd · Pull Request #10646 · dolthub/dolt

coffeegoddd · 2026-03-06T00:31:59Z

☕ An Automated Dependency Version Bump PR 👑

Initial Changes

The initial changes contained in this PR were produced by `go get`ing the dependency.

```
$ cd ./go
$ go get github.com/dolthub//go@
```

Before Merging

This PR must have passing CI and a review before merging.

…ationFailed Export runCommitVerification as RunCommitVerification so callers outside the package (cherry-pick, merge, rebase) can invoke verification explicitly before NewPendingCommit. Add ErrCommitVerificationFailed typed error using goerrors.NewKind so callers can use errors.Is() to detect verification failures vs other errors. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

When commit verification fails during CherryPick(), instead of returning a bare error and losing all staged changes, explicitly run verification before NewPendingCommit(). On failure, call StartCherryPick() to set merge-in-progress state and save the working set, leaving staged changes intact so the user can fix the failing tests and --continue. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

When ContinueCherryPick() calls NewPendingCommit() and verification fails, return ErrCommitVerificationFailed directly rather than wrapping it as "failed to create pending commit". The merge state is not cleared at this point, so the workspace remains dirty and the user can fix and --continue again. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

… bug Add a 5th verification_failures column to dolt_cherry_pick result schema so verification failures can be surfaced without returning a SQL error (which would roll back working set changes and lose dirty state). Fix the StartCherryPick preMergeWorking bug: previously StartCherryPick was called after SetWorkingRoot, so --abort would restore to the cherry-pick result instead of the original state. Now we capture preApplyWs before any working set changes and use it to build the new working set with the correct pre-merge root. Update all existing cherry-pick test expectations to the 5-column schema. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

When a cherry-pick step during rebase fails commit verification, commit the current SQL transaction before returning an error. This preserves the dirty working set (staged tables + active cherry-pick merge state) so the user can fix failing tests and call dolt_rebase('--continue'). Defines ErrRebaseVerificationFailed for structured error messages. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Run commit verification explicitly in executeNoFFMerge() and performMerge() before creating the pending commit. On failure, return the error message through the result message field instead of as a SQL error, so the SQL transaction commits normally and the dirty merge state (staged tables + active merge state) is preserved. This lets users fix failing tests and call CALL dolt_commit() to complete the merge, mirroring the conflict-resolution workflow. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Add engine tests covering the dirty-state workflow for all three operations when commit verification fails: Cherry-pick: tests pass, tests fail (dirty state preserved + --abort restores clean state), fix data then --continue succeeds. Rebase: tests pass, tests fail (--abort works, --skip-verification succeeds after abort). Merge: tests pass, tests fail (dirty state preserved), dolt_commit without fixing re-fails, fix data then dolt_commit succeeds. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

- merge CLI (merge.go): add getMergeMessage() helper and check for "commit verification failed:" prefix in message column. Print the message and return exit code 1 when verification fails, after first committing the SQL transaction to preserve staged state. - rebase CLI (rebase.go): extend isRebaseConflictError() to also match ErrCommitVerificationFailed (typed) and "commit verification failed:" prefix (string match for over-the-wire). This ensures syncCliBranch- ToSqlSessionBranch() is called, switching the CLI to dolt_rebase_<b> so staged changes are visible after verification failure. - dolt_rebase.go: return verification failure error directly (not wrapped in ErrRebaseVerificationFailed) so engine tests can match the exact "commit verification failed: ..." string without including the non-deterministic commit hash. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Each test file gets two new bats tests: - verification failure halts with dirty state preserved - fix data then continue succeeds Tests use SET @@PERSIST.dolt_commit_verification_groups = '*' (not SET GLOBAL) to persist the setting across CLI invocations in non-server mode. cherry-pick.bats: user fixes dolt_tests and calls dolt cherry-pick --continue merge.bats: user fixes dolt_tests and calls dolt commit after merge fails rebase.bats: user fixes dolt_tests and calls dolt rebase --continue; after failure the CLI is on dolt_rebase_b1 (not b1), where staged changes are visible in dolt status Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

- Remove verification failure tests from cherry-pick.bats, merge.bats, rebase.bats - Consolidate into commit_verification.bats with 6 new tests covering dirty-state-preserved and fix+continue workflows for cherry-pick, merge, rebase - Fix pre-existing tests that assumed clean-state after verification failure: add --abort before --skip-verification retries for cherry-pick and merge tests - Remove unskip and fix pre-existing rebase test (was skipped, now works correctly) - Remove invalid test_users_count assertion from cherry-pick CLI test (cherry-pick CLI uses ErrCherryPickVerificationFailed which does not include test names) Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…trings Add CommitVerificationFailedPrefix = "commit verification failed:" to actions/commit.go and use it in ErrCommitVerificationFailed's format string. Replace the hardcoded string literals in merge.go and rebase.go with this constant, and add the actions import to merge.go. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Instead of running verification manually before NewPendingCommit and skipping it inside, let NewPendingCommit run verification exactly once via GetCommitStaged. When it returns ErrCommitVerificationFailed, catch it, set the merge state (same logic as before), and return nil Go error so CommitTransaction persists the dirty working set. This matches the pattern already used in ContinueCherryPick. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Previously, cherry-pick verification failure was reduced to verification_failures=1 in the stored proc result row and the CLI emitted a generic ErrCherryPickVerificationFailed message with no test details. Now: - doDoltCherryPick: when VerificationFailureErr is set, commit the transaction to persist dirty working set + merge state, then return the specific error (containing test name and failure details). - ContinueCherryPick: return ErrCommitVerificationFailed directly instead of (0,0,0,1,nil), since the merge state is already on disk from the previous call. - cherry-pick.go CLI: detect ErrCommitVerificationFailed in both the initial and --continue paths, print the specific error, then return ErrCherryPickVerificationFailed for the --continue/--abort guidance. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…or not row The three test assertions that expected sql.Row{{"",0,0,0,1}} now use ExpectedErrStr with the specific "commit verification failed: ..." message. The dolt_status check between the initial failure and --continue remains, confirming dirty state is preserved via the explicit CommitTransaction. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ions Replace generic "Commit verification failed" checks with specific assertions matching the actual ErrCommitVerificationFailed output: lowercase prefix, test name (test_count), failure details (expected_single_value equal to 1, got 2), and both --continue and --abort guidance. Applied to both the initial cherry-pick failure and the --continue-still-fails case in tests 11 and 12. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…error not row The "cherry-pick with test verification enabled - tests pass" test had a fourth verification failure assertion (commit_2_hash) that also returned verification_failures=1. Update it to ExpectedErrStr matching the specific ErrCommitVerificationFailed message. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…ocedure result Verification failures are now surfaced as structured errors (ErrCommitVerificationFailed) rather than as a result column. Update ContinueCherryPick to return 4 values instead of 5, clean up the CLI's row-reading code, and update all engine tests to expect 4-column results. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

…vate The pre-emptive verification call before NewPendingCommit in executeNoFFMerge duplicated the verification that already runs inside GetCommitStaged. Remove it and let NewPendingCommit surface ErrCommitVerificationFailed, handling it the same way the caller already did. Since RunCommitVerification and GetCommitRunTestGroups are now only called within the actions package, make them unexported. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

/{go,integration-tests}: handle scp style git remote urls better

commit verification workflow

github-actions · 2026-03-06T00:32:07Z

This PR is being tested for SQL correctness. Please allow ~25 mins for this to complete. If this PR does not result in a SQL correctness regression, the correctness_approved label will be automatically added to this PR and the Check for correctness_approved workflow will succeed.

github-actions · 2026-03-06T00:32:07Z

This PR is being tested for SQL correctness. Please allow ~25 mins for this to complete. If this PR does not result in a SQL correctness regression, the correctness_approved label will be automatically added to this PR and the Check for correctness_approved workflow will succeed.

github-actions · 2026-03-06T00:32:08Z

This PR is being tested for performance. Please allow ~25 mins for this to complete. If this PR does not result in a performance regression, the performance_approved label will be automatically added to this PR.

github-actions · 2026-03-06T00:32:08Z

This PR is being tested for performance. Please allow ~25 mins for this to complete. If this PR does not result in a performance regression, the performance_approved label will be automatically added to this PR.

coffeegoddd · 2026-03-06T00:50:37Z

@coffeegoddd DOLT

read_tests	from_latency	to_latency	percent_change
covering_index_scan	0.54	0.55	1.85
groupby_scan	10.09	10.09	0.0
index_join	1.86	1.82	-2.15
index_join_scan	1.37	1.37	0.0
index_scan	22.69	22.28	-1.81
oltp_point_select	0.27	0.27	0.0
oltp_read_only	5.28	5.28	0.0
select_random_points	0.54	0.54	0.0
select_random_ranges	0.55	0.56	1.82
table_scan	22.69	22.69	0.0
types_table_scan	69.29	68.05	-1.79

write_tests	from_latency	to_latency
oltp_delete_insert	6.32	6.32
oltp_insert	3.13	3.13
oltp_read_write	11.45	11.45
oltp_update_index	3.19	3.19
oltp_update_non_index	3.13	3.13
oltp_write_only	6.09	6.09
types_delete_insert	6.91	6.91

coffeegoddd · 2026-03-06T00:59:08Z

@coffeegoddd DOLT

coffeegoddd · 2026-03-06T01:06:13Z

@coffeegoddd DOLT

test_name	from_latency_p95	to_latency_p95	percent_change
tpcc-scale-factor-1	61.08	61.08	0.0

test_name	from_server_name	from_server_version	from_tps	to_server_name	to_server_version	to_tps	percent_change
tpcc-scale-factor-1	dolt	`ae67607`	37.79	dolt	`097d655`	37.9	0.29

coffeegoddd and others added 30 commits March 4, 2026 17:00

/{go,integration-tests}: handle scp style git remote urls better

3e94572

Fix recomentation after failing cherry-pick

782e98b

Make cherry-pick more resilient to mismatched versions

6485ddf

BAD CLAUDE

979f736

cleanup of bats tests

5c51504

forgot || false on a couple tests

be9d08f

/go/cmd/dolt/commands/remote_test.go: fix test

069fce8

/{go,integration-tests}: pr feedback and testing

e555dae

/go/libraries/doltcore/dbfactory: revert uneeded changes

2481b9f

manual review/cleanup

e4f83ee

Merge pull request #10640 from dolthub/db/fix-gr

0e4e7d5

/{go,integration-tests}: handle scp style git remote urls better

PR Feedback for additional comment

6b4b3f5

macneale4 and others added 2 commits March 5, 2026 14:59

Merge pull request #10581 from dolthub/macneale4-claude/verify-workflow

ae67607

commit verification workflow

[ga-bump-dep] Bump dependency in Dolt by angelamayxie

097d655

coffeegoddd added the gms-bump pr that bumps the go-mysql-server version label Mar 6, 2026

coffeegoddd assigned angelamayxie Mar 6, 2026

coffeegoddd added the gms-bump pr that bumps the go-mysql-server version label Mar 6, 2026

coffeegoddd requested a review from zachmu March 6, 2026 00:32

angelamayxie changed the base branch from main to angela/import March 6, 2026 00:32

Merge branch 'angela/import' into angelamayxie-3e8a4521

98fbf5e

angelamayxie merged commit 5e60320 into angela/import Mar 6, 2026
1 check passed

angelamayxie deleted the angelamayxie-3e8a4521 branch March 6, 2026 00:33

coffeegoddd added the performance_approved label Mar 6, 2026

coffeegoddd added the correctness_approved label Mar 6, 2026

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

[auto-bump] [no-release-notes] dependency by angelamayxie#10646

[auto-bump] [no-release-notes] dependency by angelamayxie#10646
angelamayxie merged 33 commits intoangela/importfrom
angelamayxie-3e8a4521

coffeegoddd commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

Uh oh!

coffeegoddd commented Mar 6, 2026

Uh oh!

coffeegoddd commented Mar 6, 2026

Uh oh!

coffeegoddd commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Uh oh!

Conversation

coffeegoddd commented Mar 6, 2026

Initial Changes

Before Merging

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

github-actions bot commented Mar 6, 2026

Uh oh!

Uh oh!

coffeegoddd commented Mar 6, 2026

Uh oh!

coffeegoddd commented Mar 6, 2026

Uh oh!

coffeegoddd commented Mar 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants