Properly compare velocypack objects in Agency operations (arangodb#6924)

graetzer · jsteemann · commit 4359d98b9d98 · 2018-10-23T11:52:14.000+02:00
diff --git a/arangod/Agency/Node.cpp b/arangod/Agency/Node.cpp
@@ -539,8 +539,9 @@ template <> bool Node::handle<ERASE>(VPackSlice const& slice) {
 
     if (this->slice().isArray()) {
       if (haveVal) {
+        VPackSlice valToErase = slice.get("val");
         for (auto const& old : VPackArrayIterator(this->slice())) {
-          if (old != slice.get("val")) {
+          if (VelocyPackHelper::compare(old, valToErase, /*useUTF8*/true) != 0) {
             tmp.add(old);
           }
         }
@@ -581,8 +582,13 @@ bool Node::handle<REPLACE>(VPackSlice const& slice) {
   Builder tmp;
   { VPackArrayBuilder t(&tmp);
     if (this->slice().isArray()) {
+      VPackSlice valToRepl = slice.get("val");
       for (auto const& old : VPackArrayIterator(this->slice())) {
-        tmp.add(old == slice.get("val") ? slice.get("new") : old);
+        if (VelocyPackHelper::compare(old, valToRepl, /*useUTF8*/true) == 0) {
+          tmp.add(slice.get("new"));
+        } else {
+          tmp.add(old);
+        }
       }
     }
   }
diff --git a/arangod/Cluster/ClusterInfo.cpp b/arangod/Cluster/ClusterInfo.cpp
@@ -2013,8 +2013,7 @@ int ClusterInfo::ensureIndexCoordinatorWithoutRollback(
               errorMsg = "Error during index creation: " + errorMsg;
 
               // Returns the specific error number if set, or the general
-              // error
-              // otherwise
+              // error otherwise
               *dbServerResult =
                   arangodb::basics::VelocyPackHelper::getNumericValue<int>(
                       v, "errorNum", TRI_ERROR_ARANGO_INDEX_CREATION_FAILED);

Original file line number	Diff line number	Diff line change
`@@ -539,8 +539,9 @@ template <> bool Node::handle<ERASE>(VPackSlice const& slice) {`
`539`	`539`
`540`	`540`	`if (this->slice().isArray()) {`
`541`	`541`	`if (haveVal) {`
	`542`	`+ VPackSlice valToErase = slice.get("val");`
`542`	`543`	`for (auto const& old : VPackArrayIterator(this->slice())) {`
`543`		`- if (old != slice.get("val")) {`
	`544`	`+ if (VelocyPackHelper::compare(old, valToErase, /useUTF8/true) != 0) {`
`544`	`545`	`tmp.add(old);`
`545`	`546`	`}`
`546`	`547`	`}`
`@@ -581,8 +582,13 @@ bool Node::handle<REPLACE>(VPackSlice const& slice) {`
`581`	`582`	`Builder tmp;`
`582`	`583`	`{ VPackArrayBuilder t(&tmp);`
`583`	`584`	`if (this->slice().isArray()) {`
	`585`	`+ VPackSlice valToRepl = slice.get("val");`
`584`	`586`	`for (auto const& old : VPackArrayIterator(this->slice())) {`
`585`		`- tmp.add(old == slice.get("val") ? slice.get("new") : old);`
	`587`	`+ if (VelocyPackHelper::compare(old, valToRepl, /useUTF8/true) == 0) {`
	`588`	`+ tmp.add(slice.get("new"));`
	`589`	`+ } else {`
	`590`	`+ tmp.add(old);`
	`591`	`+ }`
`586`	`592`	`}`
`587`	`593`	`}`
`588`	`594`	`}`