Fix mac compile

MarkusTeufelberger · Sep 17, 2014 · 3c232e1 · 3c232e1
1 parent 54cada9
commit 3c232e1
Showing 1 changed file with 28 additions and 25 deletions.
diff --git a/util/options_test.cc b/util/options_test.cc
@@ -158,11 +158,11 @@ TEST(OptionsTest, GetOptionsFromStringsTest) {
   Options base_opt;
   Options new_opt;
   ASSERT_TRUE(GetOptionsFromStrings(base_opt, options_map, &new_opt));
-  ASSERT_EQ(new_opt.write_buffer_size, 1);
+  ASSERT_EQ(new_opt.write_buffer_size, 1U);
   ASSERT_EQ(new_opt.max_write_buffer_number, 2);
   ASSERT_EQ(new_opt.min_write_buffer_number_to_merge, 3);
   ASSERT_EQ(new_opt.compression, kSnappyCompression);
-  ASSERT_EQ(new_opt.compression_per_level.size(), 6);
+  ASSERT_EQ(new_opt.compression_per_level.size(), 6U);
   ASSERT_EQ(new_opt.compression_per_level[0], kNoCompression);
   ASSERT_EQ(new_opt.compression_per_level[1], kSnappyCompression);
   ASSERT_EQ(new_opt.compression_per_level[2], kZlibCompression);
@@ -179,9 +179,9 @@ TEST(OptionsTest, GetOptionsFromStringsTest) {
   ASSERT_EQ(new_opt.max_mem_compaction_level, 11);
   ASSERT_EQ(new_opt.target_file_size_base, 12);
   ASSERT_EQ(new_opt.target_file_size_multiplier, 13);
-  ASSERT_EQ(new_opt.max_bytes_for_level_base, 14);
+  ASSERT_EQ(new_opt.max_bytes_for_level_base, 14U);
   ASSERT_EQ(new_opt.max_bytes_for_level_multiplier, 15);
-  ASSERT_EQ(new_opt.max_bytes_for_level_multiplier_additional.size(), 3);
+  ASSERT_EQ(new_opt.max_bytes_for_level_multiplier_additional.size(), 3U);
   ASSERT_EQ(new_opt.max_bytes_for_level_multiplier_additional[0], 16);
   ASSERT_EQ(new_opt.max_bytes_for_level_multiplier_additional[1], 17);
   ASSERT_EQ(new_opt.max_bytes_for_level_multiplier_additional[2], 18);
@@ -190,54 +190,57 @@ TEST(OptionsTest, GetOptionsFromStringsTest) {
   ASSERT_EQ(new_opt.max_grandparent_overlap_factor, 21);
   ASSERT_EQ(new_opt.soft_rate_limit, 1.1);
   ASSERT_EQ(new_opt.hard_rate_limit, 2.1);
-  ASSERT_EQ(new_opt.arena_block_size, 22);
+  ASSERT_EQ(new_opt.arena_block_size, 22U);
   ASSERT_EQ(new_opt.disable_auto_compactions, true);
   ASSERT_EQ(new_opt.purge_redundant_kvs_while_flush, true);
   ASSERT_EQ(new_opt.compaction_style, kCompactionStyleLevel);
   ASSERT_EQ(new_opt.verify_checksums_in_compaction, false);
-  ASSERT_EQ(new_opt.compaction_options_fifo.max_table_files_size, 23);
+  ASSERT_EQ(new_opt.compaction_options_fifo.max_table_files_size,
+            static_cast<uint64_t>(23));
   ASSERT_EQ(new_opt.filter_deletes, false);
-  ASSERT_EQ(new_opt.max_sequential_skip_in_iterations, 24);
+  ASSERT_EQ(new_opt.max_sequential_skip_in_iterations,
+            static_cast<uint64_t>(24));
   ASSERT_EQ(new_opt.inplace_update_support, true);
-  ASSERT_EQ(new_opt.inplace_update_num_locks, 25);
-  ASSERT_EQ(new_opt.memtable_prefix_bloom_bits, 26);
-  ASSERT_EQ(new_opt.memtable_prefix_bloom_probes, 27);
-  ASSERT_EQ(new_opt.memtable_prefix_bloom_huge_page_tlb_size, 28);
-  ASSERT_EQ(new_opt.bloom_locality, 29);
-  ASSERT_EQ(new_opt.max_successive_merges, 30);
-  ASSERT_EQ(new_opt.min_partial_merge_operands, 31);
+  ASSERT_EQ(new_opt.inplace_update_num_locks, 25U);
+  ASSERT_EQ(new_opt.memtable_prefix_bloom_bits, 26U);
+  ASSERT_EQ(new_opt.memtable_prefix_bloom_probes, 27U);
+  ASSERT_EQ(new_opt.memtable_prefix_bloom_huge_page_tlb_size, 28U);
+  ASSERT_EQ(new_opt.bloom_locality, 29U);
+  ASSERT_EQ(new_opt.max_successive_merges, 30U);
+  ASSERT_EQ(new_opt.min_partial_merge_operands, 31U);
   ASSERT_EQ(new_opt.create_if_missing, false);
   ASSERT_EQ(new_opt.create_missing_column_families, true);
   ASSERT_EQ(new_opt.error_if_exists, false);
   ASSERT_EQ(new_opt.paranoid_checks, true);
   ASSERT_EQ(new_opt.max_open_files, 32);
-  ASSERT_EQ(new_opt.max_total_wal_size, 33);
+  ASSERT_EQ(new_opt.max_total_wal_size, static_cast<uint64_t>(33));
   ASSERT_EQ(new_opt.disableDataSync, false);
   ASSERT_EQ(new_opt.use_fsync, true);
   ASSERT_EQ(new_opt.db_log_dir, "/db_log_dir");
   ASSERT_EQ(new_opt.wal_dir, "/wal_dir");
-  ASSERT_EQ(new_opt.delete_obsolete_files_period_micros, 34);
+  ASSERT_EQ(new_opt.delete_obsolete_files_period_micros,
+            static_cast<uint64_t>(34));
   ASSERT_EQ(new_opt.max_background_compactions, 35);
   ASSERT_EQ(new_opt.max_background_flushes, 36);
-  ASSERT_EQ(new_opt.max_log_file_size, 37);
-  ASSERT_EQ(new_opt.log_file_time_to_roll, 38);
-  ASSERT_EQ(new_opt.keep_log_file_num, 39);
-  ASSERT_EQ(new_opt.max_manifest_file_size, 40);
+  ASSERT_EQ(new_opt.max_log_file_size, 37U);
+  ASSERT_EQ(new_opt.log_file_time_to_roll, 38U);
+  ASSERT_EQ(new_opt.keep_log_file_num, 39U);
+  ASSERT_EQ(new_opt.max_manifest_file_size, static_cast<uint64_t>(40));
   ASSERT_EQ(new_opt.table_cache_numshardbits, 41);
   ASSERT_EQ(new_opt.table_cache_remove_scan_count_limit, 42);
-  ASSERT_EQ(new_opt.WAL_ttl_seconds, 43);
-  ASSERT_EQ(new_opt.WAL_size_limit_MB, 44);
-  ASSERT_EQ(new_opt.manifest_preallocation_size, 45);
+  ASSERT_EQ(new_opt.WAL_ttl_seconds, static_cast<uint64_t>(43));
+  ASSERT_EQ(new_opt.WAL_size_limit_MB, static_cast<uint64_t>(44));
+  ASSERT_EQ(new_opt.manifest_preallocation_size, 45U);
   ASSERT_EQ(new_opt.allow_os_buffer, false);
   ASSERT_EQ(new_opt.allow_mmap_reads, true);
   ASSERT_EQ(new_opt.allow_mmap_writes, false);
   ASSERT_EQ(new_opt.is_fd_close_on_exec, true);
   ASSERT_EQ(new_opt.skip_log_error_on_recovery, false);
-  ASSERT_EQ(new_opt.stats_dump_period_sec, 46);
+  ASSERT_EQ(new_opt.stats_dump_period_sec, 46U);
   ASSERT_EQ(new_opt.advise_random_on_open, true);
   ASSERT_EQ(new_opt.use_adaptive_mutex, false);
   ASSERT_EQ(new_opt.allow_thread_local, true);
-  ASSERT_EQ(new_opt.bytes_per_sync, 47);
+  ASSERT_EQ(new_opt.bytes_per_sync, static_cast<uint64_t>(47));
 
   options_map["write_buffer_size"] = "hello";
   ASSERT_TRUE(!GetOptionsFromStrings(base_opt, options_map, &new_opt));