mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-05-03 11:30:28 -05:00
Code Issues Packages Projects Releases 159 Wiki Activity

go/store/datas: commit.go: parentsList -> parents_list.

Browse Source
This commit is contained in:
Aaron Son
2020-07-13 10:48:51 -07:00
parent a99c6fa1b1
commit 6c466ddcf3
7 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go/libraries/doltcore/sqle/sqlselect_test.go
+2 -2
View File
@@ -706,7 +706,7 @@ var BasicSelectTests = []SelectTest{
Query: "select * from dolt_log",
ExpectedRows: []sql.Row{
{
"g9db1mi3nartl9ivdhgk5r3ptqn6mn1r",
"0o2rnf5pq2s1nq3hj3609e1lt0socuf1",
"billy bob",
"bigbillieb@fake.horse",
time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC),
@@ -736,7 +736,7 @@ var BasicSelectTests = []SelectTest{
ExpectedRows: []sql.Row{
{
"master",
"g9db1mi3nartl9ivdhgk5r3ptqn6mn1r",
"0o2rnf5pq2s1nq3hj3609e1lt0socuf1",
"billy bob", "bigbillieb@fake.horse",
time.Date(1970, 1, 1, 0, 0, 0, 0, time.UTC),
"Initialize data repository",
go/store/cmd/noms/noms_ds_test.go
+2 -2
View File
@@ -92,7 +92,7 @@ func (s *nomsDsTestSuite) TestNomsDs() {
// delete one dataset, print message at delete
rtnVal, _ = s.MustRun(main, []string{"ds", "-d", datasetName})
s.Equal("Deleted "+datasetName+" (was #a0fb5qm5mm522e0698nb00lsd8510ri7)\n", rtnVal)
s.Equal("Deleted "+datasetName+" (was #7jrps2q0ubq0phnha37gd6051m8uqq6b)\n", rtnVal)
// print datasets, just one left
rtnVal, _ = s.MustRun(main, []string{"ds", dbSpec})
@@ -100,7 +100,7 @@ func (s *nomsDsTestSuite) TestNomsDs() {
// delete the second dataset
rtnVal, _ = s.MustRun(main, []string{"ds", "-d", dataset2Name})
s.Equal("Deleted "+dataset2Name+" (was #gia5df0il0u05nc78scujj1guh5lgppf)\n", rtnVal)
s.Equal("Deleted "+dataset2Name+" (was #hiqpb7kk36vo80uc36virlnrddru2o7h)\n", rtnVal)
// print datasets, none left
rtnVal, _ = s.MustRun(main, []string{"ds", dbSpec})
go/store/cmd/noms/noms_root_test.go
+2 -2
View File
@@ -51,11 +51,11 @@ func (s *nomsRootTestSuite) TestBasic() {
dbSpecStr := spec.CreateDatabaseSpecString("nbs", s.DBDir)
ds, _ = ds.Database().CommitValue(context.Background(), ds, types.String("hello!"))
c1, _ := s.MustRun(main, []string{"root", dbSpecStr})
s.Equal("1ijiai6majc7u8uvifgecb0fdblogr4v\n", c1)
s.Equal("maojl4udo9a7mtk2rnhuc08r0u7hc0fn\n", c1)
ds, _ = ds.Database().CommitValue(context.Background(), ds, types.String("goodbye"))
c2, _ := s.MustRun(main, []string{"root", dbSpecStr})
s.Equal("m8nr5eltahdjrqeul9p4u39lk4ug7hov\n", c2)
s.Equal("avdab61n1s1d1emdee7kb7e49quisr5n\n", c2)
// TODO: Would be good to test successful --update too, but requires changes to MustRun to allow
// input because of prompt :(.
go/store/cmd/noms/noms_show_test.go
+3 -3
View File
@@ -44,11 +44,11 @@ type nomsShowTestSuite struct {
}
const (
res1 = "struct Commit {\n meta: struct {},\n parents: set {},\n parentsList: [],\n value: #nl181uu1ioc2j6t7mt9paidjlhlcjtgj,\n}"
res1 = "struct Commit {\n meta: struct {},\n parents: set {},\n parents_list: [],\n value: #nl181uu1ioc2j6t7mt9paidjlhlcjtgj,\n}"
res2 = "\"test string\""
res3 = "struct Commit {\n meta: struct {},\n parents: set {\n #4g7ggl6999v5mlucl4a507n7k3kvckiq,\n },\n parentsList: [\n #4g7ggl6999v5mlucl4a507n7k3kvckiq,\n ],\n value: #82adk7hfcudg8fktittm672to66t6qeu,\n}"
res3 = "struct Commit {\n meta: struct {},\n parents: set {\n #4g7ggl6999v5mlucl4a507n7k3kvckiq,\n },\n parents_list: [\n #4g7ggl6999v5mlucl4a507n7k3kvckiq,\n ],\n value: #82adk7hfcudg8fktittm672to66t6qeu,\n}"
res4 = "[\n \"elem1\",\n 2,\n \"elem3\",\n]"
res5 = "struct Commit {\n meta: struct {},\n parents: set {\n #3tmg89vabs2k6hotdock1kuo13j4lmqv,\n },\n parentsList: [\n #3tmg89vabs2k6hotdock1kuo13j4lmqv,\n ],\n value: #5cgfu2vk4nc21m1vjkjjpd2kvcm2df7q,\n}"
res5 = "struct Commit {\n meta: struct {},\n parents: set {\n #3tmg89vabs2k6hotdock1kuo13j4lmqv,\n },\n parents_list: [\n #3tmg89vabs2k6hotdock1kuo13j4lmqv,\n ],\n value: #5cgfu2vk4nc21m1vjkjjpd2kvcm2df7q,\n}"
)
func (s *nomsShowTestSuite) spec(str string) spec.Spec {
go/store/datas/commit.go
+6 -1
View File
@@ -33,7 +33,12 @@ import (
const (
ParentsField = "parents"
ParentsListField = "parentsList"
// Added in July, 2020. Commits created with versions before this was
// added have only a Set of parents. Commits created after this was
// added carry a List of parents, because parent order can matter.
// `"parents"` is still written as a Set as well, so that commits
// created with newer versions of still usable by older versions.
ParentsListField = "parents_list"
ValueField = "value"
MetaField = "meta"
commitName = "Commit"
go/store/datas/commit_test.go
+4 -4
View File
@@ -140,7 +140,7 @@ func TestNewCommit(t *testing.T) {
et2 := nomdl.MustParseType(`Struct Commit {
meta: Struct {},
parents: Set<Ref<Cycle<Commit>>>,
parentsList: List<Ref<Cycle<Commit>>>,
parents_list: List<Ref<Cycle<Commit>>>,
value: Float,
}`)
assertTypeEquals(et2, at2)
@@ -154,7 +154,7 @@ func TestNewCommit(t *testing.T) {
et3 := nomdl.MustParseType(`Struct Commit {
meta: Struct {},
parents: Set<Ref<Cycle<Commit>>>,
parentsList: List<Ref<Cycle<Commit>>>,
parents_list: List<Ref<Cycle<Commit>>>,
value: Float | String,
}`)
assertTypeEquals(et3, at3)
@@ -178,7 +178,7 @@ func TestNewCommit(t *testing.T) {
number: Float,
},
parents: Set<Ref<Cycle<Commit>>>,
parentsList: List<Ref<Cycle<Commit>>>,
parents_list: List<Ref<Cycle<Commit>>>,
value: Float | String,
}`)
assertTypeEquals(et4, at4)
@@ -198,7 +198,7 @@ func TestNewCommit(t *testing.T) {
et5 := nomdl.MustParseType(`Struct Commit {
meta: Struct {},
parents: Set<Ref<Cycle<Commit>>>,
parentsList: List<Ref<Cycle<Commit>>>,
parents_list: List<Ref<Cycle<Commit>>>,
value: Float | String,
}`)
assertTypeEquals(et5, at5)
go/store/datas/puller_test.go
+1 -1
View File
@@ -467,7 +467,7 @@ func errIfNotEqual(ctx context.Context, ex, act types.Map) error {
}
func parentsAndTables(cm types.Struct) (types.List, types.Map, error) {
ps, ok, err := cm.MaybeGet("parentsList")
ps, ok, err := cm.MaybeGet(ParentsListField)
if err != nil {
return types.EmptyList, types.EmptyMap, err