SERVER-47773 Error consistently when tailable cursors and $near are used togetherr4.0.19-rc0r4.0.19

(cherry picked from commit c8ced6df8f620daaa2e539f192f2eef356c63e9c)
(cherry picked from commit e9c31e791b2e056c016c048d7e21c59e0e2452ea)
(cherry picked from commit 444dab325b5351ddd566da1d5365ec8728a06634)

2 files changed, 7 insertions, 1 deletions

diff --git a/src/mongo/db/query/canonical_query.cpp b/src/mongo/db/query/canonical_query.cpp
index 6d2337d92ef..3d15afafe6c 100644
--- a/src/mongo/db/query/canonical_query.cpp
+++ b/src/mongo/db/query/canonical_query.cpp
@@ -404,6 +404,12 @@ Status CanonicalQuery::isValid(MatchExpression* root, const QueryRequest& parsed
         return Status(ErrorCodes::BadValue, "text and tailable cursor not allowed in same query");
     }
 
+    // NEAR and tailable are incompatible.
+    if (numGeoNear > 0 && parsed.isTailable()) {
+        return Status(ErrorCodes::BadValue,
+                      "Tailable cursors and geo $near cannot be used together");
+    }
+
     // $natural sort order must agree with hint.
     if (sortNaturalElt) {
         if (!hintObj.isEmpty() && !hintNaturalElt) {
diff --git a/src/mongo/db/query/query_planner.cpp b/src/mongo/db/query/query_planner.cpp
index d91e92a6449..9236c52d206 100644
--- a/src/mongo/db/query/query_planner.cpp
+++ b/src/mongo/db/query/query_planner.cpp
@@ -544,7 +544,7 @@ StatusWith<std::vector<std::unique_ptr<QuerySolution>>> QueryPlanner::plan(
     // If the query requests a tailable cursor, the only solution is a collscan + filter with
     // tailable set on the collscan.
     if (isTailable) {
-        if (!QueryPlannerCommon::hasNode(query.root(), MatchExpression::GEO_NEAR) && canTableScan) {
+        if (canTableScan) {
             auto soln = buildCollscanSoln(query, isTailable, params);
             if (soln) {
                 out.push_back(std::move(soln));