.

wcfs/btree.go

@@ -14,6 +14,16 @@
 package main
 // ZODB BTree handling
 
+import (
+	"context"
+
+	"lab.nexedi.com/kirr/neo/go/zodb"
+)
+
+// XXX -> template
+type KEY int64
+
+
 // ZBucket mimics ?OBucket from btree/py, with ? being any integer.
 //
 // py description:
@@ -32,7 +42,7 @@ type ZBucket struct {
 }
 
 // zBTreeItem mimics BTreeItem from btree/py.
-type zBTreeItem {
+type zBTreeItem struct {
 	key	KEY
 	child	interface{}	// ZBTree or ZBucket
 }

wcfs/zblk.go

@@ -34,7 +34,9 @@ package main
 
 
 import (
-	//"lab.nexedi.com/kirr/neo/go/zodb"
+	"context"
+
+	"lab.nexedi.com/kirr/neo/go/zodb"
 )
 
 
@@ -51,11 +53,11 @@ type ZBigFile struct {
 	pyobj *zodb.PyObject
 
 	blksize	int64
-	blktab  ...	// LOBtree{}  blk -> ZBlk*(blkdata)
+	blktab  *ZBTree	// LOBtree{}  blk -> ZBlk*(blkdata)
 }
 
 // module of Wendelin ZODB py objects
-const zwendelin "wendelin.bigfile.file_zodb"
+const zwendelin = "wendelin.bigfile.file_zodb"
 
 // loadZBigFile loads ZBigFile object from specified oid.
 func (conn *zpyconn) loadZBigFile(ctx context.Context, oid zodb.Oid) (*ZBigFile, error) {
@@ -92,7 +94,8 @@ func (conn *zpyconn) loadZBigFile(ctx context.Context, oid zodb.Oid) (*ZBigFile,
 	taboid, err = decodeOID(t[0])
 	// XXX err
 
-	if t[1] != pickle.Class{Module: "BTrees.LOBTree", Name: "LOBTree"} {
+	lobtreeClass := pickle.Class{Module: "BTrees.LOBTree", Name: "LOBTree"}
+	if t[1] != lobtreeClass {
 		// XXX err
 	}