8000 Merge branch 'devel' of https://github.com/arangodb/arangodb into mvcc · lethalbrains/arangodb@55366cb · GitHub
[go: up one dir, main page]
Skip to content

Commit 55366cb

Browse files
jsteemannjsteemann
committed
Merge branch 'devel' of https://github.com/arangodb/arangodb into mvcc
2 parents 22f6e2b + 50843c9 commit 55366cb

File tree

7 files changed

+13
-9
lines changed

7 files changed

+13
-9
lines changed

‎arangod/Cluster/ApplicationCluster.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,8 @@ bool ApplicationCluster::prepare () {
209209
}
210210

211211
// initialise ClusterComm library
212-
ClusterComm::initialise();
212+
// must call initialize while still single-threaded
213+
ClusterComm::initialize();
213214

214215
// disable error logging for a while
215216
ClusterComm::instance()->enableConnectionErrorLogging(false);

‎arangod/Cluster/ClusterComm.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,10 +93,10 @@ ClusterComm* ClusterComm::instance () {
9393
}
9494

9595
////////////////////////////////////////////////////////////////////////////////
96-
/// @brief initialise the cluster comm singleton object
96+
/// @brief initialize the cluster comm singleton object
9797
////////////////////////////////////////////////////////////////////////////////
9898

99-
void ClusterComm::initialise () {
99+
void ClusterComm::initialize () {
100100
auto* i = instance();
101101
i->startBackgroundThread();
102102
}

‎arangod/Cluster/ClusterComm.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ void ClusterCommRestCallback (std::string& coordinator, rest::HttpResponse* resp
229229
// -----------------------------------------------------------------------------
230230

231231
////////////////////////////////////////////////////////////////////////////////
232-
/// @brief initialises library
232+
/// @brief initializes libra 10000 ry
233233
///
234234
/// We are a singleton class, therefore nobody is allowed to create
235235
/// new instances or copy them, except we ourselves.
@@ -258,10 +258,10 @@ void ClusterCommRestCallback (std::string& coordinator, rest::HttpResponse* resp
258258
static ClusterComm* instance ();
259259

260260
////////////////////////////////////////////////////////////////////////////////
261-
/// @brief initialise function to call once when still single-threaded
261+
/// @brief initialize function to call once when still single-threaded
262262
////////////////////////////////////////////////////////////////////////////////
263263

264-
static void initialise ();
264+
static void initialize ();
265265

266266
////////////////////////////////////////////////////////////////////////////////
267267
/// @brief cleanup function to call once when shutting down

‎arangosh/Benchmark/BenchmarkThread.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,7 @@ namespace triagens {
234234

235235
void executeBatchRequest (const unsigned long numOperations) {
236236
static const char boundary[] = "XXXarangob-benchmarkXXX";
237-
long blen = strlen(boundary);
237+
size_t blen = strlen(boundary);
238238

239239
StringBuffer batchPayload(TRI_UNKNOWN_MEM_ZONE);
240240
int ret = batchPayload.reserve(numOperations * 1024);

‎js/common/modules/org/arangodb/foxx/manager-utils.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -300,6 +300,7 @@ function listJson (showPrefix, onlyDevelopment) {
300300
author: doc.manifest.author,
301301
system: doc.isSystem || false,
302302
development: doc.isDevelopment || false,
303+
license: doc.manifest.license,
303304
version: doc.version,
304305
path: fs.join(fs.makeAbsolute(doc.root), doc.path)
305306
};

‎lib/V8/v8-utils.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4013,6 +4013,7 @@ v8::Handle<v8::Array> static TRI_V8PathList (v8::Isolate* isolate, string const&
40134013

40144014
bool TRI_SingleRunGarbageCollectionV8 (v8::Isolate* isolate,
40154015
int idleTimeInMs) {
4016+
LOG_INFO("%F");
40164017
isolate->LowMemoryNotification();
40174018
bool rc = isolate->IdleNotification(idleTimeInMs);
40184019
isolate->RunMicrotasks();
@@ -4029,10 +4030,10 @@ void TRI_RunGarbageCollectionV8 (v8::Isolate* isolate,
40294030
int idleTimeInMs = 1000;
40304031

40314032
if (availableTime >= 5.0) {
4032-
idleTimeInMs = 10000;
4033+
idleTimeInMs = 5000;
40334034
}
40344035
if (availableTime >= 10.0) {
4035-
idleTimeInMs = 100000;
4036+
idleTimeInMs = 10000;
40364037
}
40374038

40384039
double const until = TRI_microtime() + availableTime;

‎scripts/run

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ $VG bin/arangod \
5454
--javascript.script $SCRIPT \
5555
--no-server \
5656
--temp-path ${PS}var${PS}tmp \
57+
"${ARGS[@]}" \
5758
$VXML
5859

5960
if test $? -eq 0; then

0 commit comments

Comments
 (0)
0