Commit b76f1d2a authored by Rich Prohaska's avatar Rich Prohaska Committed by Yoni Fogel

refs[t:2613] get the brtloader tests working with the new memory accounting

git-svn-id: file:///svn/toku/tokudb@20307 c7de825b-a66e-492c-adef-691d508d4ae1
parent 10629732
...@@ -134,8 +134,11 @@ static void write_dbfile (char *template, int n, char *output_name, BOOL expect_ ...@@ -134,8 +134,11 @@ static void write_dbfile (char *template, int n, char *output_name, BOOL expect_
if (verbose) printf("test start %d %d\n", n, expect_error); if (verbose) printf("test start %d %d\n", n, expect_error);
DB *dest_db = NULL; DB *dest_db = NULL;
struct brtloader_s bl = {.panic = 0, struct brtloader_s bl = {
.temp_file_template = template}; .panic = 0,
.temp_file_template = template,
.reserved_memory = 512*1024*1024,
};
int r = brtloader_init_file_infos(&bl.file_infos); int r = brtloader_init_file_infos(&bl.file_infos);
CKERR(r); CKERR(r);
struct merge_fileset fs; struct merge_fileset fs;
......
...@@ -82,8 +82,11 @@ static void test_write_dbfile (char *template, int n, char *output_name) { ...@@ -82,8 +82,11 @@ static void test_write_dbfile (char *template, int n, char *output_name) {
if (verbose) traceit("test start"); if (verbose) traceit("test start");
DB *dest_db = NULL; DB *dest_db = NULL;
struct brtloader_s bl = {.panic = 0, struct brtloader_s bl = {
.temp_file_template = template}; .panic = 0,
.temp_file_template = template,
.reserved_memory = 512*1024*1024,
};
int r = brtloader_init_file_infos(&bl.file_infos); int r = brtloader_init_file_infos(&bl.file_infos);
CKERR(r); CKERR(r);
struct merge_fileset fs; struct merge_fileset fs;
......
...@@ -277,8 +277,11 @@ static void verify_dbfile(int n, int sorted_keys[], const char *sorted_vals[], c ...@@ -277,8 +277,11 @@ static void verify_dbfile(int n, int sorted_keys[], const char *sorted_vals[], c
static void test_merge_files (const char *template, const char *output_name) { static void test_merge_files (const char *template, const char *output_name) {
DB *dest_db = NULL; DB *dest_db = NULL;
struct brtloader_s bl = {.panic = 0, struct brtloader_s bl = {
.temp_file_template = template}; .panic = 0,
.temp_file_template = template,
.reserved_memory = 512*1024*1024,
};
int r = brtloader_init_file_infos(&bl.file_infos); int r = brtloader_init_file_infos(&bl.file_infos);
CKERR(r); CKERR(r);
struct merge_fileset fs; struct merge_fileset fs;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment