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

Some fixes as preparation for release

Browse Source
This commit is contained in:
Igor Canadi 2014-04-30 08:38:09 -07:00
parent d6d67c0efe
commit 66f88c43a5
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build_tools/build_detect_platform
View File

@ -156,7 +156,9 @@ case "$TARGET_OS" in
exit 1 exit 1
esac esac
$PWD/build_tools/build_detect_version if test -z "$DO_NOT_RUN_BUILD_DETECT_VERSION"; then
$PWD/build_tools/build_detect_version
fi
# We want to make a list of all cc files within util, db, table, and helpers # We want to make a list of all cc files within util, db, table, and helpers
# except for the test and benchmark files. By default, find will output a list # except for the test and benchmark files. By default, find will output a list

8
db/file_indexer_test.cc
View File

@ -87,7 +87,7 @@ struct FileIndexerTest {
TEST(FileIndexerTest, next_level_hint) { TEST(FileIndexerTest, next_level_hint) {
for (uint32_t i = 0; i < kNumLevels; ++i) { for (uint32_t i = 0; i < kNumLevels; ++i) {
ASSERT_EQ(0, indexer.LevelIndexSize(i)); ASSERT_EQ(0U, indexer.LevelIndexSize(i));
} }
// Case 1: no overlap, files are on the left of next level files // Case 1: no overlap, files are on the left of next level files
@ -129,7 +129,7 @@ TEST(FileIndexerTest, next_level_hint) {
// Case 2: no overlap, files are on the right of next level files // Case 2: no overlap, files are on the right of next level files
Reset(); Reset();
for (uint32_t i = 1; i < kNumLevels; ++i) { for (uint32_t i = 1; i < kNumLevels; ++i) {
ASSERT_EQ(0, indexer.LevelIndexSize(i)); ASSERT_EQ(0U, indexer.LevelIndexSize(i));
} }
// level 1 // level 1
AddFile(1, 2100, 2200); AddFile(1, 2100, 2200);
@ -170,7 +170,7 @@ TEST(FileIndexerTest, next_level_hint) {
// Case 3: empty L2 // Case 3: empty L2
Reset(); Reset();
for (uint32_t i = 1; i < kNumLevels; ++i) { for (uint32_t i = 1; i < kNumLevels; ++i) {
ASSERT_EQ(0, indexer.LevelIndexSize(i)); ASSERT_EQ(0U, indexer.LevelIndexSize(i));
} }
// level 1 // level 1
AddFile(1, 2100, 2200); AddFile(1, 2100, 2200);
@ -206,7 +206,7 @@ TEST(FileIndexerTest, next_level_hint) {
// Case 4: mixed // Case 4: mixed
Reset(); Reset();
for (uint32_t i = 1; i < kNumLevels; ++i) { for (uint32_t i = 1; i < kNumLevels; ++i) {
ASSERT_EQ(0, indexer.LevelIndexSize(i)); ASSERT_EQ(0U, indexer.LevelIndexSize(i));
} }
// level 1 // level 1
AddFile(1, 100, 200); AddFile(1, 100, 200);

2
db/plain_table_db_test.cc
View File

@ -265,7 +265,7 @@ TEST(PlainTableDBTest, Flush) {
TablePropertiesCollection ptc; TablePropertiesCollection ptc;
reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc); reinterpret_cast<DB*>(dbfull())->GetPropertiesOfAllTables(&ptc);
ASSERT_EQ(1, ptc.size()); ASSERT_EQ(1U, ptc.size());
auto row = ptc.begin(); auto row = ptc.begin();
auto tp = row->second; auto tp = row->second;
ASSERT_EQ( ASSERT_EQ(

2
util/hash_cuckoo_rep.h
View File

@ -16,7 +16,7 @@ namespace rocksdb {
class HashCuckooRepFactory : public MemTableRepFactory { class HashCuckooRepFactory : public MemTableRepFactory {
public: public:
// maxinum number of hash functions used in the cuckoo hash. // maxinum number of hash functions used in the cuckoo hash.
static const int kMaxHashCount = 10; static const unsigned int kMaxHashCount = 10;
explicit HashCuckooRepFactory(size_t write_buffer_size, explicit HashCuckooRepFactory(size_t write_buffer_size,
size_t average_data_size, size_t average_data_size,