Skip to content

C rocksdb_create_column_family(_with_ttl): Fix leak on error #14214

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

Open
evanj wants to merge 1 commit into
base: main
Choose a base branch
from
Open

C rocksdb_create_column_family(_with_ttl): Fix leak on error #14214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
19 changes: 13 additions & 6 deletions db/c.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1762,9 +1762,12 @@ rocksdb_column_family_handle_t* rocksdb_create_column_family(
rocksdb_t* db, const rocksdb_options_t* column_family_options,
const char* column_family_name, char** errptr) {
rocksdb_column_family_handle_t* handle = new rocksdb_column_family_handle_t;
SaveError(errptr, db->rep->CreateColumnFamily(
ColumnFamilyOptions(column_family_options->rep),
std::string(column_family_name), &(handle->rep)));
if (SaveError(errptr, db->rep->CreateColumnFamily(
ColumnFamilyOptions(column_family_options->rep),
std::string(column_family_name), &(handle->rep)))) {
delete handle;
return nullptr;
}
handle->immortal = false;
return handle;
}
Expand Down Expand Up @@ -1826,9 +1829,13 @@ rocksdb_column_family_handle_t* rocksdb_create_column_family_with_ttl(
ROCKSDB_NAMESPACE::DBWithTTL* db_with_ttl =
static_cast<ROCKSDB_NAMESPACE::DBWithTTL*>(db->rep);
rocksdb_column_family_handle_t* handle = new rocksdb_column_family_handle_t;
SaveError(errptr, db_with_ttl->CreateColumnFamilyWithTtl(
ColumnFamilyOptions(column_family_options->rep),
std::string(column_family_name), &(handle->rep), ttl));
if (SaveError(errptr,
db_with_ttl->CreateColumnFamilyWithTtl(
ColumnFamilyOptions(column_family_options->rep),
std::string(column_family_name), &(handle->rep), ttl))) {
delete handle;
return nullptr;
}
handle->immortal = false;
return handle;
}
Expand Down
37 changes: 36 additions & 1 deletion db/c_test.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -912,9 +912,10 @@ int main(int argc, char** argv) {
Free(&err);

StartPhase("open_error");
rocksdb_open(options, dbname, &err);
db = rocksdb_open(options, dbname, &err);
CheckCondition(err != NULL);
Free(&err);
CheckCondition(db == NULL);

StartPhase("open");
rocksdb_options_set_create_if_missing(options, 1);
Expand Down Expand Up @@ -2013,10 +2014,19 @@ int main(int argc, char** argv) {

rocksdb_options_set_create_if_missing(db_options, 0);
db = rocksdb_open(db_options, dbname, &err);

// create cf1
rocksdb_column_family_handle_t* cfh;
cfh = rocksdb_create_column_family(db, db_options, "cf1", &err);
rocksdb_column_family_handle_destroy(cfh);
CheckNoError(err);

// create cf1 again: must return an error and a NULL pointer
cfh = rocksdb_create_column_family(db, db_options, "cf1", &err);
CheckCondition(err != NULL);
Free(&err);
CheckCondition(cfh == NULL);

rocksdb_close(db);

size_t cflen;
Expand Down Expand Up @@ -4872,6 +4882,31 @@ int main(int argc, char** argv) {
rocksdb_sst_file_manager_destroy(sst_file_manager);
}

StartPhase("create_column_family_with_ttl");
{
static const int test_ttl = 10;
// create a new TTL database
CheckCondition(db != NULL);
rocksdb_close(db);
rocksdb_destroy_db(options, dbname, &err);
CheckNoError(err);

db = rocksdb_open_with_ttl(options, dbname, -1, &err);
CheckNoError(err);

rocksdb_column_family_handle_t* cf = rocksdb_create_column_family_with_ttl(
db, options, "cf_ttl", test_ttl, &err);
CheckNoError(err);
rocksdb_column_family_handle_destroy(cf);

// create cf again: must return an error and a NULL pointer
cf = rocksdb_create_column_family_with_ttl(db, options, "cf_ttl", test_ttl,
&err);
CheckCondition(err != NULL);
Free(&err);
CheckCondition(cf == NULL);
}

StartPhase("cancel_all_background_work");
rocksdb_cancel_all_background_work(db, 1);

Expand Down
Loading