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

2100 Commits

Author SHA1 Message Date
Frank Celler 9fa3d22d6c towards new dispatcher interface 2014-08-18 23:37:32 +02:00
Max Neunhoeffer 1e592cebb9 Delete const copy constructor for better error messages. 2014-08-15 16:38:34 +02:00
Max Neunhoeffer 86055a7773 Further cleanup of Json wrapper class. 2014-08-15 14:38:10 +02:00
Max Neunhoeffer 21eda8a212 Withdraw some operator magic for Json wrapper class. 2014-08-15 13:29:01 +02:00
James b5327b3770 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-14 15:21:07 +02:00
James 392c1db4c3 JS_ExecuteAql now returns a cursor. 2014-08-14 15:20:52 +02:00
Max Neunhoeffer 2bf01eae1b Remove tabs. 2014-08-14 13:07:20 +02:00
Willi Goesgens a5c031505b Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-13 17:12:46 +02:00
Willi Goesgens dd1845ac8a Print beautiful stacktraces for C-Asserts. 2014-08-13 17:09:27 +02:00
Jan Steemann 30b32f1f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Ahuacatl/ahuacatl-grammar.h
	arangod/V8Server/v8-vocbase.cpp
	js/server/tests/ahuacatl-general-graph.js
 2014-08-13 16:29:57 +02:00
Jan Steemann 0a70e979f8 call `toJSON` function of objects (if present) when serializing 2014-08-13 16:05:58 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
Frank Celler f6e242039d relaxed % and escaping 2014-08-12 14:53:59 +02:00
Jan Steemann a2061f66a3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 14:54:25 +02:00
Jan Steemann 24f1f979d0 fixed jsonification of values 2014-08-11 14:54:14 +02:00
Max Neunhoeffer e065c1e507 Fix a bug in JsonHelper about autofree. 2014-08-11 14:28:34 +02:00
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +02:00
James a4f357c15e EnumerateListBlock now working for JSON lists and prepended "explicit" to Json constructors.. 2014-08-08 09:43:54 +02:00
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Jan Steemann cb2e9a8a37 fixed JSON conversion 2014-08-07 15:48:33 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +02:00
Jan Steemann 1015404edc working on AQL function calls and error handling 2014-08-06 16:19:43 +02:00
Jan Steemann ac7b47c0b7 nullptr 2014-08-06 09:42:36 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
 2014-08-05 15:09:28 +02:00
Thomas Schmidts baf6635627 Added missing methods to fs module. fix #978 2014-08-05 13:37:40 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Jan Steemann 6e09cd1736 gcc 2014-08-05 09:07:11 +02:00
Max Neunhoeffer 87a36596b1 Change Json format of ExecutionPlans. 2014-07-30 15:20:09 +02:00
Jan Steemann 376ae9b8dc Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-30 12:30:20 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +02:00
Max Neunhoeffer b9e5218d81 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-30 09:46:13 +02:00
Jan Steemann b657c61bee readline vs. linenoise vs. dummyshell: finally... 2014-07-30 09:43:38 +02:00
Max Neunhoeffer 8f1945bba7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-30 09:32:26 +02:00
Jan Steemann 728a439d3f readline vs. linenoise vs. dummyshell: next try 2014-07-30 09:30:41 +02:00
Jan Steemann 62d989aa61 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-30 09:19:55 +02:00
Jan Steemann e05604e5b4 issue #972: Compilation Issue 2014-07-30 09:13:40 +02:00
Jan Steemann 641d35b906 added static v8-basic optimizations 2014-07-29 12:52:37 +02:00
Max Neunhoeffer f3a5aefffb Forgot one. 2014-07-28 16:26:50 +02:00
Jan Steemann 765e44e80b execution v0.0000001 2014-07-28 15:51:38 +02:00
Max Neunhoeffer aa7e24495f Take out debugging output. 2014-07-25 15:16:34 +02:00
Max Neunhoeffer 7c983d0f7b Fix memory allocation issues in Json class. 2014-07-25 15:09:13 +02:00
Max Neunhoeffer b6122ad3dc Snapshot, this version has memcheck problems. 2014-07-25 14:25:22 +02:00
Max Neunhoeffer 067b740146 Comment and finalise Json wrapper class. 2014-07-25 10:33:54 +02:00
Max Neunhoeffer fc83eed330 Add an explicit steal() method to Json. 2014-07-25 00:31:50 +02:00
Max Neunhoeffer f1bcf6e264 Fix operator= for Json objects. 2014-07-25 00:07:20 +02:00
Max Neunhoeffer 6a1203405f Add Json wrapper class to JsonHelpers. 2014-07-24 23:41:06 +02:00
Thomas Schmidts 059b83b1d2 Comments in .md will be deleted now 2014-07-23 17:06:32 +02:00
Jan Steemann f0f9664bae fix compile warnings for Visual Studio 2014-07-23 11:35:17 +02:00
Max Neunhoeffer a8e3236560 Snapshot, legend cache started. 2014-07-22 16:59:19 +02:00
Jan Steemann 6ca37dd0eb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-22 15:17:02 +02:00
Jan Steemann b36ad17cc6 finished --wal.suppress-shape-information 2014-07-22 15:16:49 +02:00
Thomas Schmidts 2afd5cc356 Fixed some wrong references 2014-07-21 18:06:02 +02:00
Jan Steemann 33ca76773a fixed compiler warning 2014-07-21 14:22:54 +02:00
Jan Steemann ddf69e99a9 fixed tasks with offset 0.0 2014-07-21 14:22:39 +02:00
Frank Celler cf81e3ff00 generate .cpp file instead of .c file 2014-07-10 19:13:12 +02:00
Thomas Schmidts 1be856675f Added Error codes and meanings 2014-07-09 14:20:23 +02:00
Michael Hackstein 4cf8df05dc Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-07-08 13:53:43 +02:00
Michael Hackstein f763f0aa13 Added an error for the graph module. It will be thrown on the attempt to add an orphan collection that is already used. Also alloed orphan collections for restrictions in fluentAQL 2014-07-08 13:53:39 +02:00
Frank Celler e436ecfa40 if a cancelation has occured, flush the module cache 2014-07-08 11:54:53 +02:00
Frank Celler 0703809e00 added isIP 2014-07-07 18:46:02 +02:00
Thomas Schmidts 1a78807a67 Fixed a few @startDocuBlock errors 2014-07-07 16:15:50 +02:00
Max Neunhoeffer af3c55d198 Fix a typo. 2014-07-07 12:13:01 +02:00
Frank Celler b536afd7f5 lower log level to debug 2014-07-07 12:11:37 +02:00
Frank Celler 60057037e2 added ERR_clear_error 2014-07-07 12:06:13 +02:00
Frank Celler 0c56fdc431 added state transition for WANT_READ and WANT_WRITE 2014-07-06 13:43:53 +02:00
Frank Celler 906fe27886 cosmetics 2014-07-06 13:43:52 +02:00
Frank Celler 093ee72467 removed superflous shutdown 2014-07-05 23:31:29 +02:00
Frank Celler dd006970cc shutdown SSL immediately 2014-07-05 23:02:30 +02:00
Frank Celler df997d0688 removed superflous socket and connection info 2014-07-05 22:18:34 +02:00
Frank Celler 9ff5ea5e30 cosmetics 2014-07-05 22:18:05 +02:00
Frank Celler d3df9ae82c ifdef for old MacOS openssl 2014-07-04 10:50:41 +02:00
Jan Steemann bf549f902f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-03 22:51:03 +02:00
Jan Steemann f939b079c4 recovery 2014-07-03 22:49:49 +02:00
Max Neunhoeffer f1a3b687f4 Try to fix compilation of new SSL setup on Mac OSX. 2014-07-03 22:13:38 +02:00
Jan Steemann cbf7e27f68 added derived files 2014-07-03 17:12:56 +02:00
Jan Steemann 1d051f4e1e fixed shaping of regexp/date objects etc 
this is disallowed, but due to an invalid sequence of if statements such attributes
were silently converted into `{ }` before and no error was returned to the user
 2014-07-03 16:58:40 +02:00
Thomas Schmidts 648014bc8f Fixed appearance of errorCodes in Documentation, moved files 2014-07-03 16:46:07 +02:00
Jan Steemann 2babd2a1d2 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-03 12:58:18 +02:00
Max Neunhoeffer c3fbfba2d9 Try to fix SSL problems, not yet working. 2014-07-03 11:24:05 +02:00
Jan Steemann 60fd8e44e4 nullptr 2014-07-03 10:17:10 +02:00
Jan Steemann abfb1d0f31 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 18:52:45 +02:00
Jan Steemann 42ba273589 prevent assertion failure 2014-07-02 18:52:29 +02:00
Thomas Schmidts 0328c9a900 Fixed a few spelling and code erros and deleted last examples 2014-07-02 17:48:54 +02:00
Jan Steemann 33be59ed7e cxx 2014-07-02 17:24:21 +02:00
Jan Steemann 8a36d58524 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-02 16:53:30 +02:00
Jan Steemann 98a0ef0ded prevent endless connection attempts by arangosh 2014-07-02 15:18:24 +02:00
Thomas Schmidts e46d87f23c Changed documentation code in configure chapter 2014-07-02 14:08:41 +02:00
Jan Steemann 40473b58b7 safety 2014-07-02 12:19:28 +02:00
Max Neunhoeffer 77d931b03d Handle strange exceptional case of waitpid. 2014-07-02 11:17:32 +02:00
Thomas Schmidts 55aa1645ac Changes in the code documentation 2014-07-02 09:51:26 +02:00
Jan Steemann 36a67ccf32 comments 2014-07-01 23:32:24 +02:00
Thomas Schmidts a828ed3d08 Changed some code comments 2014-07-01 16:30:36 +02:00
Jan Steemann 270ab5d045 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-01 15:14:22 +02:00
Jan Steemann ef6f7b44ab comments 2014-07-01 15:14:16 +02:00
Thomas Schmidts 0577583aa5 Changes in the documentation code for API 2014-07-01 14:18:12 +02:00
Jan Steemann 0e5679693c fixed compile warnings 2014-07-01 13:17:46 +02:00
Jan Steemann 4cd20bfb7c fixed syncs across multiple files 2014-07-01 13:12:36 +02:00
Frank Celler 7bdc42a7d1 added yy_fatal_error unused function fix 2014-06-30 09:21:24 +02:00
Max Neunhoeffer dc956d3598 Fix linking problem on Linux. 2014-06-30 09:06:10 +02:00
Jan Steemann f2ed881227 upgrade error message 2014-06-29 00:18:42 +02:00
Jan Steemann 1b92282b32 less string buffer moves 2014-06-27 23:58:19 +02:00
Jan Steemann 76de1ae762 cppcheck 2014-06-27 22:20:17 +02:00
Jan Steemann 067dbf63b2 WAL recovery 2014-06-27 19:11:41 +02:00
Jan Steemann d827eaea2d simplified 2014-06-26 15:44:34 +02:00
Frank Celler 74582d1c13 use abort to crash (for MacOS segfault freezes the server) 2014-06-26 14:05:40 +02:00
Frank Celler af6eab46af Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-06-26 13:24:53 +02:00
Frank Celler 31dea7dee3 moved scripts to utils 2014-06-26 13:24:42 +02:00
Jan Steemann 96569367d7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/VocBase/document-collection.cpp
 2014-06-26 13:07:53 +02:00
Frank Celler 4ae1f0cd4a added temporary attribute entries in shaper 2014-06-26 12:50:50 +02:00
Jan Steemann 723a0ab265 fixed some memory errors 2014-06-26 11:52:37 +02:00
Jan Steemann c4aad1e0cd added tests 2014-06-24 15:11:19 +02:00
Alan Plum d2f0b0efc5 Added HMAC-SHA224, exposed SHA1, SHA224. 2014-06-24 12:49:20 +02:00
Jan Steemann 5846e4a9fe removed startup option `--random.no-seed` 2014-06-24 11:44:28 +02:00
Jan Steemann 5dc4f31e29 dont provide functionality in non-debug mode 2014-06-24 00:34:53 +02:00
Jan Steemann 13e061bd76 fixed tests 2014-06-23 17:46:00 +02:00
Jan Steemann 3b0d8b15d6 re-added replication 2014-06-23 13:22:38 +02:00
Jan Steemann 6ec4cdec53 issue #919: remove potentially existing temporary file 2014-06-21 14:32:59 +02:00
Jan Steemann 69eb029c56 CXX 2014-06-21 03:21:55 +02:00
Jan Steemann ac04c3384e removed double const 2014-06-21 03:20:22 +02:00
Frank Celler 28f4433bff Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Wal/LogfileManager.cpp
 2014-06-20 16:43:28 +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
Jan Steemann 5556cd8dad fixed startup on Windows 2014-06-20 16:42:21 +02:00
Frank Celler 6936972d08 updated disclaimer 2014-06-20 16:41:35 +02:00
gschwab 28b5f27ca6 error added 2014-06-20 16:18:58 +02:00
gschwab eefd78ae0a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:49:23 +02:00
Jan Steemann 7e52ebbc3b fixes for Visual Studio 2014-06-20 15:46:33 +02:00
gschwab ced319c9ca Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-20 15:37:45 +02:00
Frank Celler b9fd33c473 LLVM does not know __thread 2014-06-20 15:37:12 +02:00
gschwab 3fb7a85ca0 error handling 2014-06-20 15:36:26 +02:00
gschwab ad6e867e9d merge 2014-06-20 15:15:16 +02:00
gschwab b311c94977 exception handling 2014-06-20 15:11:29 +02:00
Jan Steemann 70d589eaa8 fixed compile error 2014-06-20 14:42:17 +02:00
Jan Steemann 09a64c1f7f fixed compile warnings 2014-06-20 14:30:36 +02:00
Jan Steemann 9b713fccba renamed macro 2014-06-20 13:43:29 +02:00
Jan Steemann 56b032c688 more tests 2014-06-20 09:38:35 +02:00
Jan Steemann cc35e4696c added more tests 2014-06-20 09:20:27 +02:00
Jan Steemann c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann 65d130c0f2 removed unused suppressions file 2014-06-18 22:51:04 +02:00
Jan Steemann a6bb3985bd removed doxygen comments 2014-06-18 22:15:10 +02:00
Jan Steemann 5fb901d713 cppcheck 2014-06-18 21:27:53 +02:00
Jan Steemann 9fc03ec85f cppcheck 2014-06-18 21:13:20 +02:00
Jan Steemann 589ff8e208 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-18 17:26:20 +02:00
Jan Steemann 4a28040d37 --enable-failure-tests 2014-06-18 17:09:41 +02:00
Frank Celler 2b3c686e42 rearranged messages 2014-06-18 16:35:09 +02:00
Jan Steemann 0567e64f2f recovery 2014-06-17 18:23:14 +02:00
Jan Steemann acba4c8851 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	CHANGELOG
 2014-06-17 15:31:04 +02:00
Jan Steemann 091491d13b crash recovery tests 2014-06-17 15:30:11 +02:00
Alan Plum a682767efc Added HMAC MD5. 2014-06-17 13:25:07 +02:00
Jan Steemann a231ab3d29 return HMAC as hex 2014-06-17 11:25:53 +02:00
Jan Steemann 70fec69952 added crypto.hmac function 2014-06-17 11:20:46 +02:00
Jan Steemann b303db2b50 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/apps/system/aardvark/frontend/js/bootstrap/errors.js
	js/common/bootstrap/errors.js
 2014-06-17 00:49:18 +02:00
Jan Steemann a1177816aa modifiable AQL, final syntax 2014-06-17 00:37:08 +02:00
Jan Steemann ff494cc897 added recovery tests (not functional yet) 2014-06-16 16:52:26 +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
Jan Steemann 2a0e0b18d0 added many tests 2014-06-16 14:39:26 +02:00
gschwab 7318417cf8 made make 2014-06-16 14:36:28 +02:00
gschwab 3943fdeb13 refactored orphan treatment for guacamole belongings 2014-06-16 14:16:21 +02:00
Jan Steemann b3d18d0deb cppcheck 2014-06-16 09:50:38 +02:00
Jan Steemann 964af24fe7 fixed compiler warnings 2014-06-14 01:49:17 +02:00
Jan Steemann 51cb9257e5 speed up string-buffer reusage by simplehttpclient 2014-06-14 01:24:43 +02:00
Jan Steemann af57d28711 cleanup 2014-06-13 21:59:09 +02:00
Jan Steemann 1a3dca4e78 cleanup 2014-06-13 21:40:58 +02:00
Jan Steemann 47999865d6 read-only mode 2014-06-13 15:32:13 +02:00
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +02:00
Jan Steemann fabc51f889 fixed wrong ASSERT usage 2014-06-13 12:10:35 +02:00
Jan Steemann d5e695e63f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/RestServer/ArangoServer.h
	arangod/VocBase/server.cpp
	js/common/bootstrap/errors.js
 2014-06-13 02:23:03 +02:00
Max Neunhoeffer 53cebee93b Remove an unused "using namespace triagens;". 2014-06-12 16:28:07 +02:00
Max Neunhoeffer 369ea69d28 Take care of primitive shapes in LegendReader. 2014-06-12 16:04:32 +02:00
Max Neunhoeffer 131da49f60 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-06-12 15:42:06 +02:00
Max Neunhoeffer 982ca7460b Implement StringifyMarkerDump for WAL markers. 
This implements a LegendReader class inheriting from TRI_shaper_t,
to allow for TRI_StringifyArrayShapedJson to work.
 2014-06-12 15:30:18 +02:00
gschwab c46e0df090 added CRD for orphan collections of graphs 2014-06-12 15:28:35 +02:00
gschwab 17e850f646 fixed tests 2014-06-12 13:30:21 +02:00
gschwab d8bcfd3bbb Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-06-12 11:36:39 +02:00
gschwab 7f9d3ffc03 fixed errors, added (standalone) vertex collection function for graphs 2014-06-12 11:36:29 +02:00
Jan Steemann dae5a5151d call (still empty) WAL recovery procedure at startup 2014-06-12 11:28:48 +02:00
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +02:00
Jan Steemann 89f6070e01 cppcheck 2014-06-11 17:53:44 +02:00
Jan Steemann cc115a2766 removed outdated upgrade methods 2014-06-11 17:38:49 +02:00
Max Neunhoeffer d916d5d714 Fix Legendung. 2014-06-11 15:47:42 +02:00
Jan Steemann ace37fc26a Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-11 14:25:27 +02:00
Jan Steemann 49cc332361 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	js/common/bootstrap/errors.js
 2014-06-11 14:23:47 +02:00
Max Neunhoeffer 88a19e5928 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
 2014-06-11 14:22:53 +02:00
Max Neunhoeffer 1ab7aa6c7c Fix bug in array legendung. 2014-06-11 14:20:56 +02:00
Max Neunhoeffer 0bf6ad1189 Correct documentation of offsets. 2014-06-11 14:19:48 +02:00
Jan Steemann 63288f7405 legend fix 2014-06-11 14:18:11 +02:00
Jan Steemann 28d2ae151e flush 2014-06-11 14:18:04 +02:00
Max Neunhoeffer cf83fecda2 Explain offsets are relative to... 2014-06-11 14:04:07 +02:00
Frank Celler 4c09448d28 result is no longer used 2014-06-10 13:15:27 +02:00
Jan Steemann d9653bc462 DML for AQL 2014-06-10 09:30:27 +02:00
Jan Steemann 72a102e794 major internal changes 2014-06-08 00:12:53 +02:00
Jan Steemann 7b9e3af0f1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/voc-shaper.cpp
 2014-06-06 17:00:49 +02:00
Frank Celler b6aee8fce1 added define for random vs rand 
Conflicts:
	CHANGELOG
	VERSION
	build.h
	configure
	configure.ac
 2014-06-06 15:13:15 +02:00
Frank Celler 315232f2c8 fixed order of checks 2014-06-06 15:10:27 +02:00
Jan Steemann 362838ae69 TRI_ASSERT 2014-06-06 11:25:19 +02:00
Jan Steemann 8da6824d15 added TRI_ASSERT and TRI_ASSERT_EXPENSIVE 2014-06-06 10:32:20 +02:00
Jan Steemann cb5bb4eb0e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/Makefile.files
	arangod/RestHandler/RestEdgeHandler.cpp
	arangod/V8Server/v8-vocbase.cpp
	arangod/VocBase/voc-shaper.cpp
 2014-06-05 22:58:49 +02:00
Frank Celler 2cfb2e0577 fixed issue #883: arango 2.1 - when starting multi-machine cluster, UI web does not change to cluster overview 
Conflicts:
	CHANGELOG
	lib/ShapedJson/shape-accessor.cpp
	lib/ShapedJson/shape-accessor.h
 2014-06-05 15:58:19 +02:00
Jan Steemann 229e710dd1 less memset 2014-06-05 01:15:40 +02:00
Jan Steemann ed0af6e7a4 less memset 2014-06-05 01:15:12 +02:00
Jan Steemann e31a91affe calculate lengths only once during dump() 2014-06-05 01:14:38 +02:00
Jan Steemann d7c6f74bf8 less doxygen-style comments 2014-06-05 01:13:01 +02:00
Jan Steemann ad1feb0ed4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-04 14:30:28 +02:00
Frank Celler eda4b0cde4 fixed dfdb 2014-06-04 11:02:42 +02:00
Jan Steemann edd97f9bf3 removed doxygen comments 2014-06-03 17:35:44 +02:00
Jan Steemann 8ea7fa5e4a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-06-03 17:18:02 +02:00
Thomas Schmidts 87e0d54f04 small changes for new documentation in code-docu 2014-06-03 14:55:39 +02:00
Jan Steemann 715d11cb22 removed consts 2014-06-03 10:17:09 +02:00
Jan Steemann b7b6dafce9 removed libraryloader 2014-06-02 15:46:54 +02:00
Jan Steemann 2c934cf1aa Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/RestServer/ArangoServer.cpp
	arangod/V8Server/ApplicationV8.cpp
 2014-06-02 09:52:05 +02:00
Frank Celler f054c71447 fixed log messages 2014-06-01 13:37:13 +02:00
Jan Steemann f055a7e3a2 added comment 2014-05-31 02:56:37 +02:00
Jan Steemann 5962e9dfc4 added std::19337 2014-05-31 02:56:18 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann 7b521a4c9e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/VocBase/document-collection.cpp
	arangod/VocBase/document-collection.h
 2014-05-30 12:51:20 +02:00
Jan Steemann c2478e30ec adjusted types for Windows 2014-05-30 12:09:17 +02:00
Frank Celler c8ddff2a9b fixed shutdown for busy V8 contexts 2014-05-30 11:39:11 +02:00
Jan Steemann 4cbdbba633 unregister all user tasks on shutdown 2014-05-28 21:36:05 +02:00
Jan Steemann 57d0d4a5ca inlined some functions 2014-05-28 21:12:16 +02:00
Jan Steemann 4f3ed048e4 fixed disconnect of agency connections, use less CPU while spinning in agency methods 2014-05-28 13:44:35 +02:00
Jan Steemann 7f6877e978 fixed wrong URL in API description 2014-05-28 11:01:34 +02:00
Jan Steemann 74ccb66d59 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-28 09:17:55 +02:00
Esteban Lombeyda 42525b2858 checking header file of DummyShell. This shell is not in use 2014-05-28 08:48:28 +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 adfaf9b760 garbage collection 2014-05-26 16:06:18 +02:00
Frank Celler ecd5641d03 added i/o stats 2014-05-25 23:11:03 +02:00
Jan Steemann e198c2f926 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:33:38 +02:00
Jan Steemann 922d4890f2 Fixes to compile under Visual Studio. 2014-05-22 16:27:30 +02:00
Jan Steemann bd6ca1aeb2 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 16:00:21 +02:00
Jan Steemann ea97d443b0 use wal shape and attribute markers 2014-05-22 16:00:00 +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 cb2f826494 Document legend format and fix offsets. 2014-05-22 14:08:03 +02:00
Max Neunhoeffer 12684aeb9b Add source code comments to Legends.{cpp,h}. 2014-05-22 11:10:04 +02:00
Jan Steemann 01a4c43b81 Merge branch 'mjmh' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 10:52:23 +02:00
Jan Steemann cf099a629b dump markers 2014-05-22 10:52:12 +02:00
Max Neunhoeffer 2820afdcc2 Remove many extern "C" declarations that are no longer needed. 2014-05-22 10:19:03 +02:00
Max Neunhoeffer e7560357d2 Further cleanup with #include "Basics/Common.h" 2014-05-21 16:59:54 +02:00
Max Neunhoeffer 726198007c Do not use linenoise with cmake under non-Windows. 2014-05-21 16:10:53 +02:00
Max Neunhoeffer c913f3a4c7 Fix lib/CMakeLists.txt 2014-05-21 15:59:04 +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 792b6d4458 Repair C++ version of program-options.c 2014-05-21 15:00:06 +02:00
Max Neunhoeffer 50783b36c8 program-options.c -> program-options.cpp 2014-05-21 14:50:52 +02:00
Max Neunhoeffer 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 77025348df Make JsonParser C++, however, functions still extern "C". 2014-05-21 13:56:45 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Max Neunhoeffer 786ea250ba Snapshot. 2014-05-21 11:20:03 +02:00
Max Neunhoeffer 07f9b941bb Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-21 08:38:58 +02:00
Jan Steemann c15acbab08 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	lib/ShapedJson/Legends.cpp
	lib/ShapedJson/Legends.h
 2014-05-20 17:03:49 +02:00
Max Neunhoeffer a5f901fe37 Add pointer marking functionality. 2014-05-20 15:25:51 +02:00
Jan Steemann b20240b829 added legend 2014-05-20 14:37:57 +02:00