SERVER-4494 Explain includes index version for 2dsphere and text stages.

3 files changed, 10 insertions, 4 deletions

diff --git a/src/mongo/db/exec/geo_near.cpp b/src/mongo/db/exec/geo_near.cpp
index c4ae337ab16..bfad1618b62 100644
--- a/src/mongo/db/exec/geo_near.cpp
+++ b/src/mongo/db/exec/geo_near.cpp
@@ -444,6 +444,7 @@ GeoNear2DStage::GeoNear2DStage(const GeoNearParams& nearParams,
       _boundsIncrement(0.0) {
     _specificStats.keyPattern = twoDIndex->keyPattern();
     _specificStats.indexName = twoDIndex->indexName();
+    _specificStats.indexVersion = twoDIndex->version();
 }
 
 
@@ -741,6 +742,7 @@ GeoNear2DSphereStage::GeoNear2DSphereStage(const GeoNearParams& nearParams,
       _boundsIncrement(0.0) {
     _specificStats.keyPattern = s2Index->keyPattern();
     _specificStats.indexName = s2Index->indexName();
+    _specificStats.indexVersion = s2Index->version();
     ExpressionParams::parse2dsphereParams(s2Index->infoObj(), &_indexParams);
 }
 
diff --git a/src/mongo/db/exec/plan_stats.h b/src/mongo/db/exec/plan_stats.h
index d65446338f2..01af3cd0198 100644
--- a/src/mongo/db/exec/plan_stats.h
+++ b/src/mongo/db/exec/plan_stats.h
@@ -551,9 +551,8 @@ struct IntervalStats {
     bool inclusiveMaxDistanceAllowed = false;
 };
 
-class NearStats : public SpecificStats {
-public:
-    NearStats() {}
+struct NearStats : public SpecificStats {
+    NearStats() : indexVersion(0) {}
 
     SpecificStats* clone() const final {
         return new NearStats(*this);
@@ -561,6 +560,8 @@ public:
 
     std::vector<IntervalStats> intervalStats;
     std::string indexName;
+    // btree index version, not geo index version
+    int indexVersion;
     BSONObj keyPattern;
 };
 
@@ -610,7 +611,7 @@ struct UpdateStats : public SpecificStats {
 };
 
 struct TextStats : public SpecificStats {
-    TextStats() : parsedTextQuery() {}
+    TextStats() : parsedTextQuery(), textIndexVersion(0) {}
 
     SpecificStats* clone() const final {
         TextStats* specific = new TextStats(*this);
@@ -622,6 +623,8 @@ struct TextStats : public SpecificStats {
     // Human-readable form of the FTSQuery associated with the text stage.
     BSONObj parsedTextQuery;
 
+    int textIndexVersion;
+
     // Index keys that precede the "text" index key.
     BSONObj indexPrefix;
 };
diff --git a/src/mongo/db/exec/text.cpp b/src/mongo/db/exec/text.cpp
index 295baa10b14..fdc53a11a25 100644
--- a/src/mongo/db/exec/text.cpp
+++ b/src/mongo/db/exec/text.cpp
@@ -64,6 +64,7 @@ TextStage::TextStage(OperationContext* txn,
     _specificStats.indexPrefix = _params.indexPrefix;
     _specificStats.indexName = _params.index->indexName();
     _specificStats.parsedTextQuery = _params.query.toBSON();
+    _specificStats.textIndexVersion = _params.index->infoObj()["textIndexVersion"].numberInt();
 }
 
 bool TextStage::isEOF() {