From 62485b6d54e7f8394272b1b80778f677b0fc5996 Mon Sep 17 00:00:00 2001 From: mountain Date: Sun, 16 Jul 2023 15:36:20 +0900 Subject: [PATCH] =?UTF-8?q?redis=20json=20=EB=A7=88=EC=9D=B4=EA=B7=B8?= =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=85=98=20=EC=99=84=EB=A3=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/group_memory.go | 15 +- core/redison_handler.go | 361 ++++++++++++++++++++++++++++++++++++++++ core/rejson_handler.go | 210 ----------------------- core/tavern_test.go | 42 ++--- go.mod | 2 +- go.sum | 52 ------ 6 files changed, 381 insertions(+), 301 deletions(-) create mode 100644 core/redison_handler.go delete mode 100644 core/rejson_handler.go diff --git a/core/group_memory.go b/core/group_memory.go index ee766d4..6d9fb32 100644 --- a/core/group_memory.go +++ b/core/group_memory.go @@ -7,7 +7,6 @@ import ( "time" "github.com/go-redis/redis/v8" - "github.com/nitishm/go-rejson/v4/rjs" "repositories.action2quare.com/ayo/gocommon" "repositories.action2quare.com/ayo/gocommon/logger" "repositories.action2quare.com/ayo/gocommon/wshandler" @@ -50,7 +49,7 @@ type groupDoc struct { Members map[string]*memberDoc `json:"members"` InCharge string `json:"incharge"` - rh *RejsonHandler + rh *RedisonHandler id groupID idhex string } @@ -134,7 +133,7 @@ func (gd *groupDoc) addMember(mid accountID, doc bson.M) (*memberDoc, error) { Body: doc, } - if _, err := gd.rh.JSONSet(gd.strid(), "$.members."+gd.tid(mid), memdoc, rjs.SetOptionXX); err != nil { + if _, err := gd.rh.JSONSet(gd.strid(), "$.members."+gd.tid(mid), memdoc, SetOptionXX); err != nil { return nil, err } @@ -151,7 +150,7 @@ type groupInMemory struct { sendUpstreamMessage func(*wshandler.UpstreamMessage) sendEnterRoomMessage func(groupID, accountID) sendLeaveRoomMessage func(groupID, accountID) - rh *RejsonHandler + rh *RedisonHandler } func (gm *groupInMemory) createGroup(newid groupID, charge accountID, chargeDoc bson.M) (*groupDoc, error) { @@ -172,7 +171,7 @@ func (gm *groupInMemory) createGroup(newid groupID, charge accountID, chargeDoc id: newid, } - _, err := gm.rh.JSONSet(gd.strid(), "$", gd, rjs.SetOptionNX) + _, err := gm.rh.JSONSet(gd.strid(), "$", gd, SetOptionNX) if err != nil { return nil, err } @@ -367,7 +366,7 @@ func (gm *groupInMemory) UpdateMemberDocument(gid groupID, mid accountID, doc bs id: gid, rh: gm.rh, } - _, err := gm.rh.JSONSet(gd.strid(), "$.members."+gd.tid(mid)+".body", doc, rjs.SetOptionXX) + _, err := gm.rh.JSONSet(gd.strid(), "$.members."+gd.tid(mid)+".body", doc, SetOptionXX) if err != nil { return err } @@ -392,7 +391,7 @@ func (gm *groupInMemory) UpdateGroupDocument(gid groupID, body []byte) error { id: gid, rh: gm.rh, } - _, err := gm.rh.JSONSet(gd.strid(), "$.members.body", body, rjs.SetOptionXX) + _, err := gm.rh.JSONSet(gd.strid(), "$.members.body", body, SetOptionXX) return err } @@ -410,7 +409,7 @@ func (cfg *groupConfig) prepareInMemory(ctx context.Context, typename string, su // 각 함수에서는 publish gm := &groupInMemory{ groupConfig: cfg, - rh: NewReJSONHandler(ctx, redisClient), + rh: NewRedisonHandler(ctx, redisClient), sendUpstreamMessage: func(msg *wshandler.UpstreamMessage) { wsh.SendUpstreamMessage(region, msg) }, diff --git a/core/redison_handler.go b/core/redison_handler.go new file mode 100644 index 0000000..93c19cc --- /dev/null +++ b/core/redison_handler.go @@ -0,0 +1,361 @@ +package core + +import ( + "context" + "encoding/json" + "fmt" + "strings" + + "github.com/go-redis/redis/v8" +) + +type SetOption string +type GetOption = [2]any + +const ( + // JSONSET command Options + SetOptionNX SetOption = "NX" + SetOptionXX SetOption = "XX" +) + +var ( + GetOptionSPACE = GetOption{"SPACE", " "} + GetOptionINDENT = GetOption{"INDENT", "\t"} + GetOptionNEWLINE = GetOption{"NEWLINE", "\n"} + GetOptionNOESCAPE = GetOption{"NOESCAPE", ""} +) + +// gocommon으로 옮길 거 +type RedisonHandler struct { + *redis.Client + ctx context.Context +} + +func NewRedisonHandler(ctx context.Context, redisClient *redis.Client) *RedisonHandler { + return &RedisonHandler{ + Client: redisClient, + ctx: ctx, + } +} + +func respToArray[T any](resp any, err error) ([]T, error) { + if err != nil { + return nil, err + } + + resArr := resp.([]any) + v := make([]T, len(resArr)) + for i, e := range resArr { + v[i] = e.(T) + } + return v, nil +} + +func appendArgs[T any](args []any, ext ...T) []any { + for _, e := range ext { + args = append(args, e) + } + return args +} + +func (rh *RedisonHandler) JSONMSet(key string, kv map[string]any) error { + pl := rh.Pipeline() + for path, obj := range kv { + b, err := json.Marshal(obj) + if err != nil { + return err + } + pl.Do(rh.ctx, "JSON.SET", key, path, b) + } + + cmders, err := pl.Exec(rh.ctx) + if err != nil { + return err + } + + for _, cmder := range cmders { + if cmder.Err() != nil { + return cmder.Err() + } + } + return nil +} + +func (rh *RedisonHandler) JSONSet(key, path string, obj any, opts ...SetOption) (bool, error) { + b, err := json.Marshal(obj) + if err != nil { + return false, err + } + + args := []any{ + "JSON.SET", + key, + path, + b, + } + if len(opts) > 0 { + args = append(args, opts[0]) + } + + res, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return false, err + } + + return res.(string) == "OK", nil +} + +func (rh *RedisonHandler) JSONGet(key, path string, opts ...GetOption) (res any, err error) { + args := appendArgs[string]([]any{ + "JSON.GET", + key, + }, strings.Split(path, " ")...) + + for _, opt := range opts { + args = append(args, opt[:]...) + } + + return rh.Do(rh.ctx, args...).Result() +} + +func (rh *RedisonHandler) JSONGetString(key, path string) ([]string, error) { + return respToArray[string](rh.JSONResp(key, path)) +} + +func (rh *RedisonHandler) JSONGetInt64(key, path string) ([]int64, error) { + return respToArray[int64](rh.JSONResp(key, path)) +} + +func (rh *RedisonHandler) JSONMGet(path string, keys ...string) (res any, err error) { + args := appendArgs[string]([]any{ + "JSON.MGET", + path, + }, keys...) + return rh.Do(rh.ctx, args...).Result() +} + +func (rh *RedisonHandler) JSONMDel(key string, paths []string) error { + pl := rh.Pipeline() + for _, path := range paths { + args := []any{ + "JSON.DEL", + key, + path, + } + pl.Do(rh.ctx, args...) + } + _, err := pl.Exec(rh.ctx) + return err +} + +func (rh *RedisonHandler) JSONDel(key, path string) (int64, error) { + args := []any{ + "JSON.DEL", + key, + path, + } + resp, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return 0, err + } + + return resp.(int64), nil +} + +func (rh *RedisonHandler) JSONType(key, path string) ([]string, error) { + args := []any{ + "JSON.TYPE", + key, + path, + } + return respToArray[string](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONNumIncrBy(key, path string, number int) ([]any, error) { + args := []any{ + "JSON.NUMINCRBY", + key, + path, + number, + } + resp, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return nil, err + } + + return resp.([]any), nil +} + +func (rh *RedisonHandler) JSONNumMultBy(key, path string, number int) (res any, err error) { + args := []any{ + "JSON.NUMMULTBY", + key, + path, + number, + } + resp, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return nil, err + } + + return resp.([]any), nil +} + +func (rh *RedisonHandler) JSONStrAppend(key, path string, jsonstring string) ([]int64, error) { + args := []any{ + "JSON.STRAPPEND", + key, + path, + fmt.Sprintf(`'"%s"'`, jsonstring), + } + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONStrLen(key, path string) (res []int64, err error) { + args := []any{ + "JSON.STRLEN", + key, + path, + } + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONArrAppend(key, path string, values ...any) (int64, error) { + args := []any{ + "JSON.ARRAPPEND", + key, + path, + } + resp, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return 0, err + } + + return resp.(int64), nil +} + +func (rh *RedisonHandler) JSONArrLen(key, path string) ([]int64, error) { + args := []any{ + "JSON.ARRLEN", + key, + path, + } + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONArrPop(key, path string, index int) (res any, err error) { + args := []any{ + "JSON.ARRPOP", + key, + path, + index, + } + resp, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return nil, err + } + return resp.([]any)[0], nil +} + +func appendValues(args []any, values ...any) []any { + for _, jsonValue := range values { + switch jsonValue := jsonValue.(type) { + case string: + args = append(args, fmt.Sprintf(`'"%s"'`, jsonValue)) + case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64: + args = append(args, jsonValue) + default: + bt, _ := json.Marshal(jsonValue) + args = append(args, bt) + } + } + return args +} + +func (rh *RedisonHandler) JSONArrIndex(key, path string, jsonValue any, optionalRange ...int) ([]int64, error) { + args := appendValues([]any{ + "JSON.ARRINDEX", + key, + path, + }, jsonValue) + + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONArrTrim(key, path string, start, end int) (res any, err error) { + args := []any{ + "JSON.ARRTRIM", + key, + path, + start, + end, + } + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONArrInsert(key, path string, index int, values ...any) (res any, err error) { + args := appendValues([]any{ + "JSON.ARRINSERT", + key, + path, + index, + }, values...) + + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONObjKeys(key, path string) ([]string, error) { + args := []any{ + "JSON.OBJKEYS", + key, + path, + } + + res, err := rh.Do(rh.ctx, args...).Result() + if err != nil { + return nil, err + } + + resArr := res.([]any) + resArr = resArr[0].([]any) + slc := make([]string, len(resArr)) + + for i, r := range resArr { + slc[i] = r.(string) + } + + return slc, nil +} + +func (rh *RedisonHandler) JSONObjLen(key, path string) ([]int64, error) { + args := []any{ + "JSON.OBJLEN", + key, + path, + } + + return respToArray[int64](rh.Do(rh.ctx, args...).Result()) +} + +func (rh *RedisonHandler) JSONDebug(key, path string) (res any, err error) { + args := []any{ + "JSON.DEBUG", + "MEMORY", + key, + path, + } + return rh.Do(rh.ctx, args...).Result() +} + +func (rh *RedisonHandler) JSONForget(key, path string) (int64, error) { + return rh.JSONDel(key, path) +} + +func (rh *RedisonHandler) JSONResp(key, path string) (res any, err error) { + args := []any{ + "JSON.RESP", + key, + path, + } + return rh.Do(rh.ctx, args...).Result() +} diff --git a/core/rejson_handler.go b/core/rejson_handler.go deleted file mode 100644 index 698fc3c..0000000 --- a/core/rejson_handler.go +++ /dev/null @@ -1,210 +0,0 @@ -package core - -import ( - "context" - "encoding/json" - - "github.com/go-redis/redis/v8" - "github.com/nitishm/go-rejson/v4" - "github.com/nitishm/go-rejson/v4/rjs" -) - -// gocommon으로 옮길 거 -type RejsonHandler struct { - *redis.Client - inner *rejson.Handler - ctx context.Context -} - -func NewReJSONHandler(ctx context.Context, redisClient *redis.Client) *RejsonHandler { - inner := rejson.NewReJSONHandler() - inner.SetGoRedisClientWithContext(ctx, redisClient) - return &RejsonHandler{ - Client: redisClient, - inner: inner, - ctx: ctx, - } -} - -func respToArray[T any](resp any) []T { - resArr := resp.([]any) - v := make([]T, len(resArr)) - for i, e := range resArr { - v[i] = e.(T) - } - return v -} - -func (rh *RejsonHandler) JSONMSet(key string, kv map[string]any) error { - pl := rh.Pipeline() - for path, obj := range kv { - b, err := json.Marshal(obj) - if err != nil { - return err - } - pl.Do(rh.ctx, []any{"JSON.SET"}, key, path, b) - } - - cmders, err := pl.Exec(rh.ctx) - if err != nil { - return err - } - - for _, cmder := range cmders { - if cmder.Err() != nil { - return cmder.Err() - } - } - return nil -} - -func (rh *RejsonHandler) JSONSet(key, path string, obj any, opts ...rjs.SetOption) (res interface{}, err error) { - b, err := json.Marshal(obj) - if err != nil { - return nil, err - } - args := []any{ - []any{"JSON.SET"}, - key, - path, - b, - } - if len(opts) > 0 { - args = append(args, opts[0]) - } - - return rh.Do(rh.ctx, args...).Result() -} - -func (rh *RejsonHandler) JSONGet(key, path string, opts ...rjs.GetOption) (res interface{}, err error) { - return rh.inner.JSONGet(key, path, opts...) -} - -func (rh *RejsonHandler) JSONGetString(key, path string) ([]string, error) { - res, err := rh.inner.JSONResp(key, path) - if err != nil { - return nil, err - } - return respToArray[string](res), nil -} - -func (rh *RejsonHandler) JSONGetInt64(key, path string) ([]int64, error) { - res, err := rh.inner.JSONResp(key, path) - if err != nil { - return nil, err - } - return respToArray[int64](res), nil -} - -func (rh *RejsonHandler) JSONMGet(path string, keys ...string) (res interface{}, err error) { - return rh.inner.JSONMGet(path, keys...) -} - -func (rh *RejsonHandler) JSONMDel(key string, paths []string) error { - pl := rh.Pipeline() - for _, path := range paths { - name, args, err := rjs.CommandBuilder(rjs.ReJSONCommandDEL, key, path) - if err != nil { - return err - } - args = append([]interface{}{name}, args...) - pl.Do(rh.ctx, args...) - } - _, err := pl.Exec(rh.ctx) - return err -} - -func (rh *RejsonHandler) JSONDel(key, path string) (res interface{}, err error) { - return rh.inner.JSONDel(key, path) -} - -func (rh *RejsonHandler) JSONType(key, path string) (res interface{}, err error) { - return rh.inner.JSONType(key, path) -} - -func (rh *RejsonHandler) JSONNumIncrBy(key, path string, number int) (res interface{}, err error) { - return rh.inner.JSONNumIncrBy(key, path, number) -} - -func (rh *RejsonHandler) JSONNumMultBy(key, path string, number int) (res interface{}, err error) { - return rh.inner.JSONNumMultBy(key, path, number) -} - -func (rh *RejsonHandler) JSONStrAppend(key, path string, jsonstring string) (res interface{}, err error) { - return rh.inner.JSONStrAppend(key, path, jsonstring) -} - -func (rh *RejsonHandler) JSONStrLen(key, path string) (res interface{}, err error) { - return rh.inner.JSONStrLen(key, path) -} - -func (rh *RejsonHandler) JSONArrAppend(key, path string, values ...interface{}) (res interface{}, err error) { - return rh.inner.JSONArrAppend(key, path, values...) -} - -func (rh *RejsonHandler) JSONArrLen(key, path string) (res interface{}, err error) { - return rh.inner.JSONArrLen(key, path) -} - -func (rh *RejsonHandler) JSONArrPop(key, path string, index int) (res interface{}, err error) { - return rh.inner.JSONArrPop(key, path, index) -} - -func (rh *RejsonHandler) JSONArrIndex(key, path string, jsonValue interface{}, optionalRange ...int) (res interface{}, err error) { - return rh.inner.JSONArrIndex(key, path, jsonValue, optionalRange...) -} - -func (rh *RejsonHandler) JSONArrTrim(key, path string, start, end int) (res interface{}, err error) { - return rh.inner.JSONArrTrim(key, path, start, end) -} - -func (rh *RejsonHandler) JSONArrInsert(key, path string, index int, values ...interface{}) (res interface{}, err error) { - return rh.inner.JSONArrInsert(key, path, index, values...) -} - -func (rh *RejsonHandler) JSONObjKeys(key, path string) ([]string, error) { - name, args, err := rjs.CommandBuilder(rjs.ReJSONCommandOBJKEYS, key, path) - if err != nil { - return nil, err - } - - args = append([]interface{}{name}, args...) - res, err := rh.Do(rh.ctx, args...).Result() - if err != nil { - return nil, err - } - - resArr := res.([]any) - resArr = resArr[0].([]any) - slc := make([]string, len(resArr)) - - for i, r := range resArr { - slc[i] = r.(string) - } - - return slc, nil -} - -func (rh *RejsonHandler) JSONObjLen(key, path string) (res interface{}, err error) { - return rh.inner.JSONObjLen(key, path) -} - -func (rh *RejsonHandler) JSONObjLenInt64(key, path string) (int64, error) { - res, err := rh.inner.JSONObjLen(key, path) - if err != nil { - return 0, err - } - return res.([]any)[0].(int64), nil -} - -func (rh *RejsonHandler) JSONDebug(subCmd rjs.DebugSubCommand, key, path string) (res interface{}, err error) { - return rh.inner.JSONDebug(subCmd, key, path) -} - -func (rh *RejsonHandler) JSONForget(key, path string) (res interface{}, err error) { - return rh.inner.JSONForget(key, path) -} - -func (rh *RejsonHandler) JSONResp(key, path string) (res interface{}, err error) { - return rh.inner.JSONResp(key, path) -} diff --git a/core/tavern_test.go b/core/tavern_test.go index 9cacfbc..a947d6d 100644 --- a/core/tavern_test.go +++ b/core/tavern_test.go @@ -12,7 +12,7 @@ import ( func TestReJSON(t *testing.T) { rc := redis.NewClient(&redis.Options{Addr: "192.168.8.94:6380"}) - rh := NewReJSONHandler(context.Background(), rc) + rh := NewRedisonHandler(context.Background(), rc) testDoc := map[string]any{ "members": map[string]any{ @@ -36,39 +36,21 @@ func TestReJSON(t *testing.T) { midout := gd.mid(tid) logger.Println(midin, tid, midout) - res, err := rh.JSONSet("jsontest", "$", testDoc) - logger.Println(res, err) + logger.Println(rh.JSONSet("jsontest", "$", testDoc)) + logger.Println(rh.JSONGet("jsontest", "$")) + logger.Println(rh.JSONResp("jsontest", "$.members")) + logger.Println(rh.JSONGetString("jsontest", "$.members..key")) + logger.Println(rh.JSONGetInt64("jsontest", "$.members..exp")) + logger.Println(rh.JSONObjKeys("jsontest", "$.members")) - res, err = rh.JSONResp("jsontest", "$.members") - vars := res.([]any) - logger.Println(vars, err) - - res, err = rh.JSONGetString("jsontest", "$.members..key") - logger.Println(res, err) - - res, err = rh.JSONGetInt64("jsontest", "$.members..exp") - logger.Println(res, err) - - res, err = rh.JSONObjKeys("jsontest", "$.members") - logger.Println(res, err) - - err = rh.JSONMSet("jsontest", map[string]any{ + err := rh.JSONMSet("jsontest", map[string]any{ "$.members.mid1.key": "newval", "$.members.mid2.key": "newval", }) logger.Println(err) - res, err = rh.JSONGet("jsontest", "$") - logger.Println(string(res.([]byte)), err) - - err = rh.JSONMDel("jsontest", []string{"$.members.mid1", "$.members.mid2"}) - logger.Println(err) - - res, err = rh.JSONGet("jsontest", "$") - logger.Println(string(res.([]byte)), err) - - res, err = rh.JSONObjLen("jsontest", "$.members") - count := res.([]any)[0].(int64) - logger.Println(count, err) - + logger.Println(rh.JSONGet("jsontest", "$")) + logger.Println(rh.JSONMDel("jsontest", []string{"$.members.mid1", "$.members.mid2"})) + logger.Println(rh.JSONGet("jsontest", "$")) + logger.Println(rh.JSONObjLen("jsontest", "$.members")) } diff --git a/go.mod b/go.mod index 5c7e213..4e0302a 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,6 @@ go 1.20 require ( github.com/go-redis/redis/v8 v8.11.5 - github.com/nitishm/go-rejson/v4 v4.1.0 go.mongodb.org/mongo-driver v1.11.7 repositories.action2quare.com/ayo/gocommon v0.0.0-20230715080833-f0f459332d1a ) @@ -13,6 +12,7 @@ require ( github.com/cespare/xxhash/v2 v2.2.0 // indirect github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect github.com/golang/snappy v0.0.4 // indirect + github.com/google/go-cmp v0.5.4 // indirect github.com/gorilla/websocket v1.5.0 // indirect github.com/klauspost/compress v1.16.6 // indirect github.com/montanaflynn/stats v0.7.1 // indirect diff --git a/go.sum b/go.sum index 06ed224..6ef210b 100644 --- a/go.sum +++ b/go.sum @@ -1,4 +1,3 @@ -github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/cespare/xxhash/v2 v2.2.0 h1:DC2CZ1Ep5Y4k3ZQ899DldepgrayRUGE6BBZ/cd9Cj44= github.com/cespare/xxhash/v2 v2.2.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -6,33 +5,17 @@ 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/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4= -github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ= -github.com/go-redis/redis/v8 v8.4.4/go.mod h1:nA0bQuF0i5JFx4Ta9RZxGKXFrQ8cRWntra97f0196iY= github.com/go-redis/redis/v8 v8.11.5 h1:AcZZR7igkdvfVmQTPnu9WE37LRrO/YrBH5zWyjDC0oI= github.com/go-redis/redis/v8 v8.11.5/go.mod h1:gREzHqY1hg6oD9ngVRbLStwAWKhA0FEgq8Jd4h5lpwo= -github.com/golang/protobuf v1.2.0/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.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.4 h1:yAGX7huGHXlcLOEtBnF4w7FQwA26wojNCwOYAEhLjQM= github.com/golang/snappy v0.0.4/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/gomodule/redigo v1.8.3 h1:HR0kYDX2RJZvAup8CsiJwxB4dTCSC0AaUq6S4SiLwUc= -github.com/gomodule/redigo v1.8.3/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= -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.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/google/go-cmp v0.5.4 h1:L8R9j+yAqZuZjsqh/z+F1NCffTKKLShY6zXTItVIZ8M= github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE= github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc= github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE= -github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpOxQnU= github.com/klauspost/compress v1.13.6/go.mod h1:/3/Vjq9QcHkK5uEr5lBEmyoZ1iFhe47etQ6QUkpK6sk= github.com/klauspost/compress v1.16.6 h1:91SKEy4K37vkp255cJ8QesJhjyRO0hn9i9G0GoUwLsk= github.com/klauspost/compress v1.16.6/go.mod h1:ntbaceVETuRiXiv4DpjP66DpAtAGkEQskQzEyD//IeE= @@ -44,17 +27,8 @@ github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/montanaflynn/stats v0.0.0-20171201202039-1bf9dbcd8cbe/go.mod h1:wL8QJuTMNUDYhXwkmfOly8iTdp5TEcJFWZD2D7SIkUc= github.com/montanaflynn/stats v0.7.1 h1:etflOAAHORrCC44V+aR6Ftzort912ZU+YLiSTuV8eaE= github.com/montanaflynn/stats v0.7.1/go.mod h1:etXPPgVO6n31NxCd9KQUMvCM+ve0ruNzt6R8Bnaayow= -github.com/nitishm/go-rejson/v4 v4.1.0 h1:NckPgP5ct9ZsQp+aueVCXBiFZ7FBUwltBkEAjg98mJY= -github.com/nitishm/go-rejson/v4 v4.1.0/go.mod h1:LG1zga7gFp/GH+0IAbXZ7rM4MJruA8B2dXvmXwV7VZo= -github.com/nxadm/tail v1.4.4/go.mod h1:kenIhsEOeOJmVchQTgglprH7qJGnHDVpk1VPCcaMI8A= github.com/nxadm/tail v1.4.8 h1:nPr65rt6Y5JFSKQO7qToXr7pePgD6Gwiw05lkbyAQTE= -github.com/onsi/ginkgo v1.6.0/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE= -github.com/onsi/ginkgo v1.12.1/go.mod h1:zj2OWP4+oCPe1qIXoGWkgMRwljMUYCdkwsT2108oapk= -github.com/onsi/ginkgo v1.14.2/go.mod h1:iSB4RoI2tjJc9BBv4NKIKWKya62Rps+oPG/Lv9klQyY= github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE= -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.4/go.mod h1:g/HbgYopi++010VEqkFgJHKC09uJiW9UkXvMUuKHUCQ= github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE= github.com/pires/go-proxyproto v0.7.0 h1:IukmRewDQFWC7kfnb66CSomk2q/seBuilHBYFwyq0Hs= github.com/pires/go-proxyproto v0.7.0/go.mod h1:Vz/1JPY/OACxWGQNIRY2BeyDmpoaWmEP40O9LbuiFR4= @@ -63,7 +37,6 @@ github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINE github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= -github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA= github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0= github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= github.com/tidwall/pretty v1.0.0 h1:HsD+QiTn7sK6flMKIvNmpqz1qrpP3Ps6jOKIKMooyg4= @@ -82,39 +55,26 @@ github.com/youmark/pkcs8 v0.0.0-20201027041543-1326539a0a0a/go.mod h1:ul22v+Nro/ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= go.mongodb.org/mongo-driver v1.11.7 h1:LIwYxASDLGUg/8wOhgOOZhX8tQa/9tgZPgzZoVqJvcs= go.mongodb.org/mongo-driver v1.11.7/go.mod h1:G9TgswdsWjX4tmDA5zfs2+6AEPpYJwqblyjsfuh8oXY= -go.opentelemetry.io/otel v0.15.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200302210943-78000ba7a073/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= -golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4= golang.org/x/crypto v0.10.0 h1:LKqV2xt9+kDzSTfOhx4FrkEBcMrAgHSYgzywV9zcGmM= golang.org/x/crypto v0.10.0/go.mod h1:o4eNf7Ede1fv+hwOwZsTHl9EsPFO6q6ZvYR8vYfY45I= golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4= -golang.org/x/net v0.0.0-20180906233101-161cd47e91fd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20200520004742-59133d7f0dd7/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A= -golang.org/x/net v0.0.0-20201202161906-c7110b5ffcbb/go.mod h1:sp8m0HH+o8qH0wwXwYZr8TS3Oi6o0r6Gce1SSxlDquU= golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v0D8zg8gWTRqZa9RBIspLL5mdg= golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c= golang.org/x/net v0.10.0 h1:X2//UzNDwYmtCLn7To6G58Wr6f5ahEAQgKNzv9Y951M= -golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.3.0 h1:ftCYgMx6zT/asHUrPw8BLLscYtGznsLAnjq5RH9P66E= golang.org/x/sync v0.3.0/go.mod h1:FU7BRWz2tNW+3quACPkgCx/L+uEAv1htQ0V83Z9Rj+Y= -golang.org/x/sys v0.0.0-20180909124046-d0be0721c37e/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200519105757-fe76b779f299/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= @@ -124,7 +84,6 @@ golang.org/x/sys v0.9.0 h1:KS/R3tvhPqvJvwcKfnBHJwwthS11LRhmM5D59eEXa0s= golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo= golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= -golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk= golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ= golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ= @@ -138,20 +97,9 @@ golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8T golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE= golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/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-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= -gopkg.in/fsnotify.v1 v1.4.7/go.mod h1:Tz8NjZHkW78fSQdbUxIjBTcgA1z1m8ZHf0WmKUhAMys= gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 h1:uRGJdciOHaEIrze2W8Q3AKkepLTh2hOroT7a+7czfdQ= -gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7/go.mod h1:dt/ZhP58zS4L8KSrWDmTeBkI65Dw0HsyUHuEVlX15mw= -gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= -gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI= gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY= gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=