bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-06-06 02:25:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix Left() And Right() Panic Bug

Browse Source
This commit is contained in:
huangqian
2021-11-25 23:56:51 +08:00
parent 2c542cfd46
commit f78d65833b
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
container/gtree/gtree_btree.go
View File

@ -346,7 +346,10 @@ func (tree *BTree) Left() *BTreeEntry {
tree.mu.RLock()
defer tree.mu.RUnlock()
node := tree.left(tree.root)
return node.Entries[0]
if node != nil {
return node.Entries[0]
}
return nil
}
// Right returns the right-most (max) entry or nil if tree is empty.
@ -354,7 +357,10 @@ func (tree *BTree) Right() *BTreeEntry {
tree.mu.RLock()
defer tree.mu.RUnlock()
node := tree.right(tree.root)
return node.Entries[len(node.Entries)-1]
if node != nil {
return node.Entries[len(node.Entries)-1]
}
return nil
}
// String returns a string representation of container (for debugging purposes)
@ -931,7 +937,7 @@ func (tree *BTree) deleteChild(node *BTreeNode, index int) {
// MarshalJSON implements the interface MarshalJSON for json.Marshal.
func (tree *BTree) MarshalJSON() ([]byte, error) {
return json.Marshal(tree.Map())
return json.Marshal(tree.MapStrAny())
}
// getComparator returns the comparator if it's previously set,