From 3e4f7dd3f3abaeb653a6470646c8965dee2b62ca Mon Sep 17 00:00:00 2001 From: Travis Date: Thu, 5 Mar 2020 15:38:34 -0600 Subject: [PATCH] change translateFieldKeys to variadic function --- api.go | 4 ++-- cluster.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/api.go b/api.go index 1fbafb36f..08750eb90 100644 --- a/api.go +++ b/api.go @@ -966,7 +966,7 @@ func (api *API) Import(ctx context.Context, req *ImportRequest, opts ...ImportOp if len(req.RowIDs) != 0 { return errors.New("row ids cannot be used because field uses string keys") } - if req.RowIDs, err = api.cluster.translateFieldKeys(ctx, field, req.RowKeys); err != nil { + if req.RowIDs, err = api.cluster.translateFieldKeys(ctx, field, req.RowKeys...); err != nil { return errors.Wrapf(err, "translating field keys") } } @@ -1479,7 +1479,7 @@ func (api *API) TranslateKeys(ctx context.Context, r io.Reader) (_ []byte, err e if err != nil { return nil, err } - } else if ids, err = api.cluster.translateFieldKeys(ctx, field, req.Keys); err != nil { + } else if ids, err = api.cluster.translateFieldKeys(ctx, field, req.Keys...); err != nil { return nil, errors.Wrapf(err, "translating field keys") } } diff --git a/cluster.go b/cluster.go index 86b8fc6aa..863093ef8 100644 --- a/cluster.go +++ b/cluster.go @@ -2087,7 +2087,7 @@ func (c *cluster) setStatic(hosts []string) error { // translateFieldKey gets a single key from translateFieldKeys. func (c *cluster) translateFieldKey(ctx context.Context, field *Field, key string) (uint64, error) { - ids, err := c.translateFieldKeys(ctx, field, []string{key}) + ids, err := c.translateFieldKeys(ctx, field, key) if err != nil { return 0, err } else if len(ids) == 0 { @@ -2102,7 +2102,7 @@ func (c *cluster) translateFieldKey(ctx context.Context, field *Field, key strin // is read-only (i.e. it's not the primary translate // store), then this method will forward the translation // request to the coordinator. -func (c *cluster) translateFieldKeys(ctx context.Context, field *Field, keys []string) ([]uint64, error) { +func (c *cluster) translateFieldKeys(ctx context.Context, field *Field, keys ...string) ([]uint64, error) { ids, err := field.TranslateStore().TranslateKeys(keys) // If we get a "read only" error, then forward the request // to the coordinator.