1
0
Fork 0
Commit Graph

442 Commits

Author SHA1 Message Date
Jan Steemann 58a8f2a6a2 remove v8 dependency for arangoimp 2015-06-18 18:30:45 +02:00
Willi Goesgens 8282aa426e ForceDelete is gone - here too. 2015-06-18 13:09:04 +02:00
Jan Steemann a6b2998b5d added try...catch blocks for V8-to-CPP bindings 2015-06-08 16:04:42 +02:00
Jan Steemann 8ac0ad2643 issue #1360 2015-06-05 10:08:09 +02:00
Jan Steemann 81c1d62b0a issue #1360: added extra help for foxx-manager 2015-06-05 09:43:17 +02:00
Jan Steemann b76cb5caee use nullptr 2015-06-02 23:39:41 +02:00
Willi Goesgens 6af4c548ae When running --javascript.execute also set __filename and __dirname as JS_Load does - so the environment for scripts is similar. 2015-06-01 12:01:21 +02:00
Jan Steemann 59ce0b7ad9 test option `--create-database` 2015-05-29 14:37:47 +02:00
Jan Steemann caa2e32c5a better provide a default 2015-05-29 14:25:42 +02:00
Jan Steemann ca5695d711 issue #1347: arangorestore: create database if not exists 2015-05-29 14:23:15 +02:00
Jan Steemann a9f2769ffa now compiles and links 2015-05-23 04:31:13 +02:00
Jan Steemann 2990a6296f resolve conflict with namespace "Concurrency", introduced by MS on top-level... 2015-05-20 16:11:27 +02:00
Jan Steemann 688b21fe51 fixed namespaces 2015-05-20 15:49:39 +02:00
Jan Steemann 5cd7b64ce8 fixed potential race during arangob runs 2015-05-11 22:57:30 +02:00
Jan Steemann 5ad7dea0c8 use auto for HTTP response headers iteration 2015-05-08 17:44:33 +02:00
Jan Steemann 6b412a1c01 Merge branch 'json-privatisierung' of https://github.com/arangodb/arangodb into json-privatisierung 2015-05-07 13:05:12 +02:00
Willi Goesgens 982615e9dc Fix warning for 32 bit systems 2015-05-05 11:06:12 +02:00
Jan Steemann a007a867ee "privatized" TRI_vector_t internals.
This allows changing the internals of TRI_vector_t structs in order to make the struct smaller.
On 64 bits, the size of TRI_vector_t is reduced from 48 bytes to 28 bytes.
TRI_json_t does benefit from this, as its biggest component is a TRI_vector_t.
2015-05-05 10:31:02 +02:00
Jan Steemann 8dbcf0e23f Visual Studio adjustments 2015-04-30 11:46:55 +02:00
Willi Goesgens b0b9232f05 don't use static std::string constants, they're not thread safe in windows. 2015-04-21 10:28:05 +02:00
Jan Steemann e1312f2088 attempt to satisfy scan-build a bit 2015-04-16 11:47:18 +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
Jan Steemann 2299d2916d initial commit to satisfy #1298 2015-04-13 18:26:33 +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
Alan Plum 1961389092 Added globals to arangosh. 2015-04-08 15:57:02 +02:00
Jan Steemann 960b464c57 issue #1054: add info whether server is running in service or user mode? 2015-03-27 16:49:47 +01:00
Jan Steemann a0420101e2 fixed compile error 2015-03-27 15:18:27 +01:00
Willi Goesgens ad1596712e Merge branch 'devel' of github.com:arangodb/arangodb into devel 2015-03-27 11:15:09 +01:00
Willi Goesgens 6a9f213340 Add more traps for the windows bug of empty URLs 2015-03-27 11:14:36 +01:00
Max Neunhoeffer e49e4662b1 Fix a warning message. 2015-03-26 14:56:28 -07:00
Willi Goesgens 9bc7ec23c6 If we encounter a server error also output the post document. 2015-03-26 17:51:03 +01:00
Jan Steemann d567c012c3 added SYS_OPTIONS() to get options 2015-03-25 16:55:24 +01:00
Willi Goesgens a775c410b0 Output http replies if verbose set and an error occurs. 2015-03-23 14:26:38 +01:00
Willi Goesgens 2869f7c325 Show error messages in all conditions, show error count for non-complete reqlies. 2015-03-23 13:22:39 +01:00
Jan Steemann ee906c698f increase default timeout 2015-03-20 13:35:21 +01:00
Jan Steemann 8c6cafceb3 fix arangosh multi-line input for ES6 template strings 2015-03-19 21:03:48 +01:00
Willi Goesgens 043b0cb62f This is not a printf function - though its name is similar. 2015-03-17 13:45:11 +01:00
Willi Goesgens 67494ea108 Add the contents of the ICU_DATA environment to the fatal error message. 2015-03-17 13:20:55 +01:00
Frank Celler 0687e4e080 removed registry entry, using relative path to binary instead 2015-03-08 20:06:18 +01:00
Willi Goesgens 06899572e5 fix windows warning. 2015-03-05 09:26:10 +01:00
Willi Goesgens 23d8750d2d Windows seems to have problems with race conditions when having 'static const std::string("foo")' in a function context. 2015-03-04 16:19:14 +01:00
Jan Steemann 65f57f015a constified method 2015-03-03 15:01:27 +01:00
Jan Steemann 68c57ce061 fix Visual Studio undefinedness 2015-02-26 18:07:25 +01:00
Willi Goesgens 0879312201 StringBuffer::appendChar ignores allocation errors. work around this by pre-allocating enough space. 2015-02-26 17:05:51 +01:00
Willi Goesgens 8eb861e6a6 Log more information about whats going wrong with the logging. 2015-02-26 15:08:24 +01:00
Willi Goesgens a58974d773 Improve error handling
- directory creation
  - zip extraction
2015-02-23 12:26:49 +01:00
Willi Goesgens d61fc4343a Set debug message trap for failing windows arangobench tests. 2015-02-17 14:27:25 +01:00
Willi Goesgens 93f7284851 if we detect that we're running in a cygwin shell, assume we can use unix like message printing. 2015-02-13 11:32:58 +01:00
Jan Steemann d06c3c1ff3 changed "file names" of anonymous commands 2015-02-03 12:46:34 +01:00
Willi Goesgens 5e1720132f Stacktraces & asserts for windows too. 2015-01-30 16:46:56 +01:00