summaryrefslogtreecommitdiff
path: root/src/mongo/db/index
diff options
context:
space:
mode:
authorADAM David Alan Martin <adam.martin@10gen.com>2017-03-28 13:15:16 -0400
committerADAM David Alan Martin <adam.martin@10gen.com>2017-03-28 13:15:16 -0400
commit8a988f7dfee2eaba686043cee9d7bca3366e0e8e (patch)
tree9010cfa47d3e77ce7da4c1b0b6f13c83a4e580c8 /src/mongo/db/index
parent00ee4f5156348477b9dd3f71b747104794f766c0 (diff)
downloadmongo-8a988f7dfee2eaba686043cee9d7bca3366e0e8e.tar.gz
SERVER-28025 Sever `index_access_method`'s catalog dependency.
Slice this dependency by inserting an `IndexCatalogEntry` proxy class with a pure vtable, and exposing an inline version of `Collection::docFor`.
Diffstat (limited to 'src/mongo/db/index')
-rw-r--r--src/mongo/db/index/SConscript1
-rw-r--r--src/mongo/db/index/index_descriptor.h2
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mongo/db/index/SConscript b/src/mongo/db/index/SConscript
index f651ec3f57f..545ee2720c8 100644
--- a/src/mongo/db/index/SConscript
+++ b/src/mongo/db/index/SConscript
@@ -93,6 +93,7 @@ serveronlyEnv.Library(
],
LIBDEPS=[
'$BUILD_DIR/mongo/base',
+ '$BUILD_DIR/mongo/db/catalog/index_catalog_entry',
'$BUILD_DIR/mongo/db/concurrency/write_conflict_exception',
'$BUILD_DIR/mongo/db/storage/storage_options',
'$BUILD_DIR/mongo/db/storage/mmap_v1/btree',
diff --git a/src/mongo/db/index/index_descriptor.h b/src/mongo/db/index/index_descriptor.h
index ec7e13026d0..c0d4a4301f9 100644
--- a/src/mongo/db/index/index_descriptor.h
+++ b/src/mongo/db/index/index_descriptor.h
@@ -298,7 +298,7 @@ private:
IndexCatalogEntry* _cachedEntry;
friend class IndexCatalog;
- friend class IndexCatalogEntry;
+ friend class IndexCatalogEntryImpl;
friend class IndexCatalogEntryContainer;
};