merge 2578b to main refs[t:2578]

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

linux/file.c

@@ -103,7 +103,7 @@ toku_set_func_pwrite (ssize_t (*pwrite_fun)(int, const void *, size_t, off_t)) {
 }
 
 void
-toku_os_full_pwrite (int fd, const void *buf, size_t len, off_t off) {
+toku_os_full_pwrite (int fd, const void *buf, size_t len, toku_off_t off) {
     const char *bp = (const char *) buf;
     while (len > 0) {
         ssize_t r;
@@ -124,6 +124,28 @@ toku_os_full_pwrite (int fd, const void *buf, size_t len, off_t off) {
     assert(len == 0);
 }
 
+int
+toku_os_pwrite (int fd, const void *buf, size_t len, toku_off_t off) {
+    const char *bp = (const char *) buf;
+    int result = 0;
+    while (len > 0) {
+        ssize_t r;
+        if (t_pwrite) {
+            r = t_pwrite(fd, bp, len, off);
+        } else {
+            r = pwrite(fd, bp, len, off);
+        }
+        if (r < 0) {
+            result = errno;
+            break;
+        }
+        len           -= r;
+        bp            += r;
+        off           += r;
+    }
+    return result;
+}
+
 static ssize_t (*t_write)(int, const void *, size_t) = 0;
 
 int 
@@ -156,6 +178,7 @@ toku_os_full_write (int fd, const void *buf, size_t len) {
 int
 toku_os_write (int fd, const void *buf, size_t len) {
     const char *bp = (const char *) buf;
+    int result = 0;
     while (len > 0) {
         ssize_t r;
         if (t_write) {
@@ -163,12 +186,14 @@ toku_os_write (int fd, const void *buf, size_t len) {
         } else {
             r = write(fd, bp, len);
         }
-        if (r < 0)
-            return errno;
+        if (r < 0) {
+            result = errno;
+            break;
+        }
         len           -= r;
         bp            += r;
     }
-    return 0;
+    return result;
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

newbrt/brtloader-internal.h

@@ -110,9 +110,6 @@ int brt_loader_call_error_function(brtloader_error_callback);
 int brt_loader_set_error_and_callback(brtloader_error_callback, int error, DB *db, int which_db, DBT *key, DBT *val);
 
 struct brtloader_s {
-    int panic;
-    int panic_errno;
-
     generate_row_for_put_func generate_row_for_put;
     brt_compare_func *bt_compare_funs;
 
@@ -129,6 +126,9 @@ struct brtloader_s {
     toku_pthread_t     extractor_thread;     // the thread that takes primary rowset and does extraction and the first level sort and write to file.
     BOOL extractor_live;
 
+    BOOL panic;
+    int panic_errno;
+    
     struct rowset *rows; // secondary rows that have been put, but haven't been sorted and written to a file.
     u_int64_t n_rows; // how many rows have been put?
     struct merge_fileset *fs;
@@ -153,6 +153,8 @@ struct brtloader_s {
     QUEUE *fractal_queues; // an array of work queues, one for each secondary index.
     toku_pthread_t *fractal_threads;
     BOOL *fractal_threads_live; // an array of bools indicating that fractal_threads[i] is a live thread.  (There is no NULL for a pthread_t, so we have to maintain this separately).
+
+    pthread_mutex_t mutex;
 };
 
 // Set the number of rows in the loader.  Used for test.

newbrt/tests/Makefile

@@ -94,17 +94,11 @@ check_test-assert$(BINSUF): test-assert$(BINSUF) $(PTHREAD_LOCAL)
 
 check_brtloader-test$(BINSUF): EXTRA_ARGS=dir.brtloader-test
 
-check_brtloader-test-write-dbfile$(BINSUF): EXTRA_ARGS=-n 1000000 dir.brtloader-test-write-dbfile
+check_brtloader-test-write-dbfile$(BINSUF): EXTRA_ARGS=-s -r 100000 dir.brtloader-test-write-dbfile
 
-brtloader-test$(BINSUF): brtloader-test.$(OEXT)
-ifeq ($(BRTLOADER),cilk)
-	$(CILKPP) $(CILKFLAGS) $< -o $@ $(LDFLAGS)
-endif
-ifeq ($(BRTLOADER),cxx)
-	$(CXX) $(CXXFLAGS) $< -o $@ $(LDFLAGS)
-endif
+check_brtloader-test-write-dbfile-enospc$(BINSUF): EXTRA_ARGS=-s -r 10000 dir.brtloader-test-write-dbfile-enospc
 
-brtloader-test-write-dbfile$(BINSUF): brtloader-test-write-dbfile.$(OEXT)
+brtloader-%$(BINSUF): brtloader-%.$(OEXT)
 ifeq ($(BRTLOADER),cilk)
 	$(CILKPP) $(CILKFLAGS) $< -o $@ $(LDFLAGS)
 endif

newbrt/tests/brtloader-test-write-dbfile-enospc.c

+/* -*- mode: C; c-basic-offset: 4 -*- */
+#ident "$Id: pqueue.c$"
+#ident "Copyright (c) 2010 Tokutek Inc.  All rights reserved."
+#ident "The technology is licensed by the Massachusetts Institute of Technology, Rutgers State University of New Jersey, and the Research Foundation of State University of New York at Stony Brook under United States of America Serial No. 11/760379 and to the patents and/or patent applications resulting from it."
+
+// test the loader write dbfile function
+
+#define DONT_DEPRECATE_WRITES
+#include "includes.h"
+#include "test.h"
+#include "brtloader-internal.h"
+
+#if defined(__cplusplus)
+extern "C" {
+#endif
+
+static int write_count, write_count_trigger, write_enospc;
+
+static void reset_write_counts(void) {
+    write_count = write_count_trigger = write_enospc = 0;
+}
+
+static void count_enospc(void) {
+    write_enospc++;
+}
+
+static size_t bad_fwrite (const void *ptr, size_t size, size_t nmemb, FILE *stream) {
+    write_count++;
+    size_t r;
+    if (write_count_trigger == write_count) {
+        count_enospc();
+	errno = ENOSPC;
+	r = -1;
+    } else {
+	r = fwrite(ptr, size, nmemb, stream);
+	if (r!=nmemb) {
+	    errno = ferror(stream);
+	}
+    }
+    return r;
+}
+
+static ssize_t bad_write(int fd, const void * bp, size_t len) {
+    ssize_t r;
+    write_count++;
+    if (write_count_trigger == write_count) {
+        count_enospc();
+	errno = ENOSPC;
+	r = -1;
+    } else {
+	r = write(fd, bp, len);
+    }
+    return r;
+}
+
+static ssize_t bad_pwrite(int fd, const void * bp, size_t len, toku_off_t off) {
+    ssize_t r;
+    write_count++;
+    if (write_count_trigger == write_count) {
+        count_enospc();
+	errno = ENOSPC;
+	r = -1;
+    } else {
+	r = pwrite(fd, bp, len, off);
+    }
+    return r;
+}
+
+static int qsort_compare_ints (const void *a, const void *b) {
+    int avalue = *(int*)a;
+    int bvalue = *(int*)b;
+    if (avalue<bvalue) return -1;
+    if (avalue>bvalue) return +1;
+    return 0;
+
+}
+
+static int compare_ints (DB *dest_db, const DBT *akey, const DBT *bkey) {
+    assert(dest_db==NULL);
+    assert(akey->size==sizeof(int));
+    assert(bkey->size==sizeof(int));
+    return qsort_compare_ints(akey->data, bkey->data);
+}
+
+static void err_cb(DB *db UU(), int dbn UU(), int err UU(), DBT *key UU(), DBT *val UU(), void *extra UU()) {
+    fprintf(stderr, "error in test");
+    abort();
+}
+
+static void verify_dbfile(int n, const char *name) {
+    if (verbose) printf("verify\n");
+
+    int r;
+
+    CACHETABLE ct;
+    r = toku_brt_create_cachetable(&ct, 0, ZERO_LSN, NULL_LOGGER); assert(r==0);
+
+    TOKUTXN const null_txn = NULL;
+    BRT t = NULL;
+    r = toku_brt_create(&t); assert(r == 0);
+    r = toku_brt_set_bt_compare(t, compare_ints); assert(r == 0);
+    r = toku_brt_open(t, name, 0, 0, ct, null_txn, 0); assert(r==0);
+
+    BRT_CURSOR cursor = NULL;
+    r = toku_brt_cursor(t, &cursor, NULL, TXNID_NONE, FALSE); assert(r == 0);
+
+    int i;
+    for (i=0; ; i++) {
+	int kk = i;
+	int vv = i;
+	struct check_pair pair = {sizeof kk, &kk, sizeof vv, &vv, 0};
+        r = toku_brt_cursor_get(cursor, NULL, NULL, lookup_checkf, &pair, DB_NEXT);
+        if (r != 0) {
+	    assert(pair.call_count ==0);
+	    break;
+	}
+	assert(pair.call_count==1);
+    }
+
+    assert(i == n);
+
+    r = toku_brt_cursor_close(cursor); assert(r == 0);
+    r = toku_close_brt(t, 0); assert(r==0);
+    r = toku_cachetable_close(&ct);assert(r==0);
+    if (verbose) printf("verify done\n");
+}
+
+static void write_dbfile (char *template, int n, char *output_name, BOOL expect_error) {
+    if (verbose) printf("test start %d %d\n", n, expect_error);
+
+    DB *dest_db = NULL;
+    struct brtloader_s bl = {.panic              = 0,
+			     .temp_file_template = template};
+    int r = brtloader_init_file_infos(&bl.file_infos);
+    CKERR(r);
+    struct merge_fileset fs;
+    init_merge_fileset(&fs);
+
+    // put rows in the row set
+    struct rowset aset;
+    init_rowset(&aset);
+    for (int i=0; i<n; i++) {
+	DBT key = {.size=sizeof i,
+		   .data=&i};
+	DBT val = {.size=sizeof i,
+		   .data=&i};
+	add_row(&aset, &key, &val);
+    }
+
+    toku_brt_loader_set_n_rows(&bl, n);
+
+    brt_loader_init_error_callback(&bl.error_callback);
+    brt_loader_set_error_function(&bl.error_callback, err_cb, NULL);
+    r = brt_loader_sort_and_write_rows(&aset, &fs, &bl, 0, dest_db, compare_ints, 0);  CKERR(r);
+    // destroy_rowset(&aset);
+
+    QUEUE q;
+    r = queue_create(&q, 0xFFFFFFFF); // infinite queue.
+    assert(r==0);
+    r = merge_files(&fs, &bl, 0, dest_db, compare_ints, 0, q); CKERR(r);
+    assert(fs.n_temp_files==0);
+
+    QUEUE q2;
+    r = queue_create(&q2, 0xFFFFFFFF); // infinite queue.
+    assert(r==0);
+
+    size_t num_found = 0;
+    while (1) {
+	void *v;
+	r = queue_deq(q, &v, NULL, NULL);
+	if (r==EOF) break;
+	struct rowset *rs = (struct rowset *)v;
+	if (verbose) printf("v=%p\n", v);
+
+	for (size_t i=num_found; i<rs->n_rows; i++) {
+	    struct row *row = &rs->rows[i];
+	    assert(row->klen==sizeof(int));
+	    assert(row->vlen==sizeof(int));
+	    assert((int)i==*(int*)(rs->data+row->off));
+	}
+
+	num_found += rs->n_rows;
+
+	r = queue_enq(q2, v, 0, NULL);
+	assert(r==0);
+    }
+    assert((int)num_found == n);
+
+    r = queue_eof(q2);
+    assert(r==0);
+
+    r = queue_destroy(q);
+    assert(r==0);
+
+    struct descriptor desc = {.version = 1, .dbt = (DBT){.size = 4, .data="abcd"}};
+
+    int fd = open(output_name, O_RDWR | O_CREAT | O_BINARY, S_IRWXU|S_IRWXG|S_IRWXO);
+    assert(fd>=0);
+
+    brtloader_set_os_fwrite(bad_fwrite);
+    toku_set_func_write(bad_write);
+    toku_set_func_pwrite(bad_pwrite);
+
+    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q2);
+    assert(expect_error ? r != 0 : r == 0);
+
+    brtloader_set_os_fwrite(NULL);
+    toku_set_func_write(NULL);
+    toku_set_func_pwrite(NULL);
+    
+    r = queue_destroy(q2);
+    assert(r==0);
+   
+    destroy_merge_fileset(&fs);
+    brtloader_fi_destroy(&bl.file_infos, expect_error);
+
+    brt_loader_destroy_error_callback(&bl.error_callback);
+}
+
+int test_main (int argc, const char *argv[]) {
+    const char *progname=argv[0];
+    int n = 1;
+    argc--; argv++;
+    while (argc>0) {
+	if (strcmp(argv[0],"-v")==0) {
+	    verbose=1;
+	} else if (strcmp(argv[0],"-q")==0) {
+	    verbose=0;
+        } else if (strcmp(argv[0],"-r") == 0) {
+            argc--; argv++;
+            n = atoi(argv[0]);
+        } else if (strcmp(argv[0],"-s") == 0) {
+            toku_brtloader_set_size_factor(1);
+	} else if (argc!=1) {
+	    fprintf(stderr, "Usage:\n %s [-v] [-q] [-r %d] [-s] directory\n", progname, n);
+	    exit(1);
+	}
+        else {
+            break;
+        }
+	argc--; argv++;
+    }
+    assert(argc==1); // argv[1] is the directory in which to do the test.
+    const char* directory = argv[0];
+    char unlink_all[strlen(directory)+20];
+    snprintf(unlink_all, strlen(directory)+20, "rm -rf %s", directory);
+
+    int  templen = strlen(directory)+15;
+    char template[templen];
+    int tlen = snprintf(template, templen, "%s/tempXXXXXX", directory);
+    assert (tlen>0 && tlen<templen);
+
+    char output_name[templen];
+    int  olen = snprintf(output_name, templen, "%s/test.tokudb", directory);
+    assert (olen>0 && olen<templen);
+
+    // callibrate
+    int r;
+    r = system(unlink_all); CKERR(r);
+    r = toku_os_mkdir(directory, 0755); CKERR(r);
+    write_dbfile(template, n, output_name, FALSE);
+    if (0) verify_dbfile(n, output_name);
+
+    int write_error_limit = write_count;
+    if (verbose) printf("write_error_limit=%d\n", write_error_limit);
+
+    for (int i = 1; i <= write_error_limit; i++) {
+        reset_write_counts();
+        write_count_trigger = i;
+        r = system(unlink_all); CKERR(r);
+        r = toku_os_mkdir(directory, 0755); CKERR(r);
+        write_dbfile(template, n, output_name, TRUE);
+    }
+
+    return 0;
+}
+
+#if defined(__cplusplus)
+}
+#endif

newbrt/tests/brtloader-test-write-dbfile.c

@@ -123,7 +123,7 @@ static void test_write_dbfile (char *template, int n, char *output_name) {
 	r = queue_deq(q, &v, NULL, NULL);
 	if (r==EOF) break;
 	struct rowset *rs = (struct rowset *)v;
-	printf("v=%p\n", v);
+	if (verbose) printf("v=%p\n", v);
 
 	for (size_t i=num_found; i<rs->n_rows; i++) {
 	    struct row *row = &rs->rows[i];
@@ -166,7 +166,6 @@ static void test_write_dbfile (char *template, int n, char *output_name) {
     brt_loader_destroy_error_callback(&bl.error_callback);
 }
 
-/* Test to see if we can open temporary files. */
 int test_main (int argc, const char *argv[]) {
     const char *progname=argv[0];
     int n = 1;
@@ -176,11 +175,13 @@ int test_main (int argc, const char *argv[]) {
 	    verbose=1;
 	} else if (strcmp(argv[0],"-q")==0) {
 	    verbose=0;
-        } else if (strcmp(argv[0],"-n") == 0) {
+        } else if (strcmp(argv[0],"-r") == 0) {
             argc--; argv++;
             n = atoi(argv[0]);
+        } else if (strcmp(argv[0],"-s") == 0) {
+            toku_brtloader_set_size_factor(1);
 	} else if (argc!=1) {
-	    fprintf(stderr, "Usage:\n %s [-v] [-q] directory\n", progname);
+	    fprintf(stderr, "Usage:\n %s [-v] [-q] [-r %d] [-s] directory\n", progname, n);
 	    exit(1);
 	}
         else {
@@ -213,5 +214,5 @@ int test_main (int argc, const char *argv[]) {
 }
 
 #if defined(__cplusplus)
-};
+}
 #endif

newbrt/tests/brtloader-test.c

@@ -373,5 +373,5 @@ int test_main (int argc, const char *argv[]) {
 }
 
 #if defined(__cplusplus)
-};
+}
 #endif

toku_include/toku_portability.h

@@ -147,10 +147,13 @@ extern void *realloc(void*, size_t)            __THROW __attribute__((__deprecat
 void *os_malloc(size_t);
 void *os_realloc(void*,size_t);
 void  os_free(void*);
+
 // full_pwrite and full_write performs a pwrite, and checks errors.  It doesn't return unless all the data was written. */
 void toku_os_full_pwrite (int fd, const void *buf, size_t len, toku_off_t off) __attribute__((__visibility__("default")));
 void toku_os_full_write (int fd, const void *buf, size_t len) __attribute__((__visibility__("default")));
+
 // os_write returns 0 on success, otherwise an errno.
+int toku_os_pwrite (int fd, const void *buf, size_t len, toku_off_t off) __attribute__((__visibility__("default")));
 int toku_os_write (int fd, const void *buf, size_t len) __attribute__((__visibility__("default")));
 
 // wrapper around fsync

windows/file.c

@@ -251,6 +251,30 @@ toku_os_full_pwrite (int fd, const void *org_buf, size_t len, toku_off_t off)
     }
     assert(len == 0);
 }
+
+int
+toku_os_pwrite (int fd, const void *org_buf, size_t len, toku_off_t off)
+{
+    const uint8_t *buf = org_buf;
+    int result = 0;
+    while (len > 0) {
+        ssize_t r;
+        if (t_pwrite) {
+            r = t_pwrite(fd, buf, len, off);
+        } else {
+            r = pwrite(fd, buf, len, off);
+        }
+        if (r < 0) {
+            result = errno;
+            break;
+        }
+        len           -= r;
+        buf           += r;
+        off           += r;
+    }
+    return result;
+}
+
 /*
 {
     ssize_t r;