1
0
Fork 0
Commit Graph

20613 Commits

Author SHA1 Message Date
Willi Goesgens feda1119b4 We can simplify extra arguments now that we work with objects for argv all over the place. 2015-04-15 10:21:32 +02:00
Jan Steemann 30a2dbf283 updated documentation 2015-04-14 21:01:18 +02:00
Jan Steemann 48f2b65377 added documentation for updating import 2015-04-14 19:50:14 +02:00
Jan Steemann 19471fcec4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-04-14 19:26:54 +02:00
Alan Plum 3a15e749d1 Automatically show/hide scripts dropdown. 2015-04-14 19:19:30 +02:00
Jan Steemann 322b3f9c6d issue #1231: bug xor feature in AQL: LENGTH(null) == 4
This changes the behavior of the AQL `LENGTH` function as follows:

- if the single argument to `LENGTH()` is `null`, then the result will now be `0`. In previous
  versions of ArangoDB, the result of `LENGTH(null)` was `4`.

- if the single argument to `LENGTH()` is `true`, then the result will now be `1`. In previous
  versions of ArangoDB, the result of `LENGTH(true)` was `4`.

- if the single argument to `LENGTH()` is `false`, then the result will now be `0`. In previous
  versions of ArangoDB, the result of `LENGTH(false)` was `5`.

The results of `LENGTH()` with string, numeric, array object argument values do not change.
2015-04-14 19:03:29 +02:00
Alan Plum c6b72d01e1 Rebuilt aardvark again. Removed indent on test GUI stacktraces. 2015-04-14 18:54:24 +02:00
Alan Plum 2f3bf9ed82 Rebuilt aardvark. 2015-04-14 18:44:48 +02:00
Alan Plum 7c4a3daeea Implemented aardvark test GUI. 2015-04-14 18:44:37 +02:00
Alan Plum 281fbf1fcb Saner manifest handling.
Controllers and tests are coerced into an object/array on parse instead of on demand.
Removed unnecessary function.
2015-04-14 18:31:12 +02:00
Alan Plum 4e5d097f1a Linting. 2015-04-14 18:31:12 +02:00
Willi Goesgens 950e05787b Instead of zip'ing for move, copy recursive & remove original. 2015-04-14 18:30:03 +02:00
Willi Goesgens 6450d2a3b2 We have to detect for 'undefined' rather then empty string in the dev-AppPath 2015-04-14 17:17:52 +02:00
Willi Goesgens 40c5e18481 - We _must_ evaluate the return values of these system calls.
- fix windows driveletter detection.
2015-04-14 17:16:44 +02:00
Willi Goesgens 6579eefc33 Add function that can copy files recursive. 2015-04-14 14:46:17 +02:00
Alan Plum decbc6dcea Fully implemented tests API. 2015-04-14 13:39:06 +02:00
Alan Plum 044669cdac Hardcore stubbing action. 2015-04-14 13:39:06 +02:00
Alan Plum 3dcb0f52e5 Reconstructed stubs. 2015-04-14 13:39:05 +02:00
Jan Steemann 8a1677c1dc safely increment nrRegs 2015-04-14 13:27:48 +02:00
Jan Steemann 4d24618e3e updated CHANGELOG 2015-04-14 12:00:57 +02:00
Jan Steemann 3d6bc8d28a Merge branch 'import-update' into devel 2015-04-14 11:47:57 +02:00
Jan Steemann 92fcdd3e56 issue #1298: Bulk import if data already exists
This change extends the HTTP REST API for bulk imports as follows:

When documents are imported and the `_key` attribute is specified for them, the import can be
used for inserting and updating/replacing documents. Previously, the import could be used for
inserting new documents only, and re-inserting a document with an existing would have failed
with a *unique key constraint violated* error.

The above behavior is still the default. However, the API now allows controlling the behavior
in case of a unique key constraint error via the optional URL parameter `onDuplicate`.

This parameter can have one of the following values:

- `error`: when a unique key constraint error occurs, do not import or update the document but
  report an error. This is the default.

- `update`: when a unique key constraint error occurs, try to (partially) update the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. Only the attributes present in the import data will be
  updated and other attributes already present will be preserved. The number of updated documents
  will be reported in the `updated` attribute of the HTTP API result.

- `replace`: when a unique key constraint error occurs, try to fully replace the existing
  document with the data specified in the import. This may still fail if the document would
  violate secondary unique indexes. The number of replaced documents will be reported in the
  `updated` attribute of the HTTP API result.

- `ignore`: when a unique key constraint error occurs, ignore this error. There will be no
  insert, update or replace for the particular document. Ignored documents will be reported
  separately in the `ignored` attribute of the HTTP API result.

The result of the HTTP import API will now contain the attributes `ignored` and `updated`, which
contain the number of ignored and updated documents respectively. These attributes will contain a
value of zero unless the `onDuplicate` URL parameter is set to either `update` or `replace`
(in this case the `updated` attribute may contain non-zero values) or `ignore` (in this case the
`ignored` attribute may contain a non-zero value).
2015-04-14 11:44:33 +02:00
Max Neunhoeffer f34a009885 Do not execute a time critical test on cluster tests. 2015-04-14 09:06:47 +02:00
Jan Steemann 2299d2916d initial commit to satisfy #1298 2015-04-13 18:26:33 +02:00
Willi Goesgens 25c99c5365 - fix off by one in logfile parsing
- if we already have an exit status, the server is already dead.
2015-04-13 17:02:11 +02:00
Jan Steemann 1fce9850b5 return to original database instead of hard-coded _system database 2015-04-13 16:54:50 +02:00
Jan Steemann f68f20d32e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-04-13 16:24:35 +02:00
Jan Steemann 7c393dec44 fixed assertion error on shutdown 2015-04-13 16:24:19 +02:00
Heiko Kernbach 71eda3b6f8 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-04-13 15:36:29 +02:00
Heiko Kernbach 29a1d54a81 jan #1308 2015-04-13 15:36:22 +02:00
Jan Steemann d7e4c6fd4c fixed test that failed in cluster
Conflicts:
	js/server/tests/shell-foxx-model.js
2015-04-13 15:33:29 +02:00
Jan Steemann d8597d9662 fixed edge index lookups in cluster 2015-04-13 14:36:16 +02:00
Jan Steemann a17d2d2e0e added generated file 2015-04-13 13:41:57 +02:00
Jan Steemann 60bad2ebd6 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-04-13 13:41:23 +02:00
Jan Steemann e8186a6ded issue #1308: ArangoDB Foxx Install via ZIP Frontend 2015-04-13 13:41:05 +02:00
Max Neunhoeffer 8a999c8cc1 Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel 2015-04-13 13:04:50 +02:00
Max Neunhoeffer bd0724add6 Fix retry behaviour in some places of cluster code. 2015-04-13 13:03:40 +02:00
Willi Goesgens 3867ca9cc6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-04-13 12:17:42 +02:00
Willi Goesgens 19eb79dd4d On windows also copy the pdb files on core exit 2015-04-13 12:17:08 +02:00
Max Neunhoeffer 4b4e1b2466 Fix number of tries in getCollection. 2015-04-13 12:07:53 +02:00
Max Neunhoeffer 1c9d348e0f Do not do waitForSync in upgrade-database.js. 2015-04-13 12:07:34 +02:00
Max Neunhoeffer 1709a25163 Startup V8 threads concurrently in multiple C++11 threads.
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
2015-04-13 12:07:26 +02:00
Max Neunhoeffer 541b4c2f07 New startLocalCluster script, speed much better. 2015-04-13 12:02:16 +02:00
Max Neunhoeffer 900cc84204 Only allow bootstrapDbServers action on coordinators. Only allow POST. 2015-04-13 12:01:25 +02:00
Max Neunhoeffer 0179922eb0 Create _configuration collection only at startup and no longer on the fly.
This gets rid of a race condition on coordinators.
2015-04-13 11:58:21 +02:00
Max Neunhoeffer 358714599a Do not initialise statistics collections on each coordinator. 2015-04-13 11:57:58 +02:00
Jan Steemann 8e4e9c076b updated CHANGELOG 2015-04-13 11:51:40 +02:00
Jan Steemann eb219d9391 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-04-13 11:47:27 +02:00
Jan Steemann e507e4f9d9 issue #1300: do not make arangodump fail if output directory exists but is empty 2015-04-13 11:45:16 +02:00
Willi Goesgens c7abfdac45 Add the rc file 2015-04-13 11:13:36 +02:00