forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-07-21 20:26:41 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

allocate root key if nil

Browse source
This commit is contained in:
zelig 2015-02-06 19:50:33 +01:00
parent 85b1cf0a81
commit effe37d282
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bzz/chunker.go
View file

@ -107,7 +107,7 @@ func (self *TreeChunker) Init() {
} }
self.hashSize = int64(self.HashFunc.New().Size()) self.hashSize = int64(self.HashFunc.New().Size())
self.chunkSize = self.hashSize * self.Branches self.chunkSize = self.hashSize * self.Branches
// dpaLogger.Debugf("Chunker initialised: branches: %v, hashsize: %v, chunksize: %v, join timeout: %v , split timeout: %v", self.Branches, self.hashSize, self.chunkSize, self.JoinTimeout, self.SplitTimeout) dpaLogger.Debugf("Chunker initialised: branches: %v, hashsize: %v, chunksize: %v, join timeout: %v , split timeout: %v", self.Branches, self.hashSize, self.chunkSize, self.JoinTimeout, self.SplitTimeout)
} }
@ -148,8 +148,7 @@ func (self *TreeChunker) Split(key Key, data SectionReader, chunkC chan *Chunk)
rerrC := make(chan error) rerrC := make(chan error)
timeout := time.After(self.SplitTimeout) timeout := time.After(self.SplitTimeout)
if key == nil { if key == nil {
// dpaLogger.Debugf("please allocate byte slice for root key") key = make([]byte, self.hashSize)
return
} }
wg.Add(1) wg.Add(1)
go func() { go func() {
@ -168,7 +167,7 @@ func (self *TreeChunker) Split(key Key, data SectionReader, chunkC chan *Chunk)
depth++ depth++
} }
// 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/self.Branches, key, data, chunkC, rerrC, wg) self.split(depth, treeSize/self.Branches, key, data, chunkC, rerrC, wg)
@ -204,7 +203,7 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
size := data.Size() size := data.Size()
var newChunk *Chunk var newChunk *Chunk
var hash Key var hash Key
// dpaLogger.Debugf("depth: %v, max subtree size: %v, data size: %v", depth, treeSize, size) dpaLogger.Debugf("depth: %v, max subtree size: %v, data size: %v", depth, treeSize, size)
for depth > 0 && size < treeSize { for depth > 0 && size < treeSize {
treeSize /= self.Branches treeSize /= self.Branches
@ -214,7 +213,7 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
if depth == 0 { if depth == 0 {
// leaf nodes -> content chunks // leaf nodes -> content chunks
hash = self.Hash(size, data) hash = self.Hash(size, data)
// dpaLogger.Debugf("content chunk: max subtree size: %v, data size: %v", treeSize, size) dpaLogger.Debugf("content chunk: max subtree size: %v, data size: %v", treeSize, size)
newChunk = &Chunk{ newChunk = &Chunk{
Key: hash, Key: hash,
Reader: data, Reader: data,
@ -223,7 +222,7 @@ func (self *TreeChunker) split(depth int, treeSize int64, key Key, data SectionR
} else { } else {
// intermediate chunk containing child nodes hashes // intermediate chunk containing child nodes hashes
branches := int64((size-1)/treeSize) + 1 branches := int64((size-1)/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)
var chunk []byte = make([]byte, branches*self.hashSize) var chunk []byte = make([]byte, branches*self.hashSize)
var pos, i int64 var pos, i int64
@ -364,7 +363,7 @@ func (self *TreeChunker) join(depth int, treeSize int64, key Key, chunkC chan *C
var readerF func() (r LazySectionReader) var readerF func() (r LazySectionReader)
var readerFs [](func() (r LazySectionReader)) var readerFs [](func() (r LazySectionReader))
branches := int64((chunk.Size-1)/treeSize) + 1 branches := int64((chunk.Size-1)/treeSize) + 1
// dpaLogger.DebugDetailf("tree node - size %v, chunk size: %v, subtreeSize %v, branches %v", chunk.Size, chunk.Reader.Size(), treeSize, branches) dpaLogger.DebugDetailf("tree node - size %v, chunk size: %v, subtreeSize %v, branches %v", chunk.Size, chunk.Reader.Size(), treeSize, branches)
// iterate through the chunk containing the keys of children // iterate through the chunk containing the keys of children
// create lazy init functions that give back readers // create lazy init functions that give back readers
@ -373,7 +372,7 @@ func (self *TreeChunker) join(depth int, treeSize int64, key Key, chunkC chan *C
childKey = make([]byte, self.hashSize) // preallocate hashSize long slice for key childKey = make([]byte, self.hashSize) // preallocate hashSize long slice for key
// read the Hash of the subtree from the relevant section of the Chunk into the allocated byte slice in subtree.Key // read the Hash of the subtree from the relevant section of the Chunk into the allocated byte slice in subtree.Key
if _, err := chunk.Reader.ReadAt(childKey, i*self.hashSize); err != nil { if _, err := chunk.Reader.ReadAt(childKey, i*self.hashSize); err != nil {
// dpaLogger.DebugDetailf("Read error: %v", err) dpaLogger.DebugDetailf("Read error: %v", err)
errC <- err errC <- err
break break
} }