Skip to content

remote cleanup#9256

Merged
macneale4 merged 4 commits intomainfrom
macneale/claud-remote-cleanup
May 28, 2025
Merged

remote cleanup#9256
macneale4 merged 4 commits intomainfrom
macneale/claud-remote-cleanup

Conversation

@macneale4
Copy link
Copy Markdown
Contributor

@macneale4 macneale4 commented May 27, 2025

When removing remote definitions, we now also remove the remote references from the branch specifications.

Fixes: #9169

macneale4 and others added 3 commits May 27, 2025 15:11
This test reproduces GitHub issue #9169 where removing a remote
does not properly clean up branch tracking information. After
'dolt remote remove origin', the status still shows tracking
references to the removed remote.

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
When removing a remote via 'dolt remote remove', the remote refs and
remote entry were properly cleaned up, but branch configurations that
tracked the removed remote were not updated. This caused 'dolt status'
to still show tracking information for the removed remote.

The fix adds logic to the dolt_remote SQL procedure to:
1. Find all branch configurations that reference the removed remote
2. Update those configurations to clear the remote field while
   preserving the head reference
3. Then proceed with the normal remote removal

This ensures that after removing a remote, branches no longer show
tracking status for the non-existent remote.

Fixes #9169

🤖 Generated with [Claude Code](https://claude.ai/code)

Co-Authored-By: Claude <noreply@anthropic.com>
@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
cace617 ok 5937457
version total_tests
cace617 5937457
correctness_percentage
100.0

@coffeegoddd
Copy link
Copy Markdown
Contributor

@coffeegoddd DOLT

comparing_percentages
100.000000 to 100.000000
version result total
46cd952 ok 5937457
version total_tests
46cd952 5937457
correctness_percentage
100.0

@macneale4 macneale4 marked this pull request as ready for review May 28, 2025 00:27
NathanGabrielson

This comment was marked as resolved.

@macneale4 macneale4 merged commit 84af7d9 into main May 28, 2025
21 checks passed
@macneale4 macneale4 deleted the macneale/claud-remote-cleanup branch May 28, 2025 20:25
@coffeegoddd
Copy link
Copy Markdown
Contributor

@macneale4 DOLT

comparing_percentages
100.000000 to 100.000000
version result total
cfbcbf8 ok 5937457
version total_tests
cfbcbf8 5937457
correctness_percentage
100.0

@github-actions
Copy link
Copy Markdown

@coffeegoddd DOLT

test_name detail row_cnt sorted mysql_time sql_mult cli_mult
batching LOAD DATA 10000 1 0.07 1.14
batching batch sql 10000 1 0.1 1.2
batching by line sql 10000 1 0.1 1.2
blob 1 blob 200000 1 0.95 3.56 4.27
blob 2 blobs 200000 1 0.93 4.11 4.45
blob no blob 200000 1 0.96 2.31 2.74
col type datetime 200000 1 0.82 2.48 2.84
col type varchar 200000 1 0.84 2.81 3.29
config width 2 cols 200000 1 0.84 2.63 3.08
config width 32 cols 200000 1 1.91 1.99 2.71
config width 8 cols 200000 1 0.99 2.38 2.63
pk type float 200000 1 0.89 2.33 2.67
pk type int 200000 1 1.16 1.75 2.01
pk type varchar 200000 1 1.49 1.75 1.91
row count 1.6mm 1600000 1 5.85 2.93 3
row count 400k 400000 1 1.51 2.75 2.98
row count 800k 800000 1 2.92 2.91 3.02
secondary index four index 200000 1 3.57 1.45 1.32
secondary index no secondary 200000 1 0.91 2.48 2.88
secondary index one index 200000 1 1.21 2.35 2.39
secondary index two index 200000 1 2.05 1.77 1.84
sorting shuffled 1mm 1000000 0 5.19 2.81 2.62
sorting sorted 1mm 1000000 1 4.96 2.95 2.73

@github-actions
Copy link
Copy Markdown

@coffeegoddd DOLT

name detail mean_mult
dolt_blame_basic system table 1.13
dolt_blame_commit_filter system table 2.85
dolt_commit_ancestors_commit_filter system table 0.63
dolt_commits_commit_filter system table 1.05
dolt_diff_log_join_from_commit system table 2.7
dolt_diff_log_join_to_commit system table 2.7
dolt_diff_table_from_commit_filter system table 1.16
dolt_diff_table_to_commit_filter system table 1.25
dolt_diffs_commit_filter system table 1.03
dolt_history_commit_filter system table 1.48
dolt_log_commit_filter system table 1.1

@github-actions
Copy link
Copy Markdown

@coffeegoddd DOLT

test_name detail row_cnt sorted mysql_time sql_mult cli_mult
batching LOAD DATA 10000 1 0.07 1.29
batching batch sql 10000 1 0.09 1.33
batching by line sql 10000 1 0.09 1.33
blob 1 blob 200000 1 0.9 3.79 4.49
blob 2 blobs 200000 1 0.89 4.28 4.57
blob no blob 200000 1 0.93 2.41 2.81
col type datetime 200000 1 0.78 2.58 2.96
col type varchar 200000 1 0.72 3.33 3.71
config width 2 cols 200000 1 0.88 2.31 2.66
config width 32 cols 200000 1 1.95 1.95 2.65
config width 8 cols 200000 1 0.95 2.48 2.74
pk type float 200000 1 0.82 2.54 2.88
pk type int 200000 1 0.91 2.4 2.52
pk type varchar 200000 1 1.48 1.76 2.15
row count 1.6mm 1600000 1 5.63 3.03 3.12
row count 400k 400000 1 1.56 2.67 2.86
row count 800k 800000 1 2.89 2.93 3.02
secondary index four index 200000 1 3.65 1.39 1.33
secondary index no secondary 200000 1 0.95 2.38 2.77
secondary index one index 200000 1 1.13 2.48 2.65
secondary index two index 200000 1 2.02 1.76 1.88
sorting shuffled 1mm 1000000 0 5.13 2.88 2.7
sorting sorted 1mm 1000000 1 5.12 2.87 2.67

@github-actions
Copy link
Copy Markdown

@coffeegoddd DOLT

name detail mean_mult
dolt_blame_basic system table 1.17
dolt_blame_commit_filter system table 2.85
dolt_commit_ancestors_commit_filter system table 0.59
dolt_commits_commit_filter system table 1.05
dolt_diff_log_join_from_commit system table 2.83
dolt_diff_log_join_to_commit system table 2.72
dolt_diff_table_from_commit_filter system table 1.19
dolt_diff_table_to_commit_filter system table 1.17
dolt_diffs_commit_filter system table 1
dolt_history_commit_filter system table 1.48
dolt_log_commit_filter system table 1.16

@github-actions
Copy link
Copy Markdown

@coffeegoddd DOLT

name add_cnt delete_cnt update_cnt latency
adds_only 60000 0 0 1.13
adds_updates_deletes 60000 60000 60000 4.5
deletes_only 0 60000 0 2.36
updates_only 0 0 60000 3.04

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Dolt maintains reference to removed remote

3 participants