From 3df9c61b7747058cd84edd7a875b1524db57dd1d Mon Sep 17 00:00:00 2001
From: Kaloian Manassiev <kaloian.manassiev@mongodb.com>
Date: Thu, 3 Sep 2020 04:51:07 -0400
Subject: SERVER-46199 Make the RoutingTableHistory movable

---
 src/mongo/s/catalog_cache.cpp | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/mongo/s/catalog_cache.cpp')

diff --git a/src/mongo/s/catalog_cache.cpp b/src/mongo/s/catalog_cache.cpp
index 52a83f2c371..19846e62b48 100644
--- a/src/mongo/s/catalog_cache.cpp
+++ b/src/mongo/s/catalog_cache.cpp
@@ -111,8 +111,9 @@ std::shared_ptr<RoutingTableHistory> refreshCollectionRoutingInfo(
                     existingRoutingInfo->getVersion())
                 return existingRoutingInfo;
 
-            return existingRoutingInfo->makeUpdated(std::move(collectionAndChunks.reshardingFields),
-                                                    collectionAndChunks.changedChunks);
+            return std::make_shared<RoutingTableHistory>(
+                existingRoutingInfo->makeUpdated(std::move(collectionAndChunks.reshardingFields),
+                                                 collectionAndChunks.changedChunks));
         }
 
         auto defaultCollator = [&]() -> std::unique_ptr<CollatorInterface> {
@@ -124,14 +125,15 @@ std::shared_ptr<RoutingTableHistory> refreshCollectionRoutingInfo(
             return nullptr;
         }();
 
-        return RoutingTableHistory::makeNew(nss,
-                                            collectionAndChunks.uuid,
-                                            KeyPattern(collectionAndChunks.shardKeyPattern),
-                                            std::move(defaultCollator),
-                                            collectionAndChunks.shardKeyIsUnique,
-                                            collectionAndChunks.epoch,
-                                            std::move(collectionAndChunks.reshardingFields),
-                                            collectionAndChunks.changedChunks);
+        return std::make_shared<RoutingTableHistory>(
+            RoutingTableHistory::makeNew(nss,
+                                         collectionAndChunks.uuid,
+                                         KeyPattern(collectionAndChunks.shardKeyPattern),
+                                         std::move(defaultCollator),
+                                         collectionAndChunks.shardKeyIsUnique,
+                                         collectionAndChunks.epoch,
+                                         std::move(collectionAndChunks.reshardingFields),
+                                         collectionAndChunks.changedChunks));
     }();
 
     std::set<ShardId> shardIds;
-- 
cgit v1.2.1