Commit 1a42eccf authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 51e0d65d
...@@ -371,7 +371,7 @@ func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb ...@@ -371,7 +371,7 @@ func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb
// verify that either // verify that either
// - δ is all empty (just created), or // - δ is all empty (just created), or
// - all δ transactions come strictly after base. // - all δ transactions come strictly after base.Head .
at0 := baseAt0 at0 := baseAt0
var δEventq0 []zodb.Event var δEventq0 []zodb.Event
if δAt0 != 0 { if δAt0 != 0 {
...@@ -402,7 +402,6 @@ func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb ...@@ -402,7 +402,6 @@ func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb
// verify δ // verify δ
:= δ.Iterate(ctx, 0, baseAt0) := δ.Iterate(ctx, 0, baseAt0)
δtxni, _, err := .NextTxn(ctx) δtxni, _, err := .NextTxn(ctx)
// TODO iδ.Close()
switch { switch {
case err == io.EOF: case err == io.EOF:
err = nil // ok - nothing in δ err = nil // ok - nothing in δ
...@@ -411,6 +410,7 @@ func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb ...@@ -411,6 +410,7 @@ func openByURL(ctx context.Context, u *url.URL, opt *zodb.DriverOptions) (_ zodb
// there is a δ transaction ∈ [δAt0, baseAt0) // there is a δ transaction ∈ [δAt0, baseAt0)
err = fmt.Errorf("base overlaps with δ: base.head=%s δ.tail=%s", baseAt0, δtxni.Tid) err = fmt.Errorf("base overlaps with δ: base.head=%s δ.tail=%s", baseAt0, δtxni.Tid)
} }
// TODO iδ.Close()
close(δq0Stop) close(δq0Stop)
<-δq0Done <-δq0Done
......
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