chedck for indexes on $inc updates. disallow the update then for now …

…-- but will eventually allow and just update the index
mongodb · Aug 28, 2008 · 5bd0db4 · 5bd0db4
1 parent d434796
commit 5bd0db4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/db/jsobj.h b/db/jsobj.h
@@ -223,6 +223,8 @@ class JSObj {
 	string toString() const;
 	/* note: addFields always adds _id even if not specified */
 	int addFields(JSObj& from, set<string>& fields); /* returns n added */
+
+    /* adds the field names to the fields set.  does NOT clear it (appends). */
 	int getFieldNames(set<string>& fields);
 
 	/* return has eoo() true if no match 

diff --git a/db/namespace.cpp b/db/namespace.cpp
@@ -1,4 +1,4 @@
-//namespacedetails.cpp
+// namespacedetails.cpp
 
 /**
 *    Copyright (C) 2008 10gen Inc.
@@ -313,7 +313,11 @@ NamespaceDetailsTransient& NamespaceDetailsTransient::get(const char *ns) {
 
 void NamespaceDetailsTransient::computeIndexKeys() {
 	NamespaceDetails *d = nsdetails(ns.c_str());
-//FINISH
+    for( int i = 0; i < d->nIndexes; i++ ) {
+//        set<string> fields;
+        d->indexes[i].key().getFieldNames(allIndexKeys);
+//        allIndexKeys.insert(fields.begin(),fields.end());
+    }
 }
 
 /* ------------------------------------------------------------------------- */
@@ -323,7 +327,7 @@ void NamespaceDetailsTransient::computeIndexKeys() {
 */
 void addNewNamespaceToCatalog(const char *ns, JSObj *options = 0) {
 	log() << "New namespace: " << ns << endl;
-	if( strstr(ns, "system.namespaces") ) { 
+	if( strstr(ns, "system.namespaces``") ) { 
 		// system.namespaces holds all the others, so it is not explicitly listed in the catalog.
 		// TODO: fix above should not be strstr!
 		return;

diff --git a/db/namespace.h b/db/namespace.h
@@ -79,6 +79,13 @@ class IndexDetails {
 	*/
 	void getKeysFromObject(JSObj& obj, set<JSObj>& keys);
 
+    /* get the key pattern for this object. 
+       e.g., { lastname:1, firstname:1 }
+    */
+    JSObj key() { 
+        return info.obj().getObjectField("key");
+    }
+
     // returns name of this index's storage area
 	// client.table.$index
 	string indexNamespace() { 
@@ -216,15 +223,12 @@ class NamespaceDetailsTransient : boost::noncopyable {
 	/* get set of index keys for this namespace.  handy to quickly check if a given 
 	   field is indexed (Note it might be a seconary component of a compound index.) 
 	*/
-
-//TODO USE THIS IN $INC
-
-	set<string>& indexKeys() { 
-		if( !haveIndexKeys ) { computeIndexKeys(); haveIndexKeys=true; }
+	set<string>& indexKeys() {
+		if( !haveIndexKeys ) { haveIndexKeys=true; computeIndexKeys(); }
 		return allIndexKeys;
 	}
 
-	void addedIndex() { haveIndexKeys=false; }
+    void addedIndex() { haveIndexKeys=false; }
 private:
 	static map<const char *,NamespaceDetailsTransient*> map;
 public:

diff --git a/db/query.cpp b/db/query.cpp
@@ -358,6 +358,14 @@ int _updateObjects(const char *ns, JSObj updateobj, JSObj pattern, bool upsert,
 				if( firstField[0] == '$' ) {
 					vector<Mod> mods;
 					Mod::getMods(mods, updateobj);
+                    NamespaceDetailsTransient& ndt = NamespaceDetailsTransient::get(ns);
+                    set<string>& idxKeys = ndt.indexKeys();
+                    for( vector<Mod>::iterator i = mods.begin(); i != mods.end(); i++ ) { 
+                        if( idxKeys.count(i->fieldName) ) {
+                            assert(false);
+                        }
+                    }
+
 					Mod::applyMods(mods, c->currLoc().obj());
 					if( profile ) 
 						ss << " fastmod ";