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

13561 Commits

Author SHA1 Message Date
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
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
Simon Grätzer c049576c59 Added single server support 2017-03-07 15:07:51 +01:00
Michael Hackstein e6ab0afb50 Moved indexBuckets from Logical => MMFiles collection. 2017-03-07 14:07:32 +01:00
jsteemann 57dd92902c move engine-specific optimizer rules into engine 2017-03-07 13:10:58 +01:00
Simon Grätzer 0d5f8ae5b8 Fixed canceling of storage, changed the docs 2017-03-07 12:14:12 +01:00
Simon Grätzer 0b64bf3bc2 Fixed pregel test, async default off 2017-03-07 10:41:03 +01:00
jsteemann 63918afce9 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-07 00:19:39 +01:00
jsteemann 644ef08ce0 added "bindVars" to attributes of currently running and slow queries 2017-03-07 00:19:01 +01:00
Andreas Streichardt 59b49485b5 Merge branch 'devel' into catch_tests_ng 2017-03-06 18:34:46 +01:00
jsteemann aa8160fc3d try to fix non-enterprise compile error 2017-03-06 18:09:43 +01:00
Andreas Streichardt ce3c17e7de Merge branch 'devel' into catch_tests_ng 2017-03-06 17:59:26 +01:00
Michael Hackstein 9b69035f1a Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 17:40:46 +01:00
Michael Hackstein 31df7eb527 Fixed error in recovery for duplicate collection name 2017-03-06 17:34:54 +01:00
jsteemann 39370aac2f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:04:35 +01:00
jsteemann c2a41cb5a2 remove references to MMFiles* 2017-03-06 17:04:23 +01:00
Dan Larkin db2cabf844 Completed implementation of transactional cache. 2017-03-06 10:31:36 -05:00
jsteemann e495b5fb6c jslint && cppcheck 2017-03-06 16:13:04 +01:00
jsteemann 9d3bbd1d89 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 16:08:58 +01:00
jsteemann 8ba2654540 cleanup 2017-03-06 16:08:49 +01:00
Michael Hackstein 42e14c59f4 A MMFiles collection now reads a path if created from a slice. 2017-03-06 16:06:23 +01:00
Michael Hackstein d4dd243946 Alphabetically ordered includeds 2017-03-06 16:04:43 +01:00
jsteemann e27cf1bc5e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 15:55:00 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
Simon Grätzer 5b1cb0ec6d Various fixes 2017-03-06 15:41:27 +01:00
Michael Hackstein dccd6d5c1d Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:40:36 +01:00
jsteemann f7b819579d attempt to fix clang build 2017-03-06 15:40:03 +01:00
Michael Hackstein 13a1f15116 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 15:26:46 +01:00
jsteemann 62eee2d9bf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 14:31:36 +01:00
jsteemann c7acebe3c0 Revert "another attempt to fix logger issues" 
This reverts commit c6c9120e33.
 2017-03-06 14:30:42 +01:00
jsteemann 79f6a39c23 fix cppcheck errors 2017-03-06 14:22:03 +01:00
jsteemann c6c9120e33 another attempt to fix logger issues 2017-03-06 14:20:45 +01:00
Michael Hackstein 048bdf4cbd Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-06 13:28:07 +01:00
jsteemann 19830d8dee Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 12:58:22 +01:00
Mark bf8f0b7be8 fixed windows compile error 2017-03-06 12:24:20 +01:00
Michael Hackstein 7afccbd6e9 Fixed forward declarition. Struct vs. class 2017-03-06 10:48:37 +01:00
jsteemann 9954b52f34 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 08:19:24 +01:00
Frank Celler da27597ff4 fixed missing double quote 2017-03-05 23:29:08 +01:00
Jan Christoph Uhde 664acb8695 Change link order of static libs 2017-03-05 18:54:46 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
 2017-03-04 02:08:27 +01:00
Jan Christoph Uhde d4000ebf70 Add hexdump when vaidation fails for incoming VPackSlice 2017-03-03 22:38:04 +01:00
Andreas Streichardt fe512ed526 Create a arangoserver lib which we link againts arangod and tests 2017-03-03 15:31:43 +01:00
Michael Hackstein f42b3196e1 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-03 13:44:27 +00:00
Michael Hackstein 16c43192a0 Fixed feature startup ordering because recovery of presistent indices doid fail 2017-03-03 13:40:17 +00:00
jsteemann e1d043e607 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-02 22:20:59 +01:00
jsteemann fa2c0c02f1 simplifications 2017-03-02 22:20:51 +01:00
Simon Grätzer 77d02669c4 Added LabelPropagation 2017-03-02 19:53:34 +01:00
jsteemann e6d5058557 fix error message 2017-03-02 17:53:33 +01:00
jsteemann 00631d0307 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-02 15:24:17 +01:00
jsteemann 7051f5d87a fixed --convert false in arangoimp 2017-03-02 15:05:06 +01:00
Simon Grätzer b2ceda6250 Some more async stuff 2017-03-02 15:03:35 +01:00
Simon Grätzer fefed8b1d6 Async stuff 2017-03-02 14:27:31 +01:00
jsteemann 129a93056e fix another vpack vs. json confusion 2017-03-02 14:26:19 +01:00
jsteemann 6196a2704a Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-02 13:21:18 +01:00
jsteemann 66192a4046 added assertion 2017-03-02 13:21:07 +01:00
jsteemann 1b7b668066 simplify query list a great deal and use less dynamic memory for its entries 2017-03-02 13:20:37 +01:00
Simon Grätzer 87e1acd5bf Fixed halting 2017-03-02 13:07:27 +01:00
Simon Grätzer c74fd5b2d8 Fix SSSP 2017-03-02 12:47:50 +01:00
Michael Hackstein 83a8c7281d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-02 11:12:06 +00:00
jsteemann 79a7955634 dont set content-type header twice 2017-03-02 11:13:04 +01:00
Simon Grätzer 27098e9e4f Revert "Changing PageRank" 
This reverts commit 93a03c923a.
 2017-03-01 23:20:38 +01:00
Simon Grätzer 93a03c923a Changing PageRank 2017-03-01 23:03:45 +01:00
Michael Hackstein 0941a57c91 Fixed a classical bug. true/false is always way harder to get right than extremly complicated datatypes... 2017-03-01 22:07:52 +01:00
jsteemann 42fccb69c6 remove dependency on MMFilesLogfileManager 2017-03-01 15:50:10 +01:00
jsteemann 62f894c2b8 split big file 2017-03-01 15:49:57 +01:00
jsteemann 678ba0dcee dont prevent copy ellision 2017-03-01 15:44:41 +01:00
Simon Grätzer 3533364739 Added support for canceling during loading 2017-03-01 15:06:20 +01:00
Simon Grätzer 080048b080 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-01 15:05:25 +01:00
Simon Grätzer 27c617fe10 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 
# Conflicts:
#	3rdParty/V8/v8
#	arangod/Transaction/Methods.h
#	arangod/Utils/UserTransaction.h
#	arangod/V8Server/v8-collection.cpp
 2017-03-01 14:52:35 +01:00
jsteemann 0ac29eb177 don't fail when using optional features as dependencies 2017-03-01 12:52:51 +01:00
Kaveh Vahedipour 51b63027fe should not overimplement LoggerStream. allows unified behaviour of std::cout and LOG_TOPIC(.,.) 2017-03-01 11:51:27 +01:00
Michael Hackstein 050e470543 Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-03-01 11:11:58 +01:00
Michael Hackstein 26d95cfe80 Fixed dead-lock situation in dump tests 2017-03-01 11:10:51 +01:00
Dan Larkin b9b977c889 Added hit-rate reporting to caches. 2017-02-28 14:04:13 -05:00
jsteemann 6d8b77333a renamed classes 2017-02-28 17:59:48 +01:00
jsteemann 236bc67216 fix crashes 2017-02-28 17:59:28 +01:00
Michael Hackstein 86c34d1b88 ClusterInfo now uses the general toVPack function of LogicalCollection instead of building everything locally. 2017-02-28 17:05:30 +01:00
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann a6421118d4 fix cppcheck complaint 2017-02-28 17:02:24 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
Michael Hackstein c25fc40d09 Merge branch 'engine-api' of github.com:arangodb/arangodb into devel 2017-02-28 16:41:16 +01:00
Michael Hackstein 7950270134 Removed obsolete code in LogicalCollection. 2017-02-28 16:08:54 +01:00
Michael Hackstein 900b15dd3a API cleanup in LogicalCollection. Removed some unused exposed toVelocypack functions. Removed toVelocyPack with maxTick variant. That is available in the StorageEngine instead 2017-02-28 15:35:31 +01:00
Michael Hackstein cac32a4d1d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-28 14:59:13 +01:00
Michael Hackstein df4eadac75 Replaced several specialized toVelocyPack functions of LogicalCollection by toVelocyPackIgnore(). Fixed distributeLike bug that occured through this. 2017-02-28 14:54:32 +01:00
Dan Larkin e538f1e962 Fixed bugs in cache resize tasks and related tests. 2017-02-27 17:28:45 -05:00
jsteemann fd516e1e1b give up waiting for V8 context after some time 2017-02-27 23:08:49 +01:00
jsteemann 695d215b0c ensure that JobGuards are started and ended in the same thread 2017-02-27 22:41:58 +01:00
jsteemann 5e0fd0c8b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 22:27:51 +01:00
jsteemann b872aa59fd simplified performance logging 2017-02-27 22:22:41 +01:00
jsteemann de22bd10cf removed unused include 2017-02-27 17:32:06 +01:00
jsteemann ed4b5fb3f9 removed unused includes 2017-02-27 17:29:28 +01:00
jsteemann a420093f2d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 17:25:51 +01:00
jsteemann 4005a15697 added some assertions 2017-02-27 17:23:41 +01:00
jsteemann ae751e7360 create engine-specific transaction context data 2017-02-27 17:05:30 +01:00
jsteemann e37e94adbe Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 14:38:35 +01:00
jsteemann 666b2f8da9 renaming 2017-02-27 14:38:27 +01:00
Simon Grätzer 9e9b1fd0c5 Stuff 2017-02-27 13:16:40 +01:00
Michael Hackstein ae14ae99a5 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-27 13:01:12 +01:00
Michael Hackstein a884ee2bfb Intermediate commit. Moved many toVPack functions of LogicalCollection to a unified vpack + ignore-keys alternative. This commit is used to run all tests everywhere. May be red 2017-02-27 13:01:07 +01:00
jsteemann ba9283f43f remove logically dead code 2017-02-27 12:02:34 +01:00
jsteemann 92788ad827 fix potential memory issue 2017-02-27 12:01:14 +01:00
jsteemann 90f32ed525 renamed classes 2017-02-27 11:40:15 +01:00
jsteemann 94ce6a65f8 renamed methods 2017-02-27 11:22:44 +01:00
jsteemann 4600670167 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 10:58:59 +01:00
jsteemann 779755b605 MSVC 2017-02-27 09:40:14 +01:00
jsteemann 9d13dcaadd Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 09:26:18 +01:00
jsteemann f72f53d6ca fix compile warnings and errors 2017-02-27 09:18:56 +01:00
Simon Grätzer 92d705ce76 Fix 2017-02-27 02:56:57 +01:00
Dan Larkin 84f284543c Fixed two compile errors. 2017-02-24 17:12:32 -05:00
Dan Larkin 09600f0971 Added hash cache system. 2017-02-24 15:31:40 -05:00
jsteemann ca54ae9b72 use unique_ptrs 2017-02-24 18:03:40 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
jsteemann 0e6df4833f removed unused variable 2017-02-24 17:38:33 +01:00
jsteemann a70ddf7116 don't let read-only transactions block the WAL collector 2017-02-24 17:03:42 +01:00
Michael Hackstein c8f03d16e3 updateProperties now returns an CollectionResult container with errorMessage and code. Moved error reporting logic for cluster-case into this function. 2017-02-24 17:00:41 +01:00
jsteemann b02168bdf0 make transaction data read-only while iterating over it 2017-02-24 12:25:20 +01:00
Simon Grätzer 19d3dfc601 Small fix 2017-02-24 11:22:16 +01:00
jsteemann e14909966d issue #2326 2017-02-24 10:35:52 +01:00
jsteemann 32a5e13f5f clear collection name cache in case a rename is seen 2017-02-23 18:08:58 +01:00
jsteemann d46e3a6453 added some assertions 2017-02-23 18:08:41 +01:00
Michael Hackstein b6943d233b Fixed v8-collection properties cluster-variant. In some cases it did not contain correct information 2017-02-23 16:46:21 +01:00
Michael Hackstein 076198106d Now also the cluster variant of collection properties uses the shared toVPackVariant 2017-02-23 16:40:33 +01:00
Michael Hackstein cc78b0131f v8-collection-properties now reuses propertiesVPack on logical collection (SingleServerCase) 2017-02-23 15:31:13 +01:00
jsteemann dc72ec3ee7 fixed a race when dropping databases 2017-02-23 15:22:50 +01:00
Michael Hackstein de31c68539 Moved isVolatile into MMfiles collection. 2017-02-23 14:56:54 +01:00
jsteemann 3679050a31 fixed a race when renaming collections 2017-02-23 13:41:48 +01:00
Michael Hackstein aa442fc4ac Removed a velocypack-aliases include from voc-type.h 2017-02-23 13:07:32 +01:00
Michael Hackstein daf7cc73e9 Added a propertiesVPack to PhysicalCollection / MMFiles collection for engine specific properties 2017-02-23 11:27:16 +01:00
Michael Hackstein 853394da79 Moved keyGenerator into physicalCollection. Only used when actually storing data. 2017-02-23 11:10:58 +01:00
jsteemann 70c55f1edf naming conventions 2017-02-23 10:15:18 +01:00
jsteemann 09919cfc36 fixed issue #2320 2017-02-23 10:14:42 +01:00
jsteemann 6c4ecf28aa also sanitize vpack custom types when sending vpack data to clients 2017-02-23 10:12:20 +01:00
Frank Celler 77f17a0839 fixed negative counting of http connection in UI 2017-02-23 09:59:49 +01:00
Frank Celler 4a3fdf6351 raised default hard limit on threads for very small to 64 2017-02-23 09:08:39 +01:00
Michael Hackstein 5d452edec6 Moved ditches into MMFiles. 2017-02-23 09:02:34 +01:00
Simon Grätzer 32200b24d2 angleichen von async SCC 2017-02-22 23:42:04 +01:00
Simon Grätzer 4722f4c6dd fix SCC 2017-02-22 23:39:49 +01:00
Simon Grätzer 3565469ebf Some stuff 2017-02-22 18:56:35 +01:00
Frank Celler a38f19a84c added locking to avoid races within boost asio 2017-02-22 14:51:48 +01:00
Michael Hackstein df59411710 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-22 14:43:10 +01:00
Jan Christoph Uhde 3a201b4362 add persistProperties() to PysicalCollection 2017-02-22 12:47:03 +01:00
Michael Hackstein a359424af0 Moved logic of write Marker out of the dropIndex API from Logical collection. Can be derived from the engine internally. 2017-02-22 12:32:54 +01:00
Jan Christoph Uhde 6a659922ba Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 
* 'engine-api' of github.com:arangodb/arangodb:
  Removed unused included.
  Moved CompactionLocker into MMFiles.

Conflicts:
	arangod/VocBase/replication-dump.cpp
 2017-02-22 11:16:58 +01:00
Jan Christoph Uhde e298aca3ea remove unused includes 2017-02-22 11:00:45 +01:00
Michael Hackstein b857717ff0 Removed unused included. 2017-02-22 10:47:20 +01:00
Jan Christoph Uhde 711a71ac4d add LogicalCollection::invokeOnAllElements() 
and remove MMFilesPrimaryIndex.h from Transaction/Methods.cpp
 2017-02-22 10:40:27 +01:00
Michael Hackstein 99d1b1edec Moved CompactionLocker into MMFiles. 2017-02-22 10:39:31 +01:00
Jan Christoph Uhde fcfe66e254 add getAll/AnyIterator to LogicalCollection 2017-02-22 09:24:38 +01:00
Frank Celler e4da3d3948 allow passing of define USE_PLAN_CACHE in flags 2017-02-22 09:03:07 +01:00
Frank Celler b2b9f377c1 safe guard 2017-02-22 09:02:49 +01:00
jsteemann af34fa439a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-21 18:08:56 +01:00
jsteemann 99ea3c37bb attempt to fix broken AQL in cluster 2017-02-21 18:08:35 +01:00
Kaveh Vahedipour b1299ec3b9 fixes from 3.1.11 in agency/state 2017-02-21 17:44:27 +01:00
jsteemann 04bc8124c3 try to fix crash 2017-02-21 17:33:22 +01:00
jsteemann def25b304a fix compile warning 2017-02-21 17:32:54 +01:00
Jan Christoph Uhde 3467031cb9 remove transferMarkers from StorageEngine.h 2017-02-21 16:00:37 +01:00
jsteemann d27360fd04 minor adjustments 2017-02-21 15:49:47 +01:00
Jan Christoph Uhde ebbfeaead9 add high-level documentation for some features of MMFilesEngine 2017-02-21 15:44:50 +01:00
Jan Christoph Uhde d73d25a310 remove some includes 2017-02-21 14:43:21 +01:00
Michael Hackstein 0f7d50765d Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-21 14:12:16 +01:00
Michael Hackstein fbdbfdcb6d Moved primaryIndex knowledge out of Logical Collection. Also moved logic for close into MMFiles 2017-02-21 14:12:07 +01:00
jsteemann 9f7defa7de fix plan cache 2017-02-21 13:43:47 +01:00
jsteemann deb0ff1110 fix stringification of keys with _id type 2017-02-21 13:43:07 +01:00
Jan Christoph Uhde 133961ff8d remove applyForTickRange from LogicalCollection 2017-02-21 13:42:59 +01:00
Michael Hackstein 7cf3581812 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-21 13:25:18 +01:00
Michael Hackstein aacbb3e4cf This commit should fix cluster startup problems 2017-02-21 13:22:29 +01:00
Simon Grätzer 41bc0da58e Fixed DMID 2017-02-21 13:15:35 +01:00
jsteemann 511d0b29c7 deactive plan cache as final step before merge 2017-02-21 13:06:34 +01:00
jsteemann ed3a230939 some final cleanup 2017-02-21 13:04:24 +01:00
jsteemann c0c9fa4b19 Merge branch 'devel' of https://github.com/arangodb/arangodb into plan-cache 2017-02-21 12:18:55 +01:00
jsteemann f5c8932744 initial version of query execution plan cache, still very rough 2017-02-21 11:58:38 +01:00
Jan Christoph Uhde e9555e4b10 remove rotateJournals from LogicalCollection 2017-02-21 11:06:53 +01:00
Jan Christoph Uhde 6e1f77be24 remove ditches from interface. the ditches concept needs fixing!! 2017-02-21 10:53:51 +01:00
Jan Christoph Uhde fe1ed3aa4a re add conversion functions 
after checking with hacki who deleted them last time
 2017-02-21 10:18:26 +01:00
Jan Christoph Uhde 0f86801645 remove updateStats from LogicalCollection interface 2017-02-21 10:06:51 +01:00
Jan Christoph Uhde cf970ed230 Squashed commit of the following: 
commit 2644735fe06806ec8ffb78ceb2ede04037258952
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Tue Feb 21 09:10:55 2017 +0100

    failed ammend

commit c2b8604df5a60fd00e57b4f088fe8a2624d9ac3b
Author: Jan Christoph Uhde <Jan@UhdeJC.com>
Date:   Mon Feb 20 12:49:58 2017 +0100

    move - maxTick to Physical - RACE!
 2017-02-21 09:19:49 +01:00
jsteemann 12f1a7af29 fixed issue #2315 2017-02-21 09:11:50 +01:00
Kaveh Vahedipour 4cc830b0df merge from 3.1 2017-02-20 20:05:52 +01:00
Simon Grätzer 2e912a1743 Fixed HITS and MessageIterator 2017-02-20 15:44:30 +01:00
Wilfried Goesgens 110e548a9a streamline import process; fix arangoexport 2017-02-20 15:35:34 +01:00
Simon Grätzer bba94e7ecd Added HITS algorithm 2017-02-20 12:19:01 +01:00
Jan Christoph Uhde 071137adf6 move doCompact into PhysicalColletion 2017-02-20 10:53:11 +01:00
Jan Christoph Uhde f3a1f128ee remove isFullyCollected from LogicalCollection 2017-02-20 10:28:28 +01:00
jsteemann 8ce7f6558d simplifications 2017-02-20 09:51:40 +01:00
Jan Christoph Uhde 40a1345f76 Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api 
* 'engine-api' of github.com:arangodb/arangodb:
  Moved logic for drop index into MMFilesCollection
 2017-02-20 09:50:17 +01:00
Michael Hackstein fea2dbad79 Fixed compiler warning in Query.cpp 2017-02-20 09:21:54 +01:00
Michael Hackstein 17effdc065 Moved logic for drop index into MMFilesCollection 2017-02-20 09:06:41 +01:00
Simon Grätzer ea905816bd Some reshuffling 2017-02-19 13:50:43 +01:00
Jan Christoph Uhde 21cb8e3217 Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api 
* 'engine-api' of github.com:arangodb/arangodb:
  Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways...
  Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc.
  Moved useSecondaryIndexes check from Logical to MMFiles collection
  Some cleanup in Logical collection imports
  Moved index filling into the MMFiles collection
  changelog
  grunt build
  css
  ui: queries now using cursors api - issue #2065
  remove crosscompile hack - it doesn't work anymore
  updated CHANGELOG
  add changlog entry for stacktrace log messages
  clean up write lockers a bit
  fix too early closing of sockets
  Moved restoreIndex to Physical collection.
  Fix a shell script used during build.
  Lower log level to debug in shutdown message.
  fix spelling
  Moved saveIndex logic into the physical collection
  fix potential deadlock

Conflicts:
	arangod/MMFiles/MMFilesCollection.cpp
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.cpp
 2017-02-18 19:10:45 +01:00
Simon Grätzer f9eb868f1a Fixed SCC 2017-02-18 18:14:29 +01:00
jsteemann be8d6b0a9e simplifications 2017-02-17 20:55:52 +01:00
Simon Grätzer e2de2c4354 GRR 2017-02-17 20:24:04 +01:00
Simon Grätzer 8aa2465483 Fix compiler errors 2017-02-17 20:22:52 +01:00
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection 
MMFilesCollection ctor might be buggy
 2017-02-17 20:06:47 +01:00
Michael Hackstein 92f52b13d3 Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-02-17 17:29:53 +01:00
Michael Hackstein 91f303e963 Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways... 2017-02-17 17:29:49 +01:00
jsteemann ea87cc52b7 simplifications 2017-02-17 17:10:13 +01:00
Michael Hackstein b84b05244f Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc. 2017-02-17 16:07:02 +01:00
jsteemann 535eca3ae0 make ctor explicit 2017-02-17 15:56:55 +01:00
jsteemann 10ddb52964 remove unused property 2017-02-17 15:41:45 +01:00