Commit Graph

18122 Commits

Author SHA1 Message Date
Solipsis
f68cfd2aff Create CommitMetaGenerator interface to remove "fun hash" logic from DoltDB 2023-03-20 16:44:36 -07:00
solipsis-project
05a829dceb Fix typo in go/libraries/doltcore/doltdb/doltdb.go
Co-authored-by: Jason Fulghum <jason.fulghum@gmail.com>
2023-03-18 17:14:21 -07:00
solipsis-project
776eff6239 Fix formatting of go/libraries/doltcore/doltdb/doltdb.go
Co-authored-by: Jason Fulghum <jason.fulghum@gmail.com>
2023-03-18 17:13:59 -07:00
solipsis-project
6876471bcf Fix formatting of go/libraries/doltcore/doltdb/doltdb.go
Co-authored-by: Jason Fulghum <jason.fulghum@gmail.com>
2023-03-18 17:13:46 -07:00
Solipsis
a6eb06c7f2 Merge branch 'fun_commits' of github.com:solipsis-project/dolt into fun_commits 2023-03-15 15:46:29 -07:00
Solipsis
accfa2ae01 Add missing parameter to InitRepoWithTime and InitDBAndRepoState 2023-03-15 15:46:13 -07:00
Solipsis
b30858a9f6 Preallocate choices array 2023-03-15 15:45:51 -07:00
Solipsis
a8f79520e4 Rename flag variable to be consistent. 2023-03-15 15:45:15 -07:00
Solipsis
b8730abec1 Move comment so documentation generates correctly. 2023-03-15 15:44:55 -07:00
solipsis-project
7b6354d027 Fix spacing in integration-tests/bats/init.bats
Co-authored-by: Jason Fulghum <jason.fulghum@gmail.com>
2023-03-15 14:52:38 -07:00
Solipsis
e94200a523 Merge branch 'main' of https://github.com/dolthub/dolt into fun_commits 2023-03-14 15:19:34 -07:00
Solipsis
698915e64e Add BATS test that --fun produces a fun hash
The test isn't hermetic because it depends on the current timestamp,
but we want that. We want the confidence that it works for all timestamps,
not just specific ones.
2023-03-14 15:14:10 -07:00
Solipsis
8976cf59d0 dolt init --fun can use Cyrillic characters in the desc
This allows us to create 2^12 possible commits for each timestamp,
making the timestamp skew imperceptible.
2023-03-14 14:43:49 -07:00
Maximilian Hoffman
af987d213c Three way differ and merge optimizations (#5464)
* add three way differ for merge optimizations

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

* docstrings

* prog

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

* fix tests

* format

* more test fixes

* rewrite chunk of table merge, still need to rewrite unique lookup checking

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

* more test fixes

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

* test

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

* fix tests

* batching test

* larger buffer for secondary mutableMap

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

* refactor, fix buffer sizing

* fix more tests

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

* restore proto

* sort unique checks by secondary

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

* fix keyless pk len

* fmt

* revert edits

* merge conflicts

* merge conflict

---------

Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
2023-03-14 14:37:11 -07:00
Taylor Bantle
2e4466c02b Merge pull request #5575 from dolthub/taylor/workbench-tests-2
[no-release-notes] mysql-client-tests/node: Add dolt_patch workbench test, improve match…
2023-03-14 14:35:41 -07:00
Taylor Bantle
ea8048f8f2 mysql-client-tests/node: Add dolt_patch workbench test, improve matcher functions 2023-03-14 13:53:48 -07:00
Jason Fulghum
94273132bf Merge pull request #5574 from dolthub/fulghum/bugfix
[no-release-notes] Temporarily disabling the label-customer-issues workflow
2023-03-14 12:59:07 -07:00
Jason Fulghum
457bb1a832 Temporarily disabling the label-customer-issues workflow until I can figure out why it's not able to read 2023-03-14 12:47:58 -07:00
AndyA
6ea1e0d63f Merge pull request #5569 from dolthub/andy/speedup-bats
[no-release-notes] go/store/nbs: tweak chunk journal IO parameters
2023-03-14 12:47:45 -07:00
Jason Fulghum
c2784ac87e Merge pull request #5573 from dolthub/fulghum/bugfix
[no-release-notes] Switching to use correct auth token for label customer issues GH Action
2023-03-14 12:20:32 -07:00
Jason Fulghum
8ce0ac01e8 Switching to use correct auth token 2023-03-14 12:19:18 -07:00
Andy Arthur
34f63b3f0c .github/workflows: bump apache maven version to 3.9.0 2023-03-14 11:04:23 -07:00
Andy Arthur
e542e199f6 go/store/nbs: tweak chunk journal IO parameters 2023-03-14 10:30:19 -07:00
Jason Fulghum
11bf97a896 Merge pull request #5554 from dolthub/fulghum/github-actions
[no-release-notes] New GitHub Action to label issues and PRs from customers
2023-03-14 10:24:45 -07:00
James Cor
74df1c09f1 Merge pull request #5566 from dolthub/JCOR11599-06dfbe43
[auto-bump] [no-release-notes] dependency by JCOR11599
2023-03-13 23:39:03 -07:00
jennifersp
785d75290c use revision database name from current database for accessing DbData for dolt_checkout() (#5555) 2023-03-13 21:50:22 -07:00
andy-wm-arthur
5811046097 [ga-bump-release] Update Dolt version to 0.75.2 and release v0.75.2 v0.75.2 2023-03-14 03:46:16 +00:00
AndyA
dd8080f8da Merge pull request #5546 from dolthub/andy/cli-diff-fix
go/doltcore/diff: refactor diff splitter to handle columns unmatched across revisions
2023-03-13 20:37:04 -07:00
Andy Arthur
6e89a53d5a go/doltcore/diff: pr feedback 2023-03-13 19:07:43 -07:00
Andy Arthur
b4459bbb26 go/doltcore/diff: reproduce score-warrior failure 2023-03-13 16:51:02 -07:00
Jason Fulghum
a240846681 Merge pull request #5553 from dolthub/fulghum/bugfix
Fix incorrect recorded dolt commit times for MySQL replication
2023-03-13 16:39:32 -07:00
Maximilian Hoffman
2324c0b584 Sec index differ for parent fk constraint checking (#5552) 2023-03-13 16:12:17 -07:00
Taylor Bantle
75c71f13e2 Merge pull request #5542 from dolthub/taylor/token-audience
Use auth host for `RPCCreds` audience, use dolthub.com for issuer
2023-03-13 16:00:50 -07:00
JCOR11599
080e657892 [ga-bump-dep] Bump dependency in Dolt by JCOR11599 2023-03-13 21:53:41 +00:00
James Cor
a05366c31e Merge pull request #5562 from dolthub/james/skip
[no-release-notes] skip on duplicate key update tests on old format
2023-03-13 14:49:34 -07:00
Jason Fulghum
75337275f7 Merge pull request #5559 from solipsis-project/fix-log-head
Fix dolt log HEAD detection
2023-03-13 14:42:20 -07:00
Jason Fulghum
9960070075 Setting a fresh subcontext for each executed query and adding tests for unique commit timestamps. 2023-03-13 13:30:53 -07:00
Taylor Bantle
74f310198d Merge remote-tracking branch 'origin/main' into taylor/token-audience 2023-03-13 12:21:57 -07:00
James Cor
ef2c72856d bump 2023-03-13 12:14:49 -07:00
James Cor
56319f7430 adding prepareds 2023-03-13 12:03:21 -07:00
James Cor
795181fdb3 one more thing 2023-03-13 11:44:57 -07:00
James Cor
8738efeb85 revert 2023-03-13 11:44:17 -07:00
James Cor
425c79697e revert single script 2023-03-13 11:41:49 -07:00
James Cor
cc0605d6ad bump 2023-03-13 11:40:07 -07:00
James Cor
b14eab6a0b skipping tests on old format 2023-03-13 11:28:55 -07:00
AndyA
8779a1e815 Merge pull request #5560 from dolthub/andy/put-back-iter-key-range
[no-release-notes] go/store/prolly: revert deleted prolly.Map.IterKeyRange()
2023-03-13 11:04:36 -07:00
Andy Arthur
31d4365ea1 go/store/prolly: revert deleted prolly.Map.IterKeyRange() 2023-03-13 10:29:06 -07:00
James Cor
470789d762 Merge branch 'main' into JCOR11599-9cd06005 2023-03-13 10:20:44 -07:00
Andy Arthur
a9c3e61ef0 go/doltcore/diff: add diff splitter test 2023-03-12 11:25:39 -07:00
James Cor
0551cd56fc asdf 2023-03-11 18:07:00 -08:00