Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
W
wendelin.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
Kirill Smelkov
wendelin.core
Commits
4f6d5caf
Commit
4f6d5caf
authored
Jun 19, 2020
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
eb68c598
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
3 deletions
+5
-3
wcfs/δbtail.go
wcfs/δbtail.go
+5
-3
No files found.
wcfs/δbtail.go
View file @
4f6d5caf
...
@@ -292,7 +292,7 @@ func (δBtail *ΔBtail) Update(δZ *zodb.EventCommit) (_ ΔB, err error) {
...
@@ -292,7 +292,7 @@ func (δBtail *ΔBtail) Update(δZ *zodb.EventCommit) (_ ΔB, err error) {
}
}
for
root
,
δZT
:=
range
δZByRoot
{
for
root
,
δZT
:=
range
δZByRoot
{
δT
,
err
:=
δBtail
.
treediff
(
ctx
,
root
,
δZT
,
zconnOld
,
zconnNew
)
δT
,
err
:=
treediff
(
ctx
,
root
,
δZT
,
zconnOld
,
zconnNew
)
if
err
!=
nil
{
if
err
!=
nil
{
return
ΔB
{},
err
return
ΔB
{},
err
}
}
...
@@ -327,7 +327,7 @@ func (δBtail *ΔBtail) Update(δZ *zodb.EventCommit) (_ ΔB, err error) {
...
@@ -327,7 +327,7 @@ func (δBtail *ΔBtail) Update(δZ *zodb.EventCommit) (_ ΔB, err error) {
//
//
// XXX only for tracked
// XXX only for tracked
// δZT is δZ/T - subset of δZ(old..new) that touches tracked nodes of T.
// δZT is δZ/T - subset of δZ(old..new) that touches tracked nodes of T.
func
(
δBtail
*
ΔBtail
)
treediff
(
ctx
context
.
Context
,
root
zodb
.
Oid
,
δZT
SetOid
,
zconnOld
,
zconnNew
*
zodb
.
Connection
)
(
δT
map
[
Key
]
Value
,
err
error
)
{
func
treediff
(
ctx
context
.
Context
,
root
zodb
.
Oid
,
δZT
SetOid
,
zconnOld
,
zconnNew
*
zodb
.
Connection
)
(
δT
map
[
Key
]
Value
,
err
error
)
{
defer
xerr
.
Contextf
(
&
err
,
"treediff %s..%s %s"
,
zconnOld
.
At
(),
zconnNew
.
At
(),
root
)
defer
xerr
.
Contextf
(
&
err
,
"treediff %s..%s %s"
,
zconnOld
.
At
(),
zconnNew
.
At
(),
root
)
// XXX zconnX -> a, b ?
// XXX zconnX -> a, b ?
...
@@ -353,7 +353,9 @@ func (δBtail *ΔBtail) treediff(ctx context.Context, root zodb.Oid, δZT SetOid
...
@@ -353,7 +353,9 @@ func (δBtail *ΔBtail) treediff(ctx context.Context, root zodb.Oid, δZT SetOid
}
}
// FIXME -> merge (VDEL vs add)
// FIXME -> merge (VDEL vs add)
// XXX no - not needed here - changes cannot migrate in between two disconnected subtrees
// XXX no - not needed here - keys cannot migrate in between two disconnected subtrees
// DEL k -> Tkextra += k
// +k -> Tkextra -= k
for
k
,
v
:=
range
δtop
{
for
k
,
v
:=
range
δtop
{
δT
[
k
]
=
v
δT
[
k
]
=
v
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment