1
0
Fork 0
Commit Graph

1541 Commits

Author SHA1 Message Date
Jan Steemann 12d326d62b updated documentation and operators behavior 2014-11-10 18:05:11 +01:00
Jan Steemann d05b47cdb6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-09 00:10:10 +01:00
Jan Steemann d1f4c6b5fe fixed optimization 2014-11-09 00:09:07 +01:00
Jan Steemann 97b5e906da Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-08 23:26:38 +01:00
Jan Steemann 567860cf65 more aggresively optimizer filters 2014-11-08 23:26:04 +01:00
Jan Steemann 9c5d150866 use Ast::ReverseOperator 2014-11-08 22:31:31 +01:00
Jan Steemann 738636db2d whitespace 2014-11-08 21:26:54 +01:00
Jan Steemann e120bdec8c do not allocate too much space for hash index elements 2014-11-08 21:15:44 +01:00
Jan Steemann 7695223744 use emplace_back 2014-11-08 21:13:41 +01:00
James 14e6370c22 cleaning up. 2014-11-08 17:35:27 +00:00
James e2b8456395 tests and bugfixes. 2014-11-08 17:31:30 +00:00
James 103db8c8b5 more flexible remove-redundant-OR rule 2014-11-08 16:42:39 +00:00
James bc80940018 correct logic. 2014-11-08 13:52:24 +00:00
James 586cacc2ee replace-redundant-OR optimizer rule first version. 2014-11-08 13:45:14 +00:00
James 53782f5364 bug fix 2014-11-08 11:39:09 +00:00
James b849a6da72 some more cleaning up of replace-OR-with-IN 2014-11-08 11:36:56 +00:00
James 84e6881a44 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index
Conflicts:
	arangod/Aql/ExecutionNode.h
2014-11-08 09:53:30 +00:00
Willi Goesgens 3cb7a2016d Once we deleted a query from the registry we don't need to close it anymore. 2014-11-07 14:03:22 +01:00
Jan Steemann 48ec4a3539 fixed number of parameters 2014-11-07 11:48:00 +01:00
Jan Steemann 0d01e6c7b6 less verbose error messages 2014-11-07 11:16:25 +01:00
Jan Steemann b0de1bb226 leaner and meaner error messages 2014-11-07 10:53:00 +01:00
Jan Steemann c8c16767be added rule to remove filters if covered by index ranges - not yet activated 2014-11-06 23:18:18 +01:00
Jan Steemann 8e678c50da mini optimization: share frequently occuring values 2014-11-06 20:14:02 +01:00
James 6822594bff changed to number of blocks pulled by default by CalculationBlock and ExecutionBlock 2014-11-06 12:51:32 +00:00
Jan Steemann 7d036da648 fixed limit estimation 2014-11-06 13:44:55 +01:00
James c54b92c6e7 getting tests to work 2014-11-06 12:24:28 +00:00
James c063b85d29 working except for 1 test. 2014-11-06 11:42:31 +00:00
James 47810e76e1 quick hack 2014-11-06 10:10:40 +00:00
Jan Steemann 2fe79a65a4 speed up AQL queries with V8 expressions 2014-11-05 16:59:57 +01:00
Jan Steemann bf30927913 removed canThrow tag for various built-in functions 2014-11-05 14:40:00 +01:00
Jan Steemann 987bfa1285 extended optimizer rule to detect more OR to IN transformation opportunities 2014-11-05 12:10:10 +01:00
Jan Steemann 7137647608 Merge branch 'aql-feature-optimize-or' of https://github.com/triAGENS/ArangoDB into devel 2014-11-05 11:37:10 +01:00
Willi Goesgens bab1762ee9 Directly route results to v8-objects instead of going via a json object when calling AQL from a V8 context 2014-11-05 10:56:10 +01:00
James 10220c3207 adding functions. 2014-11-04 22:01:36 +00:00
James 095cc8a9e3 removed incorrect assertion 2014-11-04 21:49:37 +00:00
James 37ab716edc cleaning up 2014-11-04 21:42:34 +00:00
James 3b49921a15 more cleaning up 2014-11-04 21:09:21 +00:00
James 61afce9d10 cleaning up 2014-11-04 21:04:56 +00:00
James 2e48bbb82b tests are green again 2014-11-04 13:16:39 +00:00
James 04770d3563 nearly working better version of previous 2014-11-04 13:01:51 +00:00
Jan Steemann 830da6dd51 issue #846: Add within_bounds function to AQL 2014-11-04 12:40:14 +01:00
Willi Goesgens f920a0f8d4 By Kasper: Fix possible uninitializen variable access. 2014-11-04 10:42:51 +01:00
James f6e8dcd6ca more general case working. Code needs cleaning up 2014-11-03 22:23:41 +00:00
James 0ceb51cbd7 compiler warning. 2014-11-03 20:24:59 +00:00
James 62cb8d3a93 bugfix 2014-11-03 11:10:18 +00:00
James 1ff7e8d252 cleaning up 2014-11-03 10:42:16 +00:00
James fa7668e1ce snapshot 2014-11-03 10:38:05 +00:00
James b301102655 Jan's patch 2014-11-03 09:32:12 +00:00
James 901c65559c Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-optimize-or 2014-11-02 18:05:35 +00:00
Jan Steemann 749a0aa408 fixed cloning of AST nodes 2014-11-01 21:54:02 +01:00
Jan Steemann 97206f8c30 fixed cloning of AST nodes 2014-11-01 21:52:28 +01:00
James 5f6964796e still not working 2014-11-01 19:06:59 +00:00
James 2c10e943b8 still doesn't work 2014-11-01 17:12:44 +00:00
James cd710ed55d snapshot 2014-11-01 16:06:53 +00:00
Jan Steemann e2cfa056c0 pass query warnings around in cluster 2014-11-01 16:36:58 +01:00
James 6470669871 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-optimize-or 2014-11-01 14:35:26 +00:00
James d12b5baf12 first try at replace-OR-with-IN optimizer rule. 2014-11-01 14:30:18 +00:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann 51d3871195 removed debug output 2014-11-01 02:25:17 +01:00
Jan Steemann a7af7eed31 fix double free issue 2014-11-01 02:20:13 +01:00
Max Neunhoeffer 0044d7d1b0 Fix bug in AQL that abort() was called after commit() for trx. 2014-10-31 18:15:40 +01:00
Jan Steemann 4f68960ed7 removed Ahuacatl [skip ci] 2014-10-31 17:31:00 +01:00
Max Neunhoeffer ddf85982f0 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-31 11:50:54 +01:00
Max Neunhoeffer 8f854ec3b2 Fix a leak in cluster instanciation of queries. 2014-10-31 11:50:34 +01:00
Willi Goesgens 10bf137692 Move free logic into its own function, so we can call in in both places. 2014-10-31 11:28:27 +01:00
Jan Steemann 83252851e6 report warnings in queries 2014-10-30 17:33:15 +01:00
Max Neunhoeffer e74e3ac8db Fix a use after free in RestAqlHandler. 2014-10-30 14:58:34 +01:00
Max Neunhoeffer 4503d7a982 Fix a memleak in instanciation. 2014-10-30 14:58:12 +01:00
Jan Steemann 31d875921f removed TODOs 2014-10-30 00:45:55 +01:00
Jan Steemann 0903c1b9b6 use more precomputed values in expressions 2014-10-29 21:41:00 +01:00
Max Neunhoeffer 9fcdc1fa94 Start building proper cleanup if instanciation throws in between. 2014-10-29 16:51:59 +01:00
Max Neunhoeffer 425d50bdc1 Fix RemoteBlock initializeCursor forwarding by HTTP. 2014-10-29 16:17:15 +01:00
Max Neunhoeffer b0e08bd8eb Take out some debugging output. 2014-10-29 15:42:03 +01:00
Max Neunhoeffer bfce170cae Fix cost estimation of SortNodes. 2014-10-29 15:41:38 +01:00
Max Neunhoeffer ebf8936cd3 Fix deserialisation of AqlItemBlocks (ranges). 2014-10-29 15:41:21 +01:00
Jan Steemann 5d731e7bdc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-29 13:19:21 +01:00
Jan Steemann 464c0751d9 removed TODOs 2014-10-29 13:19:13 +01:00
Jan Steemann cf79ef33e2 removed TODO 2014-10-29 13:15:52 +01:00
Max Neunhoeffer 6d73373249 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 13:14:35 +01:00
Max Neunhoeffer 534ae76279 Add an explanation of the instanciation procedure. 2014-10-29 13:09:11 +01:00
Jan Steemann 0d335f403a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-29 13:07:06 +01:00
Jan Steemann ecc6089cc8 removed TODO 2014-10-29 13:06:54 +01:00
Max Neunhoeffer a3265b7fd4 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 12:41:16 +01:00
Max Neunhoeffer da1c2c0109 Further simplify and cleanup instanciation. 2014-10-29 12:41:03 +01:00
Jan Steemann ca15e72b14 fixed test 2014-10-29 12:33:10 +01:00
Jan Steemann c31d8fae68 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-29 12:14:31 +01:00
Jan Steemann d67a60c223 removed TODO 2014-10-29 12:14:14 +01:00
Max Neunhoeffer 42eefbe71d Cleanup and comment instanciation. 2014-10-29 12:13:43 +01:00
Max Neunhoeffer 7e6e758a76 Remove unnecessary plans for coordinator pieces. 2014-10-29 11:41:24 +01:00
Max Neunhoeffer ecb7317461 Remove enterSubQueryFirst. 2014-10-29 11:37:06 +01:00
Max Neunhoeffer 59c1935466 Get rid of some TODOs and FIXMEs. 2014-10-29 11:25:30 +01:00
Max Neunhoeffer cfb26c8b0a Fix instanciation order, for good??? 2014-10-29 10:37:39 +01:00
Max Neunhoeffer 18990d9b95 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 08:57:34 +01:00
Jan Steemann 35cc5bb468 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-29 01:04:53 +01:00
Jan Steemann 8bb213e7ba sort and cache list expression values
emplace

fixed wrong assertion
2014-10-29 01:02:20 +01:00
Max Neunhoeffer 5da86da39d Another step to fix instanciation of plan in cluster. 2014-10-29 00:27:45 +01:00
Max Neunhoeffer 96c749682e Fix order of ExecutionBlock instanciation in cluster. 2014-10-28 23:48:48 +01:00
Jan Steemann 2e9100619a a bit less copying 2014-10-28 18:10:23 +01:00
Jan Steemann 246c6fc840 less parameter passing 2014-10-28 16:50:09 +01:00
Jan Steemann 0e27ccbfdb jslintified tests 2014-10-28 15:59:38 +01:00
Jan Steemann f6b8f17dfa less optimizations for simple plans 2014-10-28 15:01:44 +01:00
Jan Steemann 529bf386d7 fixed some API errors 2014-10-28 11:30:49 +01:00
Max Neunhoeffer 4098279ed6 Implement a shutdown method for the Subqueryblock. 2014-10-28 09:02:01 +01:00
Jan Steemann 2808e4eee8 cppcheck 2014-10-28 00:35:18 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann b7c93c361a fixed tests 2014-10-27 16:43:10 +01:00
Willi Goesgens 5ed8816788 Remove Explain of cluster snippets 2014-10-27 16:10:13 +01:00
Willi Goesgens 03cbca59e4 Make errormessage sound more like normal language. 2014-10-27 15:38:09 +01:00
Willi Goesgens 896c6f591e fix forwarding of http-errors; there mustn't be a second variable. 2014-10-27 15:37:35 +01:00
Max Neunhoeffer 5eed22ad5f Repair distribute-sort-to-cluster rule and make it less aggressive. 2014-10-27 14:02:08 +01:00
Max Neunhoeffer 48dc3c5081 Remove an unnecessary TODO. 2014-10-27 13:41:46 +01:00
Max Neunhoeffer 7ca33e7b73 Remove unnecessary case: no SHAPED on coordinators. 2014-10-27 13:25:34 +01:00
Jan Steemann b5c222b9b8 determine whether calculations may run on a DB server 2014-10-27 12:04:06 +01:00
Max Neunhoeffer d564fca3d2 Make distribute-filtercalc-in-cluster switch-off-able. 2014-10-27 10:34:51 +01:00
Max Neunhoeffer e9aded7b5e Make distribute-sort-to-cluster switch-off-able. 2014-10-27 10:28:06 +01:00
James 8bdd0cea4c added some explanation of distribute-in-cluster and undistribute-remove-after-enum-coll. 2014-10-25 17:40:55 +01:00
James c99cc155b6 fixing undistribute-remove-after-enum-coll optimizer rule. 2014-10-25 14:24:57 +01:00
Jan Steemann dacc249105 fixed AggregatorGroup shutdown 2014-10-24 23:39:58 +02:00
Jan Steemann 0f2cd7211b fixed v8 crash 2014-10-24 23:30:07 +02:00
Jan Steemann 3306ff99fc removed unused variable 2014-10-24 17:29:36 +02:00
Jan Steemann 50e8fed964 more handlescopes 2014-10-24 17:29:22 +02:00
Willi Goesgens 91e04e3230 Implement outputting of splitted plans which are to be distributed to the db servers 2014-10-24 17:14:13 +02:00
Max Neunhoeffer 08930fac3a Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-24 14:10:59 +02:00
Max Neunhoeffer 93ceafa686 Make EnumerateCollectionBlock even more lazy. 2014-10-24 14:10:30 +02:00
Jan Steemann bc4ae8e7df fixed leak in IndexOperator, simplified IndexOperator API 2014-10-24 12:57:09 +02:00
Jan Steemann 699517413e fixed clumsy error handling 2014-10-24 10:29:13 +02:00
James 0158a67300 adding ignoreShutdown change. 2014-10-23 21:52:10 +01:00
James 705eb42ca1 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 21:41:59 +01:00
James 3b784f931c removed unnecessary harmless line 2014-10-23 21:41:49 +01:00
Jan Steemann 6dfe652d56 cleanup v8 expressions in coordinator, too 2014-10-23 22:22:15 +02:00
James 5821b9da00 fixing Distribute/ScatterBlocks. 2014-10-23 21:02:20 +01:00
Jan Steemann bb47eb93ad Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-23 16:57:18 +02:00
Jan Steemann d34c9ade30 re-enable optimizer rule 2014-10-23 16:56:48 +02:00
Willi Goesgens 249b89aa09 - Add statistics under all circumstances (also if the status is "exhausted")
- return statistics in all cases (empty statistics in doubt)
2014-10-23 16:39:14 +02:00
Jan Steemann a37c3cea93 added comment 2014-10-23 15:36:59 +02:00
Jan Steemann 819d2bada7 fixed shutdown error 2014-10-23 14:46:59 +02:00
Jan Steemann 4dfb556016 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-23 14:43:59 +02:00
Jan Steemann db98158739 different error message 2014-10-23 14:43:25 +02:00
James 7a6b2650c1 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 13:16:06 +01:00
Jan Steemann 8583dc08ca fix V8 segfault 2014-10-23 14:03:50 +02:00
Jan Steemann 8a544eefb5 commit transaction on remote servers 2014-10-23 11:26:28 +02:00
James ef4099a8af remove unnecessary/incorrect cleanup in DistributeBlock 2014-10-23 10:09:15 +01:00
James 6fe6cecf32 Merge branches 'devel' and 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 09:41:57 +01:00
James 88a59b3336 some more cleaning up distribute/gather blocks 2014-10-23 09:41:49 +01:00
Jan Steemann fc4886e1f3 added diagnostic information 2014-10-23 10:38:31 +02:00
Jan Steemann 612abc6a20 less throwing in destructors 2014-10-23 10:18:30 +02:00
Jan Steemann 1dafc31f2d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-22 19:06:03 +02:00
Jan Steemann 36e0ec5e55 commented out code 2014-10-22 19:05:54 +02:00
Jan Steemann 54a0f182e2 call shutdown using an errorCode 2014-10-22 19:01:56 +02:00
Willi Goesgens a8b8fbcf28 Properly handle statistics if multiple getSome() calls are performed. 2014-10-22 18:24:42 +02:00
Willi Goesgens 9558f5aa0a Implement passing of query statistics through cluster. 2014-10-22 17:36:23 +02:00
Jan Steemann 7f2373204a fixed cloning of coordinator queries 2014-10-22 17:25:59 +02:00
Jan Steemann 3dc2f9b299 fixed test 2014-10-22 16:30:06 +02:00
Jan Steemann 828fe1f1d7 enabled statistics 2014-10-22 12:59:15 +02:00
Jan Steemann def5729ed8 potentially fixed cleanup of DistributeBlock 2014-10-22 12:40:34 +02:00
Jan Steemann e2ef21c33a fixed non-working DistributeBlock 2014-10-22 12:07:31 +02:00
James 89d554c49b remove some redundant comment 2014-10-21 17:27:39 +01:00
Jan Steemann d43e3f7127 fixed race conditions when multiple clients accessed the same coordinator query 2014-10-21 18:17:08 +02:00
James 6106e70405 fixing _distBuffer initialisation. 2014-10-21 16:49:19 +01:00
Jan Steemann 8a5a570996 fixed undefined behavior 2014-10-21 14:50:48 +02:00
Jan Steemann bcf23e2acf Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-21 13:46:04 +02:00
Jan Steemann 66bb48f61f removed spam output 2014-10-21 13:45:52 +02:00
Jan Steemann 97a4355c4e fixed tests 2014-10-21 13:45:46 +02:00
James 5369f08454 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-21 12:11:21 +01:00
James 470f4fcda5 adding distribute block to RestAqlHandler. 2014-10-21 12:11:11 +01:00
Willi Goesgens 7190475616 While cloning respect optionality of variables. 2014-10-21 13:01:38 +02:00
Jan Steemann c91355831b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-21 12:50:37 +02:00
Jan Steemann 2617f3879c fixed primary index usage in cluster 2014-10-21 12:50:06 +02:00
Willi Goesgens 07facdd1c9 Add more precise error messages to runtime errors with the update block 2014-10-21 12:45:02 +02:00
James d0d4955a83 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-21 11:05:19 +01:00
James 6e934585f9 adding distribute node 2014-10-21 11:05:11 +01:00
James dc357b96bf fixing distribute in cluster optimizer rule. 2014-10-21 11:04:38 +01:00
Jan Steemann 6883651c3c fixed usage of indexes in cluster 2014-10-21 11:53:24 +02:00
Jan Steemann 8b7da8aacb the great rename 2014-10-21 00:38:53 +02:00
Jan Steemann aec1ea970a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 18:28:32 +02:00
Jan Steemann 40e62e95a5 fixed out-of-scheduler-threads issue 2014-10-20 18:27:50 +02:00
Max Neunhoeffer ba41701bf8 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 17:33:04 +02:00
Max Neunhoeffer a54c4351bd Add a reminder for myself. 2014-10-20 17:32:56 +02:00
Willi Goesgens b3beff3053 Call shutdown() on execution abortion, so we don't leave trash behind on the cluster nodes. 2014-10-20 16:36:54 +02:00
Jan Steemann 34d34af340 do not throw on shutdown 2014-10-20 16:17:19 +02:00
Jan Steemann bafdf8a332 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 15:40:03 +02:00
Jan Steemann 10c9a54932 start transactions on coordinator 2014-10-20 15:39:55 +02:00
Willi Goesgens 8856abeacc Implement error-logging of RestAqlHandler 2014-10-20 14:49:44 +02:00
Willi Goesgens 28149299b9 Fix condition of assertion when error: true is to be expected. 2014-10-20 14:48:54 +02:00
Jan Steemann 6356c47f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 12:32:15 +02:00
Jan Steemann c93c952c05 fixed from/to-handling in cluster 2014-10-20 12:32:08 +02:00
Willi Goesgens 56099b96c9 - More precisely describe which request failed in the cluster communication
- catch exceptions during shutdown - they shouldn't be output since its usually already known.
2014-10-20 12:06:53 +02:00
Max Neunhoeffer 828926d819 Take out debugging output. 2014-10-20 11:29:52 +02:00
Max Neunhoeffer 44f89adc66 Fix instanciation of queries in which a sharded collection is used >=2 times. 2014-10-20 11:21:00 +02:00
Max Neunhoeffer f15cb48a10 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 10:47:49 +02:00
Max Neunhoeffer 9744228bf9 Make correct parts on DBserver MAIN and DEPENDENT.
Seems not to work yet because of more fundamental problems.
2014-10-20 10:47:14 +02:00
Jan Steemann 9132a10785 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 09:51:43 +02:00
Jan Steemann 5510f7eee8 indentation 2014-10-20 09:51:33 +02:00
Max Neunhoeffer feef5140a7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 09:14:37 +02:00
Max Neunhoeffer 6eb2073336 Rename VarOverview into RegisterPlan, because that is what it is. 2014-10-20 09:14:01 +02:00
Max Neunhoeffer db7b23bdb8 Fix cloning of VarOverview. 2014-10-20 09:04:32 +02:00
Jan Steemann 648274f30a removed HTTP DELETE handler 2014-10-20 08:52:44 +02:00
James 78339c6c52 more bug fixes in GatherBlock. 2014-10-18 15:06:03 +01:00
James a89d250316 fixed skipSome and further cleaning up 2014-10-18 14:33:37 +01:00
James f16ee1a671 fixed bug in comparison function for GatherBlock 2014-10-18 14:17:43 +01:00
James 6f1c251077 debugging GatherBlock 2014-10-18 14:01:53 +01:00
Jan Steemann 19502fee8e fixed some tests 2014-10-17 18:50:00 +02:00
Jan Steemann 946ab83c42 fixed bug in code generation 2014-10-17 16:13:36 +02:00
Jan Steemann 42c91307ec handlescope 2014-10-17 15:56:03 +02:00
Jan Steemann 026fc2b83a next attempt to fix v8 context handling 2014-10-17 15:47:39 +02:00
Jan Steemann 3effea896c fixed wrong error code 2014-10-17 15:30:55 +02:00
Max Neunhoeffer de7c303c5d Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel
Conflicts:
	arangod/Aql/Query.cpp
2014-10-17 15:26:50 +02:00
Max Neunhoeffer cb75b0b18a Sort out transactions in cluster, part I. 2014-10-17 15:25:46 +02:00
Jan Steemann d2d9a0ca2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-17 15:25:15 +02:00
Jan Steemann ee614d6ebd v8 context handling 2014-10-17 15:25:06 +02:00
Willi Goesgens 7f387d9ac8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-17 14:16:19 +02:00
Willi Goesgens 1a80e19702 Implement the option to enter Subqueries first in the ExecutionBlock Walker too
(as in #d2a15253b0805ce2624eac4a44bb66b15c34a21e for the ExecutionNode)
2014-10-17 13:36:40 +02:00
James 40114ef954 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 11:07:52 +01:00
James dcf427071c shardIds -> shardKeys in distribute to cluster. 2014-10-17 11:07:33 +01:00
James 7da7841f97 shardKeys method for Collection. 2014-10-17 11:06:57 +01:00
Jan Steemann 2b68d83072 added enterContext and exitContext to Query 2014-10-17 12:01:50 +02:00
James 15e2c87823 Merge branches 'devel' and 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 10:22:33 +01:00
James 32f4216005 updating distribute-in-cluster opt rule 2014-10-17 10:22:26 +01:00
Jan Steemann a7f9714d53 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-17 10:35:21 +02:00
Jan Steemann 0aa02a696b pass ApplicationV8 to queries 2014-10-17 10:35:02 +02:00
James 56c8599dd1 fixes to DistributeBlock cursor init and can now send SHAPED to clients. 2014-10-17 09:25:37 +01:00
Max Neunhoeffer e4460501e7 Remove get context in RestAqlHandler. 2014-10-17 09:31:11 +02:00
Max Neunhoeffer 83ebd46652 Tell AqlTransaction constructor if transaction is main or sub.
Only lock collections in AqlTransactions that are main ones.
2014-10-16 23:59:02 +02:00
Jan Steemann 68fbe06c4b added missing files 2014-10-16 17:25:28 +02:00
Jan Steemann 912a8162fb some renaming 2014-10-16 17:23:50 +02:00
Max Neunhoeffer a231ca4c82 Finish some changes to transactions in AQL. 2014-10-16 16:46:39 +02:00
Max Neunhoeffer 743d7d127a Snapshot, does not compile, try to sort out transactions in AQL. 2014-10-16 16:41:32 +02:00
Jan Steemann 70c59a61fd removed macro 2014-10-16 16:28:18 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Jan Steemann 64fd7ea4b3 conversions 2014-10-16 10:20:04 +02:00
Willi Goesgens 93ff2652e1 Walker: add possibility to enter Subqueries on the way in
NodeClone: don't clone the subquery reference list, we don't need them.
2014-10-15 14:59:06 +02:00
James 9f942d0ce3 finished first version of DistributeBlock/Node. 2014-10-15 10:53:09 +01:00
Jan Steemann dd0601591b fixed uninitialized variable 2014-10-15 10:01:01 +02:00
Jan Steemann 1f423a5e0d removed optimization for range node 2014-10-14 13:22:04 +02:00
Jan Steemann fc8094e832 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-14 13:20:18 +02:00
Jan Steemann 6895ba9e27 fixed tests 2014-10-14 13:20:10 +02:00
James 1bed52300e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-14 11:29:34 +01:00
James adca1117ff removing debug output, up dating tests. 2014-10-14 11:29:14 +01:00
Jan Steemann dfb1905035 fixed tests 2014-10-14 12:03:25 +02:00
James 3442f298ea Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-14 10:19:38 +01:00
James 602f03e4e3 adding distribute-in-cluster optimizer rule. 2014-10-14 10:19:27 +01:00
Jan Steemann 3886d6ef09 fixes for Visual Studio 2014-10-14 11:04:28 +02:00
James 362dc083cc Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-14 09:22:20 +01:00
James 60e85ccc7e proper toJsonHelper method for DistributeNode. 2014-10-14 09:21:40 +01:00
Jan Steemann 7be268c07c changed AQL optimizer to not throw 2014-10-14 10:14:40 +02:00
Jan Steemann 77ff3642c9 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-10 18:58:07 +02:00
Jan Steemann 23e692e7fa added FIND_FIRST, not yet documented 2014-10-10 18:57:57 +02:00
Willi Goesgens 3a7a03a51f Don't add intermediate calculationnodes for LET-statements to forward the results of subqueries. Instead adjust the outvariable of the subquerynode. 2014-10-10 17:00:49 +02:00
James 10f7feeede added comment to Query.cpp about comparison of serialised/deserialised plans. 2014-10-10 10:23:59 +01:00
James c0c3f627bb proper initialisation and shutdown of distribute block. 2014-10-10 08:31:19 +01:00