NextGraph
/
rocksdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added some more wrappers and wrote a test for backup in C

Browse Source
main
Marko Kevac 10 years ago
parent 86e2a1eeea
commit 7e50ed8c24
3 changed files with 153 additions and 3 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 70
      db/c.cc
  2. 42
      db/c_test.c
  3. 44
      include/rocksdb/c.h

70
db/c.cc
Unescape View File

@ -72,6 +72,8 @@ using rocksdb::WriteOptions;
using rocksdb::LiveFileMetaData;
using rocksdb::BackupEngine;
using rocksdb::BackupableDBOptions;
using rocksdb::BackupInfo;
using rocksdb::RestoreOptions;
using std::shared_ptr;
@ -79,6 +81,8 @@ extern "C" {
struct rocksdb_t { DB* rep; };
struct rocksdb_backup_engine_t { BackupEngine* rep; };
struct rocksdb_backup_engine_info_t { std::vector<BackupInfo> rep; };
struct rocksdb_restore_options_t { RestoreOptions rep; };
struct rocksdb_iterator_t { Iterator* rep; };
struct rocksdb_writebatch_t { WriteBatch rep; };
struct rocksdb_snapshot_t { const Snapshot* rep; };
@ -532,10 +536,11 @@ rocksdb_t* rocksdb_open_for_read_only(
}
rocksdb_backup_engine_t* rocksdb_backup_engine_open(
const rocksdb_options_t* options,
const char* path,
char** errptr) {
BackupEngine* be;
if (SaveError(errptr, BackupEngine::Open(Env::Default(), BackupableDBOptions(path), &be))) {
if (SaveError(errptr, BackupEngine::Open(options->rep.env, BackupableDBOptions(path), &be))) {
return nullptr;
}
rocksdb_backup_engine_t* result = new rocksdb_backup_engine_t;
@ -550,6 +555,69 @@ void rocksdb_backup_engine_create_new_backup(
SaveError(errptr, be->rep->CreateNewBackup(db->rep));
}
rocksdb_restore_options_t* rocksdb_restore_options_create() {
return new rocksdb_restore_options_t;
}
void rocksdb_restore_options_destroy(rocksdb_restore_options_t* opt) {
delete opt;
}
void rocksdb_restore_options_set_keep_log_files(
rocksdb_restore_options_t* opt, int v) {
opt->rep.keep_log_files = v;
}
void rocksdb_backup_engine_restore_db_from_latest_backup(
rocksdb_backup_engine_t *be,
const char* db_dir,
const char* wal_dir,
const rocksdb_restore_options_t *restore_options,
char** errptr) {
SaveError(errptr, be->rep->RestoreDBFromLatestBackup(std::string(db_dir), std::string(wal_dir), restore_options->rep));
}
const rocksdb_backup_engine_info_t* rocksdb_backup_engine_get_backup_info(
rocksdb_backup_engine_t* be) {
rocksdb_backup_engine_info_t* result = new rocksdb_backup_engine_info_t;
be->rep->GetBackupInfo(&result->rep);
return result;
}
int rocksdb_backup_engine_info_count(
const rocksdb_backup_engine_info_t* info) {
return static_cast<int>(info->rep.size());
}
const int64_t rocksdb_backup_engine_info_timestamp(
const rocksdb_backup_engine_info_t* info,
int index) {
return info->rep[index].timestamp;
}
const uint32_t rocksdb_backup_engine_info_backup_id(
const rocksdb_backup_engine_info_t* info,
int index) {
return info->rep[index].backup_id;
}
const uint64_t rocksdb_backup_engine_info_size(
const rocksdb_backup_engine_info_t* info,
int index) {
return info->rep[index].size;
}
const uint32_t rocksdb_backup_engine_info_number_files(
const rocksdb_backup_engine_info_t* info,
int index) {
return info->rep[index].number_files;
}
void rocksdb_backup_engine_info_destroy(
const rocksdb_backup_engine_info_t* info) {
delete info;
}
void rocksdb_backup_engine_close(
rocksdb_backup_engine_t *be) {
delete be->rep;

42
db/c_test.c
Unescape View File

@ -10,9 +10,11 @@
#include <string.h>
#include <sys/types.h>
#include <unistd.h>
#include <inttypes.h>
const char* phase = "";
static char dbname[200];
static char dbbackupname[200];
static void StartPhase(const char* name) {
fprintf(stderr, "=== Test %s\n", name);
@ -346,6 +348,11 @@ int main(int argc, char** argv) {
GetTempDir(),
((int) geteuid()));
snprintf(dbbackupname, sizeof(dbbackupname),
"%s/rocksdb_c_test-%d-backup",
GetTempDir(),
((int) geteuid()));
StartPhase("create_objects");
cmp = rocksdb_comparator_create(NULL, CmpDestroy, CmpCompare, CmpName);
env = rocksdb_create_default_env();
@ -396,6 +403,41 @@ int main(int argc, char** argv) {
CheckNoError(err);
CheckGet(db, roptions, "foo", "hello");
StartPhase("backup");
{
rocksdb_destroy_db(options, dbbackupname, &err);
CheckNoError(err);
rocksdb_backup_engine_t *be = rocksdb_backup_engine_open(options, dbbackupname, &err);
CheckNoError(err);
rocksdb_backup_engine_create_new_backup(be, db, &err);
CheckNoError(err);
rocksdb_delete(db, woptions, "foo", 3, &err);
CheckNoError(err);
rocksdb_close(db);
rocksdb_destroy_db(options, dbname, &err);
CheckNoError(err);
rocksdb_restore_options_t *restore_options = rocksdb_restore_options_create();
rocksdb_restore_options_set_keep_log_files(restore_options, 0);
rocksdb_backup_engine_restore_db_from_latest_backup(be, dbname, dbname, restore_options, &err);
CheckNoError(err);
rocksdb_restore_options_destroy(restore_options);
rocksdb_options_set_error_if_exists(options, 0);
db = rocksdb_open(options, dbname, &err);
CheckNoError(err);
rocksdb_options_set_error_if_exists(options, 1);
CheckGet(db, roptions, "foo", "hello");
rocksdb_backup_engine_close(be);
}
StartPhase("compactall");
rocksdb_compact_range(db, NULL, 0, NULL, 0);
CheckGet(db, roptions, "foo", "hello");

44
include/rocksdb/c.h
Unescape View File

@ -56,6 +56,8 @@ extern "C" {
typedef struct rocksdb_t rocksdb_t;
typedef struct rocksdb_backup_engine_t rocksdb_backup_engine_t;
typedef struct rocksdb_backup_engine_info_t rocksdb_backup_engine_info_t;
typedef struct rocksdb_restore_options_t rocksdb_restore_options_t;
typedef struct rocksdb_cache_t rocksdb_cache_t;
typedef struct rocksdb_compactionfilter_t rocksdb_compactionfilter_t;
typedef struct rocksdb_compactionfiltercontext_t
@ -106,16 +108,54 @@ extern rocksdb_t* rocksdb_open_for_read_only(
char** errptr);
extern rocksdb_backup_engine_t* rocksdb_backup_engine_open(
const rocksdb_options_t* options,
const char* path,
char** errptr);
extern void rocksdb_backup_engine_create_new_backup(
rocksdb_backup_engine_t *be,
rocksdb_backup_engine_t* be,
rocksdb_t* db,
char** errptr);
extern rocksdb_restore_options_t* rocksdb_restore_options_create();
extern void rocksdb_restore_options_destroy(rocksdb_restore_options_t* opt);
extern void rocksdb_restore_options_set_keep_log_files(
rocksdb_restore_options_t* opt, int v);
extern void rocksdb_backup_engine_restore_db_from_latest_backup(
rocksdb_backup_engine_t *be,
const char* db_dir,
const char* wal_dir,
const rocksdb_restore_options_t *restore_options,
char** errptr);
extern const rocksdb_backup_engine_info_t* rocksdb_backup_engine_get_backup_info(
rocksdb_backup_engine_t* be);
extern int rocksdb_backup_engine_info_count(
const rocksdb_backup_engine_info_t* info);
extern const int64_t rocksdb_backup_engine_info_timestamp(
const rocksdb_backup_engine_info_t* info,
int index);
extern const uint32_t rocksdb_backup_engine_info_backup_id(
const rocksdb_backup_engine_info_t* info,
int index);
extern const uint64_t rocksdb_backup_engine_info_size(
const rocksdb_backup_engine_info_t* info,
int index);
extern const uint32_t rocksdb_backup_engine_info_number_files(
const rocksdb_backup_engine_info_t* info,
int index);
extern void rocksdb_backup_engine_info_destroy(
const rocksdb_backup_engine_info_t *info);
extern void rocksdb_backup_engine_close(
rocksdb_backup_engine_t *be);
rocksdb_backup_engine_t* be);
extern rocksdb_t* rocksdb_open_column_families(
const rocksdb_options_t* options,

Write Preview
Loading…
Cancel
Save