Skip to content
This repository was archived by the owner on Jun 21, 2019. It is now read-only.

Commit 94a30d2

Browse files
author
drmfly
committed
fix issue 1 & 2
1 parent e1df076 commit 94a30d2

File tree

2 files changed

+15
-20
lines changed

2 files changed

+15
-20
lines changed

mysql_redis_cacher_test.go

+11-17
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package xormrediscache
22

33
import (
44
"database/sql"
5+
_ "encoding/gob"
56
"testing"
67

78
_ "github.com/go-sql-driver/mysql"
@@ -14,7 +15,6 @@ import (
1415
CREATE DATABASE IF NOT EXISTS xorm_test CHARACTER SET
1516
utf8 COLLATE utf8_general_ci;
1617
*/
17-
1818
func TestMysqlWithCache(t *testing.T) {
1919
err := mysqlDdlImport()
2020
if err != nil {
@@ -28,11 +28,9 @@ func TestMysqlWithCache(t *testing.T) {
2828
t.Error(err)
2929
return
3030
}
31-
engine.SetDefaultCacher(NewRedisCacher("localhost:6379", "", DEFAULT_EXPIRATION, engine.Logger))
32-
engine.ShowSQL = ShowTestSql
33-
engine.ShowErr = ShowTestSql
34-
engine.ShowWarn = ShowTestSql
35-
engine.ShowDebug = ShowTestSql
31+
engine.SetDefaultCacher(NewRedisCacher("localhost:6379", "", DEFAULT_EXPIRATION, engine.Logger()))
32+
engine.ShowSQL(true)
33+
engine.Logger().SetLevel(core.LOG_DEBUG)
3634

3735
BaseTestAll(engine, t)
3836
BaseTestAllSnakeMapper(engine, t)
@@ -53,11 +51,9 @@ func TestMysqlWithCacheSameMapper(t *testing.T) {
5351
return
5452
}
5553
engine.SetMapper(core.SameMapper{})
56-
engine.SetDefaultCacher(NewRedisCacher("localhost:6379", "", DEFAULT_EXPIRATION, engine.Logger))
57-
engine.ShowSQL = ShowTestSql
58-
engine.ShowErr = ShowTestSql
59-
engine.ShowWarn = ShowTestSql
60-
engine.ShowDebug = ShowTestSql
54+
engine.SetDefaultCacher(NewRedisCacher("localhost:6379", "", DEFAULT_EXPIRATION, engine.Logger()))
55+
engine.ShowSQL(true)
56+
engine.Logger().SetLevel(core.LOG_DEBUG)
6157

6258
BaseTestAll(engine, t)
6359
BaseTestAllSameMapper(engine, t)
@@ -71,7 +67,7 @@ func newMysqlEngine() (*xorm.Engine, error) {
7167
func newMysqlEngineWithCacher() (*xorm.Engine, error) {
7268
engine, err := newMysqlEngine()
7369
if err == nil {
74-
engine.SetDefaultCacher(NewRedisCacher("localhost:6379", "", DEFAULT_EXPIRATION, engine.Logger))
70+
engine.SetDefaultCacher(NewRedisCacher("localhost:6379", "", DEFAULT_EXPIRATION, engine.Logger()))
7571
}
7672
return engine, err
7773
}
@@ -81,13 +77,11 @@ func mysqlDdlImport() error {
8177
if err != nil {
8278
return err
8379
}
84-
engine.ShowSQL = ShowTestSql
85-
engine.ShowErr = ShowTestSql
86-
engine.ShowWarn = ShowTestSql
87-
engine.ShowDebug = ShowTestSql
80+
engine.ShowSQL(true)
81+
engine.Logger().SetLevel(core.LOG_DEBUG)
8882

8983
sqlResults, _ := engine.ImportFile("../testdata/mysql_ddl.sql")
90-
engine.LogDebug("sql results: %v", sqlResults)
84+
engine.Logger().Debugf("sql results: %v", sqlResults)
9185
engine.Close()
9286
return nil
9387
}

redis_cacher.go

+4-3
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,10 @@ import (
44
"bytes"
55
"encoding/gob"
66
"fmt"
7+
"hash/crc32"
8+
79
"github.com/garyburd/redigo/redis"
810
"github.com/go-xorm/core"
9-
"hash/crc32"
1011
// "log"
1112
"reflect"
1213
// "strconv"
@@ -81,7 +82,7 @@ func exists(conn redis.Conn, key string) bool {
8182

8283
func (c *RedisCacher) logErrf(format string, contents ...interface{}) {
8384
if c.Logger != nil {
84-
c.Logger.Errf(fmt.Sprintf("%s %s", LOGGING_PREFIX, format), contents...)
85+
c.Logger.Errorf(fmt.Sprintf("%s %s", LOGGING_PREFIX, format), contents...)
8586
}
8687
}
8788

@@ -290,7 +291,7 @@ func (c *RedisCacher) registerGobConcreteType(value interface{}) error {
290291
case reflect.Ptr:
291292
v := reflect.ValueOf(value)
292293
i := v.Elem().Interface()
293-
gob.Register(i)
294+
gob.Register(&i)
294295
case reflect.Struct, reflect.Map, reflect.Slice:
295296
gob.Register(value)
296297
case reflect.String, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Bool, reflect.Float32, reflect.Float64, reflect.Complex64, reflect.Complex128:

0 commit comments

Comments
 (0)