Moved all the block producer/consumer interfaces to common.

common/block.go

@@ -1,7 +1,31 @@
 package common
 
+import (
+	"errors"
+)
+
+// Error returned if a Producer has run to its end.
+var ErrNoMoreBlocks = errors.New("No more blocks.")
+
+type (
 	// Block data from Minetest database.
-type Block struct {
+	Block struct {
 		Coord Coord
 		Data  []byte
 	}
+	// BlockProducer is used to over a existing Minetest database
+	// and return its content block by block.
+	BlockProducer interface {
+		// error is ErrNoMoreBlocks if it run out of blocks.
+		Next(*Block) error
+		// Closes the open database connections.
+		Close() error
+	}
+
+	// BlockConsumer is used to store blocks in a new Minetest database.
+	BlockConsumer interface {
+		Consume(*Block) error
+		// Closes the open database connections.
+		Close() error
+	}
+)

interleaver/interfaces.go

@@ -1,32 +0,0 @@
-// Copyright 2014 by Sascha L. Teichmann
-// Use of this source code is governed by the MIT license
-// that can be found in the LICENSE file.
-
-package main
-
-import (
-	"errors"
-
-	"bitbucket.org/s_l_teichmann/mtredisalize/common"
-)
-
-// Error returned if a Producer has run to its end.
-var ErrNoMoreBlocks = errors.New("No more blocks.")
-
-type (
-	// BlockProducer is used to over a existing Minetest database
-	// and return its content block by block.
-	BlockProducer interface {
-		// error is ErrNoMoreBlocks if it run out of blocks.
-		Next(*common.Block) error
-		// Closes the open database connections.
-		Close() error
-	}
-
-	// BlockConsumer is used to store blocks in a new Minetest database.
-	BlockConsumer interface {
-		Consume(*common.Block) error
-		// Closes the open database connections.
-		Close() error
-	}
-)

interleaver/leveldb.go

@@ -77,12 +77,12 @@ func (ldbp *LevelDBBlockProducer) Close() error {
 
 func (ldbp *LevelDBBlockProducer) Next(block *common.Block) (err error) {
 	if ldbp.iterator == nil {
-		err = ErrNoMoreBlocks
+		err = common.ErrNoMoreBlocks
 		return
 	}
 	if !ldbp.iterator.Valid() {
 		if err = ldbp.iterator.GetError(); err == nil {
-			err = ErrNoMoreBlocks
+			err = common.ErrNoMoreBlocks
 		}
 		ldbp.iterator.Close()
 		ldbp.iterator = nil

interleaver/main.go

@@ -49,7 +49,7 @@ func selectKeyEncoder(interleaved bool) common.KeyEncoder {
 	return common.EncodeStringToBytes
 }
 
-func copyProducerToConsumer(producer BlockProducer, consumer BlockConsumer) error {
+func copyProducerToConsumer(producer common.BlockProducer, consumer common.BlockConsumer) error {
 
 	blocks := make(chan *common.Block)
 	done := make(chan struct{})
@@ -62,7 +62,7 @@ func copyProducerToConsumer(producer BlockProducer, consumer BlockConsumer) erro
 		for {
 			block := pool.Get().(*common.Block)
 			if err := producer.Next(block); err != nil {
-				if err != ErrNoMoreBlocks {
+				if err != common.ErrNoMoreBlocks {
 					log.Printf("Reading failed: %s\n", err)
 				}
 				return
@@ -126,8 +126,8 @@ func main() {
 	}
 
 	var (
-		producer BlockProducer
+		producer common.BlockProducer
-		consumer BlockConsumer
+		consumer common.BlockConsumer
 		err      error
 	)
 

interleaver/sqlite.go

@@ -151,7 +151,7 @@ func NewSQLiteBlockProducer(
 
 func (sbp *SQLiteBlockProducer) Next(block *common.Block) (err error) {
 	if sbp.rows == nil {
-		err = ErrNoMoreBlocks
+		err = common.ErrNoMoreBlocks
 		return
 	}
 	if sbp.rows.Next() {
@@ -162,7 +162,7 @@ func (sbp *SQLiteBlockProducer) Next(block *common.Block) (err error) {
 	} else {
 		sbp.rows.Close()
 		sbp.rows = nil
-		err = ErrNoMoreBlocks
+		err = common.ErrNoMoreBlocks
 	}
 	return
 }