mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-30 10:45:18 -06:00
Code Issues Packages Projects Releases 124 Wiki Activity
17,007 Commits 73 Branches 594 Tags
ea46bce1d1e4039d76fcbf30416b172f2f2621f4
Commit Graph

17007 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Taylor Bantle
ea46bce1d1 Merge pull request #4959 from dolthub/taylor/gc 
First pass at online GC
 2023-01-25 14:01:36 -08:00
Aaron Son
62a0424f16 Merge pull request #5205 from dolthub/aaron/dsess-txn-does-not-commit-unstaged-stuff 
go/libraries/doltcore/sqle/dsess: When commiting a transaction with a  DOLT_COMMIT, merge against the current HEAD if necessary.
 2023-01-25 13:32:04 -08:00
Maximilian Hoffman
fffb9d0c73 Revert "merge join correctness bump" (#5215) 2023-01-25 13:31:37 -08:00
Max Hoffman
5d84ba010e merge main 2023-01-25 12:48:35 -08:00
Max Hoffman
ad6220e340 info schema changes? 2023-01-25 12:45:43 -08:00
James Cor
75f89767a4 Merge pull request #5211 from dolthub/JCOR11599-65857181 
[auto-bump] [no-release-notes] dependency by JCOR11599
 2023-01-25 12:38:44 -08:00
reltuk
84890d5616 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-25 20:34:41 +00:00
AndyA
187d72ff01 Merge pull request #5208 from dolthub/andy/concurrent-blob-persister 
go/store/nbs: add concurrency to blobstore persister operations
 2023-01-25 12:33:14 -08:00
Aaron Son
046b9d5593 go/libraries/doltcore/sqle: dsess/transactions,engintest: PR feedback. 2023-01-25 12:29:21 -08:00
Andy Arthur
210903f177 pr feedback 2023-01-25 12:29:08 -08:00
Max Hoffman
5259f88af5 bump 2023-01-25 11:49:02 -08:00
Taylor Bantle
d6260ab2b3 Fix 2023-01-25 11:30:32 -08:00
Taylor Bantle
ba7935b25b Merge remote-tracking branch 'origin/main' into taylor/gc 2023-01-25 11:24:06 -08:00
jennifersp
de2bdf74cb fix bats tests 2023-01-25 10:51:48 -08:00
JCOR11599
fa03dc16f6 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2023-01-25 18:16:10 +00:00
Aaron Son
b09b29de9d Merge pull request #5207 from dolthub/aaron/remotesrv-206 
go/libraries/doltcore/remotesrv: Response with HTTP status code 206 when writing partial responses.
 2023-01-25 09:08:01 -08:00
Aaron Son
e4dde36512 Merge pull request #5177 from dolthub/aaron/sql-server-remotesrv-supports-tls 
go/cmd/dolt: sqlserver: If tls config is defined for the sql-server, use it for the remotesapi port as well.
 2023-01-25 09:07:47 -08:00
Andy Arthur
bebcd8065a go/store/nbs: fix race in table existence check 2023-01-25 08:22:12 -08:00
James Cor
767ddda502 Merge pull request #5191 from dolthub/james/zaddr 
add z-address encoding
 2023-01-25 00:49:24 -08:00
Andy Arthur
6a30d36b78 go/store/nbs: add concurrency toblobstore persister operations 2023-01-24 18:43:43 -08:00
Aaron Son
493938d666 Merge remote-tracking branch 'origin/main' into aaron/sql-server-remotesrv-supports-tls 2023-01-24 16:48:54 -08:00
reltuk
c1c93b8bf8 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-25 00:43:35 +00:00
Aaron Son
c438bcd986 format_repo.sh. 2023-01-24 16:41:23 -08:00
Aaron Son
79e80f7569 go/libraries/doltcore/remotesrv: Response with HTTP status code 206 when writing partial responses. 
Also add Accept-Ranges headers in all HTTP responses for portions of table
files and Content-Range headers for partial file responses.

This makes the HTTP server more correct and can improve compatibility with
various HTTP middleware.
 2023-01-24 16:40:34 -08:00
Zach Musgrave
913e7b4771 Merge pull request #5193 from dolthub/zachmu/csv-out 
Fixed error in csv and json output formats for sql shell
 2023-01-24 16:00:06 -08:00
James Cor
ec34fd7254 Merge branch 'james/zaddr' of https://github.com/dolthub/dolt into james/zaddr 2023-01-24 15:59:16 -08:00
James Cor
026b665e98 removing loops and conditions 2023-01-24 15:59:14 -08:00
stephanie
c0b3660066 Merge pull request #5201 from dolthub/steph/dolt-5079 
dolt pull without configs doesnt return error when up to date
 2023-01-24 15:58:49 -08:00
James Cor
3803c94c0b unrolling 2023-01-24 15:56:51 -08:00
reltuk
2d6a580324 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-24 23:45:53 +00:00
JCOR11599
f0a92b60e2 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-24 23:44:37 +00:00
James Cor
ed71543d7d Merge branch 'james/zaddr' of https://github.com/dolthub/dolt into james/zaddr 2023-01-24 15:43:26 -08:00
James Cor
e3f35185da fixed 2023-01-24 15:43:24 -08:00
Aaron Son
b692065218 go/libraries/doltcore/sqle/dsess: When commiting a transaction with a DOLT_COMMIT, merge against the current HEAD if necessary. 
Update the transaction logic to land a merge of current HEAD and the staged
root value when we are creating a commit and the current HEAD has moved since
the start of the transaction.

Dolt allows two concurrent transactions to both land commits on a branch HEAD.
In the past, Dolt would simply commit the staged value on each transaction as
the value of the database for the commit, and would merge the working sets so
that the branch working set was updated with the latest data. This would result
in histories with commits which seemed to delete previously committed data,
only for it to still be present in the working set and to reappear in later
commits. This was particularly problematic under remote replication, where the
dolt commits themselves are replicated.

A change landed recently attempted to fix this by writing the merged working
set value as the committed value. That works in the case of
@@dolt_transaction_commit, assuming there are no manual calls to DOLT_COMMIT
with manually staged changes, for example, but it has the wrong semantics when
a user is manually staging and commiting changes.
 2023-01-24 15:38:59 -08:00
JCOR11599
8ea3495ae7 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-24 23:29:12 +00:00
James Cor
074c6f29bb fixing more tests 2023-01-24 15:27:55 -08:00
James Cor
f3b5226af4 flipping level and reordering 2023-01-24 15:26:43 -08:00
Stephanie You
5c9f2957a2 check output in test when dolt pull without configs 2023-01-24 14:30:10 -08:00
Stephanie You
a5320f6cea dolt pull without configs doesnt return error when up to date 2023-01-24 14:01:17 -08:00
JCOR11599
d907dbfc00 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-24 21:55:44 +00:00
James Cor
3cf3ba8f8d fixing tests 2023-01-24 13:54:28 -08:00
James Cor
23c5590f69 last bits of implementation 2023-01-24 13:44:04 -08:00
Zach Musgrave
b588ddee43 Merging in max's fix 2023-01-24 13:38:43 -08:00
zachmu
405ced8c81 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-24 20:05:51 +00:00
Zach Musgrave
443c3d59dc actually upgrade gms, fix the format breaking newline that keeps getting added to imports 2023-01-24 12:04:20 -08:00
zachmu
21c922a9c9 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-01-24 19:59:31 +00:00
Zach Musgrave
1fd0c57d1f upgraded gms 2023-01-24 11:58:13 -08:00
Zach Musgrave
7f88400f3c Fix import group issue 2023-01-24 11:55:46 -08:00
Zach Musgrave
d83f1150be Merge branch 'zachmu/csv-out' of github.com:dolthub/dolt into zachmu/csv-out 2023-01-24 11:53:50 -08:00
Zach Musgrave
e77ae77452 Changed types2 import alias to gmstypes everywhere 2023-01-24 11:53:44 -08:00