mirror of
https://github.com/dolthub/dolt.git
synced 2026-02-09 18:59:12 -06:00
This allows parsing all Noms values from the string representation
used by human readable encoding:
```
v, err := nomdl.Parse(vrw, `map {"abc": 42}`)
```
Fixes #1466
223 lines
6.6 KiB
Go
223 lines
6.6 KiB
Go
// Copyright 2016 Attic Labs, Inc. All rights reserved.
|
|
// Licensed under the Apache License, version 2.0:
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
package datas
|
|
|
|
import (
|
|
"fmt"
|
|
"strings"
|
|
"testing"
|
|
|
|
"github.com/attic-labs/noms/go/chunks"
|
|
"github.com/attic-labs/noms/go/nomdl"
|
|
"github.com/attic-labs/noms/go/types"
|
|
"github.com/stretchr/testify/assert"
|
|
)
|
|
|
|
func TestNewCommit(t *testing.T) {
|
|
assert := assert.New(t)
|
|
|
|
assertTypeEquals := func(e, a *types.Type) {
|
|
assert.True(a.Equals(e), "Actual: %s\nExpected %s", a.Describe(), e.Describe())
|
|
}
|
|
|
|
storage := &chunks.TestStorage{}
|
|
db := NewDatabase(storage.NewView())
|
|
defer db.Close()
|
|
|
|
commit := NewCommit(types.Number(1), types.NewSet(db), types.EmptyStruct)
|
|
at := types.TypeOf(commit)
|
|
et := makeCommitStructType(
|
|
types.EmptyStructType,
|
|
types.MakeSetType(types.MakeUnionType()),
|
|
types.NumberType,
|
|
)
|
|
assertTypeEquals(et, at)
|
|
|
|
// Committing another Number
|
|
commit2 := NewCommit(types.Number(2), types.NewSet(db, types.NewRef(commit)), types.EmptyStruct)
|
|
at2 := types.TypeOf(commit2)
|
|
et2 := nomdl.MustParseType(`Struct Commit {
|
|
meta: Struct {},
|
|
parents: Set<Ref<Cycle<Commit>>>,
|
|
value: Number,
|
|
}`)
|
|
assertTypeEquals(et2, at2)
|
|
|
|
// Now commit a String
|
|
commit3 := NewCommit(types.String("Hi"), types.NewSet(db, types.NewRef(commit2)), types.EmptyStruct)
|
|
at3 := types.TypeOf(commit3)
|
|
et3 := nomdl.MustParseType(`Struct Commit {
|
|
meta: Struct {},
|
|
parents: Set<Ref<Cycle<Commit>>>,
|
|
value: Number | String,
|
|
}`)
|
|
assertTypeEquals(et3, at3)
|
|
|
|
// Now commit a String with MetaInfo
|
|
meta := types.NewStruct("Meta", types.StructData{"date": types.String("some date"), "number": types.Number(9)})
|
|
metaType := nomdl.MustParseType(`Struct Meta {
|
|
date: String,
|
|
number: Number,
|
|
}`)
|
|
assertTypeEquals(metaType, types.TypeOf(meta))
|
|
commit4 := NewCommit(types.String("Hi"), types.NewSet(db, types.NewRef(commit2)), meta)
|
|
at4 := types.TypeOf(commit4)
|
|
et4 := nomdl.MustParseType(`Struct Commit {
|
|
meta: Struct {} | Struct Meta {
|
|
date: String,
|
|
number: Number,
|
|
},
|
|
parents: Set<Ref<Cycle<Commit>>>,
|
|
value: Number | String,
|
|
}`)
|
|
assertTypeEquals(et4, at4)
|
|
|
|
// Merge-commit with different parent types
|
|
commit5 := NewCommit(types.String("Hi"), types.NewSet(db, types.NewRef(commit2), types.NewRef(commit3)), types.EmptyStruct)
|
|
at5 := types.TypeOf(commit5)
|
|
et5 := nomdl.MustParseType(`Struct Commit {
|
|
meta: Struct {},
|
|
parents: Set<Ref<Cycle<Commit>>>,
|
|
value: Number | String,
|
|
}`)
|
|
assertTypeEquals(et5, at5)
|
|
}
|
|
|
|
func TestCommitWithoutMetaField(t *testing.T) {
|
|
assert := assert.New(t)
|
|
|
|
storage := &chunks.TestStorage{}
|
|
db := NewDatabase(storage.NewView())
|
|
defer db.Close()
|
|
|
|
metaCommit := types.NewStruct("Commit", types.StructData{
|
|
"value": types.Number(9),
|
|
"parents": types.NewSet(db),
|
|
"meta": types.EmptyStruct,
|
|
})
|
|
assert.True(IsCommit(metaCommit))
|
|
assert.True(IsCommitType(types.TypeOf(metaCommit)))
|
|
|
|
noMetaCommit := types.NewStruct("Commit", types.StructData{
|
|
"value": types.Number(9),
|
|
"parents": types.NewSet(db),
|
|
})
|
|
assert.False(IsCommit(noMetaCommit))
|
|
assert.False(IsCommitType(types.TypeOf(noMetaCommit)))
|
|
}
|
|
|
|
// Convert list of Struct's to Set<Ref>
|
|
func toRefSet(vrw types.ValueReadWriter, commits ...types.Struct) types.Set {
|
|
set := types.NewSet(vrw).Edit()
|
|
for _, p := range commits {
|
|
set.Insert(types.NewRef(p))
|
|
}
|
|
return set.Set()
|
|
}
|
|
|
|
// Convert Set<Ref<Struct>> to a string of Struct.Get("value")'s
|
|
func toValuesString(refSet types.Set, vr types.ValueReader) string {
|
|
values := []string{}
|
|
refSet.IterAll(func(v types.Value) {
|
|
values = append(values, fmt.Sprintf("%v", v.(types.Ref).TargetValue(vr).(types.Struct).Get("value")))
|
|
})
|
|
return strings.Join(values, ",")
|
|
}
|
|
|
|
func TestFindCommonAncestor(t *testing.T) {
|
|
assert := assert.New(t)
|
|
storage := &chunks.TestStorage{}
|
|
db := NewDatabase(storage.NewView())
|
|
defer db.Close()
|
|
|
|
// Add a commit and return it
|
|
addCommit := func(datasetID string, val string, parents ...types.Struct) types.Struct {
|
|
ds := db.GetDataset(datasetID)
|
|
var err error
|
|
ds, err = db.Commit(ds, types.String(val), CommitOptions{Parents: toRefSet(db, parents...)})
|
|
assert.NoError(err)
|
|
return ds.Head()
|
|
}
|
|
|
|
// Assert that c is the common ancestor of a and b
|
|
assertCommonAncestor := func(expected, a, b types.Struct) {
|
|
if found, ok := FindCommonAncestor(types.NewRef(a), types.NewRef(b), db); assert.True(ok) {
|
|
ancestor := found.TargetValue(db).(types.Struct)
|
|
assert.True(
|
|
expected.Equals(ancestor),
|
|
"%s should be common ancestor of %s, %s. Got %s",
|
|
expected.Get(ValueField),
|
|
a.Get(ValueField),
|
|
b.Get(ValueField),
|
|
ancestor.Get(ValueField),
|
|
)
|
|
}
|
|
}
|
|
|
|
// Build commit DAG
|
|
//
|
|
// ds-a: a1<-a2<-a3<-a4<-a5<-a6
|
|
// ^ ^ ^ |
|
|
// | \ \----\ /-/
|
|
// | \ \V
|
|
// ds-b: \ b3<-b4<-b5
|
|
// \
|
|
// \
|
|
// ds-c: c2<-c3
|
|
// /
|
|
// /
|
|
// V
|
|
// ds-d: d1<-d2
|
|
//
|
|
a, b, c, d := "ds-a", "ds-b", "ds-c", "ds-d"
|
|
a1 := addCommit(a, "a1")
|
|
d1 := addCommit(d, "d1")
|
|
a2 := addCommit(a, "a2", a1)
|
|
c2 := addCommit(c, "c2", a1)
|
|
d2 := addCommit(d, "d2", d1)
|
|
a3 := addCommit(a, "a3", a2)
|
|
b3 := addCommit(b, "b3", a2)
|
|
c3 := addCommit(c, "c3", c2, d2)
|
|
a4 := addCommit(a, "a4", a3)
|
|
b4 := addCommit(b, "b4", b3)
|
|
a5 := addCommit(a, "a5", a4)
|
|
b5 := addCommit(b, "b5", b4, a3)
|
|
a6 := addCommit(a, "a6", a5, b5)
|
|
|
|
assertCommonAncestor(a1, a1, a1) // All self
|
|
assertCommonAncestor(a1, a1, a2) // One side self
|
|
assertCommonAncestor(a2, a3, b3) // Common parent
|
|
assertCommonAncestor(a2, a4, b4) // Common grandparent
|
|
assertCommonAncestor(a1, a6, c3) // Traversing multiple parents on both sides
|
|
|
|
// No common ancestor
|
|
if found, ok := FindCommonAncestor(types.NewRef(d2), types.NewRef(a6), db); !assert.False(ok) {
|
|
assert.Fail(
|
|
"Unexpected common ancestor!",
|
|
"Should be no common ancestor of %s, %s. Got %s",
|
|
d2.Get(ValueField),
|
|
a6.Get(ValueField),
|
|
found.TargetValue(db).(types.Struct).Get(ValueField),
|
|
)
|
|
}
|
|
}
|
|
|
|
func TestNewCommitRegressionTest(t *testing.T) {
|
|
storage := &chunks.TestStorage{}
|
|
db := NewDatabase(storage.NewView())
|
|
defer db.Close()
|
|
|
|
c1 := NewCommit(types.String("one"), types.NewSet(db), types.EmptyStruct)
|
|
cx := NewCommit(types.Bool(true), types.NewSet(db), types.EmptyStruct)
|
|
value := types.String("two")
|
|
parents := types.NewSet(db, types.NewRef(c1))
|
|
meta := types.NewStruct("", types.StructData{
|
|
"basis": cx,
|
|
})
|
|
|
|
// Used to fail
|
|
NewCommit(value, parents, meta)
|
|
}
|