Commit d0527da2 authored by Yoni Fogel's avatar Yoni Fogel

refs #4964 Cleanups during review

git-svn-id: file:///svn/toku/tokudb@45068 c7de825b-a66e-492c-adef-691d508d4ae1
parent 3c9a75b5
...@@ -396,10 +396,8 @@ get_indexer_if_exists( ...@@ -396,10 +396,8 @@ get_indexer_if_exists(
if (!first_indexer) { if (!first_indexer) {
first_indexer = indexer; first_indexer = indexer;
} }
else { else if (first_indexer != indexer) {
if (first_indexer != indexer) { r = EINVAL;
r = EINVAL;
}
} }
} }
} }
...@@ -442,7 +440,6 @@ env_del_multiple( ...@@ -442,7 +440,6 @@ env_del_multiple(
goto cleanup; goto cleanup;
} }
{
uint32_t lock_flags[num_dbs]; uint32_t lock_flags[num_dbs];
uint32_t remaining_flags[num_dbs]; uint32_t remaining_flags[num_dbs];
FT_HANDLE brts[num_dbs]; FT_HANDLE brts[num_dbs];
...@@ -456,7 +453,7 @@ env_del_multiple( ...@@ -456,7 +453,7 @@ env_del_multiple(
del_keys[which_db] = *src_key; del_keys[which_db] = *src_key;
} }
else { else {
//Generate the key //Generate the key
r = env->i->generate_row_for_del(db, src_db, &keys[which_db], src_key, src_val); r = env->i->generate_row_for_del(db, src_db, &keys[which_db], src_key, src_val);
if (r != 0) goto cleanup; if (r != 0) goto cleanup;
del_keys[which_db] = keys[which_db]; del_keys[which_db] = keys[which_db];
...@@ -492,7 +489,7 @@ env_del_multiple( ...@@ -492,7 +489,7 @@ env_del_multiple(
else { else {
r = log_del_multiple(txn, src_db, src_key, src_val, num_dbs, brts, del_keys); r = log_del_multiple(txn, src_db, src_key, src_val, num_dbs, brts, del_keys);
} }
if (r == 0) if (r == 0) {
r = do_del_multiple(txn, num_dbs, db_array, del_keys, src_db, src_key); r = do_del_multiple(txn, num_dbs, db_array, del_keys, src_db, src_key);
} }
toku_multi_operation_client_unlock(); toku_multi_operation_client_unlock();
......
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