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

4042 Commits

Author SHA1 Message Date
Max Neunhoeffer 3e135323dd Change the API one more time. 2014-08-13 15:44:44 +02:00
Jan Steemann 3fd352e7d7 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-13 15:40:06 +02:00
Jan Steemann ea418088c5 fixed simple expressions 2014-08-13 15:39:56 +02:00
James 3b91313ef7 replacing getSome and skipSome methods for limit block with getOrSkipSome 
method.
 2014-08-13 15:25:04 +02:00
James 6a8b2d3254 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-13 15:06:44 +02:00
James 22b2bedc59 skipSome method for limit block now working. 2014-08-13 15:06:34 +02:00
Jan Steemann 2cbf14716e Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-13 14:22:51 +02:00
Jan Steemann 69f99324f2 added simple expressions 2014-08-13 14:22:14 +02:00
Max Neunhoeffer 28f0d7be05 Sort out TRI_CompareValuesJson to use UTF8 on demand. 2014-08-13 14:22:05 +02:00
James fafad41150 Complete merge. 2014-08-13 12:47:32 +02:00
James 19f01bab0a Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2014-08-13 10:26:33 +02:00
James fa29a2ecb0 removed deprecated skipSome method from AggregateBlock. 2014-08-13 09:41:11 +02:00
James b05ae9668c removed deprecated skipSome from FilterBlock. 2014-08-13 09:40:22 +02:00
Max Neunhoeffer 684384e313 Cleanup ExecutionBlocks w.r.t. exceptions and leakages. 
Note:
  Aggregate not completely checked.
  Left some FIXMEs.
 2014-08-13 00:27:34 +02:00
Max Neunhoeffer e2851d1b2d Adjust some indentation. 2014-08-12 22:57:56 +02:00
James eed06f6512 method for getOrSkipSome for AggregateBlock, now working. 2014-08-12 20:06:18 +02:00
Jan Steemann 52911293f7 added special compare function to take into account floating point differences 2014-08-12 19:14:13 +02:00
Jan Steemann 413ce6c50c test fixes 2014-08-12 18:53:49 +02:00
Jan Steemann d06dd817b0 removed some default cases 2014-08-12 17:03:06 +02:00
James 98393aca94 removing DEBUG statements. 2014-08-12 16:59:00 +02:00
James 0c558f57b8 getOrSkipSome method for FilterBlock. 2014-08-12 16:57:12 +02:00
Jan Steemann 13849b2c77 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-12 16:54:07 +02:00
Jan Steemann 14e136f6d4 fixed enumeration over empty docvec 2014-08-12 16:53:58 +02:00
Max Neunhoeffer afaabc7964 Fix bug in skipSome of EnumerateCollectionBlock. 2014-08-12 16:49:00 +02:00
James a62cba0306 reversing changes to skipSome and getSome for EnumerateCollectionBlock. 2014-08-12 16:38:21 +02:00
Jan Steemann 6400912c3a some comments 2014-08-12 16:19:48 +02:00
Max Neunhoeffer cb56e2175f Fix SortBlock empty bug. 2014-08-12 16:00:31 +02:00
Max Neunhoeffer 132b22e0bb Further bugfixes with AqlItemBlock and AqlValue allocations. 2014-08-12 15:52:27 +02:00
Max Neunhoeffer c1c84cdf15 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-12 15:36:05 +02:00
Max Neunhoeffer 758b6b7cfc Fix problems with empty AqlValues in hashes. 2014-08-12 15:35:49 +02:00
Jan Steemann b3ed6a2b38 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-12 15:28:00 +02:00
Jan Steemann e329864efc fixed function calls that do not return values 2014-08-12 15:27:44 +02:00
Max Neunhoeffer 58d062d426 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-12 15:26:08 +02:00
Max Neunhoeffer 73abdf80f3 Redo exception-safe SortBlock. 2014-08-12 15:25:40 +02:00
Jan Steemann 7feea4c640 fixed [] attribute access 2014-08-12 14:02:46 +02:00
Jan Steemann 162681ada4 fixed handling of ranges 2014-08-12 14:00:51 +02:00
Max Neunhoeffer 449b92aa0a Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-12 13:26:26 +02:00
Max Neunhoeffer 3f67262e07 Teach AqlItemBlocks to reference count. 2014-08-12 13:25:35 +02:00
Jan Steemann 19e39fb80e fixed another test 2014-08-12 11:59:09 +02:00
Jan Steemann 0b2b1e83db fixed handling of bind parameters 2014-08-12 11:52:17 +02:00
Jan Steemann c5fc5b7de8 fixed collection argument conversion 2014-08-12 11:13:23 +02:00
James 09cb203f8c getOrSkipSome method for singleton block. 2014-08-12 10:53:53 +02:00
James d0a7f2890f generic getOrSkipSome for ExecutionBlock base class. 2014-08-12 10:45:08 +02:00
James 835c30edbc want to inspect previous version of function 2014-08-12 10:18:00 +02:00
Frank Celler 7a6d5413a1 database version is now AABBCC, where AA = major, BB = minor, CC = patch 2014-08-12 09:58:42 +02:00
Willi Goesgens 36fef2ab97 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-12 09:46:46 +02:00
Willi Goesgens 382fca6521 Add GRAPH_ABSOLUTE_BETWEENNESS mapping which was gone missing. 2014-08-12 09:46:17 +02:00
James 702e143fd6 further updating of skipSome method for AggregateBlock after changes to getSome 
method.
 2014-08-12 09:34:48 +02:00
James 8b71fca20c removed some unnecessary lines from skipSome method for AggregateBlock. 2014-08-12 09:11:37 +02:00
Jan Steemann 7df456a1dd rework of COLLECT 2014-08-11 20:06:08 +02:00
Jan Steemann 83ceedf48e Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 18:05:35 +02:00
Jan Steemann 88f6e527f9 small changes 2014-08-11 18:05:27 +02:00
Jan Steemann 5bc797b4d1 made DefaultBatchSize public 2014-08-11 18:04:35 +02:00
James 42bfc02d7f Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 17:10:43 +02:00
James 9c87992bd9 fixed bug in skipSome method for EnumerateListBlock. 2014-08-11 17:10:32 +02:00
Max Neunhoeffer 283edc67cf Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 17:01:16 +02:00
Max Neunhoeffer 933ca8f245 Add another assertion. 2014-08-11 17:01:04 +02:00
James 7d98ab731d removing debugging output. 2014-08-11 16:40:40 +02:00
James c911b93ebd skipSome method for AGGREGATE block. 2014-08-11 16:36:02 +02:00
James 3e32dafc91 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 15:56:57 +02:00
James 94e0d88067 skipSome method for FilterBlocks. 2014-08-11 15:56:49 +02:00
Max Neunhoeffer ef9430c49d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 15:55:41 +02:00
Jan Steemann cbd753b285 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-11 15:54:54 +02:00
Jan Steemann 3cea81d8c5 fixed [*] operator 2014-08-11 15:54:42 +02:00
Max Neunhoeffer 71b97f892f Another initialization bug fixed. 2014-08-11 15:54:01 +02:00
Max Neunhoeffer 07b560cf68 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 15:45:28 +02:00
Max Neunhoeffer 12ea8fcf74 Fix bugs when .initialize is called multiple times. 2014-08-11 15:44:41 +02:00
James 36147733a1 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-11 15:41:38 +02:00
James f94b2c22cc fixed bug in skipSome for EnumerateListBlock, and in limit node. 2014-08-11 15:41:30 +02:00
Jan Steemann 562054134e prevent double-free 2014-08-11 15:34:11 +02:00
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
Jan Steemann af1ecf44a4 GRAPH_TRAVERSAL_TREE 2014-08-11 14:48:58 +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
Frank Celler cc91cd1cb0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-08-11 12:43:47 +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 b8073515b7 Merge changes for steal in. 2014-08-09 00:06:05 +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 018618cbc8 Add facility to AqlItemBlock to save some copying. 2014-08-08 17:41:12 +02:00
Jan Steemann 9e459d986a removed unused file 2014-08-08 17:24:48 +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
James 5dc4f414f3 working on the tests. 2014-08-08 16:51:59 +02:00
Max Neunhoeffer ac28678640 Change a getBlock call and improve exception message. 2014-08-08 16:51:59 +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
Max Neunhoeffer 13ef2912a3 Better error message and remove unnecessary file. 2014-08-08 16:30:05 +02:00
Max Neunhoeffer 269d65cc24 Improve comments. 2014-08-08 16:15:31 +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
Willi Goesgens 6135e733fb Cleanup 
- adjust sequence of functions in cpp to header
  - adjust documentation
 2014-08-08 15:48:39 +02:00
James e5299e2cd2 adding skipSome method for EnumerateListBlock. 2014-08-08 15:47:43 +02:00
Jan Steemann ebd5b024e3 fixed crash in parser 2014-08-08 15:09:59 +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
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
Willi Goesgens 6522df2e52 v8-vocbase split: clean up includes - more includes to get rid of. 2014-08-08 13:48:28 +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
Jan Steemann c7350c4c06 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
 2014-08-07 16:12:14 +02:00
Jan Steemann 099ec8db60 reallow attribute names starting with underscores 2014-08-07 15:52:58 +02:00
Willi Goesgens 9f03c16a6b v8-vocbase split: clean up includes - more tricky hidden dependencies can be removed. 2014-08-07 15:50:50 +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
Michael Hackstein a5b35f224a Fixed REST API documentation. Some values were not recognized as paramters by swagger script 2014-08-07 14:52:55 +02:00
Willi Goesgens 26b62538f3 Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-07 14:17:04 +02:00
Frank Celler be06ef7f25 new upgrade-database (formely known as version-check) and new startup procedure 2014-08-07 14:12:19 +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
Willi Goesgens ba5365d9e9 v8-vocbase split: clean up includes. 2014-08-07 11:55:22 +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
James eef744c32e added new global function triagens::aql::CompareAqlValues. 
Also made associated changes in SortBlock.execute().
 2014-08-07 10:53:16 +02:00
Max Neunhoeffer baa54afc3b Sort out staticAnalysis for AggregateBlocks. 2014-08-07 10:52:22 +02:00
James 70c9b00745 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-08-07 09:53:42 +02:00
James 0a9502dae0 same as last. 2014-08-07 09:53:06 +02:00
Max Neunhoeffer 7956c69c69 Use two shapers in TRI_CompareShapeTypes 2014-08-07 09:51:24 +02:00
James aff67afef4 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 09:47:08 +02:00
James d15954fbdb working on comparison function for AqlValues. 2014-08-07 09:46:46 +02:00
Max Neunhoeffer c628a85bc8 Take out a cout. 2014-08-07 09:19:01 +02:00
Max Neunhoeffer b9a5377114 Implement JSON/SHAPED and SHAPED/JSON comparison by conversion. 2014-08-07 08:53:41 +02:00
Jan Steemann dbf2842a28 much better exception handling 2014-08-06 18:37:37 +02:00
James d79c9f928c Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-06 17:36:23 +02:00
James 643e421585 adding compare() method for AqlValue. 2014-08-06 17:36:15 +02:00
Jan Steemann 7c226df013 handle calls to user-defined functions 2014-08-06 17:30:21 +02:00
Jan Steemann e8f69490ff optimize away function calls with const arguments 2014-08-06 17:15:36 +02:00
Jan Steemann a69da2fea3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-06 16:19:55 +02:00
Jan Steemann 1015404edc working on AQL function calls and error handling 2014-08-06 16:19:43 +02:00
Max Neunhoeffer d07706674b Change signature of TRI_CompareShapedJson. 2014-08-06 15:23:48 +02:00
Max Neunhoeffer 7b65a958d8 Take care of static analyis case AggregateNode. 2014-08-06 15:13:22 +02:00
Max Neunhoeffer 70618ec768 Take out a cout. 2014-08-06 14:22:34 +02:00
Max Neunhoeffer 99a32a36b7 Fix bugs in SortBlock. 2014-08-06 14:14:32 +02:00
James c645648b54 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-06 13:37:13 +02:00
James 5ac060e687 adding SortBlock, something not working. 2014-08-06 13:36:50 +02:00
Willi Goesgens 226790a353 v8-base splitting: adjust filenaming to the convention. 2014-08-06 12:54:24 +02:00
Willi Goesgens 52710f15cd Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-06 12:51:29 +02:00
Willi Goesgens b068fa92ed v8-vocbase splitting: fix initialisation. 2014-08-06 12:49:59 +02:00
Jan Steemann d623d1a0ab renamed things 2014-08-06 09:42:06 +02:00
Willi Goesgens f6f35cab9f Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-05 19:00:05 +02:00
Willi Goesgens a7d241cdd8 Split v8-vocbase.cpp into handy bits. 2014-08-05 18:59:40 +02:00
Jan Steemann a8c8560c6a fixed segfault 2014-08-05 18:40:42 +02:00
James 3e902323dd cleaning up. 2014-08-05 17:28:36 +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 1bb42c31e8 added comments 2014-08-05 16:13:25 +02:00
Jan Steemann 2471bee676 moved implementations to cpp files 2014-08-05 16:10:39 +02:00
Max Neunhoeffer ccbcade0eb Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:47:39 +02:00
Max Neunhoeffer 7fee115990 Add a proper hash function for AqlValue objects. 2014-08-05 15:47:20 +02:00
James 5b044a3092 removing old code. 2014-08-05 15:46:51 +02:00
James a1222d394d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:38:11 +02:00
James 86989711ce adding a method for toJson to AqlValue. 2014-08-05 15:36:15 +02:00
Max Neunhoeffer cab02853ef Fix two bugs with new ShapedJson register values. 2014-08-05 15:26:21 +02:00
Jan Steemann ae04cb95d9 fixed compile errors 2014-08-05 15:04:42 +02:00
James 1d912648cd removing previous use of queryResult.json in JS_ExecuteAql. 2014-08-05 14:43:51 +02:00
James fbc6ae2267 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 14:37:29 +02:00
James 6772762c60 preparing json return value for queryResult. 2014-08-05 14:37:08 +02:00
Max Neunhoeffer 5cbbd8a4c4 Fix barrier and documentCollection access in Expressions. 
Still does not link.
 2014-08-05 14:33:54 +02:00
Jan Steemann 7924c89a69 fix compile error 2014-08-05 13:56:26 +02:00
Jan Steemann 2003524a3d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-05 13:52:17 +02:00
Jan Steemann d896089210 added helper method 2014-08-05 13:52:03 +02:00
Max Neunhoeffer 8d1ce3baf2 Copy document collection in slice and splice for AqlItemBlocks 2014-08-05 13:50:56 +02:00
Max Neunhoeffer 135cce3250 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 13:24:22 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Max Neunhoeffer 96d8dcc054 Major cleanup, not yet working. 2014-08-05 12:29:36 +02:00
Max Neunhoeffer 4f466f2a09 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 11:05:57 +02:00
Max Neunhoeffer a9dac96bf3 Store AqlValue objects in AqlItemBlocks. 2014-08-05 11:05:24 +02:00
Jan Steemann 932aac9d06 added method signature 2014-08-05 10:58:58 +02:00
Jan Steemann 4a2d943d45 added helper methods 2014-08-05 10:56:37 +02:00
Jan Steemann 57f5590646 fixed scoping 2014-08-05 10:44:27 +02:00
Jan Steemann 129ba6a5ad Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-05 10:23:44 +02:00
Jan Steemann 23d02a3602 added collect plan node generation 2014-08-05 10:23:33 +02:00
Max Neunhoeffer 6e9b345634 Fix a memory leak. 2014-08-04 18:40:34 +02:00
Jan Steemann b2b9c7c03f use constants 2014-08-04 17:38:08 +02:00
Jan Steemann f6384b006d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-08-04 17:31:00 +02:00
Jan Steemann 7fd236aa4f fixed enumeratecollection block 2014-08-04 17:27:51 +02:00
Max Neunhoeffer fabfeae14d Add LimitNode. Implement skip generically. 2014-08-04 16:34:37 +02:00
Max Neunhoeffer 8b640be8ac Add Filter node. 2014-08-04 15:11:51 +02:00
Max Neunhoeffer 87af84d4b1 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-08-04 12:53:39 +02:00
Max Neunhoeffer 901129394e More comments, more generic functionality. 2014-08-04 12:51:53 +02:00
Jan Steemann 2487474e96 master pointers 2014-08-04 11:58:42 +02:00
Jan Steemann 06c9c719e2 optimization for EnumerateCollection 2014-08-04 11:46:19 +02:00
Jan Steemann 7dc549d058 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-04 11:16:00 +02:00
Jan Steemann 182ab57e8d transaction 2014-08-04 11:15:53 +02:00
Max Neunhoeffer 91ec3d5647 Some cleanup of interface and names. 2014-08-04 10:29:17 +02:00
Max Neunhoeffer 3ed34b86e7 Rename _exePlan to _exeNode 2014-08-04 09:36:13 +02:00
Jan Steemann 4603d2a1dd Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 17:54:41 +02:00
Jan Steemann 36d9cd6259 properly return compound types 2014-08-01 17:20:30 +02:00
Jan Steemann e733e3e83b fixed some issues 2014-08-01 17:08:12 +02:00
Max Neunhoeffer 390f0fe605 Implement distributeShardsLike 2014-08-01 17:05:04 +02:00
Jan Steemann a530b71477 initialize _pos 2014-08-01 16:11:09 +02:00
Jan Steemann 48935297ac fixed some dependency issues 2014-08-01 15:50:52 +02:00
Max Neunhoeffer 316bffe45e Move calculation setup to initialize() after staticAnalysis. 2014-08-01 15:12:12 +02:00
Max Neunhoeffer 2063a985fd Add a header inclusion. 2014-08-01 15:01:22 +02:00
Max Neunhoeffer f9fd8ec8a8 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-01 15:00:42 +02:00
Max Neunhoeffer ff5d2c9557 Fix setValue bug. 2014-08-01 15:00:29 +02:00
Jan Steemann 888e3ff7e7 unified signature 2014-08-01 15:00:12 +02:00
Max Neunhoeffer 8611be5c24 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-01 14:53:46 +02:00
Max Neunhoeffer 9c9e02a948 More expression stuff. 2014-08-01 14:53:31 +02:00
Jan Steemann 8ed4acf63f Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 14:53:00 +02:00
Jan Steemann 2f7b7ad1f1 toV8 2014-08-01 14:52:55 +02:00
Max Neunhoeffer 0d434cfc21 Merge. 2014-08-01 14:40:29 +02:00
Jan Steemann b08b052fd4 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 14:37:36 +02:00
Jan Steemann 0d7ca46b45 added variables() method 2014-08-01 14:37:29 +02:00
Max Neunhoeffer 1ee156f53b Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-01 14:35:58 +02:00
Max Neunhoeffer 46424e9e0b Call many things register, because they are. 
Implement CalculationBlock stub.
 2014-08-01 14:35:28 +02:00
Jan Steemann c9f104cdd6 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 13:59:10 +02:00
Jan Steemann 8de760bf1b added expression function 2014-08-01 13:58:51 +02:00
Max Neunhoeffer dd1b1c8d01 Fix shared_ptr VarOverview mess. 2014-08-01 13:47:55 +02:00
Max Neunhoeffer 0bbb1a3408 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-01 13:22:45 +02:00
Max Neunhoeffer 2b14d0fb39 Fix shared_ptr pilot mistake. 2014-08-01 13:22:10 +02:00
Jan Steemann b6af736c60 smallness 2014-08-01 13:16:07 +02:00
Jan Steemann 69c55d754c renamed "root" to "return" 2014-08-01 12:23:55 +02:00
Jan Steemann db2018e052 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 12:19:22 +02:00
Jan Steemann 9856d4e9e0 use addNode 2014-08-01 12:19:15 +02:00
Max Neunhoeffer 341675ffaf Destructor of ExecutionBlock must not destruct children. 2014-08-01 12:18:41 +02:00
Max Neunhoeffer aa48d48755 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Query.cpp
 2014-08-01 12:05:37 +02:00
Max Neunhoeffer fd28a5cc4f Fix something. 2014-08-01 11:59:54 +02:00
Max Neunhoeffer 5315f35ed3 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/ExecutionBlock.h
 2014-08-01 11:57:27 +02:00
Jan Steemann 0ec4e7f73e renaming 2014-08-01 11:57:19 +02:00
Max Neunhoeffer e7e98262ea Redo instanciator using Walker and in ExecutionEngine. 2014-08-01 11:56:39 +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
Jan Steemann 7ca38317b2 execution engine 2014-08-01 11:22:35 +02:00
Jan Steemann af9dbdba85 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 11:21:17 +02:00
Jan Steemann d492271b93 added ExecutionEngine 2014-08-01 11:21:08 +02:00
Max Neunhoeffer c1b15188ff Rename *Plan to *Node. 2014-08-01 11:17:34 +02:00
Max Neunhoeffer 48a14825ea Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-01 10:28:44 +02:00
Max Neunhoeffer cd56e35f1f Sort out static analysis. 2014-08-01 10:28:25 +02:00
Jan Steemann 7ca458e397 more code generation 2014-08-01 09:50:08 +02:00
Max Neunhoeffer 15235b1337 Merge old and new version of Types.cpp 2014-08-01 08:53:48 +02:00
Max Neunhoeffer 0a71c3ba73 Finish first draft of staticAnalysis. 
Compiles but is untested.
 2014-07-31 23:16:00 +02:00
Max Neunhoeffer 000664db6e Finish Types.cpp, the forgotten file. Now splice should work. 2014-07-31 22:31:28 +02:00
Max Neunhoeffer 93e82b50e1 Add the forgotten file. splice is only a stub. 2014-07-31 19:32:19 +02:00
Jan Steemann 2574982771 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 18:18:08 +02:00
Jan Steemann 91ac7ab74a Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-07-31 17:18:23 +02:00
Jan Steemann d240314cfe code generation for V8 expressions 2014-07-31 17:13:38 +02:00
Max Neunhoeffer 3e89688d82 New execution engine. 2014-07-31 17:00:06 +02:00
Max Neunhoeffer b7a2add68c Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-31 16:07:34 +02:00
Jan Steemann d7429d3c6c removed parameter 2014-07-31 16:04:43 +02:00
Max Neunhoeffer b0dd258070 Restructure execution engine with blocks. 2014-07-31 15:36:46 +02:00
Jan Steemann d15771854d pass executor to expression 2014-07-31 15:20:47 +02:00
Jan Steemann c335a16d5a used Expression 2014-07-31 15:14:35 +02:00
Jan Steemann 65386d8529 added class Expression 2014-07-31 15:12:12 +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 76a9887e25 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 13:40:34 +02:00
Jan Steemann fbedb15df8 some more nodes 2014-07-31 13:40:20 +02:00
Jan Steemann 1ff3d44e88 removed AQL_PENG 2014-07-31 12:30:16 +02:00
Max Neunhoeffer 9714979d73 Enable some more ClusterComm stuff for dbServers. 2014-07-31 12:19:46 +02:00
Jan Steemann bee98cf420 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 12:12:04 +02:00
Jan Steemann c7c7ee5a52 create more plan nodes 2014-07-31 12:11:40 +02:00
Jan Steemann 3d899f27e8 variable generator 2014-07-31 11:43:01 +02:00
Jan Steemann 6df3aa1c8d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 10:38:58 +02:00
Jan Steemann 2aad264e77 refactoring 2014-07-31 10:38:49 +02:00
Max Neunhoeffer df64c69e73 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-31 10:32:12 +02:00
Max Neunhoeffer 98d82de6fb Create generic recursive walk functionality for Plans/Blocks. 2014-07-31 10:31:45 +02:00
Max Neunhoeffer fa5096a710 Allow ClusterComm requests originate in DBservers. 2014-07-31 09:25:53 +02:00
Jan Steemann 6ebfbfef49 stubs for various node types 2014-07-31 09:18:28 +02:00
Jan Steemann 1382a9ed81 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 09:05:09 +02:00
Max Neunhoeffer 2ef0095797 Start static analysis of variables in ExecutionBlocks. 2014-07-30 23:50:03 +02:00
Max Neunhoeffer 8613450e5b Fix free crash. 2014-07-30 22:54:25 +02:00
Jan Steemann e777cb71b1 adjusted after API changes 2014-07-30 18:06:28 +02:00
Jan Steemann 1175e9e61c Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-30 18:04:19 +02:00
Jan Steemann e203691f0c started plan generator 2014-07-30 18:04:05 +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
Jan Steemann 6442bc4353 fixed race condition in task setup 2014-07-30 15:54:39 +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 dcf23ed93c Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-30 13:41:31 +02:00
Max Neunhoeffer 4f1b5cbe2e Add a test case. 2014-07-30 13:41:22 +02:00
Jan Steemann 77c2ad31a4 added plan generator 2014-07-30 13:30:43 +02:00
Jan Steemann dc70c6f4d2 renamed class 2014-07-30 13:26:48 +02:00
Jan Steemann 31b245fa73 comments 2014-07-30 13:18:40 +02:00
Jan Steemann 4717979c74 nicer parser error messages 2014-07-30 13:14:28 +02:00
Jan Steemann 94a0d29d46 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-30 12:30:30 +02:00
Jan Steemann 376ae9b8dc Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-30 12:30:20 +02:00
Jan Steemann f4e8775ddc nicer parser error messages 2014-07-30 12:30:06 +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 234eb21ae9 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-30 11:37:07 +02:00
Max Neunhoeffer 92d68cfd0b Allow asynchronous cluster internal communication between DBservers. 2014-07-30 10:47:28 +02:00
Jan Steemann 39d7c71fce getResponsibleShard 2014-07-30 10:27:32 +02:00
Max Neunhoeffer 2b8d497bc8 Repair CalculationPlan, add Json for expressions. 2014-07-30 10:00:25 +02:00
Jan Steemann 2c5b696959 split toJson function 2014-07-30 09:53:00 +02:00
Max Neunhoeffer f078425b6d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-30 09:31:18 +02:00
Max Neunhoeffer 944ba6597d Add projection and sort node. 2014-07-30 09:30:59 +02:00
Jan Steemann 9a1067f97e Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-30 09:26:50 +02:00
Jan Steemann f3252ac429 moved variable into own file 2014-07-30 09:26:41 +02:00
Max Neunhoeffer d5ddf057ca Finish CalculationPlan node. 2014-07-30 09:06:43 +02:00
Max Neunhoeffer 9f92830f84 Plan remaining nodes. 2014-07-29 22:35:06 +02:00
Max Neunhoeffer b292208800 Use RootBlock to strip away context and only return latest result. 2014-07-29 20:13:42 +02:00
Jan Steemann 7a1abc3847 small refactoring for variable access 2014-07-29 19:35:03 +02:00
Jan Steemann 8fcd57d42f Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-29 18:03:01 +02:00
Jan Steemann c5cf0085ff fixed expansion nodes properly 2014-07-29 18:02:50 +02:00
Max Neunhoeffer e690185bf5 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-29 16:27:39 +02:00