SERVER-48353 logv2 cleanup for db/query, s/query, db/views, db/matcher

1 files changed, 10 insertions, 7 deletions

diff --git a/src/mongo/db/query/index_bounds_builder.cpp b/src/mongo/db/query/index_bounds_builder.cpp
index cc856d9c092..1f8dcae97e9 100644
--- a/src/mongo/db/query/index_bounds_builder.cpp
+++ b/src/mongo/db/query/index_bounds_builder.cpp
@@ -888,14 +888,16 @@ void IndexBoundsBuilder::_translatePredicate(const MatchExpression* expr,
             *tightnessOut = IndexBoundsBuilder::INEXACT_FETCH;
         } else {
             LOGV2_WARNING(20934,
-                          "Planner error trying to build geo bounds for {elt} index element.",
-                          "elt"_attr = elt.toString());
+                          "Planner error trying to build geo bounds for {element} index element",
+                          "Planner error trying to build geo bounds for an index element",
+                          "element"_attr = elt.toString());
             verify(0);
         }
     } else {
         LOGV2_WARNING(20935,
-                      "Planner error, trying to build bounds for expression: {expr_debugString}",
-                      "expr_debugString"_attr = redact(expr->debugString()));
+                      "Planner error, trying to build bounds for expression: {expression}",
+                      "Planner error while trying to build bounds for expression",
+                      "expression"_attr = redact(expr->debugString()));
         verify(0);
     }
 }
@@ -1201,10 +1203,11 @@ void IndexBoundsBuilder::alignBounds(IndexBounds* bounds, const BSONObj& kp, int
 
     if (!bounds->isValidFor(kp, scanDir)) {
         LOGV2(20933,
-              "INVALID BOUNDS: {bounds}\nkp = {kp}\nscanDir = {scanDir}",
+              "INVALID BOUNDS: {bounds}\nkp = {keyPattern}\nscanDir = {scanDirection}",
+              "INVALID BOUNDS",
               "bounds"_attr = redact(bounds->toString()),
-              "kp"_attr = redact(kp),
-              "scanDir"_attr = scanDir);
+              "keyPattern"_attr = redact(kp),
+              "scanDirection"_attr = scanDir);
         MONGO_UNREACHABLE;
     }
 }