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

833 Commits

Author SHA1 Message Date
jsteemann 64c5b21074 cppcheck 2016-01-08 01:17:44 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
jsteemann 50c0e18d53 removed useless con|destructor comments 2016-01-07 21:19:53 +01:00
jsteemann 0bfc9a19ae BE -> AE 2016-01-07 21:09:33 +01:00
Jan Steemann 02de75afe0 added option --default-number-of-shards for arangorestore 2016-01-07 10:54:02 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann 9a1d7959e9 merged string-buffer.h and StringBuffer.h 2016-01-06 13:24:09 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Jan Steemann c651a4b80f next attempt to fix MacOS build 2016-01-05 14:08:30 +01:00
Jan Steemann b16efdc645 fixed CMakeLists for arangosh on Non-Linux 2016-01-05 09:33:19 +01:00
jsteemann a6cb463e06 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2016-01-05 00:25:10 +01:00
Frank Celler 1065a1bd2c added work monitor 2016-01-04 15:33:06 +01:00
Max Neunhoeffer a364974fec Adjust TODOs. 2015-12-23 15:06:08 +01:00
Max Neunhoeffer 3cb5fe7d5a Return error code when run in batch mode. 2015-12-23 15:05:40 +01:00
Max Neunhoeffer c7f00bfeda Continue work on TODOs. 2015-12-23 14:40:04 +01:00
Max Neunhoeffer 5f3a1fbdb2 Merge branch 'devel' into vpack 2015-12-22 14:18:34 +01:00
Jan Steemann dcb8c4f174 prevent segfault 2015-12-22 11:12:16 +01:00
jsteemann 19782a45a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-18 23:33:44 +01:00
jsteemann 20ed092d11 added `--create-collection-type` option for arangoimp 2015-12-18 22:26:32 +01:00
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 622fafa0fc Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2015-12-10 11:13:42 +01:00
Michael Hackstein b492b154d8 Added a velocyPackFromFile to the VelocyPackHelper 2015-12-10 11:02:19 +01:00
Jan Steemann a36e4827c7 build fix 2015-12-10 10:43:59 +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 76d5f57af0 Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-08 18:23:06 +01:00
Jan Steemann 6eb44f229e issue #1598: improved error reporting for dump/restore 2015-12-08 18:11:44 +01:00
Jan Steemann 5c033f566b Merge branch 'devel' of https://github.com/arangodb/arangodb into vpack 2015-12-04 13:47:08 +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 9ef5b4746a removed several includes from Common.h 2015-11-25 12:21:55 +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 01499dde43 added deadlock detection for lazy locking of collections 2015-10-29 11:57:22 +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
Jan Steemann 03da10bb51 attempt to fix failing Windows build 2015-10-22 18:03:07 +02: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 97120d9751 added test case aqlv8 2015-09-29 18:09:37 +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 8aa78dcb7f Fix some more typos 2015-09-05 17:18:04 +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 f5e5977eca colors only for ttys 2015-08-20 22:26:39 +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 09736f965f more lock instrumentation 2015-07-21 13:09:02 +02:00
Willi Goesgens faed66ccef * fix windows language from russian to English 
* fix creating of distinct resource files for our set of commandline tools.
 2015-07-20 14:10:49 +02:00
Willi Goesgens ee398569d7 Fix assigning of resources & versions to multiple binaries in the same cmake file 2015-07-20 10:42:07 +02:00
Willi Goesgens f2ddf10a46 Windows doesn't like strings in versions... 2015-07-17 18:51:22 +02:00
Willi Goesgens 018cfce58c Fix cmake variable referencing. 2015-07-17 17:07:42 +02:00
Willi Goesgens edabac8927 Add Version information & icons to the windows binaries. 2015-07-17 16:36:40 +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 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
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
Jan Steemann a8d5bc32b2 fixed memleaks in client tools 2014-05-17 12:49:50 +02:00
Jan Steemann 4bfde2e6d1 remove v8 dependency from arangodump, arangorestore and arangob builds 2014-05-16 21:35:02 +02:00
Jan Steemann b811d21fad issue #862: added `--overwrite` option for arangoimp 2014-05-16 21:29:20 +02:00
Jan Steemann 6da081474c explicitly name test cases 2014-05-16 18:38:53 +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
Jan Steemann 911f10cb52 included correct init header 2014-05-12 18:06:49 +02:00
Jan Steemann 594c5c3a3c use atomics 2014-05-12 18:00:55 +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 746fc5886e fix password prompt on Windows 2014-04-23 09:34:57 +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 17bf8ebafb fixed VS warnings 2014-04-03 16:13:56 +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
Jan Steemann a1e300d934 assume disable-authentication=false when a username is specified on the command-line 2014-03-24 09:28:49 +01:00
Jan Steemann 52be4acba6 adjusted the help texts 2014-03-21 22:40:02 +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 35cf13a38c more tests for shapes 2014-03-12 13:26:09 +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
Jan Steemann b9623ee59f parse configuration files even with --help 2014-02-18 10:21:44 +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
Esteban Lombeyda 8ab6290d65 Bug fix: tabulators work correct under microsoft windows. Needs 49ee3f0d0fc80cce300427a2ddbf519c61a7cb24 
of ArangoDB-Windows
 2014-02-07 16:30:04 +01:00
Jan Steemann 83b0cd8e5b fixed segfault 2014-01-30 18:46:34 +01:00
Jan Steemann e906f68235 windows fixes 2014-01-27 17:46:15 +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 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel 
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
 2013-12-30 17:27:17 +01:00
Frank Celler 9928cd645f added local config 2013-12-30 17:20:39 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 7e30dc0b4e MacOS bundle 2013-12-23 16:03:38 +01:00
Frank Celler da8f9098a2 windows installer 2013-12-23 12:48:35 +01:00
Frank Celler 87cc2c4104 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-21 13:10:15 +01:00
Frank Celler 4f0d9f5b71 install Windows binaries all in bin 2013-12-21 13:10:08 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +01:00
Frank Celler 2651f7bae5 added TRI_LocateInstallDirectory and TRI_LocateConfigDirectory 2013-12-20 10:39:50 +01:00
Frank Celler f7bf96846b Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-19 09:33:02 +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
Frank Celler 86b7fea992 Vs2013 2013-12-07 18:55:55 +01:00
Jan Steemann 6ea120ada6 issue #695: arangosh server.password error 
Documentation is fixed
 2013-12-02 13:13:51 +01:00
Jan Steemann 54b5a74530 added shapes test 2013-11-22 02:42:11 +01:00
Jan Steemann adcc26c331 added test case 2013-11-20 23:05:55 +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 914bd38cfc added check-sever 2013-11-20 09:21:22 +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
Frank Celler eee23de5e0 fixed Mac build 
Conflicts:
	Makefile.in
 2013-11-09 13:00:21 +01:00
Frank Celler 3fef8ed585 fixed Mac build 2013-11-09 12:59:24 +01:00
Frank Celler 0ad11bfc06 removed daemon mode when upgrading, added arm building 2013-11-06 09:16:18 +01:00
Jan Steemann 670393f660 updated CHANGELOG 2013-11-04 17:33:50 +01:00
Frank Celler 11683a60a2 added debian 2013-11-02 22:16:43 +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 2f4499bae1 windows fixes 2013-10-31 11:53:11 +01:00
Jan Steemann bcf6eabce7 fixed --javascript.check option for arangosh 2013-10-30 18:35:08 +01:00
Jan Steemann bc57a0c468 fixed --javascript.check option for arangosh 2013-10-30 18:33:42 +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
Frank Celler 96d3c32cb7 added startup script 2013-10-27 20:14:48 +01:00
Frank Celler 4d3045e060 cmake 2013-10-26 09:45:27 +02:00
Jan Steemann 473e52aba1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2013-10-20 20:22:20 +02:00
Jan Steemann dd058bdfbf fix typo in help text 2013-10-20 20:22:09 +02:00
Frank Celler d620386a7b added tests 2013-10-20 18:46:40 +02:00
Frank Celler f52d02f8d3 more cmake 2013-10-20 12:18:05 +02:00
Frank Celler d868171b46 more tests with cmake 2013-10-20 10:52:24 +02:00
Frank Celler 0a0bb534c3 added first attempt for cmake 2013-10-18 17:29:33 +02: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 a3b35c613c config file handling 2013-10-09 17:00:06 +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 c3a2886148 fixed some minor issues in arangob 2013-09-24 10:45:01 +02:00
Jan Steemann ed163164c4 fixed queue naming 2013-09-20 13:17:32 +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 369433f1e2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/SimpleHttpClient/SimpleHttpClient.cpp
 2013-09-05 12:34:45 +02:00
Jan Steemann 073745a5fe added --keep-alive option for arangob, improved output of arangob 2013-09-04 23:56:13 +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 4b36f1422c allow incremental dumping using tick-start and tick-end 2013-08-29 21:47:29 +02:00
Jan Steemann a42be561fd added includeSystem URL parameter 2013-08-29 21:15:47 +02:00
Jan Steemann 2556b0714f fixed issues reported by VS 2012 2013-08-29 16:43:56 +02:00
Jan Steemann a9f486a0b0 simplified version getting 2013-08-29 11:48:22 +02:00
Jan Steemann 64fda46f62 removed unused variable 2013-08-29 11:47:48 +02:00
Jan Steemann 860ed964c3 simplify build.h 2013-08-28 22:20:06 +02:00
Jan Steemann 7cb6b7d922 simplified build.h stuff 2013-08-28 19:57:07 +02:00
Jan Steemann 9b8b030a8a added several tests for authentication 2013-08-22 11:18:11 +02:00
Jan Steemann 8ca9e3d350 fixed password prompt 2013-07-27 00:49:27 +02:00
Jan Steemann 6d4a58e625 generate foxx-manager man page 2013-07-26 22:46:58 +02:00
Jan Steemann 94051a74c3 return error code from foxx-manager 2013-07-26 14:58:03 +02:00
Frank Celler 1b6dfad627 new name convention 2013-07-25 17:25:39 +02:00
Jan Steemann 8b6e79dd86 fix VisualStudio error 2013-07-24 16:01:41 +02:00
Jan Steemann c4f82088dd replication tests 2013-07-22 18:12:56 +02:00
Jan Steemann cdc57aea83 added arango.reconnect() method for arangosh 2013-07-22 09:57:39 +02:00
Jan Steemann 4a4c3d75e4 display username 2013-07-17 11:02:07 +02:00
Jan Steemann 1d80670a45 fix password prompt 2013-07-17 10:58:33 +02:00
Jan Steemann ca6b184286 added TRI_JSON_STRING_REFERENCE 2013-07-10 17:00:29 +02:00
Jan Steemann 7ef7ad297f added TRI_StealStringBuffer() 2013-07-10 12:02:42 +02:00
Jan Steemann d7561e70e1 added logging options 2013-07-02 12:16:13 +02:00