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

828 Commits

Author SHA1 Message Date
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 c60bde28b6 added crash tests 2014-06-20 08:36:36 +02:00
Jan Steemann a6bb3985bd removed doxygen comments 2014-06-18 22:15:10 +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 091491d13b crash recovery tests 2014-06-17 15:30:11 +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 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
gschwab f067be5a97 orphan may only be added when not used in edge def 2014-06-13 13:56:39 +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
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
Frank Celler 299b99ed00 fixed check-version for empty directory 2014-06-11 19:30:12 +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
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
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 d7c6f74bf8 less doxygen-style comments 2014-06-05 01:13:01 +02:00
Jan Steemann e106f2a38d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-31 02:57:16 +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
Jan Steemann cf099a629b dump markers 2014-05-22 10:52:12 +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 69353334eb Get rid of TRI_ENABLE_CLUSTER everywhere. 2014-05-21 14:46:47 +02:00
Max Neunhoeffer 0af211c1e5 More header cleanups. 2014-05-21 13:42:41 +02:00
Max Neunhoeffer a5f901fe37 Add pointer marking functionality. 2014-05-20 15:25:51 +02:00
Max Neunhoeffer 0dab3706c5 Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:27:57 +02:00
Max Neunhoeffer dbd973164b Finish first version of JsonLegend, not activated in Makefile. 2014-05-20 13:24:29 +02:00
Jan Steemann 168fdcf6ef Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	UnitTests/Basics/bson-test.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Basics/BsonHelper.h
 2014-05-19 11:21:58 +02:00
Jan Steemann 2bc4aa90af fixed issues found by scan-build 2014-05-15 10:09:06 +02:00
Jan Steemann 8a5c2438b9 removed tabs 2014-05-14 18:01:40 +02:00
Jan Steemann 9f7923ace3 fixed VS warnings 2014-05-13 13:39:42 +02:00
Jan Steemann 3f6d28de8d fixed VS warnings 2014-05-13 12:44:00 +02:00
Jan Steemann 027ec2d3f4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 
Conflicts:
	arangod/V8Server/V8PeriodicTask.cpp
	arangod/V8Server/V8PeriodicTask.h
	arangod/V8Server/v8-actions.cpp
	js/common/bootstrap/module-internal.js
	js/server/server.js
	lib/Dispatcher/ApplicationDispatcher.cpp
	lib/Dispatcher/RequeueTask.cpp
	lib/GeneralServer/GeneralListenTask.h
	lib/Scheduler/ApplicationScheduler.cpp
	lib/Scheduler/PeriodicTask.cpp
	lib/Scheduler/Scheduler.cpp
	lib/Scheduler/Scheduler.h
	lib/Scheduler/Task.cpp
	lib/Scheduler/Task.h
	lib/Scheduler/TimerTask.cpp
	lib/Scheduler/TimerTask.h
 2014-05-12 16:49:20 +02:00
Max Neunhoeffer 8ce1b08183 Add a ClusterMethod to truncate a collection in a cluster. 2014-05-09 23:14:41 +02:00
Jan Steemann 2e17f4bcd7 cppcheck 2014-05-09 00:21:17 +02:00
Jan Steemann 20292af75c throw different type of debug error to prevent bogus "out-of-memory" errors 2014-05-08 23:00:18 +02:00
Jan Steemann 8fa45ca181 added string task ids for periodic jobs 2014-05-08 22:59:36 +02:00
Jan Steemann 7b9ce7046f added typecasts 2014-05-08 14:29:15 +02:00
Jan Steemann 7f9446f6bc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-07 18:48:44 +02:00
Jan Steemann 7d28a03782 added AQL date functions 2014-05-07 18:17:46 +02:00
Max Neunhoeffer a312d496a9 Finish server functionality for cluster dump. 2014-05-07 16:36:47 +02:00
Max Neunhoeffer 8ba8ffcbb1 Add a useful const. 2014-05-07 16:34:22 +02:00
Max Neunhoeffer 18b759ce32 Fix killing of processes unknown to arangod under Unix. 2014-05-06 11:41:55 +02:00
Jan Steemann 0a5e641f97 added index memory usage statistics 
this also adds index memory usage to the output of the `figures` method
 2014-05-02 22:05:29 +02:00
Jan Steemann 77d02b1235 fixed invalid typedef 2014-05-02 12:29:11 +02:00
Max Neunhoeffer 0dd2bfe38e Cleanup 64-byte alignment for 32-bit compilation. 2014-04-24 11:08:28 +02:00
Jan Steemann d3d3473013 fixed compile warning regarding ISOC90 2014-04-23 21:30:55 +02:00
Jan Steemann f34d25381f don't log if not properly initialised 2014-04-22 22:00:09 +02:00
Jan Steemann 341481ba66 fixed Windows compile errors and warnings 2014-04-22 14:49:00 +02:00
Frank Celler 8e9ad58f3b added cancelation of asnyc jobs 
Conflicts:
	arangod/V8Server/ApplicationV8.cpp
	arangod/V8Server/v8-actions.cpp
	lib/Rest/Handler.h
 2014-04-16 20:16:22 +02:00
Jan Steemann b5cb711a47 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-11 13:01:13 +02:00
Frank Celler fc0ffd40b6 added missing figures 2014-04-10 11:48:35 +02:00
Jan Steemann 0852dbb301 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-04-09 09:51:38 +02:00
Jan Steemann f893a9e53e typecast 2014-04-09 09:36:21 +02:00
Jan Steemann c29cf874b5 transaction interface 2014-04-08 14:40:09 +02:00
Jan Steemann de38d8c0ea simplify serialisation of JSON into string-buffer 2014-04-07 21:31:23 +02:00
Jan Steemann 3cc2b59e74 size tests 2014-04-07 21:27:57 +02:00
Jan Steemann 87b31f9793 VS fixes 2014-04-07 11:50:52 +02:00
Jan Steemann 0f5ae9b4eb use WorkingSetSize instead of PeakWorkingSetSize 2014-04-04 16:43:38 +02:00
Jan Steemann 282f510e34 fixed race conditions 2014-04-04 14:57:14 +02:00
Max Neunhoeffer 41befb9d85 Move BSON to C++. 2014-04-04 12:51:45 +02:00
Jan Steemann 6baeaf606d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-03 16:14:19 +02:00
Jan Steemann 17bf8ebafb fixed VS warnings 2014-04-03 16:13:56 +02:00
Max Neunhoeffer 5a2debd863 Add a first version (only 2 funcs) of tri-bson.h 2014-04-03 15:55:51 +02:00
Jan Steemann 23dffa05a7 change parameter name to avoid compiler warnings 2014-04-03 13:34:55 +02:00
Esteban Lombeyda d9e9983286 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-02 16:29:10 +02:00
Esteban Lombeyda df2ef651fe Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-04-02 16:27:57 +02:00
Esteban Lombeyda dfd7eb7bae implementation of thread number and process times for windows 2014-04-02 14:47:33 +02:00
Jan Steemann 50f2ffaaaf fixed misbehaving memory barriers for Visual Studio 2013 
seems we are affected by the issue described here:
http://lists.schmorp.de/pipermail/libev/2014q1/002318.html
 2014-04-02 14:19:40 +02:00
Max Neunhoeffer 0b80d25c29 Fix bug in associative-multi-pointer hash. 
Also finish unittest for it.
 2014-04-01 20:28:58 +02:00
Esteban Lombeyda 4d9534280b implementing process information for windows processes 2014-04-01 17:05:17 +02:00
Max Neunhoeffer 2970899e6c More debug code to track down bug in hash table. 2014-04-01 16:22:54 +02:00
Max Neunhoeffer 5fb98df16e Debugging output. 2014-04-01 15:54:51 +02:00
Max Neunhoeffer 4f0453e6f9 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-04-01 14:50:52 +02:00
Max Neunhoeffer 8585d97c80 Fix a bug in multi pointer hash. 2014-04-01 14:50:29 +02:00
Jan Steemann 70f0c5c304 lol VS 2014-04-01 11:19:45 +02:00