#4117 add a program to verify a db-benchmark file refs[t:4117]

git-svn-id: file:///svn/toku/tokudb@36863 c7de825b-a66e-492c-adef-691d508d4ae1

db-benchmark-test/Makefile

@@ -32,6 +32,7 @@ SCANRACE_TDB = scanrace-tokudb$(BINSUF)
 PTQUERY_TDB = ptquery-tokudb$(BINSUF)
 TXNCOMMIT_TDB = txncommit-tokudb$(BINSUF)
 MULTIBENCH_TDB = multi-bench-tokudb$(BINSUF)
+VERIFY_TDB = db-verify-tokudb$(BINSUF)
 
 TARGETS_BDB = $(TARGET_BDB) $(SCANSCAN_BDB) $(PTQUERY_BDB) $(TXNCOMMIT_BDB)
 TARGETS = $(TARGETS_BDB) $(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB)
@@ -121,7 +122,7 @@ clean:
 	rm -f $(TARGETS) 4g.out
 	rm -rf *.dir $(BENCHDBS)
 
-$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB): BIN_FROM_C_FLAGS+=-DDIRSUF=tokudb -I$(PORTABILITY_HEADERS) -I$(TOKUROOT)toku_include -I$(TOKUROOT)include
+$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(VERIFY_TDB): BIN_FROM_C_FLAGS+=-DDIRSUF=tokudb -I$(PORTABILITY_HEADERS) -I$(TOKUROOT)toku_include -I$(TOKUROOT)include
 
 ifneq ($(PROF),)
     USE_STATIC=1
@@ -155,10 +156,10 @@ ifeq ($(OS_CHOICE),windows)
 $(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB): $(WIN_YDB) $(PTHREAD_LOCAL)
 $(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB): LINK_FILES+=$(WIN_YDB)
 else
-$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB): DLINK_FILES=$(TDB_DLINK_FILES)
-$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB): RPATH_DIRS=$(dir $(TDB_DLINK_FILES))
+$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB) $(VERIFY_TDB): DLINK_FILES=$(TDB_DLINK_FILES)
+$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB) $(VERIFY_TDB): RPATH_DIRS=$(dir $(TDB_DLINK_FILES))
 endif
-$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB): LDLIBS+=-ltokuportability
+$(TARGET_TDB) $(SCANSCAN_TDB) $(SCANRACE_TDB) $(MULTIBENCH_TDB) $(PTQUERY_TDB) $(TXNCOMMIT_TDB) $(VERIFY_TDB): LDLIBS+=-ltokuportability
 $(TARGET_TDB): db-benchmark-test.c $(PTHREAD_LOCAL)
 	$(CC) $< $(BIN_FROM_C_FLAGS) $(LINK_MUST_BE_LAST)
 $(SCANSCAN_TDB): scanscan.c $(PTHREAD_LOCAL)
@@ -171,6 +172,8 @@ $(MULTIBENCH_TDB): multi-bench.c $(PTHREAD_LOCAL)
 	$(CC) $< $(BIN_FROM_C_FLAGS) $(LINK_MUST_BE_LAST)
 $(TXNCOMMIT_TDB): txncommit.c $(PTHREAD_LOCAL)
 	$(CC) $< $(BIN_FROM_C_FLAGS) $(LINK_MUST_BE_LAST)
+$(VERIFY_TDB): db-verify.c $(PTHREAD_LOCAL)
+	$(CC) $< $(BIN_FROM_C_FLAGS) $(LINK_MUST_BE_LAST)
 endif
 
 $(TARGETS_BDB): CPPFLAGS+=-DDIRSUF=bdb  -DTOKU_ALLOW_DEPRECATED

db-benchmark-test/db-verify.c

+#include <stdio.h>
+#include <assert.h>
+#include <string.h>
+#include <stdbool.h>
+#include <db.h>
+#include "tokudb_common_funcs.h"
+
+static int verbose = 0;
+static int env_open_flags_yesx = DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL|DB_INIT_TXN|DB_INIT_LOG|DB_INIT_LOCK;
+static int env_open_flags_nox = DB_CREATE|DB_PRIVATE|DB_INIT_MPOOL;
+
+int test_main(int argc, char * const argv[]) {
+    int r;
+    char *envdir = "bench.tokudb";
+    char *dbfilename = "bench.db";
+    bool do_txns = false;
+
+    for (int i = 1; i < argc; i++) {
+        if (strcmp(argv[i], "-v") == 0 || strcmp(argv[i], "--verbose") == 0) {
+            verbose++;
+            continue;
+        }
+        if (strcmp(argv[i], "-x") == 0) {
+            do_txns = true;
+            continue;
+        }
+    }
+   
+
+    DB_ENV *env = NULL;
+    r = db_env_create(&env, 0); 
+    assert(r == 0);
+
+    r = env->open(env, envdir, do_txns ? env_open_flags_yesx : env_open_flags_nox, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+    assert(r == 0);
+
+    DB *db = NULL;
+    r = db_create(&db, env, 0); 
+    assert(r == 0);
+
+    r = db->open(db, NULL, dbfilename, NULL, DB_BTREE, DB_AUTO_COMMIT, S_IRUSR|S_IWUSR|S_IRGRP|S_IROTH);
+    assert(r == 0);
+
+    r = db->verify_with_progress(db, NULL, NULL, 0, 0);
+    assert(r == 0);
+
+    r = db->close(db, 0);
+    assert(r == 0);
+
+    r = env->close(env, 0); 
+    assert(r == 0);
+    return 0;
+}

newbrt/brt-verify.c

@@ -114,7 +114,7 @@ count_msgs(OMTVALUE v, u_int32_t UU(idx), void *ve)
     const struct fifo_entry *entry = toku_fifo_get_entry(e->fifo, offset);
     DBT dbt;
     const DBT *buffer_key = fill_dbt_for_fifo_entry(&dbt, entry);
-    if (e->cmp(e->cmp_extra, e->key, buffer_key) == 0 && entry->msn.msn == e->msn.msn) {
+    if (entry->msn.msn == e->msn.msn && e->cmp(e->cmp_extra, e->key, buffer_key) == 0) {
         e->count++;
     }
     return 0;