diff --git a/db/db_bench.cc b/db/db_bench.cc index 727f5afcb..0314a3ea9 100644 --- a/db/db_bench.cc +++ b/db/db_bench.cc @@ -814,7 +814,6 @@ class Benchmark { int64_t writes_; int64_t readwrites_; int64_t merge_keys_; - int heap_counter_; void PrintHeader() { PrintEnvironment(); fprintf(stdout, "Keys: %d bytes each\n", FLAGS_key_size); @@ -1011,8 +1010,7 @@ class Benchmark { readwrites_((FLAGS_writes < 0 && FLAGS_reads < 0)? FLAGS_num : ((FLAGS_writes > FLAGS_reads) ? FLAGS_writes : FLAGS_reads) ), - merge_keys_(FLAGS_merge_keys < 0 ? FLAGS_num : FLAGS_merge_keys), - heap_counter_(0) { + merge_keys_(FLAGS_merge_keys < 0 ? FLAGS_num : FLAGS_merge_keys) { if (FLAGS_prefix_size > FLAGS_key_size) { fprintf(stderr, "prefix size is larger than key size"); exit(1); diff --git a/table/merger.cc b/table/merger.cc index 7799a0cc4..03d177a6a 100644 --- a/table/merger.cc +++ b/table/merger.cc @@ -267,15 +267,14 @@ void MergingIterator::ClearHeaps() { } } // namespace -Iterator* NewMergingIterator(Env* const env, const Comparator* cmp, - Iterator** list, int n) { +Iterator* NewMergingIterator(const Comparator* cmp, Iterator** list, int n) { assert(n >= 0); if (n == 0) { return NewEmptyIterator(); } else if (n == 1) { return list[0]; } else { - return new MergingIterator(env, cmp, list, n); + return new MergingIterator(cmp, list, n); } }