* dolt_checkout and read replication working set fixes
Sql path 'dolt_checkout' used to create a new branch from HEAD
if the checkout name did not have a remote tracking ref. The CLI,
on the other hand, will initialize a local branch if a remote tracking
ref with the same name in the default remote exists. The SQl path
now mirrors the CLI checkout: if we checkout a new branch, like
'new_feature', and we have previously fetched that branch from our
default remote, `dolt_checkout('feature')` will initialize a branch
using the head commit from the remote `feature`.
Second, read replication was creating a local tracking branch for
remote branches (sourced from the master remote), but not creating
corresponding working sets. This let users attach to new branches with
`use db/feature` syntax, but prevented users from
`dolt_checkout('feature')` both for the bug in dolt checkout, but also
because we created an intermediary state with a local branch, but
without a corresponding working set. SQL replication will now fetch,
create the new branch, and create the appropriate working set.
* jennifer's feedback
* unskip
* Fix merge test for __DOLT_1__
* tree.ThreeWayMerge always calls callback when key collision occurs
* add keyless support for new format merge and other merge related tables
* newline of doom
* unskip more bats
* empty
* skip blame.bats and remotes-aws.bats
* Read replica update working set fixes
Read replica pull updates the session working set after pulling a
filtered set of branches from the tracking database. The original
(buggy) implementation updates the working set to the branch specified
at server-start time. The identity of that branch was fixed for the
duration of the server, so dolt_checkout would (appear to) have no
effect on the new branch's working set. What actually happened was more
pernicious: the working set was updated to the value of the
incorrect branch.
The fix no longer statically sets the active branch for a read replica
database. The active branch is pulled from the `*sql.Context`, so the
correct working set will be updated.
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* add test
* todos
* delete extraeneous line
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
* save version with defaultConfig in session -- todo remove and make PersistedSession
* add PersistedSession, and DoltSession interface to switch
* fmt
* fixup test for persistedSession
* PersistedSession progress, interfaces and enginetests
* All DsessFromSess references fixed
* delete unnuecessary lines
* Comments for dolt session
* Dolt session tests
* save bats progress
* formatting
* GMS version
* Bump GMS version
* add license header
* fix multi-db errors
* try copyright again
* make test deterministic
* higher connection timeout default
* sever config ordering
* PR fixes
* PR fixes
* config rewrite progress
* server config refactor
* PR cleanup
* delete lines
* add go tests, refactor persistent global initialization
* PR fixes
* delete more lines
* small PR cleanup
* try to fix data race
* better constructor names
* zach don't like --server flag
* edge cases around disabling replication
* missed line in merge
* Skip two tests i fixed in follow-on PR
* commit hook warning progress
* merge two config prs
* fix nondeterministic bats
* zach's comments
* bump bats sql-shell expect timeout
* non-server progress
* replication warnings
* Get and set config bool types
* More bats, small PR fixes
* missing header
* fix bats panic
* PR touch ups
* flag, logic and tests for pulling multiple heads to replica
* change name because enginetest, fix impl typo
* missed file commit, config var name changed to strategy
* delete unnecessary lines
* progress, need to merge other PR
* prototype working
* delete some lines
* don't make a new branch until after fetch
* zach's comments
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* fix import cycle
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* fix import cycle, sys vars in sqle
* style fixes, one more bats
* split heads spec and all heads into two variables
* remove unnecessary rebase
* bad merge duplicated bats
* fix on demand fetch after multi head pull changes
* correctness, bats and zach fixes
* drop unnecessary server test
* bad bats title
* small PR fixes
* correctness fix for detached head / fetch branch
* fix comment
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
* save version with defaultConfig in session -- todo remove and make PersistedSession
* add PersistedSession, and DoltSession interface to switch
* fmt
* fixup test for persistedSession
* PersistedSession progress, interfaces and enginetests
* All DsessFromSess references fixed
* delete unnuecessary lines
* Comments for dolt session
* Dolt session tests
* save bats progress
* formatting
* GMS version
* Bump GMS version
* add license header
* fix multi-db errors
* try copyright again
* make test deterministic
* higher connection timeout default
* sever config ordering
* PR fixes
* PR fixes
* config rewrite progress
* server config refactor
* PR cleanup
* delete lines
* add go tests, refactor persistent global initialization
* PR fixes
* delete more lines
* small PR cleanup
* try to fix data race
* better constructor names
* zach don't like --server flag
* edge cases around disabling replication
* missed line in merge
* Skip two tests i fixed in follow-on PR
* merge two config prs
* fix nondeterministic bats
* zach's comments
* bump bats sql-shell expect timeout
* GMS and integrator race to access system vars; need to decide whether to force integrator to initialize, or make GMS init private; leaving in GMS for now
* prototype
* backup pushes noms root
* backup pushes root value, basic restore still needs origin drop
* bats tests, no origin on restore, only head ref on restore
* cleanup code, up to date bats test
* make backup restore a root sync also, to catch branches and remote refs
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* couple of tim's comments
couple of tim's comments
* zach's comments
* loosen restrictions for conflicting remote addresses
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
* shittiest read replica imaginable is kind of working
* import cycle progress
* delete unecessary files and fix db type switch bug
* Add bats test
* delete comments
* fix working set updates for cli
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* clean comments
* comment racy server test
* move env variables to local dolt config
* refactor clone, fix multienv test
* cleanup comments
* missing copyright
* brian's comments, add compile time checks for config interfaces
* format
* fix windows filepaths issue
* file:/// with three slashes should work on windows
* more windows problems
* three slashes didn't work for clone, do chdir to ref local dolt db
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
* shittiest read replica imaginable is kind of working
* import cycle progress
* delete unecessary files and fix db type switch bug
* Add bats test
* delete comments
* fix working set updates for cli
* [ga-format-pr] Run go/utils/repofmt/format_repo.sh and go/Godeps/update.sh
* clean comments
* comment racy server test
* zach's comments
* add copyright headers
Co-authored-by: max-hoffman <max-hoffman@users.noreply.github.com>
Aaron Son