diff options
Diffstat (limited to 'src/third_party/wiredtiger/test/csuite')
17 files changed, 122 insertions, 163 deletions
diff --git a/src/third_party/wiredtiger/test/csuite/random_abort/main.c b/src/third_party/wiredtiger/test/csuite/random_abort/main.c index 52161d089a8..1e90d8dc495 100644 --- a/src/third_party/wiredtiger/test/csuite/random_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/random_abort/main.c @@ -479,9 +479,7 @@ recover_and_verify(uint32_t nthreads) fatal = true; } else { if (!inmem) - printf( - "%s: deleted record" - " found with key %" PRIu64 "\n", + printf("%s: deleted record found with key %" PRIu64 "\n", fname[DELETE_RECORD_FILE_ID], key); absent++; middle = key; @@ -501,9 +499,7 @@ recover_and_verify(uint32_t nthreads) if (ret != WT_NOTFOUND) testutil_die(ret, "search"); if (!inmem) - printf( - "%s: no insert record" - " with key %" PRIu64 "\n", + printf("%s: no insert record with key %" PRIu64 "\n", fname[INSERT_RECORD_FILE_ID], key); absent++; middle = key; diff --git a/src/third_party/wiredtiger/test/csuite/random_directio/main.c b/src/third_party/wiredtiger/test/csuite/random_directio/main.c index 09c8f1b3de3..6a9967a4f3d 100644 --- a/src/third_party/wiredtiger/test/csuite/random_directio/main.c +++ b/src/third_party/wiredtiger/test/csuite/random_directio/main.c @@ -1131,9 +1131,7 @@ main(int argc, char *argv[]) } if (!LF_ISSET(SCHEMA_INTEGRATED) && LF_ISSET(SCHEMA_CREATE_CHECK | SCHEMA_DATA_CHECK | SCHEMA_DROP_CHECK)) { - fprintf(stderr, - "Schema '*check' options cannot be used " - "without 'integrated'\n"); + fprintf(stderr, "Schema '*check' options cannot be used without 'integrated'\n"); usage(); } printf("CONFIG:%s\n", args); diff --git a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c index 68c5fc7f9e9..1705d940263 100644 --- a/src/third_party/wiredtiger/test/csuite/schema_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/schema_abort/main.c @@ -490,7 +490,7 @@ thread_ts_run(void *arg) } } else ts_wait: - __wt_sleep(0, 1000); + __wt_sleep(0, 1000); } /* NOTREACHED */ } @@ -539,10 +539,8 @@ thread_ckpt_run(void *arg) if (WT_TIMEDIFF_SEC(now, start) >= 1) printf("CKPT: !stable_set time %" PRIu64 "\n", WT_TIMEDIFF_SEC(now, start)); if (WT_TIMEDIFF_SEC(now, start) > MAX_STARTUP) { - fprintf(stderr, - "After %d seconds stable still not " - "set. Aborting.\n", - MAX_STARTUP); + fprintf( + stderr, "After %d seconds stable still not set. Aborting.\n", MAX_STARTUP); /* * For the checkpoint thread the info contains the number of threads. */ @@ -871,9 +869,7 @@ print_missing(REPORT *r, const char *fname, const char *msg) { if (r->exist_key != INVALID_KEY) printf("%s: %s error %" PRIu64 " absent records %" PRIu64 "-%" PRIu64 ". Then keys %" PRIu64 - "-%" PRIu64 - " exist." - " Key range %" PRIu64 "-%" PRIu64 "\n", + "-%" PRIu64 " exist. Key range %" PRIu64 "-%" PRIu64 "\n", fname, msg, (r->exist_key - r->first_miss) - 1, r->first_miss, r->exist_key - 1, r->exist_key, r->last_key, r->first_key, r->last_key); } @@ -990,9 +986,7 @@ main(int argc, char *argv[]) nth = MIN_TH; } - printf( - "Parent: compatibility: %s, " - "in-mem log sync: %s, timestamp in use: %s\n", + printf("Parent: compatibility: %s, in-mem log sync: %s, timestamp in use: %s\n", compat ? "true" : "false", inmem ? "true" : "false", use_ts ? "true" : "false"); printf("Parent: Create %" PRIu32 " threads; sleep %" PRIu32 " seconds\n", nth, timeout); printf("CONFIG: %s%s%s%s -h %s -T %" PRIu32 " -t %" PRIu32 "\n", progname, @@ -1047,9 +1041,7 @@ main(int argc, char *argv[]) * particularly in automated testing. */ testutil_check(__wt_snprintf(buf, sizeof(buf), - "rm -rf ../%s.SAVE && mkdir ../%s.SAVE && " - "cp -p * ../%s.SAVE", - home, home, home)); + "rm -rf ../%s.SAVE && mkdir ../%s.SAVE && cp -p * ../%s.SAVE", home, home, home)); if ((status = system(buf)) < 0) testutil_die(status, "system: %s", buf); printf("Open database, run recovery and verify content\n"); @@ -1134,9 +1126,8 @@ main(int argc, char *argv[]) * larger than the saved one. */ if (!inmem && stable_fp != 0 && stable_fp <= stable_val) { - printf( - "%s: COLLECTION no record with " - "key %" PRIu64 " record ts %" PRIu64 " <= stable ts %" PRIu64 "\n", + printf("%s: COLLECTION no record with key %" PRIu64 " record ts %" PRIu64 + " <= stable ts %" PRIu64 "\n", fname, key, stable_fp, stable_val); absent_coll++; } @@ -1155,9 +1146,8 @@ main(int argc, char *argv[]) * If we found a record, the stable timestamp written to our file better be no * larger than the checkpoint one. */ - printf( - "%s: COLLECTION record with " - "key %" PRIu64 " record ts %" PRIu64 " > stable ts %" PRIu64 "\n", + printf("%s: COLLECTION record with key %" PRIu64 " record ts %" PRIu64 + " > stable ts %" PRIu64 "\n", fname, key, stable_fp, stable_val); fatal = true; } diff --git a/src/third_party/wiredtiger/test/csuite/scope/main.c b/src/third_party/wiredtiger/test/csuite/scope/main.c index 145472fdc01..ff7057c4104 100644 --- a/src/third_party/wiredtiger/test/csuite/scope/main.c +++ b/src/third_party/wiredtiger/test/csuite/scope/main.c @@ -38,8 +38,9 @@ handle_error(WT_EVENT_HANDLER *handler, WT_SESSION *session, int error, const ch (void)(handler); /* Skip the error messages we're expecting to see. */ - if (ignore_errors > 0 && (strstr(message, "requires key be set") != NULL || - strstr(message, "requires value be set") != NULL)) { + if (ignore_errors > 0 && + (strstr(message, "requires key be set") != NULL || + strstr(message, "requires value be set") != NULL)) { --ignore_errors; return (0); } @@ -87,41 +88,52 @@ cursor_scope_ops(WT_SESSION *session, const char *uri) RESERVE, UPDATE } func; - } * op, ops[] = {/* - * The ops order is specific: insert has to happen first so - * other operations are possible, and remove has to be last. - */ - { - "insert", INSERT_GET_KEY, - }, - { - "insert", INSERT_GET_VALUE, - }, - { - "search", SEARCH, - }, - { - "search", SEARCH_NEAR, - }, - { - "reserve", RESERVE, - }, - { - "insert", MODIFY, - }, - { - "update", UPDATE, - }, - { - "remove", REMOVE_GET_KEY, - }, - { - "remove", REMOVE_GET_VALUE, - }, - { - "remove", REMOVE_POS, - }, - {NULL, INSERT_GET_KEY}}; + } * op, + ops[] = {/* + * The ops order is specific: insert has to happen first so + * other operations are possible, and remove has to be last. + */ + { + "insert", + INSERT_GET_KEY, + }, + { + "insert", + INSERT_GET_VALUE, + }, + { + "search", + SEARCH, + }, + { + "search", + SEARCH_NEAR, + }, + { + "reserve", + RESERVE, + }, + { + "insert", + MODIFY, + }, + { + "update", + UPDATE, + }, + { + "remove", + REMOVE_GET_KEY, + }, + { + "remove", + REMOVE_GET_VALUE, + }, + { + "remove", + REMOVE_POS, + }, + {NULL, INSERT_GET_KEY}}; WT_CURSOR *cursor; #define MODIFY_ENTRIES 2 WT_MODIFY entries[MODIFY_ENTRIES]; diff --git a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c index 6c5ceb9d0e2..20fa7ebbdd7 100644 --- a/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c +++ b/src/third_party/wiredtiger/test/csuite/timestamp_abort/main.c @@ -550,9 +550,7 @@ print_missing(REPORT *r, const char *fname, const char *msg) { if (r->exist_key != INVALID_KEY) printf("%s: %s error %" PRIu64 " absent records %" PRIu64 "-%" PRIu64 ". Then keys %" PRIu64 - "-%" PRIu64 - " exist." - " Key range %" PRIu64 "-%" PRIu64 "\n", + "-%" PRIu64 " exist. Key range %" PRIu64 "-%" PRIu64 "\n", fname, msg, (r->exist_key - r->first_miss) - 1, r->first_miss, r->exist_key - 1, r->exist_key, r->last_key, r->first_key, r->last_key); } @@ -625,10 +623,8 @@ main(int argc, char *argv[]) rand_th = false; nth = (uint32_t)atoi(__wt_optarg); if (nth > MAX_TH) { - fprintf(stderr, - "Number of threads is larger than the" - " maximum %" PRId32 "\n", - MAX_TH); + fprintf( + stderr, "Number of threads is larger than the maximum %" PRId32 "\n", MAX_TH); return (EXIT_FAILURE); } break; @@ -676,8 +672,8 @@ main(int argc, char *argv[]) } printf( - "Parent: compatibility: %s, in-mem log sync: %s, add timing stress: %s, " - "timestamp in use: %s\n", + "Parent: compatibility: %s, in-mem log sync: %s, add timing stress: %s, timestamp in " + "use: %s\n", compat ? "true" : "false", inmem ? "true" : "false", stress ? "true" : "false", use_ts ? "true" : "false"); printf("Parent: Create %" PRIu32 " threads; sleep %" PRIu32 " seconds\n", nth, timeout); @@ -734,9 +730,7 @@ main(int argc, char *argv[]) * particularly in automated testing. */ testutil_check(__wt_snprintf(buf, sizeof(buf), - "rm -rf ../%s.SAVE && mkdir ../%s.SAVE && " - "cp -p * ../%s.SAVE", - home, home, home)); + "rm -rf ../%s.SAVE && mkdir ../%s.SAVE && cp -p * ../%s.SAVE", home, home, home)); if ((status = system(buf)) < 0) testutil_die(status, "system: %s", buf); printf("Open database, run recovery and verify content\n"); @@ -831,9 +825,8 @@ main(int argc, char *argv[]) * larger than the saved one. */ if (!inmem && stable_fp != 0 && stable_fp <= stable_val) { - printf( - "%s: COLLECTION no record with " - "key %" PRIu64 " record ts %" PRIu64 " <= stable ts %" PRIu64 "\n", + printf("%s: COLLECTION no record with key %" PRIu64 " record ts %" PRIu64 + " <= stable ts %" PRIu64 "\n", fname, key, stable_fp, stable_val); absent_coll++; } @@ -859,9 +852,8 @@ main(int argc, char *argv[]) * If we found a record, the stable timestamp written to our file better be no * larger than the checkpoint one. */ - printf( - "%s: COLLECTION record with " - "key %" PRIu64 " record ts %" PRIu64 " > stable ts %" PRIu64 "\n", + printf("%s: COLLECTION record with key %" PRIu64 " record ts %" PRIu64 + " > stable ts %" PRIu64 "\n", fname, key, stable_fp, stable_val); fatal = true; } else if ((ret = cur_shadow->search(cur_shadow)) != 0) diff --git a/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c b/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c index a518f6bed0e..f4b428fda2e 100644 --- a/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt1965_col_efficiency/main.c @@ -114,10 +114,8 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(wiredtiger_open(opts->home, NULL, - "create,cache_size=1G,checkpoint=(wait=30)," - "eviction_trigger=80,eviction_target=64,eviction_dirty_target=65," - "log=(enabled,file_max=10M)," - "transaction_sync=(enabled=true,method=none)", + "create,cache_size=1G,checkpoint=(wait=30),eviction_trigger=80,eviction_target=64,eviction_" + "dirty_target=65,log=(enabled,file_max=10M),transaction_sync=(enabled=true,method=none)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c b/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c index 0131c020994..e227a6fd5d7 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2246_col_append/main.c @@ -107,16 +107,12 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(__wt_snprintf(buf, sizeof(buf), - "create," - "cache_size=%s," - "eviction=(threads_max=5)," - "statistics=(fast)", + "create,cache_size=%s,eviction=(threads_max=5),statistics=(fast)", opts->table_type == TABLE_FIX ? "500MB" : "2GB")); testutil_check(wiredtiger_open(opts->home, NULL, buf, &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(__wt_snprintf(buf, sizeof(buf), - "key_format=r,value_format=%s," - "allocation_size=4K,leaf_page_max=64K", + "key_format=r,value_format=%s,allocation_size=4K,leaf_page_max=64K", opts->table_type == TABLE_FIX ? "8t" : "S")); testutil_check(session->create(session, opts->uri, buf)); testutil_check(session->close(session, NULL)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c b/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c index 95bc274b0f8..e8a1637730e 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2323_join_visibility/main.c @@ -151,9 +151,8 @@ test_join(TEST_OPTS *opts, SHARED_OPTS *sharedopts, bool bloom, bool sometimes_r * Note: id is repeated as id2. This makes it easier to identify the primary key in dumps of the * index files. */ - testutil_check(session->create(session, opts->uri, - "key_format=i,value_format=iiSii," - "columns=(id,post,bal,extra,flag,id2)")); + testutil_check(session->create( + session, opts->uri, "key_format=i,value_format=iiSii,columns=(id,post,bal,extra,flag,id2)")); testutil_check(session->create(session, sharedopts->posturi, "columns=(post)")); testutil_check(session->create(session, sharedopts->baluri, "columns=(bal)")); @@ -203,9 +202,8 @@ test_join(TEST_OPTS *opts, SHARED_OPTS *sharedopts, bool bloom, bool sometimes_r } for (i = 0; i < N_INSERT_THREAD; ++i) fprintf(stderr, - " insert thread %d did " - "%d inserts, %d removes, %d notfound, %d rollbacks\n", - i, insert_args[i].inserts, insert_args[i].removes, insert_args[i].notfounds, + " insert thread %d did %d inserts, %d removes, %d notfound, %d rollbacks\n", i, + insert_args[i].inserts, insert_args[i].removes, insert_args[i].notfounds, insert_args[i].rollbacks); testutil_check(session->drop(session, sharedopts->posturi, NULL)); @@ -363,9 +361,7 @@ thread_join(void *arg) */ testutil_check(joincur->get_key(joincur, &key)); testutil_check(joincur->get_value(joincur, &post, &bal, &extra, &flag, &key2)); - fprintf(stderr, - "FAIL: iteration %d: " - "key=%d/%d, postal_code=%d, balance=%d, flag=%d\n", + fprintf(stderr, "FAIL: iteration %d: key=%d/%d, postal_code=%d, balance=%d, flag=%d\n", threadargs->joins, key, key2, post, bal, flag); /* Save the results. */ testutil_check(opts->conn->close(opts->conn, NULL)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c b/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c index e49d0cbe0aa..f8b5098b1a3 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2535_insert_race/main.c @@ -62,15 +62,10 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(wiredtiger_open(opts->home, NULL, - "create," - "cache_size=2G," - "eviction=(threads_max=5)," - "statistics=(fast)", - &opts->conn)); + "create,cache_size=2G,eviction=(threads_max=5),statistics=(fast)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); - testutil_check(session->create(session, opts->uri, - "key_format=Q,value_format=Q," - "leaf_page_max=32k,")); + testutil_check( + session->create(session, opts->uri, "key_format=Q,value_format=Q,leaf_page_max=32k,")); /* Create the single record. */ testutil_check(session->open_cursor(session, opts->uri, NULL, NULL, &c)); diff --git a/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c b/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c index 4f211493c57..c101c824fc0 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2592_join_schema/main.c @@ -74,10 +74,8 @@ main(int argc, char *argv[]) testutil_check(wiredtiger_open(opts->home, NULL, "create,cache_size=200M", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); - testutil_check(session->create(session, opts->uri, - "key_format=r," - "value_format=5sHQ," - "columns=(id,country,year,population)")); + testutil_check(session->create( + session, opts->uri, "key_format=r,value_format=5sHQ,columns=(id,country,year,population)")); /* Create an index with a simple key. */ testutil_check(session->create(session, countryuri, "columns=(country)")); diff --git a/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c b/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c index bee38e812ab..1cb98c6b717 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2834_join_bloom_fix/main.c @@ -74,9 +74,8 @@ main(int argc, char *argv[]) * Note: repeated primary key 'id' as 'id2'. This makes it easier to dump an index and know * which record we're looking at. */ - testutil_check(session->create(session, opts->uri, - "key_format=i,value_format=iiii," - "columns=(id,post,balance,flag,id2)")); + testutil_check(session->create( + session, opts->uri, "key_format=i,value_format=iiii,columns=(id,post,balance,flag,id2)")); tablename = strchr(opts->uri, ':'); testutil_assert(tablename != NULL); @@ -136,10 +135,8 @@ main(int argc, char *argv[]) */ testutil_check(joincur->get_key(joincur, &key)); testutil_check(joincur->get_value(joincur, &post, &balance, &flag, &key2)); - fprintf(stderr, - "FAIL: " - "key=%d/%d, postal_code=%d, balance=%d, flag=%d\n", - key, key2, post, balance, flag); + fprintf(stderr, "FAIL: key=%d/%d, postal_code=%d, balance=%d, flag=%d\n", key, key2, post, + balance, flag); count++; } testutil_assert(ret == WT_NOTFOUND); diff --git a/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c b/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c index 9005c474801..66be61ad271 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2853_perf/main.c @@ -116,9 +116,8 @@ main(int argc, char *argv[]) * Note: id is repeated as id2. This makes it easier to identify the primary key in dumps of the * index files. */ - testutil_check(session->create(session, opts->uri, - "key_format=i,value_format=iiSii," - "columns=(id,post,bal,extra,flag,id2)")); + testutil_check(session->create( + session, opts->uri, "key_format=i,value_format=iiSii,columns=(id,post,bal,extra,flag,id2)")); tablename = strchr(opts->uri, ':'); testutil_assert(tablename != NULL); @@ -188,10 +187,8 @@ main(int argc, char *argv[]) */ if (nfail != 0) fprintf(stderr, - "ERROR: %d failures when a single commit" - " took more than %d seconds.\n" - "This may indicate a real problem or a" - " particularly slow machine.\n", + "ERROR: %d failures when a single commit took more than %d seconds.\n" + "This may indicate a real problem or a particularly slow machine.\n", nfail, GAP_ERROR); testutil_assert(nfail == 0); testutil_progress(opts, "cleanup starting"); diff --git a/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c b/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c index 1285109e706..92bd2c3cd4c 100644 --- a/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt2909_checkpoint_integrity/main.c @@ -342,9 +342,7 @@ run_check_subtest_range(TEST_OPTS *opts, const char *debugger, bool close_test) bool got_failure, got_success; if (opts->verbose) - printf( - "Determining best range of operations until failure, " - "with close_test %s.\n", + printf("Determining best range of operations until failure, with close_test %s.\n", (close_test ? "enabled" : "disabled")); run_check_subtest(opts, debugger, 1, close_test, &cutoff); @@ -386,9 +384,7 @@ run_check_subtest_range(TEST_OPTS *opts, const char *debugger, bool close_test) if (!got_failure || !got_success) { fprintf(stderr, "Warning: did not find a reliable test range.\n" - "midpoint=%" PRIu64 - ", close_test=%d, got_failure=%d, " - "got_success=%d\n", + "midpoint=%" PRIu64 ", close_test=%d, got_failure=%d, got_success=%d\n", mid, (int)close_test, (int)got_failure, (int)got_success); return (EAGAIN); } @@ -511,17 +507,14 @@ subtest_main(int argc, char *argv[], bool close_test) if ((p = getenv("top_builddir")) == NULL) p = "../../build_posix"; testutil_check(__wt_snprintf(config, sizeof(config), - "create,cache_size=250M,log=(enabled)," - "transaction_sync=(enabled,method=none)," - "extensions=(%s/%s=" - "(early_load,config={environment=true,verbose=true}))", + "create,cache_size=250M,log=(enabled),transaction_sync=(enabled,method=none),extensions=(%s/" + "%s=(early_load,config={environment=true,verbose=true}))", p, WT_FAIL_FS_LIB)); testutil_check(wiredtiger_open(opts->home, &event_handler, config, &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); - testutil_check(session->create(session, "table:subtest", - "key_format=i,value_format=iiiS," - "columns=(id,v0,v1,v2,big)")); + testutil_check(session->create( + session, "table:subtest", "key_format=i,value_format=iiiS,columns=(id,v0,v1,v2,big)")); testutil_check(session->create(session, "table:subtest2", "key_format=i,value_format=i")); diff --git a/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c b/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c index 9c433ed127e..baca92846bc 100644 --- a/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt3363_checkpoint_op_races/main.c @@ -188,10 +188,8 @@ monitor(void *args) if (ctr != last_ops[i]) last_ops[i] = ctr; else { - printf( - "Thread %d had a task running" - " for more than %d seconds\n", - i, MAX_EXECUTION_TIME / 2); + printf("Thread %d had a task running for more than %d seconds\n", i, + MAX_EXECUTION_TIME / 2); abort(); } } diff --git a/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c b/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c index a63cfb2724a..b56a638c6ed 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4105_large_doc_small_upd/main.c @@ -54,8 +54,9 @@ handle_error(WT_EVENT_HANDLER *handler, WT_SESSION *session, int error, const ch (void)(handler); /* Skip the error messages we're expecting to see. */ - if (ignore_errors > 0 && (strstr(message, "requires key be set") != NULL || - strstr(message, "requires value be set") != NULL)) { + if (ignore_errors > 0 && + (strstr(message, "requires key be set") != NULL || + strstr(message, "requires value be set") != NULL)) { --ignore_errors; return (0); } @@ -83,15 +84,11 @@ main(int argc, char *argv[]) testutil_make_work_dir(opts->home); testutil_check(wiredtiger_open(opts->home, &event_handler, - "create," - "cache_size=1G," - "statistics_log=(json,wait=1)", - &opts->conn)); + "create,cache_size=1G,statistics_log=(json,wait=1)", &opts->conn)); testutil_check(opts->conn->open_session(opts->conn, NULL, NULL, &session)); testutil_check(session->create(session, uri, - "key_format=Q,value_format=u," - "leaf_item_max=64M,leaf_page_max=32k,memory_page_max=1M")); + "key_format=Q,value_format=u,leaf_item_max=64M,leaf_page_max=32k,memory_page_max=1M")); testutil_check(session->open_cursor(session, uri, NULL, NULL, &c)); diff --git a/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c b/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c index 4e1393b0449..ef51a9dd19c 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4156_metadata_salvage/main.c @@ -312,9 +312,7 @@ copy_database(const char *sfx) char buf[1024]; testutil_check(__wt_snprintf(buf, sizeof(buf), - "rm -rf ./%s.%s; mkdir ./%s.%s; " - "cp -p %s/* ./%s.%s", - home, sfx, home, sfx, home, home, sfx)); + "rm -rf ./%s.%s; mkdir ./%s.%s; cp -p %s/* ./%s.%s", home, sfx, home, sfx, home, home, sfx)); printf("copy: %s\n", buf); if ((ret = system(buf)) < 0) testutil_die(ret, "system: %s", buf); diff --git a/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c b/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c index b91d3c2222e..d3283d6007b 100644 --- a/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c +++ b/src/third_party/wiredtiger/test/csuite/wt4333_handle_locks/main.c @@ -57,9 +57,8 @@ uri_init(void) /* Initialize the file contents. */ for (i = 0; i < uris; ++i) { - testutil_check(__wt_snprintf(buf, sizeof(buf), - "key_format=S,value_format=S," - "allocation_size=4K,leaf_page_max=32KB,")); + testutil_check(__wt_snprintf( + buf, sizeof(buf), "key_format=S,value_format=S,allocation_size=4K,leaf_page_max=32KB,")); testutil_check(session->create(session, uri_list[i], buf)); testutil_check(session->open_cursor(session, uri_list[i], NULL, NULL, &cursor)); for (key = 1; key < MAXKEY; ++key) { @@ -305,9 +304,18 @@ run(int argc, char *argv[]) u_int uris; bool cache_cursors; } runs[] = { - {1, 1, false}, {1, 1, true}, {8, 1, false}, {8, 1, true}, {16, 1, false}, {16, 1, true}, - {16, WT_ELEMENTS(uri_list), false}, {16, WT_ELEMENTS(uri_list), true}, {64, 100, false}, - {64, 100, true}, {64, WT_ELEMENTS(uri_list), false}, {64, WT_ELEMENTS(uri_list), true}, + {1, 1, false}, + {1, 1, true}, + {8, 1, false}, + {8, 1, true}, + {16, 1, false}, + {16, 1, true}, + {16, WT_ELEMENTS(uri_list), false}, + {16, WT_ELEMENTS(uri_list), true}, + {64, 100, false}, + {64, 100, true}, + {64, WT_ELEMENTS(uri_list), false}, + {64, WT_ELEMENTS(uri_list), true}, }; WT_RAND_STATE rnd; u_int i, n; |