scriptoriumadmin/featurebase
1
0
Fork 0
mirror of https://github.com/featurebasedb/featurebase.git synced 2026-10-06 10:57:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove comments/leftovers

Browse source
This commit is contained in:
Kuba Podgórski 2021-02-25 19:00:52 +01:00
parent 49dc48f057
commit 50cbb72619
1 changed files with 4 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
etcd/embed.go
View file

@ -242,7 +242,6 @@ func (e *Etcd) NodeState(ctx context.Context, peerID string) (disco.NodeState, e
}
func (e *Etcd) nodeState(ctx context.Context, peerID string) (disco.NodeState, error) {
// resp, err := e.cli.Get(ctx, path.Join(resizePrefix, peerID), clientv3.WithCountOnly())
kv := e.e.Server.KV()
resp, err := kv.Range([]byte(path.Join(resizePrefix, peerID)), nil, mvcc.RangeOptions{Count: true})
if err != nil {
@ -252,7 +251,6 @@ func (e *Etcd) nodeState(ctx context.Context, peerID string) (disco.NodeState, e
return disco.NodeStateResizing, nil
}
// resp, err = e.cli.Get(ctx, path.Join(heartbeatPrefix, peerID))
resp, err = kv.Range([]byte(path.Join(heartbeatPrefix, peerID)), nil, mvcc.RangeOptions{})
if err != nil {
return disco.NodeStateUnknown, err
@ -447,7 +445,7 @@ func (e *Etcd) DeleteNode(ctx context.Context, nodeID string) error {
}
func (e *Etcd) Schema(ctx context.Context) (disco.Schema, error) {
keys, vals, err := e.getKey(ctx, schemaPrefix)
keys, vals, err := e.getKeyWithPrefix(ctx, schemaPrefix)
if err != nil {
return nil, err
}
@ -502,7 +500,6 @@ func (e *Etcd) Schema(ctx context.Context) (disco.Schema, error) {
}
func (e *Etcd) Metadata(ctx context.Context, peerID string) ([]byte, error) {
// resp, err := e.cli.Get(ctx, path.Join(metadataPrefix, peerID))
kv := e.e.Server.KV()
resp, err := kv.Range([]byte(path.Join(metadataPrefix, peerID)), nil, mvcc.RangeOptions{})
if err != nil {
@ -651,7 +648,6 @@ func (e *Etcd) putKey(ctx context.Context, key, val string, opts ...clientv3.OpO
func (e *Etcd) getKeyBytes(ctx context.Context, key string) ([]byte, error) {
// Get the current value for the key.
// resp, err := e.cli.Get(ctx, key)
kv := e.e.Server.KV()
resp, err := kv.Range([]byte(key), nil, mvcc.RangeOptions{})
if err != nil {
@ -667,30 +663,12 @@ func (e *Etcd) getKeyBytes(ctx context.Context, key string) ([]byte, error) {
return kvs[0].Value, nil
}
func (e *Etcd) getKey(ctx context.Context, key string) ([]string, [][]byte, error) {
getPrefix := func(key []byte) []byte {
end := make([]byte, len(key))
copy(end, key)
for i := len(end) - 1; i >= 0; i-- {
if end[i] < 0xff {
end[i] = end[i] + 1
end = end[:i+1]
return end
}
}
// next prefix does not exist (e.g., 0xffff);
// default to WithFromKey policy
return nil
}
kv := e.e.Server.KV()
resp, err := kv.Range([]byte(key), getPrefix([]byte(key)), mvcc.RangeOptions{})
// resp, err := e.cli.Get(ctx, key, clientv3.WithPrefix())
func (e *Etcd) getKeyWithPrefix(ctx context.Context, key string) ([]string, [][]byte, error) {
resp, err := e.cli.Get(ctx, key, clientv3.WithPrefix())
if err != nil {
return nil, nil, err
}
kvs := resp.KVs
kvs := resp.Kvs
var (
keys []string
@ -706,7 +684,6 @@ func (e *Etcd) getKey(ctx context.Context, key string) ([]string, [][]byte, erro
}
func (e *Etcd) keyExists(ctx context.Context, key string) (bool, error) {
// resp, err := e.cli.Get(ctx, key, clientv3.WithCountOnly())
kv := e.e.Server.KV()
resp, err := kv.Range([]byte(key), nil, mvcc.RangeOptions{Count: true})
if err != nil {