Commit Graph

26740 Commits

Author SHA1 Message Date
Nathan Gabrielson 795dd4058f Expect is pain, expect is suffering 2025-06-11 21:02:48 -07:00
Nathan Gabrielson 8ca4bf3a32 Working tests + todo message for future improvmeent 2025-06-11 20:44:55 -07:00
Nathan Gabrielson 6cfa19f130 Some more changes, suffering with expect 2025-06-11 19:04:52 -07:00
Nathan Gabrielson 40bd24a522 quick pass at commit time change 2025-06-11 15:04:38 -07:00
coffeegoddd 4c517bbd48 [ga-bump-release] Update Dolt version to 1.55.0 and release v1.55.0 v1.55.0 2025-06-11 21:35:35 +00:00
Nathan Gabrielson c8a6b59d4a Merge pull request #9308 from dolthub/nathan/stashes
dolt_stash stored procedure
2025-06-11 14:03:55 -07:00
Aaron Son 6b13f0061b Merge pull request #9329 from dolthub/aaron/push-to-sql-server-during-gc-fixes
go: store/datas/database_common: store/nbs/store.go: Fix some issues when pushing to a dolt sql-server that is itself running GC.
2025-06-11 13:58:59 -07:00
Aaron Son 2d00d71b96 integration-tests/go-sql-server-driver/auto_gc_test.go: Remove some flakey asserts for now. 2025-06-11 12:15:27 -07:00
Aaron Son de9915b817 go/store/nbs: Move sanity checks panics from file_table_reader into dynamic enabled asserts. 2025-06-11 11:34:20 -07:00
angelamayxie f732029dba Merge pull request #9331 from dolthub/angelamayxie-c62c7e38
[auto-bump] [no-release-notes] dependency by angelamayxie
2025-06-10 17:03:27 -07:00
Nathan Gabrielson a3bc2ba365 Better stash field name 2025-06-10 16:53:45 -07:00
NathanGabrielson 98b7a35a4a [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2025-06-10 23:48:30 +00:00
Nathan Gabrielson a0c800690d Requested changes pt 2 2025-06-10 16:39:51 -07:00
Nathan Gabrielson 503c1379ec Some cleanup 2025-06-10 15:02:22 -07:00
Nathan Gabrielson 37deab0d41 Some more small fixes 2025-06-10 13:04:49 -07:00
reltuk 07a2e11e5c [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2025-06-10 18:43:53 +00:00
Aaron Son 5701a93cb2 go/store/nbs: Small PR cleanups. 2025-06-10 11:35:40 -07:00
NathanGabrielson b0e5eee980 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2025-06-10 18:08:40 +00:00
Nathan Gabrielson f954cffa92 Requested changes 2025-06-10 10:59:52 -07:00
angelamayxie 123608731c [ga-bump-dep] Bump dependency in Dolt by angelamayxie 2025-06-10 17:42:07 +00:00
Taylor Bantle 93301be373 Merge pull request #9270 from dolthub/taylor/conflicts-preview-table
Add `dolt_preview_merge_conflicts` table function
2025-06-10 10:31:22 -07:00
Taylor Bantle 816935099c Merge remote-tracking branch 'origin/main' into taylor/conflicts-preview-table 2025-06-10 09:54:11 -07:00
angelamayxie b3b7dcc158 Merge pull request #9328 from dolthub/angelamayxie-75f15bbd
[auto-bump] [no-release-notes] dependency by angelamayxie
2025-06-09 20:18:34 -07:00
Aaron Son 956f073dfd go: store/datas/database_common: store/nbs/store.go: Fix some issues when pushing to a dolt sql-server that is itself running GC.
A push to a remote works by uploading the missing content and then adding
references to it in the remote datastore. If the remote is running a GC during
the push, it is possible for the newly added data to be collected and no longer
be available when the references are added.

This should cause a transient failure which is safe is retry. There were a
couple bugs which could instead cause a panic. This makes some changes to
safeguard against those case.
2025-06-09 17:19:20 -07:00
angelamayxie c91eec5491 [ga-bump-dep] Bump dependency in Dolt by angelamayxie 2025-06-09 23:51:56 +00:00
Jason Fulghum 15d3919e10 Merge pull request #9327 from dolthub/fulghum-c44b30ca
[auto-bump] [no-release-notes] dependency by fulghum
2025-06-09 16:23:07 -07:00
tbantle22 f1f9decdca [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2025-06-09 22:10:59 +00:00
fulghum 04dfc369b9 [ga-bump-dep] Bump dependency in Dolt by fulghum 2025-06-09 21:54:36 +00:00
Taylor Bantle bbfbb8ffd1 Merge remote-tracking branch 'origin/main' into taylor/conflicts-preview-table 2025-06-09 14:54:31 -07:00
Taylor Bantle bfcc421785 Merge pull request #9233 from dolthub/taylor/conflicts-preview
Add a `dolt_preview_merge_conflicts_summary` table function
2025-06-09 14:53:24 -07:00
Nathan Gabrielson 25d2e6eadb Fixed tests + cleanup 2025-06-09 14:16:49 -07:00
Taylor Bantle 43db156ed1 Merge branch 'taylor/conflicts-preview' into taylor/conflicts-preview-table 2025-06-09 12:57:21 -07:00
Taylor Bantle e0225f4b0a Add comments 2025-06-09 12:57:14 -07:00
Taylor Bantle 3a5dcb3471 Update maven to 3.9.10 2025-06-09 12:20:33 -07:00
Taylor Bantle 98a0d7a31a Merge remote-tracking branch 'origin/main' into taylor/conflicts-preview 2025-06-09 12:08:06 -07:00
Nathan Gabrielson 01ca03baa6 Small fixes 2025-06-09 12:07:23 -07:00
Nathan Gabrielson f2bb0baf71 Better tests & documentatioin & working stash reference 2025-06-09 12:07:23 -07:00
Nathan Gabrielson 406812d1e0 Many engine tests & a (mostly) working procedure 2025-06-09 12:07:23 -07:00
NathanGabrielson c042c0c073 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2025-06-09 12:07:23 -07:00
Nathan Gabrielson 32b529bfc3 Stash list table + (mostly) function procedure 2025-06-09 12:07:23 -07:00
Nathan Gabrielson 6251b3513f First pass at dolt_stash() 2025-06-09 12:07:23 -07:00
Taylor Bantle 6e02038966 More feedback 2025-06-09 11:57:56 -07:00
Taylor Bantle e5ee96448b More feedback 2025-06-09 11:57:10 -07:00
Neil Macneale IV b787711666 Merge pull request #9301 from dolthub/macneale4/node-cache-stripes-2
Use 256 stripes in node cache
2025-06-06 15:23:28 -07:00
Taylor Bantle 09e334f342 Better naming, Schema doc string 2025-06-06 11:34:24 -07:00
Aaron Son 6cd52bbec8 Merge pull request #9317 from dolthub/aaron/archive-auto-gc-transient-failure-fix
go/store/nbs: archive_chunk_source.go: Make sure we skip getRecords marked found when fetching chunks.
2025-06-06 10:20:05 -07:00
Aaron Son 232e1aab6e go/store/nbs: archive_chunk_source.go: Make sure we skip getRecords marked found when fetching chunks.
This avoids delivering the chunk more than once, which parts of the application
layer are not expecting.
2025-06-05 17:05:23 -07:00
Taylor Bantle 3ba5443a17 Fix conflict id calculation for table function 2025-06-05 16:17:47 -07:00
Taylor Bantle eec403b4f1 Merge tests, better naming, share some conflict logic 2025-06-05 15:30:30 -07:00
James Cor eb0107a766 tidy up errors (#9310) 2025-06-05 15:20:27 -07:00