rename HasData() to IsEmpty()

grafana · Dec 14, 2017 · 7457eea · 7457eea
1 parent fc64bb5
commit 7457eea
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 10 deletions.
diff --git a/mdata/aggmetric.go b/mdata/aggmetric.go
@@ -560,7 +560,7 @@ func (a *AggMetric) GC(chunkMinTs, metricMinTs uint32) bool {
 	}
 
 	// this aggMetric has never had metrics written to it.
-	if len(a.Chunks) == 0 && (a.rob == nil || !a.rob.HasData()) {
+	if len(a.Chunks) == 0 && (a.rob == nil || a.rob.IsEmpty()) {
 		return true
 	}
 

diff --git a/mdata/reorder_buffer.go b/mdata/reorder_buffer.go
@@ -95,6 +95,6 @@ func (rob *ReorderBuffer) Flush() []schema.Point {
 	return res
 }
 
-func (rob *ReorderBuffer) HasData() bool {
-	return rob.buf[rob.newest].Ts != 0
+func (rob *ReorderBuffer) IsEmpty() bool {
+	return rob.buf[rob.newest].Ts == 0
 }
diff --git a/mdata/reorder_buffer_test.go b/mdata/reorder_buffer_test.go
@@ -291,21 +291,21 @@ func TestReorderBufferFlushUnsortedData2(t *testing.T) {
 	}
 }
 
-func TestReorderBufferFlushAndHasData(t *testing.T) {
+func TestReorderBufferFlushAndIsEmpty(t *testing.T) {
 	buf := NewReorderBuffer(10, 1)
 
-	if buf.HasData() != false {
-		t.Fatalf("Expected HasData() to be false")
+	if buf.IsEmpty() != true {
+		t.Fatalf("Expected IsEmpty() to be false")
 	}
 
 	buf.Add(123, 123)
-	if buf.HasData() != true {
-		t.Fatalf("Expected HasData() to be true")
+	if buf.IsEmpty() != false {
+		t.Fatalf("Expected IsEmpty() to be true")
 	}
 
 	buf.Reset()
-	if buf.HasData() != false {
-		t.Fatalf("Expected HasData() to be false")
+	if buf.IsEmpty() != true {
+		t.Fatalf("Expected IsEmpty() to be false")
 	}
 }