Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'devel' of https://github.com/arangodb/arangodb into devel

This commit is contained in:
jsteemann 2017-03-23 12:18:36 +01:00
parent ed40426f09 66a8ea1538
commit e37ac1c4f8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arangod/Aql/CollectBlock.cpp
View File

@ -312,7 +312,7 @@ int SortedCollectBlock::getOrSkipSome(size_t atLeast, size_t atMost,
// we already had a group, check if the group has changed
size_t i = 0;
if (_pos > 0) {
if (_pos > 0 && !skipping) {
// re-use already copied AQLValues
for (auto& it : _groupRegisters) {
res->copyColValuesFromFirstRow(_pos, it.second);
@ -345,7 +345,7 @@ int SortedCollectBlock::getOrSkipSome(size_t atLeast, size_t atMost,
// increase output row count
++skipped;
if (skipped == atMost) {
if (skipped == atMost && !skipping) {
// output is full
// do NOT advance input pointer
result = res.release();

2
arangod/Cluster/ClusterMethods.cpp
View File

@ -50,7 +50,7 @@
using namespace arangodb::basics;
using namespace arangodb::rest;
static double const CL_DEFAULT_TIMEOUT = 90.0;
static double const CL_DEFAULT_TIMEOUT = 120.0;
namespace {
template<typename T>