andreacavalli/rocksdb
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some other signed & unsigned comparisons

Browse Source 
Summary: Fix some signed and unsigned comparisons to make some other build script happy.

Test Plan: Build and run those changed tests

Reviewers: ljin, igor, haobo

Reviewed By: igor

CC: yhchiang, dhruba, kailiu, leveldb

Differential Revision: https://reviews.facebook.net/D17463
This commit is contained in:
sdong 2014-04-02 15:05:03 -07:00
parent 040657aec9
commit ef7dc38919
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
util/dynamic_bloom_test.cc
View File

@ -76,11 +76,12 @@ TEST(DynamicBloomTest, VaryingLengths) {
// Count number of filters that significantly exceed the false positive rate // Count number of filters that significantly exceed the false positive rate
int mediocre_filters = 0; int mediocre_filters = 0;
int good_filters = 0; int good_filters = 0;
uint32_t num_probes = static_cast<uint32_t>(FLAGS_num_probes);
fprintf(stderr, "bits_per_key: %d num_probes: %d\n", fprintf(stderr, "bits_per_key: %d num_probes: %d\n",
FLAGS_bits_per_key, FLAGS_num_probes); FLAGS_bits_per_key, num_probes);
for (uint32_t cl_per_block = 0; cl_per_block < FLAGS_num_probes; for (uint32_t cl_per_block = 0; cl_per_block < num_probes;
++cl_per_block) { ++cl_per_block) {
for (uint32_t num = 1; num <= 10000; num = NextNum(num)) { for (uint32_t num = 1; num <= 10000; num = NextNum(num)) {
uint32_t bloom_bits = 0; uint32_t bloom_bits = 0;
@ -90,7 +91,7 @@ TEST(DynamicBloomTest, VaryingLengths) {
bloom_bits = std::max(num * FLAGS_bits_per_key, bloom_bits = std::max(num * FLAGS_bits_per_key,
cl_per_block * CACHE_LINE_SIZE * 8); cl_per_block * CACHE_LINE_SIZE * 8);
} }
DynamicBloom bloom(bloom_bits, cl_per_block, FLAGS_num_probes); DynamicBloom bloom(bloom_bits, cl_per_block, num_probes);
for (uint64_t i = 0; i < num; i++) { for (uint64_t i = 0; i < num; i++) {
bloom.Add(Key(i, buffer)); bloom.Add(Key(i, buffer));
ASSERT_TRUE(bloom.MayContain(Key(i, buffer))); ASSERT_TRUE(bloom.MayContain(Key(i, buffer)));
@ -129,6 +130,7 @@ TEST(DynamicBloomTest, VaryingLengths) {
TEST(DynamicBloomTest, perf) { TEST(DynamicBloomTest, perf) {
StopWatchNano timer(Env::Default()); StopWatchNano timer(Env::Default());
uint32_t num_probes = static_cast<uint32_t>(FLAGS_num_probes);
if (!FLAGS_enable_perf) { if (!FLAGS_enable_perf) {
return; return;
@ -138,7 +140,7 @@ TEST(DynamicBloomTest, perf) {
const uint64_t num_keys = m * 8 * 1024 * 1024; const uint64_t num_keys = m * 8 * 1024 * 1024;
fprintf(stderr, "testing %" PRIu64 "M keys\n", m * 8); fprintf(stderr, "testing %" PRIu64 "M keys\n", m * 8);
DynamicBloom std_bloom(num_keys * 10, 0, FLAGS_num_probes); DynamicBloom std_bloom(num_keys * 10, 0, num_probes);
timer.Start(); timer.Start();
for (uint64_t i = 1; i <= num_keys; ++i) { for (uint64_t i = 1; i <= num_keys; ++i) {
@ -161,9 +163,9 @@ TEST(DynamicBloomTest, perf) {
elapsed / count); elapsed / count);
ASSERT_TRUE(count == num_keys); ASSERT_TRUE(count == num_keys);
for (int cl_per_block = 1; cl_per_block <= FLAGS_num_probes; for (uint32_t cl_per_block = 1; cl_per_block <= num_probes;
++cl_per_block) { ++cl_per_block) {
DynamicBloom blocked_bloom(num_keys * 10, cl_per_block, FLAGS_num_probes); DynamicBloom blocked_bloom(num_keys * 10, cl_per_block, num_probes);
timer.Start(); timer.Start();
for (uint64_t i = 1; i <= num_keys; ++i) { for (uint64_t i = 1; i <= num_keys; ++i) {

4
utilities/geodb/geodb_test.cc
View File

@ -106,14 +106,14 @@ TEST(GeoDBTest, Search) {
std::vector<GeoObject> values; std::vector<GeoObject> values;
status = getdb()->SearchRadial(GeoPosition(46, 46), 200000, &values); status = getdb()->SearchRadial(GeoPosition(46, 46), 200000, &values);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(values.size(), 1); ASSERT_EQ(values.size(), 1U);
// search all objects centered at 46 degree latitude with // search all objects centered at 46 degree latitude with
// a radius of 2 kilometers. There should be none. // a radius of 2 kilometers. There should be none.
values.clear(); values.clear();
status = getdb()->SearchRadial(GeoPosition(46, 46), 2, &values); status = getdb()->SearchRadial(GeoPosition(46, 46), 2, &values);
ASSERT_TRUE(status.ok()); ASSERT_TRUE(status.ok());
ASSERT_EQ(values.size(), 0); ASSERT_EQ(values.size(), 0U);
} }
} // namespace rocksdb } // namespace rocksdb