mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-02 11:30:13 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity
16,512 Commits 299 Branches 629 Tags
3d91099ae4e2d1ea43d476ba1bbf550b927749f8
Commit Graph

16512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Pavel Safronov c2136a3e09 Block branch switches when both current and target branches have working set changes. 
Allow this behavior to be skipped using the `-f` flag, in which case the two working sets are combined (as is the current behavior).
 2022-12-06 16:43:26 -08:00
Andy Arthur 48b6fb8946 refactored chunk journal shutdown 2022-12-06 15:54:42 -08:00
Andy Arthur 97443d8e8c added pull tests for chunk journal 2022-12-06 15:51:09 -08:00
Andy Arthur fa4df4740b refactored chunkJournal to differentiate empty and non-empty initialization, removed chunk journal for oldGen nbs 2022-12-06 15:51:09 -08:00
Andy Arthur b1dad8e274 checkpoint 2022-12-06 15:51:09 -08:00
Andy Arthur c46c63d695 go/cmd/commands: added --datasets flag to dolt branch to list all datasets 2022-12-06 15:50:08 -08:00
Maximilian Hoffman bd32265cc1 ambyii's escape commit tag (#4939) 
* no newlines

* Get uncommitted values for GC from datasets

* Remove getGCKeepers

* [no-release-notes] revert systab debugging (#4918)

* Revert "no newlines"

This reverts commit a41db014cc.

* Revert "indent error"

This reverts commit f074dee15d.

* Revert "starter (#4912)"

This reverts commit 02809af1b9.

* Fix and tests for escaping commit messages

Co-authored-by: Taylor Bantle <taylor@dolthub.com>
Co-authored-by: Abdurrahmaan Iqbal <abdurrahmaaniqbal@hotmail.com>
 2022-12-06 15:13:54 -08:00
Dhruv Sringari 1466d9e9a9 Merge pull request #4929 from dolthub/dhruv/merge-broken 
Adds skipped bats for silent merge failures
 2022-12-06 14:41:09 -08:00
James Cor 8a9a39f464 Merge pull request #4938 from dolthub/JCOR11599-b1478504 
[auto-bump] [no-release-notes] dependency by JCOR11599
 2022-12-06 13:24:43 -08:00
JCOR11599 761b0bbe28 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2022-12-06 20:14:33 +00:00
Zach Musgrave 389320173b Merge pull request #4907 from dolthub/zachmu/bats-dolt-branch-c 
Added bats tests for dolt_branch(-c...)
 2022-12-06 10:24:40 -08:00
Dhruv Sringari 1b721635a4 Adds skipped bats for a couple broken merge scenarios 
5 skipped bats showing how merge breaks today.
 2022-12-05 16:07:01 -08:00
Jason Fulghum d167aca238 Merge pull request #4924 from JCPrice0024/fixed-minor-bug 
minor bug in results.go
 2022-12-05 15:47:03 -08:00
JCPrice0024 e04d4d8422 found another minor bug in results.go 
Documented behavior
 2022-12-05 17:34:37 -05:00
Jason Fulghum 1f67474c01 Merge pull request #4923 from JCPrice0024/fixed-minor-bug 
minor bug in validate.go
 2022-12-05 12:27:28 -08:00
JCPrice0024 039a8b0815 found minor bug in validate.go 2022-12-05 14:05:31 -05:00
Maximilian Hoffman a614a39230 [no-release-notes] revert systab CI (#4922) 
* Revert "cat job.json"

This reverts commit e23f7b304a.

* Revert "indent error"

This reverts commit f074dee15d.

* Revert "starter (#4912)"

This reverts commit 02809af1b9.
 2022-12-05 10:03:00 -08:00
Max Hoffman e23f7b304a cat job.json 2022-12-05 09:17:32 -08:00
Aaron Son 7d80eb6a2e Merge pull request #4911 from dolthub/aaron/dolt-standby-replication-remotesapi-listen-address 
go/cmd/dolt/commands/sqlserver: Allow a server in a cluster to configure which address it listens on for replication traffic.
 2022-12-02 13:44:05 -08:00
andy-wm-arthur 31d4ff4a0a [ga-bump-release] Update Dolt version to 0.51.9 and release v0.51.9 v0.51.9 2022-12-02 21:02:10 +00:00
Max Hoffman f074dee15d indent error 2022-12-02 12:57:58 -08:00
Maximilian Hoffman 02809af1b9 starter (#4912) 2022-12-02 12:56:09 -08:00
AndyA 388a43fad6 Merge pull request #4909 from dolthub/andy/nbs-refactor 
go/store/nbs: cleanup NBS interfaces
 2022-12-02 12:24:59 -08:00
reltuk 962fb1c2dc [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-12-02 19:49:16 +00:00
Aaron Son e9ce266733 go/cmd/dolt/commands/sqlserver: Allow a server in a cluster to configure which address it listens on for replication traffic. 2022-12-02 11:36:49 -08:00
Andy Arthur 6a1c6156a0 update andy's github username 2022-12-02 10:47:29 -08:00
Andy Arthur 96ee7a4598 Merge remote-tracking branch 'origin/main' into andy/nbs-refactor 2022-12-02 09:46:45 -08:00
Dustin Brown 460d2f7c8f [auto-bump] [no-release-notes] dependency by Hydrocharged (#4910) 
* [ga-bump-dep] Bump dependency in Dolt by Hydrocharged

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

Co-authored-by: Hydrocharged <Hydrocharged@users.noreply.github.com>
Co-authored-by: coffeegoddd <coffeegoddd@users.noreply.github.com>
 2022-12-02 08:37:20 -08:00
Andy Arthur 60dae047cb refactored conjoiner as conjoinStrategy 2022-12-01 17:12:54 -08:00
Dhruv Sringari e7275585f8 Merge pull request #4906 from dolthub/dhruv/dolt_conflict_id 
Add dolt_conflict_id to dolt_conflicts_$table_name
 2022-12-01 16:55:10 -08:00
Dhruv Sringari 946b2f2d9c Include from_root_ish in the dolt_conflict_id hash. 2022-12-01 16:04:27 -08:00
Jason Fulghum 0a5028f52f Merge pull request #4905 from dolthub/fulghum-bbec6939 
[auto-bump] [no-release-notes] dependency by fulghum
 2022-12-01 15:41:45 -08:00
Zach Musgrave aed541437f Added bats tests for dolt_branch(-c...) 2022-12-01 15:27:23 -08:00
Dhruv Sringari ee68d46c96 Add dolt_conflict_id to dolt_conflicts_$table_name 
This PR makes manipulating the dolt_conflicts_$table_name tables easier.
It adds a new `dolt_conflict_id` column. The column is a hash of the primary keys for a
keyed table and the value hash of the row for a keyless table.

You can use the new column along with the `from_root_ish` column to select singular rows.
The `dolt_conflict_id` column does not uniquely identify conflict rows. Conflicts can
be aggregated across merges, which can result in two rows having the same `dolt_conflict_id`.
 2022-12-01 14:30:33 -08:00
fulghum 5499f6a6e3 [ga-bump-dep] Bump dependency in Dolt by fulghum 2022-12-01 22:27:06 +00:00
Andy Arthur e997e02c8a added getRecordRanges to chunkSource interface 2022-12-01 14:22:48 -08:00
Jason Fulghum b192155eae Adding TestJoinQueriesPrepared in Dolt (#4898) 
* Adding the new TestJoinQueriesPrepared engine test function.

* Decrementing `SkipPreparedsCount` after adding TestJoinQueriesPrepared

* Bumping to latest GMS commit on fulghum/test-join-queries-prepared dev branch.

* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh

Co-authored-by: fulghum <fulghum@users.noreply.github.com>
 2022-12-01 13:41:06 -08:00
Dhruv Sringari 9701fd7d9b Merge pull request #4894 from dolthub/dhruv/fix-truncate 
Truncate table should not drop conflicts or CVs
 2022-12-01 12:38:41 -08:00
Jason Fulghum 0caa2c8b08 Merge pull request #4897 from dolthub/fulghum-da3a6cba 
[auto-bump] [no-release-notes] dependency by fulghum
 2022-12-01 11:31:51 -08:00
Jason Fulghum 6dc7a33bfe Pulling over James' timetest fix 2022-12-01 10:06:48 -08:00
stephanie f8462b78a5 Merge pull request #4900 from dolthub/steph/dolt-4889 
fixes dolt table export appending success message to csv when using redirect syntax
 2022-12-01 09:48:49 -08:00
Max Hoffman 5928dbf293 fix defaults 2022-12-01 09:17:10 -08:00
Dhruv Sringari e54b00488f Allow rows to be inserted by updating dolt_conflicts_$table_name 2022-11-30 17:21:53 -08:00
Stephanie You 296481f2cb remove unneeded comment 2022-11-30 17:12:19 -08:00
Dhruv Sringari e078cf09a3 fix old format tests 2022-11-30 16:57:40 -08:00
James Cor 5651df4224 local time for ci is not local time for me 2022-11-30 16:52:31 -08:00
James Cor 830efc0815 manual bump and fixing test 2022-11-30 16:34:10 -08:00
Stephanie You 6446ab3d81 fixes dolt table export appending success message to csv when using redirect syntax 2022-11-30 16:21:52 -08:00
fulghum f8f5ed3bcc [ga-bump-dep] Bump dependency in Dolt by fulghum 2022-11-30 23:31:45 +00:00
Dhruv Sringari c3de0809e1 Truncate table should not drop conflicts or CVs 2022-11-30 14:36:12 -08:00