X Adjust to btree.VGet & friends signature change to include keycov in visit callback

neo@20e8f37b

wcfs/go.mod

@@ -11,7 +11,7 @@ require (
 	github.com/stretchr/objx v0.3.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	lab.nexedi.com/kirr/go123 v0.0.0-20210906140734-c9eb28d9e408
-	lab.nexedi.com/kirr/neo/go v0.0.0-20210908100526-87199da2b163
+	lab.nexedi.com/kirr/neo/go v0.0.0-20211004111643-c74a5a3cd0d0
 )
 
 // we use kirr/go-fuse@y/nodefs-cancel

wcfs/go.sum

@@ -214,3 +214,5 @@ lab.nexedi.com/kirr/neo/go v0.0.0-20210720105030-d99bf118d61a h1:ex8P5oGhvDDp4y3
 lab.nexedi.com/kirr/neo/go v0.0.0-20210720105030-d99bf118d61a/go.mod h1:llI3hcJJMACe+rYuXUfS5dljjwIrlBMfJ1ZeRcey96A=
 lab.nexedi.com/kirr/neo/go v0.0.0-20210908100526-87199da2b163 h1:0HTNfLHL2ZNmfETtlF0iFPpWfuAAjzfIkxL5r6x2ALE=
 lab.nexedi.com/kirr/neo/go v0.0.0-20210908100526-87199da2b163/go.mod h1:llI3hcJJMACe+rYuXUfS5dljjwIrlBMfJ1ZeRcey96A=
+lab.nexedi.com/kirr/neo/go v0.0.0-20211004111643-c74a5a3cd0d0 h1:rmfVDj/IaTiMUFAXTKyW993f1G5IxKcZ1vtcrrqscpk=
+lab.nexedi.com/kirr/neo/go v0.0.0-20211004111643-c74a5a3cd0d0/go.mod h1:llI3hcJJMACe+rYuXUfS5dljjwIrlBMfJ1ZeRcey96A=

wcfs/internal/xbtree/blib/blib.go

@@ -36,7 +36,8 @@ type Node   = btree.LONode
 type TreeEntry   = btree.LOEntry
 type BucketEntry = btree.LOBucketEntry
 
-type Key    = int64
+type Key         = int64
+type KeyRange    = btree.LKeyRange
 const KeyMax Key = math.MaxInt64
 const KeyMin Key = math.MinInt64
 

wcfs/internal/xbtree/blib/keyrange.go

-// Copyright (C) 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 blib
-// range of keys.
-
-import (
-	"fmt"
-)
-
-
-// KeyRange represents [lo,hi) Key range.
-type KeyRange struct {
-	Lo  Key
-	Hi_ Key // NOTE _not_ hi) to avoid overflow at ∞;  hi = hi_ + 1
-}
-
-
-// Has returns whether key k belongs to the range.
-func (r *KeyRange) Has(k Key) bool {
-	return (r.Lo <= k && k <= r.Hi_)
-}
-
-// Empty returns whether key range is empty.
-func (r *KeyRange) Empty() bool {
-	hi := r.Hi_
-	if hi == KeyMax {
-		// [x,∞] cannot be empty because max x is ∞ and [∞,∞] has one element: ∞
-		return false
-	}
-	hi++ // no overflow
-	return r.Lo >= hi
-}
-
-
-func (r KeyRange) String() string {
-	var shi string
-	if r.Hi_ == KeyMax {
-		shi = KStr(r.Hi_) // ∞
-	} else {
-		shi = fmt.Sprintf("%d", r.Hi_+1)
-	}
-	return fmt.Sprintf("[%s,%s)", KStr(r.Lo), shi)
-}

wcfs/internal/xbtree/xbtreetest/init/init.go

@@ -36,9 +36,10 @@ import (
 	"lab.nexedi.com/nexedi/wendelin.core/wcfs/internal/zdata"
 )
 
-type Tree = xbtreetest.Tree
-type Node = xbtreetest.Node
-type Key  = xbtreetest.Key
+type Tree     = xbtreetest.Tree
+type Node     = xbtreetest.Node
+type Key      = xbtreetest.Key
+type KeyRange = xbtreetest.KeyRange
 
 type ZBlk = zdata.ZBlk
 
@@ -46,7 +47,8 @@ type ZBlk = zdata.ZBlk
 // XXX +return blkRevMax and use it ?
 func ztreeGetBlk(ctx context.Context, ztree *Tree, k Key) (zblk ZBlk, ok bool, path []Node, err error) {
 	path = []Node{}
-	xzblk, ok, err := ztree.VGet(ctx, k, func(node Node) {
+	xzblk, ok, err := ztree.VGet(ctx, k, func(node Node, keycov KeyRange) {
+		// XXX use keycov
 		path = append(path, node)
 	})
 	if err != nil {

wcfs/internal/xbtree/xbtreetest/xbtreetest.go

@@ -36,9 +36,10 @@ type Node   = blib.Node
 type TreeEntry   = blib.TreeEntry
 type BucketEntry = blib.BucketEntry
 
-type Key    = blib.Key
-const KeyMax = blib.KeyMax
-const KeyMin = blib.KeyMin
+type Key      = blib.Key
+type KeyRange = blib.KeyRange
+const KeyMax  = blib.KeyMax
+const KeyMin  = blib.KeyMin
 
 type setKey = set.I64
 

wcfs/internal/zdata/zblk.go

@@ -426,7 +426,8 @@ func (bf *ZBigFile) LoadBlk(ctx context.Context, blk int64) (_ []byte, treePath
 	defer bf.PDeactivate()
 
 	blkRevMax = 0
-	xzblk, ok, err := bf.blktab.VGet(ctx, blk, func(node btree.LONode) {
+	xzblk, ok, err := bf.blktab.VGet(ctx, blk, func(node btree.LONode, keycov btree.LKeyRange) {
+		// XXX use keycov
 		treePath = append(treePath, node)
 		blkRevMax = tidmax(blkRevMax, node.PSerial())
 	})
@@ -475,7 +476,8 @@ func (bf *ZBigFile) Size(ctx context.Context) (_ int64, treePath []btree.LONode,
 	}
 	defer bf.PDeactivate()
 
-	tailblk, ok, err := bf.blktab.VMaxKey(ctx, func(node btree.LONode) {
+	tailblk, ok, err := bf.blktab.VMaxKey(ctx, func(node btree.LONode, keycov btree.LKeyRange) {
+		// XXX use keycov
 		treePath = append(treePath, node)
 	})
 	if err != nil {