#3163 use the nodesize configured in a db in the brtloader refs[t:3163]

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

newbrt/brtloader-internal.h

@@ -187,6 +187,7 @@ struct fractal_thread_args {
     uint64_t                 total_disksize_estimate;
     int                      errno_result; // the final result.
     int                      which_db;
+    uint32_t                 target_nodesize;
 };
 
 void toku_brt_loader_set_n_rows(BRTLOADER bl, u_int64_t n_rows);
@@ -218,7 +219,8 @@ int toku_loader_write_brt_from_q_in_C (BRTLOADER                bl,
 				       int                      progress_allocation,
 				       QUEUE                    q,
 				       uint64_t                 total_disksize_estimate,
-                                       int                      which_db);
+                                       int                      which_db,
+                                       uint32_t                 target_nodesize);
 
 int brt_loader_mergesort_row_array (struct row rows[/*n*/], int n, int which_db, DB *dest_db, brt_compare_func, BRTLOADER, struct rowset *);
 

newbrt/tests/brtloader-test-writer-errors.c

@@ -132,7 +132,7 @@ static void write_dbfile (char *template, int n, char *output_name, BOOL expect_
     brt_loader_set_error_function(&bl.error_callback, NULL, NULL);
     brt_loader_set_poll_function(&bl.poll_callback, loader_poll_callback, NULL);
 
-    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q2, size_est, 0);
+    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q2, size_est, 0, 0);
     // if (!(expect_error ? r != 0 : r == 0)) printf("WARNING%%d expect_error=%d r=%d\n", __LINE__, expect_error, r); 
     assert(expect_error ? r != 0 : r == 0);
 

newbrt/tests/brtloader-test-writer.c

@@ -163,7 +163,7 @@ static void test_write_dbfile (char *template, int n, char *output_name) {
     assert(fd>=0);
 
     if (verbose) traceit("write to file");
-    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q2, size_est, 0);
+    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q2, size_est, 0, 0);
     assert(r==0);
 
     r = queue_destroy(q2);

newbrt/tests/brtloader-test.c

@@ -325,7 +325,7 @@ static void verify_dbfile(int n, int sorted_keys[], const char *sorted_vals[], c
     int fd = open(output_name, O_RDWR | O_CREAT | O_BINARY, S_IRWXU|S_IRWXG|S_IRWXO);
     assert(fd>=0);
     
-    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q, size_est, 0);
+    r = toku_loader_write_brt_from_q_in_C(&bl, &desc, fd, 1000, q, size_est, 0, 0);
     assert(r==0);
 
     destroy_merge_fileset(&fs);

src/tests/loader-reference-test.c

@@ -19,6 +19,7 @@ struct kv_pair {
 struct kv_pair kv_pairs[NUM_KV_PAIRS] = {{1,4},
                                          {2,5},
                                          {3,6}};
+static uint32_t block_size = 0;
 
 static int put_multiple_generate(DB *dest_db, DB *src_db, DBT *dest_key, DBT *dest_val, const DBT *src_key, const DBT *src_val) {
 
@@ -132,6 +133,9 @@ static void run_test(void)
         r = db_create(&dbs[i], env, 0);                                                                       CKERR(r);
         r = dbs[i]->set_descriptor(dbs[i], 1, &desc);                                       CKERR(r);
         dbs[i]->app_private = &idx[i];
+        if (block_size != 0) {
+            r = dbs[i]->set_pagesize(dbs[i], block_size); CKERR(r);
+        }
         snprintf(name, sizeof(name), "db_%04x", i);
         r = dbs[i]->open(dbs[i], NULL, name, NULL, DB_BTREE, DB_CREATE, 0666);                                CKERR(r);
     }
@@ -173,6 +177,9 @@ static void do_args(int argc, char * const argv[]) {
 	    exit(resultcode);
         } else if (strcmp(argv[0], "-p")==0) {
             USE_PUTS = 1;
+        } else if (strcmp(argv[0], "--block_size") == 0) {
+            argc--; argv++;
+            block_size = atoi(argv[0]);
 	} else {
 	    fprintf(stderr, "Unknown arg: %s\n", argv[0]);
 	    resultcode=1;