dolysis
/
rocksdb
mirror of https://github.com/facebook/rocksdb.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #226 from bbiao/master 

fix various 'comparison of integers of different signs' compiling errors...
This commit is contained in:
Igor Canadi 2014-08-07 10:40:11 -04:00
parent 76dcf7eefd 63d5cc72fa
commit 1a1957ba4d
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
table/cuckoo_table_builder_test.cc
View File

@ -383,10 +383,10 @@ TEST(CuckooBuilderTest, FailWhenSameKeyInserted) {
ASSERT_OK(builder.status());
builder.Add(Slice(GetInternalKey(user_key, false)), Slice("value1"));
ASSERT_EQ(builder.NumEntries(), 1);
ASSERT_EQ(builder.NumEntries(), 1u);
ASSERT_OK(builder.status());
builder.Add(Slice(GetInternalKey(user_key, true)), Slice("value2"));
ASSERT_EQ(builder.NumEntries(), 2);
ASSERT_EQ(builder.NumEntries(), 2u);
ASSERT_OK(builder.status());
ASSERT_TRUE(builder.Finish().IsNotSupported());

6
table/cuckoo_table_reader_test.cc
View File

@ -163,7 +163,7 @@ class CuckooReaderTest {
++cnt;
it->Next();
}
ASSERT_EQ(cnt, num_items);
ASSERT_EQ(static_cast<uint32_t>(cnt), num_items);
it->SeekToLast();
cnt = num_items - 1;
@ -186,7 +186,7 @@ class CuckooReaderTest {
++cnt;
it->Next();
}
ASSERT_EQ(cnt, num_items);
ASSERT_EQ(static_cast<uint32_t>(cnt), num_items);
delete it;
Arena arena;
@ -404,7 +404,7 @@ void BM_CuckooRead(uint64_t num, uint32_t key_length,
uint64_t time_now = env->NowMicros();
reader.NewIterator(ReadOptions(), nullptr);
fprintf(stderr, "Time taken for preparing iterator for %lu items: %lu ms.\n",
fprintf(stderr, "Time taken for preparing iterator for %" PRIu64 " items: %" PRIu64 " ms.\n",
num, (env->NowMicros() - time_now)/1000);
time_now = env->NowMicros();
for (uint64_t i = 0; i < num_reads; ++i) {