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

280 Commits

Author SHA1 Message Date
James 1be93b54a9 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 14:32:31 +02:00
James fb55c4c753 base class ExecutionBlock methods for skip and skipSome. 2014-08-08 14:31:21 +02:00
Jan Steemann 0adde6121c Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.cpp
 2014-08-08 13:56:52 +02:00
Jan Steemann b27e705b08 DOCVEC->toV8 2014-08-08 13:56:03 +02:00
Willi Goesgens 3accfe7a3c Implement error handling during executing sub queries. 2014-08-08 13:49:08 +02:00
Max Neunhoeffer 90eec4f5ad Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 13:38:34 +02:00
Max Neunhoeffer ba0435ec07 Change an exception. 2014-08-08 13:38:09 +02:00
Jan Steemann ab9f98657b Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-08 13:37:46 +02:00
Jan Steemann 7acb36ee8f added shrink() method for AqlItemBlock 2014-08-08 13:37:34 +02:00
Max Neunhoeffer 3f4b4fe406 Fix double delete. 2014-08-08 13:32:06 +02:00
Max Neunhoeffer 6417adfda2 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 13:27:28 +02:00
Max Neunhoeffer 9ce702c1b0 Fix static analysis once more. 2014-08-08 13:27:06 +02:00
Jan Steemann 456f2f6264 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-08 13:06:53 +02:00
Jan Steemann aaa0707b66 collect 2014-08-08 13:06:48 +02:00
James dbb02de26c Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 11:58:05 +02:00
James 7d95ef0c72 EnumerateListBlock now works with DOCVECs. 2014-08-08 11:57:25 +02:00
Max Neunhoeffer 9b3266c8f8 Add an initialiser. 2014-08-08 11:55:09 +02:00
Max Neunhoeffer 8cbb88b6fb Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 11:51:53 +02:00
Max Neunhoeffer 50218231ec Fix static analysis for subqueries. 2014-08-08 11:51:25 +02:00
Jan Steemann 5d838a5a6f refactoring 2014-08-08 11:13:58 +02:00
Jan Steemann ace9eff9e9 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-08 10:53:22 +02:00
Jan Steemann ebf70cb4ba fixed assertion errors 2014-08-08 10:53:15 +02:00
Jan Steemann 5d47e8df44 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2014-08-08 10:53:02 +02:00
James f4142651ef EnumerateListBlock working for ranges. 2014-08-08 10:51:28 +02:00
Jan Steemann c99517ae25 fixed missing collections 2014-08-08 09:54:41 +02:00
James 8e8898d3c0 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 09:44:35 +02:00
James a4f357c15e EnumerateListBlock now working for JSON lists and prepended "explicit" to Json constructors.. 2014-08-08 09:43:54 +02:00
Jan Steemann 82318ebb08 removed a remaining getOne() 2014-08-07 18:39:09 +02:00
Willi Goesgens 8eb3cfeca3 Implement subquery block - these parameters also should be enabled. 2014-08-07 18:04:42 +02:00
James 8b89ea95ac Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 17:42:56 +02:00
James 41e0294594 removing unnecessary transaction from EnumerateListBlock. 2014-08-07 17:42:45 +02:00
Jan Steemann d30914afb2 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
	arangod/Aql/ExecutionEngine.cpp
 2014-08-07 17:25:37 +02:00
Jan Steemann 9734662ee0 begun implementation of AggregateNode, not yet working 2014-08-07 17:02:21 +02:00
Jan Steemann 253fd6f2bc prevent crashes 2014-08-07 17:02:07 +02:00
Willi Goesgens ba2e7badd8 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-07 16:57:37 +02:00
Willi Goesgens 69ff2303c9 Implement subquery block 2014-08-07 16:56:35 +02:00
James 67ce79aa63 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 16:45:29 +02:00
James cb86cef60e first version of EnumerateListBlock for json lists. 2014-08-07 16:45:03 +02:00
Willi Goesgens a548745d1c Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-07 16:18:10 +02:00
Willi Goesgens bfdc940450 v8-vocbase split: clean up includes 
- Move includes from Types .h -> .cpp
 - Move forward Declerations to their respective headers.
 2014-08-07 16:17:40 +02:00
Max Neunhoeffer 0f9f01b686 Remove getOne except in the base class. 2014-08-07 16:15:41 +02:00
James 2ac9adcf1c first version of EnumerateListBlock. 
It is missing the method for getSome, and only works for json lists.
 2014-08-07 15:05:59 +02:00
Willi Goesgens 26b62538f3 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-07 14:17:04 +02:00
Willi Goesgens 75da21ead4 always fetch blocks in the default batch size. 2014-08-07 13:57:26 +02:00
Max Neunhoeffer 83a60e578e Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 11:56:50 +02:00
Max Neunhoeffer 1d6f7bc3d2 Sort out bind as a preparation for subqueries. 2014-08-07 11:56:26 +02:00
Jan Steemann 2b85b04ce6 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-07 11:44:32 +02:00
Jan Steemann 8e229ec2b2 stringification of function parameters 2014-08-07 11:44:22 +02:00
James 7c7901fd5b added brief description of AqlItemBlock structure. 2014-08-07 11:16:07 +02:00
James 720285acfe Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 10:54:22 +02:00