apps/redis-go
0
0
Fork 0
mirror of https://github.com/HDT3213/godis.git synced 2025-10-05 08:46:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modify the implementation of database RWLocks and RWUnLocks

Browse Source
This commit is contained in:
Eriri
2023-05-05 23:10:15 +08:00
committed by finley
parent 68d7f28b1a
commit 388fdabd7f
5 changed files with 397 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
database/database.go
View File

@@ -6,7 +6,6 @@ import (
"time"
"github.com/hdt3213/godis/datastruct/dict"
"github.com/hdt3213/godis/datastruct/lock"
"github.com/hdt3213/godis/interface/database"
"github.com/hdt3213/godis/interface/redis"
"github.com/hdt3213/godis/lib/logger"
@@ -17,22 +16,18 @@ import (
const (
dataDictSize = 1 << 16
ttlDictSize = 1 << 10
lockerSize = 1024
)
// DB stores data and execute user's commands
type DB struct {
index int
// key -> DataEntity
data dict.Dict
data *dict.ConcurrentDict
// key -> expireTime (time.Time)
ttlMap dict.Dict
ttlMap *dict.ConcurrentDict
// key -> version(uint32)
versionMap dict.Dict
versionMap *dict.ConcurrentDict
// dict.Dict will ensure concurrent-safety of its method
// use this mutex for complicated command only, eg. rpush, incr ...
locker *lock.Locks
// addaof is used to add command to aof
addAof func(CmdLine)
}
@@ -58,20 +53,17 @@ func makeDB() *DB {
data: dict.MakeConcurrent(dataDictSize),
ttlMap: dict.MakeConcurrent(ttlDictSize),
versionMap: dict.MakeConcurrent(dataDictSize),
locker: lock.Make(lockerSize),
addAof: func(line CmdLine) {},
}
return db
}
// makeBasicDB create DB instance only with basic abilities.
// It is not concurrent safe
func makeBasicDB() *DB {
db := &DB{
data: dict.MakeSimple(),
ttlMap: dict.MakeSimple(),
versionMap: dict.MakeSimple(),
locker: lock.Make(1),
data: dict.MakeConcurrent(dataDictSize),
ttlMap: dict.MakeConcurrent(ttlDictSize),
versionMap: dict.MakeConcurrent(dataDictSize),
addAof: func(line CmdLine) {},
}
return db
@@ -154,7 +146,7 @@ func validateArity(arity int, cmdArgs [][]byte) bool {
// GetEntity returns DataEntity bind to given key
func (db *DB) GetEntity(key string) (*database.DataEntity, bool) {
raw, ok := db.data.Get(key)
raw, ok := db.data.GetWithLock(key)
if !ok {
return nil, false
}
@@ -167,22 +159,22 @@ func (db *DB) GetEntity(key string) (*database.DataEntity, bool) {
// PutEntity a DataEntity into DB
func (db *DB) PutEntity(key string, entity *database.DataEntity) int {
return db.data.Put(key, entity)
return db.data.PutWithLock(key, entity)
}
// PutIfExists edit an existing DataEntity
func (db *DB) PutIfExists(key string, entity *database.DataEntity) int {
return db.data.PutIfExists(key, entity)
return db.data.PutIfExistsWithLock(key, entity)
}
// PutIfAbsent insert an DataEntity only if the key not exists
func (db *DB) PutIfAbsent(key string, entity *database.DataEntity) int {
return db.data.PutIfAbsent(key, entity)
return db.data.PutIfAbsentWithLock(key, entity)
}
// Remove the given key from db
func (db *DB) Remove(key string) {
db.data.Remove(key)
db.data.RemoveWithLock(key)
db.ttlMap.Remove(key)
taskKey := genExpireTask(key)
timewheel.Cancel(taskKey)
@@ -192,7 +184,7 @@ func (db *DB) Remove(key string) {
func (db *DB) Removes(keys ...string) (deleted int) {
deleted = 0
for _, key := range keys {
_, exists := db.data.Get(key)
_, exists := db.data.GetWithLock(key)
if exists {
db.Remove(key)
deleted++
@@ -207,19 +199,18 @@ func (db *DB) Removes(keys ...string) (deleted int) {
func (db *DB) Flush() {
db.data.Clear()
db.ttlMap.Clear()
db.locker = lock.Make(lockerSize)
}
/* ---- Lock Function ----- */
// RWLocks lock keys for writing and reading
func (db *DB) RWLocks(writeKeys []string, readKeys []string) {
db.locker.RWLocks(writeKeys, readKeys)
db.data.RWLocks(writeKeys, readKeys)
}
// RWUnLocks unlock keys for writing and reading
func (db *DB) RWUnLocks(writeKeys []string, readKeys []string) {
db.locker.RWUnLocks(writeKeys, readKeys)
db.data.RWUnLocks(writeKeys, readKeys)
}
/* ---- TTL Functions ---- */