summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyle Suarez <kyle.suarez@mongodb.com>2016-12-01 10:19:56 -0500
committerKyle Suarez <kyle.suarez@mongodb.com>2016-12-01 10:27:24 -0500
commit9e941332d0c15cf498298de32d843bd6f409ddf7 (patch)
tree4edb2bed088212b025eb8307dd3882b12a95171f
parentbab79e5beca9451e90571d02fb88b74459c2d792 (diff)
downloadmongo-9e941332d0c15cf498298de32d843bd6f409ddf7.tar.gz
SERVER-27207 populate merge queue in AsyncResultsMerger when encountering ResolvedView
(cherry picked from commit 1db6b26bcfdc67992c52739f50deacd31edc4fc0)
-rw-r--r--src/mongo/s/query/async_results_merger.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/mongo/s/query/async_results_merger.cpp b/src/mongo/s/query/async_results_merger.cpp
index 741691d7876..d6ea954db66 100644
--- a/src/mongo/s/query/async_results_merger.cpp
+++ b/src/mongo/s/query/async_results_merger.cpp
@@ -473,6 +473,12 @@ void AsyncResultsMerger::handleBatchResponse(
remote.docBuffer.push(result);
remote.cursorId = 0;
remote.status = Status::OK();
+
+ if (!_params.sort.isEmpty()) {
+ // Push the index of this remote to the merge queue so that the resolved view is
+ // visible to nextReadySorted().
+ _mergeQueue.push(remoteIndex);
+ }
return;
}