Revert "Allow users to profile a query and see bottleneck of the query"

This reverts commit 3d8ac31d71.

table/merger.cc

@@ -11,11 +11,8 @@
 
 #include "rocksdb/comparator.h"
 #include "rocksdb/iterator.h"
-#include "rocksdb/options.h"
 #include "table/iter_heap.h"
 #include "table/iterator_wrapper.h"
-#include "util/stop_watch.h"
-#include "util/perf_context_imp.h"
 
 #include <vector>
 
@@ -25,12 +22,10 @@ namespace {
 
 class MergingIterator : public Iterator {
  public:
-  MergingIterator(Env* const env, const Comparator* comparator,
-                  Iterator** children, int n)
+  MergingIterator(const Comparator* comparator, Iterator** children, int n)
       : comparator_(comparator),
         children_(n),
         current_(nullptr),
-        env_(env),
         direction_(kForward),
         maxHeap_(NewMaxIterHeap(comparator_)),
         minHeap_ (NewMinIterHeap(comparator_)) {
@@ -76,24 +71,14 @@ class MergingIterator : public Iterator {
 
   virtual void Seek(const Slice& target) {
     ClearHeaps();
-    StopWatchNano child_seek_timer(env_, false);
-    StopWatchNano min_heap_timer(env_, false);
     for (auto& child : children_) {
-      StartPerfTimer(&child_seek_timer);
       child.Seek(target);
-      BumpPerfTime(&perf_context.seek_child_seek_time, &child_seek_timer);
-      BumpPerfCount(&perf_context.seek_child_seek_count);
-
       if (child.Valid()) {
-        StartPerfTimer(&min_heap_timer);
         minHeap_.push(&child);
-        BumpPerfTime(&perf_context.seek_min_heap_time, &child_seek_timer);
       }
     }
-    StartPerfTimer(&min_heap_timer);
     FindSmallest();
     direction_ = kForward;
-    BumpPerfTime(&perf_context.seek_min_heap_time, &child_seek_timer);
   }
 
   virtual void Next() {
@@ -193,7 +178,6 @@ class MergingIterator : public Iterator {
   const Comparator* comparator_;
   std::vector<IteratorWrapper> children_;
   IteratorWrapper* current_;
-  Env* const env_;
   // Which direction is the iterator moving?
   enum Direction {
     kForward,
@@ -230,15 +214,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);
   }
 }
 

table/merger.h

@@ -13,7 +13,6 @@ namespace rocksdb {
 
 class Comparator;
 class Iterator;
-class Env;
 
 // Return an iterator that provided the union of the data in
 // children[0,n-1].  Takes ownership of the child iterators and
@@ -24,6 +23,6 @@ class Env;
 //
 // REQUIRES: n >= 0
 extern Iterator* NewMergingIterator(
-    Env* const env, const Comparator* comparator, Iterator** children, int n);
+    const Comparator* comparator, Iterator** children, int n);
 
 }  // namespace rocksdb