update sources to ceph Nautilus 14.2.1

[ceph.git] / ceph / src / rocksdb / table / iter_heap.h

diff --git a/ceph/src/rocksdb/table/iter_heap.h b/ceph/src/rocksdb/table/iter_heap.h
index 642383345cbd304eb0c42387664afbbe5a8cfe6b..f30c122722e2130a8e761de464024818c471752c 100644 (file)
--- a/ceph/src/rocksdb/table/iter_heap.h
+++ b/ceph/src/rocksdb/table/iter_heap.h
@@ -1,12 +1,12 @@
 //  Copyright (c) 2011-present, Facebook, Inc.  All rights reserved.
-//  This source code is licensed under the BSD-style license found in the
-//  LICENSE file in the root directory of this source tree. An additional grant
-//  of patent rights can be found in the PATENTS file in the same directory.
+//  This source code is licensed under both the GPLv2 (found in the
+//  COPYING file in the root directory) and Apache 2.0 License
+//  (found in the LICENSE.Apache file in the root directory).
 //
 
 #pragma once
 
-#include "rocksdb/comparator.h"
+#include "db/dbformat.h"
 #include "table/iterator_wrapper.h"
 
 namespace rocksdb {
@@ -15,28 +15,28 @@ namespace rocksdb {
 // iterator with the max/largest key on top.
 class MaxIteratorComparator {
  public:
-  MaxIteratorComparator(const Comparator* comparator) :
-    comparator_(comparator) {}
+  MaxIteratorComparator(const InternalKeyComparator* comparator)
+      : comparator_(comparator) {}
 
   bool operator()(IteratorWrapper* a, IteratorWrapper* b) const {
     return comparator_->Compare(a->key(), b->key()) < 0;
   }
  private:
-  const Comparator* comparator_;
+  const InternalKeyComparator* comparator_;
 };
 
 // When used with std::priority_queue, this comparison functor puts the
 // iterator with the min/smallest key on top.
 class MinIteratorComparator {
  public:
-  MinIteratorComparator(const Comparator* comparator) :
-    comparator_(comparator) {}
+  MinIteratorComparator(const InternalKeyComparator* comparator)
+      : comparator_(comparator) {}
 
   bool operator()(IteratorWrapper* a, IteratorWrapper* b) const {
     return comparator_->Compare(a->key(), b->key()) > 0;
   }
  private:
-  const Comparator* comparator_;
+  const InternalKeyComparator* comparator_;
 };
 
 }  // namespace rocksdb