Revert "."

This reverts commit a5027dc7.

wcfs/internal/xbtree/misc.go

+// Copyright (C) 2018-2021  Nexedi SA and Contributors.
+//                          Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Free Software licenses or any of the Open Source
+// Initiative approved licenses and Convey the resulting work. Corresponding
+// source of such a combination shall include the source code for all other
+// software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+// See https://www.nexedi.com/licensing for rationale and options.
+
+package xbtree
+
+import (
+	"fmt"
+)
+
+func panicf(format string, argv ...interface{}) {
+	panic(fmt.Sprintf(format, argv...))
+}

wcfs/internal/zhist/pptreesubset.go → wcfs/internal/xbtree/pptreesubset.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 // PP-connected subset of tree nodes.
 
 import (

wcfs/internal/zhist/pptreesubset_test.go → wcfs/internal/xbtree/pptreesubset_test.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 
 import (
 	"strings"

wcfs/internal/zhist/rangeset.go → wcfs/internal/xbtree/rangeset.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 // set of [lo,hi) Key ranges.
 
 import (

wcfs/internal/zhist/rangeset_test.go → wcfs/internal/xbtree/rangeset_test.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 
 import (
 	"testing"

wcfs/internal/zhist/treediff.go → wcfs/internal/xbtree/treediff.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 // diff for BTrees
 // XXX doc
 

wcfs/internal/zhist/zhist.go → wcfs/internal/xbtree/xbtree.go

-// Package zhist provides way to query ZODB for BTree and ZBigFile history.
-//
-// It complements packages lab.nexedi.com/kirr/neo/go/zodb/btree and
-// lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/zdata.
-//
-// It provides:
-//
-//	- ΔBTail to query BTree-level ZODB history, and
-//	- ΔFtail to query ZBigFile-level ZODB history.
-package zhist
+// Package xbtree complements package lab.nexedi.com/kirr/neo/go/zodb/btree.
+// XXX doc
+package xbtree
+
 
 import (
 	"fmt"
@@ -80,7 +74,3 @@ func kstr(k Key) string {
 	}
 	return fmt.Sprintf("%d", k)
 }
-
-func panicf(format string, argv ...interface{}) {
-	panic(fmt.Sprintf(format, argv...))
-}

wcfs/internal/zhist/kvdiff_test.go → wcfs/internal/xbtree/xbtreetest/kvdiff.go

@@ -17,15 +17,13 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtreetest
 // kvdiff + friends
 
 import (
 	"fmt"
-	"reflect"
 	"sort"
 	"strings"
-	"testing"
 )
 
 // kvdiff returns difference in between kv1 and kv2.
@@ -53,16 +51,6 @@ func kvdiff(kv1, kv2 map[Key]string) map[Key]Δstring {
 	return delta
 }
 
-func TestKVDiff(t *testing.T) {
-	kv1 := map[Key]string{1:"a", 3:"c", 4:"d"}
-	kv2 := map[Key]string{1:"b",        4:"d", 5:"e"}
-	got  := kvdiff(kv1, kv2)
-	want := map[Key]Δstring{1:{"a","b"}, 3:{"c",DEL}, 5:{DEL,"e"}}
-	if !reflect.DeepEqual(got, want) {
-		t.Fatalf("error:\ngot:  %v\nwant: %v", got, want)
-	}
-}
-
 // kvtxt returns string representation of {} kv.
 func kvtxt(kv map[Key]string) string {
 	if len(kv) == 0 {
@@ -84,12 +72,3 @@ func kvtxt(kv map[Key]string) string {
 
 	return strings.Join(sv, ",")
 }
-
-func TestKVTxt(t *testing.T) {
-	kv := map[Key]string{3:"hello", 1:"zzz", 4:"world"}
-	got  := kvtxt(kv)
-	want := "1:zzz,3:hello,4:world"
-	if got != want {
-		t.Fatalf("error:\ngot:  %q\nwant: %q", got, want)
-	}
-}

wcfs/internal/xbtree/xbtreetest/kvdiff_test.go

+// Copyright (C) 2020-2021  Nexedi SA and Contributors.
+//                          Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Free Software licenses or any of the Open Source
+// Initiative approved licenses and Convey the resulting work. Corresponding
+// source of such a combination shall include the source code for all other
+// software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+// See https://www.nexedi.com/licensing for rationale and options.
+
+package xbtreetest
+
+import (
+	"reflect"
+	"testing"
+)
+
+func TestKVDiff(t *testing.T) {
+	kv1 := map[Key]string{1:"a", 3:"c", 4:"d"}
+	kv2 := map[Key]string{1:"b",        4:"d", 5:"e"}
+	got  := kvdiff(kv1, kv2)
+	want := map[Key]Δstring{1:{"a","b"}, 3:{"c",DEL}, 5:{DEL,"e"}}
+	if !reflect.DeepEqual(got, want) {
+		t.Fatalf("error:\ngot:  %v\nwant: %v", got, want)
+	}
+}
+
+func TestKVTxt(t *testing.T) {
+	kv := map[Key]string{3:"hello", 1:"zzz", 4:"world"}
+	got  := kvtxt(kv)
+	want := "1:zzz,3:hello,4:world"
+	if got != want {
+		t.Fatalf("error:\ngot:  %q\nwant: %q", got, want)
+	}
+}

wcfs/internal/zhist/rtree_test.go → wcfs/internal/xbtree/xbtreetest/rtree.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtreetest
 
 import (
 	"fmt"

wcfs/internal/zhist/treeenv_test.go → wcfs/internal/xbtree/xbtreetest/treeenv.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtreetest
 // TreeEnv + friends
 
 import (

wcfs/internal/zhist/treegen_test.go → wcfs/internal/xbtree/xbtreetest/treegen.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtreetest
 // treegen.go provides functionality:
 //
 //   - to commit a particular BTree topology into ZODB, and

wcfs/internal/xbtree/xbtreetest/xbtreetest.go

+// Copyright (C) 2020-2021  Nexedi SA and Contributors.
+//                          Kirill Smelkov <kirr@nexedi.com>
+//
+// This program is free software: you can Use, Study, Modify and Redistribute
+// it under the terms of the GNU General Public License version 3, or (at your
+// option) any later version, as published by the Free Software Foundation.
+//
+// You can also Link and Combine this program with other software covered by
+// the terms of any of the Free Software licenses or any of the Open Source
+// Initiative approved licenses and Convey the resulting work. Corresponding
+// source of such a combination shall include the source code for all other
+// software used.
+//
+// This program is distributed WITHOUT ANY WARRANTY; without even the implied
+// warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+//
+// See COPYING file for full licensing terms.
+// See https://www.nexedi.com/licensing for rationale and options.
+
+// Package xbtreetest provides infrastructure for testing LOBTree with ZBlk values.
+// XXX -> treetest?
+package xbtreetest
+
+import (
+	"fmt"
+	"math"
+
+	"lab.nexedi.com/kirr/neo/go/zodb"
+	"lab.nexedi.com/kirr/neo/go/zodb/btree"
+
+	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/set"
+//	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xbtree"
+)
+
+// XXX dup from xbtree  (to avoid import cycle)
+type Tree   = btree.LOBTree
+type Bucket = btree.LOBucket
+
+type Key  = int64
+const KeyMax Key = math.MaxInt64
+const KeyMin Key = math.MinInt64
+type setKey = set.I64
+
+const VDEL  = zodb.InvalidOid
+
+
+func panicf(format string, argv ...interface{}) {
+	panic(fmt.Sprintf(format, argv...))
+}

wcfs/internal/zhist/δbtail.go → wcfs/internal/xbtree/δbtail.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 // ΔBtail
 
 import (

wcfs/internal/zhist/δbtail_test.go → wcfs/internal/xbtree/δbtail_test.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package xbtree
 // tests for δbtail.go
 //
 // This are the main tests for ΔBtail functionality. There are two primary testing concerns:
@@ -38,18 +38,23 @@ package zhist
 //
 // TestΔBTail and TestΔBTailAllStructs implement approaches "a" and "b" correspondingly.
 //
-// testprog/treegen.py is used as helper to both:
+// testprog/treegen.py is used as helper to both:	XXX moved to xbtreetest
 //
 //   - commit a particular BTree topology into ZODB, and
 //   - to generate set of random tree topologies that all correspond to particular {k->v} dict.
 
 import (
+	"bufio"
 	"context"
 	"flag"
 	"fmt"
+	"io"
 	"math"
 	"math/rand"
+	"os"
+	"os/exec"
 	"reflect"
+	"regexp"
 	"sort"
 	"strings"
 	"testing"
@@ -60,6 +65,9 @@ import (
 	"lab.nexedi.com/kirr/neo/go/transaction"
 	"lab.nexedi.com/kirr/neo/go/zodb"
 	_ "lab.nexedi.com/kirr/neo/go/zodb/wks"
+
+	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xbtree/xbtreetest"
+//	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xzodb"
 )
 
 // trackSet returns what should be ΔBtail.trackSet coverage for specified tracked key set.
@@ -1430,7 +1438,7 @@ func TestΔBTailAllStructs(t *testing.T) {
 	nkeys    := N(3,  5, 10)
 
 	// server to generate AllStructs(kv, ...)
-	sg, err := StartAllStructsSrv(); X(err)
+	sg, err := xbtreetest.StartAllStructsSrv(); X(err)
 	defer func() {
 		err := sg.Close(); X(err)
 	}()

wcfs/internal/zhist/δbtail_x_test.go → wcfs/internal/xbtree/δbtail_x_test.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist_test
+package xbtree_test
 // ZBlk-related part of δbtail_test
 
 import (
@@ -27,14 +27,14 @@ import (
 	"lab.nexedi.com/kirr/go123/xerr"
 	"lab.nexedi.com/kirr/neo/go/zodb"
 
+	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xbtree"
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xzodb"
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/zdata"
-	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/zhist"
 )
 
-type Tree = zhist.Tree
-type Node = zhist.Node
-type Key  = zhist.Key
+type Tree = xbtree.Tree
+type Node = xbtree.Node
+type Key  = xbtree.Key
 
 type ZBlk = zdata.ZBlk
 
@@ -61,8 +61,8 @@ func ztreeGetBlk(ctx context.Context, ztree *Tree, k Key) (zblk ZBlk, ok bool, p
 
 
 func init() {
-	zhist.ZTreeGetBlkData = ZTreeGetBlkData
-	zhist.ZGetBlkData     = ZGetBlkData
+	xbtree.ZTreeGetBlkData = ZTreeGetBlkData
+	xbtree.ZGetBlkData     = ZGetBlkData
 }
 
 // ZTreeGetBlkData returns block data from block pointed to by ztree[k].

wcfs/internal/zdata/zblk.go

@@ -19,7 +19,7 @@
 
 // Package zdata provides access for wendelin.core in-ZODB data.
 //
-// ZBlk* + ZBigFile.
+// ZBlk* + ZBigFile + ΔFtail for ZBigFile-level ZODB history.
 package zdata
 
 // module: "wendelin.bigfile.file_zodb"

wcfs/internal/zhist/δftail.go → wcfs/internal/zdata/δftail.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package zdata
 
 import (
 	"context"
@@ -28,12 +28,13 @@ import (
 	"lab.nexedi.com/kirr/neo/go/zodb/btree"
 
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/set"
+	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xbtree"
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xtail"
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/xzodb"
-	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/zdata"
 )
 
 type setI64 = set.I64
+type setOid = set.Oid
 
 // ΔFtail represents tail of revisional changes to files.
 //
@@ -73,7 +74,7 @@ type setI64 = set.I64
 // See also zodb.ΔTail
 type ΔFtail struct {
 	// ΔFtail merges ΔBtail with history of ZBlk
-	δBtail  *ΔBtail
+	δBtail  *xbtree.ΔBtail
 	fileIdx map[zodb.Oid]setOid // tree-root -> {} ZBigFile<oid> as of @head
 
 	trackSetZFile setOid                  // set of tracked ZBigFiles	as of @head
@@ -121,7 +122,7 @@ type ΔFile struct {
 // ZODB when needed.
 func NewΔFtail(at0 zodb.Tid, db *zodb.DB) *ΔFtail {
 	return &ΔFtail{
-		δBtail:        NewΔBtail(at0, db),
+		δBtail:        xbtree.NewΔBtail(at0, db),
 		fileIdx:       map[zodb.Oid]setOid{},
 		trackSetZFile: setOid{},
 		trackSetZBlk:  map[zodb.Oid]*zblkTrack{},
@@ -146,13 +147,13 @@ func (δFtail *ΔFtail) Tail() zodb.Tid { return δFtail.δBtail.Tail() }
 // XXX objects in path and zblk must be with .PJar().At() == .head
 //
 // A root can be associated with several files (each provided on different Track call).
-func (δFtail *ΔFtail) Track(file *zdata.ZBigFile, blk int64, path []btree.LONode, zblk zdata.ZBlk) {
+func (δFtail *ΔFtail) Track(file *ZBigFile, blk int64, path []btree.LONode, zblk ZBlk) {
 	// XXX locking
 
 	foid := file.POid()
 	if blk == -1 {
 		// XXX blk = ∞ from beginning ?
-		blk = KeyMax
+		blk = xbtree.KeyMax
 	}
 	err := δFtail.δBtail.Track(blk, path)
 	if err != nil {
@@ -295,7 +296,7 @@ func (δFtail *ΔFtail) Update(δZ *zodb.EventCommit, zhead *xzodb.ZConn) (_ ΔF
 //
 // If file != nil only track requests related to file are processed.
 // Otherwise all track requests are processed.
-func (δFtail *ΔFtail) update(file *zdata.ZBigFile) {
+func (δFtail *ΔFtail) update(file *ZBigFile) {
 	if file == nil {
 		panic("TODO")
 	}
@@ -356,7 +357,7 @@ func (δFtail *ΔFtail) ForgetPast(revCut zodb.Tid) {
 // the caller must not modify returned slice.
 //
 // Note: contrary to regular go slicing, low is exclusive while high is inclusive.
-func (δFtail *ΔFtail) SliceByFileRev(file *zdata.ZBigFile, lo, hi zodb.Tid) /*readonly*/[]*ΔFile {
+func (δFtail *ΔFtail) SliceByFileRev(file *ZBigFile, lo, hi zodb.Tid) /*readonly*/[]*ΔFile {
 	xtail.AssertSlice(δFtail, lo, hi)
 
 	// FIXME rework to just query .δBtail.SliceByRootRev(file.blktab, lo, hi) +
@@ -468,7 +469,7 @@ func (δFtail *ΔFtail) SliceByFileRev(file *zdata.ZBigFile, lo, hi zodb.Tid) /*
 // blk must be tracked
 //
 // XXX +ctx, error	rebuild []δF here
-func (δFtail *ΔFtail) LastBlkRev(ctx context.Context, zf *zdata.ZBigFile, blk int64, at zodb.Tid) (_ zodb.Tid, exact bool) {
+func (δFtail *ΔFtail) LastBlkRev(ctx context.Context, zf *ZBigFile, blk int64, at zodb.Tid) (_ zodb.Tid, exact bool) {
 	//defer xerr.Contextf(&err, "")	// XXX text
 
 	// XXX assert δFtail == f.head.bfdir.δFtail ?

wcfs/internal/zhist/δftail_test.go → wcfs/internal/zdata/δftail_test.go

@@ -17,7 +17,7 @@
 // See COPYING file for full licensing terms.
 // See https://www.nexedi.com/licensing for rationale and options.
 
-package zhist
+package zdata
 
 import (
 	"testing"