8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into eng… · sleepycat/arangodb@fae1f7b · GitHub
[go: up one dir, main page]
Skip to content

Commit fae1f7b

Browse files
jsteemannjsteemann
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2 parents e970976 + 25fcfca commit fae1f7b

25 files changed

+308
-55
lines changed

‎README_maintainers.md

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -425,6 +425,9 @@ Dependencies to build documentation:
425425
426426
npm install gitbook-cli -g
427427
428+
- [ditaa (DIagrams Through Ascii Art)](http://ditaa.sourceforge.net/) to build the
429+
ascii art diagrams (optional)
430+
428431
- Calibre2 (optional, only required if you want to build the e-book version)
429432
430433
http://calibre-ebook.com/download
@@ -807,9 +810,9 @@ Deploying a locally changed version
807810
808811
Create local docker images using the following repositories:
809812
810-
https://github.com/arangodb/arangodb-docker
811-
https://github.com/arangodb/arangodb-mesos-docker
812-
https://github.com/arangodb/arangodb-mesos-framework
813+
- https://github.com/arangodb/arangodb-docker
814+
- https://github.com/arangodb/arangodb-mesos-docker
815+
- https://github.com/arangodb/arangodb-mesos-framework
813816
814817
Then adjust the docker images in the config (`arangodb3.json`) and redeploy it using the curl command above.
815818

‎arangod/Aql/Ast.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
#include <velocypack/Slice.h>
4040
#include <velocypack/velocypack-aliases.h>
4141

42+
using namespace arangodb;
4243
using namespace arangodb::aql;
4344

4445
/// @brief initialize a singleton no-op node instance

‎arangod/Aql/BlockCollector.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ BlockCollector::~BlockCollector() { clear(); }
3636

3737
size_t BlockCollector::totalSize() const { return _totalSize; }
3838

39-
size_t BlockCollector::nrRegs() const {
39+
RegisterId BlockCollector::nrRegs() const {
4040
TRI_ASSERT(_totalSize > 0);
4141
TRI_ASSERT(!_blocks.empty());
4242
return _blocks[0]->getNrRegs();

‎arangod/Aql/BlockCollector.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,12 @@
2525
#define ARANGOD_AQL_BLOCK_COLLECTOR_H 1
2626

2727
#include "Basics/Common.h"
28+
#include "Aql/types.h"
2829

2930
namespace arangodb {
3031
namespace aql {
3132
class AqlItemBlock;
32-
class ResourceMonitor;
33+
struct ResourceMonitor;
3334

3435
class BlockCollector {
3536
friend class AqlItemBlock;
@@ -42,7 +43,7 @@ class BlockCollector {
4243
~BlockCollector();
4344

4445
size_t totalSize() const;
45-
size_t nrRegs() const;
46+
RegisterId nrRegs() const;
4647

4748
void clear();
4849

‎arangod/Aql/Collections.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
#include "Aql/Collection.h"
2626
#include "Basics/Exceptions.h"
2727

28+
using namespace arangodb;
2829
using namespace arangodb::aql;
2930

3031
Collections::Collections(TRI_vocbase_t* vocbase)

‎arangod/Aql/EnumerateCollectionBlock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ int EnumerateCollectionBlock::initialize() {
123123
auto dbName = logicalCollection->dbName();
124124
auto collectionInfoCurrent = ClusterInfo::instance()->getCollectionCurrent(dbName, std::to_string(cid));
125125

126-
double maxWait = _engine->getQuery()->getNumericOption("satelliteSyncWait", 60.0);
126+
double maxWait = _engine->getQuery()->getNumericOption<double>("satelliteSyncWait", 60.0);
127127
bool inSync = false;
128128
unsigned long waitInterval = 10000;
129129
double startTime = TRI_microtime();

‎arangod/Aql/ExecutionBlock.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ ExecutionBlock::ExecutionBlock(ExecutionEngine* engine, ExecutionNode const* ep)
3737
_exeNode(ep),
3838
_pos(0),
3939
_done(false),
40-
_tracing(engine->getQuery()->getNumericOption("tracing", 0)) {}
40+
_tracing(engine->getQuery()->getNumericOption<double>("tracing", 0.0)) {}
4141

4242
ExecutionBlock::~ExecutionBlock() {
4343
for (auto& it : _buffer) {

‎arangod/Aql/ExecutionEngine.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -565,9 +565,9 @@ struct CoordinatorInstanciator : public WalkerWorker<ExecutionNode> {
565565
result.add(VPackValue("-all"));
566566
result.close(); // options.optimizer.rules
567567
result.close(); // options.optimizer
568-
double tracing = query->getNumericOption("tracing", 0);
568+
double tracing = query->getNumericOption<double>("tracing", 0.0);
569569
result.add("tracing", VPackValue(tracing));
570-
double satelliteSyncWait = query->getNumericOption("satelliteSyncWait", 60.0);
570+
double satelliteSyncWait = query->getNumericOption<double>("satelliteSyncWait", 60.0);
571571
result.add("satelliteSyncWait", VPackValue(satelliteSyncWait));
572572
result.close(); // options
573573

‎arangod/Aql/Expression.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -869,8 +869,8 @@ AqlValue Expression::executeSimpleExpressionFCall(
869869
VPackFunctionParameters parameters{arena};
870870

871871
// same here
872-
SmallVector<int, 64>::allocator_type::arena_type arena2;
873-
SmallVector<int, 64> destroyParameters{arena2};
872+
SmallVector<uint64_t>::allocator_type::arena_type arena2;
873+
SmallVector<uint64_t> destroyParameters{arena2};
874874
parameters.reserve(n);
875875
destroyParameters.reserve(n);
876876

‎arangod/Aql/Query.cpp

Lines changed: 0 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1294,25 +1294,6 @@ bool Query::canUseQueryCache() const {
12941294
return false;
12951295
}
12961296

1297-
/// @brief fetch a numeric value from the options
1298-
double Query::getNumericOption(char const* option, double defaultValue) const {
1299-
if (_options == nullptr) {
1300-
return defaultValue;
1301-
}
1302-
1303-
VPackSlice options = _options->slice();
1304-
if (!options.isObject()) {
1305-
return defaultValue;
1306-
}
1307-
1308-
VPackSlice value = options.get(option);
1309-
if (!value.isNumber()) {
1310-
return defaultValue;
1311-
}
1312-
1313-
return value.getNumericValue<double>();
1314-
}
1315-
13161297
/// @brief neatly format transaction error to the user.
13171298
QueryResult Query::transactionError(int errorCode) const {
13181299
std::string err(TRI_errno_string(errorCode));

0 commit comments

Comments
 (0)
0