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

17172 Commits

Author SHA1 Message Date
Max Neunhoeffer 5600a2bb22 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 15:34:10 +02:00
Max Neunhoeffer 11ace2de3a Fix registerTransaction in StandaloneTransactionContext. 2014-10-17 15:33:48 +02:00
Jan Steemann 3effea896c fixed wrong error code 2014-10-17 15:30:55 +02:00
Max Neunhoeffer de7c303c5d Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 
Conflicts:
	arangod/Aql/Query.cpp
 2014-10-17 15:26:50 +02:00
Max Neunhoeffer cb75b0b18a Sort out transactions in cluster, part I. 2014-10-17 15:25:46 +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
Jan Steemann d48f8d3ba4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-17 13:25:55 +02:00
Jan Steemann d4da8cb908 fixed arangosh 2014-10-17 13:25:49 +02:00
James fc4b128391 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 11:26:31 +01:00
James 380b118f11 more tests for distribute-in-cluster. 2014-10-17 11:26:23 +01:00
Heiko Kernbach 751812e483 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-17 12:14:32 +02:00
Heiko Kernbach 0d4b2c5af5 fixed a js bug 2014-10-17 12:14:14 +02:00
James 40114ef954 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 11:07:52 +01:00
James dcf427071c shardIds -> shardKeys in distribute to cluster. 2014-10-17 11:07:33 +01:00
James 7da7841f97 shardKeys method for Collection. 2014-10-17 11:06:57 +01:00
Jan Steemann 22bd5740ee Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-17 12:02:07 +02:00
Jan Steemann 2b68d83072 added enterContext and exitContext to Query 2014-10-17 12:01:50 +02:00
Heiko Kernbach 79852a79d0 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-17 11:56:38 +02:00
Heiko Kernbach b89583f34a #1053 - step1: now limiting returned arguments in documentation view for single document 2014-10-17 11:56:26 +02:00
Heiko Kernbach ab0d3e1732 added y value formatting for page faults values - dashboard 2014-10-17 11:33:13 +02:00
James 15e2c87823 Merge branches 'devel' and 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-17 10:22:33 +01:00
James 32f4216005 updating distribute-in-cluster opt rule 2014-10-17 10:22:26 +01:00
Max Neunhoeffer 7a25f20e23 Fix clone for AqlTransactions. 2014-10-17 11:02:37 +02:00
Jan Steemann c438ca5d93 made CSS slightly smaller 2014-10-17 10:58:43 +02:00
Jan Steemann a7f9714d53 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-17 10:35:21 +02:00
Jan Steemann 0aa02a696b pass ApplicationV8 to queries 2014-10-17 10:35:02 +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 80b9808646 refixed typo: a user is correct. 2014-10-17 08:38:21 +01:00
Max Neunhoeffer e4460501e7 Remove get context in RestAqlHandler. 2014-10-17 09:31:11 +02:00
Max Neunhoeffer d508812ec3 Silence a compiler warning. 2014-10-17 09:09:36 +02:00
Max Neunhoeffer 83ebd46652 Tell AqlTransaction constructor if transaction is main or sub. 
Only lock collections in AqlTransactions that are main ones.
 2014-10-16 23:59:02 +02:00
Max Neunhoeffer 183cd3eb40 Sort out temporary directory creation with individual names. 2014-10-16 20:08:21 +02:00
Jan Steemann bb0e11499d fixed races reported by helgrind 2014-10-16 19:32:14 +02:00
Jan Steemann ace7312c73 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-16 18:21:19 +02:00
Jan Steemann 9ba259af97 fixed failing tests 2014-10-16 18:21:13 +02:00
Jan Steemann 9311d74abc fixed failing tests 2014-10-16 18:19:32 +02:00
Thomas Schmidts fa19cb5d42 Fixed spelling error 2014-10-16 18:09:25 +02:00
Jan Steemann a6b237b06e whitespace 2014-10-16 17:41:50 +02:00
Jan Steemann 68fbe06c4b added missing files 2014-10-16 17:25:28 +02:00
Jan Steemann 912a8162fb some renaming 2014-10-16 17:23:50 +02:00
Max Neunhoeffer a231ca4c82 Finish some changes to transactions in AQL. 2014-10-16 16:46:39 +02:00
Max Neunhoeffer 743d7d127a Snapshot, does not compile, try to sort out transactions in AQL. 2014-10-16 16:41:32 +02:00
Jan Steemann 223820eba3 removed some macros 2014-10-16 16:31:49 +02:00
Jan Steemann 70c59a61fd removed macro 2014-10-16 16:28:18 +02:00
Jan Steemann 968234ece4 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-10-16 15:53:40 +02:00
Jan Steemann dcb9427b6f rewrote transaction contexts 2014-10-16 15:53:28 +02:00
Willi Goesgens 9e01c41c2a - List the right available test cases for single client/server 
- use our runInArangosh function instead of copying the code
 - only start an arangod if we know that we will try to run a test.
 2014-10-16 12:10:34 +02:00