1
0
mirror of https://github.com/astaxie/beego.git synced 2024-11-22 13:30:56 +00:00

rename vars

This commit is contained in:
liuchun 2016-03-07 14:45:45 +08:00
parent 22e3900403
commit 0caadb9b66
2 changed files with 13 additions and 14 deletions

View File

@ -10,7 +10,6 @@ services:
- mysql - mysql
- postgresql - postgresql
- memcached - memcached
- ssdb
env: env:
- ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db - ORM_DRIVER=sqlite3 ORM_SOURCE=$TRAVIS_BUILD_DIR/orm_test.db
- ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8" - ORM_DRIVER=mysql ORM_SOURCE="root:@/orm_test?charset=utf8"

26
cache/ssdb/ssdb.go vendored
View File

@ -50,9 +50,9 @@ func (rc *Cache) GetMulti(keys []string) []interface{} {
} }
} }
res, err := rc.conn.Do("multi_get", keys) res, err := rc.conn.Do("multi_get", keys)
res_size := len(res) resSize := len(res)
if err == nil { if err == nil {
for i := 1; i < res_size; i += 2 { for i := 1; i < resSize; i += 2 {
values = append(values, string(res[i+1])) values = append(values, string(res[i+1]))
} }
return values return values
@ -154,9 +154,9 @@ func (rc *Cache) IsExist(key string) bool {
} }
if resp[1] == "1" { if resp[1] == "1" {
return true return true
} else {
return false
} }
return false
} }
// ClearAll clear all cached in memcache. // ClearAll clear all cached in memcache.
@ -166,8 +166,8 @@ func (rc *Cache) ClearAll() error {
return err return err
} }
} }
key_start, key_end, limit := "", "", 50 keyStart, keyEnd, limit := "", "", 50
resp, err := rc.Scan(key_start, key_end, limit) resp, err := rc.Scan(keyStart, keyEnd, limit)
for err == nil { for err == nil {
size := len(resp) size := len(resp)
if size == 1 { if size == 1 {
@ -181,20 +181,20 @@ func (rc *Cache) ClearAll() error {
if e != nil { if e != nil {
return e return e
} }
key_start = resp[size-2] keyStart = resp[size-2]
resp, err = rc.Scan(key_start, key_end, limit) resp, err = rc.Scan(keyStart, keyEnd, limit)
} }
return err return err
} }
// Scan key all cached in ssdb. // Scan key all cached in ssdb.
func (rc *Cache) Scan(key_start string, key_end string, limit int) ([]string, error) { func (rc *Cache) Scan(keyStart string, keyEnd string, limit int) ([]string, error) {
if rc.conn == nil { if rc.conn == nil {
if err := rc.connectInit(); err != nil { if err := rc.connectInit(); err != nil {
return nil, err return nil, err
} }
} }
resp, err := rc.conn.Do("scan", key_start, key_end, limit) resp, err := rc.conn.Do("scan", keyStart, keyEnd, limit)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@ -221,9 +221,9 @@ func (rc *Cache) StartAndGC(config string) error {
// connect to memcache and keep the connection. // connect to memcache and keep the connection.
func (rc *Cache) connectInit() error { func (rc *Cache) connectInit() error {
conninfo_array := strings.Split(rc.conninfo[0], ":") conninfoArray := strings.Split(rc.conninfo[0], ":")
host := conninfo_array[0] host := conninfoArray[0]
port, e := strconv.Atoi(conninfo_array[1]) port, e := strconv.Atoi(conninfoArray[1])
if e != nil { if e != nil {
return e return e
} }