Influxdata
/
influxdb
mirror of https://github.com/influxdata/influxdb.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(kv): update user and variables to use forward cursor (#16671)

pull/16705/head
Lyon Hill 2020-02-03 08:50:06 -07:00 committed by GitHub
parent f385d19713
commit 8bd6044398
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kv/user.go
View File

@ -293,12 +293,12 @@ func (s *Service) forEachUser(ctx context.Context, tx Tx, fn func(*influxdb.User
return err
}
cur, err := b.Cursor()
cur, err := b.ForwardCursor(nil)
if err != nil {
return ErrInternalUserServiceError(err)
}
for k, v := cur.First(); k != nil; k, v = cur.Next() {
for k, v := cur.Next(); k != nil; k, v = cur.Next() {
u, err := UnmarshalUser(v)
if err != nil {
return err

14
kv/variable.go
View File

@ -1,7 +1,6 @@
package kv
import (
"bytes"
"context"
"encoding/json"
"strings"
@ -52,19 +51,18 @@ func (s *Service) findOrganizationVariables(ctx context.Context, tx Tx, orgID in
return nil, err
}
// TODO(leodido): support find options
cur, err := idx.Cursor()
if err != nil {
return nil, err
}
prefix, err := orgID.Encode()
if err != nil {
return nil, err
}
cur, err := idx.ForwardCursor(prefix, WithCursorPrefix(prefix))
if err != nil {
return nil, err
}
variables := []*influxdb.Variable{}
for k, _ := cur.Seek(prefix); bytes.HasPrefix(k, prefix); k, _ = cur.Next() {
for k, _ := cur.Next(); k != nil; k, _ = cur.Next() {
_, id, err := decodeVariableOrgsIndexKey(k)
if err != nil {
return nil, err