summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Gorrod <alexg@wiredtiger.com>2016-02-17 02:08:56 +0000
committerAlex Gorrod <alexg@wiredtiger.com>2016-02-17 02:08:56 +0000
commit99f2005a55a5eb6a555b71841d6cf4feae3c5f40 (patch)
treec80fc59e6a015afdaa8438d7919cda6fa0afc9bb
parent9f1a9bc198fdac975bc5bea1fed487b877d37a18 (diff)
downloadmongo-99f2005a55a5eb6a555b71841d6cf4feae3c5f40.tar.gz
Minor cleanup.
-rw-r--r--test/cursor_order/cursor_order.h11
-rw-r--r--test/cursor_order/cursor_order_file.c1
-rw-r--r--test/cursor_order/cursor_order_ops.c4
3 files changed, 4 insertions, 12 deletions
diff --git a/test/cursor_order/cursor_order.h b/test/cursor_order/cursor_order.h
index 9a3ae51ed91..dd49fce124b 100644
--- a/test/cursor_order/cursor_order.h
+++ b/test/cursor_order/cursor_order.h
@@ -26,23 +26,14 @@
* OTHER DEALINGS IN THE SOFTWARE.
*/
-#include <sys/types.h>
-#include <sys/time.h>
-
-#include <errno.h>
-#include <inttypes.h>
-#include <pthread.h>
#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
#include "test_util.i"
#define FNAME "file:cursor_order.%03d" /* File name */
typedef enum { FIX, ROW, VAR } __ftype; /* File type */
+
typedef struct {
uint64_t append_inserters; /* Number of append threads */
WT_CONNECTION *conn; /* WiredTiger connection */
diff --git a/test/cursor_order/cursor_order_file.c b/test/cursor_order/cursor_order_file.c
index 81c76a3a63e..e5dd76fa1a1 100644
--- a/test/cursor_order/cursor_order_file.c
+++ b/test/cursor_order/cursor_order_file.c
@@ -100,6 +100,7 @@ load(SHARED_CONFIG *cfg, const char *name)
if ((ret = cursor->insert(cursor)) != 0)
testutil_die(ret, "cursor.insert");
}
+
/* Setup the starting key range for the workload phase. */
cfg->key_range = cfg->nkeys;
cursor->close(cursor);
diff --git a/test/cursor_order/cursor_order_ops.c b/test/cursor_order/cursor_order_ops.c
index c60923d9cc0..e2578f7544e 100644
--- a/test/cursor_order/cursor_order_ops.c
+++ b/test/cursor_order/cursor_order_ops.c
@@ -28,9 +28,9 @@
#include "cursor_order.h"
+static void *append_insert(void *);
static void print_stats(SHARED_CONFIG *);
static void *reverse_scan(void *);
-static void *append_insert(void *);
typedef struct {
char *name; /* object name */
@@ -224,9 +224,9 @@ reverse_scan(void *arg)
SHARED_CONFIG *cfg;
WT_CURSOR *cursor;
WT_SESSION *session;
- uint64_t i;
int id, ret;
char tid[128];
+ uint64_t i;
id = (int)(uintptr_t)arg;
s = &run_info[id];