Skip to content

Commit 7e3d22d

Browse files
committed
Fix issues found in meeting
1 parent e2a134e commit 7e3d22d

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

src/mongo/db/commands/pipeline_d.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ namespace mongo {
6868
status = (*pSources)[i]->getDependencies(deps);
6969
}
7070

71-
if (status == DocumentSource::EXAUSTIVE) {
71+
if (status == DocumentSource::EXHAUSTIVE) {
7272
projection = DocumentSource::depsToProjection(deps);
7373
}
7474
}

src/mongo/db/pipeline/document_source.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,10 @@ namespace mongo {
8787
*/
8888
virtual bool advance();
8989

90-
/**
91-
Advance the source, and return the next Expression.
92-
93-
@returns the current Document
94-
TODO throws an exception if there are no more expressions to return.
95-
*/
90+
/** @returns the current Document without advancing.
91+
*
92+
* some implementations do the equivalent of verify(!eof()) so check eof() first
93+
*/
9694
virtual intrusive_ptr<Document> getCurrent() = 0;
9795

9896
/**
@@ -159,11 +157,11 @@ namespace mongo {
159157

160158
enum GetDepsReturn {
161159
NOT_SUPPORTED, // This means the set should be ignored
162-
EXAUSTIVE, // This means that everything needed should be in the set
160+
EXHAUSTIVE, // This means that everything needed should be in the set
163161
SEE_NEXT, // Add the next Source's deps to the set
164162
};
165163

166-
/** Get the fields this operation needs to do it's job.
164+
/** Get the fields this operation needs to do its job.
167165
* Deps should be in "a.b.c" notation
168166
*
169167
* @param deps results are added here. NOT CLEARED

src/mongo/db/pipeline/document_source_group.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ namespace mongo {
9797
pA->addDependencies(deps);
9898
}
9999

100-
return EXAUSTIVE;
100+
return EXHAUSTIVE;
101101
}
102102

103103
intrusive_ptr<DocumentSourceGroup> DocumentSourceGroup::create(

src/mongo/db/pipeline/document_source_project.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,6 @@ namespace mongo {
143143
DocumentSource::GetDepsReturn DocumentSourceProject::getDependencies(set<string>& deps) const {
144144
vector<string> path; // empty == top-level
145145
pEO->addDependencies(deps, &path);
146-
return EXAUSTIVE;
146+
return EXHAUSTIVE;
147147
}
148148
}

0 commit comments

Comments
 (0)