mirror of https://github.com/tidwall/tile38.git
Updated btree deps
This commit is contained in:
tidwall
parent
9998e03f6f
commit
79bee8523b
7
go.mod
7
go.mod
|
|
@ -15,8 +15,8 @@ require (
|
|||
github.com/nats-io/nuid v1.0.0 // indirect
|
||||
github.com/peterh/liner v1.2.0
|
||||
github.com/streadway/amqp v1.0.0
|
||||
github.com/tidwall/btree v0.0.0-20191029221954-400434d76274
|
||||
github.com/tidwall/buntdb v1.1.0
|
||||
github.com/tidwall/btree v0.2.2
|
||||
github.com/tidwall/buntdb v1.1.4
|
||||
github.com/tidwall/cities v0.0.0-20190730194520-dbe1ae0b862c // indirect
|
||||
github.com/tidwall/geoindex v1.1.0
|
||||
github.com/tidwall/geojson v1.2.3
|
||||
|
|
@ -29,9 +29,8 @@ require (
|
|||
github.com/tidwall/redcon v1.3.2
|
||||
github.com/tidwall/resp v0.0.0-20160908231031-b2b1a7ca20e3
|
||||
github.com/tidwall/rhh v1.1.0
|
||||
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e // indirect
|
||||
github.com/tidwall/sjson v1.1.1
|
||||
github.com/tidwall/tinybtree v0.0.0-20181217131827-de5932d649b5
|
||||
github.com/tidwall/tinybtree v1.0.1
|
||||
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 // indirect
|
||||
github.com/yuin/gopher-lua v0.0.0-20200816102855-ee81675732da
|
||||
golang.org/x/crypto v0.0.0-20200204104054-c9f3fb736b72
|
||||
|
|
|
|||
6
go.sum
6
go.sum
|
|
@ -134,10 +134,14 @@ github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0 h1:QnyrPZZvPmR0AtJCx
|
|||
github.com/tidwall/btree v0.0.0-20170113224114-9876f1454cf0/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
|
||||
github.com/tidwall/btree v0.0.0-20191029221954-400434d76274 h1:G6Z6HvJuPjG6XfNGi/feOATzeJrfgTNJY+rGrHbA04E=
|
||||
github.com/tidwall/btree v0.0.0-20191029221954-400434d76274/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
|
||||
github.com/tidwall/btree v0.2.2 h1:VVo0JW/tdidNdQzNsDR4wMbL3heaxA1DGleyzQ3/niY=
|
||||
github.com/tidwall/btree v0.2.2/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
|
||||
github.com/tidwall/buntdb v1.1.0 h1:H6LzK59KiNjf1nHVPFrYj4Qnl8d8YLBsYamdL8N+Bao=
|
||||
github.com/tidwall/buntdb v1.1.0/go.mod h1:Y39xhcDW10WlyYXeLgGftXVbjtM0QP+/kpz8xl9cbzE=
|
||||
github.com/tidwall/buntdb v1.1.2 h1:noCrqQXL9EKMtcdwJcmuVKSEjqu1ua99RHHgbLTEHRo=
|
||||
github.com/tidwall/buntdb v1.1.2/go.mod h1:xAzi36Hir4FarpSHyfuZ6JzPJdjRZ8QlLZSntE2mqlI=
|
||||
github.com/tidwall/buntdb v1.1.4 h1:W7y9+2dM3GOswU0t3pz6+BcwZXjj/tVOhPcO6EHufME=
|
||||
github.com/tidwall/buntdb v1.1.4/go.mod h1:06+/n7EFf6uUaIG5r9xZcExYN3H0Lnc+g/Kqx0fZFkI=
|
||||
github.com/tidwall/cities v0.0.0-20190730194520-dbe1ae0b862c h1:K/6v4woP8qym96ZKorm6mbOhEs3xhlJoEQWiJ5WT7mw=
|
||||
github.com/tidwall/cities v0.0.0-20190730194520-dbe1ae0b862c/go.mod h1:lV/HDp2gCcRcHJWqgt6Di54GiDrTZwh1aG2ZUPNbqa4=
|
||||
github.com/tidwall/geoindex v1.1.0 h1:d/pGCgKUonfQINd1235kKqx9gWBU4N7GjDS9WvbPvLY=
|
||||
|
|
@ -189,6 +193,8 @@ github.com/tidwall/rhh v1.1.0 h1:U+3RGzEB6VoBBkLlsAaF3ThjwZ0JGibplJhDin5Ub/Y=
|
|||
github.com/tidwall/rhh v1.1.0/go.mod h1:37/ybjMQQ4nDztczc//g/WBd2X51vogKHWL3xC8kY24=
|
||||
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e h1:+NL1GDIUOKxVfbp2KoJQD9cTQ6dyP2co9q4yzmT9FZo=
|
||||
github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao=
|
||||
github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8 h1:BsKSRhu0TDB6Snq8SutN9KQHc6vqHEXJTcAFwyGNius=
|
||||
github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao=
|
||||
github.com/tidwall/sjson v1.0.2 h1:WHiiu9LsxPZazjIUPC1EGBuUqQVWJksZszl9BasNNjg=
|
||||
github.com/tidwall/sjson v1.0.2/go.mod h1:bURseu1nuBkFpIES5cz6zBtjmYeOQmEESshn7VpF15Y=
|
||||
github.com/tidwall/sjson v1.1.1 h1:7h1vk049Jnd5EH9NyzNiEuwYW4b5qgreBbqRC19AS3U=
|
||||
|
|
|
|||
|
|
@ -10,7 +10,6 @@ import (
|
|||
"github.com/tidwall/geojson/geometry"
|
||||
"github.com/tidwall/rbang"
|
||||
"github.com/tidwall/tile38/internal/deadline"
|
||||
"github.com/tidwall/tinybtree"
|
||||
)
|
||||
|
||||
// yieldStep forces the iterator to yield goroutine every 255 steps.
|
||||
|
|
@ -27,9 +26,13 @@ type itemT struct {
|
|||
obj geojson.Object
|
||||
}
|
||||
|
||||
func (item *itemT) Less(other btree.Item, ctx interface{}) bool {
|
||||
value1 := item.obj.String()
|
||||
value2 := other.(*itemT).obj.String()
|
||||
func byID(a, b interface{}) bool {
|
||||
return a.(*itemT).id < b.(*itemT).id
|
||||
}
|
||||
|
||||
func byValue(a, b interface{}) bool {
|
||||
value1 := a.(*itemT).obj.String()
|
||||
value2 := b.(*itemT).obj.String()
|
||||
if value1 < value2 {
|
||||
return true
|
||||
}
|
||||
|
|
@ -37,12 +40,12 @@ func (item *itemT) Less(other btree.Item, ctx interface{}) bool {
|
|||
return false
|
||||
}
|
||||
// the values match so we'll compare IDs, which are always unique.
|
||||
return item.id < other.(*itemT).id
|
||||
return byID(a, b)
|
||||
}
|
||||
|
||||
// Collection represents a collection of geojson objects.
|
||||
type Collection struct {
|
||||
items tinybtree.BTree // items sorted by keys
|
||||
items *btree.BTree // items sorted by keys
|
||||
index *geoindex.Index // items geospatially indexed
|
||||
values *btree.BTree // items sorted by value+key
|
||||
fieldMap map[string]int
|
||||
|
|
@ -59,8 +62,9 @@ var counter uint64
|
|||
// New creates an empty collection
|
||||
func New() *Collection {
|
||||
col := &Collection{
|
||||
items: btree.New(byID),
|
||||
index: geoindex.Wrap(&rbang.RTree{}),
|
||||
values: btree.New(32, nil),
|
||||
values: btree.New(byValue),
|
||||
fieldMap: make(map[string]int),
|
||||
fieldArr: make([]string, 0),
|
||||
}
|
||||
|
|
@ -159,8 +163,8 @@ func (c *Collection) Set(
|
|||
newItem := &itemT{id: id, obj: obj}
|
||||
|
||||
// add the new item to main btree and remove the old one if needed
|
||||
oldItem, ok := c.items.Set(id, newItem)
|
||||
if ok {
|
||||
oldItem := c.items.Set(newItem)
|
||||
if oldItem != nil {
|
||||
oldItem := oldItem.(*itemT)
|
||||
// the old item was removed, now let's remove it from the rtree/btree.
|
||||
if objIsSpatial(oldItem.obj) {
|
||||
|
|
@ -187,7 +191,7 @@ func (c *Collection) Set(
|
|||
c.indexInsert(newItem)
|
||||
c.objects++
|
||||
} else {
|
||||
c.values.ReplaceOrInsert(newItem)
|
||||
c.values.Set(newItem)
|
||||
c.nobjects++
|
||||
}
|
||||
|
||||
|
|
@ -220,8 +224,8 @@ func (c *Collection) Set(
|
|||
func (c *Collection) Delete(id string) (
|
||||
obj geojson.Object, fields []float64, ok bool,
|
||||
) {
|
||||
oldItemV, ok := c.items.Delete(id)
|
||||
if !ok {
|
||||
oldItemV := c.items.Delete(&itemT{id: id})
|
||||
if oldItemV == nil {
|
||||
return nil, nil, false
|
||||
}
|
||||
oldItem := oldItemV.(*itemT)
|
||||
|
|
@ -247,8 +251,8 @@ func (c *Collection) Delete(id string) (
|
|||
func (c *Collection) Get(id string) (
|
||||
obj geojson.Object, fields []float64, ok bool,
|
||||
) {
|
||||
itemV, ok := c.items.Get(id)
|
||||
if !ok {
|
||||
itemV := c.items.Get(&itemT{id: id})
|
||||
if itemV == nil {
|
||||
return nil, nil, false
|
||||
}
|
||||
item := itemV.(*itemT)
|
||||
|
|
@ -260,8 +264,8 @@ func (c *Collection) Get(id string) (
|
|||
func (c *Collection) SetField(id, field string, value float64) (
|
||||
obj geojson.Object, fields []float64, updated bool, ok bool,
|
||||
) {
|
||||
itemV, ok := c.items.Get(id)
|
||||
if !ok {
|
||||
itemV := c.items.Get(&itemT{id: id})
|
||||
if itemV == nil {
|
||||
return nil, nil, false, false
|
||||
}
|
||||
item := itemV.(*itemT)
|
||||
|
|
@ -273,8 +277,8 @@ func (c *Collection) SetField(id, field string, value float64) (
|
|||
func (c *Collection) SetFields(
|
||||
id string, inFields []string, inValues []float64,
|
||||
) (obj geojson.Object, fields []float64, updatedCount int, ok bool) {
|
||||
itemV, ok := c.items.Get(id)
|
||||
if !ok {
|
||||
itemV := c.items.Get(&itemT{id: id})
|
||||
if itemV == nil {
|
||||
return nil, nil, 0, false
|
||||
}
|
||||
item := itemV.(*itemT)
|
||||
|
|
@ -356,20 +360,20 @@ func (c *Collection) Scan(
|
|||
offset = cursor.Offset()
|
||||
cursor.Step(offset)
|
||||
}
|
||||
iter := func(key string, value interface{}) bool {
|
||||
iter := func(item interface{}) bool {
|
||||
count++
|
||||
if count <= offset {
|
||||
return true
|
||||
}
|
||||
nextStep(count, cursor, deadline)
|
||||
iitm := value.(*itemT)
|
||||
iitm := item.(*itemT)
|
||||
keepon = iterator(iitm.id, iitm.obj, c.getFieldValues(iitm.id))
|
||||
return keepon
|
||||
}
|
||||
if desc {
|
||||
c.items.Reverse(iter)
|
||||
c.items.Descend(nil, iter)
|
||||
} else {
|
||||
c.items.Scan(iter)
|
||||
c.items.Ascend(nil, iter)
|
||||
}
|
||||
return keepon
|
||||
}
|
||||
|
|
@ -389,18 +393,19 @@ func (c *Collection) ScanRange(
|
|||
offset = cursor.Offset()
|
||||
cursor.Step(offset)
|
||||
}
|
||||
iter := func(key string, value interface{}) bool {
|
||||
iter := func(value interface{}) bool {
|
||||
item := value.(*itemT)
|
||||
count++
|
||||
if count <= offset {
|
||||
return true
|
||||
}
|
||||
nextStep(count, cursor, deadline)
|
||||
if !desc {
|
||||
if key >= end {
|
||||
if item.id >= end {
|
||||
return false
|
||||
}
|
||||
} else {
|
||||
if key <= end {
|
||||
if item.id <= end {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
|
@ -410,9 +415,9 @@ func (c *Collection) ScanRange(
|
|||
}
|
||||
|
||||
if desc {
|
||||
c.items.Descend(start, iter)
|
||||
c.items.Descend(&itemT{id: start}, iter)
|
||||
} else {
|
||||
c.items.Ascend(start, iter)
|
||||
c.items.Ascend(&itemT{id: start}, iter)
|
||||
}
|
||||
return keepon
|
||||
}
|
||||
|
|
@ -431,7 +436,7 @@ func (c *Collection) SearchValues(
|
|||
offset = cursor.Offset()
|
||||
cursor.Step(offset)
|
||||
}
|
||||
iter := func(item btree.Item) bool {
|
||||
iter := func(item interface{}) bool {
|
||||
count++
|
||||
if count <= offset {
|
||||
return true
|
||||
|
|
@ -442,9 +447,9 @@ func (c *Collection) SearchValues(
|
|||
return keepon
|
||||
}
|
||||
if desc {
|
||||
c.values.Descend(iter)
|
||||
c.values.Descend(nil, iter)
|
||||
} else {
|
||||
c.values.Ascend(iter)
|
||||
c.values.Ascend(nil, iter)
|
||||
}
|
||||
return keepon
|
||||
}
|
||||
|
|
@ -462,7 +467,7 @@ func (c *Collection) SearchValuesRange(start, end string, desc bool,
|
|||
offset = cursor.Offset()
|
||||
cursor.Step(offset)
|
||||
}
|
||||
iter := func(item btree.Item) bool {
|
||||
iter := func(item interface{}) bool {
|
||||
count++
|
||||
if count <= offset {
|
||||
return true
|
||||
|
|
@ -472,16 +477,24 @@ func (c *Collection) SearchValuesRange(start, end string, desc bool,
|
|||
keepon = iterator(iitm.id, iitm.obj, c.getFieldValues(iitm.id))
|
||||
return keepon
|
||||
}
|
||||
pstart := &itemT{obj: String(start)}
|
||||
pend := &itemT{obj: String(end)}
|
||||
if desc {
|
||||
c.values.DescendRange(&itemT{obj: String(start)},
|
||||
&itemT{obj: String(end)}, iter)
|
||||
// descend range
|
||||
c.values.Descend(pstart, func(item interface{}) bool {
|
||||
return bGT(c.values, item, pend) && iter(item)
|
||||
})
|
||||
} else {
|
||||
c.values.AscendRange(&itemT{obj: String(start)},
|
||||
&itemT{obj: String(end)}, iter)
|
||||
c.values.Ascend(pstart, func(item interface{}) bool {
|
||||
return bLT(c.values, item, pend) && iter(item)
|
||||
})
|
||||
}
|
||||
return keepon
|
||||
}
|
||||
|
||||
func bLT(tr *btree.BTree, a, b interface{}) bool { return tr.Less(a, b) }
|
||||
func bGT(tr *btree.BTree, a, b interface{}) bool { return tr.Less(b, a) }
|
||||
|
||||
// ScanGreaterOrEqual iterates though the collection starting with specified id.
|
||||
func (c *Collection) ScanGreaterOrEqual(id string, desc bool,
|
||||
cursor Cursor,
|
||||
|
|
@ -495,7 +508,7 @@ func (c *Collection) ScanGreaterOrEqual(id string, desc bool,
|
|||
offset = cursor.Offset()
|
||||
cursor.Step(offset)
|
||||
}
|
||||
iter := func(key string, value interface{}) bool {
|
||||
iter := func(value interface{}) bool {
|
||||
count++
|
||||
if count <= offset {
|
||||
return true
|
||||
|
|
@ -506,9 +519,9 @@ func (c *Collection) ScanGreaterOrEqual(id string, desc bool,
|
|||
return keepon
|
||||
}
|
||||
if desc {
|
||||
c.items.Descend(id, iter)
|
||||
c.items.Descend(&itemT{id: id}, iter)
|
||||
} else {
|
||||
c.items.Ascend(id, iter)
|
||||
c.items.Ascend(&itemT{id: id}, iter)
|
||||
}
|
||||
return keepon
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,202 +1,18 @@
|
|||
Copyright (c) 2020 Josh Baker
|
||||
|
||||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
Permission is hereby granted, free of charge, to any person obtaining a copy of
|
||||
this software and associated documentation files (the "Software"), to deal in
|
||||
the Software without restriction, including without limitation the rights to
|
||||
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
|
||||
the Software, and to permit persons to whom the Software is furnished to do so,
|
||||
subject to the following conditions:
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
The above copyright notice and this permission notice shall be included in all
|
||||
copies or substantial portions of the Software.
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "[]"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright [yyyy] [name of copyright owner]
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
||||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
||||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
|
||||
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
|
||||
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
|
||||
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
||||
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
|
||||
|
|
|
|||
|
|
@ -1,107 +1,5 @@
|
|||
BTree implementation for Go
|
||||
===========================
|
||||
# B-tree for Go
|
||||
|
||||
|
||||
[](https://godoc.org/github.com/tidwall/btree)
|
||||
|
||||
This package provides an in-memory B-Tree implementation for Go, useful as
|
||||
an ordered, mutable data structure.
|
||||
|
||||
This is a fork of the wonderful [google/btree](https://github.com/google/btree) package. It's has all the same great features and adds a few more.
|
||||
|
||||
- Descend* functions for iterating backwards.
|
||||
- Iteration performance boost.
|
||||
- User defined context.
|
||||
|
||||
User defined context
|
||||
--------------------
|
||||
This is a great new feature that allows for entering the same item into multiple B-trees, and each B-tree have a different ordering formula.
|
||||
|
||||
For example:
|
||||
|
||||
```go
|
||||
package main
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/tidwall/btree"
|
||||
)
|
||||
|
||||
type Item struct {
|
||||
Key, Val string
|
||||
}
|
||||
|
||||
func (i1 *Item) Less(item btree.Item, ctx interface{}) bool {
|
||||
i2 := item.(*Item)
|
||||
switch tag := ctx.(type) {
|
||||
case string:
|
||||
if tag == "vals" {
|
||||
if i1.Val < i2.Val {
|
||||
return true
|
||||
} else if i1.Val > i2.Val {
|
||||
return false
|
||||
}
|
||||
// Both vals are equal so we should fall though
|
||||
// and let the key comparison take over.
|
||||
}
|
||||
}
|
||||
return i1.Key < i2.Key
|
||||
}
|
||||
|
||||
func main() {
|
||||
|
||||
// Create a tree for keys and a tree for values.
|
||||
// The "keys" tree will be sorted on the Keys field.
|
||||
// The "values" tree will be sorted on the Values field.
|
||||
keys := btree.New(16, "keys")
|
||||
vals := btree.New(16, "vals")
|
||||
|
||||
// Create some items.
|
||||
users := []*Item{
|
||||
&Item{Key: "user:1", Val: "Jane"},
|
||||
&Item{Key: "user:2", Val: "Andy"},
|
||||
&Item{Key: "user:3", Val: "Steve"},
|
||||
&Item{Key: "user:4", Val: "Andrea"},
|
||||
&Item{Key: "user:5", Val: "Janet"},
|
||||
&Item{Key: "user:6", Val: "Andy"},
|
||||
}
|
||||
|
||||
// Insert each user into both trees
|
||||
for _, user := range users {
|
||||
keys.ReplaceOrInsert(user)
|
||||
vals.ReplaceOrInsert(user)
|
||||
}
|
||||
|
||||
// Iterate over each user in the key tree
|
||||
keys.Ascend(func(item btree.Item) bool {
|
||||
kvi := item.(*Item)
|
||||
fmt.Printf("%s %s\n", kvi.Key, kvi.Val)
|
||||
return true
|
||||
})
|
||||
|
||||
fmt.Printf("\n")
|
||||
// Iterate over each user in the val tree
|
||||
vals.Ascend(func(item btree.Item) bool {
|
||||
kvi := item.(*Item)
|
||||
fmt.Printf("%s %s\n", kvi.Key, kvi.Val)
|
||||
return true
|
||||
})
|
||||
}
|
||||
|
||||
// Should see the results
|
||||
/*
|
||||
user:1 Jane
|
||||
user:2 Andy
|
||||
user:3 Steve
|
||||
user:4 Andrea
|
||||
user:5 Janet
|
||||
user:6 Andy
|
||||
|
||||
user:4 Andrea
|
||||
user:2 Andy
|
||||
user:6 Andy
|
||||
user:1 Jane
|
||||
user:3 Steve
|
||||
*/
|
||||
```
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1 +1,4 @@
|
|||
language: go
|
||||
|
||||
go:
|
||||
- 1.15.x
|
||||
|
|
|
|||
|
|
@ -576,7 +576,7 @@ var config buntdb.Config
|
|||
if err := db.ReadConfig(&config); err != nil{
|
||||
log.Fatal(err)
|
||||
}
|
||||
if err := db.WriteConfig(config); err != nil{
|
||||
if err := db.SetConfig(config); err != nil{
|
||||
log.Fatal(err)
|
||||
}
|
||||
```
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
// Package buntdb implements a low-level in-memory key/value store in pure Go.
|
||||
// It persists to disk, is ACID compliant, and uses locking for multiple
|
||||
// readers and a single writer. Bunt is ideal for projects that need
|
||||
// a dependable database, and favor speed over data size.
|
||||
// readers and a single writer. Bunt is ideal for projects that need a
|
||||
// dependable database, and favor speed over data size.
|
||||
package buntdb
|
||||
|
||||
import (
|
||||
|
|
@ -122,10 +122,11 @@ type Config struct {
|
|||
// has been expired.
|
||||
OnExpired func(keys []string)
|
||||
|
||||
// OnExpiredSync will be called inside the same transaction that is performing
|
||||
// the deletion of expired items. If OnExpired is present then this callback
|
||||
// will not be called. If this callback is present, then the deletion of the
|
||||
// timeed-out item is the explicit responsibility of this callback.
|
||||
// OnExpiredSync will be called inside the same transaction that is
|
||||
// performing the deletion of expired items. If OnExpired is present then
|
||||
// this callback will not be called. If this callback is present, then the
|
||||
// deletion of the timeed-out item is the explicit responsibility of this
|
||||
// callback.
|
||||
OnExpiredSync func(key, value string, tx *Tx) error
|
||||
}
|
||||
|
||||
|
|
@ -142,8 +143,8 @@ const btreeDegrees = 64
|
|||
func Open(path string) (*DB, error) {
|
||||
db := &DB{}
|
||||
// initialize trees and indexes
|
||||
db.keys = btree.New(btreeDegrees, nil)
|
||||
db.exps = btree.New(btreeDegrees, &exctx{db})
|
||||
db.keys = btree.New(lessCtx(nil))
|
||||
db.exps = btree.New(lessCtx(&exctx{db}))
|
||||
db.idxs = make(map[string]*index)
|
||||
// initialize default configuration
|
||||
db.config = Config{
|
||||
|
|
@ -204,7 +205,7 @@ func (db *DB) Save(wr io.Writer) error {
|
|||
// use a buffered writer and flush every 4MB
|
||||
var buf []byte
|
||||
// iterated through every item in the database and write to the buffer
|
||||
db.keys.Ascend(func(item btree.Item) bool {
|
||||
btreeAscend(db.keys, func(item interface{}) bool {
|
||||
dbi := item.(*dbItem)
|
||||
buf = dbi.writeSetTo(buf)
|
||||
if len(buf) > 1024*1024*4 {
|
||||
|
|
@ -285,7 +286,7 @@ func (idx *index) clearCopy() *index {
|
|||
}
|
||||
// initialize with empty trees
|
||||
if nidx.less != nil {
|
||||
nidx.btr = btree.New(btreeDegrees, nidx)
|
||||
nidx.btr = btree.New(lessCtx(nidx))
|
||||
}
|
||||
if nidx.rect != nil {
|
||||
nidx.rtr = rtree.New(nidx)
|
||||
|
|
@ -297,20 +298,20 @@ func (idx *index) clearCopy() *index {
|
|||
func (idx *index) rebuild() {
|
||||
// initialize trees
|
||||
if idx.less != nil {
|
||||
idx.btr = btree.New(btreeDegrees, idx)
|
||||
idx.btr = btree.New(lessCtx(idx))
|
||||
}
|
||||
if idx.rect != nil {
|
||||
idx.rtr = rtree.New(idx)
|
||||
}
|
||||
// iterate through all keys and fill the index
|
||||
idx.db.keys.Ascend(func(item btree.Item) bool {
|
||||
btreeAscend(idx.db.keys, func(item interface{}) bool {
|
||||
dbi := item.(*dbItem)
|
||||
if !idx.match(dbi.key) {
|
||||
// does not match the pattern, conintue
|
||||
// does not match the pattern, continue
|
||||
return true
|
||||
}
|
||||
if idx.less != nil {
|
||||
idx.btr.ReplaceOrInsert(dbi)
|
||||
idx.btr.Set(dbi)
|
||||
}
|
||||
if idx.rect != nil {
|
||||
idx.rtr.Insert(dbi)
|
||||
|
|
@ -334,8 +335,6 @@ func (idx *index) rebuild() {
|
|||
// less function to handle the content format and comparison.
|
||||
// There are some default less function that can be used such as
|
||||
// IndexString, IndexBinary, etc.
|
||||
//
|
||||
// Deprecated: Use Transactions
|
||||
func (db *DB) CreateIndex(name, pattern string,
|
||||
less ...func(a, b string) bool) error {
|
||||
return db.Update(func(tx *Tx) error {
|
||||
|
|
@ -347,8 +346,6 @@ func (db *DB) CreateIndex(name, pattern string,
|
|||
// The items are ordered in an b-tree and can be retrieved using the
|
||||
// Ascend* and Descend* methods.
|
||||
// If a previous index with the same name exists, that index will be deleted.
|
||||
//
|
||||
// Deprecated: Use Transactions
|
||||
func (db *DB) ReplaceIndex(name, pattern string,
|
||||
less ...func(a, b string) bool) error {
|
||||
return db.Update(func(tx *Tx) error {
|
||||
|
|
@ -381,8 +378,6 @@ func (db *DB) ReplaceIndex(name, pattern string,
|
|||
// Thus min[0] must be less-than-or-equal-to max[0].
|
||||
// The IndexRect is a default function that can be used for the rect
|
||||
// parameter.
|
||||
//
|
||||
// Deprecated: Use Transactions
|
||||
func (db *DB) CreateSpatialIndex(name, pattern string,
|
||||
rect func(item string) (min, max []float64)) error {
|
||||
return db.Update(func(tx *Tx) error {
|
||||
|
|
@ -394,8 +389,6 @@ func (db *DB) CreateSpatialIndex(name, pattern string,
|
|||
// The items are organized in an r-tree and can be retrieved using the
|
||||
// Intersects method.
|
||||
// If a previous index with the same name exists, that index will be deleted.
|
||||
//
|
||||
// Deprecated: Use Transactions
|
||||
func (db *DB) ReplaceSpatialIndex(name, pattern string,
|
||||
rect func(item string) (min, max []float64)) error {
|
||||
return db.Update(func(tx *Tx) error {
|
||||
|
|
@ -415,8 +408,6 @@ func (db *DB) ReplaceSpatialIndex(name, pattern string,
|
|||
}
|
||||
|
||||
// DropIndex removes an index.
|
||||
//
|
||||
// Deprecated: Use Transactions
|
||||
func (db *DB) DropIndex(name string) error {
|
||||
return db.Update(func(tx *Tx) error {
|
||||
return tx.DropIndex(name)
|
||||
|
|
@ -424,8 +415,6 @@ func (db *DB) DropIndex(name string) error {
|
|||
}
|
||||
|
||||
// Indexes returns a list of index names.
|
||||
//
|
||||
// Deprecated: Use Transactions
|
||||
func (db *DB) Indexes() ([]string, error) {
|
||||
var names []string
|
||||
var err = db.View(func(tx *Tx) error {
|
||||
|
|
@ -468,7 +457,7 @@ func (db *DB) SetConfig(config Config) error {
|
|||
// will be replaced with the new one, and return the previous item.
|
||||
func (db *DB) insertIntoDatabase(item *dbItem) *dbItem {
|
||||
var pdbi *dbItem
|
||||
prev := db.keys.ReplaceOrInsert(item)
|
||||
prev := db.keys.Set(item)
|
||||
if prev != nil {
|
||||
// A previous item was removed from the keys tree. Let's
|
||||
// fully delete this item from all indexes.
|
||||
|
|
@ -491,7 +480,7 @@ func (db *DB) insertIntoDatabase(item *dbItem) *dbItem {
|
|||
if item.opts != nil && item.opts.ex {
|
||||
// The new item has eviction options. Add it to the
|
||||
// expires tree
|
||||
db.exps.ReplaceOrInsert(item)
|
||||
db.exps.Set(item)
|
||||
}
|
||||
for _, idx := range db.idxs {
|
||||
if !idx.match(item.key) {
|
||||
|
|
@ -499,7 +488,7 @@ func (db *DB) insertIntoDatabase(item *dbItem) *dbItem {
|
|||
}
|
||||
if idx.btr != nil {
|
||||
// Add new item to btree index.
|
||||
idx.btr.ReplaceOrInsert(item)
|
||||
idx.btr.Set(item)
|
||||
}
|
||||
if idx.rtr != nil {
|
||||
// Add new item to rtree index.
|
||||
|
|
@ -569,9 +558,9 @@ func (db *DB) backgroundManager() {
|
|||
}
|
||||
}
|
||||
// produce a list of expired items that need removing
|
||||
db.exps.AscendLessThan(&dbItem{
|
||||
btreeAscendLessThan(db.exps, &dbItem{
|
||||
opts: &dbItemOpts{ex: true, exat: time.Now()},
|
||||
}, func(item btree.Item) bool {
|
||||
}, func(item interface{}) bool {
|
||||
expired = append(expired, item.(*dbItem))
|
||||
return true
|
||||
})
|
||||
|
|
@ -686,8 +675,8 @@ func (db *DB) Shrink() error {
|
|||
}
|
||||
done = true
|
||||
var n int
|
||||
db.keys.AscendGreaterOrEqual(&dbItem{key: pivot},
|
||||
func(item btree.Item) bool {
|
||||
btreeAscendGreaterOrEqual(db.keys, &dbItem{key: pivot},
|
||||
func(item interface{}) bool {
|
||||
dbi := item.(*dbItem)
|
||||
// 1000 items or 64MB buffer
|
||||
if n > 1000 || len(buf) > 64*1024*1024 {
|
||||
|
|
@ -861,7 +850,7 @@ func (db *DB) readLoad(rd io.Reader, modTime time.Time) error {
|
|||
if len(parts) == 0 {
|
||||
continue
|
||||
}
|
||||
if (parts[0][0] == 's' || parts[0][1] == 'S') &&
|
||||
if (parts[0][0] == 's' || parts[0][0] == 'S') &&
|
||||
(parts[0][1] == 'e' || parts[0][1] == 'E') &&
|
||||
(parts[0][2] == 't' || parts[0][2] == 'T') {
|
||||
// SET
|
||||
|
|
@ -891,7 +880,7 @@ func (db *DB) readLoad(rd io.Reader, modTime time.Time) error {
|
|||
} else {
|
||||
db.insertIntoDatabase(&dbItem{key: parts[1], val: parts[2]})
|
||||
}
|
||||
} else if (parts[0][0] == 'd' || parts[0][1] == 'D') &&
|
||||
} else if (parts[0][0] == 'd' || parts[0][0] == 'D') &&
|
||||
(parts[0][1] == 'e' || parts[0][1] == 'E') &&
|
||||
(parts[0][2] == 'l' || parts[0][2] == 'L') {
|
||||
// DEL
|
||||
|
|
@ -899,10 +888,10 @@ func (db *DB) readLoad(rd io.Reader, modTime time.Time) error {
|
|||
return ErrInvalid
|
||||
}
|
||||
db.deleteFromDatabase(&dbItem{key: parts[1]})
|
||||
} else if (parts[0][0] == 'f' || parts[0][1] == 'F') &&
|
||||
} else if (parts[0][0] == 'f' || parts[0][0] == 'F') &&
|
||||
strings.ToLower(parts[0]) == "flushdb" {
|
||||
db.keys = btree.New(btreeDegrees, nil)
|
||||
db.exps = btree.New(btreeDegrees, &exctx{db})
|
||||
db.keys = btree.New(lessCtx(nil))
|
||||
db.exps = btree.New(lessCtx(&exctx{db}))
|
||||
db.idxs = make(map[string]*index)
|
||||
} else {
|
||||
return ErrInvalid
|
||||
|
|
@ -1037,8 +1026,8 @@ func (tx *Tx) DeleteAll() error {
|
|||
}
|
||||
|
||||
// now reset the live database trees
|
||||
tx.db.keys = btree.New(btreeDegrees, nil)
|
||||
tx.db.exps = btree.New(btreeDegrees, &exctx{tx.db})
|
||||
tx.db.keys = btree.New(lessCtx(nil))
|
||||
tx.db.exps = btree.New(lessCtx(&exctx{tx.db}))
|
||||
tx.db.idxs = make(map[string]*index)
|
||||
|
||||
// finally re-create the indexes
|
||||
|
|
@ -1276,8 +1265,7 @@ func (dbi *dbItem) expiresAt() time.Time {
|
|||
// to note that the ctx parameter is used to help with determine which
|
||||
// formula to use on an item. Each b-tree should use a different ctx when
|
||||
// sharing the same item.
|
||||
func (dbi *dbItem) Less(item btree.Item, ctx interface{}) bool {
|
||||
dbi2 := item.(*dbItem)
|
||||
func (dbi *dbItem) Less(dbi2 *dbItem, ctx interface{}) bool {
|
||||
switch ctx := ctx.(type) {
|
||||
case *exctx:
|
||||
// The expires b-tree formula
|
||||
|
|
@ -1307,6 +1295,12 @@ func (dbi *dbItem) Less(item btree.Item, ctx interface{}) bool {
|
|||
return dbi.key < dbi2.key
|
||||
}
|
||||
|
||||
func lessCtx(ctx interface{}) func(a, b interface{}) bool {
|
||||
return func(a, b interface{}) bool {
|
||||
return a.(*dbItem).Less(b.(*dbItem), ctx)
|
||||
}
|
||||
}
|
||||
|
||||
// Rect converts a string to a rectangle.
|
||||
// An invalid rectangle will cause a panic.
|
||||
func (dbi *dbItem) Rect(ctx interface{}) (min, max []float64) {
|
||||
|
|
@ -1510,7 +1504,7 @@ func (tx *Tx) scan(desc, gt, lt bool, index, start, stop string,
|
|||
return ErrTxClosed
|
||||
}
|
||||
// wrap a btree specific iterator around the user-defined iterator.
|
||||
iter := func(item btree.Item) bool {
|
||||
iter := func(item interface{}) bool {
|
||||
dbi := item.(*dbItem)
|
||||
return iterator(dbi.key, dbi.val)
|
||||
}
|
||||
|
|
@ -1554,26 +1548,26 @@ func (tx *Tx) scan(desc, gt, lt bool, index, start, stop string,
|
|||
if desc {
|
||||
if gt {
|
||||
if lt {
|
||||
tr.DescendRange(itemA, itemB, iter)
|
||||
btreeDescendRange(tr, itemA, itemB, iter)
|
||||
} else {
|
||||
tr.DescendGreaterThan(itemA, iter)
|
||||
btreeDescendGreaterThan(tr, itemA, iter)
|
||||
}
|
||||
} else if lt {
|
||||
tr.DescendLessOrEqual(itemA, iter)
|
||||
btreeDescendLessOrEqual(tr, itemA, iter)
|
||||
} else {
|
||||
tr.Descend(iter)
|
||||
btreeDescend(tr, iter)
|
||||
}
|
||||
} else {
|
||||
if gt {
|
||||
if lt {
|
||||
tr.AscendRange(itemA, itemB, iter)
|
||||
btreeAscendRange(tr, itemA, itemB, iter)
|
||||
} else {
|
||||
tr.AscendGreaterOrEqual(itemA, iter)
|
||||
btreeAscendGreaterOrEqual(tr, itemA, iter)
|
||||
}
|
||||
} else if lt {
|
||||
tr.AscendLessThan(itemA, iter)
|
||||
btreeAscendLessThan(tr, itemA, iter)
|
||||
} else {
|
||||
tr.Ascend(iter)
|
||||
btreeAscend(tr, iter)
|
||||
}
|
||||
}
|
||||
return nil
|
||||
|
|
@ -2026,7 +2020,8 @@ func (tx *Tx) createIndex(name string, pattern string,
|
|||
if tx.wc.rbkeys == nil {
|
||||
// store the index in the rollback map.
|
||||
if _, ok := tx.wc.rollbackIndexes[name]; !ok {
|
||||
// we use nil to indicate that the index should be removed upon rollback.
|
||||
// we use nil to indicate that the index should be removed upon
|
||||
// rollback.
|
||||
tx.wc.rollbackIndexes[name] = nil
|
||||
}
|
||||
}
|
||||
|
|
@ -2056,8 +2051,8 @@ func (tx *Tx) DropIndex(name string) error {
|
|||
if tx.wc.rbkeys == nil {
|
||||
// store the index in the rollback map.
|
||||
if _, ok := tx.wc.rollbackIndexes[name]; !ok {
|
||||
// we use a non-nil copy of the index without the data to indicate that the
|
||||
// index should be rebuilt upon rollback.
|
||||
// we use a non-nil copy of the index without the data to indicate
|
||||
// that the index should be rebuilt upon rollback.
|
||||
tx.wc.rollbackIndexes[name] = idx.clearCopy()
|
||||
}
|
||||
}
|
||||
|
|
@ -2193,3 +2188,67 @@ func IndexJSONCaseSensitive(path string) func(a, b string) bool {
|
|||
func Desc(less func(a, b string) bool) func(a, b string) bool {
|
||||
return func(a, b string) bool { return less(b, a) }
|
||||
}
|
||||
|
||||
//// Wrappers around btree Ascend/Descend
|
||||
|
||||
func bLT(tr *btree.BTree, a, b interface{}) bool { return tr.Less(a, b) }
|
||||
func bGT(tr *btree.BTree, a, b interface{}) bool { return tr.Less(b, a) }
|
||||
|
||||
// func bLTE(tr *btree.BTree, a, b interface{}) bool { return !tr.Less(b, a) }
|
||||
// func bGTE(tr *btree.BTree, a, b interface{}) bool { return !tr.Less(a, b) }
|
||||
|
||||
// Ascend
|
||||
|
||||
func btreeAscend(tr *btree.BTree, iter func(item interface{}) bool) {
|
||||
tr.Ascend(nil, iter)
|
||||
}
|
||||
|
||||
func btreeAscendLessThan(tr *btree.BTree, pivot interface{},
|
||||
iter func(item interface{}) bool,
|
||||
) {
|
||||
tr.Ascend(nil, func(item interface{}) bool {
|
||||
return bLT(tr, item, pivot) && iter(item)
|
||||
})
|
||||
}
|
||||
|
||||
func btreeAscendGreaterOrEqual(tr *btree.BTree, pivot interface{},
|
||||
iter func(item interface{}) bool,
|
||||
) {
|
||||
tr.Ascend(pivot, iter)
|
||||
}
|
||||
|
||||
func btreeAscendRange(tr *btree.BTree, greaterOrEqual, lessThan interface{},
|
||||
iter func(item interface{}) bool,
|
||||
) {
|
||||
tr.Ascend(greaterOrEqual, func(item interface{}) bool {
|
||||
return bLT(tr, item, lessThan) && iter(item)
|
||||
})
|
||||
}
|
||||
|
||||
// Descend
|
||||
|
||||
func btreeDescend(tr *btree.BTree, iter func(item interface{}) bool) {
|
||||
tr.Descend(nil, iter)
|
||||
}
|
||||
|
||||
func btreeDescendGreaterThan(tr *btree.BTree, pivot interface{},
|
||||
iter func(item interface{}) bool,
|
||||
) {
|
||||
tr.Descend(nil, func(item interface{}) bool {
|
||||
return bGT(tr, item, pivot) && iter(item)
|
||||
})
|
||||
}
|
||||
|
||||
func btreeDescendRange(tr *btree.BTree, lessOrEqual, greaterThan interface{},
|
||||
iter func(item interface{}) bool,
|
||||
) {
|
||||
tr.Descend(lessOrEqual, func(item interface{}) bool {
|
||||
return bGT(tr, item, greaterThan) && iter(item)
|
||||
})
|
||||
}
|
||||
|
||||
func btreeDescendLessOrEqual(tr *btree.BTree, pivot interface{},
|
||||
iter func(item interface{}) bool,
|
||||
) {
|
||||
tr.Descend(pivot, iter)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -0,0 +1,12 @@
|
|||
module github.com/tidwall/buntdb
|
||||
|
||||
go 1.15
|
||||
|
||||
require (
|
||||
github.com/tidwall/btree v0.2.2
|
||||
github.com/tidwall/gjson v1.6.1
|
||||
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb
|
||||
github.com/tidwall/match v1.0.1
|
||||
github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8
|
||||
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 // indirect
|
||||
)
|
||||
|
|
@ -0,0 +1,14 @@
|
|||
github.com/tidwall/btree v0.2.2 h1:VVo0JW/tdidNdQzNsDR4wMbL3heaxA1DGleyzQ3/niY=
|
||||
github.com/tidwall/btree v0.2.2/go.mod h1:huei1BkDWJ3/sLXmO+bsCNELL+Bp2Kks9OLyQFkzvA8=
|
||||
github.com/tidwall/gjson v1.6.1 h1:LRbvNuNuvAiISWg6gxLEFuCe72UKy5hDqhxW/8183ws=
|
||||
github.com/tidwall/gjson v1.6.1/go.mod h1:BaHyNc5bjzYkPqgLq7mdVzeiRtULKULXLgZFKsxEHI0=
|
||||
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb h1:5NSYaAdrnblKByzd7XByQEJVT8+9v0W/tIY0Oo4OwrE=
|
||||
github.com/tidwall/grect v0.0.0-20161006141115-ba9a043346eb/go.mod h1:lKYYLFIr9OIgdgrtgkZ9zgRxRdvPYsExnYBsEAd8W5M=
|
||||
github.com/tidwall/match v1.0.1 h1:PnKP62LPNxHKTwvHHZZzdOAOCtsJTjo6dZLCwpKm5xc=
|
||||
github.com/tidwall/match v1.0.1/go.mod h1:LujAq0jyVjBy028G1WhWfIzbpQfMO8bBZ6Tyb0+pL9E=
|
||||
github.com/tidwall/pretty v1.0.2 h1:Z7S3cePv9Jwm1KwS0513MRaoUe3S01WPbLNV40pwWZU=
|
||||
github.com/tidwall/pretty v1.0.2/go.mod h1:XNkn88O1ChpSDQmQeStsy+sBenx6DDtFZJxhVysOjyk=
|
||||
github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8 h1:BsKSRhu0TDB6Snq8SutN9KQHc6vqHEXJTcAFwyGNius=
|
||||
github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8/go.mod h1:/h+UnNGt0IhNNJLkGikcdcJqm66zGD/uJGMRxK/9+Ao=
|
||||
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563 h1:Otn9S136ELckZ3KKDyCkxapfufrqDqwmGjcHfAyXRrE=
|
||||
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ=
|
||||
|
|
@ -183,6 +183,7 @@ type treeItem struct {
|
|||
item interface{}
|
||||
}
|
||||
|
||||
//go:nocheckptr
|
||||
func (item *treeItem) unsafeNode() *treeNode {
|
||||
return (*treeNode)(unsafe.Pointer(item))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package tinybtree
|
||||
|
||||
const maxItems = 31 // use an odd number
|
||||
const maxItems = 255
|
||||
const minItems = maxItems * 40 / 100
|
||||
|
||||
type item struct {
|
||||
|
|
@ -23,19 +23,24 @@ type BTree struct {
|
|||
}
|
||||
|
||||
func (n *node) find(key string) (index int, found bool) {
|
||||
i, j := 0, n.numItems
|
||||
for i < j {
|
||||
h := i + (j-i)/2
|
||||
if key >= n.items[h].key {
|
||||
i = h + 1
|
||||
low := 0
|
||||
high := n.numItems - 1
|
||||
for low <= high {
|
||||
mid := low + ((high+1)-low)/2
|
||||
if key >= n.items[mid].key {
|
||||
low = mid + 1
|
||||
} else {
|
||||
j = h
|
||||
high = mid - 1
|
||||
}
|
||||
}
|
||||
if i > 0 && n.items[i-1].key >= key {
|
||||
return i - 1, true
|
||||
if low > 0 && n.items[low-1].key == key {
|
||||
index = low - 1
|
||||
found = true
|
||||
} else {
|
||||
index = low
|
||||
found = false
|
||||
}
|
||||
return i, false
|
||||
return index, found
|
||||
}
|
||||
|
||||
// Set or replace a value for a key
|
||||
|
|
|
|||
|
|
@ -92,9 +92,9 @@ github.com/pierrec/lz4/internal/xxh32
|
|||
github.com/rcrowley/go-metrics
|
||||
# github.com/streadway/amqp v1.0.0
|
||||
github.com/streadway/amqp
|
||||
# github.com/tidwall/btree v0.0.0-20191029221954-400434d76274
|
||||
# github.com/tidwall/btree v0.2.2
|
||||
github.com/tidwall/btree
|
||||
# github.com/tidwall/buntdb v1.1.0
|
||||
# github.com/tidwall/buntdb v1.1.4
|
||||
github.com/tidwall/buntdb
|
||||
# github.com/tidwall/geoindex v1.1.0
|
||||
github.com/tidwall/geoindex
|
||||
|
|
@ -121,12 +121,12 @@ github.com/tidwall/redcon
|
|||
github.com/tidwall/resp
|
||||
# github.com/tidwall/rhh v1.1.0
|
||||
github.com/tidwall/rhh
|
||||
# github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e
|
||||
# github.com/tidwall/rtree v0.0.0-20201027154624-32188eeb08a8
|
||||
github.com/tidwall/rtree
|
||||
github.com/tidwall/rtree/base
|
||||
# github.com/tidwall/sjson v1.1.1
|
||||
github.com/tidwall/sjson
|
||||
# github.com/tidwall/tinybtree v0.0.0-20181217131827-de5932d649b5
|
||||
# github.com/tidwall/tinybtree v1.0.1
|
||||
github.com/tidwall/tinybtree
|
||||
# github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563
|
||||
github.com/tidwall/tinyqueue
|
||||
|
|
|
|||
Loading…
Reference in New Issue