SERVER-8192 rewritten V1 btree key generation

Author: dstorch

jstests/core/insert_illegal_doc.js

@@ -8,19 +8,19 @@ var res;
 // test upsert
 res = coll.update({}, {_id: 1, a: [1, 2, 3], b: [4, 5, 6]}, true);
 assert.writeError(res);
-assert.eq(res.getWriteError().code, 10088);
+assert.eq(res.getWriteError().code, 17485);
 assert.eq(0, coll.find().itcount(), "should not be a doc");
 
 // test insert
 res = coll.insert({_id: 1, a: [1, 2, 3], b: [4, 5, 6]});
 assert.writeError(res);
-assert.eq(res.getWriteError().code, 10088);
+assert.eq(res.getWriteError().code, 17485);
 assert.eq(0, coll.find().itcount(), "should not be a doc");
 
 // test update
 res = coll.insert({_id: 1});
 assert.writeOK(res, "insert failed");
 res = coll.update({_id: 1}, {$set : { a : [1, 2, 3], b: [4, 5, 6]}});
 assert.writeError(res);
-assert.eq(res.getWriteError().code, 10088);
+assert.eq(res.getWriteError().code, 17485);
 assert.eq(undefined, coll.findOne().a, "update should have failed");

src/mongo/db/exec/sort.cpp

@@ -172,21 +172,9 @@ namespace mongo {
         BSONObjCmp patternCmp(_btreeObj);
         BSONObjSet keys(patternCmp);
 
-        try {
-            _keyGen->getKeys(memberObj, &keys);
-        }
-        catch (const UserException& e) {
-            // Probably a parallel array.
-            if (BtreeKeyGenerator::ParallelArraysCode == e.getCode()) {
-                return Status(ErrorCodes::BadValue,
-                              "cannot sort with keys that are parallel arrays");
-            }
-            else {
-                return e.toStatus();
-            }
-        }
-        catch (...) {
-            return Status(ErrorCodes::InternalError, "unknown error during sort key generation");
+        Status keygenStatus = _keyGen->getKeys(memberObj, &keys);
+        if (!keygenStatus.isOK()) {
+            return keygenStatus;
         }
 
         // Key generator isn't sparse so we should at least get an all-null key.

src/mongo/db/index/btree_access_method.cpp

@@ -66,7 +66,10 @@ namespace mongo {
     }
 
     void BtreeAccessMethod::getKeys(const BSONObj& obj, BSONObjSet* keys) {
-        _keyGenerator->getKeys(obj, keys);
+        Status s = _keyGenerator->getKeys(obj, keys);
+        if (!s.isOK()) {
+            uasserted(17485, s.toString());
+        }
     }
 
 }  // namespace mongo