Translation fixes, error checking.

Gopkg.lock

@@ -197,12 +197,6 @@
   revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
   version = "v0.8.0"
 
-[[projects]]
-  name = "github.com/rakyll/statik"
-  packages = ["fs"]
-  revision = "fd36b3595eb2ec8da4b8153b107f7ea08504899d"
-  version = "v0.1.1"
-
 [[projects]]
   name = "github.com/satori/go.uuid"
   packages = ["."]

executor.go

@@ -1593,6 +1593,9 @@ func (e *Executor) mapperLocal(ctx context.Context, slices []uint64, mapFn mapFu
 func (e *Executor) translateCall(index string, idx *Index, c *pql.Call) error {
 	// Translate column key.
 	if idx.Keys() {
+		if c.Args["col"] != nil && !isString(c.Args["col"]) {
+			return errors.New("'col' value must be a string when index 'keys' option enabled")
+		}
 		if value := callArgString(c, "col"); value != "" {
 			ids, err := e.TranslateStore.TranslateColumnsToUint64(index, []string{value})
 			if err != nil {
@@ -1600,12 +1603,19 @@ func (e *Executor) translateCall(index string, idx *Index, c *pql.Call) error {
 			}
 			c.Args["col"] = ids[0]
 		}
+	} else {
+		if isString(c.Args["col"]) {
+			return errors.New("string 'col' value not allowed unless index 'keys' option enabled")
+		}
 	}
 
 	// Translate row key, if field is specified & key exists.
 	if fieldName := callArgString(c, "field"); fieldName != "" {
 		field := idx.Field(fieldName)
 		if field.Keys() {
+			if c.Args["row"] != nil && !isString(c.Args["row"]) {
+				return errors.New("'row' value must be a string when field 'keys' option enabled")
+			}
 			if value := callArgString(c, "row"); value != "" {
 				ids, err := e.TranslateStore.TranslateRowsToUint64(index, fieldName, []string{value})
 				if err != nil {
@@ -1613,6 +1623,10 @@ func (e *Executor) translateCall(index string, idx *Index, c *pql.Call) error {
 				}
 				c.Args["row"] = ids[0]
 			}
+		} else {
+			if isString(c.Args["row"]) {
+				return errors.New("string 'row' value not allowed unless field 'keys' option enabled")
+			}
 		}
 	}
 
@@ -1782,3 +1796,8 @@ func callArgString(call *pql.Call, key string) string {
 	s, _ := value.(string)
 	return s
 }
+
+func isString(v interface{}) bool {
+	_, ok := v.(string)
+	return ok
+}

executor_test.go

@@ -265,35 +265,132 @@ func TestExecutor_Execute_Count(t *testing.T) {
 
 // Ensure a set query can be executed.
 func TestExecutor_Execute_SetBit(t *testing.T) {
-	hldr := test.MustOpenHolder()
-	defer hldr.Close()
+	t.Run("ID", func(t *testing.T) {
+		t.Run("OK", func(t *testing.T) {
+			hldr := test.MustOpenHolder()
+			defer hldr.Close()
 
-	// set a bit so the view gets created.
-	hldr.SetBit("i", "f", 1, 0)
+			// set a bit so the view gets created.
+			hldr.SetBit("i", "f", 1, 0)
 
-	e := test.NewExecutor(hldr.Holder, pilosa.NewTestCluster(1))
-	if n := hldr.Row("i", "f", 11).Count(); n != 0 {
-		t.Fatalf("unexpected bitmap count: %d", n)
-	}
+			e := test.NewExecutor(hldr.Holder, pilosa.NewTestCluster(1))
+			if n := hldr.Row("i", "f", 11).Count(); n != 0 {
+				t.Fatalf("unexpected bitmap count: %d", n)
+			}
 
-	if res, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(row=11, field=f, col=1)`), nil, nil); err != nil {
-		t.Fatal(err)
-	} else {
-		if !res[0].(bool) {
-			t.Fatalf("expected column changed")
-		}
-	}
+			if res, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(row=11, field=f, col=1)`), nil, nil); err != nil {
+				t.Fatal(err)
+			} else {
+				if !res[0].(bool) {
+					t.Fatalf("expected column changed")
+				}
+			}
 
-	if n := hldr.Row("i", "f", 11).Count(); n != 1 {
-		t.Fatalf("unexpected bitmap count: %d", n)
-	}
-	if res, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(row=11, field=f, col=1)`), nil, nil); err != nil {
-		t.Fatal(err)
-	} else {
-		if res[0].(bool) {
-			t.Fatalf("expected column unchanged")
-		}
-	}
+			if n := hldr.Row("i", "f", 11).Count(); n != 1 {
+				t.Fatalf("unexpected bitmap count: %d", n)
+			}
+			if res, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(row=11, field=f, col=1)`), nil, nil); err != nil {
+				t.Fatal(err)
+			} else {
+				if res[0].(bool) {
+					t.Fatalf("expected column unchanged")
+				}
+			}
+		})
+
+		t.Run("ErrInvalidColValueType", func(t *testing.T) {
+			hldr := test.MustOpenHolder()
+			defer hldr.Close()
+			index := hldr.MustCreateIndexIfNotExists("i", pilosa.IndexOptions{})
+			if _, err := index.CreateField("f", pilosa.FieldOptions{}); err != nil {
+				t.Fatal(err)
+			}
+
+			e := test.NewExecutor(hldr.Holder, test.NewCluster(1))
+			if _, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(field=f, row=1, col="foo")`), nil, nil); err == nil || err.Error() != `string 'col' value not allowed unless index 'keys' option enabled` {
+				t.Fatal(err)
+			}
+		})
+
+		t.Run("ErrInvalidRowValueType", func(t *testing.T) {
+			hldr := test.MustOpenHolder()
+			defer hldr.Close()
+			index := hldr.MustCreateIndexIfNotExists("i", pilosa.IndexOptions{})
+			if _, err := index.CreateField("f", pilosa.FieldOptions{}); err != nil {
+				t.Fatal(err)
+			}
+
+			e := test.NewExecutor(hldr.Holder, test.NewCluster(1))
+			if _, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(field=f, row="bar", col=2)`), nil, nil); err == nil || err.Error() != `string 'row' value not allowed unless field 'keys' option enabled` {
+				t.Fatal(err)
+			}
+		})
+	})
+
+	t.Run("Keys", func(t *testing.T) {
+		t.Run("OK", func(t *testing.T) {
+			hldr := test.MustOpenHolder()
+			defer hldr.Close()
+			hldr.MustCreateIndexIfNotExists("i", pilosa.IndexOptions{Keys: true})
+
+			// set a bit so the view gets created.
+			hldr.SetBit("i", "f", 1, 0)
+
+			e := test.NewExecutor(hldr.Holder, pilosa.NewTestCluster(1))
+			if n := hldr.Row("i", "f", 11).Count(); n != 0 {
+				t.Fatalf("unexpected bitmap count: %d", n)
+			}
+
+			if res, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(row=11, field=f, col="foo")`), nil, nil); err != nil {
+				t.Fatal(err)
+			} else {
+				if !res[0].(bool) {
+					t.Fatalf("expected column changed")
+				}
+			}
+
+			if n := hldr.Row("i", "f", 11).Count(); n != 1 {
+				t.Fatalf("unexpected bitmap count: %d", n)
+			}
+			if res, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(row=11, field=f, col="foo")`), nil, nil); err != nil {
+				t.Fatal(err)
+			} else {
+				if res[0].(bool) {
+					t.Fatalf("expected column unchanged")
+				}
+			}
+		})
+
+		t.Run("ErrInvalidColValueType", func(t *testing.T) {
+			hldr := test.MustOpenHolder()
+			defer hldr.Close()
+			index := hldr.MustCreateIndexIfNotExists("i", pilosa.IndexOptions{Keys: true})
+			if _, err := index.CreateField("f", pilosa.FieldOptions{}); err != nil {
+				t.Fatal(err)
+			}
+
+			e := test.NewExecutor(hldr.Holder, test.NewCluster(1))
+
+			if _, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(field=f, row=1, col=2)`), nil, nil); err == nil || err.Error() != `'col' value must be a string when index 'keys' option enabled` {
+				t.Fatal(err)
+			}
+		})
+
+		t.Run("ErrInvalidRowValueType", func(t *testing.T) {
+			hldr := test.MustOpenHolder()
+			defer hldr.Close()
+			index := hldr.MustCreateIndexIfNotExists("i", pilosa.IndexOptions{})
+			if _, err := index.CreateField("f", pilosa.FieldOptions{Keys: true}); err != nil {
+				t.Fatal(err)
+			}
+
+			e := test.NewExecutor(hldr.Holder, test.NewCluster(1))
+
+			if _, err := e.Execute(context.Background(), "i", test.MustParse(`SetBit(field=f, row=1, col=2)`), nil, nil); err == nil || err.Error() != `'row' value must be a string when field 'keys' option enabled` {
+				t.Fatal(err)
+			}
+		})
+	})
 }
 
 // Ensure a SetValue() query can be executed.

server.go

@@ -258,11 +258,8 @@ func NewServer(opts ...ServerOption) (*Server, error) {
 
 	// Initialize translation database.
 	s.translateFile = NewTranslateFile()
-	s.translateFile.Path = filepath.Join(path, "keys")
+	s.translateFile.Path = filepath.Join(path, ".keys")
 	s.translateFile.PrimaryTranslateStore = s.primaryTranslateStore
-	if err := s.translateFile.Open(); err != nil {
-		return nil, err
-	}
 
 	// update URI port with actual listener port. TODO this should probably be done outside of here.
 	if s.URI.Port() == 0 {
@@ -312,6 +309,11 @@ func (s *Server) Open() error {
 		log.Println(errors.Wrap(err, "logging startup"))
 	}
 
+	// Initialize id-key storage.
+	if err := s.translateFile.Open(); err != nil {
+		return err
+	}
+
 	// Cluster settings.
 	s.Cluster.Broadcaster = s
 	s.Cluster.MaxWritesPerRequest = s.maxWritesPerRequest