Skip to content

M
MariaDB
Commit 97967314 authored by Zardosht Kasheff's avatar Zardosht Kasheff Committed by Yoni Fogel
Browse files
Options

[t:3015], merge update_multiple changes to main 

git-svn-id: file:///svn/toku/tokudb@25473 c7de825b-a66e-492c-adef-691d508d4ae1
parent ee8724e7
Expand all Show whitespace changes
Inline Side-by-side
Showing with 134 additions and 64 deletions
buildheader/db.h_4_1
View file @ 97967314
...@@ -278,9 +278,9 @@ struct __toku_db_env { ...@@ -278,9 +278,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
buildheader/db.h_4_3
View file @ 97967314
...@@ -280,9 +280,9 @@ struct __toku_db_env { ...@@ -280,9 +280,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
buildheader/db.h_4_4
View file @ 97967314
...@@ -280,9 +280,9 @@ struct __toku_db_env { ...@@ -280,9 +280,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
buildheader/db.h_4_5
View file @ 97967314
...@@ -280,9 +280,9 @@ struct __toku_db_env { ...@@ -280,9 +280,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
buildheader/db.h_4_6
View file @ 97967314
...@@ -281,9 +281,9 @@ struct __toku_db_env { ...@@ -281,9 +281,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
buildheader/make_db_h.c
View file @ 97967314
...@@ -579,9 +579,9 @@ int main (int argc __attribute__((__unused__)), char *const argv[] __attribute__ ...@@ -579,9 +579,9 @@ int main (int argc __attribute__((__unused__)), char *const argv[] __attribute__
" const DBT *src_key, const DBT *src_val,\n" " const DBT *src_key, const DBT *src_val,\n"
" void *extra))", " void *extra))",
"int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,\n" "int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,\n"
" const DBT *old_src_key, const DBT *old_src_data,\n" " DBT *old_src_key, DBT *old_src_data,\n"
" const DBT *new_src_key, const DBT *new_src_data,\n" " DBT *new_src_key, DBT *new_src_data,\n"
" uint32_t num_dbs, DB **db_array,\n" " uint32_t num_dbs, DB **db_array, uint32_t *flags_array,\n"
" uint32_t num_keys, DBT *keys,\n" " uint32_t num_keys, DBT *keys,\n"
" uint32_t num_vals, DBT *vals,\n" " uint32_t num_vals, DBT *vals,\n"
" void *extra) /* update multiple DBs */", " void *extra) /* update multiple DBs */",
......
buildheader/tdb.h
View file @ 97967314
...@@ -281,9 +281,9 @@ struct __toku_db_env { ...@@ -281,9 +281,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
include/db.h
View file @ 97967314
...@@ -281,9 +281,9 @@ struct __toku_db_env { ...@@ -281,9 +281,9 @@ struct __toku_db_env {
const DBT *src_key, const DBT *src_val, const DBT *src_key, const DBT *src_val,
void *extra)); void *extra));
int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn, int (*update_multiple) (DB_ENV *env, DB *src_db, DB_TXN *txn,
const DBT *old_src_key, const DBT *old_src_data, DBT *old_src_key, DBT *old_src_data,
const DBT *new_src_key, const DBT *new_src_data, DBT *new_src_key, DBT *new_src_data,
uint32_t num_dbs, DB **db_array, uint32_t num_dbs, DB **db_array, uint32_t *flags_array,
uint32_t num_keys, DBT *keys, uint32_t num_keys, DBT *keys,
uint32_t num_vals, DBT *vals, uint32_t num_vals, DBT *vals,
void *extra) /* update multiple DBs */; void *extra) /* update multiple DBs */;
......
src/tests/recover-update-multiple-abort.c
View file @ 97967314
...@@ -110,8 +110,9 @@ update_diagonal(DB_ENV *env, DB_TXN *txn, DB *db[], int ndbs, int nrows) { ...@@ -110,8 +110,9 @@ update_diagonal(DB_ENV *env, DB_TXN *txn, DB *db[], int ndbs, int nrows) {
int ndbts = 2 * ndbs; int ndbts = 2 * ndbs;
DBT keys[ndbts]; memset(keys, 0, sizeof keys); DBT keys[ndbts]; memset(keys, 0, sizeof keys);
DBT vals[ndbts]; memset(vals, 0, sizeof vals); DBT vals[ndbts]; memset(vals, 0, sizeof vals);
uint32_t flags_array[ndbs]; memset(flags_array, 0, sizeof(flags_array));
r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, ndbts, keys, ndbts, vals, NULL); r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, flags_array, ndbts, keys, ndbts, vals, NULL);
assert_zero(r); assert_zero(r);
} }
} }
......
src/tests/recover-update-multiple.c
View file @ 97967314
...@@ -110,8 +110,9 @@ update_diagonal(DB_ENV *env, DB_TXN *txn, DB *db[], int ndbs, int nrows) { ...@@ -110,8 +110,9 @@ update_diagonal(DB_ENV *env, DB_TXN *txn, DB *db[], int ndbs, int nrows) {
int ndbts = 2 * ndbs; int ndbts = 2 * ndbs;
DBT keys[ndbts]; memset(keys, 0, sizeof keys); DBT keys[ndbts]; memset(keys, 0, sizeof keys);
DBT vals[ndbts]; memset(vals, 0, sizeof vals); DBT vals[ndbts]; memset(vals, 0, sizeof vals);
uint32_t flags_array[ndbs]; memset(flags_array, 0, sizeof(flags_array));
r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, ndbts, keys, ndbts, vals, NULL); r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, flags_array, ndbts, keys, ndbts, vals, NULL);
assert_zero(r); assert_zero(r);
} }
} }
......
src/tests/update-multiple-data-diagonal.c
View file @ 97967314
...@@ -181,8 +181,9 @@ update_diagonal(DB_ENV *env, DB *db[], int ndbs, int nrows) { ...@@ -181,8 +181,9 @@ update_diagonal(DB_ENV *env, DB *db[], int ndbs, int nrows) {
int ndbts = 2 * ndbs; int ndbts = 2 * ndbs;
DBT keys[ndbts]; memset(keys, 0, sizeof keys); DBT keys[ndbts]; memset(keys, 0, sizeof keys);
DBT vals[ndbts]; memset(vals, 0, sizeof vals); DBT vals[ndbts]; memset(vals, 0, sizeof vals);
uint32_t flags_array[ndbs]; memset(flags_array, 0, sizeof(flags_array));
r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, ndbts, keys, ndbts, vals, NULL); r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, flags_array, ndbts, keys, ndbts, vals, NULL);
assert_zero(r); assert_zero(r);
} }
r = txn->commit(txn, 0); assert_zero(r); r = txn->commit(txn, 0); assert_zero(r);
......
src/tests/update-multiple-key0.c
View file @ 97967314
...@@ -160,8 +160,9 @@ update_key0(DB_ENV *env, DB *db[], int ndbs, int nrows) { ...@@ -160,8 +160,9 @@ update_key0(DB_ENV *env, DB *db[], int ndbs, int nrows) {
int ndbts = 2 * ndbs; int ndbts = 2 * ndbs;
DBT keys[ndbts]; memset(keys, 0, sizeof keys); DBT keys[ndbts]; memset(keys, 0, sizeof keys);
DBT vals[ndbts]; memset(vals, 0, sizeof vals); DBT vals[ndbts]; memset(vals, 0, sizeof vals);
uint32_t flags_array[ndbs]; memset(flags_array, 0, sizeof(flags_array));
r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, ndbts, keys, ndbts, vals, NULL); r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, flags_array, ndbts, keys, ndbts, vals, NULL);
assert_zero(r); assert_zero(r);
verify_locked(env, db[0], k); verify_locked(env, db[0], k);
......
src/tests/update-multiple-nochange.c
View file @ 97967314
...@@ -155,8 +155,9 @@ verify(DB_ENV *env, DB *db[], int ndbs, int nrows) { ...@@ -155,8 +155,9 @@ verify(DB_ENV *env, DB *db[], int ndbs, int nrows) {
int ndbts = 2 * ndbs; int ndbts = 2 * ndbs;
DBT keys[ndbts]; memset(keys, 0, sizeof keys); DBT keys[ndbts]; memset(keys, 0, sizeof keys);
DBT vals[ndbts]; memset(vals, 0, sizeof vals); DBT vals[ndbts]; memset(vals, 0, sizeof vals);
uint32_t flags_array[ndbs]; memset(flags_array, 0, sizeof(flags_array));
r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, ndbts, keys, ndbts, vals, NULL); r = env->update_multiple(env, NULL, txn, &old_key, &old_data, &new_key, &new_data, ndbs, db, flags_array, ndbts, keys, ndbts, vals, NULL);
assert_zero(r); assert_zero(r);
} }
r = txn->commit(txn, 0); assert_zero(r); r = txn->commit(txn, 0); assert_zero(r);
......
src/ydb.c
View file @ 97967314
This diff is collapsed.
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7