get back on dolt main as a dependency - #69
Merged
Conversation
TEMPORARY DEPENDENCY: go.mod pins dolt to the dev branch
macneale4-claude/dolt-HEAD, not dolt main. Repin to a main pseudo-version
once the dsess commit merges.
DumboDB pinned a 14-commit dolt fork whose bulk was an effort to decouple
dsess from the SQL engine so it would not pull in go-mysql-server and ICU.
That goal is dropped: this module builds its databases with sqle.NewDatabase
and depends on go-icu-collation directly, so the decoupling bought nothing.
Only two of the fourteen commits added API this module calls, and both are
now upstream as additive changes.
Reverted to the upstream package layout: doltcore/sqle/dsess rather than the
fork's doltcore/dsess, and dsess.SqlDatabase rather than the fork's
dsess.VersionedDatabase. sqle.Database already satisfies SqlDatabase, so the
provider is unchanged in behavior.
Caught up with main, which had moved 557 commits past the fork point:
- NewPendingCommit takes amendedCommit hash.Hash, not amend bool. The
empty hash is the not-an-amend case (datas: AmendedCommit.IsEmpty).
- chunks.ChunkStore.Count takes a context.
- val.ValueStore gained CompareAdaptive and CompareAdaptiveCollatedStrings;
the countingValueStore test fake panics on both, mirroring
val.TestValueStore, since that test never orders values.
- valDesc can no longer be a package-level singleton. Comparing an
adaptive-encoded field now dispatches through the descriptor's
ValueStore, and one built without a store nil-derefs on the first
compare. Replaced with valDescFor(ns), matching dolt's own
Schema.GetValueDescriptor(vs) shape.
go test ./... passes with -p 1. The parallel form still hits a pre-existing
harness race on the shared .runtime/bin/dolt path, tracked separately.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
The session hands back (database, branch) as a pair now, so the call sites stop joining and re-splitting revision-qualified names. database.go and session_reads.go each replace a join, a lowercase and an O(n) scan with one IsBranchDirty call. helpers.go drops the SplitRevisionDbName round-trip and reads the fields directly. commit_session_isolation.go compares the pair instead of folding case on a joined string. Repins dolt to ddd24461672a, still the macneale4-claude/dolt-HEAD dev branch and still temporary. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
The dsess commits merged as dolt#11576, so the dev-branch pin and its TEMPORARY note are no longer needed. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.