nsqd: switch to golang/snappy

Author: mreiferson

Godeps

@@ -4,7 +4,7 @@ github.com/nsqio/go-nsq                 642a3f9935f12cb3b747294318d730f56f4c34b4
 github.com/bitly/go-simplejson          18db6e68d8fd9cbf2e8ebe4c81a78b96fd9bf05a
 github.com/bmizerany/perks/quantile     6cb9d9d729303ee2628580d9aec5db968da3a607
 github.com/mreiferson/go-options        7ae3226d3e1fa6a0548f73089c72c96c141f3b95
-github.com/mreiferson/go-snappystream   028eae7ab5c4c9e2d1cb4c4ca1e53259bbe7e504 # v0.2.3
+github.com/golang/snappy                d9eb7a3d35ec988b8585d4a0068e462c27d28380
 github.com/bitly/timer_metrics          afad1794bb13e2a094720aeb27c088aa64564895
 github.com/blang/semver                 9bf7bff48b0388cb75991e58c6df7d13e982f1f2
 github.com/julienschmidt/httprouter     6aacfd5ab513e34f7e64ea9627ab9670371b34e7

nsqd/client_v2.go

@@ -10,7 +10,7 @@ import (
 	"sync/atomic"
 	"time"
 
-	"github.com/mreiferson/go-snappystream"
+	"github.com/golang/snappy"
 	"github.com/nsqio/nsq/internal/auth"
 )
 
@@ -533,8 +533,8 @@ func (c *clientV2) UpgradeSnappy() error {
 		conn = c.tlsConn
 	}
 
-	c.Reader = bufio.NewReaderSize(snappystream.NewReader(conn, snappystream.SkipVerifyChecksum), defaultBufferSize)
-	c.Writer = bufio.NewWriterSize(snappystream.NewWriter(conn), c.OutputBufferSize)
+	c.Reader = bufio.NewReaderSize(snappy.NewReader(conn), defaultBufferSize)
+	c.Writer = bufio.NewWriterSize(snappy.NewWriter(conn), c.OutputBufferSize)
 
 	atomic.StoreInt32(&c.Snappy, 1)
 

nsqd/protocol_v2_test.go

@@ -23,7 +23,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mreiferson/go-snappystream"
+	"github.com/golang/snappy"
 	"github.com/nsqio/go-nsq"
 	"github.com/nsqio/nsq/internal/protocol"
 	"github.com/nsqio/nsq/internal/test"
@@ -1112,15 +1112,15 @@ func TestSnappy(t *testing.T) {
 	test.Nil(t, err)
 	test.Equal(t, true, r.Snappy)
 
-	compressConn := snappystream.NewReader(conn, snappystream.SkipVerifyChecksum)
+	compressConn := snappy.NewReader(conn)
 	resp, _ := nsq.ReadResponse(compressConn)
 	frameType, data, _ := nsq.UnpackResponse(resp)
 	t.Logf("frameType: %d, data: %s", frameType, data)
 	test.Equal(t, frameTypeResponse, frameType)
 	test.Equal(t, []byte("OK"), data)
 
 	msgBody := make([]byte, 128000)
-	w := snappystream.NewWriter(conn)
+	w := snappy.NewWriter(conn)
 
 	rw := readWriter{compressConn, w}
 
@@ -1308,7 +1308,7 @@ func TestTLSSnappy(t *testing.T) {
 	test.Equal(t, frameTypeResponse, frameType)
 	test.Equal(t, []byte("OK"), data)
 
-	compressConn := snappystream.NewReader(tlsConn, snappystream.SkipVerifyChecksum)
+	compressConn := snappy.NewReader(tlsConn)
 
 	resp, _ = nsq.ReadResponse(compressConn)
 	frameType, data, _ = nsq.UnpackResponse(resp)

nsqd/stats_test.go

@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mreiferson/go-snappystream"
+	"github.com/golang/snappy"
 	"github.com/nsqio/nsq/internal/http_api"
 	"github.com/nsqio/nsq/internal/test"
 )
@@ -67,8 +67,8 @@ func TestClientAttributes(t *testing.T) {
 	test.Nil(t, err)
 	test.Equal(t, true, resp.Snappy)
 
-	r := snappystream.NewReader(conn, snappystream.SkipVerifyChecksum)
-	w := snappystream.NewWriter(conn)
+	r := snappy.NewReader(conn)
+	w := snappy.NewWriter(conn)
 	readValidate(t, r, frameTypeResponse, "OK")
 
 	topicName := "test_client_attributes" + strconv.Itoa(int(time.Now().Unix()))