mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-22 14:54:20 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

the brt_loader_sort_and_write_rows contract changed which caused the tests to fail. fix the tests closes[t:2593] #2593

Browse source 
git-svn-id: file:///svn/toku/tokudb@20059 c7de825b-a66e-492c-adef-691d508d4ae1
This commit is contained in:
Rich Prohaska 2013-04-16 23:59:10 -04:00 • committed by Yoni Fogel
parent 9a7a5ddef1
commit b7d19f5045
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
newbrt/tests/brtloader-test-write-dbfile.c
View file

@ -105,7 +105,7 @@ static void test_write_dbfile (char *template, int n, char *output_name) {
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);
// destroy_rowset(&aset);
QUEUE q;
r = queue_create(&q, 0xFFFFFFFF); // infinite queue.

7
newbrt/tests/brtloader-test.c
View file

@ -293,14 +293,15 @@ static void verify_dbfile(int n, int sorted_keys[], const char *sorted_vals[], c
struct rowset aset, bset;
fill_rowset(&aset, a_keys, a_vals, 6);
fill_rowset(&bset, b_keys, b_vals, 4);
toku_brt_loader_set_n_rows(&bl, 6+3);
toku_brt_loader_set_n_rows(&bl, 6+4);
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);
r = brt_loader_sort_and_write_rows(&bset, &fs, &bl, 0, dest_db, compare_ints, 0); CKERR(r);
assert(fs.n_temp_files==2 && fs.n_temp_files_limit >= fs.n_temp_files);
destroy_rowset(&aset);
destroy_rowset(&bset);
// destroy_rowset(&aset);
// destroy_rowset(&bset);
for (int i=0; i<2; i++) assert(fs.data_fidxs[i].idx != -1);
QUEUE q;