Commit a1b94828 authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 6554ee97
...@@ -250,7 +250,7 @@ func (btail *ΔTail) Update(δZ *zodb.EventCommit) (δB ΔRevEntry) { ...@@ -250,7 +250,7 @@ func (btail *ΔTail) Update(δZ *zodb.EventCommit) (δB ΔRevEntry) {
// func (btail *ΔTail) update() // func (btail *ΔTail) update()
// XXX -> Get(root, key, at) -> (valueOid, rev) ? // XXX -> Get(root, key, at) -> (valueOid, rev) ?
func (btail *ΔTail) LastRevOf(root Tree, key Key, at zodb.Tid) (_ zodb.Tid, exact bool) { func (btail *ΔTail) LastRevOf(root *Tree, key Key, at zodb.Tid) (_ zodb.Tid, exact bool) {
/* /*
lastRevOf = btail.lastRevOf[root] lastRevOf = btail.lastRevOf[root]
rev = lastRevOf[key] rev = lastRevOf[key]
......
...@@ -42,9 +42,6 @@ import ( ...@@ -42,9 +42,6 @@ import (
"lab.nexedi.com/kirr/neo/go/transaction" "lab.nexedi.com/kirr/neo/go/transaction"
"lab.nexedi.com/kirr/neo/go/zodb" "lab.nexedi.com/kirr/neo/go/zodb"
"lab.nexedi.com/kirr/neo/go/zodb/btree"
"./internal/xbtree"
) )
// ---- FUSE ---- // ---- FUSE ----
......
...@@ -20,6 +20,14 @@ ...@@ -20,6 +20,14 @@
package main package main
// ΔFtail - merge btree.ΔTail with history of ZBlk // ΔFtail - merge btree.ΔTail with history of ZBlk
import (
"fmt"
"lab.nexedi.com/kirr/neo/go/zodb"
"lab.nexedi.com/kirr/neo/go/zodb/btree"
"./internal/xbtree"
)
// ΔFTail is like btree.ΔTail but additionally tracks tree-root -> file relation and // ΔFTail is like btree.ΔTail but additionally tracks tree-root -> file relation and
// takes ZBlk history into account. // takes ZBlk history into account.
...@@ -88,7 +96,7 @@ func (δf *ΔFTail) Update(δZ *zodb.EventCommit) ΔFentry { ...@@ -88,7 +96,7 @@ func (δf *ΔFTail) Update(δZ *zodb.EventCommit) ΔFentry {
// XXX ZBigFile.LoadBlk(blk) -> blkdata, rev // XXX ZBigFile.LoadBlk(blk) -> blkdata, rev
func (δf *ΔFTail) LastRevOf(file *BigFile, blk int64, at zodb.Tid) (_ zodb.Tid, exact bool) { func (δf *ΔFTail) LastRevOf(file *BigFile, blk int64, at zodb.Tid) (_ zodb.Tid, exact bool) {
// revision of when blktab[blk] entry changed last. // revision of when blktab[blk] entry changed last.
treeKeyRev := δf.ΔTail.LastRevOf(file.zfile.blktab, blk, at) // XXX activate? treeKeyRev, exact := δf.ΔTail.LastRevOf(file.zfile.blktab, blk, at) // XXX activate?
// blktab[blk] is only a pointer (to ZBlk) and ZBlk could itself have // blktab[blk] is only a pointer (to ZBlk) and ZBlk could itself have
// been changing after treeKeyRev. We have to check for that. // been changing after treeKeyRev. We have to check for that.
......
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