From a41dad30fba5a3a13479934c7d0613ef80662b0f Mon Sep 17 00:00:00 2001
From: Bas Harenslak <basharenslak@godatadriven.com>
Date: Mon, 2 Oct 2017 22:48:47 +0200
Subject: [PATCH] Move printing db.blocks to main.go

---
 cmd/tsdb/main.go | 20 +++++++++++++++++++-
 db.go            | 21 ---------------------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/cmd/tsdb/main.go b/cmd/tsdb/main.go
index e7e77d0d2..fe84340c0 100644
--- a/cmd/tsdb/main.go
+++ b/cmd/tsdb/main.go
@@ -60,7 +60,7 @@ func main() {
 		if err != nil {
 			exitWithError(err)
 		}
-		db.PrintBlocks()
+		printBlocks(db.Blocks())
 	}
 	flag.CommandLine.Set("log.level", "debug")
 }
@@ -331,3 +331,21 @@ func exitWithError(err error) {
 	fmt.Fprintln(os.Stderr, err)
 	os.Exit(1)
 }
+
+func printBlocks(blocks []tsdb.DiskBlock) {
+	tw := tsdb.GetNewTabWriter(os.Stdout)
+	defer tw.Flush()
+
+	fmt.Fprintln(tw, "BLOCK ULID\tMIN TIME\tMAX TIME\tNUM SAMPLES\tNUM CHUNKS\tNUM SERIES")
+	for _, b := range blocks {
+		fmt.Fprintf(tw,
+			"%v\t%v\t%v\t%v\t%v\t%v\n",
+			b.Meta().ULID,
+			b.Meta().MinTime,
+			b.Meta().MaxTime,
+			b.Meta().Stats.NumSamples,
+			b.Meta().Stats.NumChunks,
+			b.Meta().Stats.NumSeries,
+		)
+	}
+}
diff --git a/db.go b/db.go
index f72c9e7e3..24437ada0 100644
--- a/db.go
+++ b/db.go
@@ -228,27 +228,6 @@ func (db *DB) Dir() string {
 	return db.dir
 }
 
-func (db *DB) PrintBlocks() {
-	db.mtx.RLock()
-	defer db.mtx.RUnlock()
-
-	tw := GetNewTabWriter(os.Stdout)
-	defer tw.Flush()
-
-	fmt.Fprintln(tw, "BLOCK ULID\tMIN TIME\tMAX TIME\tNUM SAMPLES\tNUM CHUNKS\tNUM SERIES")
-	for _, b := range db.blocks {
-		fmt.Fprintf(tw,
-			"%v\t%v\t%v\t%v\t%v\t%v\n",
-			b.Meta().ULID,
-			b.Meta().MinTime,
-			b.Meta().MaxTime,
-			b.Meta().Stats.NumSamples,
-			b.Meta().Stats.NumChunks,
-			b.Meta().Stats.NumSeries,
-		)
-	}
-}
-
 func (db *DB) run() {
 	defer close(db.donec)