1
0
Fork 0
Commit Graph

2892 Commits

Author SHA1 Message Date
Jan Steemann e106f2a38d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-31 02:57:16 +02:00
Jan Steemann d4dd58b264 merged primary-collection.cpp with document-collection.cpp 2014-05-31 00:22:32 +02:00
Jan Steemann cce2942dd5 cleanup 2014-05-30 20:55:52 +02:00
Jan Steemann 19b0642d08 removed fsrt.inc 2014-05-30 20:39:02 +02:00
Jan Steemann 186c1b9257 removed fsrt 2014-05-30 20:23:15 +02:00
Jan Steemann 1fd155edc4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-05-30 19:15:07 +02:00
Jan Steemann fb6b97b9b9 re-added transactions 2014-05-30 17:42:39 +02:00
Jan Steemann 8d97f4f978 added comments 2014-05-30 14:17:21 +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 39afcff925 type casts 2014-05-30 12:27:13 +02:00
Frank Celler c8ddff2a9b fixed shutdown for busy V8 contexts 2014-05-30 11:39:11 +02:00
Jan Steemann 72541e5046 prevent small leak in case of shutdown 2014-05-29 15:06:07 +02:00
Jan Steemann ed6a55abb9 specialized primary index for faster comparisons and less datafile lookups 2014-05-29 03:35:37 +02:00
Max Neunhoeffer 04a3dfff7b Fix logic of abort in handlePlanChangeCoordinator. 2014-05-29 00:32:13 +02:00
Max Neunhoeffer 283af09657 Fix startup race bug in cluster.
If a coordinator cannot get the users of a database, it just gives
up and immediately tries again in the next heartbeat.
2014-05-28 23:18:30 +02:00
Max Neunhoeffer cf35550057 Reduce timeout to get users data on coordinator. 2014-05-28 23:18:12 +02:00
Jan Steemann 4cbdbba633 unregister all user tasks on shutdown 2014-05-28 21:36:05 +02:00
Jan Steemann 350e8fc8fe fast path for named property access 2014-05-28 21:35:42 +02:00
Jan Steemann 4283664a65 added assert 2014-05-28 21:11:52 +02:00
Jan Steemann bd9e8b0478 fixed too eager iteration over skiplists 2014-05-28 15:19:57 +02:00
Max Neunhoeffer 0b2544910e Fix database order to do _system first in handlePlanChangeCoordinator 2014-05-28 15:16:57 +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
Esteban Lombeyda 6d76e8c6ac Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-05-28 10:29:45 +02:00
Esteban Lombeyda a4a4d770b6 more documentation 2014-05-28 10:29:10 +02:00
scottashton 504a167077 added commonNeighbors and commonProperties to ahuacatl and general-graph 2014-05-28 09:59:10 +02:00
Jan Steemann e52f6f9d05 reworked 2014-05-27 18:42:40 +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 dc1fd1f617 added reserve function 2014-05-26 17:24:16 +02:00
Jan Steemann adfaf9b760 garbage collection 2014-05-26 16:06:18 +02:00
Frank Celler d097755324 cleanup of statistics, new css, merge css, view and template, added long/short history, exclude all statistics collections, added clusterId
Conflicts:
	js/apps/system/aardvark/frontend/scss/_newDashboard.scss
	js/apps/system/aardvark/frontend/scss/_resizing.scss
	js/apps/system/aardvark/frontend/scss/generated.css
	js/apps/system/aardvark/statistics.js
2014-05-25 23:10:10 +02:00
scottashton 51cc041052 added GRAPH_VERTICES 2014-05-23 14:29:53 +02:00
Max Neunhoeffer 45a687dbd1 Merge branch 'mjmh' of ssh://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 10:32:35 +02:00
Max Neunhoeffer ba270940f6 Silence a few compiler warnings. 2014-05-23 10:30:30 +02:00
Jan Steemann 558048d267 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-23 09:34:33 +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 0d5c01cf48 removed old functions 2014-05-23 09:33:33 +02:00
scottashton 25d6bf15f1 cleaned up merge conflict 2014-05-22 17:54:13 +02:00
scottashton 3bec9b4c93 refactored aql 2014-05-22 17:49:20 +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
Esteban Lombeyda bcd8490c1b Supporting new signature for remove function 2014-05-22 14:35:17 +02:00
Jan Steemann 430d5ee9f2 added wal shape and attribute markers 2014-05-22 13:28:48 +02:00
Jan Steemann ac7e73f6e7 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into mjmh 2014-05-22 13:11:39 +02:00
Jan Steemann 6ad1ba13cc fixed mutex in key generator 2014-05-22 13:11:23 +02:00
Jan Steemann de14fa5944 removed old CRUD methods 2014-05-22 12:17:51 +02:00
Jan Steemann 081b7fd394 fixed key generators 2014-05-22 11:59:33 +02:00
Jan Steemann c5103e28b3 fixed edges 2014-05-22 11:27:17 +02:00
Esteban Lombeyda 15cb6e3f0d documentation was adapted to new signatures 2014-05-22 11:09:47 +02:00