Skip to content

Commit 7be0fe3

Browse files
committed
经过实际测试btree写入性能大大高于hash,所以修改btree作为默认存储
1 parent 33dc047 commit 7be0fe3

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

bdb/expire.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ expire_thread(void *args) {
269269
ctx.expire_db = must_open_db(&ctx, "__expire.db", DB_BTREE);
270270
}
271271
if (ctx.expire_index_db == NULL) {
272-
ctx.expire_index_db = must_open_db(&ctx, "__expire.index.db", DB_HASH);
272+
ctx.expire_index_db = must_open_db(&ctx, "__expire.index.db", DB_BTREE);
273273
}
274274
if (ctx.shared_data->app_finished == 1) {
275275
break;

server/request.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ func (w *Worker) checkerr(err error, db *bdb.Db) {
144144

145145
func (w *Worker) bdbSet(req *bdbSetReq) {
146146
table, name := bdb.SplitKey(req.key)
147-
db, err := w.getdb(table, bdb.DBTYPE_HASH)
147+
db, err := w.getdb(table, bdb.DBTYPE_BTREE)
148148
if err != nil {
149149
req.resp <- bdbSetResp{err}
150150
} else {
@@ -173,7 +173,7 @@ func (w *Worker) bdbSetEx(req *bdbSetReq) {
173173
}
174174
}
175175
if w.expireindex == nil {
176-
w.expireindex, err = w.dbenv.GetDb("__expire.index", bdb.DBTYPE_HASH)
176+
w.expireindex, err = w.dbenv.GetDb("__expire.index", bdb.DBTYPE_BTREE)
177177
if err != nil {
178178
log.Error("worker|GetDb|%s", err.Error())
179179
req.resp <- bdbSetResp{err}
@@ -206,7 +206,7 @@ func (w *Worker) bdbSetEx(req *bdbSetReq) {
206206
}
207207

208208
table, name := bdb.SplitKey(req.key)
209-
db, err := w.getdb(table, bdb.DBTYPE_HASH)
209+
db, err := w.getdb(table, bdb.DBTYPE_BTREE)
210210
if err != nil {
211211
w.checkerr(err, db)
212212
req.resp <- bdbSetResp{err}
@@ -230,7 +230,7 @@ func (w *Worker) bdbSetEx(req *bdbSetReq) {
230230

231231
func (w *Worker) bdbGet(req *bdbGetReq) {
232232
table, name := bdb.SplitKey(req.key)
233-
db, err := w.getdb(table, bdb.DBTYPE_HASH)
233+
db, err := w.getdb(table, bdb.DBTYPE_BTREE)
234234
if err != nil {
235235
req.resp <- bdbGetResp{nil, err}
236236
} else {
@@ -250,7 +250,7 @@ func (w *Worker) bdbGet(req *bdbGetReq) {
250250

251251
func (w *Worker) bdbIncrBy(req *bdbIncrByReq) {
252252
table, name := bdb.SplitKey(req.key)
253-
db, err := w.getdb(table, bdb.DBTYPE_HASH)
253+
db, err := w.getdb(table, bdb.DBTYPE_BTREE)
254254
if err != nil {
255255
req.resp <- bdbIncrByResp{0, err}
256256
} else {

0 commit comments

Comments
 (0)