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

554 Commits

Author SHA1 Message Date
Jan Steemann 13ddb8b34b fixed some cluster plans 2015-03-17 13:52:09 +01:00
Jan Steemann 6b24da1036 in the middle of refactoring 2015-03-17 09:08:25 +01:00
Jan Steemann ce0a543d25 added flag for disabling query tracking `--database.disable-query-tracking` 
Conflicts:
	arangod/RestServer/ArangoServer.cpp

Conflicts:
	Documentation/Books/Users/ConfigureArango/Arangod.mdpp
	arangod/RestServer/ArangoServer.cpp
 2015-03-13 13:51:23 +01:00
Jan Steemann 22dcbef6cb Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2015-03-12 16:53:26 +01:00
Jan Steemann dfb70d7d96 added cancellation points 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2015-03-12 15:00:23 +01:00
Jan Steemann f035ea1c3b kill AQL queries 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2015-03-12 15:00:14 +01:00
Jan Steemann a6473338b3 optimization for extractKey 2015-03-11 15:26:08 +01:00
Jan Steemann c4f17bb244 issue #1265: arangod crashed with SIGSEGV 2015-03-11 12:19:34 +01:00
Jan Steemann 7c5cc16a8a less locking for cluster status checks 2015-02-18 18:14:12 +01:00
Jan Steemann db2cd7acc9 added `filtered` attribute to AQL execution statistics 2015-02-13 21:37:49 +01:00
Jan Steemann dd74c6ac87 execute read and write operations of different collections in the same AQL query in lockstep, and not sequentially 2015-02-05 18:27:10 +01:00
Jan Steemann cef1e7bffe a bit less copying 2015-02-04 00:23:17 +01:00
Jan Steemann e13092168d added optimizer tests 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2015-01-29 21:40:43 +01:00
Jan Steemann 4142169526 fixed spurious errors when accessing a local collection from a cluster DB server 
Conflicts:
	arangod/Aql/Collection.cpp
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/Index.h
 2015-01-29 13:06:01 +01:00
Jan Steemann 7af624e2f0 selectivty, try 0 2015-01-27 09:34:04 +01:00
Jan Steemann c49986d0e8 preparation for conditions 2015-01-25 10:40:13 +01:00
Jan Steemann 02af05c50a use different cluster test methods 2015-01-24 14:08:16 +01:00
Jan Steemann 14e82da2b0 fixed leak 2015-01-19 22:25:16 +01:00
Jan Steemann 1003e52cf7 some cleanup 2015-01-18 16:41:48 +01:00
Jan Steemann 958ae69479 added tests 2015-01-18 15:34:35 +01:00
Jan Steemann a7538ca6e3 lazy hash index iteration 2015-01-18 03:25:06 +01:00
Jan Steemann cacaddd5e0 less copying hash index results 2015-01-18 00:52:41 +01:00
Jan Steemann 5ce1735372 use TRI_UNKNOWN_MEM_ZONE 2015-01-16 20:40:08 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 04bdf59ca3 fixed memleaks 2015-01-12 18:19:35 +01:00
Jan Steemann 2cbc278e6c finally 2015-01-12 14:23:26 +01:00
Jan Steemann d02de8d7e0 more tests 2015-01-12 11:59:19 +01:00
Max Neunhoeffer 892f11d2e8 Clarify code for cluster modififying AQL. 2015-01-12 10:37:06 +01:00
Jan Steemann 2d0a37d826 automatically create _keys in DistributeNode on insert 2015-01-12 10:33:05 +01:00
Jan Steemann 2de9760820 fixed empty error message 2015-01-09 23:29:36 +01:00
Jan Steemann cba74d0803 fixed memleaks 2015-01-09 18:27:59 +01:00
Jan Steemann 080c66cfe9 fixed invalid member access 2015-01-09 10:40:33 +01:00
Jan Steemann f2590881f1 return old or new values in data-modification operations 2015-01-08 16:35:54 +01:00
Willi Goesgens e2f206fd2c Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/grammar.cpp
 2015-01-07 15:50:44 +01:00
Willi Goesgens f905123802 Implement REMOVE/INSERT/UPDATE/REPLACE return the changed values 2015-01-07 15:48:13 +01:00
Jan Steemann c591357dd3 slightly changed cost estimation for IndexRangeNode 2015-01-07 15:11:42 +01:00
Max Neunhoeffer a976da2a07 Fix an issue in the cluster AQL where UPDATE d._key WITH ... did not work. 2014-12-24 01:23:48 +01:00
Max Neunhoeffer 1cdf439845 Broken version, errors not yet fixed. 2014-12-23 16:51:48 +01:00
Jan Steemann 19d2d6668f added random iteration for collections 2014-12-19 18:01:13 +01:00
Jan Steemann d92057dd03 the great rename: array => object, list => array 2014-12-18 22:33:23 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Jan Steemann dd60e53ce3 added more collect special cases 2014-12-16 22:52:33 +01:00
Jan Steemann f35f8d1643 fixed ranges, added tests 2014-12-16 13:54:46 +01:00
Jan Steemann 4a60a62028 indentation 2014-12-16 00:30:55 +01:00
Jan Steemann 1c65c042a4 added tests, fixed exception 2014-12-16 00:20:40 +01:00
Jan Steemann bcdeabd3ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
 2014-12-15 21:53:51 +01:00
Willi Goesgens 1c4a72b106 The Big V8 upgrade Merge. 2014-12-15 17:30:56 +01:00
James f5763be5f4 final clean up 2014-12-13 19:09:18 +00:00
James 17ed7fbef4 sorting works, tests updated 2014-12-13 17:47:59 +00:00
James 0dee54ee6f more bugfixes more tests 2014-12-13 16:05:20 +00:00
James a7635abe41 fixed some bugs added some tests 2014-12-13 14:51:46 +00:00
Jan Steemann f4d7a57c19 changed `COLLECT...INTO x COUNT` to `COLLECT...WITH COUNT INTO x` 
allow executing subqueries without double brackets

jslint
 2014-12-12 23:02:24 +01:00
Jan Steemann 8f6193faa2 added optional COUNT clause for AQL COLLECT 2014-12-12 17:18:04 +01:00
James 7ab57d64ec Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 22:05:57 +00:00
Jan Steemann 22928c1bb5 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-12-09 22:45:55 +01:00
James 3ce7164fb6 finally working again, and more tests 2014-12-09 20:15:38 +00:00
James 8601dd4424 working again 2014-12-09 16:54:34 +00:00
James 35be017bb3 snapshot 2014-12-09 16:44:02 +00:00
James 4fdd97c9a7 fixed another bug 2014-12-09 14:19:52 +00:00
James afb960f60e fixed another bug and added a test for it. 2014-12-09 11:19:34 +00:00
James a4dcf1b9d3 Merge branch 'aql-feature-index-or' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-12-09 10:23:07 +00:00
James 1467b34c5e fixing duplicates in dynamic bounds 2014-12-09 10:19:01 +00:00
Jan Steemann 6ddaf08ccb fixed potential memleak 2014-12-09 09:47:28 +01:00
Jan Steemann cd17c393ab Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	arangod/Aql/grammar.cpp
 2014-12-08 12:37:13 +01:00
James dca2cc0c34 some further cleaning up 2014-12-06 20:44:56 +00:00
James b2ec5d6f1b more cleaning up 2014-12-06 20:25:14 +00:00
James 62411fa64a another memleak plugged 2014-12-06 19:24:47 +00:00
James aaacbcf9bb Jan's other patch 2014-12-06 14:23:13 +00:00
James 8698a1da3d fixing bugs and updating tests 2014-12-06 14:02:50 +00:00
James caaa9435b9 cleaning up 2014-12-06 13:04:50 +00:00
James 08ffbb9638 snapshot 2014-12-06 11:09:32 +00:00
Jan Steemann e4b51f616c Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-12-03 17:46:03 +01:00
Jan Steemann 6185943bc5 prevent double-free of variable bounds 2014-12-03 17:45:46 +01:00
Jan Steemann 7e161b88ce issue #1131: added KEEP for `COLLECT...INTO` 2014-12-03 17:44:10 +01:00
Frank Celler 77f544a554 Merge pull request #1144 from triAGENS/less-confusing-http-naming 
Renamed mergeArrays->mergeObjects (because it's actually about objects, not arrays)
 2014-12-03 14:48:04 +01:00
James 8c28127be1 fixing dynamic bounds which are lists. 2014-12-03 11:44:38 +00:00
Jan Steemann 8e2c5176f4 fixed segfault 2014-12-03 10:47:35 +01:00
Alan Plum 41ab3aa4d6 Renamed mergeArrays->mergeObjects to make API less confusing. 2014-12-02 17:03:03 +01:00
James e3abbe0a17 added some comments 2014-12-02 12:35:08 +00:00
Jan Steemann 14a130bb19 manual merge 2014-12-02 12:12:30 +01:00
James fed9e98aca Merge branch 'master' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	CHANGELOG
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
	js/server/tests/aql-optimizer-indexes.js
 2014-12-02 10:36:06 +00:00
Max Neunhoeffer 015d45fd4f Fix a bug in AQL COLLECT statement. Sorts out #1127. 
This concerned every COLLECT statement, only the first group had access
to the values of the variables before the COLLECT statement.
 2014-11-28 17:56:32 +01:00
Max Neunhoeffer fb97638a11 Fix a comment. 2014-11-28 17:55:46 +01:00
Max Neunhoeffer 0a795499b9 Fix a buffer overflow that did not have any effect. 2014-11-28 17:55:40 +01:00
Max Neunhoeffer 5e3a41dabf Only put non-toplevel vars into the INTO variable in a COLLECT. 
This restores the behaviour of 2.2.
 2014-11-28 17:55:20 +01:00
Max Neunhoeffer 4d97f7a3ba Choose more sensible block sizes for fetch from dependency. 2014-11-28 17:55:12 +01:00
Max Neunhoeffer cb57738d1d Two comment changes. 2014-11-28 17:52:41 +01:00
Jan Steemann b5b803b124 allow lazier querying of hash index 2014-11-28 17:36:10 +01:00
Max Neunhoeffer 7664fc643c Fix a bug in AQL COLLECT statement. Sorts out #1127. 
This concerned every COLLECT statement, only the first group had access
to the values of the variables before the COLLECT statement.
 2014-11-28 16:14:44 +01:00
Max Neunhoeffer 5f217c5781 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-11-28 14:43:54 +01:00
Jan Steemann 7ef8097fe1 added mergeArrays 2014-11-28 14:07:36 +01:00
Jan Steemann bc8579f20b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-11-28 13:58:59 +01:00
Jan Steemann ac36c0cd7a added mergeArrays attribute 2014-11-28 13:58:49 +01:00
Max Neunhoeffer 877b1d6df9 Fix a comment. 2014-11-28 13:33:15 +01:00
Max Neunhoeffer 0445b547be Fix a buffer overflow that did not have any effect. 2014-11-28 13:31:27 +01:00
Max Neunhoeffer a76e22f03a Only put non-toplevel vars into the INTO variable in a COLLECT. 
This restores the behaviour of 2.2.
 2014-11-28 13:05:15 +01:00
Max Neunhoeffer 676ec3694d Choose more sensible block sizes for fetch from dependency. 2014-11-28 11:43:09 +01:00
James 8a8237a55e correct merge mistakes 2014-11-27 09:55:46 +00:00
James 40a67f47c7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 
Conflicts:
	arangod/Aql/ExecutionBlock.cpp
	arangod/Aql/OptimizerRules.cpp
 2014-11-27 09:25:43 +00:00
Max Neunhoeffer 27cff93a4e Two comment changes. 2014-11-26 16:47:32 +01:00
James 12eb461181 correct logic in dynamic bounds evaluation. 2014-11-25 11:55:50 +00:00
James 9df14a7200 fixed bugs in last 2014-11-23 14:33:26 +00:00
James 7e51c27b95 preventing overlap of dynamic ranges 2014-11-23 14:10:22 +00:00
James 1f69d82a8a working out bugs 2014-11-20 11:51:22 +00:00
James dd025f4a99 initial changes to IndexRangeBlock for OR and IN conditions. 2014-11-18 13:50:59 +00:00
Jan Steemann da468b2f58 allow lazier querying of hash index 2014-11-18 14:16:36 +01:00
Jan Steemann 3696e3c7c1 fixed memleak 2014-11-13 18:04:05 +01:00
Jan Steemann f84f8efaa1 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-13 14:26:28 +01:00
Jan Steemann 32013321c5 fixed compile warning 2014-11-13 14:25:10 +01:00
Jan Steemann c167024654 fixed compile error 2014-11-13 14:14:27 +01:00
James e09fc778ba Merge branch 'aql-feature-lazy-index' of ssh://github.com/triAGENS/ArangoDB into aql-feature-index-or 2014-11-13 12:19:12 +00:00
James 5fd0bd80be refactoring to avoid to calls to readIndex when fewer than DefaultBatchSize docs are requested. 2014-11-13 11:49:25 +00:00
James fb1fe3e8b1 reset the defaultbatchsize to 1000 2014-11-13 11:21:07 +00:00
James 6822f80129 updating the skipSome for index range block 2014-11-13 11:19:11 +00:00
James 49352cb8c2 removing redundant code, and updated comments. 2014-11-13 11:08:14 +00:00
James aba5567b0e cleaning up 2014-11-13 10:51:04 +00:00
Jan Steemann bb86006926 initialize variable 2014-11-13 10:36:35 +01:00
James a5006b7617 hash indexes working. 2014-11-13 08:37:52 +00:00
James f797afe0d5 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 2014-11-13 08:04:25 +00:00
Jan Steemann 7cd1eb5474 more warnings 2014-11-12 14:52:54 +01:00
James f55b252f1b snapshot working on IndexRangeBlock and hash indexes 2014-11-11 12:25:59 +00:00
James 1466813313 cleaning up 2014-11-11 11:32:48 +00:00
James d6e1971fd3 lazy index working for skiplists 2014-11-11 11:29:46 +00:00
Jan Steemann 738636db2d whitespace 2014-11-08 21:26:54 +01:00
Jan Steemann e120bdec8c do not allocate too much space for hash index elements 2014-11-08 21:15:44 +01:00
Jan Steemann 7695223744 use emplace_back 2014-11-08 21:13:41 +01:00
James 84e6881a44 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into aql-feature-lazy-index 
Conflicts:
	arangod/Aql/ExecutionNode.h
 2014-11-08 09:53:30 +00:00
Jan Steemann b0de1bb226 leaner and meaner error messages 2014-11-07 10:53:00 +01:00
James 6822594bff changed to number of blocks pulled by default by CalculationBlock and ExecutionBlock 2014-11-06 12:51:32 +00:00
James c54b92c6e7 getting tests to work 2014-11-06 12:24:28 +00:00
James c063b85d29 working except for 1 test. 2014-11-06 11:42:31 +00:00
James 47810e76e1 quick hack 2014-11-06 10:10:40 +00:00
Willi Goesgens f920a0f8d4 By Kasper: Fix possible uninitializen variable access. 2014-11-04 10:42:51 +01:00
Jan Steemann e2cfa056c0 pass query warnings around in cluster 2014-11-01 16:36:58 +01:00
Jan Steemann 025d73ae03 re-added support for fullCount 2014-11-01 15:20:05 +01:00
Jan Steemann 51d3871195 removed debug output 2014-11-01 02:25:17 +01:00
Willi Goesgens 10bf137692 Move free logic into its own function, so we can call in in both places. 2014-10-31 11:28:27 +01:00
Max Neunhoeffer 425d50bdc1 Fix RemoteBlock initializeCursor forwarding by HTTP. 2014-10-29 16:17:15 +01:00
Max Neunhoeffer ecb7317461 Remove enterSubQueryFirst. 2014-10-29 11:37:06 +01:00
Max Neunhoeffer 59c1935466 Get rid of some TODOs and FIXMEs. 2014-10-29 11:25:30 +01:00
Max Neunhoeffer 18990d9b95 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-29 08:57:34 +01:00
Jan Steemann 8bb213e7ba sort and cache list expression values 
emplace

fixed wrong assertion
 2014-10-29 01:02:20 +01:00
Jan Steemann 529bf386d7 fixed some API errors 2014-10-28 11:30:49 +01:00
Max Neunhoeffer 4098279ed6 Implement a shutdown method for the Subqueryblock. 2014-10-28 09:02:01 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Willi Goesgens 896c6f591e fix forwarding of http-errors; there mustn't be a second variable. 2014-10-27 15:37:35 +01:00
Max Neunhoeffer 7ca33e7b73 Remove unnecessary case: no SHAPED on coordinators. 2014-10-27 13:25:34 +01:00
Jan Steemann dacc249105 fixed AggregatorGroup shutdown 2014-10-24 23:39:58 +02:00
Max Neunhoeffer 08930fac3a Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-24 14:10:59 +02:00
Max Neunhoeffer 93ceafa686 Make EnumerateCollectionBlock even more lazy. 2014-10-24 14:10:30 +02:00
Jan Steemann bc4ae8e7df fixed leak in IndexOperator, simplified IndexOperator API 2014-10-24 12:57:09 +02:00
James 0158a67300 adding ignoreShutdown change. 2014-10-23 21:52:10 +01:00
James 705eb42ca1 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 21:41:59 +01:00
James 3b784f931c removed unnecessary harmless line 2014-10-23 21:41:49 +01:00
Jan Steemann 6dfe652d56 cleanup v8 expressions in coordinator, too 2014-10-23 22:22:15 +02:00
James 5821b9da00 fixing Distribute/ScatterBlocks. 2014-10-23 21:02:20 +01:00
Willi Goesgens 249b89aa09 - Add statistics under all circumstances (also if the status is "exhausted") 
- return statistics in all cases (empty statistics in doubt)
 2014-10-23 16:39:14 +02:00
James 7a6b2650c1 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 13:16:06 +01:00
Jan Steemann 8583dc08ca fix V8 segfault 2014-10-23 14:03:50 +02:00
Jan Steemann 8a544eefb5 commit transaction on remote servers 2014-10-23 11:26:28 +02:00
James ef4099a8af remove unnecessary/incorrect cleanup in DistributeBlock 2014-10-23 10:09:15 +01:00
James 6fe6cecf32 Merge branches 'devel' and 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-23 09:41:57 +01:00
James 88a59b3336 some more cleaning up distribute/gather blocks 2014-10-23 09:41:49 +01:00
Jan Steemann fc4886e1f3 added diagnostic information 2014-10-23 10:38:31 +02:00
Jan Steemann 1dafc31f2d Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-22 19:06:03 +02:00
Jan Steemann 54a0f182e2 call shutdown using an errorCode 2014-10-22 19:01:56 +02:00
Willi Goesgens a8b8fbcf28 Properly handle statistics if multiple getSome() calls are performed. 2014-10-22 18:24:42 +02:00
Willi Goesgens 9558f5aa0a Implement passing of query statistics through cluster. 2014-10-22 17:36:23 +02:00
Jan Steemann 7f2373204a fixed cloning of coordinator queries 2014-10-22 17:25:59 +02:00
Jan Steemann def5729ed8 potentially fixed cleanup of DistributeBlock 2014-10-22 12:40:34 +02:00
Jan Steemann e2ef21c33a fixed non-working DistributeBlock 2014-10-22 12:07:31 +02:00
James 6106e70405 fixing _distBuffer initialisation. 2014-10-21 16:49:19 +01:00
Jan Steemann 8a5a570996 fixed undefined behavior 2014-10-21 14:50:48 +02:00
Jan Steemann c91355831b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-21 12:50:37 +02:00
Jan Steemann 2617f3879c fixed primary index usage in cluster 2014-10-21 12:50:06 +02:00
Willi Goesgens 07facdd1c9 Add more precise error messages to runtime errors with the update block 2014-10-21 12:45:02 +02:00
Jan Steemann 40e62e95a5 fixed out-of-scheduler-threads issue 2014-10-20 18:27:50 +02:00
Jan Steemann 34d34af340 do not throw on shutdown 2014-10-20 16:17:19 +02:00
Jan Steemann bafdf8a332 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 15:40:03 +02:00
Jan Steemann 10c9a54932 start transactions on coordinator 2014-10-20 15:39:55 +02:00
Willi Goesgens 28149299b9 Fix condition of assertion when error: true is to be expected. 2014-10-20 14:48:54 +02:00
Jan Steemann 6356c47f90 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 12:32:15 +02:00
Jan Steemann c93c952c05 fixed from/to-handling in cluster 2014-10-20 12:32:08 +02:00
Willi Goesgens 56099b96c9 - More precisely describe which request failed in the cluster communication 
- catch exceptions during shutdown - they shouldn't be output since its usually already known.
 2014-10-20 12:06:53 +02:00
Jan Steemann 9132a10785 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-20 09:51:43 +02:00
Jan Steemann 5510f7eee8 indentation 2014-10-20 09:51:33 +02:00
Max Neunhoeffer 6eb2073336 Rename VarOverview into RegisterPlan, because that is what it is. 2014-10-20 09:14:01 +02:00
James 78339c6c52 more bug fixes in GatherBlock. 2014-10-18 15:06:03 +01:00
James a89d250316 fixed skipSome and further cleaning up 2014-10-18 14:33:37 +01:00
James f16ee1a671 fixed bug in comparison function for GatherBlock 2014-10-18 14:17:43 +01:00
James 6f1c251077 debugging GatherBlock 2014-10-18 14:01:53 +01:00
Jan Steemann 19502fee8e fixed some tests 2014-10-17 18:50:00 +02:00
Jan Steemann 42c91307ec handlescope 2014-10-17 15:56:03 +02:00
Jan Steemann d2d9a0ca2e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-17 15:25:15 +02:00
Jan Steemann ee614d6ebd v8 context handling 2014-10-17 15:25:06 +02:00
Willi Goesgens 7f387d9ac8 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-17 14:16:19 +02:00
Willi Goesgens 1a80e19702 Implement the option to enter Subqueries first in the ExecutionBlock Walker too 
(as in #d2a15253b0805ce2624eac4a44bb66b15c34a21e for the ExecutionNode)
 2014-10-17 13:36:40 +02:00
James 56c8599dd1 fixes to DistributeBlock cursor init and can now send SHAPED to clients. 2014-10-17 09:25:37 +01:00
James 9f942d0ce3 finished first version of DistributeBlock/Node. 2014-10-15 10:53:09 +01:00
Jan Steemann dd0601591b fixed uninitialized variable 2014-10-15 10:01:01 +02:00