Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update sql status to not report changes for unstaged tables that have changed but not visibly. #8624

Merged
merged 2 commits into from
Dec 4, 2024

Conversation

nicktobey
Copy link
Contributor

Sometimes tables can change their hashes despite having no visible changes. The two ways I identified where this can happen are:

  • The table has different column tags from the ancestor because it was originally a different table that got renamed.
  • The table stores whether it's in a conflict and stores the hash of the other branch's table and the common ancestor table.

If these are the only changes to a table, we shouldn't report it as changed in dolt status.

These tables can still be staged and report as modified once staged.

@coffeegoddd
Copy link
Contributor

@nicktobey DOLT

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

… changed but not visibly.

These tables can still be staged and report as modified once staged.
@coffeegoddd
Copy link
Contributor

@nicktobey DOLT

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

@nicktobey nicktobey requested a review from tbantle22 December 3, 2024 03:21
Copy link
Contributor

@tbantle22 tbantle22 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm thanks for fixing

integration-tests/bats/sql-status.bats Outdated Show resolved Hide resolved
@coffeegoddd
Copy link
Contributor

@nicktobey DOLT

comparing_percentages
100.000000 to 100.000000
version result total
2dbd1f6 ok 5937457
version total_tests
2dbd1f6 5937457
correctness_percentage
100.0

Copy link

github-actions bot commented Dec 4, 2024

@coffeegoddd DOLT

test_name detail row_cnt sorted mysql_time sql_mult cli_mult
batching LOAD DATA 10000 1 0.06 1.33
batching batch sql 10000 1 0.08 1.5
batching by line sql 10000 1 0.08 1.5
blob 1 blob 200000 1 0.88 3.8 3.68
blob 2 blobs 200000 1 0.88 4.27 4.38
blob no blob 200000 1 0.86 2.36 2.06
col type datetime 200000 1 0.79 3.01 2.9
col type varchar 200000 1 0.65 3.51 2.92
config width 2 cols 200000 1 0.77 2.47 2
config width 32 cols 200000 1 1.88 2.03 2.38
config width 8 cols 200000 1 0.96 2.74 2.65
pk type float 200000 1 0.82 2.37 1.91
pk type int 200000 1 0.8 2.33 2.14
pk type varchar 200000 1 1.55 1.63 1.36
row count 1.6mm 1600000 1 5.52 2.82 2.31
row count 400k 400000 1 1.41 2.72 2.21
row count 800k 800000 1 2.74 2.81 2.29
secondary index four index 200000 1 3.39 1.43 1.12
secondary index no secondary 200000 1 2.36 0.87 0.75
secondary index one index 200000 1 1.12 2.32 1.96
secondary index two index 200000 1 1.94 1.75 1.41
sorting shuffled 1mm 1000000 0 5.34 2.61 2.33
sorting sorted 1mm 1000000 1 5.33 2.7 2.22

Copy link

github-actions bot commented Dec 4, 2024

@coffeegoddd DOLT

name detail mean_mult
dolt_blame_basic system table 1.11
dolt_blame_commit_filter system table 2.92
dolt_commit_ancestors_commit_filter system table 0.68
dolt_commits_commit_filter system table 1.05
dolt_diff_log_join_from_commit system table 2.47
dolt_diff_log_join_to_commit system table 2.37
dolt_diff_table_from_commit_filter system table 1.16
dolt_diff_table_to_commit_filter system table 1.16
dolt_diffs_commit_filter system table 0.97
dolt_history_commit_filter system table 1.3
dolt_log_commit_filter system table 1.11

Copy link

github-actions bot commented Dec 4, 2024

@coffeegoddd DOLT

name add_cnt delete_cnt update_cnt latency
adds_only 60000 0 0 0.73
adds_updates_deletes 60000 60000 60000 3.81
deletes_only 0 60000 0 7.25
updates_only 0 0 60000 8.28

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.

3 participants