From 50cbb72619271fcf4d22f4ea9087a937e3035b94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kuba=20Podg=C3=B3rski?= <kuba--@users.noreply.github.com>
Date: Thu, 25 Feb 2021 19:00:52 +0100
Subject: [PATCH] Remove comments/leftovers

---
 etcd/embed.go | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/etcd/embed.go b/etcd/embed.go
index 1079bf6bb..06c081e74 100644
--- a/etcd/embed.go
+++ b/etcd/embed.go
@@ -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 {