Fixing crashes on UPDATE / INSERT queries (#6207)

arangod/Aql/QueryCursor.cpp

@@ -319,16 +319,19 @@ Result QueryStreamCursor::writeResult(VPackBuilder &builder) {
     while(rowsWritten < batchSize() && !_queryResults.empty()) {
       std::unique_ptr<AqlItemBlock>& block = _queryResults.front();
       TRI_ASSERT(_queryResultPos < block->size());
-      AqlValue const& value
-        = block->getValueReference(_queryResultPos, resultRegister);
-
-      TRI_ASSERT(!value.isEmpty());
-      value.toVelocyPack(_query->trx(), builder, false);
-      ++rowsWritten;
-      ++_queryResultPos;
-
-      // get next block
+      
+      while (rowsWritten < batchSize() && _queryResultPos < block->size()) {
+        AqlValue const& value = block->getValueReference(_queryResultPos, resultRegister);
+        if (!value.isEmpty()) {
+          value.toVelocyPack(_query->trx(), builder, false);
+          ++rowsWritten;
+        }
+        ++_queryResultPos;
+      }
+      
       if (_queryResultPos == block->size()) {
+        // get next block
+        TRI_ASSERT(_queryResultPos == block->size());
         engine->_itemBlockManager.returnBlock(std::move(block));
         _queryResults.pop_front();
         _queryResultPos = 0;

arangod/Utils/Cursor.h

@@ -65,17 +65,17 @@ class Cursor {
  public:
   CursorId id() const { return _id; }
 
-  size_t batchSize() const { return _batchSize; }
+  inline size_t batchSize() const { return _batchSize; }
 
-  bool hasCount() const { return _hasCount; }
+  inline bool hasCount() const { return _hasCount; }
 
-  double ttl() const { return _ttl; }
+  inline double ttl() const { return _ttl; }
 
-  double expires() const { return _expires; }
+  inline double expires() const { return _expires; }
 
-  bool isUsed() const { return _isUsed; }
+  inline bool isUsed() const { return _isUsed; }
 
-  bool isDeleted() const { return _isDeleted; }
+  inline bool isDeleted() const { return _isDeleted; }
 
   void deleted() { _isDeleted = true; }
 

js/client/tests/shell/shell-query-stream.js

@@ -0,0 +1,106 @@
+/*jshint globalstrict:false, strict:false, maxlen:1000*/
+/*global assertEqual, assertTrue, assertFalse, fail, more */
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test the statement class
+///
+/// @file
+///
+/// DISCLAIMER
+///
+/// Copyright 2010-2012 triagens GmbH, Cologne, Germany
+///
+/// Licensed under the Apache License, Version 2.0 (the "License");
+/// you may not use this file except in compliance with the License.
+/// You may obtain a copy of the License at
+///
+///     http://www.apache.org/licenses/LICENSE-2.0
+///
+/// Unless required by applicable law or agreed to in writing, software
+/// distributed under the License is distributed on an "AS IS" BASIS,
+/// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+/// See the License for the specific language governing permissions and
+/// limitations under the License.
+///
+/// Copyright holder is triAGENS GmbH, Cologne, Germany
+///
+/// @author Jan Steemann
+/// @author Copyright 2012, triAGENS GmbH, Cologne, Germany
+////////////////////////////////////////////////////////////////////////////////
+
+const jsunity = require("jsunity");
+
+const arangodb = require("@arangodb");
+const db = arangodb.db;
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test suite: stream cursors
+////////////////////////////////////////////////////////////////////////////////
+
+function StreamCursorSuite () {
+  'use strict';
+
+  const cn = "StreamCursorCollection";
+  let c = null;
+  const queries = [
+    `FOR doc IN ${cn} RETURN doc`,
+    `FOR doc IN ${cn} FILTER doc.value1 == 1 UPDATE doc WITH { value1: 1 } INTO ${cn}`,
+    `FOR doc IN ${cn} FILTER doc.value1 == 1 REPLACE doc WITH { value1: 2 } INTO ${cn}`,
+    `FOR doc IN ${cn} FILTER doc.value1 == 2 INSERT { value2: doc.value1 } INTO ${cn}`,
+    `FOR doc IN ${cn} FILTER doc.value1 == 2 INSERT { value2: doc.value1 } INTO ${cn}`,
+    `FOR doc IN ${cn} FILTER doc.value3 >= 4 RETURN doc`,
+    `FOR doc IN ${cn} COLLECT a = doc.value1 INTO groups = doc RETURN { val: a, doc: groups }`
+  ];
+
+  return {
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief set up
+////////////////////////////////////////////////////////////////////////////////
+
+    setUp : function () {
+      c = db._create(cn);
+      c.ensureIndex({ type: 'skiplist', fields: ["value1"]});
+      c.ensureIndex({ type: 'skiplist', fields: ["value2"]});
+
+      for (let i = 0; i < 5000; i++) {
+        c.insert({value1: i % 10, value2: i % 25 , value3: i % 25 });
+      }
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief tear down
+////////////////////////////////////////////////////////////////////////////////
+
+    tearDown : function () {
+      c.drop();
+    },
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief test cursor
+////////////////////////////////////////////////////////////////////////////////
+
+    testQueries : function () {
+      queries.forEach(q => {
+        var stmt = db._createStatement({ query: q,
+          options: { stream: true },
+          batchSize: 1000});
+        var cursor = stmt.execute();
+
+        assertEqual(undefined, cursor.count());
+        while (cursor.hasNext()) {
+          cursor.next();
+        }
+      });      
+    }
+
+  };
+}
+
+////////////////////////////////////////////////////////////////////////////////
+/// @brief executes the test suite
+////////////////////////////////////////////////////////////////////////////////
+
+jsunity.run(StreamCursorSuite);
+return jsunity.done();
+