update meta_data and multi root and redis version

dipper-iot · May 11, 2024 · 8ab2851 · 8ab2851
1 parent 84ff409
commit 8ab2851
Show file tree

Hide file tree

Showing 24 changed files with 21 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@
 /dipper-engine
 /plugins/
 /coverage.out
-/examples/base/go.sum
+go.sum
diff --git a/README.MD b/README.MD
@@ -98,7 +98,7 @@ c.Hook(engine.AfterStart, func(dipper *core.DipperEngine, c *cli.Context) error
 
     return dipper.Add(context.Background(), &data.Session{
         Data: map[string]interface{}{
-                "default": map[string]interface{}{
+            "default": map[string]interface{}{
                 "a": 10,
                 "b": 20,
                 "d": 5,

diff --git a/data/ouput.go b/data/ouput.go
@@ -17,6 +17,7 @@ type OutputEngine struct {
 	ChanId     string                 `json:"chan_id"`
 	IdNode     string                 `json:"id_node"`
 	FromEngine string                 `json:"from_engine"`
+	MetaData   map[string]interface{} `json:"meta_data"`
 	Data       map[string]interface{} `json:"data"`
 	BranchMain string                 `json:"branch_main"`
 	Next       []string               `json:"next"`

diff --git a/data/session.go b/data/session.go
@@ -15,6 +15,7 @@ type NodeRule struct {
 type Session struct {
 	ChanId   string                   `json:"chan_id"`
 	MapNode  map[string]*NodeRule     `json:"map_node"`
+	MetaData map[string]interface{}   `json:"meta_data"`
 	RootNode string                   `json:"root_node"`
 	Data     map[string]interface{}   `json:"data"`
 	Result   map[string]*OutputEngine `json:"result"`

diff --git a/engine/cli.go b/engine/cli.go
@@ -3,7 +3,7 @@ package engine
 import (
 	"fmt"
 	"github.com/dipper-iot/dipper-engine/core"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	"github.com/urfave/cli/v2"
 	"os"
 	"os/signal"

diff --git a/engine/dipper.go b/engine/dipper.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/internal/util"
 	rs "github.com/dipper-iot/dipper-engine/redis"
 	"github.com/dipper-iot/dipper-engine/store"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"time"

diff --git a/engine/run_test.go b/engine/run_test.go
@@ -6,7 +6,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/core"
 	"github.com/dipper-iot/dipper-engine/data"
 	"github.com/dipper-iot/dipper-engine/internal/debug"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"io"

diff --git a/examples/base/go.mod b/examples/base/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/dipper-iot/dipper-engine v0.0.0-20221022050351-f7e9b09096a6
-	github.com/go-redis/redis/v9 v9.0.0-rc.1
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/sirupsen/logrus v1.9.0
 	github.com/urfave/cli/v2 v2.11.2
 )

diff --git a/examples/redis-queue/go.mod b/examples/redis-queue/go.mod
@@ -4,7 +4,7 @@ go 1.18
 
 require (
 	github.com/dipper-iot/dipper-engine v0.0.0-20221022050351-f7e9b09096a6
-	github.com/go-redis/redis/v9 v9.0.0-rc.1
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/sirupsen/logrus v1.9.0
 	github.com/urfave/cli/v2 v2.11.2
 )

diff --git a/examples/redis-queue/go.sum b/examples/redis-queue/go.sum
diff --git a/examples/redis-queue/redis.go b/examples/redis-queue/redis.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/core"
 	"github.com/dipper-iot/dipper-engine/data"
 	"github.com/dipper-iot/dipper-engine/engine"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"io"

diff --git a/go.mod b/go.mod
@@ -5,7 +5,7 @@ go 1.18
 require (
 	github.com/Knetic/govaluate v3.0.0+incompatible
 	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef
-	github.com/go-redis/redis/v9 v9.0.0-rc.1
+	github.com/go-redis/redis/v8 v8.11.5
 	github.com/sirupsen/logrus v1.9.0
 	github.com/sony/sonyflake v1.1.0
 	github.com/urfave/cli/v2 v2.11.2

diff --git a/go.sum b/go.sum
diff --git a/internal/lock/redis_lock/try_lock.go b/internal/lock/redis_lock/try_lock.go
@@ -2,7 +2,7 @@ package redis_lock
 
 import (
 	"context"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"time"
 )

diff --git a/redis/bus.go b/redis/bus.go
@@ -3,7 +3,7 @@ package redis
 import (
 	"context"
 	"github.com/dipper-iot/dipper-engine/internal/util"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"io"
 )

diff --git a/redis/queue.go b/redis/queue.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/core"
 	"github.com/dipper-iot/dipper-engine/internal/util"
 	"github.com/dipper-iot/dipper-engine/queue"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"io"
 	"time"

diff --git a/redis/store.go b/redis/store.go
@@ -8,7 +8,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/internal/lock"
 	"github.com/dipper-iot/dipper-engine/internal/lock/redis_lock"
 	"github.com/dipper-iot/dipper-engine/internal/util"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"time"
 )

diff --git a/rules/common/connect_redis.go b/rules/common/connect_redis.go
@@ -2,7 +2,7 @@ package common
 
 import (
 	"context"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 )
 
 func ConnectRedis(ctx context.Context, option *OptionRedis) (client *redis.Client, err error) {

diff --git a/rules/input_redis_queue/input_redis_queue.go b/rules/input_redis_queue/input_redis_queue.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/errors"
 	"github.com/dipper-iot/dipper-engine/queue"
 	"github.com/dipper-iot/dipper-engine/rules/common"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"io"
 	"sync"

diff --git a/rules/input_redis_queue_extend/input_redis_queue.go b/rules/input_redis_queue_extend/input_redis_queue.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/errors"
 	"github.com/dipper-iot/dipper-engine/queue"
 	"github.com/dipper-iot/dipper-engine/rules/common"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 	"io"
 	"sync"

diff --git a/rules/input_redis_queue_extend/option.go b/rules/input_redis_queue_extend/option.go
@@ -3,7 +3,7 @@ package input_redis_queue_extend
 import (
 	"context"
 	"github.com/dipper-iot/dipper-engine/data"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 )
 
 type OptionSession struct {

diff --git a/rules/output_redis_queue/input_redis_queue.go b/rules/output_redis_queue/input_redis_queue.go
@@ -7,7 +7,6 @@ import (
 	"github.com/dipper-iot/dipper-engine/errors"
 	"github.com/dipper-iot/dipper-engine/queue"
 	"github.com/dipper-iot/dipper-engine/rules/common"
-	"github.com/go-redis/redis/v9"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/rules/output_redis_queue_extend/input_redis_queue_extend.go b/rules/output_redis_queue_extend/input_redis_queue_extend.go
@@ -7,7 +7,7 @@ import (
 	"github.com/dipper-iot/dipper-engine/errors"
 	"github.com/dipper-iot/dipper-engine/queue"
 	"github.com/dipper-iot/dipper-engine/rules/common"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	log "github.com/sirupsen/logrus"
 )
 

diff --git a/server_test.go b/server_test.go
@@ -15,7 +15,7 @@ import (
 	log2 "github.com/dipper-iot/dipper-engine/rules/log"
 	_switch "github.com/dipper-iot/dipper-engine/rules/switch"
 	"github.com/dipper-iot/dipper-engine/store"
-	"github.com/go-redis/redis/v9"
+	"github.com/go-redis/redis/v8"
 	"log"
 	"sync"
 	"testing"