From 0b456e1a4d4364460239e7e18ef74b5fd00b70db Mon Sep 17 00:00:00 2001
From: Svilen Mihaylov <svilen.mihaylov@mongodb.com>
Date: Thu, 29 Sep 2022 21:33:46 +0000
Subject: SERVER-70081 [CQF] Rename rule enum for index fetching

---
 src/mongo/db/query/optimizer/cascades/implementers.cpp            | 2 +-
 src/mongo/db/query/optimizer/cascades/rewriter_rules.h            | 2 +-
 src/mongo/db/query/optimizer/physical_rewriter_optimizer_test.cpp | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/mongo/db/query/optimizer')

diff --git a/src/mongo/db/query/optimizer/cascades/implementers.cpp b/src/mongo/db/query/optimizer/cascades/implementers.cpp
index 997fe8d0ee2..8586fef8c61 100644
--- a/src/mongo/db/query/optimizer/cascades/implementers.cpp
+++ b/src/mongo/db/query/optimizer/cascades/implementers.cpp
@@ -1606,7 +1606,7 @@ private:
             setCollationForRIDIntersect(
                 collationLeftRightSplit, leftPhysPropsLocal, rightPhysPropsLocal);
 
-            optimizeChildren<BinaryJoinNode, PhysicalRewriteType::RIDIntersectNLJ>(
+            optimizeChildren<BinaryJoinNode, PhysicalRewriteType::IndexFetch>(
                 _queue,
                 kDefaultPriority,
                 std::move(physicalJoin),
diff --git a/src/mongo/db/query/optimizer/cascades/rewriter_rules.h b/src/mongo/db/query/optimizer/cascades/rewriter_rules.h
index 311c38c2081..7f6b0cdb07b 100644
--- a/src/mongo/db/query/optimizer/cascades/rewriter_rules.h
+++ b/src/mongo/db/query/optimizer/cascades/rewriter_rules.h
@@ -115,7 +115,7 @@ MAKE_PRINTABLE_ENUM_STRING_ARRAY(LogicalRewriterTypeEnum,
     F(RIDIntersectMergeJoin)      \
     F(RIDIntersectHashJoin)       \
     F(RIDIntersectGroupBy)        \
-    F(RIDIntersectNLJ)
+    F(IndexFetch)
 
 MAKE_PRINTABLE_ENUM(PhysicalRewriteType, PHYSICALREWRITER_NAMES);
 MAKE_PRINTABLE_ENUM_STRING_ARRAY(PhysicalRewriterTypeEnum,
diff --git a/src/mongo/db/query/optimizer/physical_rewriter_optimizer_test.cpp b/src/mongo/db/query/optimizer/physical_rewriter_optimizer_test.cpp
index b5f52759993..6354fac394a 100644
--- a/src/mongo/db/query/optimizer/physical_rewriter_optimizer_test.cpp
+++ b/src/mongo/db/query/optimizer/physical_rewriter_optimizer_test.cpp
@@ -1075,9 +1075,9 @@ TEST(PhysRewriter, FilterIndexing2NonSarg) {
                                          LogicalRewriteType::FilterRIDIntersectReorder};
     PhysicalRewriteType physicalRules[] = {PhysicalRewriteType::Seek,
                                            PhysicalRewriteType::Seek,
-                                           PhysicalRewriteType::RIDIntersectNLJ,
+                                           PhysicalRewriteType::IndexFetch,
                                            PhysicalRewriteType::Evaluation,
-                                           PhysicalRewriteType::RIDIntersectNLJ,
+                                           PhysicalRewriteType::IndexFetch,
                                            PhysicalRewriteType::Root,
                                            PhysicalRewriteType::SargableToIndex,
                                            PhysicalRewriteType::SargableToIndex,
-- 
cgit v1.2.1