SERVER-72803 cache hinted sbe query

11 files changed, 135 insertions, 131 deletions

diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/check_collation_is_encoded.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/check_collation_is_encoded.txt
index af896002c31..2bad74dcb29 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/check_collation_is_encoded.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/check_collation_is_encoded.txt
@@ -5,4 +5,4 @@ Sort: {}
 Proj: {}
 Collation: { locale: "mock_reverse_string" }
 
-an[eqa,eqb]#mock_reverse_string02300000@ff
+an[eqa,eqb]|||mock_reverse_string02300000|ff
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key.txt
index 3cb43ca7d0a..64f1be5f748 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key.txt
@@ -1,80 +1,80 @@
 ==== VARIATION: query={}, sort={}, proj={}
-an@ff
+an||||ff
 ==== VARIATION: query={ $or: [ { a: 1 }, { b: 2 } ] }, sort={}, proj={}
-or[eqa,eqb]@ff
+or[eqa,eqb]||||ff
 ==== VARIATION: query={ $or: [ { a: 1 }, { b: 1 }, { c: 1 } ], d: 1 }, sort={}, proj={}
-an[or[eqa,eqb,eqc],eqd]@ff
+an[or[eqa,eqb,eqc],eqd]||||ff
 ==== VARIATION: query={ $or: [ { a: 1 }, { b: 1 } ], c: 1, d: 1 }, sort={}, proj={}
-an[or[eqa,eqb],eqc,eqd]@ff
+an[or[eqa,eqb],eqc,eqd]||||ff
 ==== VARIATION: query={ a: 1, b: 1, c: 1 }, sort={}, proj={}
-an[eqa,eqb,eqc]@ff
+an[eqa,eqb,eqc]||||ff
 ==== VARIATION: query={ a: 1, beqc: 1 }, sort={}, proj={}
-an[eqa,eqbeqc]@ff
+an[eqa,eqbeqc]||||ff
 ==== VARIATION: query={ ap1a: 1 }, sort={}, proj={}
-eqap1a@ff
+eqap1a||||ff
 ==== VARIATION: query={ aab: 1 }, sort={}, proj={}
-eqaab@ff
+eqaab||||ff
 ==== VARIATION: query={}, sort={ a: 1 }, proj={}
-an~aa@ff
+an|aa|||ff
 ==== VARIATION: query={}, sort={ a: -1 }, proj={}
-an~da@ff
+an|da|||ff
 ==== VARIATION: query={ $text: { $search: "search keywords" } }, sort={ a: { $meta: "textScore" } }, proj={ a: { $meta: "textScore" } }
-te_fts~ta@ff
+te_fts|ta|||ff
 ==== VARIATION: query={ a: 1 }, sort={ b: 1 }, proj={}
-eqa~ab@ff
+eqa|ab|||ff
 ==== VARIATION: query={}, sort={}, proj={ a: 1 }
-an|_id-a@ff
+an||_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: -1 }
-an|_id-a@ff
+an||_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: -1.0 }
-an|_id-a@ff
+an||_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: true }
-an|_id-a@ff
+an||_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: 0 }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: false }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: 99 }
-an|_id-a@ff
+an||_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: "foo" }
-an|_id@ff
+an||_id||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $slice: [ 3, 5 ] } }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $slice: [ 3, 5 ] }, b: 0 }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $slice: [ 3, 5 ] }, b: 1 }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $elemMatch: { x: 2 } } }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $elemMatch: { x: 2 } }, b: 0 }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $elemMatch: { x: 2 } }, b: 1 }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: { $slice: [ 3, 5 ] }, b: { $elemMatch: { x: 2 } } }
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={ a: ObjectId('507f191e810c19729de860ea') }
-an|_id@ff
+an||_id||ff
 ==== VARIATION: query={}, sort={}, proj={ _id: 0, a: ObjectId('507f191e810c19729de860ea'), b: "foo" }
-an|@ff
+an||||ff
 ==== VARIATION: query={ a: 1 }, sort={}, proj={ a.$: 1 }
-eqa@ff
+eqa||||ff
 ==== VARIATION: query={ a: 1 }, sort={}, proj={ a: 1 }
-eqa|_id-a@ff
+eqa||_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: 1, b: 1 }
-an|_id-a-b@ff
+an||_id-a-b||ff
 ==== VARIATION: query={}, sort={}, proj={ b: 1, a: 1 }
-an|_id-a-b@ff
+an||_id-a-b||ff
 ==== VARIATION: query={}, sort={}, proj={ b-1: 1, a-2: 1 }
-an|_id-a\-2-b\-1@ff
+an||_id-a\-2-b\-1||ff
 ==== VARIATION: query={}, sort={ x: 1 }, proj={ $sortKey: { $meta: "sortKey" } }
-an~ax@ff
+an|ax|||ff
 ==== VARIATION: query={}, sort={}, proj={}
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={ x: 1 }, proj={ a: 1, $sortKey: { $meta: "sortKey" } }
-an~ax|_id-a@ff
+an|ax|_id-a||ff
 ==== VARIATION: query={}, sort={}, proj={ a: 1 }
-an|_id-a@ff
+an||_id-a||ff
 ==== VARIATION: query={ $or: [ { a: 1 } ] }, sort={}, proj={ _id: 0, a: 1 }
-eqa|a@ff
+eqa||a||ff
 ==== VARIATION: query={ $or: [ { a: 1 } ] }, sort={}, proj={ a.$: 1 }
-eqa@ff
+eqa||||ff
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_escaped.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_escaped.txt
index 537b9e366c0..3c7413b8cb3 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_escaped.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_escaped.txt
@@ -1,8 +1,8 @@
 ==== VARIATION: query={ a,[]~|-<>: 1 }, sort={}, proj={}
-eqa\,\[\]\~\|\-<>@ff
+eqa\,\[\]~\|\-<>||||ff
 ==== VARIATION: query={}, sort={ a,[]~|-<>: 1 }, proj={}
-an~aa\,\[\]\~\|\-<>@ff
+an|aa\,\[\]~\|\-<>|||ff
 ==== VARIATION: query={}, sort={}, proj={ a,[]~|-<>: 1 }
-an|_id-a\,\[\]\~\|\-<>@ff
+an||_id-a\,\[\]~\|\-<>||ff
 ==== VARIATION: query={}, sort={}, proj={ a: "foo,[]~|-<>" }
-an|_id@ff
+an||_id||ff
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_geo_near.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_geo_near.txt
index bb781dc8584..c5b995b1985 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_geo_near.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_geo_near.txt
@@ -1,6 +1,6 @@
 ==== VARIATION: query={ a: { $near: [ 0, 0 ], $maxDistance: 0.3 } }, sort={}, proj={}
-gnanrfl@ff
+gnanrfl||||ff
 ==== VARIATION: query={ a: { $nearSphere: [ 0, 0 ], $maxDistance: 0.31 } }, sort={}, proj={}
-gnanssp@ff
+gnanssp||||ff
 ==== VARIATION: query={ a: { $geoNear: { $geometry: { type: "Point", coordinates: [ 0, 0 ] }, $maxDistance: 100 } } }, sort={}, proj={}
-gnanrsp@ff
+gnanrsp||||ff
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_match_in_depends_on_presence_of_regex_and_flags.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_match_in_depends_on_presence_of_regex_and_flags.txt
index 720c1b33d05..517a68b0467 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_match_in_depends_on_presence_of_regex_and_flags.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_match_in_depends_on_presence_of_regex_and_flags.txt
@@ -1,30 +1,30 @@
 ==== VARIATION: query={ a: { $in: [ /foo/ ] } }, sort={}, proj={}
-rea@ff
+rea||||ff
 ==== VARIATION: query={ a: { $in: [ /foo/i ] } }, sort={}, proj={}
-rea/i/@ff
+rea/i/||||ff
 ==== VARIATION: query={ a: { $in: [ 1, "foo" ] } }, sort={}, proj={}
-ina@ff
+ina||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/ ] } }, sort={}, proj={}
-ina_re@ff
+ina_re||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/is ] } }, sort={}, proj={}
-ina_re/is/@ff
+ina_re/is/||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/si ] } }, sort={}, proj={}
-ina_re/is/@ff
+ina_re/is/||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/i, /bar/m, /baz/s ] } }, sort={}, proj={}
-ina_re/ims/@ff
+ina_re/ims/||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/i, /bar/m, /baz/s, /qux/i, /quux/s ] } }, sort={}, proj={}
-ina_re/ims/@ff
+ina_re/ims/||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/ism, /bar/msi, /baz/im, /qux/si, /quux/im ] } }, sort={}, proj={}
-ina_re/ims/@ff
+ina_re/ims/||||ff
 ==== VARIATION: query={ a: { $in: [ 1, /foo/msi, /bar/ism, /baz/is, /qux/mi, /quux/im ] } }, sort={}, proj={}
-ina_re/ims/@ff
+ina_re/ims/||||ff
 ==== VARIATION: query={ a: { $not: { $in: [ 1, "foo" ] } } }, sort={}, proj={}
-nt[ina]@ff
+nt[ina]||||ff
 ==== VARIATION: query={ a: { $not: { $in: [ 1, /foo/ ] } } }, sort={}, proj={}
-nt[ina_re]@ff
+nt[ina_re]||||ff
 ==== VARIATION: query={ a: { $not: { $in: [ 1, /foo/i, /bar/i, /baz/msi ] } } }, sort={}, proj={}
-nt[ina_re/ims/]@ff
+nt[ina_re/ims/]||||ff
 ==== VARIATION: query={ a: { $not: { $in: [ /foo/ ] } } }, sort={}, proj={}
-nt[rea]@ff
+nt[rea]||||ff
 ==== VARIATION: query={ a: { $not: { $in: [ /foo/i ] } } }, sort={}, proj={}
-nt[rea/i/]@ff
+nt[rea/i/]||||ff
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_regex_depends_on_flags.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_regex_depends_on_flags.txt
index 987e2708e2b..7805d635360 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_regex_depends_on_flags.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_regex_depends_on_flags.txt
@@ -1,24 +1,24 @@
 ==== VARIATION: query={ a: /sometext/ }, sort={}, proj={}
-rea@tf
+rea||||tf
 ==== VARIATION: query={ a: /sometext/ }, sort={}, proj={}
-rea@tf
+rea||||tf
 ==== VARIATION: query={ a: /sometext/s }, sort={}, proj={}
-rea/s/@tf
+rea/s/||||tf
 ==== VARIATION: query={ a: /sometext/ms }, sort={}, proj={}
-rea/ms/@tf
+rea/ms/||||tf
 ==== VARIATION: query={ a: /sometext/im }, sort={}, proj={}
-rea/im/@tf
+rea/im/||||tf
 ==== VARIATION: query={ a: /sometext/mi }, sort={}, proj={}
-rea/im/@tf
+rea/im/||||tf
 ==== VARIATION: query={ a: /abc/mi }, sort={}, proj={}
-rea/im/@tf
+rea/im/||||tf
 ==== VARIATION: query={ a: /efg/mi }, sort={}, proj={}
-rea/im/@tf
+rea/im/||||tf
 ==== VARIATION: query={ a: //ms }, sort={}, proj={}
-rea/ms/@tf
+rea/ms/||||tf
 ==== VARIATION: query={ a: /___/ms }, sort={}, proj={}
-rea/ms/@tf
+rea/ms/||||tf
 ==== VARIATION: query={ a: { $regex: "abc", $options: "imxsu" } }, sort={}, proj={}
-rea/imsx/@tf
+rea/imsx/||||tf
 ==== VARIATION: query={ a: /abc/im }, sort={}, proj={}
-rea/im/@tf
+rea/im/||||tf
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e.txt
index ead917e1225..a7e6f5d8c82 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e.txt
@@ -1,50 +1,54 @@
 ==== VARIATION: sbe, query={}, sort={}, proj={}
-YW4ABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+YW4ABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={$or: [{a: 1}, {b: 2}]}, sort={}, proj={}
-b3IAW2VxAGE/AAAAACxlcQBiPwEAAABdBQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+b3IAW2VxAGE/AAAAACxlcQBiPwEAAABdBQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={b: 1}, sort={}, proj={}
-ZXEAYj8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+ZXEAYj8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={a: 1, b: 1, c: 1}, sort={}, proj={}
-YW4AW2VxAGE/AAAAACxlcQBiPwEAAAAsZXEAYz8CAAAAXQUAAAAAAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+YW4AW2VxAGE/AAAAACxlcQBiPwEAAAAsZXEAYz8CAAAAXQUAAAAAfHx8fAAAAAAAAAAAAAAAbm5ubgUAAAAAZnw=
 ==== VARIATION: sbe, query={}, sort={a: 1}, proj={}
-YW4ABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+YW4ABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
 ==== VARIATION: sbe, query={}, sort={a: -1}, proj={}
-YW4ABQAAAAB+ZGEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+YW4ABQAAAAB8ZGF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
 ==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
 ==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={a: 1}
-ZXEAYT8AAAAADAAAABBhAAEAAAAAfmFhAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+ZXEAYT8AAAAADAAAABBhAAEAAAAAfGFhfHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={}, sort={a: 1}, proj={a: 1}
-YW4ADAAAABBhAAEAAAAAfmFhAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+YW4ADAAAABBhAAEAAAAAfGFhfHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={}, sort={a: 1}, proj={a: 1}
-YW4ADAAAABBhAAEAAAAAfmFhAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+YW4ADAAAABBhAAEAAAAAfGFhfHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={}, sort={}, proj={a: 1}
-YW4ADAAAABBhAAEAAAAAAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+YW4ADAAAABBhAAEAAAAAfHx8fAAAAAAAAAAAAAAAbm5ubgUAAAAAZnw=
 ==== VARIATION: sbe, query={}, sort={}, proj={a: true}
-YW4ACQAAAAhhAAEAAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+YW4ACQAAAAhhAAEAfHx8fAAAAAAAAAAAAAAAbm5ubgUAAAAAZnw=
 ==== VARIATION: sbe, query={}, sort={}, proj={a: false}
-YW4ACQAAAAhhAAAAAAAAAAAAAAAAAABubm5uBQAAAABmXg==
+YW4ACQAAAAhhAAAAfHx8fAAAAAAAAAAAAAAAbm5ubgUAAAAAZnw=
 ==== VARIATION: sbe, query={}, sort={}, proj={}, isCountLike=true
-YW4ABQAAAAAAAQAAAAAAAAAAAG5ubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=1, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAHRubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAGZubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=1, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG50bm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5uZm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAKAAAAAAAAAAAAAABubm5uBQAAAABmXg==
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAACgAAAAAAAABubm5uBQAAAABmXg==
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=1
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5udG4YAAAAEiRyZWNvcmRJZAABAAAAAAAAAABmXg==
+YW4ABQAAAAB8fHx8AAEAAAAAAAAAAABubm5uBQAAAABmfA==
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=1, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAHRubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAGZubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=1, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG50bm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5uZm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAKAAAAAAAAAAAAAABubm5uBQAAAABmfA==
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAACgAAAAAAAABubm5uBQAAAABmfA==
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={}, proj={}, hint={ $natural: 1 }, allowDiskUse=0, returnKey=0, requestResumeToken=1
+ZXEAYT8AAAAABQAAAAB8fHwTAAAAECRuYXR1cmFsAAEAAAAAfAAAAAAAAAAAAAAAbm50bhgAAAASJHJlY29yZElkAAEAAAAAAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={}, proj={}, hint={ a: 1 }, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8fHwMAAAAEGEAAQAAAAB8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
+==== VARIATION: sbe, query={a: 1}, sort={}, proj={}, hint={ a: -1 }, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8fHwMAAAAEGEA/////wB8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_pipeline.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_pipeline.txt
index fde58d486b6..608347f42ca 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_pipeline.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_pipeline.txt
@@ -1,12 +1,12 @@
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZeWgAAAAMkbG9va3VwAEwAAAACZnJvbQAMAAAAZm9yZWlnbmNvbGwAAmFzAAMAAABhcwACbG9jYWxGaWVsZAACAAAAYQACZm9yZWlnbkZpZWxkAAIAAABiAAAA
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfFoAAAADJGxvb2t1cABMAAAAAmZyb20ADAAAAGZvcmVpZ25jb2xsAAJhcwADAAAAYXMAAmxvY2FsRmllbGQAAgAAAGEAAmZvcmVpZ25GaWVsZAACAAAAYgAAAA==
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZeWwAAAAMkbG9va3VwAE0AAAACZnJvbQAMAAAAZm9yZWlnbmNvbGwAAmFzAAMAAABhcwACbG9jYWxGaWVsZAADAAAAYTEAAmZvcmVpZ25GaWVsZAACAAAAYgAAAA==
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfFsAAAADJGxvb2t1cABNAAAAAmZyb20ADAAAAGZvcmVpZ25jb2xsAAJhcwADAAAAYXMAAmxvY2FsRmllbGQAAwAAAGExAAJmb3JlaWduRmllbGQAAgAAAGIAAAA=
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZeWwAAAAMkbG9va3VwAE0AAAACZnJvbQAMAAAAZm9yZWlnbmNvbGwAAmFzAAMAAABhcwACbG9jYWxGaWVsZAACAAAAYQACZm9yZWlnbkZpZWxkAAMAAABiMQAAAA==
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfFsAAAADJGxvb2t1cABNAAAAAmZyb20ADAAAAGZvcmVpZ25jb2xsAAJhcwADAAAAYXMAAmxvY2FsRmllbGQAAgAAAGEAAmZvcmVpZ25GaWVsZAADAAAAYjEAAAA=
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZeWwAAAAMkbG9va3VwAE0AAAACZnJvbQAMAAAAZm9yZWlnbmNvbGwAAmFzAAQAAABhczEAAmxvY2FsRmllbGQAAgAAAGEAAmZvcmVpZ25GaWVsZAACAAAAYgAAAA==
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfFsAAAADJGxvb2t1cABNAAAAAmZyb20ADAAAAGZvcmVpZ25jb2xsAAJhcwAEAAAAYXMxAAJsb2NhbEZpZWxkAAIAAABhAAJmb3JlaWduRmllbGQAAgAAAGIAAAA=
 ==== VARIATION: sbe, query={a: 1}, sort={}, proj={}
-ZXEAYT8AAAAABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZeWgAAAAMkbG9va3VwAEwAAAACZnJvbQAMAAAAZm9yZWlnbmNvbGwAAmFzAAMAAABhcwACbG9jYWxGaWVsZAACAAAAYQACZm9yZWlnbkZpZWxkAAIAAABiAAAAXQAAAAMkbG9va3VwAE8AAAACZnJvbQAMAAAAZm9yZWlnbmNvbGwAAmFzAAQAAABhczEAAmxvY2FsRmllbGQAAwAAAGExAAJmb3JlaWduRmllbGQAAwAAAGIxAAAA
+ZXEAYT8AAAAABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfFoAAAADJGxvb2t1cABMAAAAAmZyb20ADAAAAGZvcmVpZ25jb2xsAAJhcwADAAAAYXMAAmxvY2FsRmllbGQAAgAAAGEAAmZvcmVpZ25GaWVsZAACAAAAYgAAAF0AAAADJGxvb2t1cABPAAAAAmZyb20ADAAAAGZvcmVpZ25jb2xsAAJhcwAEAAAAYXMxAAJsb2NhbEZpZWxkAAMAAABhMQACZm9yZWlnbkZpZWxkAAMAAABiMQAAAA==
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_read_concern.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_read_concern.txt
index 15bf8272a09..5b1cbb1651f 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_read_concern.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_s_b_e_with_read_concern.txt
@@ -1,6 +1,6 @@
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
-==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
-ZXEAYT8AAAAABQAAAAB+YWEAAAAAAAAAAAAAAG5ubm4FAAAAAHRe
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAGZ8
+==== VARIATION: sbe, query={a: 1}, sort={a: 1}, proj={}, hint={}, allowDiskUse=0, returnKey=0, requestResumeToken=0
+ZXEAYT8AAAAABQAAAAB8YWF8fHwAAAAAAAAAAAAAAG5ubm4FAAAAAHR8
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_with_api_strict.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_with_api_strict.txt
index b78e050d792..f659839252d 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_with_api_strict.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/compute_key_with_api_strict.txt
@@ -1,8 +1,8 @@
 ==== VARIATION: query={}, sort={}, proj={}
-an@ff
+an||||ff
 ==== VARIATION: query={}, sort={}, proj={}
-an@ft
+an||||ft
 ==== VARIATION: sbe, query={}, sort={}, proj={}
-YW4ABQAAAAAAAAAAAAAAAAAAAG5ubm4FAAAAAGZe
+YW4ABQAAAAB8fHx8AAAAAAAAAAAAAABubm5uBQAAAABmfA==
 ==== VARIATION: sbe, query={}, sort={}, proj={}
-YW4ABQAAAAAAAAEAAAAAAAAAAG5ubm4FAAAAAGZe
+YW4ABQAAAAB8fHx8AAABAAAAAAAAAABubm5uBQAAAABmfA==
diff --git a/src/mongo/db/test_output/query/canonical_query_encoder_test/encode_not_equal_null_predicates.txt b/src/mongo/db/test_output/query/canonical_query_encoder_test/encode_not_equal_null_predicates.txt
index 5c43534264e..284989f183e 100644
--- a/src/mongo/db/test_output/query/canonical_query_encoder_test/encode_not_equal_null_predicates.txt
+++ b/src/mongo/db/test_output/query/canonical_query_encoder_test/encode_not_equal_null_predicates.txt
@@ -1,10 +1,10 @@
 ==== VARIATION: query={ a: { $not: { $eq: null } } }, sort={}, proj={ _id: 0, a: 1 }
-ntnot_eq_null[eqa]|a@ff
+ntnot_eq_null[eqa]||a||ff
 ==== VARIATION: query={ a: { $not: { $eq: null } } }, sort={ a: 1 }, proj={ _id: 0, a: 1 }
-ntnot_eq_null[eqa]~aa|a@ff
+ntnot_eq_null[eqa]|aa|a||ff
 ==== VARIATION: query={ a: { $not: { $gte: null } } }, sort={ a: 1 }, proj={ _id: 0, a: 1 }
-ntnot_eq_null[gea]~aa|a@ff
+ntnot_eq_null[gea]|aa|a||ff
 ==== VARIATION: query={ a: { $not: { $lte: null } } }, sort={ a: 1 }, proj={ _id: 0, a: 1 }
-ntnot_eq_null[lea]~aa|a@ff
+ntnot_eq_null[lea]|aa|a||ff
 ==== VARIATION: query={ a: { $not: { $eq: true } } }, sort={ a: 1 }, proj={ _id: 0, a: 1 }
-nt[eqa]~aa|a@ff
+nt[eqa]|aa|a||ff