Bug fix 3.6/issue 11275 (#11298)

jsteemann · KVS85 · web-flow · commit 5b5b929e2530 · 2020-03-19T13:11:52.000+03:00
* fixed issue #11275 * added test, fixed it Co-authored-by: KVS85 <vadim@arangodb.com>
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,8 @@
 v3.6.3 (XXXX-XX-XX)
 -------------------
 
+* Fixed issue #11275: indexes backward compatibility broken in 3.5+.
+
 * Fix an endless loop in FollowerInfo::persistInAgency which could trigger a
   hanger if a collection was dropped at the wrong time.
 
diff --git a/arangod/RocksDBEngine/RocksDBVPackIndex.cpp b/arangod/RocksDBEngine/RocksDBVPackIndex.cpp
@@ -749,12 +749,23 @@ namespace {
                        std::vector<arangodb::basics::AttributeName>::const_iterator begin,
                        std::vector<arangodb::basics::AttributeName>::const_iterator end) {
     for (; begin != end; ++begin) {
+      // check if, after fetching the subattribute, we are point to a non-object.
+      // e.g. if the index is on field ["a.b"], the first iteration of this loop
+      // will look for subattribute "a" in the original document. this will always
+      // work. however, when looking for "b", we have to make sure that "a" was
+      // an object. otherwise we must not call Slice::get() on it. In case one of
+      // the subattributes we found so far is not an object, we fall back to the
+      // regular comparison
+      if (!first.isObject() || !second.isObject()) {
+        break;
+      }
+
       // fetch subattribute
       first = first.get(begin->name);
-      second = second.get(begin->name);
       if (first.isExternal()) {
         first = first.resolveExternal();
       }
+      second = second.get(begin->name);
       if (second.isExternal()) {
         second = second.resolveExternal();
       }
diff --git a/tests/js/common/shell/shell-hash-index.js b/tests/js/common/shell/shell-hash-index.js
@@ -1,5 +1,5 @@
 /*jshint globalstrict:false, strict:false */
-/*global fail, assertEqual, assertTrue, assertFalse, assertNotEqual */
+/*global fail, assertEqual, assertTrue, assertFalse, assertNull, assertNotEqual */
 
 ////////////////////////////////////////////////////////////////////////////////
 /// @brief test the hash index
@@ -604,7 +604,25 @@ function HashIndexSuite() {
         }
         i *= 2;
       }
-    }
+    },
+
+    testUniqueIndexNullSubattribute : function () {
+      let idx = collection.ensureIndex({ type: "hash", unique: true, fields: ["a.b"] });
+
+      assertEqual("hash", idx.type);
+      assertEqual(true, idx.unique);
+      assertEqual(["a.b"], idx.fields);
+      assertEqual(true, idx.isNewlyCreated);
+
+      // as "a" is null here, "a.b" should also be null, at least it should not fail when accessing it via the index
+      collection.insert({ _key: "test", a : null });
+      collection.update("test", { something: "test2" });
+
+      let doc = collection.document("test");
+      assertNull(doc.a);
+      assertEqual("test2", doc.something);
+    },
+
   };
 }
 
