forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-22 04:36:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

chunker.Split pass subtreeSize to the levels

Browse source
This commit is contained in:
zelig 2015-01-13 00:18:58 +00:00
parent a9eb8915f2
commit e8ec302b7a
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
bzz/chunker.go
View file

@ -158,7 +158,7 @@ func (self *TreeChunker) Split(key Key, data SectionReader) (chunkC chan *Chunk,
dpaLogger.Debugf("split request received for data (%v bytes, depth: %v)", size, depth) dpaLogger.Debugf("split request received for data (%v bytes, depth: %v)", size, depth)
//launch actual recursive function passing the workgroup //launch actual recursive function passing the workgroup
self.split(depth, treeSize, key, data, chunkC, rerrC, wg) self.split(depth, treeSize/self.Branches, key, data, chunkC, rerrC, wg)
}() }()
// closes internal error channel if all subprocesses in the workgroup finished // closes internal error channel if all subprocesses in the workgroup finished
@ -205,7 +205,7 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
switch { switch {
case depth == 0: case depth == 0:
if size > treeSize { if size > self.chunkSize {
panic("ouch") panic("ouch")
} }
// leaf nodes -> content chunks // leaf nodes -> content chunks
@ -216,12 +216,11 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
Data: data, Data: data,
Size: size, Size: size,
} }
case size < treeSize: case size < treeSize*self.Branches:
// last item on this level (== size % self.Branches ^ (depth + 1) ) // last item on this level (== size % self.Branches ^ (depth + 1) )
self.split(depth-1, int64(treeSize/self.Branches), key, data, chunkC, errc, parentWg) self.split(depth-1, treeSize/self.Branches, key, data, chunkC, errc, parentWg)
return return
default: default:
treeSize /= self.Branches
// intermediate chunk containing child nodes hashes // intermediate chunk containing child nodes hashes
branches := int64(size/treeSize) + 1 branches := int64(size/treeSize) + 1
dpaLogger.Debugf("intermediate node: setting branches: %v, depth: %v, max subtree size: %v, data size: %v", branches, depth, treeSize, size) dpaLogger.Debugf("intermediate node: setting branches: %v, depth: %v, max subtree size: %v, data size: %v", branches, depth, treeSize, size)
@ -242,7 +241,7 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
subTreeKey := chunk[i*self.hashSize : (i+1)*self.hashSize] subTreeKey := chunk[i*self.hashSize : (i+1)*self.hashSize]
childrenWg.Add(1) childrenWg.Add(1)
go self.split(depth-1, treeSize, subTreeKey, subTreeData, chunkC, errc, childrenWg) go self.split(depth-1, treeSize/self.Branches, subTreeKey, subTreeData, chunkC, errc, childrenWg)
i++ i++
pos += treeSize pos += treeSize