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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Joshua
wendelin.core
Commits
94389dd3
Commit
94389dd3
authored
Feb 04, 2019
by
Kirill Smelkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
.
parent
0ba8cc2e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
2 deletions
+12
-2
wcfs/wcfs.go
wcfs/wcfs.go
+11
-2
wcfs/zblk.go
wcfs/zblk.go
+1
-0
No files found.
wcfs/wcfs.go
View file @
94389dd3
...
...
@@ -498,7 +498,6 @@ type blkLoadState struct {
ready
chan
struct
{}
blkdata
[]
byte
treepath
[]
zodb
.
IPersistent
// LOBTree LOBTree ... LOBucket
err
error
}
...
...
@@ -1159,10 +1158,20 @@ func (f *BigFile) readBlk(ctx context.Context, blk int64, dest []byte) error {
zbf
:=
f
.
zbf
blkdata
,
treepath
,
err
:=
zbf
.
LoadBlk
(
ctx
,
blk
)
// XXX -> +blkrevmax1
loading
.
blkdata
=
blkdata
loading
.
treepath
=
treepath
loading
.
err
=
err
close
(
loading
.
ready
)
_
=
treepath
/*
blkrevmax := zodb.Tid(0)
for __, node := range treepath {
node.PActivate() // XXX err
blkrevmax = max(_, node.PSerial())
node.PDeactivate()
}
*/
// XXX before loading.ready?
blkrevmax2
,
_
:=
f
.
δFtail
.
LastRevOf
(
blk
,
zbf
.
PJar
()
.
At
())
//revmax := min(blkrevmax1, blkrevmax2)
...
...
wcfs/zblk.go
View file @
94389dd3
...
...
@@ -452,6 +452,7 @@ func (bf *ZBigFile) LoadBlk(ctx context.Context, blk int64) (_ []byte, treePath
}
defer
bf
.
PDeactivate
()
// XXX -> GetTo(callback(node) - use node.PSerial to build maxrev + treepath)
xzblk
,
ok
,
treev
,
bucket
,
err
:=
bf
.
blktab
.
GetTo
(
ctx
,
blk
)
if
err
!=
nil
{
return
nil
,
nil
,
err
...
...
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