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

668 Commits

Author SHA1 Message Date
Frank Celler bb3acf8cd5 fixed /_admin/log 2016-02-04 00:41:50 +01:00
Kaveh Vahedipour a4623a395d Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-03 09:33:25 +01:00
jsteemann d9de65acf8 remove now useless casts when invoking logger 2016-02-02 21:38:01 +01:00
Kaveh Vahedipour 0a068ed86a OpenSSL check on OSX finds shipped 0.98. We need better than that. 2016-02-01 15:41:08 +01:00
Kaveh Vahedipour 3a6ce7bc03 Merge branch 'cmakification' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 14:24:22 +01:00
Kaveh Vahedipour 6194a83437 making progress building unix versions 2016-02-01 13:06:06 +00:00
Kaveh Vahedipour 99b0ca712e Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 13:02:15 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
Kaveh Vahedipour 22cc984f84 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-02-01 11:02:31 +00:00
Jan Christoph Uhde ed9856da40 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
* 'devel' of https://github.com/arangodb/arangodb: (166 commits)
  added deadlock test
  more logging
  fixed filename order in Makefile
  removed unused functions and headers
  removed `using namespace std`
  fix g++ complaint about exceeding variable tracking size
  honor results of clang-test, clang-tidy and clang-modernize
  Documentation: Web Interface-bind parameter example added
  fix or annotate problems identified by clang-check
  fixed leak
  fixed warnings shown by clang-3.7
  Documentation: Parameters Binding links
  Documentation: Aql with ArangoDB Web Interface
  fixed compile error in non-maintainer-mode
  removed last LOG_xxx macros
  remove TRI_ENABLE_LOGGING
  use Logger
  more files using the Logger
  logger transition: all files in arangod exception transactions.cpp
  added setLevel
  ...
 2016-02-01 10:00:46 +01:00
Jan Christoph Uhde 03409a84cc fix icu related linking issues 2016-01-31 23:06:24 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann 353c9732b7 removed last LOG_xxx macros 2016-01-30 04:03:18 +01:00
jsteemann 5bfd12a0ce Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-01-30 01:08:59 +01:00
jsteemann 9482ee1cca use Logger 2016-01-30 00:08:35 +01:00
jsteemann 00a68113b5 more files using the Logger 2016-01-29 23:45:10 +01:00
Frank Celler 44a519b89e added setLevel 2016-01-29 23:25:05 +01:00
Frank Celler eef111f4ae added Logger 2016-01-29 19:23:24 +01:00
Frank Celler 175e1e6b51 moved low level mutex in Mutex class 2016-01-27 15:31:02 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3d8a52cdf4 some refactoring 2016-01-27 13:28:19 +01:00
Wilfried Goesgens ac277648f3 Change the way windows eventlogging is handled: initialize it once on start. 
Fix unhandled exception handler to do less resource allocation.
 2016-01-26 16:50:19 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Kaveh Vahedipour 3f39a10bf8 Integrated obiwahn contributions 2016-01-25 13:46:44 +01:00
Kaveh Vahedipour 180eae9186 Merge branch 'devel' of https://github.com/arangodb/arangodb into cmakification 2016-01-25 09:14:06 +01:00
Jan Christoph Uhde 1a44d102ed add v8 and icu as imported targets 2016-01-23 15:06:33 +01:00
Frank Celler 2a590d16d4 mutex is not necessary, because it is initialized in the boot phase 2016-01-22 14:19:00 +01:00
Frank Celler d3330bdf9b fixed temp path to honor TMPDIR 2016-01-22 13:16:25 +01:00
Kaveh Vahedipour 5679410317 Building on OSX 2016-01-21 15:17:43 +01:00
Jan Steemann 25abd4f717 fixes for Visual Studio 2016-01-21 09:46:26 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Frank Celler 9840280637 added vm 2016-01-15 12:36:57 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
Jan Steemann 687d6133f0 comments reformatting 2016-01-11 09:52:39 +01:00
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