SERVER-12175 Add 2dsphere index option "2dsphereIndexVersion"

- Defines version 1 and 2; both are supported.
- Indexes without this option are assumed to be version 1.
- New builds get version 2 (if version unspecified).
- Version 1 throws in getKeys if the geometry is one of the types
  introduced since 2.4.0 (MultiPoint, MultiLineString, MultiPolygon,
  GeometryCollection).

1 files changed, 6 insertions, 1 deletions

diff --git a/src/mongo/db/index_legacy.cpp b/src/mongo/db/index_legacy.cpp
index eb65e5861a2..4ff50a636e3 100644
--- a/src/mongo/db/index_legacy.cpp
+++ b/src/mongo/db/index_legacy.cpp
@@ -30,8 +30,9 @@
 
 #include "mongo/db/client.h"
 #include "mongo/db/fts/fts_spec.h"
-#include "mongo/db/index_names.h"
 #include "mongo/db/index/hash_access_method.h"
+#include "mongo/db/index/s2_access_method.h"
+#include "mongo/db/index_names.h"
 #include "mongo/db/jsobj.h"
 #include "mongo/db/structure/catalog/namespace_details.h"
 
@@ -45,6 +46,10 @@ namespace mongo {
             return fts::FTSSpec::fixSpec(obj);
         }
 
+        if (IndexNames::GEO_2DSPHERE == pluginName) {
+            return S2AccessMethod::fixSpec(obj);
+        }
+
         return obj;
     }