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

357 Commits

Author SHA1 Message Date
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
Jan Steemann 399e93c3ff issue #1155: allow bind parameter for sort order 
SORT what @order is now allowed
 2014-12-08 13:05:40 +01:00
Jan Steemann 8f99e59747 issue #1163: fullcount was sometimes used for wrong LIMIT node 2014-12-05 19:02:51 +01:00
Jan Steemann e4b51f616c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 17:46:03 +01:00
Jan Steemann 7e161b88ce issue #1131: added KEEP for `COLLECT...INTO` 2014-12-03 17:44:10 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Jan Steemann 292eaad273 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-26 19:49:38 +01:00
Jan Steemann 45ebdf7581 enable more indexes 2014-11-26 19:49:28 +01:00
Jan Steemann 57aefb988d fix optimization of subqueries 2014-11-26 15:01:55 +01:00
Max Neunhoeffer 7161a6b848 Reengineer cost estimation completely. 
One test failing in single-server-AQL.
Cluster not yet tested.
 2014-11-14 18:58:08 -05:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +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
Jan Steemann 699517413e fixed clumsy error handling 2014-10-24 10:29:13 +02:00
Jan Steemann 7be268c07c changed AQL optimizer to not throw 2014-10-14 10:14:40 +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 0f83d8132f fixed some transaction threading errors 2014-10-06 18:39:01 +02:00
Willi Goesgens 4509a0f2b0 call findVarUsage before serialising the json, and not after deserializing it. 2014-10-06 11:53:23 +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 eae877b1be return variables on explain 2014-10-02 17:34:59 +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
Jan Steemann ec1e6552ca clone plan for DBServers 2014-09-29 15:57:53 +02:00
Jan Steemann 50571f84db changed node detection for cluster 2014-09-18 13:21:58 +02:00
Max Neunhoeffer f36187b052 Do some changes suggested by people in the C++ UG DUS. 2014-09-18 11:07:44 +02:00
Jan Steemann 5c552d4137 optimizer rule for scatter / gather 2014-09-17 17:29:36 +02:00
Jan Steemann b9f140e044 removed unused code 2014-09-17 11:31:05 +02:00
Jan Steemann 54b5e7b034 slightly improved access to dynamic bounds 2014-09-16 15:10:43 +02:00
Willi Goesgens 6609512297 Improve error handling: first test for whether we're a list, then access its members so we can throw our error message instead of a generic error occuring. 2014-09-15 15:05:14 +02:00
Jan Steemann 6805bfb540 fix compile error 2014-09-15 13:36:38 +02:00
Jan Steemann 5a1dc63946 fixed tons of compile errors in VS 2014-09-15 12:04:49 +02:00
Jan Steemann f57312baf0 pass AST to expression 2014-09-12 15:40:17 +02:00
Max Neunhoeffer de728e2893 Finish reorganisation of Ast and ExecutionPlan usage. 2014-09-12 15:01:29 +02:00
Max Neunhoeffer 35ffe6b9e4 Restructure who has Ast and ExecutionPlan. 
Not compiling yet.
 2014-09-12 14:44:20 +02:00
Max Neunhoeffer 46cb7304bf Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-09-12 11:22:28 +02:00
Willi Goesgens 6a7bfff7d0 Silence debug output. 2014-09-12 10:40:24 +02:00
Max Neunhoeffer 21f4d9be9d Teach ExecutionPlans to remember the Ast. 2014-09-12 09:44:17 +02:00
Willi Goesgens f25f12c098 Move parsing of calculations out of the whole json parser, so we can properly instanciate the transaction first. 2014-09-11 18:00:00 +02:00
Jan Steemann 2a49bf843d updated tests 2014-09-09 15:20:42 +02:00
Jan Steemann b8e12063e2 added "rules" output 2014-08-29 15:27:02 +02:00
Jan Steemann e47c2b99d3 use stable sort 2014-08-29 12:22:27 +02:00
Max Neunhoeffer c9193e44b8 Sort out some exception issues. 2014-08-29 11:37:01 +02:00
Max Neunhoeffer 338a9c6c54 Implement permutation of EnumerateCollectionNodes. 
Also: restructure leveling of rules.
And:  remove some debugging output (and add some other).
 2014-08-28 13:28:04 +02:00
Max Neunhoeffer b2d44cd35e Add show() for ExecutionPlans. 2014-08-27 22:10:38 +02:00
Willi Goesgens 10603f904d Walker: the process of walking now is aborted if the before-hook returns true. 2014-08-25 15:48:21 +02:00
Willi Goesgens 91d420ea07 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-25 13:33:59 +02:00
James c801fc4992 deserialising of IndexRangeNode finally working. 2014-08-25 13:05:22 +02:00
Willi Goesgens 5bcc8d784f Add the nodeID we tried to lookup without success in the exception message. 2014-08-25 11:43:48 +02:00
Jan Steemann 683fbf4ec4 using emplace 2014-08-23 00:48:39 +02:00
Jan Steemann 7330597f15 fixed ambigious method JsonHelper::getStringValue 2014-08-22 21:53:29 +02:00
Max Neunhoeffer 4b229c5873 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	lib/Basics/JsonHelper.h
 2014-08-22 17:02:06 +02:00
Max Neunhoeffer 8fd6cd1184 Implement clear unneeded registers. 2014-08-22 17:00:53 +02:00
Willi Goesgens 8a402683ed Optimizers: start implementing the sorting via indexes. 2014-08-22 16:48:52 +02:00
Max Neunhoeffer 821ce84b4b Disable debugging output. 2014-08-22 09:28:41 +02:00
Max Neunhoeffer 70ba155083 Teach unlinkNode to deal with nodes with multiple parents. 2014-08-22 09:24:38 +02:00
Max Neunhoeffer 90aed7a640 Fix a bug with a wrong assertion. 2014-08-21 17:01:25 +02:00
Max Neunhoeffer 8919c138c7 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-21 16:55:05 +02:00
Max Neunhoeffer 9a7dd748f4 Fix linkage bug. 2014-08-21 16:54:52 +02:00
Jan Steemann a1fcf9b28e activate rule to move calculations up 2014-08-21 16:38:49 +02:00
Max Neunhoeffer 5b0874a78a Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-21 15:49:11 +02:00
James 053ab548ba Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/OptimizerRules.cpp
 2014-08-21 15:48:58 +02:00
Max Neunhoeffer e515d7845c Fix first bug with parents. 2014-08-21 15:48:49 +02:00
Jan Steemann 51c89c6829 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionPlan.cpp
	arangod/Aql/ExecutionPlan.h
 2014-08-21 15:24:11 +02:00
Jan Steemann 81f08b7032 added insertDependency 2014-08-21 15:17:55 +02:00
Max Neunhoeffer 321ab35551 Finish _parents in ExecutionNodes business. 2014-08-21 15:15:46 +02:00
Jan Steemann 86707b336e do not unregister nodes on unlink 2014-08-21 14:23:07 +02:00
James 9cc85003ff fixed nextId in clone method for execution plans. 2014-08-21 13:59:27 +02:00
James aa03c16be0 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/OptimizerRules.cpp
 2014-08-21 12:53:05 +02:00
James c4811009a8 fixing replaceNode for ExecutionPlan. 2014-08-21 12:32:07 +02:00
James a8801803dd more IndexRangeNode stuff 2014-08-21 11:16:39 +02:00
Jan Steemann 8ff2b8e3d4 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-21 10:02:43 +02:00
Jan Steemann 1aeed2152c fixed de-serialization 2014-08-21 10:02:30 +02:00
Max Neunhoeffer cf6fe967a1 Make enterSubqueries switchable in findNodesOfType 2014-08-21 09:44:59 +02:00
Willi Goesgens d295bacb51 Json: add HTTP-Entrypoint into Javascript deserialisation. 2014-08-20 17:08:06 +02:00
Jan Steemann 3fe8831a03 fixed optimizer bug due to duplicate variable representation 2014-08-20 14:18:33 +02:00
Jan Steemann fa885f40a5 disabled printing 2014-08-20 12:31:32 +02:00
Willi Goesgens 152d8dadcf Json-Dumper: Output json dump; assert equalness. 2014-08-20 11:19:16 +02:00
Jan Steemann 99ce138c12 fixed creation of subqueries from JSON input 2014-08-19 18:51:11 +02:00
Willi Goesgens f179c35f02 Follow changes in Replace & UpdateNode - they have inDoc/inKey/out Variable now. 
Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2

Conflicts:
	arangod/Aql/ExecutionPlan.cpp
 2014-08-19 16:19:38 +02:00
Willi Goesgens 1a6487ab14 Json de/serialization 2014-08-19 16:09:37 +02:00
Jan Steemann 79e68e72e3 fixed removeUnnecessaryCalc 2014-08-19 15:46:04 +02:00
Jan Steemann e4abcdc843 added optimizer rule 2014-08-19 13:59:05 +02:00
Jan Steemann 1030ea1b7c working on optimizer rules 2014-08-19 10:22:08 +02:00
Jan Steemann 2d62ca94cc Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-18 16:31:20 +02:00
James 40f743ccbc adding varSetBy. 2014-08-18 16:29:31 +02:00
Jan Steemann e6e78811b5 fixed replace 2014-08-18 14:27:23 +02:00
Jan Steemann 7b3389b55c modification queries 2014-08-18 13:52:41 +02:00
Jan Steemann b010518e9e implementation of update/replace (update not yet merging old attributes) 2014-08-18 12:34:27 +02:00
Max Neunhoeffer 9e91d9bba3 Finish first optimization rule: remove unnecessary calcs. 
So far not activated, because test suite crashes.
Need to look into details.
 2014-08-16 00:09:11 +02:00
Jan Steemann 56eb49dcf7 fixed compile error 2014-08-15 18:22:19 +02:00
Jan Steemann b1aceb9771 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-15 18:13:11 +02:00
Jan Steemann 9348f12f78 implemented insert node 2014-08-15 18:12:33 +02:00
Max Neunhoeffer 8d080714a6 Add varUsage information to ExecutionNodes. 2014-08-15 13:29:26 +02:00
Jan Steemann 9306105447 REMOVE 2014-08-15 12:44:35 +02:00
Jan Steemann 773c29cecf further work on RemoveNode 2014-08-15 12:20:17 +02:00
Jan Steemann 655d7759bf added canThrow() for Expression 2014-08-14 20:20:59 +02:00
Jan Steemann dedc2cb035 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-14 16:59:51 +02:00
Jan Steemann b19d632b4a RemoveBlock 2014-08-14 16:59:43 +02:00
Max Neunhoeffer fcdf57ff09 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionEngine.cpp
 2014-08-14 15:07:10 +02:00
Max Neunhoeffer f248792865 Make WalkerWorker a template class. 
Implement findNodesOfType for ExecutionPlans.
 2014-08-14 15:04:59 +02:00
Jan Steemann 0546e9d8ff implemented stub of RemoveBlock 2014-08-14 14:46:53 +02:00
Jan Steemann eed9c2ea42 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-14 13:53:29 +02:00
Jan Steemann 93cfa9e2e4 count number of documents in collection 2014-08-14 13:53:21 +02:00
James 20c7897454 adding estimated cost to json rep of execution nodes/plan. 2014-08-14 11:04:41 +02:00
James 8bb501468f Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionNode.h
 2014-08-14 10:51:49 +02:00
Jan Steemann f911cd254b fixed bug 2014-08-14 10:29:54 +02:00
James 8f5c31e740 added caching of estimatedCost. 2014-08-14 10:29:47 +02:00
Jan Steemann 1ad300cee5 added more node types 2014-08-14 10:23:53 +02:00
Jan Steemann dfe7ec46a5 added RemoveNode 2014-08-14 09:39:58 +02:00
James 66794f9374 more estimateCost. 2014-08-13 18:28:22 +02:00
Jan Steemann 413ce6c50c test fixes 2014-08-12 18:53:49 +02:00
Max Neunhoeffer b9edd4e5f0 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
	arangod/Aql/Types.h
 2014-08-08 23:49:10 +02:00
Jan Steemann 61d8998909 aggregate! 2014-08-08 18:56:41 +02:00
Max Neunhoeffer 06260bd740 Fix a bug in creation of EnumerateListBlock. 
Case: FOR A in B
ended up with inVar and outVar being the same.
 2014-08-08 16:51:00 +02:00
Jan Steemann d623d1a0ab renamed things 2014-08-06 09:42:06 +02:00
Jan Steemann e7c10a2440 add a default sort node 2014-08-05 17:25:46 +02:00
Jan Steemann af288d9fe0 handle subqueries in the AST 2014-08-05 17:07:23 +02:00
Jan Steemann 23d02a3602 added collect plan node generation 2014-08-05 10:23:33 +02:00
Jan Steemann 48935297ac fixed some dependency issues 2014-08-01 15:50:52 +02:00
Jan Steemann 0d7ca46b45 added variables() method 2014-08-01 14:37:29 +02:00
Jan Steemann 69c55d754c renamed "root" to "return" 2014-08-01 12:23:55 +02:00
Jan Steemann 9856d4e9e0 use addNode 2014-08-01 12:19:15 +02:00
Jan Steemann 2881409527 renaming 2014-08-01 11:46:31 +02:00
Max Neunhoeffer 5bf0ff1a7c Rename files ExecutionPlan -> ExecutionNode 2014-08-01 11:26:09 +02:00
Max Neunhoeffer c1b15188ff Rename *Plan to *Node. 2014-08-01 11:17:34 +02:00
Jan Steemann 60d493c56c always use variables 2014-07-31 14:36:03 +02:00
Jan Steemann 4b6ab03102 rename variables in JSON 2014-07-31 14:02:17 +02:00
Jan Steemann fbedb15df8 some more nodes 2014-07-31 13:40:20 +02:00
Max Neunhoeffer 98d82de6fb Create generic recursive walk functionality for Plans/Blocks. 2014-07-31 10:31:45 +02:00
Max Neunhoeffer 2ef0095797 Start static analysis of variables in ExecutionBlocks. 2014-07-30 23:50:03 +02:00
Max Neunhoeffer 22dc301745 Change signature of RootPlan. 2014-07-30 17:05:38 +02:00
Max Neunhoeffer d09f2690da Get rid of _nrVars in ExecutionPlans. 2014-07-30 17:00:38 +02:00
Max Neunhoeffer 87a36596b1 Change Json format of ExecutionPlans. 2014-07-30 15:20:09 +02:00
Max Neunhoeffer 8c3304d242 Add a subquery node type to ExecutionPlans. 2014-07-30 13:45:00 +02:00
Max Neunhoeffer 4f1b5cbe2e Add a test case. 2014-07-30 13:41:22 +02:00
Max Neunhoeffer 92bd4b75d2 Fix signature of SortPlan nodes. 2014-07-30 11:47:45 +02:00
Max Neunhoeffer 14c465ec4d Fix signature of FilterPlan. 2014-07-30 11:42:13 +02:00
Max Neunhoeffer 2b8d497bc8 Repair CalculationPlan, add Json for expressions. 2014-07-30 10:00:25 +02:00
Max Neunhoeffer 944ba6597d Add projection and sort node. 2014-07-30 09:30:59 +02:00
Max Neunhoeffer d5ddf057ca Finish CalculationPlan node. 2014-07-30 09:06:43 +02:00
Max Neunhoeffer 65b477ddbd Snapshot, compiles, does not work. 2014-07-29 13:40:54 +02:00
Max Neunhoeffer 5684bb5b65 Add RootBlock and stuff. 2014-07-28 16:26:24 +02:00
Max Neunhoeffer 325dfb007b Add RootPlan. 2014-07-28 15:51:36 +02:00
Max Neunhoeffer 82889f8626 Add CalculationPlan. 2014-07-28 15:13:40 +02:00
Max Neunhoeffer 0c89dccc5d Add CalculationPlan, create arangod/Aql/Types.h 2014-07-28 13:16:25 +02:00
Max Neunhoeffer 47afbc7ff4 Add FilterNode. 2014-07-28 11:06:33 +02:00
Max Neunhoeffer f2b135ef36 Start infrastructure for execution engine. 2014-07-28 09:41:19 +02:00
Max Neunhoeffer 59683cb964 Add LimitPlan. 2014-07-25 16:55:44 +02:00
Max Neunhoeffer 7c983d0f7b Fix memory allocation issues in Json class. 2014-07-25 15:09:13 +02:00
Max Neunhoeffer b6122ad3dc Snapshot, this version has memcheck problems. 2014-07-25 14:25:22 +02:00
Max Neunhoeffer 462be601cf Use new Json wrapper class. 2014-07-25 00:32:30 +02:00
Max Neunhoeffer e6da8c63e2 Change Json wrapper class test. 2014-07-24 23:41:44 +02:00
Max Neunhoeffer 970ad56b2b Add new node type. appendAsString method missing. 2014-07-24 14:13:34 +02:00
Max Neunhoeffer d9876b1c5a First draft of infrastructure for ExecutionPlan. 2014-07-24 13:51:21 +02:00
Max Neunhoeffer 97071bcabb Start ExecutionPlan infrastructure. 2014-07-24 11:50:13 +02:00