Commit Graph

12712 Commits

Author SHA1 Message Date
AndyA 8dda9d8d49 Merge pull request #3331 from dolthub/andy/generic-prolly-node
[no-release-note] Add pkg `message` to abstract flatbuffers details
2022-05-04 11:43:11 -07:00
AndyA e4b18d722b Update go/store/prolly/message/serialize_test.go
Co-authored-by: Aaron Son <aaron@dolthub.com>
2022-05-04 10:56:35 -07:00
James Cor 3d94d7e262 small typo 2022-05-04 10:11:49 -07:00
Zach Musgrave bffbdcfbd1 Merge branch 'zachmu/session-conflicts' of github.com:dolthub/dolt into zachmu/session-conflicts 2022-05-03 17:34:51 -07:00
Zach Musgrave 3f8340bb57 Fixed naming problems 2022-05-03 17:34:34 -07:00
zachmu cd23da90be [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-04 00:34:09 +00:00
Zach Musgrave 0b69b095c1 Fixed leftover issues 2022-05-03 17:32:56 -07:00
Zach Musgrave e11a5c0bb4 Fixed bug in DROP PROCEDURE IF NOT EXISTS 2022-05-03 17:16:35 -07:00
Zach Musgrave bc755cd483 New bats test for mysql import (subset of client tests with no dependency on mysqldump or running mysql server) 2022-05-03 17:16:21 -07:00
Dhruv Sringari 7a130c3c0a Merge pull request #3311 from dolthub/dhruv/WIP-merge
mergeTableData for New Storage Format
2022-05-03 17:11:35 -07:00
Aaron Son 4f54384d2b Merge pull request #3338 from dolthub/aaron/types-serialmessage-refs-to-addrs
[no-release-notes] go/store/types: SerialCommitParentRefs -> SerialCommitParentAddrs.
2022-05-03 16:50:42 -07:00
zachmu 31c7da467f [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-03 23:50:37 +00:00
Zach Musgrave 1cec0397e9 gms upgrade 2022-05-03 16:49:37 -07:00
James Cor c3555cecf8 Merge branch 'james/geometry' of https://github.com/dolthub/dolt into james/geometry 2022-05-03 16:43:59 -07:00
James Cor 6b73c4216e adding tests 2022-05-03 16:43:51 -07:00
Zach Musgrave d388c69f38 Fixed remaining tests, added additional ones for the force variable 2022-05-03 16:32:36 -07:00
Zach Musgrave 38791eba50 Fixed bug in DOLT_COMMIT() transaction management 2022-05-03 15:50:37 -07:00
Zach Musgrave c0199dbd76 Fully specified test, now revealing bug 2022-05-03 15:31:29 -07:00
Zach Musgrave 898fc4b836 Create the dolt_procedures table in the current root only when necessary, not when getting built-in procedures 2022-05-03 15:16:40 -07:00
Zach Musgrave ad7f5b9525 Added additional test for CALL DOLT_CHECKOUT which was broken when a transaction was in progress 2022-05-03 15:14:41 -07:00
Zach Musgrave 7804b1587d Merge branch 'main' into zachmu/session-conflicts 2022-05-03 14:23:12 -07:00
Zach Musgrave 311aeee3bd Checkpoint before merging main 2022-05-03 14:19:55 -07:00
JCOR11599 d1c58fa90d [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-03 20:11:12 +00:00
James Cor 8811e0b802 not sure why this was here 2022-05-03 13:09:34 -07:00
James Cor a54e1f1b80 check for point, linestring, polygon kind to geometry kind 2022-05-03 13:05:29 -07:00
Zach Musgrave 912505c5c7 Rewrote conflict resolution rules yet again 2022-05-03 12:54:42 -07:00
James Cor c9963981e2 Merge branch 'main' into james/geometry 2022-05-03 12:50:12 -07:00
James Cor cd17175f6d Merge pull request #3341 from dolthub/JCOR11599-ca6cfd14
[auto-bump] [no-release-notes] dependency by JCOR11599
2022-05-03 12:26:07 -07:00
JCOR11599 95b3ddf0c9 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2022-05-03 18:47:39 +00:00
Andy Arthur 80cb33caa4 removed tree.NodeBuilder interface in favor of message.Serializer 2022-05-03 11:36:47 -07:00
Aaron Son ee8f41aa65 go/store/types: SerialCommitParentRefs -> SerialCommitParentAddrs. 2022-05-03 10:26:27 -07:00
Andy Arthur 7862c9fcaf fix content address tests 2022-05-03 10:26:25 -07:00
Andy Arthur f49fdf78ee comment doc, cleanup 2022-05-03 10:05:01 -07:00
Andy Arthur 0087c58d8c added address map serialization 2022-05-03 09:39:29 -07:00
Dhruv Sringari 47865fe067 move test fns 2022-05-03 09:22:52 -07:00
Andy Arthur 68c796ff49 Merge remote-tracking branch 'origin/main' into andy/generic-prolly-node 2022-05-02 16:01:25 -07:00
Andy Arthur 8a35593c89 added unit tests for hard-coded access to key/value offsets flatbuffers field 2022-05-02 15:49:03 -07:00
Andy Arthur 1fca9f0fee moved serialization into pkg message 2022-05-02 15:37:51 -07:00
AndyA 982ec4772f Merge pull request #3325 from dolthub/andy/multi-prolly-tree
[no-release-notes] Prolly tree implementations for `AddressMap` and `ConflictMap`
2022-05-02 14:29:41 -07:00
Andy Arthur 8af7e77872 pr feedback 2022-05-02 14:29:18 -07:00
Dhruv Sringari a297892f40 Merge remote-tracking branch 'origin/main' into dhruv/WIP-merge 2022-05-02 12:17:28 -07:00
Dhruv Sringari 7818311e22 Merge pull request #3332 from dolthub/fix/composite-idx-merge
Fix composite index merge bug
2022-05-02 12:13:02 -07:00
Dhruv Sringari a32e784107 Merge branch 'fix/composite-idx-merge' into dhruv/WIP-merge 2022-05-02 12:08:32 -07:00
Zach Musgrave e2fb7de5ef Removed debug prints 2022-05-02 11:31:57 -07:00
druvv 04bb44e3a3 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-05-02 18:27:13 +00:00
Dhruv Sringari 164a605ca5 PR feedback, reduce returned tuples 2022-05-02 11:26:05 -07:00
Zach Musgrave e8faa4393e Formatting 2022-05-02 11:12:12 -07:00
Zach Musgrave d71ab6b232 Better debug printing for noms tables, fixed some transaction tess 2022-05-02 11:10:41 -07:00
Zach Musgrave cddfb3240d Formatting fixes 2022-05-02 09:24:34 -07:00
VinaiRachakonda c941ff4f49 [ga-bump-release] Update Dolt version to 0.39.5 and release v0.39.5 v0.39.5 2022-04-30 01:56:30 +00:00