Commit e2bf931e authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel

closes #6290, allow for child transactions to change descriptors

git-svn-id: file:///svn/toku/tokudb@54517 c7de825b-a66e-492c-adef-691d508d4ae1
parent db0b6239
...@@ -166,7 +166,6 @@ static void run_test(void) { ...@@ -166,7 +166,6 @@ static void run_test(void) {
{ int chk_r = db->change_descriptor(db, txn_create, &change_descriptor, 0); CKERR(chk_r); } { int chk_r = db->change_descriptor(db, txn_create, &change_descriptor, 0); CKERR(chk_r); }
// test some error cases // test some error cases
IN_TXN_COMMIT(env, txn_create, txn_create2, 0, { IN_TXN_COMMIT(env, txn_create, txn_create2, 0, {
{ int chk_r = db->change_descriptor(db, txn_create2, &change_descriptor, 0); CKERR2(chk_r, EINVAL); }
{ int chk_r = db->change_descriptor(db, txn_create, &change_descriptor, 0); CKERR2(chk_r, EINVAL); } { int chk_r = db->change_descriptor(db, txn_create, &change_descriptor, 0); CKERR2(chk_r, EINVAL); }
}); });
assert_desc_four(db); assert_desc_four(db);
......
...@@ -481,10 +481,6 @@ toku_db_change_descriptor(DB *db, DB_TXN* txn, const DBT* descriptor, uint32_t f ...@@ -481,10 +481,6 @@ toku_db_change_descriptor(DB *db, DB_TXN* txn, const DBT* descriptor, uint32_t f
r = EINVAL; r = EINVAL;
goto cleanup; goto cleanup;
} }
if (txn && txn->parent != NULL) {
r = EINVAL; // cannot have a parent if you are a resetting op
goto cleanup;
}
// For a hot index, this is an initial descriptor. // For a hot index, this is an initial descriptor.
// We do not support (yet) hcad with hot index concurrently on a single table, which // We do not support (yet) hcad with hot index concurrently on a single table, which
// would require changing a descriptor for a hot index. // would require changing a descriptor for a hot index.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment