mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-01-18 10:23:47 -06:00
Code Issues Packages Projects Releases 120 Wiki Activity
19,941 Commits 61 Branches 590 Tags
65719c72466daabe6a004dcafe3e4724d975bdcb
Commit Graph

184 Commits

Author SHA1 Message Date
Nick Tobey
1d51563220 Merge pull request #5783 from dolthub/nicktobey/dolt-show 
`dolt show` supports displaying non-commit objects.
 2023-04-25 16:58:27 -07:00
nicktobey
ecfbc0f5fd [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-04-25 22:29:04 +00:00
Andy Arthur
babc96961e Merge remote-tracking branch 'origin/main' into andy/schema-conflicts 2023-04-24 07:35:08 -07:00
Jason Fulghum
18b20bef14 Reverting formatting changes for generated files 2023-04-21 15:30:43 -07:00
Andy Arthur
bca8aeb48f go/{commands, doltcore/merge}: update status reports to include schema conflicts 2023-04-20 18:33:22 -07:00
macneale4
caf69cdc0e [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2023-04-20 23:51:00 +00:00
Andy Arthur
df537759e5 Merge remote-tracking branch 'origin/main' into andy/schema-conflicts 2023-04-20 16:35:05 -07:00
Aaron Son
e6f224e6a6 go.mod,proto/third_party/flatbuffers: Bump flatbuffers to dolthub/flatbuffers-v23.3.3-dh.2, change import path to github.com/dolthub/flatbuffers/v23/go. 2023-04-19 15:02:06 -07:00
Andy Arthur
474730af17 go/{doltcore/merge, store}: refactored MergeRoots to return conflicts, serialization method for unmergable tables 2023-04-18 16:43:06 -07:00
Andy Arthur
abe3fdbcdc go/doltcore/{doltdb, sqle}: first pass at dolt_schema_conflicts system table 2023-04-18 14:55:29 -07:00
Jason Fulghum
5cb476089e Re-genning to fix out of sync versions in event_constants.pb.go, and adding more output to the ci-check-repo GH workflow. 2023-03-22 15:16:38 -07:00
Solipsis
b16dc01ece Add dolt show event constant. 2023-03-12 03:17:12 -07:00
jennifersp
a88828d921 support staged set of changes for dolt stash (#5502) 2023-03-08 14:20:25 -08:00
jennifersp
96855527a4 support CLI dolt stash command (#5422) 2023-03-03 16:25:24 -08:00
Aaron Son
7bd0364a23 Merge pull request #5475 from dolthub/aaron/proto-third_party-bump-deps 
proto/third_party: Bump versions.
 2023-03-02 15:37:53 -08:00
Aaron Son
0e9a605159 proto/third_party: Bump versions. 2023-03-02 13:58:18 -08:00
jennifersp
23d4d97eef add stash commands to clientEventType (#5347) 2023-03-02 13:48:48 -08:00
dependabot[bot]
869be904f8 Bump golang.org/x/text in /go/gen/proto/dolt/services/eventsapi 
Bumps [golang.org/x/text](https://github.com/golang/text) from 0.3.3 to 0.3.8.
- [Release notes](https://github.com/golang/text/releases)
- [Commits](https://github.com/golang/text/compare/v0.3.3...v0.3.8)

---
updated-dependencies:
- dependency-name: golang.org/x/text
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-23 04:45:26 +00:00
James Cor
d4b9ad9daf Merge branch 'main' into james/spatial-index-test 2023-01-31 10:23:30 -08:00
James Cor
983c74d0f7 merge with main 2023-01-30 13:56:02 -08:00
jennifersp
e956ba9516 add dolt_cherry_pick procedure (#5233) 2023-01-30 10:46:28 -08:00
James Cor
71f960b8ed small fixes 2023-01-25 14:00:07 -08:00
James Cor
7e7b75784b zaddr to cell 2023-01-25 13:55:39 -08:00
James Cor
978c150784 merge 2023-01-24 16:22:40 -08:00
James Cor
f48047dbc1 aa 2023-01-23 22:33:18 -08:00
James Cor
6ecf07f478 i hope i did it right 2023-01-23 14:06:24 -08:00
Daylon Wilkins
d95cd6fa7c Branch control permissions across databases 2022-11-14 12:26:04 -08:00
JCOR11599
abf2199300 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-11-08 00:10:34 +00:00
James Cor
954a1e2c8a clean merge 2022-11-07 15:54:41 -08:00
Daylon Wilkins
79ca7f8b7f Added database collation support 2022-10-31 06:42:37 -07:00
Daylon Wilkins
024a1b0138 Rewrote branch control persistence to use flatbuffers 2022-10-18 08:27:14 -07:00
JCOR11599
174ac3c8a1 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-20 19:08:20 +00:00
Aaron Son
526b9a3429 proto,go: Add RepoPath field to remotesapi Request messages. Pass it along in remotestorage ChunkStore. 2022-09-15 10:50:37 -07:00
Dhruv Sringari
86972d9c1d Adds dolt_merge_status system table (#4277) 
* Add dolt merge status table

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

Co-authored-by: druvv <druvv@users.noreply.github.com>
 2022-09-07 15:12:43 -07:00
JCOR11599
22144c7573 [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh 2022-09-06 06:24:30 +00:00
Aaron Son
85a46e39de proto/dolt/services/remotesapi/v1alpha1: Allow GetUploadLocs TableFileDetails to come with num_chunks. 2022-08-31 14:04:45 -07:00
Maximilian Hoffman
b5f95c648f Secondary lookup cursor reuse (#4215) 
* fix tests

* Point lookups reuse cursors

* fmt

* delete commented lines

* fix ld index

* fix some bugs

* bugs

* fix lb caching between table mutations

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

* delete irrelevent conditional

* aaron's comments

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
 2022-08-29 18:10:25 -07:00
Daylon Wilkins
1ee14d9f74 Add support for table-level collations 2022-08-26 08:10:44 -07:00
Aaron Son
6eb9e6c17d proto,go/.../remotestorage: Add repo_token support. 
doltremoteapi can return an opaque token which makes it cheaper to access the
repository than just using the RepoId. This updates protos and remotestorage
implementation to cache that token and use it for future accesses of the same
repository.
 2022-08-25 12:12:42 -07:00
Aaron Son
7906c9e98f go/{store,libraries,gen}: Adopt new flatc, throw an error if we encounter unknown fields. 2022-08-16 11:57:14 -07:00
Andy Arthur
e99fca7e7a created dedicated flatbuffer message for blobs 2022-07-26 13:14:16 -07:00
Andy Arthur
ede8deba4d Merge remote-tracking branch 'origin/main' into andy/merge-artifacts 2022-07-26 08:44:21 -07:00
Andy Arthur
9b9f5ea79b Merge remote-tracking branch 'origin/main' into andy/remove-dolt-1-super-schema 2022-07-25 15:23:39 -07:00
Aaron Son
5fcd3ccee4 go/store/prolly/message: Move MessagePrefixSz, FinishMessage to serial package. 2022-07-22 14:16:34 -07:00
Andy Arthur
ef47f7a222 Remove Super Schema field from RootValue flatbuffer schema 2022-07-21 15:28:25 -07:00
Andy Arthur
3a8bea8295 pr feedback 2022-07-20 11:22:39 -07:00
Andy Arthur
744e027ce3 de/serialize prolly.ArtifactsMap with dedicated message, serializer 2022-07-18 15:45:00 -07:00
Andy Arthur
5ac0c340a8 sketched out MergeArtifacts flatbuffer message 2022-07-18 13:49:02 -07:00
Maximilian Hoffman
91690bee18 [no-release-notes] text and json written as byte trees (#3690) 
* persistable vars

* [no-release-notes] text and json types written as byte trees

* fmt

* more tests, fix other failing tests

* GMS bump

* fix remaining tests

* small fixes

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

* bats failures

* revert

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

* tidy

* update plans

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

* more plan changes

* delete todo

* better docstring

* zach comments

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
 2022-06-29 07:37:35 -07:00
Maximilian Hoffman
ac80ba7770 New format blobs (#3588) 
* [no-release-notes] New format blob read/write

Use blob chunker to write blobs out of band. Tests for
round tripping and address walking at the tree level.
Run Blob enginetests and extra large file blob tests.

* NodeStore ref refactors

* fix index

* run verify

* fix more bats

* small PR cleanup

* more changes

* last bats errors
 2022-06-22 18:02:48 -07:00