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

130 Commits

Author SHA1 Message Date
Jan Steemann a2061f66a3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 14:54:25 +02:00
Jan Steemann 24f1f979d0 fixed jsonification of values 2014-08-11 14:54:14 +02:00
James b9cafc7c67 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 14:30:59 +02:00
Max Neunhoeffer 1b088ada7f Take out some debugging output. 2014-08-11 14:30:13 +02:00
James 82a6459fce added skipSome method to EnumerateCollectionBlock. 2014-08-11 14:29:52 +02:00
Max Neunhoeffer 8290bc64fb Make iterator [*] internal variables need no register. 2014-08-11 13:47:23 +02:00
Max Neunhoeffer dd01a7510c Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2014-08-11 13:17:36 +02:00
Max Neunhoeffer b6564690ee Take care of empty lists to loop over. 2014-08-11 13:15:13 +02:00
James 034f577702 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 09:57:05 +02:00
James c9589e0c44 corrected spelling in error and added 2 line breaks. 2014-08-11 09:56:58 +02:00
Jan Steemann 84ea5931dd fixed assertion failure 2014-08-11 09:34:43 +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 8b830974c7 fixed parser errors 2014-08-08 20:12:10 +02:00
Jan Steemann 6eb9dcb32e some comments 2014-08-08 19:52:43 +02:00
Jan Steemann 1b14aa3779 moved AqlValue to its own file 2014-08-08 19:46:20 +02:00
Jan Steemann c9a0606a96 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.cpp
 2014-08-08 19:20:53 +02:00
Jan Steemann 61d8998909 aggregate! 2014-08-08 18:56:41 +02:00
Max Neunhoeffer 9cffde03dd Implement steal for AqlItemBlocks and use it for FilterBlock. 2014-08-08 17:57:51 +02:00
Max Neunhoeffer a60ae8baae EnumerateListBlock: forward documentCollection in DOCVEC case. 2014-08-08 17:22:06 +02:00
Max Neunhoeffer 121fde4a0f Try to fix bugs in EnumerateListBlock. 2014-08-08 17:11:44 +02:00
Max Neunhoeffer f03b792616 Improve an exception message. 2014-08-08 16:53:02 +02:00
Max Neunhoeffer ac28678640 Change a getBlock call and improve exception message. 2014-08-08 16:51:59 +02:00
Max Neunhoeffer 13ef2912a3 Better error message and remove unnecessary file. 2014-08-08 16:30:05 +02:00
Willi Goesgens 9d86954e9b Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-08 15:50:15 +02:00
Willi Goesgens fd67625174 properly end switch block for EnumerateList. 2014-08-08 15:49:21 +02:00
James e5e3aba970 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-08 15:49:04 +02:00
James e5299e2cd2 adding skipSome method for EnumerateListBlock. 2014-08-08 15:47:43 +02:00
Jan Steemann bc9df8d05a Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-08 15:00:52 +02:00
Jan Steemann adccf60b91 optimization for simple variable references in CalculationBlock 2014-08-08 15:00:38 +02:00
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
Willi Goesgens 3accfe7a3c Implement error handling during executing sub queries. 2014-08-08 13:49:08 +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 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 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 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