1
0
Fork 0
Commit Graph

3632 Commits

Author SHA1 Message Date
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