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

Merge branch 'bug-fix-3.4/gharial-return-name' of ssh://github.com/arangodb/ArangoDB into bug-fix-3.4/gharial-return-name

This commit is contained in:
Michael Hackstein 2019-11-26 13:25:47 +01:00
parent ff88189ce1 a3a5159127
commit b8b98b6358
5 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -5,6 +5,8 @@ v3.4.9 (XXXX-XX-XX)
This is a consistency fix within the API as all other APIs include the name.
As a work around the returned _key can be used, which is identical to the name.
* Updated arangosync to 0.7.0.
* Make the timeouts for replication requests (for active failover and master-slave
replication configurable via startup options:

2
VERSIONS
View File

@ -1,5 +1,5 @@
STARTER_REV "0.14.12"
SYNCER_REV "0.6.5"
SYNCER_REV "0.7.0"
OPENSSL_LINUX "1.1.0l"
OPENSSL_MACOS "1.0.2t"
OPENSSL_WINDOWS "1.1.0l"

1
arangod/MMFiles/MMFilesHashIndex.cpp
View File

@ -52,6 +52,7 @@ MMFilesHashIndexLookupBuilder::MMFilesHashIndexLookupBuilder(
: _builder(trx),
_usesIn(false),
_isEmpty(false),
_mappingFieldConditionArena(),
_mappingFieldCondition{_mappingFieldConditionArena},
_inStorage(trx) {
TRI_ASSERT(node->type == aql::NODE_TYPE_OPERATOR_NARY_AND);

6
arangod/MMFiles/MMFilesHashIndex.h
View File

@ -179,8 +179,10 @@ class MMFilesHashIndexLookupBuilder {
bool _isEmpty;
size_t _coveredFields;
SmallVector<arangodb::aql::AstNode const*> _mappingFieldCondition;
SmallVector<arangodb::aql::AstNode const*>::allocator_type::arena_type _mappingFieldConditionArena;
using MappingCondition =
SmallVector<arangodb::aql::AstNode const*>;
MappingCondition::allocator_type::arena_type _mappingFieldConditionArena;
MappingCondition _mappingFieldCondition;
std::unordered_map<size_t, std::pair<size_t, std::vector<arangodb::velocypack::Slice>>> _inPosition;
transaction::BuilderLeaser _inStorage;

5
arangod/MMFiles/MMFilesPrimaryIndex.cpp
View File

@ -21,8 +21,11 @@
/// @author Dr. Frank Celler
////////////////////////////////////////////////////////////////////////////////
#include <algorithm>
#include "MMFilesPrimaryIndex.h"
#include "Aql/AstNode.h"
#include "Aql/ExecutionBlock.h"
#include "Basics/Exceptions.h"
#include "Basics/StaticStrings.h"
#include "Basics/hashes.h"
@ -162,7 +165,7 @@ bool MMFilesAllIndexIterator::next(LocalDocumentIdCallback const& cb, size_t lim
bool MMFilesAllIndexIterator::nextDocument(DocumentCallback const& cb, size_t limit) {
_documentIds.clear();
_documentIds.reserve(limit);
_documentIds.reserve((std::min)(limit, aql::ExecutionBlock::DefaultBatchSize()));
bool done = false;
while (limit > 0) {