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

475 Commits

Author SHA1 Message Date
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
Willi Goesgens e666fd6dfc Properly shut down V8 to make Valgrind happy 2015-01-29 17:31:30 +01:00
Frank Celler b00cd1f515 avoid duplicate fatal output 2015-01-29 17:09:47 +01:00
Jan Steemann 245f6adc0b fixed typo 2015-01-27 14:04:59 +01:00
Willi Goesgens 293a3fe7d3 Differenciate whether we fail to locate or execute a script in error messages. 2015-01-27 12:25:40 +01:00
Willi Goesgens 37efe55873 If we fail to initialize ICU many things will be broken, thus abort. 2015-01-27 12:13:38 +01:00
Willi Goesgens b1f881254d Upgrade V8 to 3.31.74.1 2015-01-19 19:29:31 +01:00
Jan Steemann 957fa189d2 better diagnostics for arangoimp 2015-01-15 13:42:31 +01:00
Jan Steemann 49d7a0c6bc remove trailing slashes from directory names for Windows compatibility 2015-01-12 20:13:17 +01:00
Frank Celler 2d92e15497 removed TRI_ICU_VERSION 2014-12-24 09:01:36 +01:00
Frank Celler e866c80630 arangob, arangodump and arangorestore do not need V8 2014-12-23 17:10:40 +01:00
Frank Celler 1748e403e4 added TRI_FORCE_ARMV6 2014-12-23 16:31:20 +01:00
Jan Steemann 5529c9b1c1 added test case 2014-12-22 11:34:36 +01:00
Jan Steemann d358b80080 ES6 2014-12-20 04:02:24 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Max Neunhoeffer 45cecf44f9 Initialise a few variables to please gcc. 2014-12-16 10:48:07 +01:00
Jan Steemann a90ee78ae1 fixed segfault 2014-12-15 20:48:10 +01:00
Jan Steemann 7cea1e76dc fix memleak and segfault 
Conflicts:
	arangosh/V8Client/arangosh.cpp
 2014-12-15 20:16:27 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
Jan Steemann f1f0269eb9 issue #1159: allow --server.request-timeout and --server.connect-timeout of 0 2014-12-09 16:51:08 +01:00
Jan Steemann 44a3d8c752 report progress for inputs of unknown size 2014-11-14 13:17:21 +01:00
Jan Steemann ccd20d7638 do not print broken error message 2014-10-28 01:02:24 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +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 766faddaf1 changed copyright from triAGENS GmbH to ArangoDB in ArangoShell 2014-10-14 13:54:38 +02:00
Jan Steemann 31ebe14ea6 issue #1042 2014-10-10 14:24:22 +02:00
Jan Steemann d94eaf498f integer progress values 2014-10-09 20:54:41 +02:00
Jan Steemann 066f80b2af added more test cases for arangob 
Conflicts:
	arangosh/Benchmark/arangob.cpp
	arangosh/Benchmark/test-cases.h
 2014-10-08 22:16:51 +02:00
Jan Steemann 5d28f7feb7 nullptr 2014-10-03 00:49:27 +02:00
Jan Steemann ce9499eac8 less string copying, less regex slowdown when importing CSV files 2014-09-30 23:20:12 +02:00
Jan Steemann b9bd496681 added generic exception handler 2014-09-30 17:48:41 +02:00
Jan Steemann eb2e421c08 issue #1030: too big numeric values lead to arangoimp crashing on Windows 2014-09-30 17:25:54 +02:00
Jan Steemann dbf964e204 small optimizations 2014-09-24 12:09:13 +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 953b8cdfe3 renamed files 2014-09-13 00:34:48 +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
Jan Steemann d2c5cd75db fix printing of multi-line output on Windows 2014-08-06 13:36:12 +02:00
Jan Steemann 162be97541 fixed arangob without batch-size 2014-08-01 18:22:49 +02:00
Jan Steemann 1c8b72894e speed up test cases 2014-07-23 16:34:10 +02:00
Max Neunhoeffer b93b343410 Fix behaviour of tests when few requests are done. 2014-07-23 16:05:32 +02:00
Jan Steemann 20d5c6b736 added test case "multi-collection" 2014-07-23 15:14:12 +02:00
Jan Steemann 33be59ed7e cxx 2014-07-02 17:24:21 +02:00
Jan Steemann 21067e4ff1 TRI_ASSERT 2014-07-02 15:18:51 +02:00
Jan Steemann ca4e59d7ee fixed ugly prompt when no connection to server is requested 2014-07-02 10:36:50 +02:00
Jan Steemann 16bf152c8f fully removed replication logger 2014-06-21 00:32:47 +02:00
Frank Celler 24a5ec0739 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.c
	arangod/Ahuacatl/ahuacatl-grammar.cpp
	arangod/Ahuacatl/ahuacatl-grammar.h
 2014-06-20 16:42:43 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00
Lucas Dohmen 95fb92b195 Move testrunner into the org/arangodb 'namespace' 2014-06-20 16:05:09 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Frank Celler f5419205ac added voice 2014-06-18 16:34:55 +02:00
Jan Steemann 30460bb72c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-17 00:49:37 +02:00
Jan Steemann 02d171412d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/modules/org/arangodb/general-graph.js
 2014-06-16 14:47:41 +02:00
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +02:00
Frank Celler 50b6533d0d added configuration to manifest, install and mount 
Conflicts:
	js/server/modules/org/arangodb/foxx/manager.js
 2014-06-16 12:57:17 +02:00
Jan Steemann 1b94fbf904 fixed crash in dump 2014-06-13 01:53:44 +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 0e0b6f34f5 fixed requestTimeout 2014-05-26 13:18:58 +02:00
Jan Steemann 017d36bfc2 increased default --batch-size for arangoimp, improved documentation for arangoimp 2014-05-23 18:22:00 +02:00
Jan Steemann a94435be26 added test case 2014-05-23 18:04:33 +02:00
Max Neunhoeffer bb5b341ba6 Get rid of many "using namespace ..." occurrences in header files. 2014-05-22 15:13:16 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +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 cbb78da0bc prevent double freeing 2014-05-17 13:13:19 +02:00