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

15315 Commits

Author SHA1 Message Date
Jan Steemann 2b85b04ce6 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-07 11:44:32 +02:00
Jan Steemann 8e229ec2b2 stringification of function parameters 2014-08-07 11:44:22 +02:00
James 7c7901fd5b added brief description of AqlItemBlock structure. 2014-08-07 11:16:07 +02:00
James 720285acfe Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 10:54:22 +02:00
James eef744c32e added new global function triagens::aql::CompareAqlValues. 
Also made associated changes in SortBlock.execute().
 2014-08-07 10:53:16 +02:00
Max Neunhoeffer baa54afc3b Sort out staticAnalysis for AggregateBlocks. 2014-08-07 10:52:22 +02:00
James 70c9b00745 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 
Conflicts:
	arangod/Aql/Types.h
 2014-08-07 09:53:42 +02:00
James 0a9502dae0 same as last. 2014-08-07 09:53:06 +02:00
Max Neunhoeffer 7956c69c69 Use two shapers in TRI_CompareShapeTypes 2014-08-07 09:51:24 +02:00
James aff67afef4 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-07 09:47:08 +02:00
James d15954fbdb working on comparison function for AqlValues. 2014-08-07 09:46:46 +02:00
Max Neunhoeffer c628a85bc8 Take out a cout. 2014-08-07 09:19:01 +02:00
Max Neunhoeffer b9a5377114 Implement JSON/SHAPED and SHAPED/JSON comparison by conversion. 2014-08-07 08:53:41 +02:00
Jan Steemann a324d8c6fc Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-06 18:37:52 +02:00
Jan Steemann dbf2842a28 much better exception handling 2014-08-06 18:37:37 +02:00
James d79c9f928c Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-06 17:36:23 +02:00
James 643e421585 adding compare() method for AqlValue. 2014-08-06 17:36:15 +02:00
Jan Steemann 7c226df013 handle calls to user-defined functions 2014-08-06 17:30:21 +02:00
Jan Steemann e8f69490ff optimize away function calls with const arguments 2014-08-06 17:15:36 +02:00
Jan Steemann a69da2fea3 Merge branch 'aql2' of https://github.com/triAGENS/ArangoDB into aql2 2014-08-06 16:19:55 +02:00
Jan Steemann 1015404edc working on AQL function calls and error handling 2014-08-06 16:19:43 +02:00
Max Neunhoeffer d07706674b Change signature of TRI_CompareShapedJson. 2014-08-06 15:23:48 +02:00
Max Neunhoeffer 7b65a958d8 Take care of static analyis case AggregateNode. 2014-08-06 15:13:22 +02:00
Heiko Kernbach e96a51f44d merge 2014-08-06 14:29:34 +02:00
Heiko Kernbach 64f3dba10c query view frontend 2014-08-06 14:28:54 +02:00
Max Neunhoeffer 70618ec768 Take out a cout. 2014-08-06 14:22:34 +02:00
Max Neunhoeffer 99a32a36b7 Fix bugs in SortBlock. 2014-08-06 14:14:32 +02:00
Jan Steemann dbe107ce65 jslint 2014-08-06 13:50:21 +02:00
Jan Steemann 55e0622e06 throw "real" exceptions when passing bad parameters to update/replace/remove/exists 2014-08-06 13:38:33 +02:00
James c645648b54 Merge branch 'aql2' of ssh://github.com/triAGENS/ArangoDB into aql2 2014-08-06 13:37:13 +02:00
James 5ac060e687 adding SortBlock, something not working. 2014-08-06 13:36:50 +02:00
Jan Steemann 91bbc5c30e Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into devel 2014-08-06 13:36:27 +02:00
Jan Steemann d2c5cd75db fix printing of multi-line output on Windows 2014-08-06 13:36:12 +02:00
Willi Goesgens 226790a353 v8-base splitting: adjust filenaming to the convention. 2014-08-06 12:54:24 +02:00
Willi Goesgens 52710f15cd Merge branch 'aql2' of github.com:triAGENS/ArangoDB into aql2 2014-08-06 12:51:29 +02:00
Willi Goesgens b068fa92ed v8-vocbase splitting: fix initialisation. 2014-08-06 12:49:59 +02:00
Michael Hackstein 919f713ca5 Added an upgrade cluster button when cluster is shutdown. And further adoption to asynchronous code 
Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/views/clusterDownView.js

Conflicts:
	js/apps/system/aardvark/clusterFrontend/js/collections/clusterShards.js
 2014-08-06 11:48:58 +02:00
Jan Steemann ac7b47c0b7 nullptr 2014-08-06 09:42:36 +02:00
Jan Steemann d623d1a0ab renamed things 2014-08-06 09:42:06 +02:00
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