Skip to content

ext/dba: end LMDB cursor iteration on write/delete #21979

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
iliaal wants to merge 1 commit into
base: master
Choose a base branch
from
+67 −0
Open

ext/dba: end LMDB cursor iteration on write/delete #21979

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
16 changes: 16 additions & 0 deletions ext/dba/dba_lmdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,12 @@ DBA_UPDATE_FUNC(lmdb)
int rc;
MDB_val k, v;

if (LMDB_IT(cur)) {
mdb_cursor_close(LMDB_IT(cur));
LMDB_IT(cur) = NULL;
mdb_txn_abort(LMDB_IT(txn));
}

rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn));
if (rc) {
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
Expand Down Expand Up @@ -243,6 +249,12 @@ DBA_DELETE_FUNC(lmdb)
int rc;
MDB_val k;

if (LMDB_IT(cur)) {
mdb_cursor_close(LMDB_IT(cur));
LMDB_IT(cur) = NULL;
mdb_txn_abort(LMDB_IT(txn));
}

rc = mdb_txn_begin(LMDB_IT(env), NULL, 0, &LMDB_IT(txn));
if (rc) {
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
Expand Down Expand Up @@ -314,6 +326,10 @@ DBA_NEXTKEY_FUNC(lmdb)
MDB_val k, v;
zend_string *ret = NULL;

if (!LMDB_IT(cur)) {
return NULL;
}

rc = mdb_txn_renew(LMDB_IT(txn));
if (rc) {
php_error_docref(NULL, E_WARNING, "%s", mdb_strerror(rc));
Expand Down
51 changes: 51 additions & 0 deletions ext/dba/tests/dba_lmdb_write_during_iteration.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
--TEST--
DBA LMDB: writes during cursor iteration end the iteration cleanly
--EXTENSIONS--
dba
--SKIPIF--
<?php
require_once __DIR__ . '/setup/setup_dba_tests.inc';
check_skip('lmdb');
?>
--FILE--
<?php
require_once __DIR__ . '/setup/setup_dba_tests.inc';
$db_file = __DIR__ . '/dba_lmdb_write_during_iteration.db';
@unlink($db_file);
@unlink($db_file . '-lock');

$db = dba_open($db_file, 'cl', 'lmdb');
foreach (['a' => '1', 'b' => '2', 'c' => '3'] as $k => $v) {
dba_replace($k, $v, $db);
}

var_dump(dba_firstkey($db));
var_dump(dba_nextkey($db));

var_dump(dba_replace('d', '4', $db));
var_dump(dba_nextkey($db));
var_dump(dba_nextkey($db));

var_dump(dba_firstkey($db));
var_dump(dba_delete('a', $db));
var_dump(dba_nextkey($db));

dba_close($db);
?>
--CLEAN--
<?php
$db_file = __DIR__ . '/dba_lmdb_write_during_iteration.db';
@unlink($db_file);
@unlink($db_file . '-lock');
@unlink($db_file . '.lck');
?>
--EXPECTF--
Notice: dba_open(): Handler lmdb does locking internally in %s on line %d
string(1) "a"
string(1) "b"
bool(true)
bool(false)
bool(false)
string(1) "a"
bool(true)
bool(false)
Loading