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

5285 Commits

Author SHA1 Message Date
Willi Goesgens 73ac2e729c another place to ensure that the pointer to TRI_json_t is free'd 2014-10-29 19:11:24 +01:00
Max Neunhoeffer d6d80d2b9b Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 16:52:20 +01:00
Max Neunhoeffer 9fcdc1fa94 Start building proper cleanup if instanciation throws in between. 2014-10-29 16:51:59 +01:00
Willi Goesgens 6a0fe7af9c Fix memleak: TRI_Insert2ArrayJson doesn't use the pointer; need to use TRI_Insert3ArrayJson here. 2014-10-29 16:39:54 +01:00
Max Neunhoeffer 425d50bdc1 Fix RemoteBlock initializeCursor forwarding by HTTP. 2014-10-29 16:17:15 +01:00
Max Neunhoeffer e0c85832a5 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 15:42:35 +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
Willi Goesgens 6048b8a92b Fix memleak: TRI_Insert2ArrayJson doesn't use the pointer; need to use TRI_Insert3ArrayJson here. 2014-10-29 13:51:56 +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 da10751030 do not spam dispatcher queue 2014-10-28 16:01:40 +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 acd3c8a47a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-28 11:30:59 +01:00
Jan Steemann 529bf386d7 fixed some API errors 2014-10-28 11:30:49 +01:00
Max Neunhoeffer 693b0056cc Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-28 11:20:19 +01:00
Jan Steemann d3c945d1d3 fixes for Visual Studio 2014-10-28 11:02:05 +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 ccf7e4f131 mini cleanup 2014-10-27 22:47:36 +01:00
Jan Steemann 7452c70a3b moved backtrace functions 2014-10-27 18:15:10 +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 7db7c22443 don't add the TRI_errno_string() to the exception twice. 2014-10-27 15:39:10 +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 0e96a31b6a oops, forgot to commit 2014-10-24 23:55:31 +02:00
Jan Steemann 3a3c4a9f93 issue #1063: Docs: measuring unit of --wal.logfile-size 2014-10-24 23:43:58 +02: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
Thomas Schmidts d79ff5d74d Fixed broken links 2014-10-24 17:49:01 +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 38c8f4e328 do not log warning 2014-10-24 13:19:26 +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 4848840703 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 21:52:36 +01:00
James 0158a67300 adding ignoreShutdown change. 2014-10-23 21:52:10 +01:00
Jan Steemann aa1e95036b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-23 22:51:02 +02:00
Jan Steemann 3c05701851 nullptr 2014-10-23 22:50:53 +02: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 3269bfe3a9 simpler iteration 2014-10-23 14:43:43 +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 65a52df7d1 added assertions 2014-10-23 13:55:18 +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
Willi Goesgens 02c1f59007 Also add our errno strings to exceptions with user messages (if not TRI_ERROR_INTERNAL) 2014-10-21 12:43:33 +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 4ab4dc1c11 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 11:21:28 +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
Jan Steemann 04d5f5dfdd fixed segfault 2014-10-20 10:50:31 +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
Frank Celler 1cdf01970e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 10:12:35 +02:00
Jan Steemann 4cbb5ea939 fixed wrong if statement 2014-10-20 09:58:46 +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
Frank Celler 05c6b645df fixed authentication 2014-10-20 09:29:57 +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 e6f10b374b more cleanup 2014-10-18 01:39:47 +02:00
Jan Steemann 40ddb93eee flush log at shutdown 2014-10-18 00:44:44 +02: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
Max Neunhoeffer 5600a2bb22 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 15:34:10 +02:00
Max Neunhoeffer 11ace2de3a Fix registerTransaction in StandaloneTransactionContext. 2014-10-17 15:33:48 +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
Max Neunhoeffer 7a25f20e23 Fix clone for AqlTransactions. 2014-10-17 11:02:37 +02: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 d508812ec3 Silence a compiler warning. 2014-10-17 09:09:36 +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
Max Neunhoeffer 183cd3eb40 Sort out temporary directory creation with individual names. 2014-10-16 20:08:21 +02:00
Jan Steemann bb0e11499d fixed races reported by helgrind 2014-10-16 19:32:14 +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 223820eba3 removed some macros 2014-10-16 16:31:49 +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
Jan Steemann 688e8ebbc1 better support for handling multipart requests 2014-10-16 02:05:57 +02:00
Jan Steemann b759815b68 fixed race condition in SynchroniserThread 2014-10-15 19:26:36 +02:00
Jan Steemann 1bf7fbde25 helgrind 2014-10-15 17:55:14 +02:00
Jan Steemann 24dcb9c369 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-15 17:33:26 +02:00
Jan Steemann edae662eb4 added res.send() and res.sendFile() 2014-10-15 17:33:10 +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 7bcac607bb Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-15 10:53:17 +01:00
James 9f942d0ce3 finished first version of DistributeBlock/Node. 2014-10-15 10:53:09 +01:00
Jan Steemann 8e40e727a4 fixed memleak 2014-10-15 10:13:24 +02:00
Jan Steemann dd0601591b fixed uninitialized variable 2014-10-15 10:01:01 +02:00
Jan Steemann 6bd448be46 added support for reading / writing binary data in fs.readFileSync && fs.write 2014-10-14 19:07:16 +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 f3e72a80dc fixed compile warnings 2014-10-14 11:13:01 +02: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 69e9d12955 fixed race in synchronizer 2014-10-13 15:41:22 +02:00
Jan Steemann d151088a94 fixed invariant 2014-10-13 14:24:29 +02:00
Jan Steemann 9d02516e19 potential fix for issue #1041 2014-10-11 21:42:58 +02:00
Jan Steemann ce8ac10f59 optimized memory usage of multi hash index 2014-10-11 18:38:22 +02:00
Jan Steemann fefd527b9f Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-10 22:00:15 +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
Jan Steemann 17c45db8bb changed implementation to use freelists 2014-10-10 18:57:42 +02:00
Jan Steemann 5604008ce4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-10 18:06:14 +02:00
Jan Steemann 4c366dad63 issue #1038: use linked lists for collisions 2014-10-10 18:05:23 +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
Jan Steemann 5abfa7fdbd whitespace 2014-10-10 13:42:20 +02:00
James 10f7feeede added comment to Query.cpp about comparison of serialised/deserialised plans. 2014-10-10 10:23:59 +01:00
James 9334547583 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-10 08:31:28 +01:00
James c0c3f627bb proper initialisation and shutdown of distribute block. 2014-10-10 08:31:19 +01:00
Jan Steemann 39c98c87f5 fixed memleak 2014-10-09 18:06:21 +02:00
James a346e257bb Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/ExecutionBlock.h
 2014-10-09 10:46:49 +01:00
James 92e0d1e459 abstract class BlockWithClients to contain Scatter/DistributeBlocks 2014-10-09 10:39:50 +01:00
Jan Steemann 7966c8d044 fixed compile warning 2014-10-09 10:52:08 +02:00
Jan Steemann 081a62c6e4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-09 10:45:40 +02:00
Jan Steemann 6cdaaa1b85 fixes for Visual Studio 2014-10-09 10:45:31 +02:00
James 084078f61f fixed tests for remove-unnecessary-remote-scatter and undistribute-remove-after-enum-coll, renamed distributeInCluster to scatterInCluster. 2014-10-09 08:45:34 +01:00
Jan Steemann 8294e54f32 faster import 2014-10-08 17:01:45 +02:00
Jan Steemann 999d8ffd1d small optimizations 2014-10-08 16:10:27 +02:00
Jan Steemann ff80fafba5 fixed cached lookups of collections on the server, which may have caused spurious problems after collection rename operations 2014-10-08 14:59:02 +02:00
James d2b86de370 fixed tyopo in comment 2014-10-08 10:55:58 +01:00
James 2ec03d57e3 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-08 10:26:19 +01:00
James 2ed7fb13b2 DistributeBlock getOrSkipSome done as far as possible. 2014-10-08 10:26:04 +01:00
Jan Steemann fe6ea548db fixed reading run lengths with empty values 2014-10-07 14:04:12 +02:00
Jan Steemann c2f0265d7d fixed optimizer rule remove-unnecessary-remote-scatter 2014-10-07 13:21:05 +02:00
Jan Steemann aef384da1a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-07 12:36:36 +02:00
Jan Steemann e5d8414865 fixed more queries 2014-10-07 12:36:17 +02:00
James e17a43f66e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-07 11:19:25 +01:00
Jan Steemann 4ff58364f1 fixed cloning of plans 2014-10-07 12:00:37 +02:00
James 4a8ef130f5 DistributeBlock getOrSkipSome method minus the hard part. 2014-10-07 10:33:37 +01:00
Jan Steemann a62d83603e fixed missing register planning 2014-10-06 18:43:50 +02:00
Jan Steemann 0f83d8132f fixed some transaction threading errors 2014-10-06 18:39:01 +02:00
Willi Goesgens 7dac9d8cc7 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-06 14:16:39 +02:00
Willi Goesgens 48c5ff938e If we clone an ExecutionNode for the same AST we also have to copy the evaluation members, but we don't need a deep-copy. 2014-10-06 14:15:41 +02:00
James 5af60d121e Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-06 12:57:17 +01:00
James 95fd279a52 distribution node/block declarations etc. 2014-10-06 12:57:09 +01:00
Willi Goesgens 8f74eeff97 Assert whether we have a varoverview. 2014-10-06 13:20:31 +02:00
Willi Goesgens 287b6dfb37 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-06 11:55:27 +02:00
Willi Goesgens c01e31c404 when de-serializing nodes don't create new variables, but look up the ones we already have. 2014-10-06 11:55:11 +02:00
Willi Goesgens 4509a0f2b0 call findVarUsage before serialising the json, and not after deserializing it. 2014-10-06 11:53:23 +02:00
James 032e5d085e reset _initializeCursorOrShutdown in shutdown method, renaming test file. 2014-10-06 10:35:50 +01:00
James aee0605742 better initialiseCursor and shutdown for ScatterBlock 2014-10-06 10:30:28 +01:00
Jan Steemann 577593ed55 shutdown transactions 2014-10-06 11:23:39 +02:00
Jan Steemann bf31161ef5 activated if-statement 2014-10-06 10:40:04 +02:00
Jan Steemann 5959a5e6da fixed segfaults during node cloning 2014-10-06 10:31:15 +02:00
James 029e443b12 removing debug output 2014-10-04 12:21:34 +01:00
James 8bd3a9718c undistributeRemoveAfterEnumColl now more or less works for REMOVE x._key in coll 2014-10-03 11:32:40 +01:00
James c6c0387e50 undistributeRemoveAfterEnumColl optmizer rule now working 2014-10-03 10:13:11 +01:00
James 5a070a4e0a remove const-qualified types in VarInfo struct to allow compilation. 2014-10-03 09:27:35 +01:00
Jan Steemann 0e103d33dc added assertion 2014-10-03 01:37:04 +02:00
Jan Steemann d8934a025f make parseDocumentId more strict again 2014-10-03 01:23:07 +02:00
Jan Steemann 4d488b3734 don't fail on forced shutdown 2014-10-03 00:50:05 +02:00
Jan Steemann 7a4c8f69db speed up parseDocumentId 2014-10-03 00:49:46 +02:00
Jan Steemann 81ec1a2754 indentation 2014-10-03 00:12:00 +02:00
Willi Goesgens e1efab6fb5 Fix cloning to other ASTs - dereference pointers to IDs and look up the items on the new lists 2014-10-02 18:41:13 +02:00
Jan Steemann a2e9fadc7d moved assignment into constructor 2014-10-02 18:38:36 +02:00
Jan Steemann 66d2fc570f move register assignment into constructor 2014-10-02 18:27:53 +02:00
Jan Steemann f44599644c moved register assignment into constructor 2014-10-02 17:52:45 +02:00
Jan Steemann 31005892d2 assign register in constructor 2014-10-02 17:35:43 +02:00
Jan Steemann eae877b1be return variables on explain 2014-10-02 17:34:59 +02:00
Jan Steemann 573d837561 off-by-one fix 2014-10-02 17:06:12 +02:00
Jan Steemann 873d8291db fixed race condition in getCurrentDBServers 2014-10-02 15:50:04 +02:00
Jan Steemann 1d1ce39d50 fixed warning 2014-10-02 15:35:43 +02:00
Jan Steemann 24be855c8d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-02 15:34:57 +02:00
Jan Steemann e28ad821b0 fixed spuriously occurring "database not found" error 2014-10-02 15:34:38 +02:00
Willi Goesgens b8491932db Command the cluster node not to do optimizations. 2014-10-02 14:45:10 +02:00
Willi Goesgens 97e83b491d Try to stop the transaction when catching an exception 2014-10-02 14:44:38 +02:00
Willi Goesgens dc6dba1ef4 Cluster Communication: serialize a global set of the currently available variables. 2014-10-02 13:15:02 +02:00
Willi Goesgens d7d6ce65db Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-02 11:08:02 +02:00
Willi Goesgens 6f4e5c4fd7 When creating the copy for the clusternodes we also need to copy the properties. 2014-10-02 11:07:31 +02:00
James 16d54d6694 snapshot 2014-10-02 10:06:45 +01:00
James 8e8c5c9934 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-02 10:03:28 +01:00
James 2f887e197e adding remainingForShard to ScatterBlock 2014-10-02 10:03:08 +01:00
Jan Steemann ef15f1bb5d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-02 10:41:20 +02:00
Willi Goesgens f63e90e08b Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-02 10:41:12 +02:00
Willi Goesgens bc627dda7b Also copy the varoverview to the clone. 2014-10-02 10:40:09 +02:00
Jan Steemann 67873e5edd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-02 10:34:33 +02:00
Jan Steemann 992bc5264b debug output 2014-10-02 10:34:27 +02:00
Jan Steemann 7f9da1c397 asserts 2014-10-02 10:34:08 +02:00
Max Neunhoeffer d021bcf720 Sort out shardId for ScatterBlock and HTTP API. 2014-10-02 10:24:47 +02:00
Max Neunhoeffer a59d1e4448 Start to sort out ScatterBlock's special API. 2014-10-02 09:55:15 +02:00
Max Neunhoeffer 25d588b858 Set _varUsageValid flag in Json constructor. 2014-10-02 09:28:00 +02:00
Max Neunhoeffer 8a0d5c021a Start adapting RestAqlHandler to ScatterBlock. 2014-10-02 00:34:32 +02:00
Max Neunhoeffer e043deb13b Rename StaticAnalysisDebugger into RegisterPlanningDebugger. 2014-10-02 00:13:49 +02:00
Max Neunhoeffer be07d39457 Rename staticAnalysis -> planRegisters. 2014-10-02 00:11:15 +02:00
Jan Steemann 5b0b1f0af5 indenting 2014-10-01 19:06:29 +02:00
Jan Steemann 38d43a2fb3 print error message in cases AqlHandler fails 2014-10-01 17:47:43 +02:00
Jan Steemann f2c115fa25 do not crash when using an index 2014-10-01 16:16:38 +02:00
Jan Steemann d381031972 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-01 15:35:26 +02:00
Jan Steemann 0d9cdfc87c struct Index 2014-10-01 15:35:16 +02:00
Willi Goesgens 6df55bcb0a Don't reuse "empty" json objects, they are undefined after first use. 2014-10-01 15:00:02 +02:00
Willi Goesgens 4b399236f1 Make the Transaction a smart pointer living inside of Query. 2014-10-01 14:30:53 +02:00
Jan Steemann 49237ef55a fixed some cluster internal communication 2014-10-01 14:06:00 +02:00
Jan Steemann 98733660c8 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-01 12:21:45 +02:00
Jan Steemann f8cf3d1951 fixed memleak 2014-10-01 12:21:37 +02:00
James 7a34d065b5 cleaning up and registering undistributeRemoveAfterEnumColl. 2014-10-01 10:43:54 +01:00
James 3569bfdebf Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-01 10:18:00 +01:00
James 2fd8c2b185 prelim version of undistributeRemoveAfterEnumColl 2014-10-01 10:17:36 +01:00
Willi Goesgens eb2f815d26 Add json de/serialization of new ExecutionNode members. 2014-10-01 09:59:50 +02:00
Jan Steemann ee49d712a6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-30 23:46:36 +02:00
Jan Steemann 672d540609 removed some debug output 2014-09-30 23:46:17 +02:00
Max Neunhoeffer a688636ce1 Merge branch 'verpflanzung' into devel 2014-09-30 23:31:30 +02:00
Max Neunhoeffer 993a89fea2 Fix compilation again. 2014-09-30 23:30:55 +02:00
Max Neunhoeffer 4b21832bba Take out unnecessary friend class declarations. 2014-09-30 23:23:46 +02:00
Max Neunhoeffer 8bffb3daa3 Finish transplantation. 2014-09-30 23:20:51 +02:00
Jan Steemann 03790a75f2 hold logs for slightly shorter time 2014-09-30 23:20:43 +02:00
Max Neunhoeffer 5676e82872 Make it compile using friend classes. 2014-09-30 20:14:39 +02:00
Max Neunhoeffer 40d7dec7bc Snapshot. 2014-09-30 16:49:12 +02:00
Max Neunhoeffer 5dbcac8efe Start transplantation of _varOverview to ExecutionNodes. 2014-09-30 16:44:01 +02:00
Jan Steemann f50f041bda Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/ExecutionEngine.cpp
	arangod/Aql/Query.cpp
 2014-09-30 15:50:28 +02:00
Jan Steemann c4ce98a442 fixed some bugs in distributed plan instanciation 2014-09-30 15:19:44 +02:00
Willi Goesgens 22f2753d62 Properly generate the new plan with the new query 2014-09-30 14:50:31 +02:00
Jan Steemann b78f54d94e lookup function for keys 2014-09-30 14:47:58 +02:00
Willi Goesgens 3f566f6289 Enable node* clone functions to produce deep copies which live on a specified query. 2014-09-30 14:09:12 +02:00
James 1d6637eedf Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-30 10:10:13 +01:00
James 22597af5ac version of removeUnnecessaryRemoteScatter which changes the plan in place. 2014-09-30 10:10:03 +01:00
Willi Goesgens 60dd21802b Clone the query, move the memory kept in the AST over to the query so all memory is kept in one location. 2014-09-30 10:18:13 +02:00
James 3daaaad855 fixing last 2014-09-30 08:48:29 +01:00
James 301ccddf83 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-30 08:29:36 +01:00
James d204ce4019 adding registration of the remove unnecessary remote scatter optimizer rule. 2014-09-30 08:29:21 +01:00
Jan Steemann 3a2e13b910 pass queryId to remote servers 2014-09-29 17:35:10 +02:00
Jan Steemann f3186fa065 cppcheck 2014-09-29 17:02:40 +02:00
Jan Steemann f3015bd70a fixed indentation 2014-09-29 16:52:45 +02:00
Jan Steemann b31987fea7 pass data to RemoteNode 2014-09-29 16:36:52 +02:00
Jan Steemann 691e9f315c cas adjustment for @mchacki 2014-09-29 16:09:45 +02:00
Jan Steemann ec1e6552ca clone plan for DBServers 2014-09-29 15:57:53 +02:00
Jan Steemann db0fdf24ec less string operations during batch request header parsing 2014-09-29 13:56:45 +02:00
Jan Steemann ec02ed2ccf nullptr 2014-09-29 13:56:37 +02:00
Jan Steemann 3ac25ad56f fixed some issues with remote queries 2014-09-29 12:14:03 +02:00
Jan Steemann 643ffa104d moved isCoordinator to function of its own 2014-09-29 09:38:15 +02:00
Jan Steemann 188fe0c43c accidently committed local modifications. revert 2014-09-29 09:31:27 +02:00
Jan Steemann 0d075dca3f pass queryRegistry into the AQL functions 2014-09-29 09:30:32 +02:00
Jan Steemann d177bc110c comments 2014-09-29 09:06:06 +02:00
Jan Steemann 166179c6d5 fixed compile warnings 2014-09-29 09:05:15 +02:00
Max Neunhoeffer 8fbe9bda98 Remove some unnecessary and fatal destructors. 2014-09-29 08:42:30 +02:00
James d53da7ce4a Optimiser rule to get rid of a RemoteNode->ScatterNode combination 2014-09-27 16:43:08 +01:00
James bfd8ff5f3a finished looking at ExecutionBlock destructors. 2014-09-27 15:06:09 +01:00
James 5264fa2612 remove unnecessary and incorrect renewal of ourLessThan. 2014-09-27 14:32:34 +01:00
James 8c1f9f5095 fixed arithmetic in GatherBlock::skipSome 2014-09-27 14:27:56 +01:00
James 4d0b3360cb fixing arithmetic in available in GatherBlock. 2014-09-27 14:14:03 +01:00
James 75df1bff15 destructor for SubqueryBlock, deletes private data 2014-09-27 13:19:58 +01:00
James b0ff6d1712 destructor for CaluculationBlock, deletes local data. 2014-09-27 13:17:45 +01:00
James 0c98677b16 destructor fo EnumerateListBlock, deletes local data 2014-09-27 13:13:30 +01:00
James 144ee7a8f0 destructor for IndexRangeBlock, deletes private data 2014-09-27 13:10:14 +01:00
James ae5b96bc5d destructor for EnumCollBlock that deletes local data. 2014-09-27 13:04:59 +01:00
James 1c52127cc1 destructor for GatherBlock, deletes _gatherBlockBuffer 2014-09-27 12:53:27 +01:00
James 68f48d0cd4 proper initializeCursor method for GatherBlock. 2014-09-27 12:48:48 +01:00
James dd716301ab moving _sortRegisters from initCursor to initialize. 2014-09-27 12:41:59 +01:00
James f04b25f3ea correcting comment. 2014-09-27 12:37:27 +01:00
James bcebeb4dd0 comments for ScatterBlock and some reordering 2014-09-27 12:31:12 +01:00
James 69f2cfd5a5 cleaning up, and comments in .cpp for GatherBlock 2014-09-27 12:12:50 +01:00
James 14eaac044c comments before GatherBlock in header, renamed _buffer, _pos which are 
non-standard
 2014-09-27 12:03:55 +01:00
Max Neunhoeffer 45b900913c Some adjustments to code in GatherBlock. 
Finish first version of RemoteBlock.
 2014-09-27 01:45:05 +02:00
Jan Steemann f229253e24 fixed redundant if / else if 2014-09-26 21:26:26 +02:00
Jan Steemann 9e47f3ca27 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/ExecutionNode.h
 2014-09-26 20:23:52 +02:00
Jan Steemann c3ce45e0dd added block instanciation for coordinator, v0.0.0 2014-09-26 20:17:42 +02:00
Max Neunhoeffer 5f5cf84641 Refactor getSome for RemoteBlock. 2014-09-26 16:49:26 +02:00
Max Neunhoeffer dbed62392f Implement skipSome method for RemoteBlock. 2014-09-26 16:30:30 +02:00
Max Neunhoeffer d2a9632710 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 16:20:17 +02:00
Max Neunhoeffer 046d4f524d Implement getSome for RemoteBlock. 2014-09-26 16:19:25 +02:00
Max Neunhoeffer 865d513dd0 Add skipSome to HTTP API and to ExecutionEngine. 2014-09-26 16:18:47 +02:00
Willi Goesgens d003eecac1 We need to pass a reference since we want to return values onto this; and return const references to not duplicate the memory. 2014-09-26 15:22:41 +02:00
Max Neunhoeffer 5f24e603fe Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 14:51:14 +02:00
Max Neunhoeffer 95264a82ab initializeCursor and shutdown methods for HTTP API for queries. 2014-09-26 14:50:52 +02:00
Max Neunhoeffer 25ee17c075 initializeCursor and shutdown methods for ExecutionEngine. 2014-09-26 14:50:28 +02:00
Jan Steemann 578d22c95b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-26 13:58:16 +02:00
Jan Steemann f462c5f620 add database and collection info to gather nodes 2014-09-26 13:58:02 +02:00
Willi Goesgens 41fb15d462 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-09-26 13:44:16 +02:00
Willi Goesgens 14eda3e348 - create type for SortElements to be used instead of stacked templates 
- abstract json parsing of SortElemnts into an own function
 - implement deserialisation of Scatter/GatherNode
 2014-09-26 13:42:26 +02:00
Max Neunhoeffer 5c7d058043 Add stubs for RemoteBlock. 2014-09-26 13:34:08 +02:00
Max Neunhoeffer e9bac83e67 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 13:23:33 +02:00
Max Neunhoeffer c4fd3e7553 First steps towards RemoteBlock. 2014-09-26 13:23:21 +02:00
Jan Steemann cb3d138507 fixed compiler warning 2014-09-26 13:09:38 +02:00
Willi Goesgens 53ee658be0 Implement moving of sortnode into the clusterable part of the query; add elements to the json serialisation of the gather node 2014-09-26 12:35:58 +02:00
James 9ae0879ba4 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 11:34:18 +01:00
James 53b3abeee0 ScatterBlock uses shardId strings instead of clientId numbers. 2014-09-26 11:34:07 +01:00
Jan Steemann 3afadfdefa fixed compile warnings 2014-09-26 12:30:42 +02:00
Jan Steemann 8fa141e31b removed invalid sequence from file 2014-09-26 12:09:01 +02:00
Jan Steemann 6eca3d6cc4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-26 12:07:20 +02:00
Jan Steemann 5c250d9ec7 fixed compile warning 2014-09-26 12:07:11 +02:00
Jan Steemann 046d2586ae added temporary function for @mchacki 2014-09-26 12:06:57 +02:00
Thomas Schmidts 2e151f7ab0 Added type definition to db._create documentation 2014-09-26 11:53:44 +02:00
James de19d4441b Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 10:40:43 +01:00
James e8dc7694e3 shutdown method for GatherBlock and initializeCursor for ScatterBlock 2014-09-26 10:40:05 +01:00
Max Neunhoeffer 8a6c2f22b5 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-26 11:18:31 +02:00
Max Neunhoeffer 06d039d3a0 Fix a deserialisation bug for AqlItemBlocks. 2014-09-26 11:18:17 +02:00
James 2070175a51 getOrSkipSomeForClient method for ScatterBlock. 2014-09-26 09:32:39 +01:00
James e9f8d5ac99 fixed bug in ScatterBlock::getSomeForClient. 2014-09-26 08:51:11 +01:00
Willi Goesgens 6c81f630a3 Add filter rule which moves Filters & Calculations into the parts of a Plan that is distributed to clusters. 2014-09-25 17:08:20 +02:00
Max Neunhoeffer b9f9a55fbf Move on with AqlItemBlock deserialisation. Not working yet. 2014-09-25 16:52:42 +02:00
James 3423db77e6 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-25 11:09:15 +01:00
James b9d27bee42 preliminary methods for ScatterBlock. 2014-09-25 11:08:47 +01:00
Max Neunhoeffer f80f67f18b Remove unused variable. 2014-09-25 12:06:09 +02:00
Max Neunhoeffer 85b2e7bfe3 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-25 11:57:06 +02:00
Max Neunhoeffer f1483a4ea0 Optimize/debug HTTP API for queries and AqlItemBlock serialisation. 2014-09-25 11:47:50 +02:00
James 3d6dc1eddc added missing hasMore method to GatherBlock, starting for ScatterBlock. 2014-09-25 09:41:27 +01:00
James a953ff8bcd skipSome method for GatherBlock. 2014-09-25 08:56:43 +01:00
Max Neunhoeffer 9079ba3971 Finish HTTP API. 2014-09-25 00:14:57 +02:00
Max Neunhoeffer f6b1e0060e Expose AQL_PARSE via HTTP API under /_api/aql/parse 2014-09-25 00:01:07 +02:00
Max Neunhoeffer bd02e70e41 Expose AQL_EXPLAIN via HTTP API under /_api/aql/explain. 2014-09-24 23:49:55 +02:00
Max Neunhoeffer 20f345ccdd Fix automatic expiry of queries. 2014-09-24 23:12:23 +02:00
Jan Steemann dd53bc295a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-09-24 17:14:50 +02:00
Jan Steemann 9fe3fedb45 unique_ptr 2014-09-24 17:14:37 +02:00
Max Neunhoeffer bfc8b14a87 More HTTP methods for queries. Expire queries. 2014-09-24 16:51:35 +02:00
Max Neunhoeffer 85ce0f0674 Remove some empty comments. 2014-09-24 16:27:45 +02:00
Max Neunhoeffer 37894bc628 Fix expireQueries. 2014-09-24 16:27:02 +02:00
Max Neunhoeffer afc54a07a9 Implement expireQueries in QueryRegistry. 2014-09-24 16:26:31 +02:00
Max Neunhoeffer 784a299ab8 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-09-24 16:17:44 +02:00
Max Neunhoeffer cf5e1be91e Version version of HTTP API done. 2014-09-24 16:17:18 +02:00
Jan Steemann c8fba4c9be fixes for Visual Studio 2014-09-24 15:41:26 +02:00
Jan Steemann 0320366612 fixed compile warnings 2014-09-24 13:35:26 +02:00
Jan Steemann 72f5ce8ddc Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into devel 2014-09-24 13:34:06 +02:00
Jan Steemann d5fb057603 less locking 2014-09-24 13:32:39 +02:00
Jan Steemann 1e66c86d08 fixed invalid document access 2014-09-24 12:27:36 +02:00
James c1742a9949 GatherBlock non-simple case implemented. 2014-09-24 11:17:05 +01:00
Jan Steemann dbf964e204 small optimizations 2014-09-24 12:09:13 +02:00
James 37cfa73081 first attempt at GatherBlock::nextValue 2014-09-24 10:21:08 +01:00
Jan Steemann ddfb5c965d merged experimental features 2014-09-24 09:42:16 +02:00
James b4f0df3caf Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-24 08:31:01 +01:00
James 26e1f40b32 fixing count/remaining for GatherBlock. 2014-09-24 08:30:42 +01:00
Max Neunhoeffer e8e60106f3 Add quotes for id attribute and add closeTransaction. 2014-09-24 00:27:12 +02:00
Max Neunhoeffer 063665162e Add closing and reopening of transactions. 2014-09-24 00:26:56 +02:00
Max Neunhoeffer ce041b63d4 Add Json-serialisation of AqlItemBlocks. 2014-09-24 00:26:17 +02:00
James 5362ff3203 adding skipSome method for GatherBlock. 2014-09-23 18:06:08 +01:00
James 838290381b cleaning up. 2014-09-23 17:46:08 +01:00
James d9725b037b about to delete some junk 2014-09-23 17:35:41 +01:00
James b7a1247252 adding variables/sort direction in _elements to GatherNode. 2014-09-23 17:31:27 +01:00
James 6f8516e818 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-23 17:22:31 +01:00
Max Neunhoeffer 1f74a64b58 Implement POST for HTTP API for queries. 2014-09-23 16:51:03 +02:00
Max Neunhoeffer cd36c00712 Cleanup the cleanup of a failed query preparation execution. 2014-09-23 15:31:42 +02:00
Max Neunhoeffer 36e8ab4608 Fix handling of plans in explain() 2014-09-23 15:29:14 +02:00
Max Neunhoeffer 5238686ee3 Make Queries preparable and then executable separately. 2014-09-23 15:23:10 +02:00
Max Neunhoeffer 6732913e71 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-23 13:16:24 +02:00
Max Neunhoeffer 067dd690f9 More progress with HTTP API for queries. 2014-09-23 13:16:10 +02:00
Jan Steemann f8599b0f0f removed unused instance variable 2014-09-23 13:14:53 +02:00
James 54e8caba4d interim commit. 2014-09-23 11:27:25 +01:00
James 42ab416497 count, remaining, getBlock for GatherBlock. 2014-09-23 10:10:24 +01:00
James 6bf9c1d461 stub for GatherBlock. 2014-09-23 09:14:33 +01:00
Jan Steemann 009396f7b0 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-wrapshapedjson.cpp
 2014-09-23 08:35:32 +02:00
Jan Steemann 80f18ad4b9 fixed copy-on-write for shaped json 2014-09-23 00:07:46 +02:00
Jan Steemann 92f87c19ce Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-09-22 23:51:16 +02:00
Max Neunhoeffer 591f7acb8b Fix problems with variable bounds. 2014-09-22 23:30:22 +02:00
Thomas Schmidts e99a12c339 Fixed error in Documentation and changed visualization of deprecated chapters 2014-09-22 17:44:52 +02:00
Jan Steemann b75af455e4 fixed property query 2014-09-22 17:22:01 +02:00
Jan Steemann 79c584d362 less memory usage for ShapedJson documents 2014-09-22 16:43:31 +02:00
Jan Steemann 067f253dd5 changed interface for locking 
Conflicts:
	arangod/VocBase/transaction.cpp
 2014-09-22 09:25:49 +02:00
Max Neunhoeffer 5e534261e2 Change _equality detection. 
ATTENTION: This is still not right, yet.
Pondering about solution...
 2014-09-22 08:40:21 +02:00
Jan Steemann 74c9653f6f fixed range-info equality flag after fusing 2014-09-19 22:07:06 +02:00
Jan Steemann 38fdaa4066 removed unused function parameter 2014-09-19 20:28:41 +02:00
Jan Steemann 50e17b8c4f disabled optimization due to failing tests 2014-09-19 19:30:57 +02:00
Jan Steemann a58c8661b5 added some query statistics 2014-09-19 18:47:33 +02:00
Jan Steemann 9699091466 optimize IN and NOT IN with one or no members 2014-09-19 18:22:01 +02:00
Jan Steemann ae5f454bfc added unary operator 2014-09-19 17:46:36 +02:00
Jan Steemann 9f08e441fd Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-19 17:41:13 +02:00
Jan Steemann 92e46b8191 use SimpleExpression for more types of expressions 2014-09-19 17:40:47 +02:00
Max Neunhoeffer 51aff683d9 Some more code for HTTP API for AQL. 2014-09-19 16:49:55 +02:00
Jan Steemann 3d686d4028 test 2014-09-19 16:07:22 +02:00
Jan Steemann 9a6dfa1db2 execute several types of expressions in C++ 2014-09-19 15:21:01 +02:00
Max Neunhoeffer 94bcd23070 Set up relevant HTTP methods for AQL. 2014-09-19 14:28:54 +02:00
Max Neunhoeffer c5f5cb322a Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-19 13:59:05 +02:00
Max Neunhoeffer 697dc64b58 Add a QueryRegistry in the ArangoServer and hand it on. 2014-09-19 13:56:46 +02:00
Max Neunhoeffer 0466873092 First step towards correct setup of HTTP API for AQL. 2014-09-19 13:14:19 +02:00
Max Neunhoeffer 28818a1f3d Remove debugging output. 2014-09-19 13:00:46 +02:00
Jan Steemann 64f5b22e4f changed interface for locking 2014-09-19 12:45:29 +02:00
Jan Steemann 109941207f reserve more memory for result set 2014-09-19 12:45:08 +02:00
Jan Steemann 1d87957b40 reserve enough memory for simple lists & arrays 2014-09-19 12:44:46 +02:00
Jan Steemann 76aaed94a0 make interface more user-friendly 2014-09-19 12:44:29 +02:00
Jan Steemann 1ed4e20ba1 nullptr 2014-09-19 12:02:34 +02:00
Jan Steemann b10c45af3e fixed compile warning 2014-09-19 09:22:55 +02:00
Jan Steemann 95c9a0ccba fixed compile warnings 2014-09-19 09:15:26 +02:00
Jan Steemann 68232715f1 fixed compile warning 2014-09-19 09:05:52 +02:00
Jan Steemann f782e81661 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-09-19 01:02:51 +02:00
Jan Steemann 6f4e799ccc added `profile` option 2014-09-19 01:02:39 +02:00
Max Neunhoeffer 327c5264c5 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-19 00:37:17 +02:00
Max Neunhoeffer 68f246a09f Add a REST handler for AQL (queries/cursors). 2014-09-19 00:36:57 +02:00