Skip to content

Commit

Permalink
Merge branch 'devel' of https://github.com/arangodb/arangodb into fea…
Browse files Browse the repository at this point in the history
…ture/planning-query-result-cache

* 'devel' of https://github.com/arangodb/arangodb:
  fix compilation in non-maintainer-mode
  Feature/jenkins pipeline (#3218)
  increase cache lifetime for cluster selectivity estimates
  fixed a bug, where when servers failed, when also agency leadership c… (#3189)
  added new test suite authentication_server
  No access collections Improvements (#3190)
  removing unnecessary rate limiting (#3194)
  fix duplicate mutex (#3215)
  updated CHANGELOG
  Feature/jenkins pipeline (#3210)
  Aardvark: Disable vertical line in query explain editor
  • Loading branch information
ObiWahn committed Sep 11, 2017
2 parents c9d9c0e + cf66414 commit e9230ca
Show file tree
Hide file tree
Showing 101 changed files with 1,399 additions and 1,319 deletions.
2 changes: 1 addition & 1 deletion 3rdParty/rocksdb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ if (USE_JEMALLOC)
set(THIRDPARTY_LIBS ${JEMALLOC_LIB})
endif ()
else ()
set(WITH_JEMALLOC OFF CACHE BOOL "enable jemalloc")
set(WITH_JEMALLOC OFF CACHE BOOL "enable jemalloc" FORCE)
endif ()

# snappy settings
Expand Down
2 changes: 1 addition & 1 deletion 3rdParty/snappy/google-snappy-d53de18/snappy.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1336,7 +1336,7 @@ class SnappySinkAllocator {
void Flush(size_t size) {
size_t size_written = 0;
size_t block_size;
for (int i = 0; i < blocks_.size(); ++i) {
for (size_t i = 0; i < blocks_.size(); ++i) {
block_size = min<size_t>(blocks_[i].size, size - size_written);
dest_->AppendAndTakeOwnership(blocks_[i].data, block_size,
&SnappySinkAllocator::Deleter, NULL);
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
devel
-----

* fixed issue #3106: orphan collections could not be registered in general-graph module

* fixed wrong selection of the database inside the internal cluster js api

* added startup option `--server.check-max-memory-mappings` to make arangod check
the number of memory mappings currently used by the process and compare it with
the maximum number of allowed mappings as determined by /proc/sys/vm/max_map_count
Expand All @@ -25,6 +29,8 @@ devel

* fixed issue #3070: Add index in _jobs collection

* fixed issue #3125: HTTP Foxx API JSON parsing

* fixed issue #3120: Foxx queue: job isn't running when server.authentication = true


Expand Down
2 changes: 1 addition & 1 deletion Documentation/Books/HTTP/Agency/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ curl -L http://$SERVER:$PORT/_api/agency/read -d '[["/a/b/c"],["/a/b/d"],["/a/x/

The write API must obviously be more versatile and needs a more detailed appreciation. Write operations are arrays of transactions with preconditions, i.e. `[[U,P]]`, where the system tries to apply all updates in the outer array in turn, rejecting those whose precondition is not fulfilled by the current state. It is guaranteed that the transactions in the write request are sequenced adjacent to each other (with no intervention from other write requests). Only the ones with failed preconditions are left out.

For `P`, the value of a key is an object with attributes `"old"` or `"oldEmpty"` or `"isArray"`. With `"old"` one can specify a JSON value that has to be present for the condition to be fulfilled. With `"oldEmpty"`, which can take a boolean value, one can specify that the key value needs to be not set `true` or set to an arbitrary value `false`. With `"isArray"` one can specify that the value must be an array. As a shortcut, `"old"` values of scalar or array type may be stored directly in the attribute.
For `P`, the value of a key is an object with attributes `"old"`, `"oldNot"`, `"oldEmpty"` or `"isArray"`. With `"old"` one can specify a JSON value that has to be present for the condition to be fulfilled. With `"oldNot"` one may check for a value to not be equal to the test. While with `"oldEmpty"`, which can take a boolean value, one can specify that the key value needs to be not set `true` or set to an arbitrary value `false`. With `"isArray"` one can specify that the value must be an array. As a shortcut, `"old"` values of scalar or array type may be stored directly in the attribute.
Examples:

```js
Expand Down
Loading

0 comments on commit e9230ca

Please sign in to comment.