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

405 Commits

Author SHA1 Message Date
Jan Steemann 8ac0ad2643 issue #1360 2015-06-05 10:08:09 +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 688b21fe51 fixed namespaces 2015-05-20 15:49:39 +02:00
Jan Steemann 5ad7dea0c8 use auto for HTTP response headers iteration 2015-05-08 17:44:33 +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 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
Max Neunhoeffer e49e4662b1 Fix a warning message. 2015-03-26 14:56:28 -07:00
Jan Steemann d567c012c3 added SYS_OPTIONS() to get options 2015-03-25 16:55:24 +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
Jan Steemann 65f57f015a constified method 2015-03-03 15:01:27 +01:00
Willi Goesgens a58974d773 Improve error handling 
- directory creation
  - zip extraction
 2015-02-23 12:26:49 +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 e666fd6dfc Properly shut down V8 to make Valgrind happy 2015-01-29 17:31:30 +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 1748e403e4 added TRI_FORCE_ARMV6 2014-12-23 16:31:20 +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 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 d94eaf498f integer progress values 2014-10-09 20:54:41 +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 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 20d5c6b736 added test case "multi-collection" 2014-07-23 15:14:12 +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
Lucas Dohmen b5764513d9 Extracted the test runner from jsunity 2014-06-16 14:39:40 +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 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 cbb78da0bc prevent double freeing 2014-05-17 13:13:19 +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
Max Neunhoeffer 3661d9bd93 Use /_admin/server/role instead of /_admin/execute for dump/restore. 
This prevents a warning in the logs and is cleaner.
 2014-05-16 12:57:42 +02:00
Max Neunhoeffer 9b5f015747 Prepare setup for cluster arangorestore. 2014-05-08 22:38:52 +02:00
Max Neunhoeffer 3973e61608 First cluster dump worked. 2014-05-08 12:42:38 +02:00
Max Neunhoeffer f6bd2bbe91 Start cluster mode for arangodump. Unfinished. 2014-05-07 16:46:41 +02:00
Max Neunhoeffer df68f47338 Use StringBuffer in SimpleHttpResult rather than stringstream. 2014-05-07 16:35:40 +02:00
Frank Celler 990a041bbd added local directory to search path 2014-05-04 21:24:52 +02:00
Jan Steemann 868c2371ab unified error messages 2014-04-23 23:35:59 +02:00
Jan Steemann 0aa7327c2d issue #835: arangosh doesn't show correct database name 2014-04-22 09:12:00 +02:00
Jan Steemann cdce1bb374 fix invalid character display in linenoise 2014-04-11 19:59:29 +02:00
Jan Steemann e5ec69f423 emit server version 2014-03-27 14:19:45 +01:00
Jan Steemann 16f1fc5a93 added --force option, allow using incompatible server version 2014-03-27 14:12:09 +01:00
Frank Celler e25945aaba fixed javascript.execute for coffee-script 2014-03-20 22:51:30 +01:00
Esteban Lombeyda beccde4cd1 Bug fix: too many new lines in arango shell are removed 2014-03-20 11:59:53 +01:00
Esteban Lombeyda 542cca7dc5 support of utf-8 output for windows 2014-03-19 13:10:54 +01:00
Jan Steemann 784c54718c fixed return value of `make jslint` 2014-03-10 09:28:43 +01:00
Jan Steemann abd11203c3 fixed version expectation 2014-02-28 10:26:43 +01:00
Jan Steemann 217256ca2e use change from devel branch 2014-02-27 20:11:45 +01:00
Jan Steemann 4de0014ed3 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-02-27 10:51:20 +01:00
Jan Steemann 1209298476 fixed client tests 2014-02-27 10:49:29 +01:00
Jan Steemann 3d5149b022 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangosh/V8Client/arangosh.cpp
 2014-02-26 21:34:34 +01:00
Jan Steemann cfae17c667 make SYS_UNIT_TESTS_RESULT writeable 2014-02-26 13:36:01 +01:00
Jan Steemann 0ac7ddaaf9 fix shell client test results 2014-02-25 15:43:57 +01:00
Jan Steemann 7f236650ff fix database name in prompt 2014-02-24 14:46:58 +01:00
Michael Hackstein 015ab56259 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	arangod/VocBase/document-collection.c
	arangosh/CMakeLists.txt
	js/apps/system/aardvark/test/karma/karma.conf.js
 2014-02-18 08:50:27 +01:00
Frank Celler 73f2be8a33 removed check-server 2014-02-15 23:34:24 +01:00
Jan Steemann 5270f994c9 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/frontend/css/layout.css
	js/server/modules/org/arangodb/arango-collection.js
 2014-02-12 12:53:08 +01:00
Jan Steemann 859dd2a9d8 better handling of --javascript.package-path 2014-02-12 09:59:23 +01:00
Michael Hackstein bc16cfae86 Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	Documentation/InstallationManual/Installing.md
	arangosh/CMakeLists.txt
 2014-02-11 15:52:49 +01:00
Frank Celler c6ce5c7406 made module loader more node compatible, added coffee script support 2014-02-11 13:26:11 +01:00
Jan Steemann 83b0cd8e5b fixed segfault 2014-01-30 18:46:34 +01:00
Jan Steemann 2ced0f6a21 fixed terminal reset 2014-01-27 16:54:48 +01: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
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +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 e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 865b70862e some minor adjustments for arangodump and arangorestore 2013-12-13 11:54:00 +01:00
Jan Steemann 69a462e785 some minor adjustments for arangodump and arangorestore 2013-12-13 11:52:52 +01:00
Jan Steemann fb9f9f7d26 updated Windows build 2013-11-20 15:37:11 +01:00
Frank Celler 2c3ea751c6 added missing file 2013-11-20 09:47:07 +01:00
Frank Celler f35347098b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2013-11-20 09:20:51 +01:00
Frank Celler d5b608cb79 cosmetics 2013-11-20 09:19:58 +01:00
Jan Steemann 920d08d855 removed redundant startup options 2013-11-20 01:50:27 +01:00
Jan Steemann a18c6cc98e fix character input in Windows arangosh for characters introducted with ALT-GR 2013-11-12 20:37:56 +01:00
Jan Steemann 9aaaf812c4 add --code-page option for Windows 2013-11-12 20:34:24 +01:00
Jan Steemann 670393f660 updated CHANGELOG 2013-11-04 17:33:50 +01:00
Jan Steemann d49b754f49 fixed logging in arangosh 2013-10-31 19:01:18 +01:00
Jan Steemann 4ad95f8b53 fixed logging in arangosh 2013-10-31 18:43:00 +01:00
Jan Steemann dd9802b1b8 show error details in arangoimp 
Conflicts:
	arangosh/V8Client/ImportHelper.cpp
 2013-10-30 12:14:17 +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 0a6148f2d6 fixed some VS complaints 2013-10-16 17:27:35 +02:00
Jan Steemann cd5d228e77 moved path checks from --upgrade to server start and database creation 2013-10-16 15:30:13 +02:00
Jan Steemann 3db041598d updated manuals 2013-10-11 17:38:14 +02:00
Jan Steemann 7e3a7825e5 updated Visual Studio projects 2013-10-10 17:54:49 +02:00
Jan Steemann b8318609e2 updated arangorestore 2013-10-10 16:58:21 +02:00
Jan Steemann 6a353a4c38 resolve collection names on reimport 2013-10-10 12:33:27 +02:00
Jan Steemann 294bdda547 better not use ofstream 2013-10-10 09:56:22 +02:00
Jan Steemann 13b51eb849 use batches in arangodump 2013-10-10 09:08:02 +02:00
Jan Steemann af07091d1c Windows fixes 2013-10-09 15:33:38 +02:00
Jan Steemann 0c15f387ae added collection id translation for dumps 2013-10-09 13:46:12 +02:00
Jan Steemann db08da2dc3 added config file for arangodump 2013-10-09 10:12:29 +02:00
Jan Steemann fb08211ac9 fix UTF-8 console output in Windows 2013-10-08 13:12:00 +02:00
Jan Steemann 46a295ba43 fixed some Windows warnings 2013-10-08 12:39:47 +02:00
Jan Steemann d6149c9a9a added documentation for /_api/import 2013-10-02 14:22:25 +02:00
Jan Steemann cf583b061e issue #601 2013-10-01 13:56:31 +02:00
Jan Steemann 106fedd615 several errors fixed 2013-09-26 09:44:50 +02:00
Jan Steemann ec3ffa9bca renamed --max-upload-size to --batch-size 2013-09-13 20:25:24 +02:00
Jan Steemann 64741f8a8d added test cases for endpoints 2013-09-13 14:07:30 +02:00
Jan Steemann c6c4c70333 activated arangodump and arangorestore 2013-09-06 00:54:58 +02:00
Jan Steemann 618499c2b1 adjusted client tools and documentation 2013-09-02 14:07:38 +02:00