Commit 270157fc authored by Rich Prohaska's avatar Rich Prohaska

make the bin search midpoint numerically stable.

git-svn-id: file:///svn/tokudb@4705 c7de825b-a66e-492c-adef-691d508d4ae1
parent ca330365
...@@ -12,8 +12,11 @@ ...@@ -12,8 +12,11 @@
#include "test.h" #include "test.h"
uint64_t lorange = 0;
uint64_t hirange = 1<<24;
void test_key_size_limit(int dup_mode) { void test_key_size_limit(int dup_mode) {
if (verbose) printf("test_key_size_limit:%d\n", dup_mode); if (verbose > 1) printf("%s:%d\n", __FUNCTION__, dup_mode);
DB_ENV * const null_env = 0; DB_ENV * const null_env = 0;
DB *db; DB *db;
...@@ -34,17 +37,18 @@ void test_key_size_limit(int dup_mode) { ...@@ -34,17 +37,18 @@ void test_key_size_limit(int dup_mode) {
void *k = 0; void *k = 0;
void *v = 0; void *v = 0;
int lo = 0 , mi = 0, hi = (1<<24); uint32_t lo = lorange, mi = 0, hi = hirange;
int bigest = -1; uint32_t bigest = 0;
while (lo <= hi) { while (lo <= hi) {
mi = (lo + hi) / 2; mi = lo + (hi - lo) / 2;
int ks = mi; assert(lo <= mi && mi <= hi);
if (verbose) printf("trying %d %d %d ks=%d\n", lo, mi, hi, ks); uint32_t ks = mi;
int vs = ks; if (verbose > 1) printf("trying %u %u %u ks=%u\n", lo, mi, hi, ks);
k = realloc(k, ks); k = realloc(k, ks); assert(k);
memset(k, 0, ks); memset(k, 0, ks);
memcpy(k, &ks, sizeof ks); memcpy(k, &ks, sizeof ks);
v = realloc(v, vs); uint32_t vs = sizeof (uint32_t);
v = realloc(v, vs); assert(v);
memset(v, 0, vs); memset(v, 0, vs);
memcpy(v, &vs, sizeof vs); memcpy(v, &vs, sizeof vs);
DBT key, val; DBT key, val;
...@@ -53,24 +57,103 @@ void test_key_size_limit(int dup_mode) { ...@@ -53,24 +57,103 @@ void test_key_size_limit(int dup_mode) {
bigest = mi; bigest = mi;
lo = mi+1; lo = mi+1;
} else { } else {
if (verbose) printf("%d too big\n", ks); if (verbose > 1) printf("%u too big\n", ks);
hi = mi-1; hi = mi-1;
} }
} }
free(k); free(k);
free(v); free(v);
assert(bigest > 0); assert(bigest > 0);
if (verbose && bigest >= 0) printf("bigest %d\n", bigest); if (verbose && bigest >= 0) printf("%s bigest %d\n", __FUNCTION__, bigest);
r = db->close(db, 0);
assert(r == 0);
}
void test_data_size_limit(int dup_mode) {
if (verbose > 1) printf("%s:%d\n", __FUNCTION__, dup_mode);
DB_ENV * const null_env = 0;
DB *db;
DB_TXN * const null_txn = 0;
const char * const fname = ENVDIR "/" "test.rand.insert.brt";
int r;
system("rm -rf " ENVDIR);
r=mkdir(ENVDIR, 0777); assert(r==0);
/* create the dup database file */
r = db_create(&db, null_env, 0);
assert(r == 0);
r = db->set_flags(db, dup_mode);
assert(r == 0);
r = db->open(db, null_txn, fname, "main", DB_BTREE, DB_CREATE, 0666);
assert(r == 0);
void *k = 0;
void *v = 0;
uint32_t lo = lorange, mi = 0, hi = hirange;
uint32_t bigest = 0;
while (lo <= hi) {
mi = lo + (hi - lo) / 2;
assert(lo <= mi && mi <= hi);
uint32_t ks = sizeof (uint32_t);
if (verbose > 1) printf("trying %u %u %u ks=%u\n", lo, mi, hi, ks);
k = realloc(k, ks); assert(k);
memset(k, 0, ks);
memcpy(k, &ks, sizeof ks);
uint32_t vs = mi;
v = realloc(v, vs); assert(v);
memset(v, 0, vs);
memcpy(v, &vs, sizeof vs);
DBT key, val;
r = db->put(db, null_txn, dbt_init(&key, k, ks), dbt_init(&val, v, vs), DB_YESOVERWRITE);
if (r == 0) {
bigest = mi;
lo = mi+1;
} else {
if (verbose > 1) printf("%u too big\n", vs);
hi = mi-1;
}
}
free(k);
free(v);
if (verbose && bigest > 0) printf("%s bigest %d\n", __FUNCTION__, bigest);
r = db->close(db, 0); r = db->close(db, 0);
assert(r == 0); assert(r == 0);
} }
int main(int argc, const char *argv[]) { int main(int argc, const char *argv[]) {
parse_args(argc, argv); int i;
for (i = 1; i < argc; i++) {
const char *arg = argv[i];
if (strcmp(arg, "-v") == 0) {
verbose++;
continue;
}
if (strcmp(arg, "-lorange") == 0) {
if (i+1 >= argc)
return 1;
lorange = strtoull(argv[++i], 0, 10);
if (lorange > UINT_MAX)
return 2;
continue;
}
if (strcmp(arg, "-hirange") == 0) {
if (i+1 >= argc)
return 1;
hirange = strtoull(argv[++i], 0, 10);
if (hirange > UINT_MAX)
return 2;
continue;
}
}
test_key_size_limit(0); test_key_size_limit(0);
test_data_size_limit(0);
test_key_size_limit(DB_DUP + DB_DUPSORT); test_key_size_limit(DB_DUP + DB_DUPSORT);
test_data_size_limit(DB_DUP + DB_DUPSORT);
return 0; return 0;
} }
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