Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
21,758 Commits 358 Branches 495 Tags 994 MiB
Commit Graph

65 Commits

Author SHA1 Message Date
Willi Goesgens bd7aa7c305 Remove the global include to iostream; this reduces the compile time by 10% 
( http://herbsutter.com/2013/08/19/gotw-7a-solution-minimizing-compile-time-dependencies-part-1/  for inspiration)
 2015-07-07 12:11:21 +02:00
Jan Steemann 58a8f2a6a2 remove v8 dependency for arangoimp 2015-06-18 18:30:45 +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 957fa189d2 better diagnostics for arangoimp 2015-01-15 13:42:31 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Max Neunhoeffer 183cd3eb40 Sort out temporary directory creation with individual names. 2014-10-16 20:08:21 +02:00
Jan Steemann 234bb981aa more exception handling 2014-10-15 20:39:12 +02:00
Jan Steemann b9bd496681 added generic exception handler 2014-09-30 17:48:41 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 669cb3b235 renamed files 2014-09-13 01:44:01 +02:00
Jan Steemann 0dc0bc834f more files renamed 2014-09-13 00:20:30 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Jan Steemann d72354da66 issue #1003: added feature to use backslash escaping for CSV data in arangoimp 2014-08-28 21:03:58 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Jan Steemann 86cecdb6a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
 2014-05-26 17:28:16 +02:00
Jan Steemann 017d36bfc2 increased default --batch-size for arangoimp, improved documentation for arangoimp 2014-05-23 18:22:00 +02:00
Max Neunhoeffer ff1dfdd55f Header cleanup: use #include "Basics/Common.h" in all C++ files. 2014-05-21 15:50:30 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Jan Steemann a8d5bc32b2 fixed memleaks in client tools 2014-05-17 12:49:50 +02:00
Jan Steemann b811d21fad issue #862: added `--overwrite` option for arangoimp 2014-05-16 21:29:20 +02:00
Jan Steemann 587c2aef64 issue #744 
Conflicts:
	lib/ApplicationServer/ApplicationServer.cpp
 2014-01-23 09:58:18 +01:00
Jan Steemann 724c5baa70 issue #737: adjusted error message 2014-01-21 15:23:58 +01:00
Jan Steemann 2f20f8b75f slightly updated error messages 2014-01-18 01:46:48 +01:00
Jan Steemann 7c4944de83 added --server.ssl-protocol option for client tools 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
 2013-12-13 17:58:24 +01:00
Jan Steemann 41869d25bd show error details in arangoimp 2013-10-30 12:11:44 +01:00
Jan Steemann 4f50b98c45 removed second logger implementation 2013-10-30 00:38:25 +01:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann ec3ffa9bca renamed --max-upload-size to --batch-size 2013-09-13 20:25:24 +02:00
Jan Steemann 618499c2b1 adjusted client tools and documentation 2013-09-02 14:07:38 +02:00
Jan Steemann 42b8dfca49 added --server.database option for client tools 2013-09-02 13:02:53 +02:00
Jan Steemann 6c64a35895 restore client, unfinished 2013-08-30 01:14:21 +02:00
Jan Steemann 64fda46f62 removed unused variable 2013-08-29 11:47:48 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann 7543ad0283 removed redundant declaration of HTTP status codes 2013-07-01 12:11:02 +02:00
Frank Celler f810711a79 FreeBSD port 2013-04-02 18:43:10 +02:00
Frank Celler 1aa5109fa3 updated disclaimer 2013-03-13 17:03:18 +01:00
Jan Steemann ebc653a0bd issue #435 2013-02-26 12:11:13 +01:00
Jan Steemann e1da2c45fd added TRI_ShutdownMemory() to free core reserve on clean shutdown 2013-02-20 19:11:33 +01:00
Jan Steemann 32dc7a2db2 fix warning about potentially unintialised variable 2013-01-31 10:43:20 +01:00
Oreste Panaia 3c8093849a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-01-31 00:07:19 +08:00
Oreste Panaia e0b7fbbf8d windows icu 2013-01-31 00:04:20 +08:00
Jan Steemann 31e21ec092 fix error message on arangosh and arangoimp startup when no connection can be made 2013-01-29 14:27:55 +01:00
Jan Steemann 7254487e14 added --progress option for arangoimp. make arangod show import errors 2013-01-22 15:04:06 +01:00
Frank Celler 7380ddfabe Merge branch '1.1' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/V8Client/arangosh.cpp
	bin/arango32.msi
	bin/arango64.msi
	lib/BasicsC/win-utils.c
 2013-01-15 15:50:47 +01:00
Oreste Panaia c01a5c6275 arango shell and import 2013-01-14 20:16:09 +08:00
Jan Steemann d562c52fd7 backport of issue #300 2012-12-22 03:38:29 +01:00
Jan Steemann befda25f3c increased default packet size to 1 MB 2012-12-11 13:30:33 +01:00
Jan Steemann 8c7ca55512 issue #300 2012-12-01 03:15:39 +01:00
Oreste Panaia aad73db128 various changes for windows 2012-10-22 20:51:31 +08:00