ISAR/libmdbx
3
0
Fork 0
mirror of https://github.com/isar/libmdbx.git synced 2025-08-23 21:14:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

mdbx: drops old/obsolete API (mdbx_env_copy and mdbx_env_copydf).

Browse Source
This commit is contained in:
Leo Yuriev
2017-05-22 20:02:23 +03:00
parent 0eee938c5f
commit 398b839b98
3 changed files with 13 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/mdbx.c
View File

@@ -8448,7 +8448,7 @@ done:
}
/** Copy environment with compaction. */
static int __cold mdbx_env_copyfd1(MDB_env *env, mdbx_filehandle_t fd) {
static int __cold mdbx_env_compact(MDB_env *env, mdbx_filehandle_t fd) {
MDB_meta *mm;
MDB_page *mp;
mdbx_copy my;
@@ -8548,7 +8548,7 @@ done2:
}
/** Copy environment as-is. */
static int __cold mdbx_env_copyfd0(MDB_env *env, mdbx_filehandle_t fd) {
static int __cold mdbx_env_copy_asis(MDB_env *env, mdbx_filehandle_t fd) {
MDB_txn *txn = NULL;
int rc;
@@ -8585,19 +8585,15 @@ bailout:
return rc;
}
int __cold mdbx_env_copyfd2(MDB_env *env, mdbx_filehandle_t fd,
int __cold mdbx_env_copy2fd(MDB_env *env, mdbx_filehandle_t fd,
unsigned flags) {
if (flags & MDB_CP_COMPACT)
return mdbx_env_copyfd1(env, fd);
return mdbx_env_compact(env, fd);
else
return mdbx_env_copyfd0(env, fd);
return mdbx_env_copy_asis(env, fd);
}
int __cold mdbx_env_copyfd(MDB_env *env, mdbx_filehandle_t fd) {
return mdbx_env_copyfd2(env, fd, 0);
}
int __cold mdbx_env_copy2(MDB_env *env, const char *path, unsigned flags) {
int __cold mdbx_env_copy(MDB_env *env, const char *path, unsigned flags) {
int rc, len;
char *lck_pathname;
mdbx_filehandle_t newfd = INVALID_HANDLE_VALUE;
@@ -8627,7 +8623,7 @@ int __cold mdbx_env_copy2(MDB_env *env, const char *path, unsigned flags) {
(void)fcntl(newfd, F_SETFL, rc | O_DIRECT);
#endif
}
rc = mdbx_env_copyfd2(env, newfd, flags);
rc = mdbx_env_copy2fd(env, newfd, flags);
}
if (!(env->me_flags & MDB_NOSUBDIR))
@@ -8642,10 +8638,6 @@ int __cold mdbx_env_copy2(MDB_env *env, const char *path, unsigned flags) {
return rc;
}
int __cold mdbx_env_copy(MDB_env *env, const char *path) {
return mdbx_env_copy2(env, path, 0);
}
int __cold mdbx_env_set_flags(MDB_env *env, unsigned flags, int onoff) {
if (unlikely(flags & ~CHANGEABLE))
return MDBX_EINVAL;

4
src/tools/mdbx_copy.c
View File

@@ -63,9 +63,9 @@ int main(int argc, char *argv[]) {
if (rc == MDB_SUCCESS) {
act = "copying";
if (argc == 2)
rc = mdbx_env_copyfd2(env, STDOUT_FILENO, cpflags);
rc = mdbx_env_copy2fd(env, STDOUT_FILENO, cpflags);
else
rc = mdbx_env_copy2(env, argv[2], cpflags);
rc = mdbx_env_copy(env, argv[2], cpflags);
}
if (rc)
fprintf(stderr, "%s: %s failed, error %d (%s)\n", progname, act, rc,