From cebca697b13b2bda1311e85f2dceb36fb48ea343 Mon Sep 17 00:00:00 2001
From: Travis <travis@pilosa.com>
Date: Thu, 6 Apr 2017 14:28:45 -0500
Subject: [PATCH] fixing tests that were affected by the messenger/view merge

---
 cmd/server_test.go |  2 ++
 fragment_test.go   | 14 +++++++-------
 frame.go           |  2 +-
 server.go          |  8 +++-----
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/cmd/server_test.go b/cmd/server_test.go
index 927ce8b66..f1310abc2 100644
--- a/cmd/server_test.go
+++ b/cmd/server_test.go
@@ -106,6 +106,8 @@ data-dir = "` + actualDataDir + `"
 				// confirm log file was written
 				info, err := logFile.Stat()
 				if err != nil || info.Size() == 0 {
+					// NOTE: this test assumes that something is being written to the log
+					// currently, that is relying on log: "index sync monitor initializing"
 					return errors.New("Log file was not written!")
 				}
 				return nil
diff --git a/fragment_test.go b/fragment_test.go
index 7f3d35add..83f9b42be 100644
--- a/fragment_test.go
+++ b/fragment_test.go
@@ -288,7 +288,7 @@ func TestFragment_TopN_CacheSize(t *testing.T) {
 	file.Close()
 
 	f := &Fragment{
-		Fragment:        pilosa.NewFragment(file.Name(), "d", "f.n", slice, cacheLimit),
+		Fragment:        pilosa.NewFragment(file.Name(), "d", "f.n", pilosa.ViewStandard, slice, cacheLimit),
 		BitmapAttrStore: MustOpenAttrStore(),
 	}
 	f.Fragment.BitmapAttrStore = f.BitmapAttrStore.AttrStore
@@ -308,15 +308,15 @@ func TestFragment_TopN_CacheSize(t *testing.T) {
 	f.RecalculateCache()
 
 	p := []pilosa.Pair{
-		{Key: 104, Count: 7},
-		{Key: 103, Count: 6}}
+		{ID: 104, Count: 7},
+		{ID: 103, Count: 6}}
 
 	// Retrieve top bitmaps.
 	if pairs, err := f.Top(pilosa.TopOptions{N: 5}); err != nil {
 		t.Fatal(err)
 	} else if len(pairs) > cacheLimit {
 		t.Fatalf("TopN count cannot exceed cache size: %d", cacheLimit)
-	} else if pairs[0] != (pilosa.Pair{Key: 104, Count: 7}) {
+	} else if pairs[0] != (pilosa.Pair{ID: 104, Count: 7}) {
 		t.Fatalf("unexpected pair(0): %v", pairs)
 	} else if !reflect.DeepEqual(pairs, p) {
 		t.Fatalf("Invalid TopN result set: %s", spew.Sdump(pairs))
@@ -572,7 +572,7 @@ func BenchmarkFragment_Blocks(b *testing.B) {
 	}
 
 	// Open the fragment specified by the path.
-	f := pilosa.NewFragment(*FragmentPath, "d", "f", pilosa.ViewStandard, 0, pilosa.DefaultFrameCache)
+	f := pilosa.NewFragment(*FragmentPath, "d", "f", pilosa.ViewStandard, 0, pilosa.DefaultCacheSize)
 	if err := f.Open(); err != nil {
 		b.Fatal(err)
 	}
@@ -633,7 +633,7 @@ func NewFragment(db, frame, view string, slice uint64) *Fragment {
 	file.Close()
 
 	f := &Fragment{
-		Fragment:        pilosa.NewFragment(file.Name(), db, frame, view, slice, pilosa.DefaultFrameCache),
+		Fragment:        pilosa.NewFragment(file.Name(), db, frame, view, slice, pilosa.DefaultCacheSize),
 		BitmapAttrStore: MustOpenAttrStore(),
 	}
 	f.Fragment.BitmapAttrStore = f.BitmapAttrStore.AttrStore
@@ -664,7 +664,7 @@ func (f *Fragment) Reopen() error {
 		return err
 	}
 
-	f.Fragment = pilosa.NewFragment(path, f.DB(), f.Frame(), f.View(), f.Slice(), pilosa.DefaultFrameCache)
+	f.Fragment = pilosa.NewFragment(path, f.DB(), f.Frame(), f.View(), f.Slice(), pilosa.DefaultCacheSize)
 	f.Fragment.BitmapAttrStore = f.BitmapAttrStore.AttrStore
 	if err := f.Open(); err != nil {
 		return err
diff --git a/frame.go b/frame.go
index ebfe15ab0..a15b6ee63 100644
--- a/frame.go
+++ b/frame.go
@@ -428,7 +428,7 @@ func (f *Frame) CreateViewIfNotExists(name string) (*View, error) {
 }
 
 func (f *Frame) newView(path, name string) *View {
-	view := NewView(path, f.db, f.name, name)
+	view := NewView(path, f.db, f.name, name, f.cacheSize)
 	view.cacheType = f.cacheType
 	view.LogOutput = f.LogOutput
 	view.BitmapAttrStore = f.bitmapAttrStore
diff --git a/server.go b/server.go
index 0df1182ba..5008e2d5c 100644
--- a/server.go
+++ b/server.go
@@ -120,11 +120,9 @@ func (s *Server) Open() error {
 	go func() { http.Serve(ln, s.Handler) }()
 
 	// Start background monitoring.
-	/*
-		s.wg.Add(2)
-		go func() { defer s.wg.Done(); s.monitorAntiEntropy() }()
-		go func() { defer s.wg.Done(); s.monitorMaxSlices() }()
-	*/
+	s.wg.Add(2)
+	go func() { defer s.wg.Done(); s.monitorAntiEntropy() }()
+	go func() { defer s.wg.Done(); s.monitorMaxSlices() }()
 
 	return nil
 }