1
0
Fork 0
Commit Graph

15169 Commits

Author SHA1 Message Date
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 7beeb5b541 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-01 13:49:07 +02:00
Max Neunhoeffer dd1b1c8d01 Fix shared_ptr VarOverview mess. 2014-08-01 13:47:55 +02:00
Jan Steemann eea45fee53 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-01 13:45:46 +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
Frank Celler e71a29b38b Merge pull request #969 from Acconut/doc-transaction-fix
Fix keys when using cap constraint
2014-08-01 09:02:23 +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
Heiko Kernbach ff3d95746f changed keywords in aql-theme for ace editor 2014-07-31 19:10:49 +02:00
Heiko Kernbach 4a3796186d added new functions and keywords into aql theme for ace editor 2014-07-31 18:40:41 +02:00
Heiko Kernbach 198b152970 fixed dbselectionviewspec 2014-07-31 18:25:33 +02:00
Jan Steemann 2574982771 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-07-31 18:18:08 +02:00
Heiko Kernbach cee3035d70 manage dbs: removed unnecessary divider if not needed 2014-07-31 17:53:09 +02:00
Heiko Kernbach ad51f9797f changed Graph Management label to Graphs 2014-07-31 17:47:30 +02:00
Heiko Kernbach 134975f5f1 changed copyright to arangodb gmbh 2014-07-31 17:37:46 +02:00