From 2738c922864edabfc3237511eb0364640f1cf10d Mon Sep 17 00:00:00 2001
From: Matt Jaffee <jaffee@MacBook-Pro.local>
Date: Sun, 6 May 2018 20:30:58 -0700
Subject: [PATCH] stop passing uri via context to InternalClient.ExecuteQuery

---
 client.go      | 14 ++++++++++----
 client_test.go |  8 ++++----
 ctl/bench.go   |  2 +-
 executor.go    |  3 +--
 fragment.go    |  2 +-
 5 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/client.go b/client.go
index ecfae5801..8950e8406 100644
--- a/client.go
+++ b/client.go
@@ -223,8 +223,13 @@ func (c *InternalHTTPClient) FragmentNodes(ctx context.Context, index string, sl
 	return a, nil
 }
 
-// ExecuteQuery executes query against index on the server.
-func (c *InternalHTTPClient) ExecuteQuery(ctx context.Context, index string, queryRequest *internal.QueryRequest) (*internal.QueryResponse, error) {
+// QueryNode executes query against the index.
+func (c *InternalHTTPClient) Query(ctx context.Context, index string, queryRequest *internal.QueryRequest) (*internal.QueryResponse, error) {
+	return c.QueryNode(ctx, c.defaultURI, index, queryRequest)
+}
+
+// QueryNode executes query against the index, sending the request to the node specified.
+func (c *InternalHTTPClient) QueryNode(ctx context.Context, uri *URI, index string, queryRequest *internal.QueryRequest) (*internal.QueryResponse, error) {
 	if index == "" {
 		return nil, ErrIndexRequired
 	} else if queryRequest.Query == "" {
@@ -238,7 +243,7 @@ func (c *InternalHTTPClient) ExecuteQuery(ctx context.Context, index string, que
 	}
 
 	// Create HTTP request.
-	u := c.clientURI(ctx).Path(fmt.Sprintf("/index/%s/query", index))
+	u := uri.Path(fmt.Sprintf("/index/%s/query", index))
 	req, err := http.NewRequest("POST", u, bytes.NewReader(buf))
 	if err != nil {
 		return nil, err
@@ -1320,7 +1325,8 @@ type InternalClient interface {
 	Schema(ctx context.Context) ([]*IndexInfo, error)
 	CreateIndex(ctx context.Context, index string, opt IndexOptions) error
 	FragmentNodes(ctx context.Context, index string, slice uint64) ([]*Node, error)
-	ExecuteQuery(ctx context.Context, index string, queryRequest *internal.QueryRequest) (*internal.QueryResponse, error)
+	Query(ctx context.Context, index string, queryRequest *internal.QueryRequest) (*internal.QueryResponse, error)
+	QueryNode(ctx context.Context, uri *URI, index string, queryRequest *internal.QueryRequest) (*internal.QueryResponse, error)
 	Import(ctx context.Context, index, frame string, slice uint64, bits []Bit) error
 	ImportK(ctx context.Context, index, frame string, bits []Bit) error
 	EnsureIndex(ctx context.Context, name string, options IndexOptions) error
diff --git a/client_test.go b/client_test.go
index be3505acd..88dc3accb 100644
--- a/client_test.go
+++ b/client_test.go
@@ -150,7 +150,7 @@ func TestClient_MultiNode(t *testing.T) {
 		Query:  fmt.Sprintf(`TopN(frame="%s", n=%d)`, "f", topN),
 		Remote: false,
 	}
-	result, err := client[0].ExecuteQuery(context.Background(), "i", queryRequest)
+	result, err := client[0].Query(context.Background(), "i", queryRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -168,7 +168,7 @@ func TestClient_MultiNode(t *testing.T) {
 	hldr[1].Index("i").SetRemoteMaxSlice(maxSlice)
 	hldr[2].Index("i").SetRemoteMaxSlice(maxSlice)
 
-	result, err = client[0].ExecuteQuery(context.Background(), "i", queryRequest)
+	result, err = client[0].Query(context.Background(), "i", queryRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -188,11 +188,11 @@ func TestClient_MultiNode(t *testing.T) {
 		t.Fatalf("Invalid TopN result set: %s", spew.Sdump(result))
 	}
 
-	result1, err := client[1].ExecuteQuery(context.Background(), "i", queryRequest)
+	result1, err := client[1].Query(context.Background(), "i", queryRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
-	result2, err := client[2].ExecuteQuery(context.Background(), "i", queryRequest)
+	result2, err := client[2].Query(context.Background(), "i", queryRequest)
 	if err != nil {
 		t.Fatal(err)
 	}
diff --git a/ctl/bench.go b/ctl/bench.go
index 9e37fb704..b9743bb5e 100644
--- a/ctl/bench.go
+++ b/ctl/bench.go
@@ -95,7 +95,7 @@ func (cmd *BenchCommand) runSetBit(ctx context.Context, client pilosa.InternalCl
 			Query:  fmt.Sprintf(`SetBit(id=%d, frame="%s", columnID=%d)`, rowID, cmd.Frame, columnID),
 			Remote: false,
 		}
-		if _, err := client.ExecuteQuery(ctx, cmd.Index, queryRequest); err != nil {
+		if _, err := client.Query(ctx, cmd.Index, queryRequest); err != nil {
 			return err
 		}
 	}
diff --git a/executor.go b/executor.go
index 62bc0e8c8..59e40511d 100644
--- a/executor.go
+++ b/executor.go
@@ -1490,8 +1490,7 @@ func (e *Executor) remoteExec(ctx context.Context, node *Node, index string, q *
 		Remote: true,
 	}
 
-	ctx = context.WithValue(ctx, "uri", node.URI)
-	pb, err := e.client.ExecuteQuery(ctx, index, pbreq)
+	pb, err := e.client.QueryNode(ctx, &node.URI, index, pbreq)
 	if err != nil {
 		return nil, err
 	}
diff --git a/fragment.go b/fragment.go
index 448ba3202..7168f4443 100644
--- a/fragment.go
+++ b/fragment.go
@@ -1924,7 +1924,7 @@ func (s *FragmentSyncer) syncBlock(id int) error {
 				Query:  buffers[k].String(),
 				Remote: true,
 			}
-			_, err := clients[i].ExecuteQuery(context.Background(), f.Index(), queryRequest)
+			_, err := clients[i].Query(context.Background(), f.Index(), queryRequest)
 			if err != nil {
 				return err
 			}