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 generic-col-types

This commit is contained in:
jsteemann 2016-09-01 12:02:50 +02:00
parent 36804cc30a d57c3ef792
commit 68ae8d2945
5 changed files with 223 additions and 287 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
README_maintainers.md
View File

@ -518,6 +518,14 @@ you need to place hooks:
is replaced in with its own evaluated content - so *@EXAMPLE_ARANGOSH_[OUTPUT | RUN]* sections are executed
the same way as inside of source code documentation.
Include ditaa diagrams
----------------------
We use the [beautifull ditaa (DIagrams Through Ascii Art)](http://ditaa.sourceforge.net/) to generate diagrams explaining flows etc.
in our documentation.
We have i.e. `Manual/Graphs/graph_user_in_group.ditaa` which is transpiled by ditaa into a png file, thus you simply include
a png file of the same name as image into the mardown: `![User in group example](graph_user_in_group.png)` to reference it.
Read / use the documentation
----------------------------
- `file:///Documentation/Books/books/Manual/index.html` contains the generated manual

7
arangod/Agency/v8-agency.cpp
View File

@ -45,12 +45,7 @@ static void JS_EnabledAgent(v8::FunctionCallbackInfo<v8::Value> const& args) {
TRI_V8_TRY_CATCH_BEGIN(isolate);
v8::HandleScope scope(isolate);
try {
ApplicationServer::getEnabledFeature<AgencyFeature>("Agency");
TRI_V8_RETURN_TRUE();
} catch (std::exception const& e) {
TRI_V8_RETURN_FALSE();
}
TRI_V8_RETURN(v8::Boolean::New(isolate, ApplicationServer::server->isEnabled("Agency")));
TRI_V8_TRY_CATCH_END

13
arangod/Cluster/HeartbeatThread.cpp
View File

@ -170,10 +170,10 @@ void HeartbeatThread::runDBServer() {
int currentCount = currentCountStart;
while (!isStopping()) {
try {
LOG_TOPIC(DEBUG, Logger::HEARTBEAT) << "sending heartbeat to agency";
double const start = TRI_microtime();
// send our state to the agency.
// we don't care if this fails
sendState();
@ -276,6 +276,11 @@ void HeartbeatThread::runDBServer() {
}
remain = interval - (TRI_microtime() - start);
} while (remain > 0);
} catch (std::exception const& e) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an exception in DBServer heartbeat: " << e.what();
} catch (...) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an unknown exception in DBServer heartbeat";
}
}
_agencyCallbackRegistry->unregisterCallback(planAgencyCallback);
@ -316,6 +321,7 @@ void HeartbeatThread::runCoordinator() {
setReady();
while (!isStopping()) {
try {
LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "sending heartbeat to agency";
double const start = TRI_microtime();
@ -449,6 +455,11 @@ void HeartbeatThread::runCoordinator() {
remain = 0.0;
}
}
} catch (std::exception const& e) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an exception in coordinator heartbeat: " << e.what();
} catch (...) {
LOG_TOPIC(ERR, Logger::HEARTBEAT) << "Got an unknown exception in coordinator heartbeat";
}
}
LOG_TOPIC(TRACE, Logger::HEARTBEAT) << "stopped heartbeat thread";

36
lib/Basics/StringBuffer.cpp
View File

@ -807,42 +807,6 @@ int TRI_AppendUInt64StringBuffer(TRI_string_buffer_t* self, uint64_t attr) {
return TRI_ERROR_NO_ERROR;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 32 bits in octal
////////////////////////////////////////////////////////////////////////////////
int TRI_AppendUInt32OctalStringBuffer(TRI_string_buffer_t* self,
uint32_t attr) {
int res = Reserve(self, 11);
if (res != TRI_ERROR_NO_ERROR) {
return res;
}
size_t len = TRI_StringUInt32OctalInPlace(attr, self->_current);
self->_current += len;
return TRI_ERROR_NO_ERROR;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 64 bits in octal
////////////////////////////////////////////////////////////////////////////////
int TRI_AppendUInt64OctalStringBuffer(TRI_string_buffer_t* self,
uint64_t attr) {
int res = Reserve(self, 22);
if (res != TRI_ERROR_NO_ERROR) {
return res;
}
size_t len = TRI_StringUInt64OctalInPlace(attr, self->_current);
self->_current += len;
return TRI_ERROR_NO_ERROR;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 32 bits in hex
////////////////////////////////////////////////////////////////////////////////

42
lib/Basics/StringBuffer.h
View File

@ -315,18 +315,6 @@ int TRI_AppendInt64StringBuffer(TRI_string_buffer_t* self, int64_t attr);
int TRI_AppendUInt64StringBuffer(TRI_string_buffer_t* self, uint64_t attr);
////////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 32 bits in octal
////////////////////////////////////////////////////////////////////////////////
int TRI_AppendUInt32OctalStringBuffer(TRI_string_buffer_t* self, uint32_t attr);
////////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 64 bits in octal
////////////////////////////////////////////////////////////////////////////////
int TRI_AppendUInt64OctalStringBuffer(TRI_string_buffer_t* self, uint64_t attr);
////////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 32 bits in hex
////////////////////////////////////////////////////////////////////////////////
@ -981,36 +969,6 @@ class StringBuffer {
return appendInteger(sizetint_t(attr));
}
#endif
//////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 32 bits in octal
//////////////////////////////////////////////////////////////////////////////
StringBuffer& appendOctal(uint32_t attr) {
TRI_AppendUInt32OctalStringBuffer(&_buffer, attr);
return *this;
}
//////////////////////////////////////////////////////////////////////////////
/// @brief appends unsigned integer with 64 bits in octal
//////////////////////////////////////////////////////////////////////////////
StringBuffer& appendOctal(uint64_t attr) {
TRI_AppendUInt64OctalStringBuffer(&_buffer, attr);
return *this;
}
////////////////////////////////////////////////////////////////////////////////
/// @brief appends size_t in octal
////////////////////////////////////////////////////////////////////////////////
#ifdef TRI_OVERLOAD_FUNCS_SIZE_T
StringBuffer& appendOctal(size_t attr) {
return appendOctal(sizetint_t(attr));
}
#endif
//////////////////////////////////////////////////////////////////////////////