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

15476 Commits

Author SHA1 Message Date
Heiko Kernbach abf221ed82 merge 2014-08-06 09:36:13 +02:00
Heiko Kernbach 2d1c62903d prep for import and export of aql queries 2014-08-06 09:35:45 +02:00
Michael Hackstein 4a815d6730 Added automatic retry file to karma tests 2014-08-06 09:20:55 +02:00
Michael Hackstein ba08d7e5fd Fixed a bug in cluster dashboard, which made it impossible to view the dashboard for a multi machine cluster. #883 2014-08-06 09:18:28 +02:00
Michael Hackstein 53abe18fe5 Fixed cluster dashboard on server failure 2014-08-06 09:18:19 +02:00
Michael Hackstein b3dedc10c9 Fixed a redircetion bug (Dead Coordinator -> Revive Coordinator -> Dead Coordinator -> Revive Coordinator) did not load cluster interface twice 2014-08-06 09:18:00 +02:00
Michael Hackstein 15f535ed61 Fixed a bug with retrying whenever the connection was lost 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
 2014-08-06 09:17:34 +02:00
Michael Hackstein 2a9c88e85b Added unreachable view 2014-08-06 09:16:50 +02:00
Michael Hackstein db5b7c2086 If no coordinator is available the interface will tell you. Screen needs to be prettified. Still some issues when interface comes back, null-pointer exceptions 2014-08-06 09:16:36 +02:00
Michael Hackstein 7aa7697ded Continued implementing async functionality in cluster dashboard 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:16:08 +02:00
Michael Hackstein 06e9a949d5 Cluster Servers and Coordinators are now working async. It is now possible to contact a cluster even if some of the coordinators are down 2014-08-06 09:14:42 +02:00
Michael Hackstein 9d85b25674 Started moving synchronous cluster implementation to asynchronous one. Synchronous is broken on some browsers as soon as one coordinator is dead 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/showClusterView.js
 2014-08-06 09:14:28 +02:00
Willi Goesgens f6f35cab9f Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-05 19:00:05 +02:00
Willi Goesgens a7d241cdd8 Split v8-vocbase.cpp into handy bits. 2014-08-05 18:59:40 +02:00
Jan Steemann 8b8346e81e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-05 18:41:00 +02:00
Jan Steemann a8c8560c6a fixed segfault 2014-08-05 18:40:42 +02:00
James 3e902323dd cleaning up. 2014-08-05 17:28:36 +02:00
Jan Steemann e7c10a2440 add a default sort node 2014-08-05 17:25:46 +02:00
Jan Steemann af288d9fe0 handle subqueries in the AST 2014-08-05 17:07:23 +02:00
Jan Steemann 1bb42c31e8 added comments 2014-08-05 16:13:25 +02:00
Jan Steemann 2471bee676 moved implementations to cpp files 2014-08-05 16:10:39 +02:00
Thomas Schmidts 7b3baba2e9 Added glossary to the documentation. Also linked the glossary keywords to the documentation 2014-08-05 15:49:21 +02:00
Max Neunhoeffer ccbcade0eb Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:47:39 +02:00
Max Neunhoeffer 7fee115990 Add a proper hash function for AqlValue objects. 2014-08-05 15:47:20 +02:00
James 5b044a3092 removing old code. 2014-08-05 15:46:51 +02:00
James a1222d394d Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:38:11 +02:00
James 86989711ce adding a method for toJson to AqlValue. 2014-08-05 15:36:15 +02:00
Max Neunhoeffer 758b7de263 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 15:26:40 +02:00
Max Neunhoeffer cab02853ef Fix two bugs with new ShapedJson register values. 2014-08-05 15:26:21 +02:00
Jan Steemann fe4d83e80b Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	Documentation/Books/Users/Aql/README.mdpp
	Documentation/Books/Users/AqlExtending/README.mdpp
 2014-08-05 15:09:28 +02:00
Jan Steemann ae04cb95d9 fixed compile errors 2014-08-05 15:04:42 +02:00
Thomas Schmidts 5d6c8a8971 changed width of summary block 2014-08-05 14:55:19 +02:00
James 1d912648cd removing previous use of queryResult.json in JS_ExecuteAql. 2014-08-05 14:43:51 +02:00
James fbc6ae2267 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 14:37:29 +02:00
James 6772762c60 preparing json return value for queryResult. 2014-08-05 14:37:08 +02:00
Max Neunhoeffer 5cbbd8a4c4 Fix barrier and documentCollection access in Expressions. 
Still does not link.
 2014-08-05 14:33:54 +02:00
Jan Steemann 7924c89a69 fix compile error 2014-08-05 13:56:26 +02:00
Jan Steemann 2003524a3d Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-05 13:52:17 +02:00
Jan Steemann d896089210 added helper method 2014-08-05 13:52:03 +02:00
Max Neunhoeffer 8d1ce3baf2 Copy document collection in slice and splice for AqlItemBlocks 2014-08-05 13:50:56 +02:00
Thomas Schmidts baf6635627 Added missing methods to fs module. fix #978 2014-08-05 13:37:40 +02:00
Max Neunhoeffer 135cce3250 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 13:24:22 +02:00
Jan Steemann 196441b9b4 improved v8 object generation 2014-08-05 13:23:37 +02:00
Max Neunhoeffer 96d8dcc054 Major cleanup, not yet working. 2014-08-05 12:29:36 +02:00
Max Neunhoeffer 4f466f2a09 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-05 11:05:57 +02:00
Max Neunhoeffer a9dac96bf3 Store AqlValue objects in AqlItemBlocks. 2014-08-05 11:05:24 +02:00
Jan Steemann 932aac9d06 added method signature 2014-08-05 10:58:58 +02:00
Jan Steemann 4a2d943d45 added helper methods 2014-08-05 10:56:37 +02:00
Jan Steemann 57f5590646 fixed scoping 2014-08-05 10:44:27 +02:00
Thomas Schmidts bf8ea5de4b Moved subsection troubleshooting from collections to arangodb shell 2014-08-05 10:32:45 +02:00