summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2022-03-07 12:07:18 +0000
committerEvergreen Agent <no-reply@evergreen.mongodb.com>2022-03-07 14:24:27 +0000
commit29371ed11e06b9e85f93e981986c0efceac0df40 (patch)
treeede7cee9c0764d59d4224d15f3d809b3f1ae98bb
parent943e4453c6cd679f9b195bf1b7143c885eaa2149 (diff)
downloadmongo-29371ed11e06b9e85f93e981986c0efceac0df40.tar.gz
SERVER-64199 Use legal Timestamps for the routing performance benchmarks
(cherry picked from commit 7e114c6dc901142c721a9ca7c7adc17edd4868e4)
-rw-r--r--src/mongo/db/s/SConscript16
-rw-r--r--src/mongo/db/s/sharding_write_router_bm.cpp36
-rw-r--r--src/mongo/s/chunk_manager_refresh_bm.cpp14
3 files changed, 32 insertions, 34 deletions
diff --git a/src/mongo/db/s/SConscript b/src/mongo/db/s/SConscript
index fa5a4927e11..156c4c14c2d 100644
--- a/src/mongo/db/s/SConscript
+++ b/src/mongo/db/s/SConscript
@@ -619,13 +619,15 @@ env.Benchmark(
)
env.Benchmark(
- target="sharding_write_router_bm",
- source=["sharding_write_router_bm.cpp"],
+ target='sharding_write_router_bm',
+ source=[
+ 'sharding_write_router_bm.cpp',
+ ],
LIBDEPS=[
- "$BUILD_DIR/mongo/db/auth/authmocks",
- "$BUILD_DIR/mongo/s/grid",
- "$BUILD_DIR/mongo/s/sharding_test_fixture_common",
- "sharding_api_d",
- "sharding_runtime_d",
+ '$BUILD_DIR/mongo/db/auth/authmocks',
+ '$BUILD_DIR/mongo/s/grid',
+ '$BUILD_DIR/mongo/s/sharding_test_fixture_common',
+ 'sharding_api_d',
+ 'sharding_runtime_d',
],
)
diff --git a/src/mongo/db/s/sharding_write_router_bm.cpp b/src/mongo/db/s/sharding_write_router_bm.cpp
index 6980358d793..655bbcbe5ab 100644
--- a/src/mongo/db/s/sharding_write_router_bm.cpp
+++ b/src/mongo/db/s/sharding_write_router_bm.cpp
@@ -27,35 +27,31 @@
* it in the license file.
*/
-#include "mongo/db/keypattern.h"
-#include "mongo/db/operation_context.h"
-#include "mongo/db/s/collection_sharding_state_factory_shard.h"
-#include "mongo/db/service_context.h"
-#include "mongo/platform/basic.h"
-
-#include "mongo/db/concurrency/locker_noop_client_observer.h"
-#include "mongo/db/s/collection_sharding_runtime.h"
-#include "mongo/s/catalog_cache.h"
-#include "mongo/s/catalog_cache_loader_mock.h"
-#include "mongo/s/catalog_cache_mock.h"
-#include "mongo/unittest/unittest.h"
-#include "mongo/util/processinfo.h"
-#include "mongo/util/uuid.h"
#include <benchmark/benchmark.h>
+#include <cstdint>
+#include <utility>
+#include <vector>
-#include "mongo/base/init.h"
+#include "mongo/db/concurrency/locker_noop_client_observer.h"
+#include "mongo/db/keypattern.h"
+#include "mongo/db/operation_context.h"
#include "mongo/db/s/collection_metadata.h"
+#include "mongo/db/s/collection_sharding_runtime.h"
+#include "mongo/db/s/collection_sharding_state_factory_shard.h"
#include "mongo/db/s/operation_sharding_state.h"
#include "mongo/db/s/sharding_state.h"
#include "mongo/db/s/sharding_write_router.h"
+#include "mongo/db/service_context.h"
#include "mongo/platform/random.h"
+#include "mongo/s/catalog_cache.h"
+#include "mongo/s/catalog_cache_loader_mock.h"
+#include "mongo/s/catalog_cache_mock.h"
#include "mongo/s/chunk_manager.h"
+#include "mongo/unittest/unittest.h"
#include "mongo/util/assert_util.h"
+#include "mongo/util/processinfo.h"
#include "mongo/util/str.h"
-#include <cstdint>
-#include <utility>
-#include <vector>
-
+#include "mongo/util/uuid.h"
namespace mongo {
namespace {
@@ -117,7 +113,7 @@ std::pair<std::vector<mongo::ChunkType>, mongo::ChunkManager> createChunks(
reshardingFields.setDonorFields(TypeCollectionDonorFields{tempNss, reshardKeyPattern, shards});
ChunkManager cm(shards[0],
- DatabaseVersion(UUID::gen(), Timestamp()),
+ DatabaseVersion(UUID::gen(), Timestamp(1, 0)),
makeStandaloneRoutingTableHistory(
RoutingTableHistory::makeNew(kNss,
collIdentifier,
diff --git a/src/mongo/s/chunk_manager_refresh_bm.cpp b/src/mongo/s/chunk_manager_refresh_bm.cpp
index cd166c1adb1..3c7f3adb6b3 100644
--- a/src/mongo/s/chunk_manager_refresh_bm.cpp
+++ b/src/mongo/s/chunk_manager_refresh_bm.cpp
@@ -77,7 +77,7 @@ CollectionMetadata makeChunkManagerWithShardSelector(int nShards,
for (uint32_t i = 0; i < nChunks; ++i) {
chunks.emplace_back(collUuid,
getRangeForChunk(i, nChunks),
- ChunkVersion{i + 1, 0, collEpoch, Timestamp()},
+ ChunkVersion{i + 1, 0, collEpoch, Timestamp(1, 0)},
selectShard(i, nShards, nChunks));
}
@@ -87,14 +87,14 @@ CollectionMetadata makeChunkManagerWithShardSelector(int nShards,
nullptr,
true,
collEpoch,
- Timestamp(),
+ Timestamp(1, 0),
boost::none /* timeseriesFields */,
boost::none,
boost::none /* chunkSizeBytes */,
true,
chunks);
return CollectionMetadata(ChunkManager(ShardId("Shard0"),
- DatabaseVersion(UUID::gen(), Timestamp()),
+ DatabaseVersion(UUID::gen(), Timestamp(1, 0)),
makeStandaloneRoutingTableHistory(std::move(rt)),
boost::none),
ShardId("shard0"));
@@ -125,7 +125,7 @@ MONGO_COMPILER_NOINLINE auto runIncrementalUpdate(const CollectionMetadata& cm,
auto rt = cm.getChunkManager()->getRoutingTableHistory_ForTest().makeUpdated(
boost::none /* timeseriesFields */, boost::none, boost::none, true, newChunks);
return CollectionMetadata(ChunkManager(ShardId("shard0"),
- DatabaseVersion(UUID::gen(), Timestamp()),
+ DatabaseVersion(UUID::gen(), Timestamp(1, 0)),
makeStandaloneRoutingTableHistory(std::move(rt)),
boost::none),
ShardId("shard0"));
@@ -169,7 +169,7 @@ auto BM_FullBuildOfChunkManager(benchmark::State& state, ShardSelectorFn selectS
for (uint32_t i = 0; i < nChunks; ++i) {
chunks.emplace_back(collUuid,
getRangeForChunk(i, nChunks),
- ChunkVersion{i + 1, 0, collEpoch, Timestamp()},
+ ChunkVersion{i + 1, 0, collEpoch, Timestamp(1, 0)},
selectShard(i, nShards, nChunks));
}
@@ -180,7 +180,7 @@ auto BM_FullBuildOfChunkManager(benchmark::State& state, ShardSelectorFn selectS
nullptr,
true,
collEpoch,
- Timestamp(),
+ Timestamp(1, 0),
boost::none /* timeseriesFields */,
boost::none,
boost::none /* chunkSizeBytes */,
@@ -188,7 +188,7 @@ auto BM_FullBuildOfChunkManager(benchmark::State& state, ShardSelectorFn selectS
chunks);
benchmark::DoNotOptimize(
CollectionMetadata(ChunkManager(ShardId("shard0"),
- DatabaseVersion(UUID::gen(), Timestamp()),
+ DatabaseVersion(UUID::gen(), Timestamp(1, 0)),
makeStandaloneRoutingTableHistory(std::move(rt)),
boost::none),
ShardId("shard0")));