SERVER-11531, SERVER-10489, SERVER-6835, SERVER-4830: Refactor update system to support immutable fields, consolodate storage validation, and misc issues.

1 files changed, 29 insertions, 0 deletions

diff --git a/src/mongo/db/field_ref_set.cpp b/src/mongo/db/field_ref_set.cpp
index c1a3c79cff5..64c5e178b7a 100644
--- a/src/mongo/db/field_ref_set.cpp
+++ b/src/mongo/db/field_ref_set.cpp
@@ -29,9 +29,12 @@
 #include "mongo/db/field_ref_set.h"
 
 #include "mongo/util/assert_util.h"
+#include "mongo/util/mongoutils/str.h"
 
 namespace mongo {
 
+    namespace str = mongoutils::str;
+
     namespace {
 
         // For legacy purposes, we must handle empty fieldnames, which FieldRef clearly
@@ -78,6 +81,19 @@ namespace mongo {
         }
     }
 
+    void FieldRefSet::keepShortest(const FieldRef* toInsert) {
+        const FieldRef* conflict;
+        if ( !insert(toInsert, &conflict) && (toInsert->numParts() < (conflict->numParts()))) {
+            _fieldSet.erase(conflict);
+           keepShortest(toInsert);
+        }
+    }
+
+    void FieldRefSet::fillFrom(const std::vector<FieldRef*>& fields) {
+        dassert(_fieldSet.empty());
+        _fieldSet.insert(fields.begin(), fields.end());
+    }
+
     bool FieldRefSet::insert(const FieldRef* toInsert, const FieldRef** conflict) {
 
         // We can determine if two fields conflict by checking their common prefix.
@@ -118,4 +134,17 @@ namespace mongo {
         return true;
     }
 
+    const std::string FieldRefSet::toString() const {
+        str::stream res;
+        res << "Fields:[ ";
+        FieldRefSet::const_iterator where = _fieldSet.begin();
+        const FieldRefSet::const_iterator end = _fieldSet.end();
+        for( ; where != end; ++where ) {
+            const FieldRef& current = **where;
+            res << current.dottedField() << ",";
+        }
+        res << "]";
+        return res;
+    }
+
 } // namespace mongo