mahlon/ruby-mdbx
1
0
Fork 0
Code Issues Pull requests Activity

Updates to support libmdbx 0.12.x.

Browse source 
Also, close some hanging open transactions in some error states.

FossilOrigin-Name: 9582fff0788d3f78e9b33f292a2c48afeac32587c89496a5a7d5e97a98085683
This commit is contained in:
Mahlon E. Smith 2024-03-25 01:58:15 +00:00
parent 080235d55a
commit 7fc1ebb408
4 changed files with 42 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ext/mdbx_ext/database.c
View file

@ -168,6 +168,12 @@ rmdbx_open_env( VALUE self )
rb_raise( rmdbx_eDatabaseError, "mdbx_env_open: (%d) %s", rc, mdbx_strerror(rc) );
}
/* Force populate the db->dbi handle. Under 0.12.x, getting a
* 'permission denied' doing this for the first access with a RDONLY
* for some reason. */
rmdbx_open_txn( db, MDBX_TXN_READWRITE );
rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
db->state.open = 1;
return Qtrue;
}
@ -189,8 +195,10 @@ rmdbx_clear( VALUE self )
rmdbx_open_txn( db, MDBX_TXN_READWRITE );
int rc = mdbx_drop( db->txn, db->dbi, false );
if ( rc != MDBX_SUCCESS )
if ( rc != MDBX_SUCCESS ) {
rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
rb_raise( rmdbx_eDatabaseError, "mdbx_drop: (%d) %s", rc, mdbx_strerror(rc) );
}
rmdbx_close_txn( db, RMDBX_TXN_COMMIT );
@ -229,8 +237,10 @@ rmdbx_drop( VALUE self, VALUE name )
rmdbx_open_txn( db, MDBX_TXN_READWRITE );
int rc = mdbx_drop( db->txn, db->dbi, true );
if ( rc != MDBX_SUCCESS )
if ( rc != MDBX_SUCCESS ) {
rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
rb_raise( rmdbx_eDatabaseError, "mdbx_drop: (%d) %s", rc, mdbx_strerror(rc) );
}
rmdbx_close_txn( db, RMDBX_TXN_COMMIT );
@ -238,6 +248,12 @@ rmdbx_drop( VALUE self, VALUE name )
db->subdb = NULL;
rmdbx_close_dbi( db ); /* ensure next access is not in the defunct subdb */
/* Force populate the new db->dbi handle. Under 0.12.x, getting a
* 'permission denied' doing this for the first access with a RDONLY
* for some reason. */
rmdbx_open_txn( db, MDBX_TXN_READWRITE );
rmdbx_close_txn( db, RMDBX_TXN_ROLLBACK );
return self;
}
@ -830,7 +846,7 @@ rmdbx_stats( VALUE self )
* db.clone => [copy of db]
*
* Copy the object (clone/dup). The returned copy is closed and needs
* to be reopened before use. This function likely has limited use,
* to be reopened before use. This function likely has limited use,
* considering you can't open two handles within the same process.
*/
static VALUE rmdbx_init_copy( VALUE copy, VALUE orig )