Merge 3478004df7 into ce79b1cf28

.drone.yml

@@ -25,6 +25,9 @@ services:
     when:
       event: [ push, tag, pull_request ]
 
+  redis:
+    image: redis:3.0
+
   #mssql:
   #  image: microsoft/mssql-server-linux:2017-CU11
   #  environment:
@@ -54,12 +57,21 @@ pipeline:
         psql -U postgres -d xorm_test -h pgsql \
           -c "create schema xorm;"
 
+  init_redis:
+    image: redis:3.0
+    commands:
+      - sleep 5
+      - redis-cli -h redis ping
+      - redis-cli -h redis set HELLO hello
+      - redis-cli -h redis get HELLO
+
   build:
     image: golang:${GO_VERSION}
     commands:
       - go get -t -d -v ./...
       - go get -u xorm.io/core
       - go get -u xorm.io/builder
+      - go get -u github.com/go-xorm/xorm-redis-cache
       - go build -v
     when:
       event: [ push, pull_request ]
@@ -70,6 +82,7 @@ pipeline:
       - go get -u github.com/wadey/gocovmerge
       - go test -v -race -db="sqlite3" -conn_str="./test.db" -coverprofile=coverage1-1.txt -covermode=atomic
       - go test -v -race -db="sqlite3" -conn_str="./test.db" -cache=true -coverprofile=coverage1-2.txt -covermode=atomic
+      - go test -v -race -db="sqlite3" -conn_str="./test.db" -cache=true -cache_redis_server="redis:6379" -coverprofile=coverage1-3.txt -covermode=atomic
     when:
       event: [ push, pull_request ]
 
@@ -78,6 +91,7 @@ pipeline:
     commands:
       - go test -v -race -db="mysql" -conn_str="root:@tcp(mysql)/xorm_test" -coverprofile=coverage2-1.txt -covermode=atomic
       - go test -v -race -db="mysql" -conn_str="root:@tcp(mysql)/xorm_test" -cache=true -coverprofile=coverage2-2.txt -covermode=atomic
+      - go test -v -race -db="mysql" -conn_str="root:@tcp(mysql)/xorm_test" -cache=true -cache_redis_server="redis:6379" -coverprofile=coverage2-3.txt -covermode=atomic
     when:
       event: [ push, pull_request ]
 
@@ -86,6 +100,7 @@ pipeline:
     commands:
       - go test -v -race -db="mysql" -conn_str="root:@tcp(mysql)/xorm_test?charset=utf8mb4" -coverprofile=coverage2.1-1.txt -covermode=atomic
       - go test -v -race -db="mysql" -conn_str="root:@tcp(mysql)/xorm_test?charset=utf8mb4" -cache=true -coverprofile=coverage2.1-2.txt -covermode=atomic
+      - go test -v -race -db="mysql" -conn_str="root:@tcp(mysql)/xorm_test?charset=utf8mb4" -cache=true -cache_redis_server="redis:6379" -coverprofile=coverage2.1-3.txt -covermode=atomic
     when:
       event: [ push, pull_request ]
 
@@ -94,6 +109,7 @@ pipeline:
     commands:
       - go test -v -race -db="mymysql" -conn_str="tcp:mysql:3306*xorm_test/root/" -coverprofile=coverage3-1.txt -covermode=atomic
       - go test -v -race -db="mymysql" -conn_str="tcp:mysql:3306*xorm_test/root/" -cache=true -coverprofile=coverage3-2.txt -covermode=atomic
+      - go test -v -race -db="mymysql" -conn_str="tcp:mysql:3306*xorm_test/root/" -cache=true -cache_redis_server="redis:6379" -coverprofile=coverage3-3.txt -covermode=atomic
     when:
       event: [ push, pull_request ]
 
@@ -102,6 +118,7 @@ pipeline:
     commands:
       - go test -v -race -db="postgres" -conn_str="postgres://postgres:@pgsql/xorm_test?sslmode=disable" -coverprofile=coverage4-1.txt -covermode=atomic
       - go test -v -race -db="postgres" -conn_str="postgres://postgres:@pgsql/xorm_test?sslmode=disable" -cache=true -coverprofile=coverage4-2.txt -covermode=atomic
+      - go test -v -race -db="postgres" -conn_str="postgres://postgres:@pgsql/xorm_test?sslmode=disable" -cache=true -cache_redis_server="redis:6379" -coverprofile=coverage4-3.txt -covermode=atomic
     when:
       event: [ push, pull_request ]
   
@@ -110,7 +127,8 @@ pipeline:
     commands:
       - go test -v -race -db="postgres" -conn_str="postgres://postgres:@pgsql/xorm_test?sslmode=disable" -schema=xorm -coverprofile=coverage5-1.txt -covermode=atomic
       - go test -v -race -db="postgres" -conn_str="postgres://postgres:@pgsql/xorm_test?sslmode=disable" -schema=xorm -cache=true -coverprofile=coverage5-2.txt -covermode=atomic
-      - gocovmerge coverage1-1.txt coverage1-2.txt coverage2-1.txt coverage2-2.txt coverage2.1-1.txt coverage2.1-2.txt coverage3-1.txt coverage3-2.txt coverage4-1.txt coverage4-2.txt coverage5-1.txt coverage5-2.txt > coverage.txt
+      - go test -v -race -db="postgres" -conn_str="postgres://postgres:@pgsql/xorm_test?sslmode=disable" -schema=xorm -cache=true -cache_redis_server="redis:6379" -coverprofile=coverage5-3.txt -covermode=atomic
+      - gocovmerge coverage1-1.txt coverage1-2.txt coverage1-3.txt coverage2-1.txt coverage2-2.txt coverage2-3.txt coverage2.1-1.txt coverage2.1-2.txt coverage2.1-3.txt coverage3-1.txt coverage3-2.txt coverage3-3.txt coverage4-1.txt coverage4-2.txt coverage4-3.txt coverage5-1.txt coverage5-2.txt coverage5-3.txt > coverage.txt
     when:
       event: [ push, pull_request ]
 

interface.go

@@ -86,6 +86,7 @@ type EngineInterface interface {
 	GetTableMapper() core.IMapper
 	GetTZDatabase() *time.Location
 	GetTZLocation() *time.Location
+	Logger() core.ILogger
 	MapCacher(interface{}, core.Cacher) error
 	NewSession() *Session
 	NoAutoTime() *Session

xorm_test.go

@@ -26,14 +26,15 @@ var (
 	dbType     string
 	connString string
 
-	db                 = flag.String("db", "sqlite3", "the tested database")
-	showSQL            = flag.Bool("show_sql", true, "show generated SQLs")
-	ptrConnStr         = flag.String("conn_str", "./test.db?cache=shared&mode=rwc", "test database connection string")
-	mapType            = flag.String("map_type", "snake", "indicate the name mapping")
-	cache              = flag.Bool("cache", false, "if enable cache")
-	cluster            = flag.Bool("cluster", false, "if this is a cluster")
-	splitter           = flag.String("splitter", ";", "the splitter on connstr for cluster")
-	schema             = flag.String("schema", "", "specify the schema")
+	db               = flag.String("db", "sqlite3", "the tested database")
+	showSQL          = flag.Bool("show_sql", true, "show generated SQLs")
+	ptrConnStr       = flag.String("conn_str", "./test.db?cache=shared&mode=rwc", "test database connection string")
+	mapType          = flag.String("map_type", "snake", "indicate the name mapping")
+	cache            = flag.Bool("cache", false, "if enable cache")
+	cacheRedisServer = flag.String("cache_redis_server", "127.0.0.1:6379", "if cache enabled this will enable redis cache mode")
+	cluster          = flag.Bool("cluster", false, "if this is a cluster")
+	splitter         = flag.String("splitter", ";", "the splitter on connstr for cluster")
+	schema           = flag.String("schema", "", "specify the schema")
 	ignoreSelectUpdate = flag.Bool("ignore_select_update", false, "ignore select update if implementation difference, only for tidb")
 )
 
@@ -106,8 +107,13 @@ func createEngine(dbType, connStr string) error {
 		testEngine.ShowSQL(*showSQL)
 		testEngine.SetLogLevel(core.LOG_DEBUG)
 		if *cache {
-			cacher := NewLRUCacher(NewMemoryStore(), 100000)
-			testEngine.SetDefaultCacher(cacher)
+			if *cacheRedisServer == "" {
+				cacher := NewLRUCacher(NewMemoryStore(), 100000)
+				testEngine.SetDefaultCacher(cacher)
+			} else {
+				cacher := xormrediscache.NewRedisCacher(*cacheRedisServer, "", xormrediscache.DEFAULT_EXPIRATION, testEngine.Logger())
+				testEngine.SetDefaultCacher(cacher)
+			}
 		}
 
 		if len(*mapType) > 0 {