1 files changed, 152 insertions, 158 deletions

diff --git a/src/third_party/wiredtiger/test/bloom/test_bloom.c b/src/third_party/wiredtiger/test/bloom/test_bloom.c
index 29806d5e488..093a231c063 100644
--- a/src/third_party/wiredtiger/test/bloom/test_bloom.c
+++ b/src/third_party/wiredtiger/test/bloom/test_bloom.c
@@ -29,28 +29,27 @@
 #include "test_util.h"
 
 static struct {
-	WT_CONNECTION *wt_conn;			/* WT_CONNECTION handle */
-	WT_SESSION *wt_session;			/* WT_SESSION handle */
+    WT_CONNECTION *wt_conn; /* WT_CONNECTION handle */
+    WT_SESSION *wt_session; /* WT_SESSION handle */
 
-	char *config_open;			/* Command-line configuration */
+    char *config_open; /* Command-line configuration */
 
-	uint32_t c_cache;			/* Config values */
-	uint32_t c_key_max;
-	uint32_t c_ops;
-	uint32_t c_k;				/* Number of hash iterations */
-	uint32_t c_factor;			/* Number of bits per item */
+    uint32_t c_cache; /* Config values */
+    uint32_t c_key_max;
+    uint32_t c_ops;
+    uint32_t c_k;      /* Number of hash iterations */
+    uint32_t c_factor; /* Number of bits per item */
 
-	WT_RAND_STATE rand;
+    WT_RAND_STATE rand;
 
-	uint8_t **entries;
+    uint8_t **entries;
 } g;
 
 void cleanup(void);
 void populate_entries(void);
 void run(void);
 void setup(void);
-void usage(void)
-    WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn));
+void usage(void) WT_GCC_FUNC_DECL_ATTRIBUTE((noreturn));
 
 extern char *__wt_optarg;
 extern int __wt_optind;
@@ -58,191 +57,186 @@ extern int __wt_optind;
 int
 main(int argc, char *argv[])
 {
-	int ch;
-
-	(void)testutil_set_progname(argv);
-
-	/* Set default configuration values. */
-	g.c_cache = 10;
-	g.c_ops = 100000;
-	g.c_key_max = 100;
-	g.c_k = 8;
-	g.c_factor = 16;
-
-	/* Set values from the command line. */
-	while ((ch = __wt_getopt(progname, argc, argv, "c:f:k:o:")) != EOF)
-		switch (ch) {
-		case 'c':			/* Cache size */
-			g.c_cache = (u_int)atoi(__wt_optarg);
-			break;
-		case 'f':			/* Factor */
-			g.c_factor = (u_int)atoi(__wt_optarg);
-			break;
-		case 'k':			/* Number of hash functions */
-			g.c_k = (u_int)atoi(__wt_optarg);
-			break;
-		case 'o':			/* Number of ops */
-			g.c_ops = (u_int)atoi(__wt_optarg);
-			break;
-		default:
-			usage();
-		}
-
-	argc -= __wt_optind;
-	if (argc != 0)
-		usage();
-
-	setup();
-	run();
-	cleanup();
-
-	return (EXIT_SUCCESS);
+    int ch;
+
+    (void)testutil_set_progname(argv);
+
+    /* Set default configuration values. */
+    g.c_cache = 10;
+    g.c_ops = 100000;
+    g.c_key_max = 100;
+    g.c_k = 8;
+    g.c_factor = 16;
+
+    /* Set values from the command line. */
+    while ((ch = __wt_getopt(progname, argc, argv, "c:f:k:o:")) != EOF)
+        switch (ch) {
+        case 'c': /* Cache size */
+            g.c_cache = (u_int)atoi(__wt_optarg);
+            break;
+        case 'f': /* Factor */
+            g.c_factor = (u_int)atoi(__wt_optarg);
+            break;
+        case 'k': /* Number of hash functions */
+            g.c_k = (u_int)atoi(__wt_optarg);
+            break;
+        case 'o': /* Number of ops */
+            g.c_ops = (u_int)atoi(__wt_optarg);
+            break;
+        default:
+            usage();
+        }
+
+    argc -= __wt_optind;
+    if (argc != 0)
+        usage();
+
+    setup();
+    run();
+    cleanup();
+
+    return (EXIT_SUCCESS);
 }
 
 void
 setup(void)
 {
-	WT_CONNECTION *conn;
-	WT_SESSION *session;
-	char config[512];
+    WT_CONNECTION *conn;
+    WT_SESSION *session;
+    char config[512];
 
-	testutil_check(system("rm -f WiredTiger* *.bf"));
+    testutil_check(system("rm -f WiredTiger* *.bf"));
 
-	/*
-	 * This test doesn't test public Wired Tiger functionality, it still
-	 * needs connection and session handles.
-	 */
+    /*
+     * This test doesn't test public Wired Tiger functionality, it still needs connection and
+     * session handles.
+     */
 
-	/*
-	 * Open configuration -- put command line configuration options at the
-	 * end so they can override "standard" configuration.
-	 */
-	testutil_check(__wt_snprintf(config, sizeof(config),
-	    "create,error_prefix=\"%s\",cache_size=%" PRIu32 "MB,%s",
-	    progname, g.c_cache, g.config_open == NULL ? "" : g.config_open));
+    /*
+     * Open configuration -- put command line configuration options at the end so they can override
+     * "standard" configuration.
+     */
+    testutil_check(__wt_snprintf(config, sizeof(config),
+      "create,error_prefix=\"%s\",cache_size=%" PRIu32 "MB,%s", progname, g.c_cache,
+      g.config_open == NULL ? "" : g.config_open));
 
-	testutil_check(wiredtiger_open(NULL, NULL, config, &conn));
+    testutil_check(wiredtiger_open(NULL, NULL, config, &conn));
 
-	testutil_check(conn->open_session(conn, NULL, NULL, &session));
+    testutil_check(conn->open_session(conn, NULL, NULL, &session));
 
-	g.wt_conn = conn;
-	g.wt_session = session;
-	populate_entries();
+    g.wt_conn = conn;
+    g.wt_session = session;
+    populate_entries();
 }
 
 void
 run(void)
 {
-	WT_BLOOM *bloomp;
-	WT_ITEM item;
-	WT_SESSION_IMPL *sess;
-	uint32_t fp, i;
-	int ret;
-	const char *uri = "file:my_bloom.bf";
-
-	/* Use the internal session handle to access private APIs. */
-	sess = (WT_SESSION_IMPL *)g.wt_session;
-
-	testutil_check(__wt_bloom_create(
-	    sess, uri, NULL, g.c_ops, g.c_factor, g.c_k, &bloomp));
-
-	item.size = g.c_key_max;
-	for (i = 0; i < g.c_ops; i++) {
-		item.data = g.entries[i];
-		__wt_bloom_insert(bloomp, &item);
-	}
-
-	testutil_check(__wt_bloom_finalize(bloomp));
-
-	for (i = 0; i < g.c_ops; i++) {
-		item.data = g.entries[i];
-		if ((ret = __wt_bloom_get(bloomp, &item)) != 0) {
-			fprintf(stderr,
-			    "get failed at record: %" PRIu32 "\n", i);
-			testutil_die(ret, "__wt_bloom_get");
-		}
-	}
-	testutil_check(__wt_bloom_close(bloomp));
-
-	testutil_check(g.wt_session->checkpoint(g.wt_session, NULL));
-	testutil_check(__wt_bloom_open(
-	    sess, uri, g.c_factor, g.c_k, NULL, &bloomp));
-
-	for (i = 0; i < g.c_ops; i++) {
-		item.data = g.entries[i];
-		testutil_check(__wt_bloom_get(bloomp, &item));
-	}
-
-	/*
-	 * Try out some values we didn't insert - choose a different size to
-	 * ensure the value doesn't overlap with existing values.
-	 */
-	item.size = g.c_key_max + 10;
-	item.data = dcalloc(item.size, 1);
-	memset((void *)item.data, 'a', item.size);
-	for (i = 0, fp = 0; i < g.c_ops; i++) {
-		((uint8_t *)item.data)[i % item.size] =
-		    'a' + (__wt_random(&g.rand) % 26);
-		if ((ret = __wt_bloom_get(bloomp, &item)) == 0)
-			++fp;
-		if (ret != 0 && ret != WT_NOTFOUND)
-			testutil_die(ret, "__wt_bloom_get");
-	}
-	free((void *)item.data);
-	printf(
-	    "Out of %" PRIu32 " ops, got %" PRIu32 " false positives, %.4f%%\n",
-	    g.c_ops, fp, 100.0 * fp/g.c_ops);
-	testutil_check(__wt_bloom_drop(bloomp, NULL));
+    WT_BLOOM *bloomp;
+    WT_ITEM item;
+    WT_SESSION_IMPL *sess;
+    uint32_t fp, i;
+    int ret;
+    const char *uri = "file:my_bloom.bf";
+
+    /* Use the internal session handle to access private APIs. */
+    sess = (WT_SESSION_IMPL *)g.wt_session;
+
+    testutil_check(__wt_bloom_create(sess, uri, NULL, g.c_ops, g.c_factor, g.c_k, &bloomp));
+
+    item.size = g.c_key_max;
+    for (i = 0; i < g.c_ops; i++) {
+        item.data = g.entries[i];
+        __wt_bloom_insert(bloomp, &item);
+    }
+
+    testutil_check(__wt_bloom_finalize(bloomp));
+
+    for (i = 0; i < g.c_ops; i++) {
+        item.data = g.entries[i];
+        if ((ret = __wt_bloom_get(bloomp, &item)) != 0) {
+            fprintf(stderr, "get failed at record: %" PRIu32 "\n", i);
+            testutil_die(ret, "__wt_bloom_get");
+        }
+    }
+    testutil_check(__wt_bloom_close(bloomp));
+
+    testutil_check(g.wt_session->checkpoint(g.wt_session, NULL));
+    testutil_check(__wt_bloom_open(sess, uri, g.c_factor, g.c_k, NULL, &bloomp));
+
+    for (i = 0; i < g.c_ops; i++) {
+        item.data = g.entries[i];
+        testutil_check(__wt_bloom_get(bloomp, &item));
+    }
+
+    /*
+     * Try out some values we didn't insert - choose a different size to ensure the value doesn't
+     * overlap with existing values.
+     */
+    item.size = g.c_key_max + 10;
+    item.data = dcalloc(item.size, 1);
+    memset((void *)item.data, 'a', item.size);
+    for (i = 0, fp = 0; i < g.c_ops; i++) {
+        ((uint8_t *)item.data)[i % item.size] = 'a' + (__wt_random(&g.rand) % 26);
+        if ((ret = __wt_bloom_get(bloomp, &item)) == 0)
+            ++fp;
+        if (ret != 0 && ret != WT_NOTFOUND)
+            testutil_die(ret, "__wt_bloom_get");
+    }
+    free((void *)item.data);
+    printf("Out of %" PRIu32 " ops, got %" PRIu32 " false positives, %.4f%%\n", g.c_ops, fp,
+      100.0 * fp / g.c_ops);
+    testutil_check(__wt_bloom_drop(bloomp, NULL));
 }
 
 void
 cleanup(void)
 {
-	uint32_t i;
+    uint32_t i;
 
-	for (i = 0; i < g.c_ops; i++)
-		free(g.entries[i]);
-	free(g.entries);
-	testutil_check(g.wt_session->close(g.wt_session, NULL));
-	testutil_check(g.wt_conn->close(g.wt_conn, NULL));
+    for (i = 0; i < g.c_ops; i++)
+        free(g.entries[i]);
+    free(g.entries);
+    testutil_check(g.wt_session->close(g.wt_session, NULL));
+    testutil_check(g.wt_conn->close(g.wt_conn, NULL));
 }
 
 /*
- * Create and keep all the strings used to populate the bloom filter, so that
- * we can do validation with the same set of entries.
+ * Create and keep all the strings used to populate the bloom filter, so that we can do validation
+ * with the same set of entries.
  */
 void
 populate_entries(void)
 {
-	uint32_t i, j;
-	uint8_t **entries;
+    uint32_t i, j;
+    uint8_t **entries;
 
-	__wt_random_init_seed(NULL, &g.rand);
+    __wt_random_init_seed(NULL, &g.rand);
 
-	entries = dcalloc(g.c_ops, sizeof(uint8_t *));
+    entries = dcalloc(g.c_ops, sizeof(uint8_t *));
 
-	for (i = 0; i < g.c_ops; i++) {
-		entries[i] = dcalloc(g.c_key_max, sizeof(uint8_t));
-		for (j = 0; j < g.c_key_max; j++)
-			entries[i][j] = 'a' + (__wt_random(&g.rand) % 26);
-	}
+    for (i = 0; i < g.c_ops; i++) {
+        entries[i] = dcalloc(g.c_key_max, sizeof(uint8_t));
+        for (j = 0; j < g.c_key_max; j++)
+            entries[i][j] = 'a' + (__wt_random(&g.rand) % 26);
+    }
 
-	g.entries = entries;
+    g.entries = entries;
 }
 
 /*
  * usage --
- *	Display usage statement and exit failure.
+ *     Display usage statement and exit failure.
  */
 void
 usage(void)
 {
-	fprintf(stderr, "usage: %s [-cfko]\n", progname);
-	fprintf(stderr, "%s",
-	    "\t-c cache size\n"
-	    "\t-f number of bits per item\n"
-	    "\t-k size of entry strings\n"
-	    "\t-o number of operations to perform\n");
-
-	exit(EXIT_FAILURE);
+    fprintf(stderr, "usage: %s [-cfko]\n", progname);
+    fprintf(stderr, "%s",
+      "\t-c cache size\n"
+      "\t-f number of bits per item\n"
+      "\t-k size of entry strings\n"
+      "\t-o number of operations to perform\n");
+
+    exit(EXIT_FAILURE);
 }