nsqd: move diskqueue into nsqio/go-diskqueue

Godeps

@@ -8,3 +8,4 @@ github.com/bitly/timer_metrics          afad1794bb13e2a094720aeb27c088aa64564895
 github.com/blang/semver                 9bf7bff48b0388cb75991e58c6df7d13e982f1f2
 github.com/julienschmidt/httprouter     6aacfd5ab513e34f7e64ea9627ab9670371b34e7
 github.com/judwhite/go-svc/svc          63c12402f579f0bdf022653c821a1aa5d7544f01
+github.com/nsqio/go-diskqueue           d7805f889b023afcd5b8933e815ce9ba36327333

nsqd/channel.go

@@ -10,6 +10,7 @@ import (
 	"sync/atomic"
 	"time"
 
+	"github.com/nsqio/go-diskqueue"
 	"github.com/nsqio/nsq/internal/pqueue"
 	"github.com/nsqio/nsq/internal/quantile"
 )
@@ -95,7 +96,7 @@ func NewChannel(topicName string, channelName string, ctx *context,
 	} else {
 		// backend names, for uniqueness, automatically include the topic...
 		backendName := getBackendName(topicName, channelName)
-		c.backend = newDiskQueue(backendName,
+		c.backend = diskqueue.New(backendName,
 			ctx.nsqd.getOpts().DataPath,
 			ctx.nsqd.getOpts().MaxBytesPerFile,
 			int32(minValidMsgLength),

nsqd/channel_test.go

@@ -59,20 +59,6 @@ func TestPutMessage2Chan(t *testing.T) {
 	test.Equal(t, msg.Body, outputMsg2.Body)
 }
 
-func TestChannelBackendMaxMsgSize(t *testing.T) {
-	opts := NewOptions()
-	opts.Logger = test.NewTestLogger(t)
-	_, _, nsqd := mustStartNSQD(opts)
-	defer os.RemoveAll(opts.DataPath)
-	defer nsqd.Exit()
-
-	topicName := "test_channel_backend_maxmsgsize" + strconv.Itoa(int(time.Now().Unix()))
-	topic := nsqd.GetTopic(topicName)
-	ch := topic.GetChannel("ch")
-
-	test.Equal(t, int32(opts.MaxMsgSize+minValidMsgLength), ch.backend.(*diskQueue).maxMsgSize)
-}
-
 func TestInFlightWorker(t *testing.T) {
 	count := 250