From 161d9e586bc1f42448d3bad3a4b1a5574dd5e536 Mon Sep 17 00:00:00 2001 From: Igor Canadi Date: Wed, 16 Apr 2014 15:15:22 -0700 Subject: [PATCH] Don't overflow size_t in mac --- db/column_family.cc | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/db/column_family.cc b/db/column_family.cc index a8ffe8cf6..2fd68e39d 100644 --- a/db/column_family.cc +++ b/db/column_family.cc @@ -63,8 +63,13 @@ ColumnFamilyOptions SanitizeOptions(const InternalKeyComparator* icmp, ColumnFamilyOptions result = src; result.comparator = icmp; result.filter_policy = (src.filter_policy != nullptr) ? ipolicy : nullptr; +#ifdef OS_MACOSX + // TODO(icanadi) make write_buffer_size uint64_t instead of size_t + ClipToRange(&result.write_buffer_size, ((size_t)64) << 10, ((size_t)1) << 30); +#else ClipToRange(&result.write_buffer_size, ((size_t)64) << 10, ((size_t)64) << 30); +#endif // if user sets arena_block_size, we trust user to use this value. Otherwise, // calculate a proper value from writer_buffer_size; if (result.arena_block_size <= 0) {