Attachment #538162 for bug #625158

Lines 74-80 Link Here

(-)tokumx-enterprise-2.0.2.ORIG/src/mongo/db/client_load.cpp (-1 / +1 lines)
74	}	74	}
75		75
76	bool Client::loadInProgress() const {	76	bool Client::loadInProgress() const {
77	return _loadInfo;	77	return bool(_loadInfo);
78	}	78	}
79		79
80	} // namespace mongo	80	} // namespace mongo

Lines 66-72 Link Here

(-)tokumx-enterprise-2.0.2.ORIG/src/mongo/db/collection_map.h (-1 / +1 lines)
66	// which must succeed, by the first invariant.	66	// which must succeed, by the first invariant.
67	Collection *getCollection(const StringData &ns);	67	Collection *getCollection(const StringData &ns);
68		68
69	bool allocated() const { return _metadb; }	69	bool allocated() const { return bool(_metadb); }
70		70
71	void getNamespaces( list<string>& tofill );	71	void getNamespaces( list<string>& tofill );
72		72

Lines 635-641 Link Here

(-)tokumx-enterprise-2.0.2.ORIG/src/mongo/db/ops/query.cpp (-1 / +1 lines)
635	shared_ptr<ExplainRecordingStrategy> ret	635	shared_ptr<ExplainRecordingStrategy> ret
636	( new SimpleCursorExplainStrategy( ancillaryInfo, _cursor ) );	636	( new SimpleCursorExplainStrategy( ancillaryInfo, _cursor ) );
637	ret->notePlan( queryPlan.valid() && queryPlan.scanAndOrderRequired,	637	ret->notePlan( queryPlan.valid() && queryPlan.scanAndOrderRequired,
638	queryPlan.keyFieldsOnly );	638	bool(queryPlan.keyFieldsOnly) );
639	return ret;	639	return ret;
640	}	640	}
641		641

Lines 106-112 Link Here

(-)tokumx-enterprise-2.0.2.ORIG/src/mongo/db/pipeline/document_source_sort.cpp (-1 / +1 lines)
106	bool DocumentSourceSort::coalesce(const intrusive_ptr<DocumentSource> &pNextSource) {	106	bool DocumentSourceSort::coalesce(const intrusive_ptr<DocumentSource> &pNextSource) {
107	if (!limitSrc) {	107	if (!limitSrc) {
108	limitSrc = dynamic_cast<DocumentSourceLimit*>(pNextSource.get());	108	limitSrc = dynamic_cast<DocumentSourceLimit*>(pNextSource.get());
109	return limitSrc; // false if next is not a $limit	109	return bool(limitSrc); // false if next is not a $limit
110	}	110	}
111	else {	111	else {
112	return limitSrc->coalesce(pNextSource);	112	return limitSrc->coalesce(pNextSource);

Lines 370-376 Link Here

(-)tokumx-enterprise-2.0.2.ORIG/src/mongo/db/queryoptimizercursorimpl.cpp (-1 / +1 lines)
370		370
371	// The query plan must have a matcher. The matcher's constructor performs some aspects	371	// The query plan must have a matcher. The matcher's constructor performs some aspects
372	// of query validation that should occur before a cursor is returned.	372	// of query validation that should occur before a cursor is returned.
373	fassert( 16449, singlePlan->matcher() );	373	fassert( 16449, bool(singlePlan->matcher()) );
374		374
375	if ( needMatcher ) {	375	if ( needMatcher ) {
376	single->setMatcher( singlePlan->matcher() );	376	single->setMatcher( singlePlan->matcher() );




        // The query plan must have a matcher.  The matcher's constructor performs some aspects
        // of query validation that should occur as part of this class's init() if not handled
        // already.
        fassert( 16249, bool(queryPlan().matcher()) );
        
        // TODO This violates the current Cursor interface abstraction, but for now it's simpler to keep our own set of
        // dups rather than avoid poisoning the cursor's dup set with unreturned documents.  Deduping documents

        _explainPlanInfo.reset( new ExplainPlanInfo() );
        _explainPlanInfo->notePlan( *_c,
                                    queryPlan().scanAndOrderRequired(),
                                    bool(queryPlan().keyFieldsOnly()) );
        return _explainPlanInfo;
    }


                _explainPlanInfo.reset( new ExplainPlanInfo() );
                _explainPlanInfo->notePlan( *_c,
                                            _queryPlan->scanAndOrderRequired(),
                                           bool(_queryPlan->keyFieldsOnly()) );
                shared_ptr<ExplainClauseInfo> clauseInfo( new ExplainClauseInfo() );
                clauseInfo->addPlanInfo( _explainPlanInfo );
                _mps->addClauseInfo( clauseInfo );

Lines 35-41 Link Here

(-)tokumx-enterprise-2.0.2.ORIG/src/mongo/db/query_plan_summary.h (-1 / +1 lines)
35	* The 'fieldRangeMulti' attribute is required, and its presence indicates the object has	35	* The 'fieldRangeMulti' attribute is required, and its presence indicates the object has
36	* been configured with a query plan.	36	* been configured with a query plan.
37	*/	37	*/
38	bool valid() const { return fieldRangeSetMulti; }	38	bool valid() const { return bool(fieldRangeSetMulti); }
39		39
40	// A description of the valid values for the fields of a query, in the context of a multikey	40	// A description of the valid values for the fields of a query, in the context of a multikey
41	// index or in memory sort.	41	// index or in memory sort.

Return to bug 625158