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 devel

This commit is contained in:
Mark 2016-10-26 10:51:15 +02:00
parent 70bfba15c8 b450dfd0f1
commit ff4dcf7c58
5 changed files with 43 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Documentation/DocuBlocks/Rest/Documents/REST_DOCUMENT_CREATE.md
View File

@ -23,9 +23,14 @@ the recommended way is to specify the collection in the URL path.
Wait until document has been synced to disk.
@RESTQUERYPARAM{returnNew,boolean,optional}
Return additionally the complete new document under the attribute *new*
Additionally return the complete new document under the attribute *new*
in the result.
@RESTQUERYPARAM{silent,boolean,optional}
If set to *true*, an empty object will be returned as response. No meta-data
will be returned for the created document. This option can be used to
save some network traffic.
@RESTDESCRIPTION
Creates a new document from the document given in the body, unless there
is already a document with the *_key* given. If no *_key* is given, a new
@ -47,8 +52,8 @@ contains the path to the newly created document. The *ETag* header field
contains the revision of the document. Both are only set in the single
document case.
The body of the response contains a JSON object (single document case)
with the following attributes:
If *silent* is not set to *true*, the body of the response contains a
JSON object (single document case) with the following attributes:
- *_id* contains the document handle of the newly created document
- *_key* contains the document key

15
Documentation/DocuBlocks/Rest/Documents/REST_DOCUMENT_DELETE.md
View File

@ -17,6 +17,11 @@ Wait until deletion operation has been synced to disk.
Return additionally the complete previous revision of the changed
document under the attribute *old* in the result.
@RESTQUERYPARAM{silent,boolean,optional}
If set to *true*, an empty object will be returned as response. No meta-data
will be returned for the removed document. This option can be used to
save some network traffic.
@RESTHEADERPARAMETERS
@RESTHEADERPARAM{If-Match,string,optional}
@ -24,11 +29,11 @@ You can conditionally remove a document based on a target revision id by
using the *if-match* HTTP header.
@RESTDESCRIPTION
The body of the response contains a JSON object with the information
about the handle and the revision. The attribute *_id* contains the
known *document-handle* of the removed document, *_key* contains the
key which uniquely identifies a document in a given collection, and
the attribute *_rev* contains the document revision.
If *silent* is not set to *true*, the body of the response contains a JSON
object with the information about the handle and the revision. The attribute
*_id* contains the known *document-handle* of the removed document, *_key*
contains the key which uniquely identifies a document in a given collection,
and the attribute *_rev* contains the document revision.
If the *waitForSync* parameter is not specified or set to *false*,
then the collection's default *waitForSync* behavior is applied.

15
Documentation/DocuBlocks/Rest/Documents/REST_DOCUMENT_REPLACE.md
View File

@ -32,6 +32,11 @@ document under the attribute *old* in the result.
Return additionally the complete new document under the attribute *new*
in the result.
@RESTQUERYPARAM{silent,boolean,optional}
If set to *true*, an empty object will be returned as response. No meta-data
will be returned for the replaced document. This option can be used to
save some network traffic.
@RESTHEADERPARAMETERS
@RESTHEADERPARAM{If-Match,string,optional}
@ -71,11 +76,11 @@ applied. The *waitForSync* query parameter cannot be used to disable
synchronization for collections that have a default *waitForSync* value
of *true*.
The body of the response contains a JSON object with the information
about the handle and the revision. The attribute *_id* contains the
known *document-handle* of the updated document, *_key* contains the
key which uniquely identifies a document in a given collection, and
the attribute *_rev* contains the new document revision.
If *silent* is not set to *true*, the body of the response contains a JSON
object with the information about the handle and the revision. The attribute
*_id* contains the known *document-handle* of the updated document, *_key*
contains the key which uniquely identifies a document in a given collection,
and the attribute *_rev* contains the new document revision.
If the query parameter *returnOld* is *true*, then
the complete previous revision of the document

15
Documentation/DocuBlocks/Rest/Documents/REST_DOCUMENT_UPDATE.md
View File

@ -46,6 +46,11 @@ document under the attribute *old* in the result.
Return additionally the complete new document under the attribute *new*
in the result.
@RESTQUERYPARAM{silent,boolean,optional}
If set to *true*, an empty object will be returned as response. No meta-data
will be returned for the updated document. This option can be used to
save some network traffic.
@RESTHEADERPARAMETERS
@RESTHEADERPARAM{If-Match,string,optional}
@ -91,11 +96,11 @@ applied. The *waitForSync* query parameter cannot be used to disable
synchronization for collections that have a default *waitForSync* value
of *true*.
The body of the response contains a JSON object with the information
about the handle and the revision. The attribute *_id* contains the
known *document-handle* of the updated document, *_key* contains the
key which uniquely identifies a document in a given collection, and
the attribute *_rev* contains the new document revision.
If *silent* is not set to *true*, the body of the response contains a JSON
object with the information about the handle and the revision. The attribute
*_id* contains the known *document-handle* of the updated document, *_key*
contains the key which uniquely identifies a document in a given collection,
and the attribute *_rev* contains the new document revision.
If the query parameter *returnOld* is *true*, then
the complete previous revision of the document

9
arangod/RestServer/BootstrapFeature.cpp
View File

@ -135,18 +135,19 @@ void BootstrapFeature::start() {
auto vocbase = DatabaseFeature::DATABASE->systemDatabase();
auto ss = ServerState::instance();
if (!ss->isRunningInCluster()) {
LOG_TOPIC(DEBUG, Logger::STARTUP) << "Running server/server.js";
LOG_TOPIC(INFO, Logger::STARTUP) << "Running server/server.js";
V8DealerFeature::DEALER->loadJavascript(vocbase, "server/server.js");
} else if (ss->isCoordinator()) {
LOG_TOPIC(DEBUG, Logger::STARTUP) << "Racing for cluster bootstrap...";
LOG_TOPIC(INFO, Logger::STARTUP) << "Racing for cluster bootstrap...";
raceForClusterBootstrap();
LOG_TOPIC(DEBUG, Logger::STARTUP)
LOG_TOPIC(INFO, Logger::STARTUP)
<< "Running server/bootstrap/coordinator.js";
V8DealerFeature::DEALER->loadJavascript(vocbase,
"server/bootstrap/coordinator.js");
} else if (ss->isDBServer()) {
LOG_TOPIC(DEBUG, Logger::STARTUP)
LOG_TOPIC(INFO, Logger::STARTUP)
<< "Running server/bootstrap/db-server.js";
V8DealerFeature::DEALER->loadJavascript(vocbase,
"server/bootstrap/db-server.js");