mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-04-24 03:16:12 -05:00
Code Issues Packages Projects Releases 157 Wiki Activity

go/store/datas: Small cleanup for val.TupleDesc handling.

Browse Source
This commit is contained in:
Aaron Son
2022-06-09 14:43:22 -07:00
parent 115d218641
commit c2a1b7c5a6
2 changed files with 14 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/store/datas/commit.go
+11 -18
View File
@@ -180,6 +180,12 @@ func commit_flatbuffer(vaddr hash.Hash, opts CommitOptions, heights []uint64, pa
return builder.FinishedBytes(), maxheight + 1
}
var commitKeyTupleDesc = val.NewTupleDescriptor(
val.Type{Enc: val.Uint64Enc, Nullable: false},
val.Type{Enc: val.ByteStringEnc, Nullable: false},
)
var commitValueTupleDesc = val.NewTupleDescriptor()
func writeCommitParentClosure(ctx context.Context, cs chunks.ChunkStore, vrw types.ValueReadWriter, parents []*serial.Commit, parentAddrs []hash.Hash) (hash.Hash, error) {
if len(parents) == 0 {
// We write an empty hash for parent-less commits of height 1.
@@ -196,18 +202,13 @@ func writeCommitParentClosure(ctx context.Context, cs chunks.ChunkStore, vrw typ
}
// Load them as ProllyTrees.
ns := tree.NewNodeStore(cs)
keyDesc := val.NewTupleDescriptor(
val.Type{Enc: val.Uint64Enc, Nullable: false},
val.Type{Enc: val.ByteStringEnc, Nullable: false},
)
valDesc := val.NewTupleDescriptor()
maps := make([]prolly.Map, len(parents))
for i := range addrs {
if !types.IsNull(vs[i]) {
node := tree.NodeFromBytes(vs[i].(types.TupleRowStorage))
maps[i] = prolly.NewMap(node, ns, keyDesc, valDesc)
maps[i] = prolly.NewMap(node, ns, commitKeyTupleDesc, commitValueTupleDesc)
} else {
maps[i], err = prolly.NewMapFromTuples(ctx, ns, keyDesc, valDesc)
maps[i], err = prolly.NewMapFromTuples(ctx, ns, commitKeyTupleDesc, commitValueTupleDesc)
if err != nil {
return hash.Hash{}, fmt.Errorf("writeCommitParentClosure: NewMapFromTuples: %w", err)
}
@@ -227,7 +228,7 @@ func writeCommitParentClosure(ctx context.Context, cs chunks.ChunkStore, vrw typ
}
}
// Add the parents themselves to the new map.
tb := val.NewTupleBuilder(keyDesc)
tb := val.NewTupleBuilder(commitKeyTupleDesc)
for i := 0; i < len(parents); i++ {
tb.PutUint64(0, parents[i].Height())
tb.PutByteString(1, parentAddrs[i][:])
@@ -798,11 +799,7 @@ func (i *fbParentsClosureIterator) Err() error {
}
func (i *fbParentsClosureIterator) Hash() hash.Hash {
keyDesc := val.NewTupleDescriptor(
val.Type{Enc: val.Uint64Enc, Nullable: false},
val.Type{Enc: val.ByteStringEnc, Nullable: false},
)
bs, _ := keyDesc.GetBytes(1, i.tuples[i.i])
bs, _ := commitKeyTupleDesc.GetBytes(1, i.tuples[i.i])
return hash.New(bs)
}
@@ -816,11 +813,7 @@ func (i *fbParentsClosureIterator) Next(ctx context.Context) bool {
func (i *fbParentsClosureIterator) Less(f *types.NomsBinFormat, otherI parentsClosureIter) bool {
other := otherI.(*fbParentsClosureIterator)
keyDesc := val.NewTupleDescriptor(
val.Type{Enc: val.Uint64Enc, Nullable: false},
val.Type{Enc: val.ByteStringEnc, Nullable: false},
)
return keyDesc.Comparator().Compare(i.tuples[i.i], other.tuples[other.i], keyDesc) == -1
return commitKeyTupleDesc.Comparator().Compare(i.tuples[i.i], other.tuples[other.i], commitKeyTupleDesc) == -1
}
func commitToMapKeyTuple(f *types.NomsBinFormat, c *Commit) (types.Tuple, error) {
go/store/datas/commit_test.go
+3 -9
View File
@@ -39,7 +39,6 @@ import (
"github.com/dolthub/dolt/go/store/prolly"
"github.com/dolthub/dolt/go/store/prolly/tree"
"github.com/dolthub/dolt/go/store/types"
"github.com/dolthub/dolt/go/store/val"
)
func mustHead(ds Dataset) types.Value {
@@ -441,12 +440,7 @@ func TestCommitParentsClosure(t *testing.T) {
return
}
node := tree.NodeFromBytes(v.(types.TupleRowStorage))
keyDesc := val.NewTupleDescriptor(
val.Type{Enc: val.Uint64Enc, Nullable: false},
val.Type{Enc: val.ByteStringEnc, Nullable: false},
)
valDesc := val.NewTupleDescriptor()
m := prolly.NewMap(node, tree.NewNodeStore(db.chunkStore()), keyDesc, valDesc)
m := prolly.NewMap(node, tree.NewNodeStore(db.chunkStore()), commitKeyTupleDesc, commitValueTupleDesc)
if !assert.Equal(len(es), m.Count(), "expected length of commit closure matches") {
return
}
@@ -463,11 +457,11 @@ func TestCommitParentsClosure(t *testing.T) {
if !assert.NoError(err, "no error on MapIterator.Next") {
return
}
height, ok := keyDesc.GetUint64(0, k)
height, ok := commitKeyTupleDesc.GetUint64(0, k)
if !assert.True(ok, "able to get height from first field of closure key") {
return
}
addrbs, ok := keyDesc.GetBytes(1, k)
addrbs, ok := commitKeyTupleDesc.GetBytes(1, k)
if !assert.True(ok, "able to get address bytes from second field of closure key") {
return
}