mirror/dolt
1
0
Fork 0
mirror of https://github.com/dolthub/dolt.git synced 2026-02-11 18:49:14 -06:00
Code Issues Packages Projects Releases 128 Wiki Activity

Standardise database/dataset accessors as database() and dataset() (#1607)

Browse Source 
In JS they are either set() or store(). In Go they are either Dataset()
Store(), or Database().
This commit is contained in:
Ben Kalman
2016-05-24 10:25:16 -07:00
parent 67c43db4de
commit e34551cd54
22 changed files with 96 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/noms-ds/noms_ds.go
View File

@@ -37,7 +37,7 @@ func main() {
util.CheckError(fmt.Errorf("Dataset %v not found", set.ID()))
}
store, err := set.Store().Delete(set.ID())
store, err := set.Database().Delete(set.ID())
util.CheckError(err)
defer store.Close()

4
cmd/noms-log/noms_log.go
View File

@@ -54,7 +54,7 @@ func main() {
origCommit, ok := dataset.MaybeHead()
if ok {
iter := NewCommitIterator(dataset.Store(), origCommit)
iter := NewCommitIterator(dataset.Database(), origCommit)
for ln, ok := iter.Next(); ok; ln, ok = iter.Next() {
if printCommit(ln) != nil {
break
@@ -62,7 +62,7 @@ func main() {
}
}
dataset.Store().Close()
dataset.Database().Close()
}
// Prints the information for one commit in the log, including ascii graph on left side of commits if

6
cmd/noms-log/noms_log_test.go
View File

@@ -29,7 +29,7 @@ func testCommitInResults(s *nomsShowTestSuite, spec string, i int) {
s.NoError(err)
commit := ds.Head()
fmt.Printf("commit hash: %s, type: %s\n", commit.Hash(), commit.Type().Name())
ds.Store().Close()
ds.Database().Close()
s.Contains(s.Run(main, []string{spec}), commit.Hash().String())
}
@@ -41,7 +41,7 @@ func (s *nomsShowTestSuite) TestNomsLog() {
ds, err := sp.Dataset()
s.NoError(err)
ds.Store().Close()
ds.Database().Close()
s.Equal("", s.Run(main, []string{spec}))
testCommitInResults(s, spec, 1)
@@ -112,7 +112,7 @@ func (s *nomsShowTestSuite) TestNomsGraph1() {
b1, err = addCommit(b1, "7")
s.NoError(err)
b1.Store().Close()
b1.Database().Close()
s.Equal(graphRes1, s.Run(main, []string{"-graph", spec + ":b1"}))
}

4
cmd/noms-show/noms_show_test.go
View File

@@ -29,10 +29,10 @@ const (
)
func writeTestData(ds dataset.Dataset, value types.Value) types.Ref {
r1 := ds.Store().WriteValue(value)
r1 := ds.Database().WriteValue(value)
ds, err := ds.Commit(r1)
d.Chk.NoError(err)
err = ds.Store().Close()
err = ds.Database().Close()
d.Chk.NoError(err)
return r1

2
cmd/noms-sync/noms_sync.go
View File

@@ -48,7 +48,7 @@ func main() {
sinkDataset, err := sinkSpec.Dataset()
util.CheckError(err)
defer sinkDataset.Store().Close()
defer sinkDataset.Database().Close()
err = d.Try(func() {
if util.MaybeStartCPUProfile() {

6
cmd/noms-sync/noms_sync_test.go
View File

@@ -28,7 +28,7 @@ func (s *testSuite) TestSync() {
source2, err := source1.Commit(types.Number(43))
s.NoError(err)
source1HeadRef := source1.Head().Hash()
source2.Store().Close() // Close Database backing both Datasets
source2.Database().Close() // Close Database backing both Datasets
sourceSpec := fmt.Sprintf("ldb:%s:%s", s.LdbDir, source1HeadRef)
ldb2dir := path.Join(s.TempDir, "ldb2")
@@ -38,7 +38,7 @@ func (s *testSuite) TestSync() {
dest := dataset.NewDataset(datas.NewDatabase(chunks.NewLevelDBStore(ldb2dir, "", 1, false)), "bar")
s.True(types.Number(42).Equals(dest.Head().Get(datas.ValueField)))
dest.Store().Close()
dest.Database().Close()
sourceDataset := fmt.Sprintf("ldb:%s:%s", s.LdbDir, "foo")
out = s.Run(main, []string{sourceDataset, sinkDatasetSpec})
@@ -46,5 +46,5 @@ func (s *testSuite) TestSync() {
dest = dataset.NewDataset(datas.NewDatabase(chunks.NewLevelDBStore(ldb2dir, "", 1, false)), "bar")
s.True(types.Number(43).Equals(dest.Head().Get(datas.ValueField)))
dest.Store().Close()
dest.Database().Close()
}