adjust import pkg

cmd/proxy/proxy-cluster-example.toml

@@ -29,7 +29,7 @@ ping_fail_limit = 3
 ping_auto_eject = true
 # A list of server address, port and weight (name:port:weight or ip:port:weight) for this server pool. Also you can use alias name like: ip:port:weight alias.
 servers = [
-    "127.0.0.1:11211:1 aa",
+    "127.0.0.1:11211:1 mc1",
 ]
 
 [[clusters]]
@@ -63,7 +63,7 @@ ping_fail_limit = 3
 ping_auto_eject = false
 # A list of server address, port and weight (name:port:weight or ip:port:weight) for this server pool. Also you can use alias name like: ip:port:weight alias.
 servers = [
-    "127.0.0.1:6379:1",
+    "127.0.0.1:6379:1 redis1",
 ]
 
 [[clusters]]

proto/memcache/node_conn.go

@@ -2,16 +2,16 @@ package memcache
 
 import (
 	"bytes"
+	"strconv"
 	"sync/atomic"
 	"time"
 
 	"overlord/lib/bufio"
+	"overlord/lib/log"
 	libnet "overlord/lib/net"
 	"overlord/proto"
 
 	"github.com/pkg/errors"
-	"overlord/lib/log"
-	"strconv"
 )
 
 const (

proto/redis/proxy_conn_test.go

@@ -1,11 +1,11 @@
 package redis
 
 import (
+	"errors"
 	"testing"
 
 	"overlord/proto"
 
-	"errors"
 	"github.com/stretchr/testify/assert"
 )
 
@@ -284,7 +284,7 @@ func TestEncodeWithPing(t *testing.T) {
 		rTp: respArray,
 		array: []*resp{
 			&resp{
-				rTp: respBulk,
+				rTp:  respBulk,
 				data: []byte("4\r\nPING"),
 			},
 		},

proto/redis/request.go

@@ -6,8 +6,6 @@ import (
 	"sync"
 )
 
-const evalArgsMinCount int = 4;
-
 var (
 	emptyBytes = []byte("")
 	crlfBytes  = []byte("\r\n")
@@ -124,7 +122,7 @@ var (
 		"15\r\nZREMRANGEBYRANK" +
 		"16\r\nZREMRANGEBYSCORE" +
 		"5\r\nPFADD" +
-		"7\r\nPFMERGE"+
+		"7\r\nPFMERGE" +
 		"4\r\nEVAL")
 
 	reqNotSupportCmdsBytes = []byte("" +
@@ -146,7 +144,6 @@ var (
 		"4\r\nSCAN" +
 		"4\r\nWAIT" +
 		"5\r\nBITOP" +
-		"4\r\nEVAL" +
 		"7\r\nEVALSHA" +
 		"4\r\nAUTH" +
 		"4\r\nECHO" +
@@ -233,8 +230,9 @@ func (r *Request) Key() []byte {
 
 	k := r.resp.array[1]
 	// SUPPORT EVAL command
+	const evalArgsMinCount int = 4
 	if r.resp.arrayn >= evalArgsMinCount {
-		if bytes.Equal(r.resp.array[0].data, []byte("4\r\nEVAL")) {
+		if bytes.Equal(r.resp.array[0].data, cmdEvalBytes) {
 			// find the 4th key with index 3
 			k = r.resp.array[3]
 		}

proto/redis/resp.go

@@ -1,10 +1,11 @@
 package redis
 
 import (
-	"overlord/lib/bufio"
-	"overlord/lib/conv"
 	"bytes"
 	"fmt"
+
+	"overlord/lib/bufio"
+	"overlord/lib/conv"
 )
 
 // respType is the type of redis resp
@@ -135,10 +136,10 @@ func (r *resp) decodeInline(line []byte) (err error) {
 	r.rTp = respArray
 
 	for i, field := range fields {
-		r.array[i] = &resp {
-			rTp: respBulk,
-			data: []byte(fmt.Sprintf("%d\r\n%c", len(field), field)),
-			array: nil,
+		r.array[i] = &resp{
+			rTp:    respBulk,
+			data:   []byte(fmt.Sprintf("%d\r\n%c", len(field), field)),
+			array:  nil,
 			arrayn: 0,
 		}
 	}

proxy/config.go

@@ -1,12 +1,13 @@
 package proxy
 
 import (
+	"fmt"
+	"strings"
+
 	"overlord/proto"
 
 	"github.com/BurntSushi/toml"
 	"github.com/pkg/errors"
-	"strings"
-	"fmt"
 )
 
 // Config proxy config.