1
0
Fork 0
Commit Graph

13561 Commits

Author SHA1 Message Date
Simon Grätzer 553421196a Pregel: Migrated to boost deadline_timer 2017-03-17 19:54:33 +01:00
jsteemann 5b1409dd40 make registerViewImplementation static 2017-03-17 17:24:09 +01:00
Simon Grätzer 79c2e87bac Pregel: code reformatting 2017-03-17 16:21:25 +01:00
Simon Grätzer 782d63b79f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 16:13:53 +01:00
jsteemann 8282aa61df Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 16:03:29 +01:00
jsteemann 6528ded053 commented the interface 2017-03-17 16:03:21 +01:00
Kaveh Vahedipour 68178599e0 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 15:59:31 +01:00
Simon Grätzer 31f30378cf Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 15:55:07 +01:00
Simon Grätzer 162a0476c3 Pregel: Removed ThreadPool, added test for memory mapping 2017-03-17 15:55:01 +01:00
Kaveh Vahedipour a87fb6d71e restructured the leadership takeover 2017-03-17 15:44:58 +01:00
jsteemann 5d6dcb3bf1 re-added constructionguard 2017-03-17 15:44:22 +01:00
jsteemann a2a14652b2 re-added ConstructionGuard 2017-03-17 15:12:14 +01:00
jsteemann 650d1afad5 fix leaks during cleanup 2017-03-17 13:38:23 +01:00
Simon Grätzer 18989d1026 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 13:26:19 +01:00
jsteemann 1d772584b7 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 12:35:00 +01:00
Frank Celler 31de362d84 switch to uint64 for hidden options --server.minimal-threads and --server.maximal-threads 2017-03-17 12:34:47 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
jsteemann c46c52d8c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-17 09:31:25 +01:00
jsteemann 67c1770f3e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 09:29:03 +01:00
jsteemann 8a69f5716f show collection load time in slow queries 2017-03-17 09:28:53 +01:00
Frank Celler 5759414ec1 because VST supports pipelining, allows queue the request in the scheduler 2017-03-17 09:08:01 +01:00
Dan Larkin a233b949c3 Updated rest handler and tests. 2017-03-16 22:36:15 -04:00
Dan Larkin 508aabeafe Updated schema, added LoggerView, and added support for implementation properties. 2017-03-16 19:45:48 -04:00
Simon Grätzer 68f32177c6 Added test for mapped files in TypedBuffer.h 2017-03-16 17:17:05 +01:00
jsteemann fd07af5216 renamed index type 2017-03-16 17:00:19 +01:00
jsteemann e22586f40c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 16:45:31 +01:00
jsteemann 1932fd1975 moved files 2017-03-16 16:45:02 +01:00
jsteemann a87b8c4f25 generalize usleep argument 2017-03-16 16:27:40 +01:00
jsteemann 2c0f9d9369 Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 15:47:48 +01:00
jsteemann 9eb8942af9 fix startup dependencies 2017-03-16 15:47:04 +01:00
Max Neunhoeffer 00cf48b638 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-16 14:13:44 +01:00
Max Neunhoeffer d4d532faa4 Silence a compiler warning. 2017-03-16 14:13:28 +01:00
Simon Grätzer a01c529d8a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 14:12:50 +01:00
Simon Grätzer 5cc259e2a1 Pregel micro optimization 2017-03-16 14:12:43 +01:00
Max Neunhoeffer bbcc20378a Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-03-16 13:54:02 +01:00
Max Neunhoeffer 428b6aa67f Port thread fixes from 3.1 to devel. 2017-03-16 13:53:40 +01:00
baslr 5179c39fec if enterprise add LdapFeature 2017-03-16 13:34:13 +01:00
jsteemann 060fe10d53 expose registerViewImplementation to the outside world 2017-03-16 13:00:33 +01:00
jsteemann 979f003538 added ViewTypesFeature 2017-03-16 12:50:22 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
Simon Grätzer a823442811 Changed Pregel LogLevels to debug where appropriate 2017-03-16 12:25:24 +01:00
jsteemann ea0be728d7 fix compile error 2017-03-16 12:16:29 +01:00
jsteemann 0bb2711abb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into views 2017-03-16 12:16:23 +01:00
baslr 1a8c930179 Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-16 12:15:26 +01:00
baslr 8244d93594 ldapauth: upsert user into _users 2017-03-16 11:21:15 +01:00
Simon Grätzer 215937a884 Fixing cppcheck and jslint warnings 2017-03-16 11:20:35 +01:00
jsteemann 238fcae46a some simplifications 2017-03-16 10:54:08 +01:00
Simon Grätzer e6ad88f2a3 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 10:52:08 +01:00
Simon Grätzer f2c133d5f6 Fix pregel test 2017-03-16 10:52:02 +01:00
jsteemann 6b7b4d1593 defer access to PersistentIndexFeature until later 2017-03-16 10:34:54 +01:00
jsteemann 22c86744b2 cppcheck 2017-03-16 10:34:09 +01:00
Michael Hackstein eded404e3a Replaced costEstimate of ShortestPath by a hardCoded one which does not require knowledge of edgeIndex 2017-03-16 10:07:50 +01:00
Michael Hackstein 1ab0295f54 Replaced Traverser estimateCost by a more precise version, it now does not check hardcoded on an edge-index estimate. 2017-03-16 09:45:09 +01:00
Dan Larkin aa23074efd Added view retrieval via HTTP with tests and initial work on view factory. 2017-03-15 18:44:48 -04:00
baslr f346f00721 fix exception 2017-03-15 23:07:29 +01:00
baslr 3015b591e5 refactor code to hexHashFromData 2017-03-15 17:51:58 +01:00
Simon Grätzer f22aec113f Fix typo in summary.md, fix segmentation fault, fix test 2017-03-15 17:47:33 +01:00
baslr 721ee1632b Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-15 17:29:02 +01:00
jsteemann 7e7fe8bc21 discover views on startup 2017-03-15 14:48:10 +01:00
Simon Grätzer 1c5c616875 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-15 14:12:18 +01:00
Simon Grätzer 3c8a6dbe9e Fixing windows build and warnings 2017-03-15 14:10:54 +01:00
jsteemann 9a88c8c226 fix a memleak 2017-03-15 14:05:13 +01:00
jsteemann 49aef67cca use std::shared_ptrs for views 2017-03-15 13:07:08 +01:00
Simon Grätzer e8258063b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	3rdParty/V8/v8
#	CMakeLists.txt
2017-03-15 12:59:22 +01:00
Michael Hackstein ce4e394305 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-15 12:35:53 +01:00
Simon Grätzer 24eaf6a6ef Reverting integer hashing 2017-03-15 12:35:40 +01:00
jsteemann 61e0fc1170 make options hidden 2017-03-15 12:33:35 +01:00
jsteemann df3d33774e fix revision conflict handling 2017-03-15 12:33:16 +01:00
jsteemann 00e99ea794 allow creation of UserTransaction with non-V8 contexts as well 2017-03-15 11:37:03 +01:00
Simon Grätzer 45fca509a8 Fixing linux build 2017-03-15 10:41:54 +01:00
Simon Grätzer 529cb4ae85 Integer ID for testing 2017-03-15 10:20:48 +01:00
Dan Larkin 966e05b596 Added very basic rest handler for views. 2017-03-14 19:05:14 -04:00
baslr d80771201a Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-14 17:38:53 +01:00
Dan Larkin 3ac4495eac Moved Finding class out of Cache for convenience. 2017-03-14 11:51:25 -04:00
Simon Grätzer f9e4f4b43d Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-14 16:39:41 +01:00
jsteemann 1a06f1e15e initial functionality for views - unstable 2017-03-14 16:35:45 +01:00
baslr b4ba426061 revalidate ldap auth 2017-03-14 14:54:06 +01:00
jsteemann 889960a6a0 fixed wrong assertion 2017-03-14 11:22:37 +01:00
baslr 6f4d94257c Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-14 10:56:47 +01:00
Michael Hackstein 1ebf562c4e Moved MMFiles out of vocbase.cpp 2017-03-14 10:29:17 +01:00
Simon Grätzer ec261d91eb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-14 10:11:08 +01:00
jsteemann a42948c6bc fix invalid assertion 2017-03-14 09:49:41 +01:00
Michael Hackstein 5eecac958f Removed accidently commited log output 2017-03-14 09:13:45 +01:00
baslr 0589953536 exclude wintendo 2017-03-14 02:16:42 +01:00
baslr 8f761516e4 make wintendo happy 2017-03-14 01:40:40 +01:00
Simon Grätzer 876bbb98f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 23:27:11 +01:00
Simon Grätzer ec6eb718f2 Working lazyloading with new memory backend 2017-03-13 23:25:53 +01:00
baslr e48a019c76 ldap build on wintendo? 2017-03-13 22:44:12 +01:00
baslr c2458f845a Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-13 20:08:01 +01:00
baslr 66f60a0ce3 auth also against ldap, create authInfo 2017-03-13 20:07:43 +01:00
Dan Larkin 45ca4bca08 Fixed some compiler warnings. 2017-03-13 13:10:22 -04:00
Michael Hackstein 8727b7b360 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-13 17:50:01 +01:00
jsteemann 7634bb5039 fixed some compile warnings 2017-03-13 17:44:46 +01:00
jsteemann 4727fd0f4b remove unused file 2017-03-13 17:32:13 +01:00
Michael Hackstein bf6f785415 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-13 17:31:51 +01:00
Michael Hackstein 1c33e77bd8 Moved unloadCollection callback into StorageEngine. 2017-03-13 17:28:08 +01:00
Simon Grätzer 7e0ed82f0f Memory Mapped files 2017-03-13 15:13:47 +01:00
Kaveh Vahedipour 5e01e89e7a oops 2017-03-13 14:53:04 +01:00
Kaveh Vahedipour 5e7cdc01cd Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 13:35:30 +01:00
Kaveh Vahedipour 870eef2f52 backport of 3.1 bug fixes and resilience improvements 2017-03-13 13:35:19 +01:00
baslr 440a7f661f Merge remote-tracking branch 'origin/devel' into feature/ldap-auth 2017-03-13 13:14:21 +01:00
Simon Grätzer fb560eece1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 13:02:55 +01:00
hkernbach ecfe18a6ce fixed clang build error 2017-03-13 12:47:09 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
jsteemann 45a68f54f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 12:10:54 +01:00
baslr a06c159081 fix unintended newline 2017-03-13 10:26:47 +01:00
jsteemann 709249bfde Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 10:25:13 +01:00
jsteemann 0f51ccbb93 renamed option and updated documentation 2017-03-13 10:24:58 +01:00
baslr 4ec57d784d merge from devel 2017-03-13 01:06:17 +01:00
baslr 05e708138b ldap auth 2017-03-13 00:49:57 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00
Simon Grätzer f2d77435c6 Added memory mapped file 2017-03-12 00:46:54 +01:00
Dan Larkin 06c3668915 Fixed a compile bug. 2017-03-11 13:22:07 -05:00
Dan Larkin 6a449efb06 Improved cache rebalancing and allocation strategies. 2017-03-11 12:15:08 -05:00
jsteemann b662b6edbf added missing locks to authentication cache methods 2017-03-11 01:54:37 +01:00
jsteemann 8875243c66 some minor refactoring preparations 2017-03-11 01:14:55 +01:00
jsteemann 2e1c7fcea6 some minor refactoring preparations 2017-03-11 01:01:29 +01:00
jsteemann b217a9d6af remove unused feature 2017-03-10 23:59:09 +01:00
jsteemann 26411687a1 honor cppcheck diagnosis 2017-03-10 23:57:08 +01:00
jsteemann 3f5bf6ceb9 improve logging 2017-03-10 19:08:57 +01:00
jsteemann 83a607d6c4 make number of v8 contexts dynamic. start with just 1 or 2 contexts 2017-03-10 17:59:44 +01:00
Michael Hackstein 83663c47b2 Deleted CollectionResult. It is identical to arangodb::Result introduced later. 2017-03-10 17:18:12 +02:00
Simon Grätzer 5f4a8844f5 Fixed parallelism parameter 2017-03-10 13:56:10 +01:00
jsteemann 0a07bb3222 make RestWalHandler a handler of the MMFiles engine 2017-03-10 09:00:37 +01:00
jsteemann f1ba4874fe functionality for plugging REST handlers 2017-03-09 17:12:00 +01:00
Simon Grätzer aa156ac28f Micro-Optimizations 2017-03-09 17:00:24 +01:00
jsteemann 010478ccd2 removed occurrences of mmfiles 2017-03-09 16:40:42 +01:00
jsteemann 31b050c5c7 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-09 16:06:47 +01:00
Michael Hackstein 046793815c Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-09 16:37:51 +02:00
jsteemann e03497ec95 initialize members 2017-03-09 15:16:28 +01:00
Simon Grätzer 00d77cbb5e Fix compiler warnings 2017-03-09 14:38:39 +01:00
jsteemann 6a1ddf7bec make method private 2017-03-09 13:32:19 +01:00
jsteemann 645889949c move engine-specific V8 functions into storage engine 2017-03-09 12:59:44 +01:00
Michael Hackstein 97824bb53e Include fixes. Update less todos. 2017-03-09 12:34:55 +01:00
Michael Hackstein a7965945d9 Just comment fixes 2017-03-09 12:20:22 +01:00
Michael Hackstein d0244b3d60 Usage of arangodb::Result above int return value. Moved marker logging out of v8-collection 2017-03-09 12:17:20 +01:00
Michael Hackstein 90b4876d3c Moved WriteMarker code Vocbase => MMFilesEngine. Also removed the decission to write a marker out of Vocbase-API 2017-03-09 11:12:39 +01:00
jsteemann 537757d9a3 added EnumIterator 2017-03-08 23:40:57 +01:00
jsteemann ff60c5e61a slightly penalize EnumerateCollectionNodes (in contrast to IndexNodes) so that IndexNodes are always preferred over EnumerateCollectionNodes when compared in two plan variants 2017-03-08 22:50:58 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
Simon Grätzer a1752da492 Added single server support 2017-03-08 18:20:36 +01:00
jsteemann 6b882ca8a2 class renaming 2017-03-08 17:54:00 +01:00
jsteemann a2a29ab6b1 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-08 15:07:33 +01:00
jsteemann 3ed19e291d added "shardIds" option for AQL queries to restrict queries to specific shards 2017-03-08 15:07:10 +01:00
Michael Hackstein 489f0d12b8 Moved the decision to write a marker into the databaseFeature, it is not triggered from outside any more. Furthermore renameCollection write marker is now done in MMFiles. 2017-03-08 14:54:25 +01:00
Michael Hackstein 18700387a8 Drop / Create Database in DBFeature does not expose writeMarker flag in it's API 2017-03-08 13:27:01 +01:00
Michael Hackstein 4701a40867 Cleanup LogicalCollection.h 2017-03-08 13:26:20 +01:00
Michael Hackstein f7210ee75b Fixed forward declaration. Was declared as class but is a struct 2017-03-08 13:25:37 +01:00
Michael Hackstein 636cc097b0 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-08 11:03:51 +01:00
Michael Hackstein 580d2a4336 Moved indexes down into the physical collections 2017-03-08 11:03:45 +01:00