summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSvilen Mihaylov <svilen.mihaylov@mongodb.com>2022-09-29 21:33:46 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-09-29 23:04:03 +0000
commit0b456e1a4d4364460239e7e18ef74b5fd00b70db (patch)
tree8d71ba2725f097c73281b87cc172ec1d75c1ea45
parent360615206b25e77946d4f5fa2484a7dc318160bf (diff)
downloadmongo-0b456e1a4d4364460239e7e18ef74b5fd00b70db.tar.gz
SERVER-70081 [CQF] Rename rule enum for index fetching
-rw-r--r--src/mongo/db/query/optimizer/cascades/implementers.cpp2
-rw-r--r--src/mongo/db/query/optimizer/cascades/rewriter_rules.h2
-rw-r--r--src/mongo/db/query/optimizer/physical_rewriter_optimizer_test.cpp4
3 files changed, 4 insertions, 4 deletions
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,