From 66650ec1f727fd48b425060dc13f488aacc0ab15 Mon Sep 17 00:00:00 2001 From: Yuce Tekol Date: Wed, 18 Oct 2017 17:38:20 +0300 Subject: [PATCH] NewExecutor doesn't return an error; renamed NewClient to NewInternalHTTPClient --- client.go | 4 ++-- client_test.go | 15 +++------------ ctl/common.go | 2 +- executor.go | 4 ++-- fragment.go | 4 ++-- holder.go | 4 ++-- holder_test.go | 5 +---- server.go | 5 +---- server/server_test.go | 6 +++--- test/client.go | 2 +- test/executor.go | 2 +- 11 files changed, 19 insertions(+), 34 deletions(-) diff --git a/client.go b/client.go index 8528e52dd..3c9ff0709 100644 --- a/client.go +++ b/client.go @@ -50,8 +50,8 @@ type InternalHTTPClient struct { HTTPClient *http.Client } -// NewClient returns a new instance of InternalHTTPClient to connect to host. -func NewClient(host string, options *ClientOptions) (*InternalHTTPClient, error) { +// NewInternalHTTPClient returns a new instance of InternalHTTPClient to connect to host. +func NewInternalHTTPClient(host string, options *ClientOptions) (*InternalHTTPClient, error) { if host == "" { return nil, ErrHostRequired } diff --git a/client_test.go b/client_test.go index 509039618..20f601fe7 100644 --- a/client_test.go +++ b/client_test.go @@ -54,10 +54,7 @@ func TestClient_MultiNode(t *testing.T) { } s[0].Handler.Executor.ExecuteFn = func(ctx context.Context, index string, query *pql.Query, slices []uint64, opt *pilosa.ExecOptions) ([]interface{}, error) { - e, err := pilosa.NewExecutor(nil) - if err != nil { - t.Fatal(err) - } + e := pilosa.NewExecutor(nil) e.Holder = hldr[0].Holder e.Scheme = cluster.Nodes[0].Scheme e.Host = cluster.Nodes[0].Host @@ -65,10 +62,7 @@ func TestClient_MultiNode(t *testing.T) { return e.Execute(ctx, index, query, slices, opt) } s[1].Handler.Executor.ExecuteFn = func(ctx context.Context, index string, query *pql.Query, slices []uint64, opt *pilosa.ExecOptions) ([]interface{}, error) { - e, err := pilosa.NewExecutor(nil) - if err != nil { - t.Fatal(err) - } + e := pilosa.NewExecutor(nil) e.Holder = hldr[1].Holder e.Scheme = cluster.Nodes[1].Scheme e.Host = cluster.Nodes[1].Host @@ -76,10 +70,7 @@ func TestClient_MultiNode(t *testing.T) { return e.Execute(ctx, index, query, slices, opt) } s[2].Handler.Executor.ExecuteFn = func(ctx context.Context, index string, query *pql.Query, slices []uint64, opt *pilosa.ExecOptions) ([]interface{}, error) { - e, err := pilosa.NewExecutor(nil) - if err != nil { - t.Fatal(err) - } + e := pilosa.NewExecutor(nil) e.Holder = hldr[2].Holder e.Scheme = cluster.Nodes[2].Scheme e.Host = cluster.Nodes[2].Host diff --git a/ctl/common.go b/ctl/common.go index 52b4e6e7e..dc64c0bee 100644 --- a/ctl/common.go +++ b/ctl/common.go @@ -34,7 +34,7 @@ func CommandClient(cmd CommandWithTLSSupport) (*pilosa.InternalHTTPClient, error } clientOptions = &pilosa.ClientOptions{TLS: TLSConfig} } - client, err := pilosa.NewClient(cmd.TLSHost(), clientOptions) + client, err := pilosa.NewInternalHTTPClient(cmd.TLSHost(), clientOptions) if err != nil { return nil, err } diff --git a/executor.go b/executor.go index 7aee4e472..6cb4aad0d 100644 --- a/executor.go +++ b/executor.go @@ -51,13 +51,13 @@ type Executor struct { } // NewExecutor returns a new instance of Executor. -func NewExecutor(clientOptions *ClientOptions) (*Executor, error) { +func NewExecutor(clientOptions *ClientOptions) *Executor { if clientOptions == nil { clientOptions = &ClientOptions{} } return &Executor{ client: NewClientFromURI(nil, clientOptions), - }, nil + } } // Execute executes a PQL query. diff --git a/fragment.go b/fragment.go index 148fd6a48..e5fbb7988 100644 --- a/fragment.go +++ b/fragment.go @@ -1714,7 +1714,7 @@ func (s *FragmentSyncer) SyncFragment() error { } // Retrieve remote blocks. - client, err := NewClient(node.Host, s.ClientOptions) + client, err := NewInternalHTTPClient(node.Host, s.ClientOptions) if err != nil { return err } @@ -1793,7 +1793,7 @@ func (s *FragmentSyncer) syncBlock(id int) error { return nil } - client, err := NewClient(node.Host, s.ClientOptions) + client, err := NewInternalHTTPClient(node.Host, s.ClientOptions) if err != nil { return err } diff --git a/holder.go b/holder.go index f3713faa2..f3b4247d0 100644 --- a/holder.go +++ b/holder.go @@ -515,7 +515,7 @@ func (s *HolderSyncer) syncIndex(index string) error { // Sync with every other host. for _, node := range Nodes(s.Cluster.Nodes).FilterHost(s.URI.HostPort()) { - client, err := NewClient(node.Host, s.ClientOptions) + client, err := NewInternalHTTPClient(node.Host, s.ClientOptions) if err != nil { return err } @@ -560,7 +560,7 @@ func (s *HolderSyncer) syncFrame(index, name string) error { // Sync with every other host. for _, node := range Nodes(s.Cluster.Nodes).FilterHost(s.URI.HostPort()) { - client, err := NewClient(node.Host, s.ClientOptions) + client, err := NewInternalHTTPClient(node.Host, s.ClientOptions) if err != nil { return err } diff --git a/holder_test.go b/holder_test.go index cb33045e6..104bd1bb0 100644 --- a/holder_test.go +++ b/holder_test.go @@ -314,10 +314,7 @@ func TestHolderSyncer_SyncHolder(t *testing.T) { defer s.Close() s.Handler.Holder = hldr1.Holder s.Handler.Executor.ExecuteFn = func(ctx context.Context, index string, query *pql.Query, slices []uint64, opt *pilosa.ExecOptions) ([]interface{}, error) { - e, err := pilosa.NewExecutor(nil) - if err != nil { - t.Fatal(err) - } + e := pilosa.NewExecutor(nil) e.Holder = hldr1.Holder e.Scheme = cluster.Nodes[1].Scheme e.Host = cluster.Nodes[1].Host diff --git a/server.go b/server.go index 3ce2883c3..7c255079e 100644 --- a/server.go +++ b/server.go @@ -164,10 +164,7 @@ func (s *Server) Open() error { s.createDefaultClient() // Create executor for executing queries. - e, err := NewExecutor(&ClientOptions{TLS: s.TLS}) - if err != nil { - return err - } + e := NewExecutor(&ClientOptions{TLS: s.TLS}) e.Holder = s.Holder e.Scheme = s.URI.Scheme() e.Host = s.URI.HostPort() diff --git a/server/server_test.go b/server/server_test.go index f03e3331b..484753a4b 100644 --- a/server/server_test.go +++ b/server/server_test.go @@ -53,7 +53,7 @@ func TestMain_Set_Quick(t *testing.T) { defer m.Close() // Create client. - client, err := pilosa.NewClient(m.Server.URI.HostPort(), nil) + client, err := pilosa.NewInternalHTTPClient(m.Server.URI.HostPort(), nil) if err != nil { t.Fatal(err) } @@ -326,7 +326,7 @@ func TestMain_FrameRestore(t *testing.T) { defer m2.Close() // Import from first cluster. - client, err := pilosa.NewClient(m2.Server.URI.HostPort(), nil) + client, err := pilosa.NewInternalHTTPClient(m2.Server.URI.HostPort(), nil) if err != nil { t.Fatal(err) } else if err := m2.Client().CreateIndex(context.Background(), "i", pilosa.IndexOptions{}); err != nil && err != pilosa.ErrIndexExists { @@ -697,7 +697,7 @@ func (m *Main) URL() string { return "http://" + m.Server.Addr().String() } // Client returns a client to connect to the program. func (m *Main) Client() *pilosa.InternalHTTPClient { - client, err := pilosa.NewClient(m.Server.URI.HostPort(), nil) + client, err := pilosa.NewInternalHTTPClient(m.Server.URI.HostPort(), nil) if err != nil { panic(err) } diff --git a/test/client.go b/test/client.go index d9044df66..4ea2fbbad 100644 --- a/test/client.go +++ b/test/client.go @@ -11,7 +11,7 @@ type Client struct { // MustNewClient returns a new instance of Client. Panic on error. func MustNewClient(host string) *Client { - c, err := pilosa.NewClient(host, nil) + c, err := pilosa.NewInternalHTTPClient(host, nil) if err != nil { panic(err) } diff --git a/test/executor.go b/test/executor.go index 4ef99d351..be370908d 100644 --- a/test/executor.go +++ b/test/executor.go @@ -15,7 +15,7 @@ type Executor struct { // NewExecutor returns a new instance of Executor. // The executor always matches the hostname of the first cluster node. func NewExecutor(holder *pilosa.Holder, cluster *pilosa.Cluster) *Executor { - executor, _ := pilosa.NewExecutor(nil) + executor := pilosa.NewExecutor(nil) e := &Executor{Executor: executor} e.Holder = holder e.Cluster = cluster