Commit 05974da5 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent a4b4a175
...@@ -46,6 +46,7 @@ import ( ...@@ -46,6 +46,7 @@ import (
"github.com/stretchr/testify/require" "github.com/stretchr/testify/require"
) )
// XXX move infrastructure -> δbtail_treegen_test.go ?
// TreeGenSrv represents connection to running `treegen ...` server. // TreeGenSrv represents connection to running `treegen ...` server.
type TreeGenSrv struct { type TreeGenSrv struct {
...@@ -117,6 +118,17 @@ func StartTreeGenSrv(argv ...string) (_ *TreeGenSrv, hello string, err error) { ...@@ -117,6 +118,17 @@ func StartTreeGenSrv(argv ...string) (_ *TreeGenSrv, hello string, err error) {
return tg, hello, nil return tg, hello, nil
} }
// Close shutdowns treegen server.
func (tg *TreeGenSrv) Close() (err error) {
defer xerr.Contextf(&err, "treegen %v: close", tg.argv)
err1 := tg.pyin.Close()
err2 := tg.pyoutRaw.Close()
err3 := tg.pysrv.Wait()
return xerr.Merge(err1, err2, err3)
}
// StartTreeSrv spawns `treegen trees` server. // StartTreeSrv spawns `treegen trees` server.
func StartTreeSrv(zurl string) (_ *TreeSrv, err error) { func StartTreeSrv(zurl string) (_ *TreeSrv, err error) {
defer xerr.Contextf(&err, "tree.srv %s: start", zurl) defer xerr.Contextf(&err, "tree.srv %s: start", zurl)
...@@ -175,19 +187,10 @@ func StartAllStructsSrv() (_ *AllStructsSrv, err error) { ...@@ -175,19 +187,10 @@ func StartAllStructsSrv() (_ *AllStructsSrv, err error) {
return sg, nil return sg, nil
} }
// Close shutdowns treegen server.
func (tg *TreeGenSrv) Close() (err error) {
defer xerr.Contextf(&err, "treegen %v: close", tg.argv)
err1 := tg.pyin.Close()
err2 := tg.pyoutRaw.Close()
err3 := tg.pysrv.Wait()
return xerr.Merge(err1, err2, err3)
}
// Commit creates new commit with underlying tree changed to specified tree topology. // Commit creates new commit with underlying tree changed to specified tree topology.
func (tg *TreeSrv) Commit(tree string) (_ zodb.Tid, err error) { func (tg *TreeSrv) Commit(tree string) (_ zodb.Tid, err error) {
defer xerr.Contextf(&err, "treegen %s: commit %s", tg.zurl, tree) defer xerr.Contextf(&err, "tree.srv %s: commit %s", tg.zurl, tree)
_, err = io.WriteString(tg.pyin, tree + "\n") _, err = io.WriteString(tg.pyin, tree + "\n")
if err != nil { if err != nil {
...@@ -208,6 +211,37 @@ func (tg *TreeSrv) Commit(tree string) (_ zodb.Tid, err error) { ...@@ -208,6 +211,37 @@ func (tg *TreeSrv) Commit(tree string) (_ zodb.Tid, err error) {
return tid, nil return tid, nil
} }
// AllStructs returns response from `treegen allstructs`
func (tg *AllStructsSrv) AllStructs(kv1, kv2 map[Key]string, maxdepth, maxsplit, n int, seed int64) (_ []string, err error) {
req := fmt.Sprintf("%d %d %d/%d %s %s", maxdepth, maxsplit, n, seed, kvtxt(kv1), kvtxt(kv2))
defer xerr.Contextf(&err, "allstructs.srv: %s", req)
_, err = io.WriteString(tg.pyin, req + "\n")
if err != nil {
return nil, err
}
structv := []string{}
for {
reply, err := tg.pyout.ReadString('\n')
if err != nil {
return nil, err
}
reply = strings.TrimSuffix(reply, "\n")
if reply == "# ----" {
return structv, nil // end of response
}
if strings.HasPrefix(reply, "#") {
continue // comment
}
structv = append(structv, reply)
}
}
// XGetTree loads Tree from zurl@at->obj<root>. // XGetTree loads Tree from zurl@at->obj<root>.
// Tree values must be ZBlk whose data is returned instead of references to ZBlk objects. // Tree values must be ZBlk whose data is returned instead of references to ZBlk objects.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment