summaryrefslogtreecommitdiff
path: root/src/mongo/dbtests
diff options
context:
space:
mode:
authorHaley Connelly <haley.connelly@mongodb.com>2021-09-28 20:24:33 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2021-09-28 21:06:23 +0000
commit8c9fa5aa62c28280f35494b091f1ae5b810d349b (patch)
treeb052f2a009c2df432016c1b0489c012419ba7c79 /src/mongo/dbtests
parent466ec4859c2391e1b4d3413297b95ade2c1e76b1 (diff)
downloadmongo-8c9fa5aa62c28280f35494b091f1ae5b810d349b.tar.gz
SERVER-59797 Introduce new type for clusteredIndex create command
Diffstat (limited to 'src/mongo/dbtests')
-rw-r--r--src/mongo/dbtests/SConscript1
-rw-r--r--src/mongo/dbtests/query_stage_collscan.cpp4
-rw-r--r--src/mongo/dbtests/validate_tests.cpp3
3 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/dbtests/SConscript b/src/mongo/dbtests/SConscript
index 1e59959297d..037a9c9178e 100644
--- a/src/mongo/dbtests/SConscript
+++ b/src/mongo/dbtests/SConscript
@@ -139,6 +139,7 @@ env.Program(
"$BUILD_DIR/mongo/client/replica_set_monitor_protocol_test_util",
"$BUILD_DIR/mongo/db/auth/authmongod",
"$BUILD_DIR/mongo/db/bson/dotted_path_support",
+ "$BUILD_DIR/mongo/db/catalog/clustered_collection_options",
"$BUILD_DIR/mongo/db/catalog/collection_validation",
"$BUILD_DIR/mongo/db/catalog/index_key_validate",
"$BUILD_DIR/mongo/db/catalog/multi_index_block",
diff --git a/src/mongo/dbtests/query_stage_collscan.cpp b/src/mongo/dbtests/query_stage_collscan.cpp
index 5094317fd33..487a16f4445 100644
--- a/src/mongo/dbtests/query_stage_collscan.cpp
+++ b/src/mongo/dbtests/query_stage_collscan.cpp
@@ -37,6 +37,7 @@
#include <memory>
#include "mongo/client/dbclient_cursor.h"
+#include "mongo/db/catalog/clustered_collection_util.h"
#include "mongo/db/catalog/collection.h"
#include "mongo/db/catalog/database.h"
#include "mongo/db/client.h"
@@ -180,7 +181,8 @@ public:
WriteUnitOfWork wuow(&_opCtx);
CollectionOptions collOptions;
- collOptions.clusteredIndex = true;
+ collOptions.clusteredIndex =
+ clustered_util::makeCanonicalClusteredInfoForLegacyFormat();
const bool createIdIndex = false;
db->createCollection(&_opCtx, ns, collOptions, createIdIndex);
wuow.commit();
diff --git a/src/mongo/dbtests/validate_tests.cpp b/src/mongo/dbtests/validate_tests.cpp
index cd589503c0e..801f1b40ddc 100644
--- a/src/mongo/dbtests/validate_tests.cpp
+++ b/src/mongo/dbtests/validate_tests.cpp
@@ -31,6 +31,7 @@
#include <cstdint>
+#include "mongo/db/catalog/clustered_collection_util.h"
#include "mongo/db/catalog/collection.h"
#include "mongo/db/catalog/collection_validation.h"
#include "mongo/db/catalog/index_catalog.h"
@@ -73,7 +74,7 @@ public:
CollectionOptions options;
if (clustered) {
- options.clusteredIndex = true;
+ options.clusteredIndex = clustered_util::makeCanonicalClusteredInfoForLegacyFormat();
}
const bool createIdIndex = !clustered;