fix some tests and update glide.lock

fragment_test.go

@@ -280,15 +280,34 @@ func TestFragment_TopN_BitmapIDs(t *testing.T) {
 // Ensure the fragment cache limit works
 func TestFragment_TopN_CacheSize(t *testing.T) {
 	slice := uint64(0)
-	cacheLimit := uint32(3)
-	file, err := ioutil.TempFile("", "pilosa-fragment-")
+	cacheSize := uint32(3)
+
+	// Create DB.
+	db := MustOpenDB()
+	defer db.Close()
+
+	// Create frame.
+	frame, err := db.CreateFrameIfNotExists("f", pilosa.FrameOptions{CacheType: pilosa.CacheTypeRanked, CacheSize: cacheSize})
 	if err != nil {
-		panic(err)
+		t.Fatal(err)
 	}
-	file.Close()
+
+	// Create view.
+	view, err := frame.CreateViewIfNotExists(pilosa.ViewStandard)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	// Create fragment.
+	frag, err := view.CreateFragmentIfNotExists(slice)
+	if err != nil {
+		t.Fatal(err)
+	}
+	// Close the storage so we can re-open it without encountering a flock.
+	frag.Close()
 
 	f := &Fragment{
-		Fragment:        pilosa.NewFragment(file.Name(), "d", "f.n", pilosa.ViewStandard, slice, cacheLimit),
+		Fragment:        frag,
 		BitmapAttrStore: MustOpenAttrStore(),
 	}
 	f.Fragment.BitmapAttrStore = f.BitmapAttrStore.AttrStore
@@ -316,8 +335,8 @@ func TestFragment_TopN_CacheSize(t *testing.T) {
 	// Retrieve top bitmaps.
 	if pairs, err := f.Top(pilosa.TopOptions{N: 5}); err != nil {
 		t.Fatal(err)
-	} else if len(pairs) > int(cacheLimit) {
-		t.Fatalf("TopN count cannot exceed cache size: %d", cacheLimit)
+	} else if len(pairs) > int(cacheSize) {
+		t.Fatalf("TopN count cannot exceed cache size: %d", cacheSize)
 	} else if pairs[0] != (pilosa.Pair{ID: 104, Count: 7}) {
 		t.Fatalf("unexpected pair(0): %v", pairs)
 	} else if !reflect.DeepEqual(pairs, p) {

glide.lock

@@ -1,5 +1,5 @@
-hash: 743e8f978eb4ad8f80a2ab71b05caebbf50b6769b71aa457bc4f144fef8c6595
-updated: 2017-04-18T15:33:39.035615802-05:00
+hash: 4bdea17c62dcd469584382515052e7a246fae6deefc2d62da70bf768e18e1f0c
+updated: 2017-04-19T10:51:10.409094081-05:00
 imports:
 - name: github.com/armon/go-metrics
   version: 97c69685293dce4c0a2d0b19535179bbc976e4d2

glide.yaml

@@ -31,7 +31,5 @@ import:
 - package: github.com/spf13/viper
 - package: github.com/gorilla/mux
   version: ^1.3.0
-- package: github.com/aws/aws-sdk-go
-  version: ^1.6.10
 - package: github.com/hashicorp/memberlist
 - package: golang.org/x/sync

handler.go

@@ -339,9 +339,9 @@ func (h *Handler) handlePostDB(w http.ResponseWriter, r *http.Request) {
 	}
 
 	// Send the delete message to all nodes.
-	err := h.Broadcaster.SendSync(
+	err = h.Broadcaster.SendSync(
 		&internal.DeleteDBMessage{
-			DB: req.DB,
+			DB: dbName,
 		})
 	if err != nil {
 		h.logger().Printf("problem sending DeleteDB message: %s", err)
@@ -485,8 +485,8 @@ func (h *Handler) handlePostFrame(w http.ResponseWriter, r *http.Request) {
 	// Send the create message to all nodes.
 	err = h.Broadcaster.SendSync(
 		&internal.CreateFrameMessage{
-			DB:    req.DB,
-			Frame: req.Frame,
+			DB:    dbName,
+			Frame: frameName,
 			Meta: &internal.FrameMeta{
 				RowLabel:    req.Options.RowLabel,
 				TimeQuantum: string(req.Options.TimeQuantum),
@@ -557,8 +557,8 @@ func (h *Handler) handleDeleteFrame(w http.ResponseWriter, r *http.Request) {
 	// Send the delete message to all nodes.
 	err := h.Broadcaster.SendSync(
 		&internal.DeleteFrameMessage{
-			DB:    req.DB,
-			Frame: req.Frame,
+			DB:    dbName,
+			Frame: frameName,
 		})
 	if err != nil {
 		h.logger().Printf("problem sending DeleteFrame message: %s", err)

internal/private.proto

@@ -2,16 +2,17 @@ syntax = "proto3";
 
 package internal;
 
-message DB {
+message DBMeta {
 	string TimeQuantum = 1;
 	string ColumnLabel = 2;
 }
 
-message Frame {
-	string TimeQuantum = 1;
-	string RowLabel = 2;
-	bool InverseEnabled = 3;
-	string CacheType = 4;
+message FrameMeta {
+	string RowLabel = 1;
+	bool InverseEnabled = 2;
+	string CacheType = 3;
+	uint32 CacheSize = 4;
+	string TimeQuantum = 5;
 }
 
 message ImportResponse {
@@ -39,3 +40,45 @@ message MaxSlicesResponse {
     map<string, uint64> MaxSlices = 1;
 }
 
+message CreateSliceMessage {
+    string DB = 1;
+    uint64 Slice = 2;
+}
+
+message DeleteDBMessage {
+    string DB = 1;
+}
+
+message CreateDBMessage {
+    string DB = 1;
+    DBMeta Meta = 2;
+}
+
+message CreateFrameMessage {
+    string DB = 1;
+    string Frame = 2;
+    FrameMeta Meta = 3;
+}
+
+message DeleteFrameMessage {
+    string DB = 1;
+    string Frame = 2;
+}
+
+message Frame {
+    string Name = 1;
+    FrameMeta Meta = 2;
+}
+
+message DB {
+    string Name = 1;
+    DBMeta Meta = 2;
+    uint64 MaxSlice = 3;
+    repeated Frame Frames = 4;
+}
+
+message NodeState {
+    string Host = 1;
+    string State = 2;
+    repeated DB DBs = 3;
+}