dolysis/rocksdb
3
0
Fork 0
mirror of https://github.com/facebook/rocksdb.git synced 2024-11-26 16:30:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix Windows constexpr issue and '#ifdef' column_family_test in Release.

Browse source
This commit is contained in:
Dmitri Smirnov 2015-09-21 16:21:01 -07:00
parent dd2e1eeb35
commit 2754ec9994
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
db/column_family_test.cc
View file

@ -23,6 +23,8 @@
#include "util/sync_point.h" #include "util/sync_point.h"
#include "utilities/merge_operators.h" #include "utilities/merge_operators.h"
#if !(defined NDEBUG) || !defined(OS_WIN)
namespace rocksdb { namespace rocksdb {
namespace { namespace {
@ -1260,8 +1262,13 @@ TEST_F(ColumnFamilyTest, FlushAndDropRaceCondition) {
} }
} // namespace rocksdb } // namespace rocksdb
#endif
int main(int argc, char** argv) { int main(int argc, char** argv) {
#if !(defined NDEBUG) || !defined(OS_WIN)
::testing::InitGoogleTest(&argc, argv); ::testing::InitGoogleTest(&argc, argv);
return RUN_ALL_TESTS(); return RUN_ALL_TESTS();
#else
return 0;
#endif
} }

2
utilities/write_batch_with_index/write_batch_with_index_internal.h
View file

@ -30,7 +30,7 @@ struct WriteBatchIndexEntry {
// If this flag appears in the offset, it indicates a key that is smaller // If this flag appears in the offset, it indicates a key that is smaller
// than any other entry for the same column family // than any other entry for the same column family
static const size_t kFlagMin = std::numeric_limits<size_t>::max(); static const size_t kFlagMin = UINT64_MAX;
size_t offset; // offset of an entry in write batch's string buffer. size_t offset; // offset of an entry in write batch's string buffer.
uint32_t column_family; // column family of the entry uint32_t column_family; // column family of the entry