DiannaHohensee

diff --git a/buildscripts/timeouts/timeout.py b/buildscripts/timeouts/timeout.py
index 45160de80e4..4c07fe4ab49 100644
--- a/buildscripts/timeouts/timeout.py
+++ b/buildscripts/timeouts/timeout.py
@@ -108,17 +108,17 @@ class TimeoutEstimate(NamedTuple):
         test_timeout = self.calculate_test_timeout(repeat_factor, test_timeout_factor)
         task_timeout = self.calculate_task_timeout(repeat_factor, task_timeout_factor)
 
-        if is_patch and (test_timeout > MAX_EXPECTED_TIMEOUT
-                         or task_timeout > MAX_EXPECTED_TIMEOUT):

DiannaHohensee

diff --git a/buildscripts/timeouts/timeout.py b/buildscripts/timeouts/timeout.py
index 3e3440f9c5b..bbdd916cff7 100644
--- a/buildscripts/timeouts/timeout.py
+++ b/buildscripts/timeouts/timeout.py
@@ -61,7 +61,8 @@ class TimeoutEstimate(NamedTuple):
         if self.max_test_runtime is None:
             return None
 
-        timeout = calculate_timeout(self.max_test_runtime, scaling_factor) * repeat_factor
+        timeout = calculate_timeout(

DiannaHohensee

diff --git a/src/search/search_index_commands.cpp b/src/search/search_index_commands.cpp
index c6609dd1..74151add 100644
--- a/src/search/search_index_commands.cpp
+++ b/src/search/search_index_commands.cpp
@@ -25,12 +25,6 @@ namespace {
  */
 executor::RemoteCommandRequest createManageSearchIndexRemoteCommandRequest(
     OperationContext* opCtx, const NamespaceString& nss, const UUID& uuid, const BSONObj& userCmd) {
-    // Fetch the search index management host and port.
-    invariant(!globalSearchIndexParams.host.empty());

DiannaHohensee

diff --git a/src/search/SConscript b/src/search/SConscript
index 85b01c3b..e172af9a 100644
--- a/src/search/SConscript
+++ b/src/search/SConscript
@@ -109,3 +109,20 @@ env.CppUnitTest(
         'mongot_options',
     ],
 )
+
+env.Library(

DiannaHohensee

// Example program
#include <iostream>
#include <string>

class DatabaseName {
public:
  // With explicit, the main() example won't compile.
  // Without explicit, the main() example will compile.
  explicit DatabaseName(std::string str) : _db(str) {}
 

DiannaHohensee

diff --git a/src/mongo/db/matcher/expression_algo.cpp b/src/mongo/db/matcher/expression_algo.cpp
index 18b4a7b22b3..70a7b9e5cc5 100644
--- a/src/mongo/db/matcher/expression_algo.cpp
+++ b/src/mongo/db/matcher/expression_algo.cpp
@@ -568,12 +568,14 @@ std::unique_ptr<MatchExpression> splitMatchExpressionForColumns(
                 : std::make_unique<AndMatchExpression>(std::move(newChildren));
         }
 
+        case MatchExpression::ELEM_MATCH_VALUE: {
+        }

DiannaHohensee

Column Store Indexes

There is now a ColumnStore interface, akin to the RecordStore and SortedDataInterface base classes.

The RecordStore represents a collection keyed (and sorted) by generated RecordIds and otherwise the values (documents) are unsorted: the key-values are RecordId-Document.

The SortedDataInterface represents sorted indexes, mapping index key value to RecordId where the sort is done on index key value.

DiannaHohensee

diff --git a/src/mongo/db/catalog/multi_index_block.cpp b/src/mongo/db/catalog/multi_index_block.cpp
index 9e26cf7d4da..b7cec49f99a 100644
--- a/src/mongo/db/catalog/multi_index_block.cpp
+++ b/src/mongo/db/catalog/multi_index_block.cpp
@@ -633,6 +633,8 @@ void MultiIndexBlock::_doCollectionScan(OperationContext* opCtx,
         // cursor around the side table write in case any write conflict exception occurs that would
         // otherwise reposition the cursor unexpectedly. All WUOW and write conflict exception
         // handling for the side table write is handled internally.
+        LOGV2(
+            0, "~~~MultiIndexBlock::_doCollectionScan", "objToIndex"_attr = objToIndex.toString());

DiannaHohensee

SchemaVersion: 2018-07-01
Owner: "@mongodb/query-execution"
Description: |
  To repro the CSI crash with duplicated fields

GlobalDefaults:
  MaxPhases: &maxPhases 1
  Database: &db repro
  Collection: &coll Collection0

DiannaHohensee

diff --git a/src/mongo/db/commands/find_cmd.cpp b/src/mongo/db/commands/find_cmd.cpp
index 1188981c991..62184a1a38d 100644
--- a/src/mongo/db/commands/find_cmd.cpp
+++ b/src/mongo/db/commands/find_cmd.cpp
@@ -738,6 +738,10 @@ public:
             // Generate the response object to send to the client.
             firstBatch.done(cursorId, nss);
 
+            LOGV2(0,
+                  "~~~Find cmd: result->getBodyBuilder().asTempObj()",