diff options
Diffstat (limited to 'src/mongo/s')
-rw-r--r-- | src/mongo/s/catalog_cache_loader.h | 9 | ||||
-rw-r--r-- | src/mongo/s/config_server_catalog_cache_loader.cpp | 7 | ||||
-rw-r--r-- | src/mongo/s/config_server_catalog_cache_loader.h | 3 |
3 files changed, 8 insertions, 11 deletions
diff --git a/src/mongo/s/catalog_cache_loader.h b/src/mongo/s/catalog_cache_loader.h index 94d8ea5a93e..ef292552df1 100644 --- a/src/mongo/s/catalog_cache_loader.h +++ b/src/mongo/s/catalog_cache_loader.h @@ -68,7 +68,6 @@ public: static CatalogCacheLoader& get(ServiceContext* serviceContext); static CatalogCacheLoader& get(OperationContext* opCtx); - /** * Used as a return value for getChunksSince. */ @@ -93,6 +92,9 @@ public: std::vector<ChunkType> changedChunks; }; + using GetChunksSinceCallbackFn = + stdx::function<void(OperationContext*, StatusWith<CollectionAndChangedChunks>)>; + /** * Initializes internal state. Must be called only once when sharding state is initialized. */ @@ -126,10 +128,7 @@ public: * Notification object can be waited on in order to ensure that. */ virtual std::shared_ptr<Notification<void>> getChunksSince( - const NamespaceString& nss, - ChunkVersion version, - stdx::function<void(OperationContext*, StatusWith<CollectionAndChangedChunks>)> - callbackFn) = 0; + const NamespaceString& nss, ChunkVersion version, GetChunksSinceCallbackFn callbackFn) = 0; /** * Non-blocking call, which requests the most recent db version for the given dbName from the diff --git a/src/mongo/s/config_server_catalog_cache_loader.cpp b/src/mongo/s/config_server_catalog_cache_loader.cpp index 4de200959e9..97b5ee9ca9d 100644 --- a/src/mongo/s/config_server_catalog_cache_loader.cpp +++ b/src/mongo/s/config_server_catalog_cache_loader.cpp @@ -27,7 +27,9 @@ * exception statement from all source files in the program, then also delete * it in the license file. */ + #define MONGO_LOG_DEFAULT_COMPONENT ::mongo::logger::LogComponent::kSharding + #include "mongo/platform/basic.h" #include "mongo/s/config_server_catalog_cache_loader.h" @@ -172,10 +174,7 @@ void ConfigServerCatalogCacheLoader::waitForDatabaseFlush(OperationContext* opCt } std::shared_ptr<Notification<void>> ConfigServerCatalogCacheLoader::getChunksSince( - const NamespaceString& nss, - ChunkVersion version, - stdx::function<void(OperationContext*, StatusWith<CollectionAndChangedChunks>)> callbackFn) { - + const NamespaceString& nss, ChunkVersion version, GetChunksSinceCallbackFn callbackFn) { auto notify = std::make_shared<Notification<void>>(); uassertStatusOK(_threadPool.schedule([ nss, version, notify, callbackFn ]() noexcept { diff --git a/src/mongo/s/config_server_catalog_cache_loader.h b/src/mongo/s/config_server_catalog_cache_loader.h index 50d771d1681..fd7d104d80a 100644 --- a/src/mongo/s/config_server_catalog_cache_loader.h +++ b/src/mongo/s/config_server_catalog_cache_loader.h @@ -53,8 +53,7 @@ public: std::shared_ptr<Notification<void>> getChunksSince( const NamespaceString& nss, ChunkVersion version, - stdx::function<void(OperationContext*, StatusWith<CollectionAndChangedChunks>)> callbackFn) - override; + GetChunksSinceCallbackFn callbackFn) override; void getDatabase( StringData dbName, |