summaryrefslogtreecommitdiff
path: root/src/mongo/db/ops
diff options
context:
space:
mode:
authorKaloian Manassiev <kaloian.manassiev@mongodb.com>2015-07-27 14:40:16 -0400
committerKaloian Manassiev <kaloian.manassiev@mongodb.com>2015-07-28 15:07:52 -0400
commit327e99adcbc1430682d59dfc50c74088f6ae29e8 (patch)
tree153230e9a0feb6cf93706868ec92d75f4151a8a3 /src/mongo/db/ops
parent789a8e2669c38ad5ebcbd07bff98d14d7354e421 (diff)
downloadmongo-327e99adcbc1430682d59dfc50c74088f6ae29e8.tar.gz
SERVER-18084 Cleanup includes
Diffstat (limited to 'src/mongo/db/ops')
-rw-r--r--src/mongo/db/ops/update_lifecycle_impl.cpp3
-rw-r--r--src/mongo/db/ops/update_lifecycle_impl.h5
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mongo/db/ops/update_lifecycle_impl.cpp b/src/mongo/db/ops/update_lifecycle_impl.cpp
index ff8d76bc71d..511f1b59244 100644
--- a/src/mongo/db/ops/update_lifecycle_impl.cpp
+++ b/src/mongo/db/ops/update_lifecycle_impl.cpp
@@ -36,7 +36,6 @@
#include "mongo/db/catalog/collection.h"
#include "mongo/db/s/collection_metadata.h"
#include "mongo/db/s/sharding_state.h"
-#include "mongo/s/chunk_version.h"
namespace mongo {
@@ -74,7 +73,7 @@ const UpdateIndexData* UpdateLifecycleImpl::getIndexKeys(OperationContext* opCtx
}
const std::vector<FieldRef*>* UpdateLifecycleImpl::getImmutableFields() const {
- CollectionMetadataPtr metadata = getMetadata(_nsString);
+ std::shared_ptr<CollectionMetadata> metadata = getMetadata(_nsString);
if (metadata) {
const std::vector<FieldRef*>& fields = metadata->getKeyPatternFields();
// Return shard-keys as immutable for the update system.
diff --git a/src/mongo/db/ops/update_lifecycle_impl.h b/src/mongo/db/ops/update_lifecycle_impl.h
index d7e5616f4eb..da67a8f2f9d 100644
--- a/src/mongo/db/ops/update_lifecycle_impl.h
+++ b/src/mongo/db/ops/update_lifecycle_impl.h
@@ -58,9 +58,10 @@ public:
virtual const std::vector<FieldRef*>* getImmutableFields() const;
private:
- Collection* _collection;
const NamespaceString& _nsString;
- ChunkVersion _shardVersion;
+ const ChunkVersion _shardVersion;
+
+ Collection* _collection;
};
} /* namespace mongo */