consistency for database ID parameter

main
Michael Bradley, Jr. 12 months ago
parent 38b09b3c0c
commit a40340a098
No known key found for this signature in database
GPG Key ID: D0307DBCF21A9A58

@ -25,7 +25,7 @@ extern "C" {
* *
* `engine`: which storage engine to use, can be "mem", "sqlite" or "rocksdb". * `engine`: which storage engine to use, can be "mem", "sqlite" or "rocksdb".
* `path`: should contain the UTF-8 encoded path name as a null-terminated C-string. * `path`: should contain the UTF-8 encoded path name as a null-terminated C-string.
* `db_id`: will contain the id of the database opened. * `db_id`: will contain the ID of the database opened.
* `options`: options for the DB constructor: engine dependent. * `options`: options for the DB constructor: engine dependent.
* *
* When the function is successful, null pointer is returned, * When the function is successful, null pointer is returned,
@ -37,12 +37,12 @@ char *cozo_open_db(const char *engine, const char *path, const char *options, in
/** /**
* Close a database. * Close a database.
* *
* `id`: the ID representing the database to close. * `db_id`: the ID representing the database to close.
* *
* Returns `true` if the database is closed, * Returns `true` if the database is closed,
* `false` if it has already been closed, or does not exist. * `false` if it has already been closed, or does not exist.
*/ */
bool cozo_close_db(int32_t id); bool cozo_close_db(int32_t db_id);
/** /**
* Run query against a database. * Run query against a database.

@ -34,7 +34,7 @@ lazy_static! {
/// ///
/// `engine`: which storage engine to use, can be "mem", "sqlite" or "rocksdb". /// `engine`: which storage engine to use, can be "mem", "sqlite" or "rocksdb".
/// `path`: should contain the UTF-8 encoded path name as a null-terminated C-string. /// `path`: should contain the UTF-8 encoded path name as a null-terminated C-string.
/// `db_id`: will contain the id of the database opened. /// `db_id`: will contain the ID of the database opened.
/// `options`: options for the DB constructor: engine dependent. /// `options`: options for the DB constructor: engine dependent.
/// ///
/// When the function is successful, null pointer is returned, /// When the function is successful, null pointer is returned,
@ -76,15 +76,15 @@ pub unsafe extern "C" fn cozo_open_db(
/// Close a database. /// Close a database.
/// ///
/// `id`: the ID representing the database to close. /// `db_id`: the ID representing the database to close.
/// ///
/// Returns `true` if the database is closed, /// Returns `true` if the database is closed,
/// `false` if it has already been closed, or does not exist. /// `false` if it has already been closed, or does not exist.
#[no_mangle] #[no_mangle]
pub unsafe extern "C" fn cozo_close_db(id: i32) -> bool { pub unsafe extern "C" fn cozo_close_db(db_id: i32) -> bool {
let db = { let db = {
let mut dbs = HANDLES.dbs.lock().unwrap(); let mut dbs = HANDLES.dbs.lock().unwrap();
dbs.remove(&id) dbs.remove(&db_id)
}; };
db.is_some() db.is_some()
} }

Loading…
Cancel
Save