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

added includeSystem URL parameter

This commit is contained in:
Jan Steemann 2013-08-29 21:15:47 +02:00
parent 2556b0714f
commit a42be561fd
2 changed files with 24 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
arangod/RestHandler/RestReplicationHandler.cpp
View File

@ -1080,6 +1080,11 @@ void RestReplicationHandler::handleCommandLoggerFollow () {
///
/// @RESTHEADER{GET /_api/replication/inventory,returns an inventory of collections and indexes}
///
/// @RESTQUERYPARAMETERS
///
/// @RESTQUERYPARAM{includeSystem,boolean,optional}
/// Include system collections in the result. The default value is `false`.
///
/// @RESTDESCRIPTION
/// Returns the list of collections and indexes available on the server. This
/// list can be used by replication clients to initiate an initial sync with the
@ -1195,8 +1200,20 @@ void RestReplicationHandler::handleCommandInventory () {
TRI_voc_tick_t tick = TRI_CurrentTickVocBase();
// collections
TRI_json_t* collections = TRI_InventoryCollectionsVocBase(_vocbase, tick, &filterCollection, NULL);
// include system collections?
bool includeSystem = false;
bool found;
const char* value = _request->value("includeSystem", found);
if (found) {
includeSystem = StringUtils::boolean(value);
}
// register filter function
bool (*filter)(TRI_vocbase_col_t*, void*) = includeSystem ? 0 : &filterCollection;
// collections and indexes
TRI_json_t* collections = TRI_InventoryCollectionsVocBase(_vocbase, tick, filter, NULL);
if (collections == 0) {
generateError(HttpResponse::SERVER_ERROR, TRI_ERROR_OUT_OF_MEMORY);

6
arangosh/V8Client/arangodump.cpp
View File

@ -421,8 +421,11 @@ static int DumpCollection (ofstream& outFile,
static int GetInventory (string& errorMsg) {
map<string, string> headers;
const string url = "/_api/replication/inventory?includeSystem=" +
string(IncludeSystemCollections ? "true" : "false");
SimpleHttpResult* response = Client->request(HttpRequest::HTTP_REQUEST_GET,
"/_api/replication/inventory",
url,
0,
0,
headers);
@ -448,6 +451,7 @@ static int GetInventory (string& errorMsg) {
const string& data = response->getBody().str();
TRI_json_t* json = TRI_JsonString(TRI_UNKNOWN_MEM_ZONE, data.c_str());
delete response;