Commit d1af8efa authored by Kirill Smelkov's avatar Kirill Smelkov

.

parent 4fec22ea
...@@ -589,9 +589,8 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -589,9 +589,8 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
// query .δBtail.SliceByRootRev(file.blktab, lo, hi) + // query .δBtail.SliceByRootRev(file.blktab, lo, hi) +
// merge δZBlk history with that. // merge δZBlk history with that.
// merging tree (δT) and Zblk (δZblk) histories into file history (δFile): // merging tree (δT) and Zblk (δZblk) histories into file history (δFile):
//
// δT ────────·──────────────·─────────────────·──────────── // δT ────────·──────────────·─────────────────·────────────
// │ │ // │ │
// ↓ │ // ↓ │
...@@ -675,7 +674,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -675,7 +674,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
} else { } else {
δE := vδE[ie+1] δE := vδE[ie+1]
root = δE.oldRoot root = δE.oldRoot
head = δE.Rev - 1 // XXX ok? head = δE.Rev - 1 // TODO better set to exact revision coming before this epoch
for zblk, inblk := range δE.oldTrackSetZBlk { for zblk, inblk := range δE.oldTrackSetZBlk {
Zinblk[zblk] = inblk.Clone() Zinblk[zblk] = inblk.Clone()
} }
...@@ -702,7 +701,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado ...@@ -702,7 +701,7 @@ func (δFtail *ΔFtail) SliceByFileRev(zfile *ZBigFile, lo, hi zodb.Tid) /*reado
// at3 δTø δD{c,d,e} δ{0,1,2} // at3 δTø δD{c,d,e} δ{0,1,2}
// at4 δTø δD{c,e} δ{ 1,2} // at4 δTø δD{c,e} δ{ 1,2}
// //
// if tracked={0} for (at1,at4] query changes to 1 should be // if tracked={0}, for (at1,at4] query, changes to 1 should be
// also all present @at2, @at3 and @at4 - because @at2 both 0 // also all present @at2, @at3 and @at4 - because @at2 both 0
// and 1 are changed in the same tracked bucket. Note that // and 1 are changed in the same tracked bucket. Note that
// changes to 2 should not be present at all. // changes to 2 should not be present at all.
...@@ -951,7 +950,7 @@ type _ΔZBigFile struct { ...@@ -951,7 +950,7 @@ type _ΔZBigFile struct {
blktabOld, blktabNew zodb.Oid blktabOld, blktabNew zodb.Oid
} }
func zfilediff(db *zodb.DB, foid zodb.Oid, old, new zodb.Tid) (δ *_ΔZBigFile, err error) { func zfilediff(db *zodb.DB, foid zodb.Oid, old, new zodb.Tid) (δ *_ΔZBigFile, err error) {
txn, ctx := transaction.New(context.TODO()) // XXX - merge in ctx arg? txn, ctx := transaction.New(context.TODO()) // TODO - merge in cancel via ctx arg
defer txn.Abort() defer txn.Abort()
zconnOld, err := db.Open(ctx, &zodb.ConnOptions{At: old}) zconnOld, err := db.Open(ctx, &zodb.ConnOptions{At: old})
if err != nil { if err != nil {
......
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