Import wiredtiger: 7dfd9391862bc9a6d84868c4dc51689c45a3aacf from branch mongodb-4.4

ref: c809757d8b..7dfd939186
for: 4.3.1

WT-4658       Apply Clang Format
WT-4810       Adding WT_ERR_ASSERT and WT_RET_ASSERT macros
WT-5046       Prepared transactions aren't properly cleared from global table with WT_CONN_LOG_DEBUG_MODE enabled

1 files changed, 631 insertions, 613 deletions

diff --git a/src/third_party/wiredtiger/test/salvage/salvage.c b/src/third_party/wiredtiger/test/salvage/salvage.c
index 06386e5e86e..283a2bb3573 100644
--- a/src/third_party/wiredtiger/test/salvage/salvage.c
+++ b/src/third_party/wiredtiger/test/salvage/salvage.c
@@ -30,16 +30,16 @@
 
 #include <assert.h>
 
-#define	HOME		"WT_TEST"
-#define	DUMP		"WT_TEST/__slvg.dump"	/* Dump file */
-#define	LOAD		"WT_TEST/__slvg.load"	/* Build file */
-#define	LOAD_URI	"file:__slvg.load"	/* Build URI */
-#define	RSLT		"WT_TEST/__slvg.result"	/* Result file */
-#define	SLVG		"WT_TEST/__slvg.slvg"	/* Salvage file */
-#define	SLVG_URI	"file:__slvg.slvg"	/* Salvage URI */
+#define HOME "WT_TEST"
+#define DUMP "WT_TEST/__slvg.dump"   /* Dump file */
+#define LOAD "WT_TEST/__slvg.load"   /* Build file */
+#define LOAD_URI "file:__slvg.load"  /* Build URI */
+#define RSLT "WT_TEST/__slvg.result" /* Result file */
+#define SLVG "WT_TEST/__slvg.slvg"   /* Salvage file */
+#define SLVG_URI "file:__slvg.slvg"  /* Salvage URI */
 
-#define	PSIZE	(2 * 1024)
-#define	OSIZE	(PSIZE / 20)
+#define PSIZE (2 * 1024)
+#define OSIZE (PSIZE / 20)
 
 void build(int, int, int);
 void copy(u_int, u_int);
@@ -48,12 +48,12 @@ void print_res(int, int, int);
 void process(void);
 void run(int);
 void t(int, u_int, int);
-int  usage(void);
+int usage(void);
 
-static FILE	*res_fp;			/* Results file */
-static u_int	 page_type;			/* File types */
-static int	 value_unique;			/* Values are unique */
-static int	 verbose;			/* -v flag */
+static FILE *res_fp;     /* Results file */
+static u_int page_type;  /* File types */
+static int value_unique; /* Values are unique */
+static int verbose;      /* -v flag */
 
 extern int __wt_optind;
 extern char *__wt_optarg;
@@ -61,673 +61,691 @@ extern char *__wt_optarg;
 int
 main(int argc, char *argv[])
 {
-	u_int ptype;
-	int ch, r;
-
-	(void)testutil_set_progname(argv);
-
-	r = 0;
-	ptype = 0;
-	while ((ch = __wt_getopt(progname, argc, argv, "r:t:v")) != EOF)
-		switch (ch) {
-		case 'r':
-			r = atoi(__wt_optarg);
-			if (r == 0)
-				return (usage());
-			break;
-		case 't':
-			if (strcmp(__wt_optarg, "fix") == 0)
-				ptype = WT_PAGE_COL_FIX;
-			else if (strcmp(__wt_optarg, "var") == 0)
-				ptype = WT_PAGE_COL_VAR;
-			else if (strcmp(__wt_optarg, "row") == 0)
-				ptype = WT_PAGE_ROW_LEAF;
-			else
-				return (usage());
-			break;
-		case 'v':
-			verbose = 1;
-			break;
-		case '?':
-		default:
-			return (usage());
-		}
-	argc -= __wt_optind;
-	if (argc != 0)
-		return (usage());
-
-	printf("salvage test run started\n");
-
-	t(r, ptype, 1);
-	t(r, ptype, 0);
-
-	printf("salvage test run completed\n");
-	return (EXIT_SUCCESS);
+    u_int ptype;
+    int ch, r;
+
+    (void)testutil_set_progname(argv);
+
+    r = 0;
+    ptype = 0;
+    while ((ch = __wt_getopt(progname, argc, argv, "r:t:v")) != EOF)
+        switch (ch) {
+        case 'r':
+            r = atoi(__wt_optarg);
+            if (r == 0)
+                return (usage());
+            break;
+        case 't':
+            if (strcmp(__wt_optarg, "fix") == 0)
+                ptype = WT_PAGE_COL_FIX;
+            else if (strcmp(__wt_optarg, "var") == 0)
+                ptype = WT_PAGE_COL_VAR;
+            else if (strcmp(__wt_optarg, "row") == 0)
+                ptype = WT_PAGE_ROW_LEAF;
+            else
+                return (usage());
+            break;
+        case 'v':
+            verbose = 1;
+            break;
+        case '?':
+        default:
+            return (usage());
+        }
+    argc -= __wt_optind;
+    if (argc != 0)
+        return (usage());
+
+    printf("salvage test run started\n");
+
+    t(r, ptype, 1);
+    t(r, ptype, 0);
+
+    printf("salvage test run completed\n");
+    return (EXIT_SUCCESS);
 }
 
 void
 t(int r, u_int ptype, int unique)
 {
-	printf("%sunique values\n", unique ? "" : "non-");
-	value_unique = unique;
-
-#define	NTESTS	24
-	if (r == 0) {
-		if (ptype == 0) {
-			page_type = WT_PAGE_COL_FIX;
-			for (r = 1; r <= NTESTS; ++r)
-				run(r);
-
-			page_type = WT_PAGE_COL_VAR;
-			for (r = 1; r <= NTESTS; ++r)
-				run(r);
-
-			page_type = WT_PAGE_ROW_LEAF;
-			for (r = 1; r <= NTESTS; ++r)
-				run(r);
-		} else {
-			page_type = ptype;
-			for (r = 1; r <= NTESTS; ++r)
-				run(r);
-		}
-	} else if (ptype == 0) {
-		page_type = WT_PAGE_COL_FIX;
-		run(r);
-		page_type = WT_PAGE_COL_VAR;
-		run(r);
-		page_type = WT_PAGE_ROW_LEAF;
-		run(r);
-	}  else {
-		page_type = ptype;
-		run(r);
-	}
+    printf("%sunique values\n", unique ? "" : "non-");
+    value_unique = unique;
+
+#define NTESTS 24
+    if (r == 0) {
+        if (ptype == 0) {
+            page_type = WT_PAGE_COL_FIX;
+            for (r = 1; r <= NTESTS; ++r)
+                run(r);
+
+            page_type = WT_PAGE_COL_VAR;
+            for (r = 1; r <= NTESTS; ++r)
+                run(r);
+
+            page_type = WT_PAGE_ROW_LEAF;
+            for (r = 1; r <= NTESTS; ++r)
+                run(r);
+        } else {
+            page_type = ptype;
+            for (r = 1; r <= NTESTS; ++r)
+                run(r);
+        }
+    } else if (ptype == 0) {
+        page_type = WT_PAGE_COL_FIX;
+        run(r);
+        page_type = WT_PAGE_COL_VAR;
+        run(r);
+        page_type = WT_PAGE_ROW_LEAF;
+        run(r);
+    } else {
+        page_type = ptype;
+        run(r);
+    }
 }
 
 int
 usage(void)
 {
-	(void)fprintf(stderr,
-	    "usage: %s [-v] [-r run] [-t fix|var|row]\n", progname);
-	return (EXIT_FAILURE);
+    (void)fprintf(stderr, "usage: %s [-v] [-r run] [-t fix|var|row]\n", progname);
+    return (EXIT_FAILURE);
 }
 
 void
 run(int r)
 {
-	char buf[128];
-
-	printf("\t%s: run %d\n", __wt_page_type_string(page_type), r);
-
-	testutil_make_work_dir(HOME);
-
-	testutil_checksys((res_fp = fopen(RSLT, "w")) == NULL);
-
-	/*
-	 * Each run builds the LOAD file, and then appends the first page of
-	 * the LOAD file into the SLVG file.  The SLVG file is then salvaged,
-	 * verified, and dumped into the DUMP file, which is compared to the
-	 * results file, which are the expected results.
-	 */
-	switch (r) {
-	case 1:
-		/*
-		 * Smoke test: empty files.
-		 */
-		build(0, 0, 0); copy(0, 0);
-		break;
-	case 2:
-		/*
-		 * Smoke test:
-		 * Sequential pages, all pages should be kept.
-		 */
-		build(100, 100, 20); copy(6,  1);
-		build(200, 200, 20); copy(7, 21);
-		build(300, 300, 20); copy(8, 41);
-		print_res(100, 100, 20);
-		print_res(200, 200, 20);
-		print_res(300, 300, 20);
-		break;
-	case 3:
-		/*
-		 * Smoke test:
-		 * Sequential pages, all pages should be kept.
-		 */
-		build(100, 100, 20); copy(8,  1);
-		build(200, 200, 20); copy(7, 21);
-		build(300, 300, 20); copy(6, 41);
-		print_res(100, 100, 20);
-		print_res(200, 200, 20);
-		print_res(300, 300, 20);
-		break;
-	case 4:
-		/*
-		 * Case #1:
-		 * 3 pages, each with 20 records starting with the same record
-		 * and sequential LSNs; salvage should leave the page with the
-		 * largest LSN.
-		 */
-		build(100, 100, 20); copy(6, 1);
-		build(100, 200, 20); copy(7, 1);
-		build(100, 300, 20); copy(8, 1);
-		print_res(100, 300, 20);
-		break;
-	case 5:
-		/*
-		 * Case #1:
-		 * 3 pages, each with 20 records starting with the same record
-		 * and sequential LSNs; salvage should leave the page with the
-		 * largest LSN.
-		 */
-		build(100, 100, 20); copy(6, 1);
-		build(100, 200, 20); copy(8, 1);
-		build(100, 300, 20); copy(7, 1);
-		print_res(100, 200, 20);
-		break;
-	case 6:
-		/*
-		 * Case #1:
-		 * 3 pages, each with 20 records starting with the same record
-		 * and sequential LSNs; salvage should leave the page with the
-		 * largest LSN.
-		 */
-		build(100, 100, 20); copy(8, 1);
-		build(100, 200, 20); copy(7, 1);
-		build(100, 300, 20); copy(6, 1);
-		print_res(100, 100, 20);
-		break;
-	case 7:
-		/*
-		 * Case #2:
-		 * The second page overlaps the beginning of the first page, and
-		 * the first page has a higher LSN.
-		 */
-		build(110, 100, 20); copy(7, 11);
-		build(100, 200, 20); copy(6,  1);
-		print_res(100, 200, 10);
-		print_res(110, 100, 20);
-		break;
-	case 8:
-		/*
-		 * Case #2:
-		 * The second page overlaps the beginning of the first page, and
-		 * the second page has a higher LSN.
-		 */
-		build(110, 100, 20); copy(6, 11);
-		build(100, 200, 20); copy(7,  1);
-		print_res(100, 200, 20);
-		print_res(120, 110, 10);
-		break;
-	case 9:
-		/*
-		 * Case #3:
-		 * The second page overlaps with the end of the first page, and
-		 * the first page has a higher LSN.
-		 */
-		build(100, 100, 20); copy(7,  1);
-		build(110, 200, 20); copy(6, 11);
-		print_res(100, 100, 20);
-		print_res(120, 210, 10);
-		break;
-	case 10:
-		/*
-		 * Case #3:
-		 * The second page overlaps with the end of the first page, and
-		 * the second page has a higher LSN.
-		 */
-		build(100, 100, 20); copy(6,  1);
-		build(110, 200, 20); copy(7, 11);
-		print_res(100, 100, 10);
-		print_res(110, 200, 20);
-		break;
-	case 11:
-		/*
-		 * Case #4:
-		 * The second page is a prefix of the first page, and the first
-		 * page has a higher LSN.
-		 */
-		build(100, 100, 20); copy(7, 1);
-		build(100, 200,  5); copy(6, 1);
-		print_res(100, 100, 20);
-		break;
-	case 12:
-		/*
-		 * Case #4:
-		 * The second page is a prefix of the first page, and the second
-		 * page has a higher LSN.
-		 */
-		build(100, 100, 20); copy(6, 1);
-		build(100, 200,  5); copy(7, 1);
-		print_res(100, 200, 5);
-		print_res(105, 105, 15);
-		break;
-	case 13:
-		/*
-		 * Case #5:
-		 * The second page is in the middle of the first page, and the
-		 * first page has a higher LSN.
-		 */
-		build(100, 100, 40); copy(7, 1);
-		build(110, 200, 10); copy(6, 11);
-		print_res(100, 100, 40);
-		break;
-	case 14:
-		/*
-		 * Case #5:
-		 * The second page is in the middle of the first page, and the
-		 * second page has a higher LSN.
-		 */
-		build(100, 100, 40); copy(6, 1);
-		build(110, 200, 10); copy(7, 11);
-		print_res(100, 100, 10);
-		print_res(110, 200, 10);
-		print_res(120, 120, 20);
-		break;
-	case 15:
-		/*
-		 * Case #6:
-		 * The second page is a suffix of the first page, and the first
-		 * page has a higher LSN.
-		 */
-		build(100, 100, 40); copy(7, 1);
-		build(130, 200, 10); copy(6, 31);
-		print_res(100, 100, 40);
-		break;
-	case 16:
-		/*
-		 * Case #6:
-		 * The second page is a suffix of the first page, and the second
-		 * page has a higher LSN.
-		 */
-		build(100, 100, 40); copy(6, 1);
-		build(130, 200, 10); copy(7, 31);
-		print_res(100, 100, 30);
-		print_res(130, 200, 10);
-		break;
-	case 17:
-		/*
-		 * Case #9:
-		 * The first page is a prefix of the second page, and the first
-		 * page has a higher LSN.
-		 */
-		build(100, 100, 20); copy(7, 1);
-		build(100, 200, 40); copy(6, 1);
-		print_res(100, 100, 20);
-		print_res(120, 220, 20);
-		break;
-	case 18:
-		/*
-		 * Case #9:
-		 * The first page is a prefix of the second page, and the second
-		 * page has a higher LSN.
-		 */
-		build(100, 100, 20); copy(6, 1);
-		build(100, 200, 40); copy(7, 1);
-		print_res(100, 200, 40);
-		break;
-	case 19:
-		/*
-		 * Case #10:
-		 * The first page is a suffix of the second page, and the first
-		 * page has a higher LSN.
-		 */
-		build(130, 100, 10); copy(7, 31);
-		build(100, 200, 40); copy(6, 1);
-		print_res(100, 200, 30);
-		print_res(130, 100, 10);
-		break;
-	case 20:
-		/*
-		 * Case #10:
-		 * The first page is a suffix of the second page, and the second
-		 * page has a higher LSN.
-		 */
-		build(130, 100, 10); copy(6, 31);
-		build(100, 200, 40); copy(7, 1);
-		print_res(100, 200, 40);
-		break;
-	case 21:
-		/*
-		 * Case #11:
-		 * The first page is in the middle of the second page, and the
-		 * first page has a higher LSN.
-		 */
-		build(110, 100, 10); copy(7, 11);
-		build(100, 200, 40); copy(6, 1);
-		print_res(100, 200, 10);
-		print_res(110, 100, 10);
-		print_res(120, 220, 20);
-		break;
-	case 22:
-		/*
-		 * Case #11:
-		 * The first page is in the middle of the second page, and the
-		 * second page has a higher LSN.
-		 */
-		build(110, 100, 10); copy(6, 11);
-		build(100, 200, 40); copy(7, 1);
-		print_res(100, 200, 40);
-		break;
-	case 23:
-		/*
-		 * Column-store only: missing an initial key range of 99
-		 * records.
-		 */
-		build(100, 100, 10); copy(1, 100);
-		empty(99);
-		print_res(100, 100, 10);
-		break;
-	case 24:
-		/*
-		 * Column-store only: missing a middle key range of 37
-		 * records.
-		 */
-		build(100, 100, 10); copy(1, 1);
-		build(138, 138, 10); copy(1, 48);
-		print_res(100, 100, 10);
-		empty(37);
-		print_res(138, 138, 10);
-		break;
-	default:
-		fprintf(stderr, "salvage: %d: no such test\n", r);
-		exit(EXIT_FAILURE);
-	}
-
-	testutil_assert(fclose(res_fp) == 0);
-
-	process();
-
-	testutil_check(__wt_snprintf(
-	    buf, sizeof(buf), "cmp %s %s > /dev/null", DUMP, RSLT));
-	if (system(buf)) {
-		fprintf(stderr,
-		    "check failed, salvage results were incorrect\n");
-		exit(EXIT_FAILURE);
-	}
-
-	testutil_clean_work_dir(HOME);
+    char buf[128];
+
+    printf("\t%s: run %d\n", __wt_page_type_string(page_type), r);
+
+    testutil_make_work_dir(HOME);
+
+    testutil_checksys((res_fp = fopen(RSLT, "w")) == NULL);
+
+    /*
+     * Each run builds the LOAD file, and then appends the first page of the LOAD file into the SLVG
+     * file. The SLVG file is then salvaged, verified, and dumped into the DUMP file, which is
+     * compared to the results file, which are the expected results.
+     */
+    switch (r) {
+    case 1:
+        /*
+         * Smoke test: empty files.
+         */
+        build(0, 0, 0);
+        copy(0, 0);
+        break;
+    case 2:
+        /*
+         * Smoke test: Sequential pages, all pages should be kept.
+         */
+        build(100, 100, 20);
+        copy(6, 1);
+        build(200, 200, 20);
+        copy(7, 21);
+        build(300, 300, 20);
+        copy(8, 41);
+        print_res(100, 100, 20);
+        print_res(200, 200, 20);
+        print_res(300, 300, 20);
+        break;
+    case 3:
+        /*
+         * Smoke test: Sequential pages, all pages should be kept.
+         */
+        build(100, 100, 20);
+        copy(8, 1);
+        build(200, 200, 20);
+        copy(7, 21);
+        build(300, 300, 20);
+        copy(6, 41);
+        print_res(100, 100, 20);
+        print_res(200, 200, 20);
+        print_res(300, 300, 20);
+        break;
+    case 4:
+        /*
+         * Case #1:
+         * 3 pages, each with 20 records starting with the same record
+         * and sequential LSNs; salvage should leave the page with the
+         * largest LSN.
+         */
+        build(100, 100, 20);
+        copy(6, 1);
+        build(100, 200, 20);
+        copy(7, 1);
+        build(100, 300, 20);
+        copy(8, 1);
+        print_res(100, 300, 20);
+        break;
+    case 5:
+        /*
+         * Case #1:
+         * 3 pages, each with 20 records starting with the same record
+         * and sequential LSNs; salvage should leave the page with the
+         * largest LSN.
+         */
+        build(100, 100, 20);
+        copy(6, 1);
+        build(100, 200, 20);
+        copy(8, 1);
+        build(100, 300, 20);
+        copy(7, 1);
+        print_res(100, 200, 20);
+        break;
+    case 6:
+        /*
+         * Case #1:
+         * 3 pages, each with 20 records starting with the same record
+         * and sequential LSNs; salvage should leave the page with the
+         * largest LSN.
+         */
+        build(100, 100, 20);
+        copy(8, 1);
+        build(100, 200, 20);
+        copy(7, 1);
+        build(100, 300, 20);
+        copy(6, 1);
+        print_res(100, 100, 20);
+        break;
+    case 7:
+        /*
+         * Case #2: The second page overlaps the beginning of the first page, and the first page has
+         * a higher LSN.
+         */
+        build(110, 100, 20);
+        copy(7, 11);
+        build(100, 200, 20);
+        copy(6, 1);
+        print_res(100, 200, 10);
+        print_res(110, 100, 20);
+        break;
+    case 8:
+        /*
+         * Case #2: The second page overlaps the beginning of the first page, and the second page
+         * has a higher LSN.
+         */
+        build(110, 100, 20);
+        copy(6, 11);
+        build(100, 200, 20);
+        copy(7, 1);
+        print_res(100, 200, 20);
+        print_res(120, 110, 10);
+        break;
+    case 9:
+        /*
+         * Case #3: The second page overlaps with the end of the first page, and the first page has
+         * a higher LSN.
+         */
+        build(100, 100, 20);
+        copy(7, 1);
+        build(110, 200, 20);
+        copy(6, 11);
+        print_res(100, 100, 20);
+        print_res(120, 210, 10);
+        break;
+    case 10:
+        /*
+         * Case #3: The second page overlaps with the end of the first page, and the second page has
+         * a higher LSN.
+         */
+        build(100, 100, 20);
+        copy(6, 1);
+        build(110, 200, 20);
+        copy(7, 11);
+        print_res(100, 100, 10);
+        print_res(110, 200, 20);
+        break;
+    case 11:
+        /*
+         * Case #4: The second page is a prefix of the first page, and the first page has a higher
+         * LSN.
+         */
+        build(100, 100, 20);
+        copy(7, 1);
+        build(100, 200, 5);
+        copy(6, 1);
+        print_res(100, 100, 20);
+        break;
+    case 12:
+        /*
+         * Case #4: The second page is a prefix of the first page, and the second page has a higher
+         * LSN.
+         */
+        build(100, 100, 20);
+        copy(6, 1);
+        build(100, 200, 5);
+        copy(7, 1);
+        print_res(100, 200, 5);
+        print_res(105, 105, 15);
+        break;
+    case 13:
+        /*
+         * Case #5: The second page is in the middle of the first page, and the first page has a
+         * higher LSN.
+         */
+        build(100, 100, 40);
+        copy(7, 1);
+        build(110, 200, 10);
+        copy(6, 11);
+        print_res(100, 100, 40);
+        break;
+    case 14:
+        /*
+         * Case #5: The second page is in the middle of the first page, and the second page has a
+         * higher LSN.
+         */
+        build(100, 100, 40);
+        copy(6, 1);
+        build(110, 200, 10);
+        copy(7, 11);
+        print_res(100, 100, 10);
+        print_res(110, 200, 10);
+        print_res(120, 120, 20);
+        break;
+    case 15:
+        /*
+         * Case #6: The second page is a suffix of the first page, and the first page has a higher
+         * LSN.
+         */
+        build(100, 100, 40);
+        copy(7, 1);
+        build(130, 200, 10);
+        copy(6, 31);
+        print_res(100, 100, 40);
+        break;
+    case 16:
+        /*
+         * Case #6: The second page is a suffix of the first page, and the second page has a higher
+         * LSN.
+         */
+        build(100, 100, 40);
+        copy(6, 1);
+        build(130, 200, 10);
+        copy(7, 31);
+        print_res(100, 100, 30);
+        print_res(130, 200, 10);
+        break;
+    case 17:
+        /*
+         * Case #9: The first page is a prefix of the second page, and the first page has a higher
+         * LSN.
+         */
+        build(100, 100, 20);
+        copy(7, 1);
+        build(100, 200, 40);
+        copy(6, 1);
+        print_res(100, 100, 20);
+        print_res(120, 220, 20);
+        break;
+    case 18:
+        /*
+         * Case #9: The first page is a prefix of the second page, and the second page has a higher
+         * LSN.
+         */
+        build(100, 100, 20);
+        copy(6, 1);
+        build(100, 200, 40);
+        copy(7, 1);
+        print_res(100, 200, 40);
+        break;
+    case 19:
+        /*
+         * Case #10: The first page is a suffix of the second page, and the first page has a higher
+         * LSN.
+         */
+        build(130, 100, 10);
+        copy(7, 31);
+        build(100, 200, 40);
+        copy(6, 1);
+        print_res(100, 200, 30);
+        print_res(130, 100, 10);
+        break;
+    case 20:
+        /*
+         * Case #10: The first page is a suffix of the second page, and the second page has a higher
+         * LSN.
+         */
+        build(130, 100, 10);
+        copy(6, 31);
+        build(100, 200, 40);
+        copy(7, 1);
+        print_res(100, 200, 40);
+        break;
+    case 21:
+        /*
+         * Case #11: The first page is in the middle of the second page, and the first page has a
+         * higher LSN.
+         */
+        build(110, 100, 10);
+        copy(7, 11);
+        build(100, 200, 40);
+        copy(6, 1);
+        print_res(100, 200, 10);
+        print_res(110, 100, 10);
+        print_res(120, 220, 20);
+        break;
+    case 22:
+        /*
+         * Case #11: The first page is in the middle of the second page, and the second page has a
+         * higher LSN.
+         */
+        build(110, 100, 10);
+        copy(6, 11);
+        build(100, 200, 40);
+        copy(7, 1);
+        print_res(100, 200, 40);
+        break;
+    case 23:
+        /*
+         * Column-store only: missing an initial key range of 99 records.
+         */
+        build(100, 100, 10);
+        copy(1, 100);
+        empty(99);
+        print_res(100, 100, 10);
+        break;
+    case 24:
+        /*
+         * Column-store only: missing a middle key range of 37 records.
+         */
+        build(100, 100, 10);
+        copy(1, 1);
+        build(138, 138, 10);
+        copy(1, 48);
+        print_res(100, 100, 10);
+        empty(37);
+        print_res(138, 138, 10);
+        break;
+    default:
+        fprintf(stderr, "salvage: %d: no such test\n", r);
+        exit(EXIT_FAILURE);
+    }
+
+    testutil_assert(fclose(res_fp) == 0);
+
+    process();
+
+    testutil_check(__wt_snprintf(buf, sizeof(buf), "cmp %s %s > /dev/null", DUMP, RSLT));
+    if (system(buf)) {
+        fprintf(stderr, "check failed, salvage results were incorrect\n");
+        exit(EXIT_FAILURE);
+    }
+
+    testutil_clean_work_dir(HOME);
 }
 
 /*
  * file_exists --
- *	Return if the file exists.
+ *     Return if the file exists.
  */
 static int
 file_exists(const char *path)
 {
-	struct stat sb;
+    struct stat sb;
 
-	return (stat(path, &sb) == 0);
+    return (stat(path, &sb) == 0);
 }
 
 /*
  * build --
- *	Build a row- or column-store page in a file.
+ *     Build a row- or column-store page in a file.
  */
 void
 build(int ikey, int ivalue, int cnt)
 {
-	WT_CONNECTION *conn;
-	WT_CURSOR *cursor;
-	WT_ITEM key, value;
-	WT_SESSION *session;
-	int new_slvg;
-	char config[256], kbuf[64], vbuf[64];
-
-	/*
-	 * Disable logging: we're modifying files directly, we don't want to
-	 * run recovery.
-	 */
-	testutil_check(wiredtiger_open(
-	    HOME, NULL, "create,log=(enabled=false)", &conn));
-	testutil_check(conn->open_session(conn, NULL, NULL, &session));
-	testutil_check(session->drop(session, LOAD_URI, "force"));
-
-	switch (page_type) {
-	case WT_PAGE_COL_FIX:
-		testutil_check(__wt_snprintf(config, sizeof(config),
-		    "key_format=r,value_format=7t,"
-		    "allocation_size=%d,"
-		    "internal_page_max=%d,internal_item_max=%d,"
-		    "leaf_page_max=%d,leaf_item_max=%d",
-		    PSIZE, PSIZE, OSIZE, PSIZE, OSIZE));
-		break;
-	case WT_PAGE_COL_VAR:
-		testutil_check(__wt_snprintf(config, sizeof(config),
-		    "key_format=r,"
-		    "allocation_size=%d,"
-		    "internal_page_max=%d,internal_item_max=%d,"
-		    "leaf_page_max=%d,leaf_item_max=%d",
-		    PSIZE, PSIZE, OSIZE, PSIZE, OSIZE));
-		break;
-	case WT_PAGE_ROW_LEAF:
-		testutil_check(__wt_snprintf(config, sizeof(config),
-		    "key_format=u,"
-		    "allocation_size=%d,"
-		    "internal_page_max=%d,internal_item_max=%d,"
-		    "leaf_page_max=%d,leaf_item_max=%d",
-		    PSIZE, PSIZE, OSIZE, PSIZE, OSIZE));
-		break;
-	default:
-		assert(0);
-	}
-	testutil_check(session->create(session, LOAD_URI, config));
-	testutil_check(session->open_cursor(
-	    session, LOAD_URI, NULL, "bulk,append", &cursor));
-	for (; cnt > 0; --cnt, ++ikey, ++ivalue) {
-		switch (page_type) {			/* Build the key. */
-		case WT_PAGE_COL_FIX:
-		case WT_PAGE_COL_VAR:
-			break;
-		case WT_PAGE_ROW_LEAF:
-			testutil_check(__wt_snprintf(
-			    kbuf, sizeof(kbuf), "%010d KEY------", ikey));
-			key.data = kbuf;
-			key.size = 20;
-			cursor->set_key(cursor, &key);
-			break;
-		}
-
-		switch (page_type) {			/* Build the value. */
-		case WT_PAGE_COL_FIX:
-			cursor->set_value(cursor, ivalue & 0x7f);
-			break;
-		case WT_PAGE_COL_VAR:
-		case WT_PAGE_ROW_LEAF:
-			testutil_check(__wt_snprintf(vbuf, sizeof(vbuf),
-			    "%010d VALUE----", value_unique ? ivalue : 37));
-			value.data = vbuf;
-			value.size = 20;
-			cursor->set_value(cursor, &value);
-		}
-		testutil_check(cursor->insert(cursor));
-	}
-
-	/*
-	 * The first time through this routine we create the salvage file and
-	 * then remove it (all we want is the appropriate schema entry, we're
-	 * creating the salvage file itself by hand).
-	 */
-	new_slvg = !file_exists(SLVG);
-	if (new_slvg) {
-		testutil_check(session->drop(session, SLVG_URI, "force"));
-		testutil_check(session->create(session, SLVG_URI, config));
-	}
-	testutil_check(conn->close(conn, 0));
-	if (new_slvg)
-		(void)remove(SLVG);
+    WT_CONNECTION *conn;
+    WT_CURSOR *cursor;
+    WT_ITEM key, value;
+    WT_SESSION *session;
+    int new_slvg;
+    char config[256], kbuf[64], vbuf[64];
+
+    /*
+     * Disable logging: we're modifying files directly, we don't want to run recovery.
+     */
+    testutil_check(wiredtiger_open(HOME, NULL, "create,log=(enabled=false)", &conn));
+    testutil_check(conn->open_session(conn, NULL, NULL, &session));
+    testutil_check(session->drop(session, LOAD_URI, "force"));
+
+    switch (page_type) {
+    case WT_PAGE_COL_FIX:
+        testutil_check(__wt_snprintf(config, sizeof(config),
+          "key_format=r,value_format=7t,"
+          "allocation_size=%d,"
+          "internal_page_max=%d,internal_item_max=%d,"
+          "leaf_page_max=%d,leaf_item_max=%d",
+          PSIZE, PSIZE, OSIZE, PSIZE, OSIZE));
+        break;
+    case WT_PAGE_COL_VAR:
+        testutil_check(__wt_snprintf(config, sizeof(config),
+          "key_format=r,"
+          "allocation_size=%d,"
+          "internal_page_max=%d,internal_item_max=%d,"
+          "leaf_page_max=%d,leaf_item_max=%d",
+          PSIZE, PSIZE, OSIZE, PSIZE, OSIZE));
+        break;
+    case WT_PAGE_ROW_LEAF:
+        testutil_check(__wt_snprintf(config, sizeof(config),
+          "key_format=u,"
+          "allocation_size=%d,"
+          "internal_page_max=%d,internal_item_max=%d,"
+          "leaf_page_max=%d,leaf_item_max=%d",
+          PSIZE, PSIZE, OSIZE, PSIZE, OSIZE));
+        break;
+    default:
+        assert(0);
+    }
+    testutil_check(session->create(session, LOAD_URI, config));
+    testutil_check(session->open_cursor(session, LOAD_URI, NULL, "bulk,append", &cursor));
+    for (; cnt > 0; --cnt, ++ikey, ++ivalue) {
+        switch (page_type) { /* Build the key. */
+        case WT_PAGE_COL_FIX:
+        case WT_PAGE_COL_VAR:
+            break;
+        case WT_PAGE_ROW_LEAF:
+            testutil_check(__wt_snprintf(kbuf, sizeof(kbuf), "%010d KEY------", ikey));
+            key.data = kbuf;
+            key.size = 20;
+            cursor->set_key(cursor, &key);
+            break;
+        }
+
+        switch (page_type) { /* Build the value. */
+        case WT_PAGE_COL_FIX:
+            cursor->set_value(cursor, ivalue & 0x7f);
+            break;
+        case WT_PAGE_COL_VAR:
+        case WT_PAGE_ROW_LEAF:
+            testutil_check(
+              __wt_snprintf(vbuf, sizeof(vbuf), "%010d VALUE----", value_unique ? ivalue : 37));
+            value.data = vbuf;
+            value.size = 20;
+            cursor->set_value(cursor, &value);
+        }
+        testutil_check(cursor->insert(cursor));
+    }
+
+    /*
+     * The first time through this routine we create the salvage file and then remove it (all we
+     * want is the appropriate schema entry, we're creating the salvage file itself by hand).
+     */
+    new_slvg = !file_exists(SLVG);
+    if (new_slvg) {
+        testutil_check(session->drop(session, SLVG_URI, "force"));
+        testutil_check(session->create(session, SLVG_URI, config));
+    }
+    testutil_check(conn->close(conn, 0));
+    if (new_slvg)
+        (void)remove(SLVG);
 }
 
 /*
  * copy --
- *	Copy the created page to the end of the salvage file.
+ *     Copy the created page to the end of the salvage file.
  */
 void
 copy(u_int gen, u_int recno)
 {
-	FILE *ifp, *ofp;
-	WT_BLOCK_HEADER *blk;
-	WT_PAGE_HEADER *dsk;
-	uint64_t recno64;
-	uint32_t cksum32, gen32;
-	char buf[PSIZE];
-
-	testutil_checksys((ifp = fopen(LOAD, "r")) == NULL);
-
-	/*
-	 * If the salvage file doesn't exist, then we're creating it:
-	 * copy the first sector (the file description).
-	 * Otherwise, we are appending to an existing file.
-	 */
-	if (file_exists(SLVG))
-		testutil_checksys((ofp = fopen(SLVG, "a")) == NULL);
-	else {
-		testutil_checksys((ofp = fopen(SLVG, "w")) == NULL);
-		testutil_assert(fread(buf, 1, PSIZE, ifp) == PSIZE);
-		testutil_assert(fwrite(buf, 1, PSIZE, ofp) == PSIZE);
-	}
-
-	/*
-	 * If there's data, copy/update the first formatted page.
-	 */
-	if (gen != 0) {
-		testutil_assert(fseek(ifp, (long)PSIZE, SEEK_SET) == 0);
-		testutil_assert(fread(buf, 1, PSIZE, ifp) == PSIZE);
-
-		/*
-		 * Page headers are written in little-endian format, swap before
-		 * calculating the checksum on big-endian hardware. Checksums
-		 * always returned in little-endian format, no swap is required.
-		 */
-		gen32 = gen;
-		recno64 = recno;
+    FILE *ifp, *ofp;
+    WT_BLOCK_HEADER *blk;
+    WT_PAGE_HEADER *dsk;
+    uint64_t recno64;
+    uint32_t cksum32, gen32;
+    char buf[PSIZE];
+
+    testutil_checksys((ifp = fopen(LOAD, "r")) == NULL);
+
+    /*
+     * If the salvage file doesn't exist, then we're creating it: copy the first sector (the file
+     * description). Otherwise, we are appending to an existing file.
+     */
+    if (file_exists(SLVG))
+        testutil_checksys((ofp = fopen(SLVG, "a")) == NULL);
+    else {
+        testutil_checksys((ofp = fopen(SLVG, "w")) == NULL);
+        testutil_assert(fread(buf, 1, PSIZE, ifp) == PSIZE);
+        testutil_assert(fwrite(buf, 1, PSIZE, ofp) == PSIZE);
+    }
+
+    /*
+     * If there's data, copy/update the first formatted page.
+     */
+    if (gen != 0) {
+        testutil_assert(fseek(ifp, (long)PSIZE, SEEK_SET) == 0);
+        testutil_assert(fread(buf, 1, PSIZE, ifp) == PSIZE);
+
+        /*
+         * Page headers are written in little-endian format, swap before calculating the checksum on
+         * big-endian hardware. Checksums always returned in little-endian format, no swap is
+         * required.
+         */
+        gen32 = gen;
+        recno64 = recno;
 #ifdef WORDS_BIGENDIAN
-		gen32 = __wt_bswap32(gen32);
-		recno64 = __wt_bswap64(recno64);
+        gen32 = __wt_bswap32(gen32);
+        recno64 = __wt_bswap64(recno64);
 #endif
-		dsk = (void *)buf;
-		if (page_type != WT_PAGE_ROW_LEAF)
-			dsk->recno = recno64;
-		dsk->write_gen = gen32;
-		blk = WT_BLOCK_HEADER_REF(buf);
-		blk->checksum = 0;
-		cksum32 = __wt_checksum(dsk, PSIZE);
+        dsk = (void *)buf;
+        if (page_type != WT_PAGE_ROW_LEAF)
+            dsk->recno = recno64;
+        dsk->write_gen = gen32;
+        blk = WT_BLOCK_HEADER_REF(buf);
+        blk->checksum = 0;
+        cksum32 = __wt_checksum(dsk, PSIZE);
 #ifdef WORDS_BIGENDIAN
-		cksum32 = __wt_bswap32(cksum32);
+        cksum32 = __wt_bswap32(cksum32);
 #endif
-		blk->checksum = cksum32;
-		testutil_assert(fwrite(buf, 1, PSIZE, ofp) == PSIZE);
-	}
+        blk->checksum = cksum32;
+        testutil_assert(fwrite(buf, 1, PSIZE, ofp) == PSIZE);
+    }
 
-	testutil_assert(fclose(ifp) == 0);
-	testutil_assert(fclose(ofp) == 0);
+    testutil_assert(fclose(ifp) == 0);
+    testutil_assert(fclose(ofp) == 0);
 }
 
 /*
  * process --
- *	Salvage, verify and dump the created file.
+ *     Salvage, verify and dump the created file.
  */
 void
 process(void)
 {
-	FILE *fp;
-	WT_CONNECTION *conn;
-	WT_CURSOR *cursor;
-	WT_SESSION *session;
-	char config[100];
-	const char *key, *value;
-
-	/* Salvage. */
-	config[0] = '\0';
-	if (verbose)
-		testutil_check(__wt_snprintf(config, sizeof(config),
-		    "error_prefix=\"%s\",verbose=[salvage,verify],",
-		    progname));
-	strcat(config, "log=(enabled=false),");
-
-	testutil_check(wiredtiger_open(HOME, NULL, config, &conn));
-	testutil_check(conn->open_session(conn, NULL, NULL, &session));
-	testutil_check(session->salvage(session, SLVG_URI, 0));
-	testutil_check(conn->close(conn, 0));
-
-	/* Verify. */
-	testutil_check(wiredtiger_open(HOME, NULL, config, &conn));
-	testutil_check(conn->open_session(conn, NULL, NULL, &session));
-	testutil_check(session->verify(session, SLVG_URI, 0));
-	testutil_check(conn->close(conn, 0));
-
-	/* Dump. */
-	testutil_checksys((fp = fopen(DUMP, "w")) == NULL);
-	testutil_check(wiredtiger_open(HOME, NULL, config, &conn));
-	testutil_check(conn->open_session(conn, NULL, NULL, &session));
-	testutil_check(session->open_cursor(
-	    session, SLVG_URI, NULL, "dump=print", &cursor));
-	while (cursor->next(cursor) == 0) {
-		if (page_type == WT_PAGE_ROW_LEAF) {
-			testutil_check(cursor->get_key(cursor, &key));
-			testutil_assert(fputs(key, fp) >= 0);
-			testutil_assert(fputc('\n', fp) >= 0);
-		}
-		testutil_check(cursor->get_value(cursor, &value));
-		testutil_assert(fputs(value, fp) >= 0);
-		testutil_assert(fputc('\n', fp) >= 0);
-	}
-	testutil_check(conn->close(conn, 0));
-	testutil_assert(fclose(fp) == 0);
+    FILE *fp;
+    WT_CONNECTION *conn;
+    WT_CURSOR *cursor;
+    WT_SESSION *session;
+    char config[100];
+    const char *key, *value;
+
+    /* Salvage. */
+    config[0] = '\0';
+    if (verbose)
+        testutil_check(__wt_snprintf(
+          config, sizeof(config), "error_prefix=\"%s\",verbose=[salvage,verify],", progname));
+    strcat(config, "log=(enabled=false),");
+
+    testutil_check(wiredtiger_open(HOME, NULL, config, &conn));
+    testutil_check(conn->open_session(conn, NULL, NULL, &session));
+    testutil_check(session->salvage(session, SLVG_URI, 0));
+    testutil_check(conn->close(conn, 0));
+
+    /* Verify. */
+    testutil_check(wiredtiger_open(HOME, NULL, config, &conn));
+    testutil_check(conn->open_session(conn, NULL, NULL, &session));
+    testutil_check(session->verify(session, SLVG_URI, 0));
+    testutil_check(conn->close(conn, 0));
+
+    /* Dump. */
+    testutil_checksys((fp = fopen(DUMP, "w")) == NULL);
+    testutil_check(wiredtiger_open(HOME, NULL, config, &conn));
+    testutil_check(conn->open_session(conn, NULL, NULL, &session));
+    testutil_check(session->open_cursor(session, SLVG_URI, NULL, "dump=print", &cursor));
+    while (cursor->next(cursor) == 0) {
+        if (page_type == WT_PAGE_ROW_LEAF) {
+            testutil_check(cursor->get_key(cursor, &key));
+            testutil_assert(fputs(key, fp) >= 0);
+            testutil_assert(fputc('\n', fp) >= 0);
+        }
+        testutil_check(cursor->get_value(cursor, &value));
+        testutil_assert(fputs(value, fp) >= 0);
+        testutil_assert(fputc('\n', fp) >= 0);
+    }
+    testutil_check(conn->close(conn, 0));
+    testutil_assert(fclose(fp) == 0);
 }
 
 /*
  * empty --
- *	Print empty print_res, for fixed-length column-store files.
+ *     Print empty print_res, for fixed-length column-store files.
  */
 void
 empty(int cnt)
 {
-	int i;
+    int i;
 
-	if (page_type == WT_PAGE_COL_FIX)
-		for (i = 0; i < cnt; ++i)
-			testutil_assert(fputs("\\00\n", res_fp));
+    if (page_type == WT_PAGE_COL_FIX)
+        for (i = 0; i < cnt; ++i)
+            testutil_assert(fputs("\\00\n", res_fp));
 }
 
 /*
  * print_res --
- *	Write results file.
+ *     Write results file.
  */
 void
 print_res(int key, int value, int cnt)
 {
-	static const char hex[] = "0123456789abcdef";
-	int ch;
-
-	for (; cnt > 0; ++key, ++value, --cnt) {
-		switch (page_type) {			/* Print key */
-		case WT_PAGE_COL_FIX:
-		case WT_PAGE_COL_VAR:
-			break;
-		case WT_PAGE_ROW_LEAF:
-			fprintf(res_fp, "%010d KEY------\n", key);
-			break;
-		}
-
-		switch (page_type) {			/* Print value */
-		case WT_PAGE_COL_FIX:
-			ch = value & 0x7f;
-			if (__wt_isprint((u_char)ch)) {
-				if (ch == '\\')
-					fputc('\\', res_fp);
-				fputc(ch, res_fp);
-			} else {
-				fputc('\\', res_fp);
-				fputc(hex[(ch & 0xf0) >> 4], res_fp);
-				fputc(hex[ch & 0x0f], res_fp);
-			}
-			fputc('\n', res_fp);
-			break;
-		case WT_PAGE_COL_VAR:
-		case WT_PAGE_ROW_LEAF:
-			fprintf(res_fp,
-			    "%010d VALUE----\n", value_unique ? value : 37);
-			break;
-		}
-	}
+    static const char hex[] = "0123456789abcdef";
+    int ch;
+
+    for (; cnt > 0; ++key, ++value, --cnt) {
+        switch (page_type) { /* Print key */
+        case WT_PAGE_COL_FIX:
+        case WT_PAGE_COL_VAR:
+            break;
+        case WT_PAGE_ROW_LEAF:
+            fprintf(res_fp, "%010d KEY------\n", key);
+            break;
+        }
+
+        switch (page_type) { /* Print value */
+        case WT_PAGE_COL_FIX:
+            ch = value & 0x7f;
+            if (__wt_isprint((u_char)ch)) {
+                if (ch == '\\')
+                    fputc('\\', res_fp);
+                fputc(ch, res_fp);
+            } else {
+                fputc('\\', res_fp);
+                fputc(hex[(ch & 0xf0) >> 4], res_fp);
+                fputc(hex[ch & 0x0f], res_fp);
+            }
+            fputc('\n', res_fp);
+            break;
+        case WT_PAGE_COL_VAR:
+        case WT_PAGE_ROW_LEAF:
+            fprintf(res_fp, "%010d VALUE----\n", value_unique ? value : 37);
+            break;
+        }
+    }
 }