1
0
Fork 0
Commit Graph

15013 Commits

Author SHA1 Message Date
Jan Steemann fe3b672ae5 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-28 13:19:03 +02:00
Jan Steemann 0f5266def9 update write collection 2014-07-28 13:18:53 +02:00
Max Neunhoeffer f9b03c3d35 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-28 13:16:43 +02:00
Max Neunhoeffer 0c89dccc5d Add CalculationPlan, create arangod/Aql/Types.h 2014-07-28 13:16:25 +02:00
Jan Steemann cdde47f589 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/CMakeLists.txt
	arangod/Makefile.files
2014-07-28 12:32:02 +02:00
Jan Steemann cc43d1190c inject bind parameters 2014-07-28 12:30:55 +02:00
Max Neunhoeffer 47afbc7ff4 Add FilterNode. 2014-07-28 11:06:33 +02:00
Max Neunhoeffer 5ee05450a9 Add stub for AqlExpression 2014-07-28 09:50:13 +02:00
Max Neunhoeffer 487ebd4bb8 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2
Conflicts:
	arangod/CMakeLists.txt
	arangod/Makefile.files
2014-07-28 09:42:15 +02:00
Max Neunhoeffer f2b135ef36 Start infrastructure for execution engine. 2014-07-28 09:41:19 +02:00
Max Neunhoeffer bfe568f48a Add virtual destructor for TRI_doc_mptr_t. 2014-07-28 09:40:31 +02:00
Jan Steemann 9369763309 added AstNode.cpp 2014-07-28 09:03:59 +02:00
Jan Steemann bdf78b853a dump more nodes 2014-07-28 08:59:04 +02:00
Jan Steemann 1be0fa6ee2 dump AST 2014-07-25 18:18:40 +02:00
Jan Steemann b822da5eb1 added missing file 2014-07-25 16:57:59 +02:00
Jan Steemann 33215ca194 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-25 16:57:12 +02:00
Jan Steemann ddf18650e7 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-25 16:57:01 +02:00
Jan Steemann 062b6f1dcf parser! 2014-07-25 16:56:53 +02:00
Max Neunhoeffer 59683cb964 Add LimitPlan. 2014-07-25 16:55:44 +02:00
Alan Plum 0f5c65e636 gharial: added missing body params. 2014-07-25 16:23:34 +02:00
scottashton 6d2e3acd13 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-07-25 16:09:45 +02:00
scottashton 0a15993322 jslinted filed 2014-07-25 16:09:40 +02:00
Michael Hackstein 516fdaa3dc Added a cleanup before empty graph test 2014-07-25 16:04:59 +02:00
Michael Hackstein 28f2ca58ac Added a regression test for restricted edges on non existing edges. Yes 2014-07-25 16:04:29 +02:00
scottashton 8776a84447 fixed bug with edgeCollectionRestrictions 2014-07-25 15:55:45 +02:00
Alan Plum edccd22286 Fixed aardvark config not showing falsey defaults and formatting. 2014-07-25 15:36:45 +02:00
Frank Celler 0344573b5f use all available, non-cluster tests 2014-07-25 15:36:21 +02:00
Max Neunhoeffer aa7e24495f Take out debugging output. 2014-07-25 15:16:34 +02:00
Max Neunhoeffer 450a27a15d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-25 15:15:18 +02:00
Max Neunhoeffer 7c983d0f7b Fix memory allocation issues in Json class. 2014-07-25 15:09:13 +02:00
Max Neunhoeffer b6122ad3dc Snapshot, this version has memcheck problems. 2014-07-25 14:25:22 +02:00
Jan Steemann 92d42168a5 free string memory 2014-07-25 11:43:19 +02:00
Max Neunhoeffer 067b740146 Comment and finalise Json wrapper class. 2014-07-25 10:33:54 +02:00
Jan Steemann 6b8ac46cca make parser use new AQL 2014-07-25 10:20:05 +02:00
Max Neunhoeffer 462be601cf Use new Json wrapper class. 2014-07-25 00:32:30 +02:00
Max Neunhoeffer fc83eed330 Add an explicit steal() method to Json. 2014-07-25 00:31:50 +02:00
Max Neunhoeffer f1bcf6e264 Fix operator= for Json objects. 2014-07-25 00:07:20 +02:00
Max Neunhoeffer e6da8c63e2 Change Json wrapper class test. 2014-07-24 23:41:44 +02:00
Max Neunhoeffer 6a1203405f Add Json wrapper class to JsonHelpers. 2014-07-24 23:41:06 +02:00
Jan Steemann adbda1462a added AST 2014-07-24 17:16:51 +02:00
Jan Steemann 5d79df9e2f re-added scopes 2014-07-24 16:39:16 +02:00
Frank Celler 026121dadd fixed sandbox 2014-07-24 16:06:06 +02:00
Frank Celler 55e1ee43bd added createLocations 2014-07-24 16:06:06 +02:00
Alan Plum 05ce0037da Fixed printRecursive for null. 2014-07-24 15:56:27 +02:00
Jan Steemann 9d07679f27 error reporting 2014-07-24 14:57:57 +02:00
Jan Steemann 7eb727bd15 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-24 14:40:06 +02:00
Jan Steemann 0496b06cf9 error reporting 2014-07-24 14:39:59 +02:00
Heiko Kernbach 83ccb3c339 changed lib to minified version 2014-07-24 14:14:05 +02:00
Max Neunhoeffer 00b9106dd3 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-07-24 14:13:49 +02:00
Max Neunhoeffer 970ad56b2b Add new node type. appendAsString method missing. 2014-07-24 14:13:34 +02:00