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

4692 Commits

Author SHA1 Message Date
Jan Steemann c93c952c05 fixed from/to-handling in cluster 2014-10-20 12:32:08 +02:00
Jan Steemann 04d5f5dfdd fixed segfault 2014-10-20 10:50:31 +02:00
Frank Celler 1cdf01970e Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-10-20 10:12:35 +02:00
Jan Steemann 4cbb5ea939 fixed wrong if statement 2014-10-20 09:58:46 +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
Frank Celler 05c6b645df fixed authentication 2014-10-20 09:29:57 +02:00
Max Neunhoeffer feef5140a7 Merge branch 'devel' of ssh://github.com/triAGENS/ArangoDB into devel 2014-10-20 09:14:37 +02:00
Max Neunhoeffer 6eb2073336 Rename VarOverview into RegisterPlan, because that is what it is. 2014-10-20 09:14:01 +02:00
Max Neunhoeffer db7b23bdb8 Fix cloning of VarOverview. 2014-10-20 09:04:32 +02:00
Jan Steemann 648274f30a removed HTTP DELETE handler 2014-10-20 08:52:44 +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 e6f10b374b more cleanup 2014-10-18 01:39:47 +02:00
Jan Steemann 40ddb93eee flush log at shutdown 2014-10-18 00:44:44 +02:00
Jan Steemann 19502fee8e fixed some tests 2014-10-17 18:50:00 +02:00
Jan Steemann 946ab83c42 fixed bug in code generation 2014-10-17 16:13:36 +02:00
Jan Steemann 42c91307ec handlescope 2014-10-17 15:56:03 +02:00
Jan Steemann 026fc2b83a next attempt to fix v8 context handling 2014-10-17 15:47:39 +02:00
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
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 2b68d83072 added enterContext and exitContext to Query 2014-10-17 12:01:50 +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 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
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 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