1
0
Fork 0
Commit Graph

1813 Commits

Author SHA1 Message Date
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