Remove stray KeepAlive, use new Close method to free RangeIterator resources
This commit is contained in:
parent
a031a12150
commit
fbb83a98db
|
@ -417,6 +417,7 @@ func (dl directoryLayer) subdirNames(rtr fdb.ReadTransaction, node subspace.Subs
|
|||
|
||||
rr := rtr.GetRange(sd, fdb.RangeOptions{})
|
||||
ri := rr.Iterator()
|
||||
defer ri.Close()
|
||||
|
||||
var ret []string
|
||||
|
||||
|
@ -442,6 +443,7 @@ func (dl directoryLayer) subdirNodes(tr fdb.Transaction, node subspace.Subspace)
|
|||
|
||||
rr := tr.GetRange(sd, fdb.RangeOptions{})
|
||||
ri := rr.Iterator()
|
||||
defer ri.Close()
|
||||
|
||||
var ret []subspace.Subspace
|
||||
|
||||
|
|
|
@ -246,6 +246,7 @@ func ExampleRangeIterator() {
|
|||
|
||||
rr := tr.GetRange(fdb.KeyRange{fdb.Key(""), fdb.Key{0xFF}}, fdb.RangeOptions{})
|
||||
ri := rr.Iterator()
|
||||
defer ri.Close()
|
||||
|
||||
// Advance will return true until the iterator is exhausted
|
||||
for ri.Advance() {
|
||||
|
|
|
@ -285,8 +285,6 @@ func stringRefToSlice(ptr unsafe.Pointer) []byte {
|
|||
}
|
||||
|
||||
func (f *futureKeyValueArray) Get() ([]KeyValue, bool, error) {
|
||||
defer runtime.KeepAlive(f.future)
|
||||
|
||||
f.BlockUntilReady()
|
||||
|
||||
var kvs *C.FDBKeyValue
|
||||
|
|
|
@ -140,6 +140,7 @@ func (rr RangeResult) GetSliceWithError() ([]KeyValue, error) {
|
|||
var ret []KeyValue
|
||||
|
||||
ri := rr.Iterator()
|
||||
defer ri.Close()
|
||||
|
||||
if rr.options.Limit != 0 {
|
||||
ri.options.Mode = StreamingModeExact
|
||||
|
|
Loading…
Reference in New Issue