]> git-server-git.apps.pok.os.sepia.ceph.com Git - rocksdb.git/commitdiff
#3865 followup for fix performance degression introduced by switching order of operan...
authorAndrey Zagrebin <azagrebin@gmail.com>
Fri, 17 Aug 2018 17:51:30 +0000 (10:51 -0700)
committerYanqin Jin <yanqin@fb.com>
Tue, 21 Aug 2018 23:53:58 +0000 (16:53 -0700)
Summary:
Followup for #4266. There is one more place in **get_context.cc** where **MergeOperator::ShouldMerge** should be called with reversed list of operands.
Pull Request resolved: https://github.com/facebook/rocksdb/pull/4284

Differential Revision: D9380008

Pulled By: sagar0

fbshipit-source-id: 70ec26e607e5b88465e1acbdcd6c6171bd76b9f2

table/get_context.cc

index 2a90978c3ca6a42eb008f21131d3b6d12079df87..6814e50b1f866769789f219bd0e2a1eb15ee2b15 100644 (file)
@@ -200,7 +200,7 @@ bool GetContext::SaveValue(const ParsedInternalKey& parsed_key,
           merge_context_->PushOperand(value, false);
         }
         if (merge_operator_ != nullptr &&
-            merge_operator_->ShouldMerge(merge_context_->GetOperands())) {
+            merge_operator_->ShouldMerge(merge_context_->GetOperandsDirectionBackward())) {
           state_ = kFound;
           if (LIKELY(pinnable_val_ != nullptr)) {
             Status merge_status = MergeHelper::TimedFullMerge(