]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
Remove unnecessary asserts in table/merger.cc
authorAbhishek Kona <abhishekk@fb.com>
Tue, 8 Jan 2013 23:55:06 +0000 (15:55 -0800)
committerAbhishek Kona <abhishekk@fb.com>
Wed, 9 Jan 2013 17:52:45 +0000 (09:52 -0800)
Summary:
The asserts introduced in https://reviews.facebook.net/D7629 are
wrong.

The direction of iteration is changed after the function call so they
assert's fail.

Test Plan: make clean check

Reviewers: dhruba

Reviewed By: dhruba

CC: leveldb
Differential Revision: https://reviews.facebook.net/D7827

table/merger.cc

index 5f7b24bd875952225de33eae3d385eff93823b12..7c5ef92f4b5f3c10319973cdd63fc8e105190d14 100644 (file)
@@ -188,7 +188,6 @@ class MergingIterator : public Iterator {
 };
 
 void MergingIterator::FindSmallest() {
-  assert (direction_ == kForward);
   if (minHeap_.empty()) {
     current_ = NULL;
   } else {
@@ -199,7 +198,6 @@ void MergingIterator::FindSmallest() {
 }
 
 void MergingIterator::FindLargest() {
-  assert(direction_ == kReverse);
   if (maxHeap_.empty()) {
     current_ = NULL;
   } else {