redis-client lib version update

go.mod

@@ -1,13 +1,11 @@
 module github.com/brokercap/Bifrost
 
-
 require (
 	github.com/ClickHouse/clickhouse-go v1.4.3
 	github.com/Shopify/sarama v1.26.4
 	github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668
 	github.com/gmallard/stompngo v1.0.11
-	github.com/go-redis/redis v6.15.5+incompatible
-	github.com/golang/protobuf v1.3.2 // indirect
+	github.com/go-redis/redis/v8 v8.7.1 // indirect
 	github.com/hprose/hprose-golang v2.0.4+incompatible
 	github.com/satori/go.uuid v1.2.0
 	github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94

go.sum

@@ -6,10 +6,14 @@ github.com/Shopify/toxiproxy v2.1.4+incompatible/go.mod h1:OXgGpZ6Cli1/URJOF1DMx
 github.com/bkaradzic/go-lz4 v1.0.0/go.mod h1:0YdlkowM3VswSROI7qDxhRvJ3sLhlFrRRwjwegp5jy4=
 github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668 h1:U/lr3Dgy4WK+hNk4tyD+nuGjpVLPEHuJSFXMw11/HPA=
 github.com/bradfitz/gomemcache v0.0.0-20190329173943-551aad21a668/go.mod h1:H0wQNHz2YrLsuXOZozoeDmnHXkNCRmMW0gwFWDfEZDA=
+github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY=
+github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58/go.mod h1:EOBUe0h4xcZ5GoxqC5SDxFQ8gwyZPKQoEzownBlhI80=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
 github.com/eapache/go-resiliency v1.2.0 h1:v7g92e/KSN71Rq7vSThKaWIq68fL4YHvWyiUKorFR1Q=
 github.com/eapache/go-resiliency v1.2.0/go.mod h1:kFI+JgMyC7bLPUVY133qvEBtVayf5mFgVsvEsIPBvNs=
 github.com/eapache/go-xerial-snappy v0.0.0-20180814174437-776d5712da21 h1:YEetp8/yCZMuEPMUDHG0CW/brkkEp8mzqk2+ODEitlw=
@@ -19,12 +23,13 @@ github.com/eapache/queue v1.1.0/go.mod h1:6eCeP0CKFpHLu8blIFXhExK/dRa7WDZfr6jVFP
 github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g=
 github.com/frankban/quicktest v1.7.2/go.mod h1:jaStnuzAqU1AJdCO0l53JDCJrVDKcS03DbaAcR7Ks/o=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
+github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/gmallard/stompngo v1.0.11 h1:H4H9kN6vXxvAznbHToc7gbJp8S12y5AmvkxiLd9JXj8=
 github.com/gmallard/stompngo v1.0.11/go.mod h1:ax8ZfZ0xjFDojYLmWfKu9rnr7c4BNwnxGrE7p0Mtibg=
 github.com/go-mgo/mgo v0.0.0-20180705113604-9856a29383ce h1:eXrClwQtoXzJMrKGA8pffaAw0UUft+K0XVWaVFMut3I=
 github.com/go-mgo/mgo v0.0.0-20180705113604-9856a29383ce/go.mod h1:M6gLQ7smMNhLvDG6Dv6inWBcT/S0rXKM2PNT0/Qu7es=
-github.com/go-redis/redis v6.15.5+incompatible h1:pLky8I0rgiblWfa8C1EV7fPEUv0aH6vKRaYHc/YRHVk=
-github.com/go-redis/redis v6.15.5+incompatible/go.mod h1:NAIEuMOZ/fxfXJIrKDQDz8wamY7mA7PouImQ2Jvg6kA=
+github.com/go-redis/redis/v8 v8.7.1 h1:8IYi6RO83fNcG5amcUUYTN/qH2h4OjZHlim3KWGFSsA=
+github.com/go-redis/redis/v8 v8.7.1/go.mod h1:BRxHBWn3pO3CfjyX6vAoyeRmCquvxr6QG+2onGV2gYs=
 github.com/go-sql-driver/mysql v1.4.0/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
 github.com/go-yaml/yaml v0.0.0-20181115110504-51d6538a90f8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 github.com/golang/crypto v0.0.0-20181001203147-e3636079e1a4 h1:GwJgHSpvcgpQxbgBabe8Vy/kMhZ5bHwiZfhOgpXtV8I=
@@ -33,14 +38,23 @@ github.com/golang/net v0.0.0-20180826012351-8a410e7b638d h1:XXZ0nKFacC83c+kBG0i/
 github.com/golang/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:98y8FxUyMjTdJ5eOj/8vzuiVO14/dkJ98NYhEPG8QGY=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
+github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
+github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrUpVNzEA03Pprs=
+github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
+github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
+github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4=
 github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q=
 github.com/golang/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:YCHYtYb9c8Q7XgYVYjmJBPtFPKx5QvOcPxHZWjldabE=
 github.com/golang/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:5JyrLPvD/ZdaYkT7IqKhsP5xt7aLjA99KXRtk4EIYDk=
 github.com/golang/text v0.3.0/go.mod h1:GUiq9pdJKRKKAZXiVgWFEvocYuREvC14NhI4OPgEjeE=
+github.com/golang/tools v0.0.0-20181219222714-6e267b5cc78e/go.mod h1:BZR6KJOI/IQ5FlSQroxL7yevEMRCz1dARTXHD9s4mHE=
+github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
+github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/hashicorp/go-uuid v1.0.2 h1:cfejS+Tpcp13yd5nYHWDI6qVCny6wyX2Mt5SGur2IGE=
 github.com/hashicorp/go-uuid v1.0.2/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU=
@@ -57,9 +71,15 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/lib/pq v1.0.0/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/mattn/go-sqlite3 v1.9.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A=
 github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
 github.com/onsi/ginkgo v1.7.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk=
+github.com/onsi/ginkgo v1.15.0/go.mod h1:hF8qUzuuC8DJGygJH3726JnCZX4MYbRB8yFfISqnKUg=
 github.com/onsi/gomega v1.4.3/go.mod h1:ex+gbHU/CVuBBDIJjb2X0qEXbFg53c61hWP/1CpauHY=
+github.com/onsi/gomega v1.7.1/go.mod h1:XdKZgCCFLUoM/7CFJVPcG8C1xQ1AJ0vpAezJrB7JYyY=
+github.com/onsi/gomega v1.10.1/go.mod h1:iN09h71vgCQne3DLsj+A5owkum+a2tYe+TOCB1ybHNo=
+github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7mt48=
 github.com/pierrec/lz4 v2.0.5+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
 github.com/pierrec/lz4 v2.4.1+incompatible h1:mFe7ttWaflA46Mhqh+jUfjp2qTbPYxLB2/OyBppH9dg=
 github.com/pierrec/lz4 v2.4.1+incompatible/go.mod h1:pdkljMzZIN41W+lC3N2tnIh5sFi+IEE17M5jbnwPHcY=
@@ -73,11 +93,25 @@ github.com/streadway/amqp v0.0.0-20190404075320-75d898a42a94/go.mod h1:AZpEONHx3
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
+github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/syndtr/goleveldb v1.0.0 h1:fBdIW9lB4Iz0n9khmH8w27SJ3QEJ7+IgjPEwGSZiFdE=
 github.com/syndtr/goleveldb v1.0.0/go.mod h1:ZVVdQEZoIme9iO1Ch2Jdy24qqXrMMOU6lpPAyBWyWuQ=
 github.com/xdg/scram v0.0.0-20180814205039-7eeb5667e42c/go.mod h1:lB8K/P019DLNhemzwFU4jHLhdvlE6uDZjXFejJXr49I=
 github.com/xdg/stringprep v1.0.0/go.mod h1:Jhud4/sHMO4oL310DaZAKk9ZaJ08SJfe+sJh0HrGL1Y=
+go.opentelemetry.io/otel v0.18.0 h1:d5Of7+Zw4ANFOJB+TIn2K3QWsgS2Ht7OU9DqZHI6qu8=
+go.opentelemetry.io/otel v0.18.0/go.mod h1:PT5zQj4lTsR1YeARt8YNKcFb88/c2IKoSABK9mX0r78=
+go.opentelemetry.io/otel/metric v0.18.0 h1:yuZCmY9e1ZTaMlZXLrrbAPmYW6tW1A5ozOZeOYGaTaY=
+go.opentelemetry.io/otel/metric v0.18.0/go.mod h1:kEH2QtzAyBy3xDVQfGZKIcok4ZZFvd5xyKPfPcuK6pE=
+go.opentelemetry.io/otel/oteltest v0.18.0/go.mod h1:NyierCU3/G8DLTva7KRzGii2fdxdR89zXKH1bNWY7Bo=
+go.opentelemetry.io/otel/trace v0.18.0 h1:ilCfc/fptVKaDMK1vWk0elxpolurJbEgey9J6g6s+wk=
+go.opentelemetry.io/otel/trace v0.18.0/go.mod h1:FzdUu3BPwZSZebfQ1vl5/tAa8LyMLXSJN57AXIt/iDk=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
+google.golang.org/protobuf v0.0.0-20200109180630-ec00e32a8dfd/go.mod h1:DFci5gLYBciE7Vtevhsrf46CRTquxDuWsQurQQe4oz8=
+google.golang.org/protobuf v0.0.0-20200221191635-4d8936d0db64/go.mod h1:kwYJMbMJ01Woi6D6+Kah6886xMZcty6N08ah7+eCXa0=
+google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQJ+fmap5saPgwCLgHXTUD7jkjRqWcaiX5VyM=
+google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
+google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
+google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys=
@@ -91,3 +125,4 @@ gopkg.in/jcmturner/gokrb5.v7 v7.5.0/go.mod h1:l8VISx+WGYp+Fp7KRbsiUuXTTOnxIc3Tuv
 gopkg.in/jcmturner/rpc.v1 v1.1.0 h1:QHIUxTX1ISuAv9dD2wJ9HWQVuWDX/Zc0PfeC2tjc4rU=
 gopkg.in/jcmturner/rpc.v1 v1.1.0/go.mod h1:YIdkC4XfD6GXbzje11McwsDuOlZQSb9W4vfLvuNnlv8=
 gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw=
+gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

plugin/redis/src/redis.go

@@ -1,12 +1,13 @@
 package src
 
 import (
-	"errors"
-	"github.com/brokercap/Bifrost/plugin/driver"
 	"encoding/json"
+	"errors"
 	"fmt"
-	//"github.com/garyburd/redigo/redis"
-	"github.com/go-redis/redis"
+	"github.com/brokercap/Bifrost/plugin/driver"
+	"context"
+	//"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 	"strconv"
 	"strings"
 	"time"
@@ -19,6 +20,8 @@ func init(){
 	driver.Register("redis",NewConn,VERSION,BIFROST_VERION)
 }
 
+var ctx = context.Background()
+
 type Conn struct {
 	driver.PluginDriverInterface
 	Uri    		*string
@@ -143,7 +146,7 @@ func (This *Conn) Connect() bool {
 		PoolSize: 4096,
 	})
 
-	_, This.err = universalClient.Ping().Result()
+	_, This.err = universalClient.Ping(ctx).Result()
 	if This.err != nil {
 		This.status = ""
 		return false
@@ -202,10 +205,10 @@ func (This *Conn) Update(data *driver.PluginDataType,retry bool) (*driver.Plugin
 	switch This.p.Type {
 	case "set":
 		if This.p.ValConfig != ""{
-			err =This.conn.Set(Key, This.getVal(data,index), time.Duration(This.p.Expir) * time.Second).Err()
+			err =This.conn.Set(ctx,Key, This.getVal(data,index), time.Duration(This.p.Expir) * time.Second).Err()
 		}else {
 			vbyte, _ := json.Marshal(data.Rows[index])
-			err =This.conn.Set(Key, string(vbyte), time.Duration(This.p.Expir) * time.Second).Err()
+			err =This.conn.Set(ctx,Key, string(vbyte), time.Duration(This.p.Expir) * time.Second).Err()
 		}
 		break
 	case "list":
@@ -231,7 +234,7 @@ func (This *Conn) Del(data *driver.PluginDataType,retry bool)(*driver.PluginData
 	var err error
 	switch This.p.Type {
 	case "set":
-		err = This.conn.Del(Key).Err()
+		err = This.conn.Del(ctx,Key).Err()
 		break
 	case "list":
 		return This.SendToList(Key,data)
@@ -258,7 +261,7 @@ func (This *Conn) SendToList(Key string, data *driver.PluginDataType) (*driver.P
 		}
 		Val = string(c)
 	}
-	err =This.conn.LPush(Key, Val).Err()
+	err =This.conn.LPush(ctx,Key, Val).Err()
 
 	if err != nil {
 		return nil,data,err
@@ -283,7 +286,10 @@ func (This *Conn) Commit(data *driver.PluginDataType,retry bool) (LastSuccessCom
 	}
 	if This.p.Type == "list" {
 		Key := This.getKeyVal(data, 0)
-		return This.SendToList(Key,data)
+		LastSuccessCommitData , ErrData , err =  This.SendToList(Key,data)
+		if err != nil {
+			return
+		}
 	}
 	return data,nil,nil
 }

plugin/redis/src/redis_test.go

@@ -1,19 +1,21 @@
 package src_test
 
 import (
-	"testing"
-	"log"
-	"github.com/brokercap/Bifrost/sdk/pluginTestData"
-	MyPlugin "github.com/brokercap/Bifrost/plugin/redis/src"
-	"github.com/go-redis/redis"
+	"context"
 	"fmt"
+	MyPlugin "github.com/brokercap/Bifrost/plugin/redis/src"
+	"github.com/brokercap/Bifrost/sdk/pluginTestData"
+	"github.com/go-redis/redis/v8"
+	"log"
 	"strings"
+	"testing"
 )
 
-var url string = "10.40.2.41:6379"
+var url string = "192.168.220.130:6379"
 var event *pluginTestData.Event
 var SchemaName = "bifrost_test"
 var TableName = "binlog_field_test"
+var ctx = context.Background()
 
 func testBefore()  {
 	event = pluginTestData.NewEvent()
@@ -45,7 +47,7 @@ func initRedisConn() error{
 
 func TestChechUri(t *testing.T){
 	testBefore()
-	var url string = "127.0.0.1:6379"
+	var url string = "192.168.220.130:6379"
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
 	if err := myConn.CheckUri();err!= nil{
@@ -69,6 +71,7 @@ func TestInsert(t *testing.T){
 	testBefore()
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
+	myConn.Open()
 	_ ,err := myConn.SetParam(getParam())
 	if err != nil {
 		t.Fatal(err)
@@ -84,6 +87,7 @@ func TestUpate(t *testing.T){
 	testBefore()
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
+	myConn.Open()
 	_ ,err := myConn.SetParam(getParam())
 	if err != nil {
 		t.Fatal(err)
@@ -100,6 +104,7 @@ func TestDelete(t *testing.T){
 	testBefore()
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
+	myConn.Open()
 	_ ,err := myConn.SetParam(getParam())
 	if err != nil {
 		t.Fatal(err)
@@ -116,6 +121,7 @@ func TestQuery(t *testing.T){
 	testBefore()
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
+	myConn.Open()
 	_ ,err := myConn.SetParam(getParam())
 	if err != nil {
 		t.Fatal(err)
@@ -131,6 +137,7 @@ func TestCommit(t *testing.T){
 	testBefore()
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
+	myConn.Open()
 	_ ,err := myConn.SetParam(getParam())
 	if err != nil {
 		t.Fatal(err)
@@ -151,6 +158,7 @@ func TestCheckData(t *testing.T){
 	}
 	myConn := MyPlugin.NewConn()
 	myConn.SetOption(&url,nil)
+	myConn.Open()
 	_ ,err = myConn.SetParam(getParam())
 	if err != nil {
 		t.Fatal(err)
@@ -172,7 +180,7 @@ func TestCheckData(t *testing.T){
 	var key string
 	key = insertData.SchemaName+"-"+insertData.TableName+"-"+fmt.Sprint(insertData.Rows[0]["id"])
 	var c string
-	c,err = redisConn.Get( key).Result()
+	c,err = redisConn.Get(ctx,key).Result()
 	if err!=nil{
 		t.Fatal(err)
 	}
@@ -203,7 +211,7 @@ func TestCheckData(t *testing.T){
 	}
 
 	key = updateData.SchemaName+"-"+updateData.TableName+"-"+fmt.Sprint(updateData.Rows[1]["id"])
-	c,err = redisConn.Get( key).Result()
+	c,err = redisConn.Get(ctx,key).Result()
 	if err!=nil{
 		t.Fatal(err)
 	}
@@ -233,7 +241,7 @@ func TestCheckData(t *testing.T){
 	}
 
 	key = deleteData.SchemaName+"-"+deleteData.TableName+"-"+fmt.Sprint(deleteData.Rows[0]["id"])
-	c,err = redisConn.Get( key).Result()
+	c,err = redisConn.Get(ctx,key).Result()
 	if strings.Contains(fmt.Sprint(err),"redis: nil") {
 		t.Log("key:",key, " delete success")
 	}else{

xdb/redis/redis.go

@@ -1,18 +1,21 @@
 package redis
 
 import (
+	"context"
 	"github.com/brokercap/Bifrost/xdb/driver"
 	"fmt"
 	"strings"
 	"strconv"
-	"github.com/go-redis/redis"
+	"github.com/go-redis/redis/v8"
 	"time"
 )
 
-const VERSION  = "v1.1.0"
+const VERSION  = "v1.1.1"
 
 type MyConn struct {}
 
+var ctx = context.Background()
+
 func (MyConn *MyConn) Open(uri string) (driver.XdbDriver,error){
 	return newConn(uri)
 }
@@ -87,7 +90,7 @@ func (This *Conn) Connect() error{
 		PoolSize: 4096,
 	})
 
-	_, This.err = universalClient.Ping().Result()
+	_, This.err = universalClient.Ping(ctx).Result()
 	if This.err != nil {
 		This.status = ""
 		return This.err
@@ -121,7 +124,7 @@ func (This *Conn) InitConn()  {
 
 func (This *Conn) GetKeyVal(key []byte) ([]byte,error){
 	This.InitConn()
-	f := This.conn.Get(string(key))
+	f := This.conn.Get(ctx,string(key))
 	s,err := f.Bytes()
 	if err != nil{
 		if err.Error() == "redis: nil"{
@@ -135,7 +138,7 @@ func (This *Conn) GetKeyVal(key []byte) ([]byte,error){
 
 func (This *Conn) PutKeyVal(key []byte,val []byte) error{
 	This.InitConn()
-	err := This.conn.Set(string(key),string(val),time.Duration(0)).Err()
+	err := This.conn.Set(ctx,string(key),string(val),time.Duration(0)).Err()
 	if err != nil{
 		This.Close()
 		return err
@@ -145,7 +148,7 @@ func (This *Conn) PutKeyVal(key []byte,val []byte) error{
 
 func (This *Conn) DelKeyVal(key []byte) error{
 	This.InitConn()
-	err := This.conn.Del(string(key)).Err()
+	err := This.conn.Del(ctx,string(key)).Err()
 	if err != nil{
 		if err.Error() != "redis: nil"{
 			This.Close()
@@ -158,7 +161,7 @@ func (This *Conn) DelKeyVal(key []byte) error{
 func (This *Conn) GetListByKeyPrefix(key []byte) ([]driver.ListValue,error){
 	This.InitConn()
 	data := make([]driver.ListValue,0)
-	list,err := This.conn.Keys(string(key)+"*").Result()
+	list,err := This.conn.Keys(ctx,string(key)+"*").Result()
 	if err != nil{
 		This.Close()
 		return data,err

xdb/redis/redis_test.go

@@ -7,7 +7,7 @@ import (
 )
 
 func getConn() (driver.XdbDriver,error)  {
-	uri := "10.40.2.41:6379"
+	uri := "192.168.220.130:6379"
 	MyConn := redis.MyConn{}
 	return  MyConn.Open(uri)
 }