Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

LMDB: minimize transaction duration #323

Merged
merged 2 commits into from
Oct 12, 2023
Merged

LMDB: minimize transaction duration #323

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a70c4f4
LMDB: minimize transaction duration
marisn Oct 12, 2023
6979aba
LMDB: do not pass data variable when deleting tiles
marisn Oct 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions lib/cache_lmdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,23 +69,24 @@ static int _mapcache_cache_lmdb_has_tile(mapcache_context *ctx, mapcache_cache *
MDB_val key, data;
MDB_txn *txn;
mapcache_cache_lmdb *cache = (mapcache_cache_lmdb*)pcache;
char *skey = mapcache_util_get_tile_key(ctx,tile,cache->key_template,NULL,NULL);
char *skey;

if (lmdb_env->is_open == 0) {
ctx->set_error(ctx,500,"lmdb is not open %s",cache->basedir);
return MAPCACHE_FALSE;
}

skey = mapcache_util_get_tile_key(ctx,tile,cache->key_template,NULL,NULL);
key.mv_size = strlen(skey)+1;
key.mv_data = skey;

rc = mdb_txn_begin(lmdb_env->env, NULL, MDB_RDONLY, &txn);
if (rc) {
ctx->set_error(ctx,500,"lmdb failed to begin transaction for has_tile in %s:%s",cache->basedir,mdb_strerror(rc));
return MAPCACHE_FALSE;
}

key.mv_size = strlen(skey)+1;
key.mv_data = skey;

rc = mdb_get(txn, lmdb_env->dbi, &key, &data);

if(rc == 0) {
ret = MAPCACHE_TRUE;
} else if(rc == MDB_NOTFOUND) {
Expand All @@ -107,24 +108,27 @@ static int _mapcache_cache_lmdb_has_tile(mapcache_context *ctx, mapcache_cache *
static void _mapcache_cache_lmdb_delete(mapcache_context *ctx, mapcache_cache *pcache, mapcache_tile *tile)
{
int rc;
MDB_val key, data;
MDB_val key;
MDB_txn *txn;
mapcache_cache_lmdb *cache = (mapcache_cache_lmdb*)pcache;
char *skey = mapcache_util_get_tile_key(ctx,tile,cache->key_template,NULL,NULL);
char *skey;

if (lmdb_env->is_open == 0) {
ctx->set_error(ctx,500,"lmdb is not open %s",cache->basedir);
return;
}

skey = mapcache_util_get_tile_key(ctx,tile,cache->key_template,NULL,NULL);
key.mv_size = strlen(skey)+1;
key.mv_data = skey;

rc = mdb_txn_begin(lmdb_env->env, NULL, 0, &txn);
if (rc) {
ctx->set_error(ctx,500,"lmdb failed to begin transaction for delete in %s:%s",cache->basedir,mdb_strerror(rc));
return;
}

key.mv_size = strlen(skey)+1;
key.mv_data = skey;
rc = mdb_del(txn, lmdb_env->dbi, &key, &data);
rc = mdb_del(txn, lmdb_env->dbi, &key, NULL);
if (rc) {
if (rc == MDB_NOTFOUND) {
ctx->log(ctx,MAPCACHE_DEBUG,"attempt to delete tile %s absent in the db %s",skey,cache->basedir);
Expand Down Expand Up @@ -152,18 +156,18 @@ static int _mapcache_cache_lmdb_get(mapcache_context *ctx, mapcache_cache *pcach
ctx->set_error(ctx,500,"lmdb is not open %s",cache->basedir);
return MAPCACHE_FALSE;
}

skey = mapcache_util_get_tile_key(ctx,tile,cache->key_template,NULL,NULL);
key.mv_size = strlen(skey)+1;
key.mv_data = skey;

rc = mdb_txn_begin(lmdb_env->env, NULL, MDB_RDONLY, &txn);
if (rc) {
ctx->set_error(ctx,500,"lmdb failed to begin transaction for get in %s:%s",cache->basedir,mdb_strerror(rc));
return MAPCACHE_FALSE;
}

skey = mapcache_util_get_tile_key(ctx,tile,cache->key_template,NULL,NULL);
key.mv_size = strlen(skey)+1;
key.mv_data = skey;

rc = mdb_get(txn, lmdb_env->dbi, &key, &data);

if(rc == 0) {
if(((char*)(data.mv_data))[0] == '#') {
tile->encoded_data = mapcache_empty_png_decode(ctx,tile->grid_link->grid->tile_sx, tile->grid_link->grid->tile_sy, (unsigned char*)data.mv_data,&tile->nodata);
Expand Down Expand Up @@ -232,6 +236,7 @@ static void _mapcache_cache_lmdb_set(mapcache_context *ctx, mapcache_cache *pcac
ctx->set_error(ctx,500,"lmdb is not open %s",cache->basedir);
return;
}

rc = mdb_txn_begin(lmdb_env->env, NULL, 0, &txn);
if (rc) {
ctx->set_error(ctx,500,"lmdb failed to begin transaction for set in %s:%s",cache->basedir,mdb_strerror(rc));
Expand Down Expand Up @@ -264,6 +269,7 @@ static void _mapcache_cache_lmdb_multiset(mapcache_context *ctx, mapcache_cache
ctx->set_error(ctx,500,"lmdb is not open %s",cache->basedir);
return;
}

rc = mdb_txn_begin(lmdb_env->env, NULL, 0, &txn);
if (rc) {
ctx->set_error(ctx,500,"lmdb failed to begin transaction for multiset in %s:%s",cache->basedir,mdb_strerror(rc));
Expand Down
Loading