Merge pull request #158 from alibaba/bugfix-1.6.18

Bugfix 1.6.18

ChangeLog

@@ -1,3 +1,6 @@
+2019-09-04 Alibaba Cloud.
+	* VERSION: 1.6.18
+	* BUGFIX: restore quicklist panic when target is cluster. see #156
 2019-08-27 Alibaba Cloud.
 	* VERSION: 1.6.17
 	* BUGFIX: transaction syncing panic when target redis is cluster. see

README.md

@@ -100,3 +100,4 @@ Plus, we have a WeChat group so that users can join and discuss, but the group u
 | ceshihao | davidzheng23@gmail.com |
 | wangyiyang | wangyiyang.kk@gmail.com |
 | muicoder | muicoder@gmail.com |
+| zhklcf | huikangzhu@126.com |

src/redis-shake/common/cluster.go

@@ -61,6 +61,11 @@ func (cc *ClusterConn) Send(commandName string, args ...interface{}) error {
 
 // send batcher and put the return into recvChan
 func (cc *ClusterConn) Flush() error {
+	if cc.batcher == nil {
+		log.Info("batcher is empty, no need to flush")
+		return nil
+	}
+
 	ret, err := cc.client.RunBatch(cc.batcher)
 	defer func() {
 		cc.batcher = nil // reset batcher

src/vendor/vendor.json

@@ -159,10 +159,10 @@
 			"revisionTime": "2019-03-04T09:57:49Z"
 		},
 		{
-			"checksumSHA1": "1PrwQi6VvhLG4ovw1B7zD/afGZ4=",
+			"checksumSHA1": "qW5Sb6hcZxGHxZbkLoHrCQtYyBs=",
 			"path": "github.com/vinllen/redis-go-cluster",
-			"revision": "0799101ddfdb7d2bc9d47948f8a0cc17d23a216e",
-			"revisionTime": "2019-08-12T11:22:58Z"
+			"revision": "1883b18765aeed1a0b01320791dfe6103aa9a6b6",
+			"revisionTime": "2019-09-04T07:01:13Z"
 		},
 		{
 			"checksumSHA1": "TM3Neoy1xRAKyZYMGzKc41sDFW4=",