summaryrefslogtreecommitdiff
path: root/src/mongo/db/exec/and_common.h
diff options
context:
space:
mode:
authorDavid Storch <david.storch@10gen.com>2019-07-19 18:30:33 -0400
committerDavid Storch <david.storch@10gen.com>2019-07-26 16:05:59 -0400
commit94fcb7d03e08014bb6a20ab010539811548d9e83 (patch)
treee44d2d923f59e0430645a13c3844f367cfa1bdb3 /src/mongo/db/exec/and_common.h
parentdc4db514a1ee737db0553f9535033453502b3ac7 (diff)
downloadmongo-94fcb7d03e08014bb6a20ab010539811548d9e83.tar.gz
SERVER-42288 Consolidate Document and WorkingSetMember metadata implementations.
Diffstat (limited to 'src/mongo/db/exec/and_common.h')
-rw-r--r--src/mongo/db/exec/and_common.h8
1 files changed, 1 insertions, 7 deletions
diff --git a/src/mongo/db/exec/and_common.h b/src/mongo/db/exec/and_common.h
index beb84e5751f..fe7a0573694 100644
--- a/src/mongo/db/exec/and_common.h
+++ b/src/mongo/db/exec/and_common.h
@@ -52,13 +52,7 @@ public:
verify(src.hasRecordId());
verify(dest->recordId == src.recordId);
- // Merge computed data.
- typedef WorkingSetComputedDataType WSCD;
- for (WSCD i = WSCD(0); i < WSM_COMPUTED_NUM_TYPES; i = WSCD(i + 1)) {
- if (!dest->hasComputed(i) && src.hasComputed(i)) {
- dest->addComputed(src.getComputed(i)->clone());
- }
- }
+ dest->metadata().mergeWith(src.metadata());
if (dest->hasObj()) {
// The merged WSM that we're creating already has the full document, so there's