From ec78e6bfd5a74c608d2dcf5f878f413051edd5c7 Mon Sep 17 00:00:00 2001 From: Sodesnei <1452401269@qq.com> Date: Mon, 27 Sep 2021 10:21:03 +0800 Subject: [PATCH 1/6] test(middleware_driver): add middleware driver test --- pkg/middle/define.go | 11 ++++++- pkg/middle/middleware_driver.go | 31 ++++++++++++++++++ pkg/middle/middleware_driver_test.go | 49 ++++++++++++++++++++++++++++ 3 files changed, 90 insertions(+), 1 deletion(-) create mode 100644 pkg/middle/middleware_driver.go create mode 100644 pkg/middle/middleware_driver_test.go diff --git a/pkg/middle/define.go b/pkg/middle/define.go index 678c75b..23c488e 100644 --- a/pkg/middle/define.go +++ b/pkg/middle/define.go @@ -1,7 +1,16 @@ package middle -import getMiddlewareMap "gitee.com/timedb/wheatCache/plugins/config" +import ( + "sync" + + getMiddlewareMap "gitee.com/timedb/wheatCache/plugins/config" +) func Init() { getMiddlewareMap.GetMiddlewareMap() } + +var ( + oneMiddle sync.Once + MiddleWareDriver *MiddleWare +) diff --git a/pkg/middle/middleware_driver.go b/pkg/middle/middleware_driver.go new file mode 100644 index 0000000..f7053a5 --- /dev/null +++ b/pkg/middle/middleware_driver.go @@ -0,0 +1,31 @@ +package middle + +import ( + "context" + + "gitee.com/timedb/wheatCache/pkg/event" +) + +type MiddleWare struct { + eventDriver event.DriverInterface + eventConsumer event.ConsumerInterface +} + +func NewMiddleWare() *MiddleWare { + oneMiddle.Do(func() { + driver := event.NewDriver(1000) + MiddleWareDriver = &MiddleWare{ + eventDriver: driver, + eventConsumer: event.NewConsumer(driver), + } + }) + return MiddleWareDriver +} + +func (m *MiddleWare) GetEventDriver() event.DriverInterface { + return m.eventDriver +} + +func (m *MiddleWare) work(ctx context.Context) { + +} diff --git a/pkg/middle/middleware_driver_test.go b/pkg/middle/middleware_driver_test.go new file mode 100644 index 0000000..3801cf2 --- /dev/null +++ b/pkg/middle/middleware_driver_test.go @@ -0,0 +1,49 @@ +package middle + +import ( + "context" + "fmt" + "testing" + + "gitee.com/timedb/wheatCache/pkg/event" +) + +func Test_middleware_driver(t *testing.T) { + + ctx := context.Background() + type Library struct { + driver MiddleWare + } + + library := &Library{ + driver: *NewMiddleWare(), + } + + + type A struct { + produce event.ProduceInterface + } + + a := &A{ + produce: event.NewProduce(library.driver.eventDriver), + } + + type B struct { + cumsumer event.ConsumerInterface + } + + b := &B{ + cumsumer: event.NewConsumer(library.driver.eventDriver), + } + + book := event.NewEvent("book") + book.SetMsg("title", "goland") + book.SetCtxValue("page", 100) + + go func() { + a.produce.Call(ctx, book) + }() + + b_book := b.cumsumer.Receive(ctx) + fmt.Println(b_book.GetMsg("title")) +} -- Gitee From 8685f5f24a70e31d0b7025f9366ffb14a80e4190 Mon Sep 17 00:00:00 2001 From: Sodesnei <1452401269@qq.com> Date: Tue, 28 Sep 2021 21:10:41 +0800 Subject: [PATCH 2/6] feat(middleware): add middleware --- middleware/config/get_middleware_map.go | 14 ++++++++++++++ middleware/logmiddle/middleware.go | 22 ++++++++++++++++++++++ pkg/lru/define.go | 8 ++++---- pkg/middle/middleware_driver_test.go | 3 ++- shell/make-struct.py | 1 - shell/proto.py | 3 ++- 6 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 middleware/config/get_middleware_map.go create mode 100644 middleware/logmiddle/middleware.go diff --git a/middleware/config/get_middleware_map.go b/middleware/config/get_middleware_map.go new file mode 100644 index 0000000..fa5b87f --- /dev/null +++ b/middleware/config/get_middleware_map.go @@ -0,0 +1,14 @@ +package config + +import ( + "gitee.com/timedb/wheatCache/middleware" + logMiddle "gitee.com/timedb/wheatCache/middleware/log-middle" +) + +func GetMiddlewareMap() map[string]middleware.MiddlewareInterface { + logMiddle := logMiddle.NewLogMiddle() + + return map[string]middleware.MiddlewareInterface{ + "logMiddle": logMiddle, + } +} diff --git a/middleware/logmiddle/middleware.go b/middleware/logmiddle/middleware.go new file mode 100644 index 0000000..34ae53f --- /dev/null +++ b/middleware/logmiddle/middleware.go @@ -0,0 +1,22 @@ +package log_middle + +import ( + "fmt" + + "gitee.com/timedb/wheatCache/middleware" +) + +type logmiddle struct { +} + +func (l *logmiddle) Init() { + fmt.Println("1") +} + +func (l *logmiddle) Exet(interface{}) (interface{}, error) { + return nil, nil +} + +func NewLogMiddle() middleware.MiddlewareInterface { + return &logmiddle{} +} diff --git a/pkg/lru/define.go b/pkg/lru/define.go index 84d56d1..8d9f76d 100644 --- a/pkg/lru/define.go +++ b/pkg/lru/define.go @@ -6,17 +6,17 @@ type SingleWorkFunc func() interface{} const ( OptionEventName = "operateEvent" - CleanEventName = "clearEvent" + CleanEventName = "clearEvent" WorkFuncEventKey = "workFunc" ) var ( lruCacheOnce sync.Once - lruCache *singleCache + lruCache *singleCache ) const ( - lruMaxSize = 1*1024*1024*1024*8 - lruClearSize = 0.5*1024*1024*1024*8 + lruMaxSize = 1 * 1024 * 1024 * 1024 * 8 + lruClearSize = 0.5 * 1024 * 1024 * 1024 * 8 lruEventDriver = 2000 ) diff --git a/pkg/middle/middleware_driver_test.go b/pkg/middle/middleware_driver_test.go index 3801cf2..c6980ac 100644 --- a/pkg/middle/middleware_driver_test.go +++ b/pkg/middle/middleware_driver_test.go @@ -19,7 +19,8 @@ func Test_middleware_driver(t *testing.T) { driver: *NewMiddleWare(), } - + library.driver.work(ctx) + type A struct { produce event.ProduceInterface } diff --git a/shell/make-struct.py b/shell/make-struct.py index 86e9787..030369e 100644 --- a/shell/make-struct.py +++ b/shell/make-struct.py @@ -62,7 +62,6 @@ def set_structure_const_template(conf: dict): val_set = [] for k, v in conf.items(): key_map.append(KeyMap(key=k, val=v)) - for val in v: val_set.append(val.upper()) diff --git a/shell/proto.py b/shell/proto.py index 9c2b57f..05f815f 100644 --- a/shell/proto.py +++ b/shell/proto.py @@ -14,7 +14,7 @@ def out_proto(): for f in files: commend = comm.format(protoPath, root, sysPath, f).strip() err = os.system(commend) - + if err: print(f, "-> out put err") else: @@ -23,3 +23,4 @@ def out_proto(): if __name__ == '__main__': out_proto() + -- Gitee From c21261ba940ee5bd510714e2b8b8bac42d05c9f2 Mon Sep 17 00:00:00 2001 From: Sodesnei <1452401269@qq.com> Date: Wed, 29 Sep 2021 13:26:02 +0800 Subject: [PATCH 3/6] feat(middle): driver get middleware map --- middleware/config/get_middleware_map.go | 2 +- pkg/middle/middleware_driver.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/middleware/config/get_middleware_map.go b/middleware/config/get_middleware_map.go index fa5b87f..dde2fdd 100644 --- a/middleware/config/get_middleware_map.go +++ b/middleware/config/get_middleware_map.go @@ -2,7 +2,7 @@ package config import ( "gitee.com/timedb/wheatCache/middleware" - logMiddle "gitee.com/timedb/wheatCache/middleware/log-middle" + logMiddle "gitee.com/timedb/wheatCache/middleware/logmiddle" ) func GetMiddlewareMap() map[string]middleware.MiddlewareInterface { diff --git a/pkg/middle/middleware_driver.go b/pkg/middle/middleware_driver.go index f7053a5..6fe04e5 100644 --- a/pkg/middle/middleware_driver.go +++ b/pkg/middle/middleware_driver.go @@ -27,5 +27,5 @@ func (m *MiddleWare) GetEventDriver() event.DriverInterface { } func (m *MiddleWare) work(ctx context.Context) { - + } -- Gitee From 6a1d8a36214996b8c4202449d2e10eae6c736b3d Mon Sep 17 00:00:00 2001 From: Sodesnei <1452401269@qq.com> Date: Wed, 29 Sep 2021 22:26:40 +0800 Subject: [PATCH 4/6] feat(middle-driver): get middleware map --- pkg/middle/middleware_driver_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/middle/middleware_driver_test.go b/pkg/middle/middleware_driver_test.go index c6980ac..1e350ce 100644 --- a/pkg/middle/middleware_driver_test.go +++ b/pkg/middle/middleware_driver_test.go @@ -39,7 +39,7 @@ func Test_middleware_driver(t *testing.T) { book := event.NewEvent("book") book.SetMsg("title", "goland") - book.SetCtxValue("page", 100) + book.SetValue("page", 100) go func() { a.produce.Call(ctx, book) -- Gitee From a606fbb08ab9d09eca41a84979e65a74a4b11658 Mon Sep 17 00:00:00 2001 From: Sodesnei <1452401269@qq.com> Date: Mon, 4 Oct 2021 11:39:01 +0800 Subject: [PATCH 5/6] fix(middle-driver): edit middledriver var --- pkg/middle/define.go | 5 +++-- pkg/middle/middleware_driver.go | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkg/middle/define.go b/pkg/middle/define.go index 23c488e..fcc5f63 100644 --- a/pkg/middle/define.go +++ b/pkg/middle/define.go @@ -3,11 +3,12 @@ package middle import ( "sync" + "gitee.com/timedb/wheatCache/plugins" getMiddlewareMap "gitee.com/timedb/wheatCache/plugins/config" ) -func Init() { - getMiddlewareMap.GetMiddlewareMap() +func Init() map[string]plugins.MiddleToolsInterface { + return getMiddlewareMap.GetMiddlewareMap() } var ( diff --git a/pkg/middle/middleware_driver.go b/pkg/middle/middleware_driver.go index 6fe04e5..5c58e03 100644 --- a/pkg/middle/middleware_driver.go +++ b/pkg/middle/middleware_driver.go @@ -2,6 +2,7 @@ package middle import ( "context" + "fmt" "gitee.com/timedb/wheatCache/pkg/event" ) @@ -27,5 +28,7 @@ func (m *MiddleWare) GetEventDriver() event.DriverInterface { } func (m *MiddleWare) work(ctx context.Context) { - + getMiddlewareMap := Init() + fmt.Println(getMiddlewareMap) + } -- Gitee From 1963843125ac39aad718b801995d125b96591833 Mon Sep 17 00:00:00 2001 From: Sodesnei <1452401269@qq.com> Date: Mon, 4 Oct 2021 21:42:34 +0800 Subject: [PATCH 6/6] fix(middle_driver): delete middleware --- middleware/config/get_middleware_map.go | 14 -------------- middleware/logmiddle/middleware.go | 22 ---------------------- 2 files changed, 36 deletions(-) delete mode 100644 middleware/config/get_middleware_map.go delete mode 100644 middleware/logmiddle/middleware.go diff --git a/middleware/config/get_middleware_map.go b/middleware/config/get_middleware_map.go deleted file mode 100644 index dde2fdd..0000000 --- a/middleware/config/get_middleware_map.go +++ /dev/null @@ -1,14 +0,0 @@ -package config - -import ( - "gitee.com/timedb/wheatCache/middleware" - logMiddle "gitee.com/timedb/wheatCache/middleware/logmiddle" -) - -func GetMiddlewareMap() map[string]middleware.MiddlewareInterface { - logMiddle := logMiddle.NewLogMiddle() - - return map[string]middleware.MiddlewareInterface{ - "logMiddle": logMiddle, - } -} diff --git a/middleware/logmiddle/middleware.go b/middleware/logmiddle/middleware.go deleted file mode 100644 index 34ae53f..0000000 --- a/middleware/logmiddle/middleware.go +++ /dev/null @@ -1,22 +0,0 @@ -package log_middle - -import ( - "fmt" - - "gitee.com/timedb/wheatCache/middleware" -) - -type logmiddle struct { -} - -func (l *logmiddle) Init() { - fmt.Println("1") -} - -func (l *logmiddle) Exet(interface{}) (interface{}, error) { - return nil, nil -} - -func NewLogMiddle() middleware.MiddlewareInterface { - return &logmiddle{} -} -- Gitee