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

413 Commits

Author SHA1 Message Date
Jan Steemann 39fccee992 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 13:23:24 +01:00
Jan Steemann 0085202b56 fixed import tests 2015-12-17 13:21:27 +01:00
Max Neunhoeffer f3a5aea8cf Fix arangodump in cluster. 2015-12-17 12:33:10 +01:00
Max Neunhoeffer 812994d459 Fix arangodump in vpack branch. 2015-12-17 12:12:59 +01:00
Jan Steemann 2b3f3f997b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-17 10:59:30 +01:00
jsteemann deb6c14bf4 cppcheck 2015-12-16 19:51:23 +01:00
jsteemann 1e98af01ba set cloexec for file descriptors 2015-12-15 20:30:28 +01:00
Jan Steemann ad8381ad6a Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-15 16:37:33 +01:00
Alan Plum 8853ede355 org/arangodb -> @arangodb 2015-12-15 15:51:44 +01:00
Michael Hackstein b492b154d8 Added a velocyPackFromFile to the VelocyPackHelper 2015-12-10 11:02:19 +01:00
Michael Hackstein 1e74d3eae0 Removed all references to TRI_json_t in arangosh 2015-12-10 10:25:44 +01:00
Michael Hackstein e39c1ea6c8 Now finally removed all TRI_json_t references in V8 Client arangodump. 2015-12-10 00:26:53 +01:00
Michael Hackstein 005f431bbf Removed TRI_json_t from V8Client arangodump. 2015-12-10 00:12:55 +01:00
Michael Hackstein 5e39b1e811 Added a convenience function for default http result body parsing options 2015-12-09 21:46:13 +01:00
Michael Hackstein 90da638e1a Removed TRI_json_t from V8CLient ImportHelper 2015-12-09 21:32:36 +01:00
Michael Hackstein c67c95eae4 Removed TRI_json_t from V8 client connection 2015-12-09 21:20:30 +01:00
Jan Steemann 6eb44f229e issue #1598: improved error reporting for dump/restore 2015-12-08 18:11:44 +01:00
Jan Steemann cf7fa63a53 issue #1036: allow aborting waiting HTTP requests from the ArangoShell 2015-12-03 18:55:51 +01:00
Jan Steemann 931e3f93ae issue #1036: implement CTRL-C handling in ArangoShell for Windows 2015-12-03 16:25:19 +01:00
Alan Plum 125f825420 Add process to system modules (because it's global) 2015-12-01 19:53:34 +01:00
Jan Steemann ae8904a5b6 added async flag for sync() and syncCollection() 2015-12-01 12:04:40 +01:00
Jan Steemann c690e91d77 improved error messages 2015-11-17 12:15:18 +01:00
Wilfried Goesgens 7780b48539 Fix exit code of arangosh if a script threw an exception - meanwhile the TryCatch is also inside. 2015-11-10 19:02:30 +01:00
Jan Steemann 4816490c98 simplified shell invocation code a bit 2015-11-05 16:16:49 +01:00
Jan Steemann 232cdab2a0 abort final GC after some amount of time 2015-10-26 09:17:01 +01:00
Frank Celler 4b99be0c30 added --enable-console to configure 2015-10-25 19:59:16 +01:00
Frank Celler b7de227138 removed readline 2015-10-22 15:41:33 +02:00
jsteemann d20c99a5da issue #1521: Can't dump/restore with user and password 
Conflicts:
	CHANGELOG
 2015-10-06 21:37:56 +02:00
Jan Steemann 99f244774d fixed --javascript.execute 2015-09-25 13:58:04 +02:00
Alan Plum 038267cb06 Re-implemented require/module based on Node 4.1.0 
The require function should now behave as expected and treat ArangoDB's module paths as sources for "external" modules.
The "assert", "buffer" and "path" modules have been moved out of ./js/node into the bootstrap modules.
The module "org/arangodb/foxx/arangoApp" (as well as any modules depending on it) is incompatible with the new module loading behaviour and will be have to be rewritten from scratch.
The "Package" class has been removed entirely and is no longer needed.
Support for the database-stored modules is currently missing and needs to be re-implemented within the module loader.
 2015-09-24 13:46:13 +02:00
Jan Steemann d8cfa1fc45 renamed functions 2015-09-07 21:11:48 +02:00
CoDEmanX 3a9648d78a More Americanization 2015-09-03 22:25:43 +02:00
CoDEmanX 956b396e43 Change spelling of 'initialize' to American English (actual code and files) 2015-09-01 17:29:22 +02:00
CoDEmanX b4593a7e82 Change spelling of 'initialize' to American English (comments and log messages only) 2015-09-01 17:07:21 +02:00
Jan Steemann a3ee707f6f less creations of empty headers maps 2015-08-30 22:11:18 +02:00
Jan Steemann 5bf32095a1 print abortion 2015-08-26 12:02:43 +02:00
Jan Steemann 0d0e652bdc fixed VS compile warnings 2015-08-25 18:02:00 +02:00
Jan Steemann 31a6547d4c fix replication resumption 2015-08-21 15:57:24 +02:00
Jan Steemann deb7830615 fix dump/restore filenames 2015-08-20 02:47:00 +02:00
Jan Steemann edd1e90511 clean up shell implementation code 2015-08-18 18:10:27 +02:00
Jan Steemann 8677da48b1 replication API enhancements, not yet ready 2015-08-18 18:08:20 +02:00
Willi Goesgens 35de50d153 set the mac to add hashes too. 2015-08-17 17:31:15 +02:00
Willi Goesgens 593eed4ac1 Adjust the import site of the dumper for hashes in the filenames. 2015-08-17 17:08:06 +02:00
Willi Goesgens 715ebfed4a Work around inferiour windows filesystem support by adding the md5 sum of the base-filename to the filename. 2015-08-17 15:36:49 +02:00
Jan Steemann b318d2939e save master's last log tick in dump file 2015-08-17 14:58:48 +02:00
Jan Steemann 57e9b55739 use TRI_CHAR_NODE_PAIR() 2015-08-14 00:54:59 +02:00
Jan Steemann beaa916ceb changed message 2015-08-13 11:34:37 +02:00
Jan Steemann e62974240b allow termination of current shell command 2015-08-12 21:39:16 +02:00
Frank Celler 9de6bd39db moved to strings, fixed #1432: arangosh doesn't ignore prefixed ....> on paste 2015-08-12 17:54:14 +02:00
Frank Celler 3029891405 added better readline support for control-C 2015-08-11 12:05:55 +02:00
Jan Steemann 330fac6225 some unused function cleanup 2015-08-06 21:25:32 +02:00
Jan Steemann 472a0c76b1 do not read over the end of Buffer objects 2015-08-04 19:02:14 +02:00
Jan Steemann c71dc4d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into aql-query-cache 2015-07-13 10:49:14 +02:00
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 61e09fe10c mini optimization 2015-06-27 06:51:11 +02:00
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 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