James
32f4216005
updating distribute-in-cluster opt rule
2014-10-17 10:22:26 +01: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
James
60e85ccc7e
proper toJsonHelper method for DistributeNode.
2014-10-14 09:21:40 +01: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
6cdaaa1b85
fixes for Visual Studio
2014-10-09 10:45:31 +02:00
Jan Steemann
4ff58364f1
fixed cloning of plans
2014-10-07 12:00:37 +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
95fd279a52
distribution node/block declarations etc.
2014-10-06 12:57:09 +01: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
Jan Steemann
5959a5e6da
fixed segfaults during node cloning
2014-10-06 10:31:15 +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
573d837561
off-by-one fix
2014-10-02 17:06:12 +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
Max Neunhoeffer
25d588b858
Set _varUsageValid flag in Json constructor.
2014-10-02 09:28:00 +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
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
Jan Steemann
49237ef55a
fixed some cluster internal communication
2014-10-01 14:06:00 +02:00
Willi Goesgens
eb2f815d26
Add json de/serialization of new ExecutionNode members.
2014-10-01 09:59:50 +02:00
Max Neunhoeffer
8bffb3daa3
Finish transplantation.
2014-09-30 23:20:51 +02:00
Max Neunhoeffer
5dbcac8efe
Start transplantation of _varOverview to ExecutionNodes.
2014-09-30 16:44:01 +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
3a2e13b910
pass queryId to remote servers
2014-09-29 17:35:10 +02:00
Jan Steemann
b31987fea7
pass data to RemoteNode
2014-09-29 16:36:52 +02:00
Jan Steemann
3ac25ad56f
fixed some issues with remote queries
2014-09-29 12:14:03 +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
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
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
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
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
Jan Steemann
5c552d4137
optimizer rule for scatter / gather
2014-09-17 17:29:36 +02:00
Jan Steemann
bd62c36771
scatter / gather 0.0
2014-09-17 16:00:54 +02:00
Jan Steemann
be81bef10c
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
2014-09-17 14:31:51 +02:00
Jan Steemann
db70b9bfcb
added not-yet used nodes for remote, scatter and gather
2014-09-17 14:31:37 +02:00
Max Neunhoeffer
2cdc5f4cd7
Fix skiplistback-ung and usage in AQL.
2014-09-17 14:07:23 +02:00
Jan Steemann
654c2ba0fe
backwards iteration, not yet working
2014-09-17 00:40:24 +02:00
Willi Goesgens
c71d142b51
We missed to output the modification options vector.
2014-09-16 18:25:41 +02:00
Jan Steemann
54b5e7b034
slightly improved access to dynamic bounds
2014-09-16 15:10:43 +02:00
Jan Steemann
bc7c7c5c60
fixed construction of bounds from json
2014-09-15 16:11:59 +02:00
Willi Goesgens
215e9bf1b4
Use 'list' in plural variables
2014-09-15 15:06:38 +02:00
Jan Steemann
5a1dc63946
fixed tons of compile errors in VS
2014-09-15 12:04:49 +02:00
Jan Steemann
ed7e5d0e67
allow primary key access via _id attribute, too
2014-09-14 00:46:44 +02:00
Jan Steemann
6552490cbe
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/ExecutionNode.cpp
arangod/Aql/ExecutionNode.h
arangod/Aql/ExecutionPlan.cpp
arangod/Aql/OptimizerRules.cpp
2014-09-12 15:17:50 +02:00
Jan Steemann
a5c52998e8
remove redundant calculations
2014-09-12 15:10:48 +02:00
Max Neunhoeffer
35ffe6b9e4
Restructure who has Ast and ExecutionPlan.
...
Not compiling yet.
2014-09-12 14:44:20 +02:00
Max Neunhoeffer
8bab78f4b5
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/ExecutionNode.cpp
2014-09-11 18:47:31 +02:00
Max Neunhoeffer
088e0ed2f9
Fix serialisation of IndexRangeNode.
2014-09-11 18:45:47 +02:00
Jan Steemann
afed9019cf
added assertion
2014-09-11 18:27:44 +02:00
Jan Steemann
0b018d26cf
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
2014-09-11 18:19:14 +02:00
Jan Steemann
2767bdc7e0
use edge index on both _from and _to
2014-09-11 18:19:05 +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
34beb65148
use primary index & edge index
2014-09-11 17:01:53 +02:00
Max Neunhoeffer
aa00df7edf
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into mmh
...
Conflicts:
arangod/Aql/ExecutionBlock.cpp
arangod/Aql/Query.h
2014-09-11 14:31:13 +02:00
Max Neunhoeffer
31e02e42cb
Instanciate expressions for variable bounds.
...
And various cleanups.
2014-09-11 14:28:38 +02:00
Jan Steemann
cb4c60a36f
explain tests
2014-09-11 09:54:59 +02:00
Max Neunhoeffer
8bb938b6de
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into mmh
2014-09-10 15:21:00 +02:00
Max Neunhoeffer
69c464ef13
Restructure RangesInfo handling to allow for variable ranges.
2014-09-10 15:20:28 +02:00
Jan Steemann
1d2c21aec5
create verbose plans
2014-09-10 14:15:37 +02:00
Max Neunhoeffer
7dcdd27891
Merge branch 'aql2' into mmh
2014-09-10 09:41:54 +02:00
Max Neunhoeffer
8aa75f01a5
Snapshot to move home.
2014-09-09 17:05:47 +02:00
Willi Goesgens
de32cddc1e
Fix memory leak in case of exceptions thrown when parsing the variable from json
2014-09-09 13:22:49 +02:00
Jan Steemann
639a026c66
fixed tests
2014-09-09 09:57:52 +02:00
Jan Steemann
4bda3e3979
finished test for remove-redundant-sorts
2014-09-08 17:33:11 +02:00
Willi Goesgens
02207d5f70
Cost estimates: IndexRangeNodes without range have to be more expensive than ones with.
2014-09-05 14:23:25 +02:00
Max Neunhoeffer
fb9481c208
Fix another memory leak.
2014-09-02 14:33:08 +02:00
Willi Goesgens
c1d0f8bccc
SortIndex: as long as the Index superseeds the sort critereon its still a full match.
2014-09-01 18:29:09 +02:00
Willi Goesgens
cd29afd88f
Fix pattern to index matcher
...
- if the number of match patterns is zero, this is not a match at all.
- if the number of condition is unequal match pattern to a match pattern this isn't a full match.
2014-09-01 13:31:39 +02:00
James
fd4b4e5df4
"proper" estimateCost method for IndexRangeNode.
2014-08-29 14:22:46 +02:00
Jan Steemann
e47c2b99d3
use stable sort
2014-08-29 12:22:27 +02:00
James
46b40015ee
renovating RangeInfo stuff to avoid mem leaks.
2014-08-29 11:52:19 +02:00
James
05dac4f52d
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/Optimizer.cpp
2014-08-28 14:41:51 +02:00
James
1deed3ebce
fixed bugs useIndexRange.
2014-08-28 14:39:26 +02:00
Jan Steemann
04b322d9e0
sorting
2014-08-28 14:04:24 +02:00
Willi Goesgens
75d9d4ee60
Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2
2014-08-28 13:48:44 +02:00
Willi Goesgens
0a1d5edb29
SortToRange: fix abort critereon for non-skiplist indexes
2014-08-28 13:48:03 +02:00
Jan Steemann
2eb38c9657
remove-redundant-sorts, initial
2014-08-28 12:39:28 +02:00
Willi Goesgens
9d4b1b1c88
SortNode: our variables can also be in other ExecutionNodes then the Calculation node. Take this into account.
...
SortIndex optimizer: when looking at our properties only check Calculation nodes, ignore other types of ExecutionNodes
2014-08-28 11:48:23 +02:00
Max Neunhoeffer
b9cfff7c89
Fix infinite recursion bug in canThrow for subqueries.
2014-08-28 09:36:15 +02:00
Jan Steemann
6d0dfcdeba
changed ctor
2014-08-28 00:27:24 +02:00
Willi Goesgens
e67a2ed36a
SortIndex optimizer:
...
- remove SortNodes which are superseeded by an IndexRangeNode
- calculate the properties of an SortNode before entering the walker
- add abstraction class
2014-08-27 15:39:37 +02:00
Max Neunhoeffer
27d8409425
Implement canThrow method for SubqueryNode.
2014-08-27 13:07:05 +02:00
Willi Goesgens
5e75ec8bb5
Expression:
...
- add function isSimpleAccessReference() to check whether it is a coll.attr.attr
- add function getAccessNRef() to retrieve pair("attr.attr", "coll"),
SortIndex optimizer:
- use the new functionality to get better readable code.
rename indexes -> indices
2014-08-26 17:26:46 +02:00
Willi Goesgens
18d308af0f
SortNode: add method that looks up the expressions referenced by the Sortnode, and returns them paired with ASC/DESC.
2014-08-26 15:38:55 +02:00
Willi Goesgens
ff4e00eb86
SortIndex optimizer:
...
- rename getIndexes to getIndexesUnordered
- add CompareIndex & getIndexesOrdered to retrieve a list which does an ordered match on the available skiplist indices
- fetch the ordered matching indices
- only remove the sortnode if its a full qualified match.
2014-08-26 13:53:19 +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
James
8896a01753
making the arguments of IndexRangeNode more general.
2014-08-25 15:11:54 +02:00
James
033735fbba
removing debug output and commenting out useIndexRange.
2014-08-25 13:12:19 +02:00
James
c801fc4992
deserialising of IndexRangeNode finally working.
2014-08-25 13:05:22 +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
James
99623c8e2a
finished deserialising of IndexRangeNode.
2014-08-22 16:57:34 +02:00
James
8559f60766
fixed bugs in last.
2014-08-22 16:25:23 +02:00
James
931aaee618
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/OptimizerRules.cpp
2014-08-22 16:19:01 +02:00
James
4c49a3be5e
deserialising of IndexRangeNode almost completed.
2014-08-22 16:17:10 +02:00
Jan Steemann
55608ceae2
use index nodes
2014-08-22 13:53:01 +02:00
Jan Steemann
3a60913afe
fix JSON serialization of indexes
2014-08-22 13:13:07 +02:00
Jan Steemann
5d5aaaa949
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
2014-08-22 12:00:55 +02:00
James
3987067339
cleaning up and readded toJsonHelper method for IndexRangeNode.
2014-08-22 10:55:51 +02:00
Jan Steemann
0793804206
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
2014-08-22 10:44:27 +02:00
Jan Steemann
30c6b26b6d
add plans!
2014-08-22 10:44:19 +02:00
James
4ba4ec4523
moving function getIndexes for EnumerateCollectionNode from h to cpp file.
2014-08-22 10:39:41 +02:00
Jan Steemann
2b27957546
added AQL_EXPLAIN()
2014-08-22 09:51:48 +02:00
Max Neunhoeffer
9a7dd748f4
Fix linkage bug.
2014-08-21 16:54:52 +02:00
Jan Steemann
81f08b7032
added insertDependency
2014-08-21 15:17:55 +02:00
James
7b5f52069a
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/OptimizerRules.cpp
2014-08-21 13:16:24 +02:00
Jan Steemann
0e8b61124e
less verbose AST dumps in AQL_PARSE
2014-08-21 13:08:21 +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
Jan Steemann
1edd170317
turned off optimization
2014-08-21 11:21:03 +02:00
James
a8801803dd
more IndexRangeNode stuff
2014-08-21 11:16:39 +02:00
Max Neunhoeffer
6ae1432db5
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
2014-08-21 10:17:40 +02:00
Max Neunhoeffer
52f48cd296
Add NoResultsNode.
2014-08-21 10:17:18 +02:00
Jan Steemann
1aeed2152c
fixed de-serialization
2014-08-21 10:02:30 +02:00
Jan Steemann
670b407185
disable filters that never produce results
2014-08-20 18:24:52 +02:00
Jan Steemann
3fe8831a03
fixed optimizer bug due to duplicate variable representation
2014-08-20 14:18:33 +02:00
Willi Goesgens
152d8dadcf
Json-Dumper: Output json dump; assert equalness.
2014-08-20 11:19:16 +02:00
Willi Goesgens
0ad6da9427
Json Serialisation: Use helper function to read variables from the json
2014-08-20 10:57:59 +02:00
Jan Steemann
592ada1d36
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/ExecutionNode.h
2014-08-19 18:58:32 +02:00
Jan Steemann
99ce138c12
fixed creation of subqueries from JSON input
2014-08-19 18:51:11 +02:00
James
447282d0bd
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
...
Conflicts:
arangod/Aql/Optimizer.cpp
arangod/Aql/OptimizerRules.cpp
2014-08-19 17:00:16 +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
James
b82b0fbefc
remove comment and update the toJsonHelper for IndexRangeNode.
2014-08-19 12:08:22 +02:00
James
857083adc9
starting to add optimizer rules which create IndexRangeNodes.
2014-08-19 12:02:50 +02:00
James
ad8e179cf1
adding unbounded ranges info for IndexRangeNode.
2014-08-18 17:18:58 +02:00
Jan Steemann
0666708206
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
2014-08-18 14:27:37 +02:00
Jan Steemann
e6e78811b5
fixed replace
2014-08-18 14:27:23 +02:00
James
1118add7e6
uncommenting out.
2014-08-18 14:15:40 +02:00
James
fb1d69bbae
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
2014-08-18 14:12:10 +02:00
James
13aeacc43c
fixed compiler errors, and working on IndexRangeNode.
2014-08-18 14:12:00 +02:00
Jan Steemann
fccfca0e47
refactoring
2014-08-18 13:22:40 +02:00
Jan Steemann
bdfef136bf
Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
2014-08-18 12:34:41 +02:00
Jan Steemann
b010518e9e
implementation of update/replace (update not yet merging old attributes)
2014-08-18 12:34:27 +02:00
James
8f6fd0e4c4
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
2014-08-18 11:11:46 +02:00
James
f1a7ca51be
adding range info to toJsonHelper.
2014-08-18 11:11:27 +02:00
James
a79f72087d
adding Index caching, and cleaning up last.
2014-08-18 10:46:47 +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
9138be31b9
Take out some debugging output.
2014-08-15 16:09:10 +02:00
Max Neunhoeffer
ceff1481ed
Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
2014-08-15 13:55:21 +02:00
James
47244fb48e
initial version of IndexRangeNode.
2014-08-15 13:52:52 +02:00
Max Neunhoeffer
8d080714a6
Add varUsage information to ExecutionNodes.
2014-08-15 13:29:26 +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
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
Jan Steemann
8b830974c7
fixed parser errors
2014-08-08 20:12:10 +02:00
Jan Steemann
d623d1a0ab
renamed things
2014-08-06 09:42:06 +02:00
Jan Steemann
7fd236aa4f
fixed enumeratecollection block
2014-08-04 17:27:51 +02:00
Jan Steemann
48935297ac
fixed some dependency issues
2014-08-01 15:50:52 +02:00
Jan Steemann
69c55d754c
renamed "root" to "return"
2014-08-01 12:23:55 +02:00
Max Neunhoeffer
e7e98262ea
Redo instanciator using Walker and in ExecutionEngine.
2014-08-01 11:56:39 +02:00
Max Neunhoeffer
5bf0ff1a7c
Rename files ExecutionPlan -> ExecutionNode
2014-08-01 11:26:09 +02:00