ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-10-31 03:29:01 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: refine handle_env_pathname() for direct pathname of data-file inside sudir-mode.

Browse Source 
Change-Id: I5b7e7c7ea5c17e00c344fedb5c96f8d94fc04fc8
This commit is contained in:
Leonid Yuriev
2020-10-11 00:14:53 +03:00
parent de1856a73c
commit 071ad525c8
2 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

54
src/core.c
View File

@@ -10371,14 +10371,15 @@ __cold int mdbx_env_open_for_recovery(MDBX_env *env, const char *pathname,
typedef struct { typedef struct {
void *buffer_for_free; void *buffer_for_free;
char *lck, *dxb; char *lck, *dxb;
size_t ent_len;
} MDBX_handle_env_pathname; } MDBX_handle_env_pathname;
__cold static int mdbx_handle_env_pathname(MDBX_handle_env_pathname *result, __cold static int mdbx_handle_env_pathname(MDBX_handle_env_pathname *ctx,
const char *pathname, const char *pathname,
MDBX_env_flags_t *flags, MDBX_env_flags_t *flags,
const mdbx_mode_t mode) { const mdbx_mode_t mode) {
int rc; int rc;
memset(result, 0, sizeof(*result)); memset(ctx, 0, sizeof(*ctx));
if (unlikely(!pathname)) if (unlikely(!pathname))
return MDBX_EINVAL; return MDBX_EINVAL;
@@ -10442,26 +10443,35 @@ __cold static int mdbx_handle_env_pathname(MDBX_handle_env_pathname *result,
} }
#endif #endif
size_t len_full, len = strlen(pathname); static const char dxb_name[] = MDBX_DATANAME;
if (*flags & MDBX_NOSUBDIR) { static const size_t dxb_name_len = sizeof(dxb_name) - 1;
len_full = len + sizeof(MDBX_LOCK_SUFFIX) + len + 1; static const char lck_name[] = MDBX_LOCKNAME;
} else { static const char lock_suffix[] = MDBX_LOCK_SUFFIX;
len_full = len + sizeof(MDBX_LOCKNAME) + len + sizeof(MDBX_DATANAME);
ctx->ent_len = strlen(pathname);
if ((*flags & MDBX_NOSUBDIR) && ctx->ent_len >= dxb_name_len &&
!memcmp(dxb_name, pathname + ctx->ent_len - dxb_name_len, dxb_name_len)) {
*flags -= MDBX_NOSUBDIR;
ctx->ent_len -= dxb_name_len;
} }
result->buffer_for_free = mdbx_malloc(len_full); const size_t bytes_needed =
if (!result->buffer_for_free) ctx->ent_len * 2 + ((*flags & MDBX_NOSUBDIR)
? sizeof(lock_suffix) + 1
: sizeof(lck_name) + sizeof(dxb_name));
ctx->buffer_for_free = mdbx_malloc(bytes_needed);
if (!ctx->buffer_for_free)
return MDBX_ENOMEM; return MDBX_ENOMEM;
result->lck = result->buffer_for_free; ctx->lck = ctx->buffer_for_free;
if (*flags & MDBX_NOSUBDIR) { if (*flags & MDBX_NOSUBDIR) {
result->dxb = result->lck + len + sizeof(MDBX_LOCK_SUFFIX); ctx->dxb = ctx->lck + ctx->ent_len + sizeof(lock_suffix);
sprintf(result->lck, "%s" MDBX_LOCK_SUFFIX, pathname); sprintf(ctx->lck, "%s%s", pathname, lock_suffix);
strcpy(result->dxb, pathname); strcpy(ctx->dxb, pathname);
} else { } else {
result->dxb = result->lck + len + sizeof(MDBX_LOCKNAME); ctx->dxb = ctx->lck + ctx->ent_len + sizeof(lck_name);
sprintf(result->lck, "%s" MDBX_LOCKNAME, pathname); sprintf(ctx->lck, "%.*s%s", (int)ctx->ent_len, pathname, lck_name);
sprintf(result->dxb, "%s" MDBX_DATANAME, pathname); sprintf(ctx->dxb, "%.*s%s", (int)ctx->ent_len, pathname, dxb_name);
} }
return MDBX_SUCCESS; return MDBX_SUCCESS;
@@ -10482,7 +10492,7 @@ __cold int mdbx_env_delete(const char *pathname, MDBX_env_delete_mode_t mode) {
dummy_env.me_flags = dummy_env.me_flags =
(mode == MDBX_ENV_ENSURE_UNUSED) ? MDBX_EXCLUSIVE : MDBX_ENV_DEFAULTS; (mode == MDBX_ENV_ENSURE_UNUSED) ? MDBX_EXCLUSIVE : MDBX_ENV_DEFAULTS;
dummy_env.me_psize = dummy_env.me_os_psize = (unsigned)mdbx_syspagesize(); dummy_env.me_psize = dummy_env.me_os_psize = (unsigned)mdbx_syspagesize();
dummy_env.me_path = (char *)pathname; dummy_env.me_pathname = (char *)pathname;
MDBX_handle_env_pathname env_pathname; MDBX_handle_env_pathname env_pathname;
STATIC_ASSERT(sizeof(dummy_env.me_flags) == sizeof(MDBX_env_flags_t)); STATIC_ASSERT(sizeof(dummy_env.me_flags) == sizeof(MDBX_env_flags_t));
@@ -10596,14 +10606,16 @@ __cold int mdbx_env_open(MDBX_env *env, const char *pathname,
if (unlikely(rc != MDBX_SUCCESS)) if (unlikely(rc != MDBX_SUCCESS))
goto bailout; goto bailout;
env->me_path = mdbx_strdup(pathname); env->me_pathname = mdbx_calloc(env_pathname.ent_len + 1, 1);
env->me_dbxs = mdbx_calloc(env->me_maxdbs, sizeof(MDBX_dbx)); env->me_dbxs = mdbx_calloc(env->me_maxdbs, sizeof(MDBX_dbx));
env->me_dbflags = mdbx_calloc(env->me_maxdbs, sizeof(env->me_dbflags[0])); env->me_dbflags = mdbx_calloc(env->me_maxdbs, sizeof(env->me_dbflags[0]));
env->me_dbiseqs = mdbx_calloc(env->me_maxdbs, sizeof(env->me_dbiseqs[0])); env->me_dbiseqs = mdbx_calloc(env->me_maxdbs, sizeof(env->me_dbiseqs[0]));
if (!(env->me_dbxs && env->me_path && env->me_dbflags && env->me_dbiseqs)) { if (!(env->me_dbxs && env->me_pathname && env->me_dbflags &&
env->me_dbiseqs)) {
rc = MDBX_ENOMEM; rc = MDBX_ENOMEM;
goto bailout; goto bailout;
} }
memcpy(env->me_pathname, env_pathname.dxb, env_pathname.ent_len);
env->me_dbxs[FREE_DBI].md_cmp = cmp_int_align4; /* aligned MDBX_INTEGERKEY */ env->me_dbxs[FREE_DBI].md_cmp = cmp_int_align4; /* aligned MDBX_INTEGERKEY */
env->me_dbxs[FREE_DBI].md_dcmp = cmp_lenfast; env->me_dbxs[FREE_DBI].md_dcmp = cmp_lenfast;
@@ -10841,7 +10853,7 @@ static int __cold mdbx_env_close0(MDBX_env *env) {
mdbx_memalign_free(env->me_pbuf); mdbx_memalign_free(env->me_pbuf);
mdbx_free(env->me_dbiseqs); mdbx_free(env->me_dbiseqs);
mdbx_free(env->me_dbflags); mdbx_free(env->me_dbflags);
mdbx_free(env->me_path); mdbx_free(env->me_pathname);
mdbx_free(env->me_dirtylist); mdbx_free(env->me_dirtylist);
if (env->me_txn0) { if (env->me_txn0) {
mdbx_txl_free(env->me_txn0->tw.lifo_reclaimed); mdbx_txl_free(env->me_txn0->tw.lifo_reclaimed);
@@ -16812,7 +16824,7 @@ int __cold mdbx_env_get_path(const MDBX_env *env, const char **arg) {
if (unlikely(!arg)) if (unlikely(!arg))
return MDBX_EINVAL; return MDBX_EINVAL;
*arg = env->me_path; *arg = env->me_pathname;
return MDBX_SUCCESS; return MDBX_SUCCESS;
} }

2
src/internals.h
View File

@@ -953,7 +953,7 @@ struct MDBX_env {
MDBX_dbi me_maxdbs; /* size of the DB table */ MDBX_dbi me_maxdbs; /* size of the DB table */
uint32_t me_pid; /* process ID of this env */ uint32_t me_pid; /* process ID of this env */
mdbx_thread_key_t me_txkey; /* thread-key for readers */ mdbx_thread_key_t me_txkey; /* thread-key for readers */
char *me_path; /* path to the DB files */ char *me_pathname; /* path to the DB files */
void *me_pbuf; /* scratch area for DUPSORT put() */ void *me_pbuf; /* scratch area for DUPSORT put() */
MDBX_txn *me_txn; /* current write transaction */ MDBX_txn *me_txn; /* current write transaction */
MDBX_txn *me_txn0; /* prealloc'd write transaction */ MDBX_txn *me_txn0; /* prealloc'd write transaction */