[t:3218] Improvements from design review. Refs #3218

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

newbrt/block_allocator.c

@@ -74,8 +74,8 @@ destroy_block_allocator (BLOCK_ALLOCATOR *bap) {
 static void
 grow_blocks_array_by (BLOCK_ALLOCATOR ba, u_int64_t n_to_add) {
     if (ba->n_blocks + n_to_add > ba->blocks_array_size) {
-	int new_size = ba->n_blocks + n_to_add;
-	int at_least = ba->blocks_array_size * 2;
+	u_int64_t new_size = ba->n_blocks + n_to_add;
+	u_int64_t at_least = ba->blocks_array_size * 2;
 	if (at_least > new_size) {
 	    new_size = at_least;
 	}

newbrt/tests/test_block_allocator_merge.c

@@ -5,14 +5,14 @@
 #include <assert.h>
 // Test the merger.
 
-#if 0
+int verbose = 0;
+
 static void
 print_array (u_int64_t n, const struct block_allocator_blockpair a[/*n*/]) {
     printf("{");
     for (u_int64_t i=0; i<n; i++) printf(" %016lx", (long)a[i].offset);
     printf("}\n");
 }
-#endif
 
 static int
 compare_blockpairs (const void *av, const void *bv) {
@@ -26,8 +26,8 @@ compare_blockpairs (const void *av, const void *bv) {
 static void
 test_merge (u_int64_t an, const struct block_allocator_blockpair a[/*an*/],
 	    u_int64_t bn, const struct block_allocator_blockpair b[/*bn*/]) {
-    //printf("a:"); print_array(an, a);
-    //printf("b:"); print_array(bn, b);
+    if (verbose>1) { printf("a:"); print_array(an, a); }
+    if (verbose>1) { printf("b:"); print_array(bn, b); }
     struct block_allocator_blockpair *MALLOC_N(an+bn, q);
     struct block_allocator_blockpair *MALLOC_N(an+bn, m);
     if (q==0 || m==0) {
@@ -40,10 +40,13 @@ test_merge (u_int64_t an, const struct block_allocator_blockpair a[/*an*/],
     for (u_int64_t i=0; i<bn; i++) {
 	q[an+i] = b[i];
     }
+    if (verbose) printf("qsort\n");
     qsort(q, an+bn, sizeof(*q), compare_blockpairs);
-    //printf("q:"); print_array(an+bn, q);
+    if (verbose>1) { printf("q:"); print_array(an+bn, q); }
+    if (verbose) printf("merge\n");
     block_allocator_merge_blockpairs_into(an, m, bn, b);
-    //printf("m:"); print_array(an+bn, m);
+    if (verbose) printf("compare\n");
+    if (verbose>1) { printf("m:"); print_array(an+bn, m); }
     for (u_int64_t i=0; i<an+bn; i++) {
 	assert(q[i].offset == m[i].offset);
     }
@@ -52,8 +55,26 @@ test_merge (u_int64_t an, const struct block_allocator_blockpair a[/*an*/],
     toku_free(m);
 }
 
+static u_int64_t
+compute_a (u_int64_t i, int mode) {
+    if (mode==0) return (((u_int64_t)random()) << 32) + i;
+    if (mode==1) return 2*i;
+    if (mode==2) return i;
+    if (mode==3) return (1LL<<50) + i;
+    abort();
+}
+static u_int64_t
+compute_b (u_int64_t i, int mode) {
+    if (mode==0) return (((u_int64_t)random()) << 32) + i;
+    if (mode==1) return 2*i+1;
+    if (mode==2) return (1LL<<50) + i;
+    if (mode==3) return i;
+    abort();
+}
+    
+
 static void
-test_merge_n_m (u_int64_t n, u_int64_t m)
+test_merge_n_m (u_int64_t n, u_int64_t m, int mode)
 {
     struct block_allocator_blockpair *MALLOC_N(n, na);
     struct block_allocator_blockpair *MALLOC_N(m, ma);
@@ -61,14 +82,18 @@ test_merge_n_m (u_int64_t n, u_int64_t m)
 	fprintf(stderr, "malloc failed, continuing\n");
 	goto malloc_failed;
     }
+    if (verbose) printf("Filling a[%ld]\n", n);
     for (u_int64_t i=0; i<n; i++) {
-	na[i].offset = (((u_int64_t)random())<<32) + random();
+	na[i].offset = compute_a(i, mode);
     }
+    if (verbose) printf("Filling b[%ld]\n", m);
     for (u_int64_t i=0; i<m; i++) {
-	ma[i].offset = (((u_int64_t)random())<<32) + random();
+	if (verbose && i % (1+m/10) == 0) { printf("."); fflush(stdout); }
+	ma[i].offset = compute_b(i, mode);
     }
     qsort(na, n, sizeof(*na), compare_blockpairs);
     qsort(ma, m, sizeof(*ma), compare_blockpairs);
+    if (verbose) fprintf(stderr, "\ntest_merge\n");
     test_merge(n, na, m, ma);
  malloc_failed:
     toku_free(na);
@@ -76,12 +101,16 @@ test_merge_n_m (u_int64_t n, u_int64_t m)
 }
 
 int main (int argc __attribute__((__unused__)), char *argv[] __attribute__((__unused__))) {
-    test_merge_n_m(4, 4);
-    test_merge_n_m(16, 16);
-    test_merge_n_m(0, 100);
-    test_merge_n_m(100, 0);
-    // Cannot run this on my laptop
+    test_merge_n_m(4, 4, 0);
+    test_merge_n_m(16, 16, 0);
+    test_merge_n_m(0, 100, 0);
+    test_merge_n_m(100, 0, 0);
+    test_merge_n_m(1000000, 1000000, 0);
+    // Cannot run this on my laptop, or even on pointy
+#if 0
     u_int64_t too_big = 1024LL * 1024LL * 1024LL * 2;
     test_merge_n_m(too_big, too_big);
+    test_merge_n_m(1, too_big, 0);
+#endif
     return 0;
 }