From 37dcc7dea37cc2cc50aaed155f430511dea3e3c4 Mon Sep 17 00:00:00 2001
From: vinllen <cvinllen@gmail.com>
Date: Thu, 28 Nov 2019 12:18:12 +0800
Subject: [PATCH] update driver bugfix: 1. bulk string return -1 is legal; 2.
 handle lua script in cluster

---
 ChangeLog               | 6 ++++++
 src/redis-shake/sync.go | 4 ++--
 src/vendor/vendor.json  | 6 +++---
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f2ed9d3..52d0c77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2019-11-28 Alibaba Cloud.
+	* VERSION: 1.6.23
+	* BUGFIX: update redis-go-cluster driver to solve MOVED error in lua
+	script.
+	* BUGFIX: update redis-go-clister driver to remove the error when meets
+	nil bluk string.
 2019-11-25 Alibaba Cloud.
 	* VERSION: 1.6.22
 	* BUGFIX: solve MOVED error when key is unicode encoding which is not
diff --git a/src/redis-shake/sync.go b/src/redis-shake/sync.go
index 9ef8aa4..83bbc44 100644
--- a/src/redis-shake/sync.go
+++ b/src/redis-shake/sync.go
@@ -535,7 +535,7 @@ func (ds *dbSyncer) syncCommand(reader *bufio.Reader, target []string, auth_type
 			id := recvId.Get() // receive id
 
 			// print debug log of receive reply
-			log.Debugf("receive reply-id[%v]: [%v], error:[%v]", id, reply, err)
+			log.Debugf("dbSyncer[%v] receive reply-id[%v]: [%v], error:[%v]", ds.id, id, reply, err)
 
 			if conf.Options.Metric == false {
 				continue
@@ -601,7 +601,7 @@ func (ds *dbSyncer) syncCommand(reader *bufio.Reader, target []string, auth_type
 				metric.GetMetric(ds.id).AddPullCmdCount(ds.id, 1)
 
 				// print debug log of send command
-				if conf.Options.LogLevel == utils.LogLevelDebug {
+				if conf.Options.LogLevel == utils.LogLevelDebug || conf.Options.LogLevel == utils.LogLevelAll {
 					strArgv := make([]string, len(argv))
 					for i, ele := range argv {
 						strArgv[i] = *(*string)(unsafe.Pointer(&ele))
diff --git a/src/vendor/vendor.json b/src/vendor/vendor.json
index 744c766..d3a0e47 100644
--- a/src/vendor/vendor.json
+++ b/src/vendor/vendor.json
@@ -159,10 +159,10 @@
 			"revisionTime": "2019-03-04T09:57:49Z"
 		},
 		{
-			"checksumSHA1": "TCoDN4L8oq/S41a1VR2iONqN+mE=",
+			"checksumSHA1": "Y95c1YwyU+rB+mFMSB4zhxCpt+Q=",
 			"path": "github.com/vinllen/redis-go-cluster",
-			"revision": "6e304ef1b7fc2db6f913570112aa2a2c4d80ef81",
-			"revisionTime": "2019-11-20T07:29:33Z"
+			"revision": "f33d5a7283f2dc28233aa0069d7ec1798323cdad",
+			"revisionTime": "2019-11-28T04:11:03Z"
 		},
 		{
 			"checksumSHA1": "U4rR1I0MXcvJz3zSxTp3hb3Y0I0=",