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

2897 Commits

Author SHA1 Message Date
Michael Hackstein d0265724a3 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:23:35 +01:00
Michael Hackstein f95c3dfa79 First version of primary server view in the cluster 2014-01-16 15:23:28 +01:00
Jan Steemann c9dabaca86 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:02:44 +01:00
Max Neunhoeffer 5b4a0bf3c2 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-16 15:01:53 +01:00
Max Neunhoeffer 5960c103bc Create/drop Database/Collection compiles. 2014-01-16 15:01:36 +01:00
Jan Steemann 334cd51e6f include console 2014-01-16 15:01:07 +01:00
Jan Steemann a987647bd2 handle state changes 2014-01-16 14:52:40 +01:00
Frank Celler d0c05f6628 fixed issue #734: foxx cookie and route problem 2014-01-16 14:16:47 +01:00
Frank Celler 87009c7e6e added missing db prefix 2014-01-16 14:08:45 +01:00
Frank Celler c2c574d828 added missing encoding 2014-01-16 14:08:28 +01:00
Jan Steemann 657406bb70 fixed jslint warnings 2014-01-15 18:15:38 +01:00
Jan Steemann f760d056df added startupPath value to result of /_api/foxx/config 
Conflicts:
	js/actions/api-foxx.js
 2014-01-15 18:10:26 +01:00
Jan Steemann db0c6dacae added test 2014-01-15 18:09:56 +01:00
Jan Steemann d8ac4046f8 added fm.configJson method 2014-01-15 18:07:47 +01:00
Jan Steemann 72902b2e62 fixed jslint warnings 2014-01-15 18:06:17 +01:00
Jan Steemann cfdbb1996e added startupPath value to result of /_api/foxx/config 2014-01-15 18:05:27 +01:00
Jan Steemann 231e277113 added fm.configJson method 2014-01-15 17:54:59 +01:00
Michael Hackstein 4a2d874678 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 17:14:35 +01:00
Michael Hackstein 3421822f0e First version of server view displaying pairs of db servers. Design missing 2014-01-15 17:13:59 +01:00
Michael Hackstein a4e500ebf5 Improved the overview and added a seperate coordinators view, it is actually completely different compared to db servers 2014-01-15 17:08:56 +01:00
Jan Steemann b0e4dc91dd adjusted listDatabases and doesDatabaseExist 2014-01-15 16:01:05 +01:00
Michael Hackstein 6feeab89b6 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-15 14:50:10 +01:00
Michael Hackstein bb1a12c76b Finished first version of Cluster Overview using fake data. User now gets a prominent overview over his cluster and can decide if coordinators or databases are effected by failures 2014-01-15 14:49:56 +01:00
Frank Celler 39ea33a68e release version 1.4.5 2014-01-15 14:35:35 +01:00
Jan Steemann fcb545d268 removed unused methods 2014-01-15 14:00:42 +01:00
Jan Steemann e02b0b52e1 renamed methods 2014-01-15 10:52:56 +01:00
Michael Hackstein b0419841f8 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 17:19:06 +01:00
Michael Hackstein ab54081b72 Moved more button-styling to buttons css, except third-party libs all should be there now 2014-01-14 17:18:57 +01:00
Michael Hackstein 5622b1a1f4 Added Headlines to all cluster columns 2014-01-14 17:18:02 +01:00
Jan Steemann 2aba046c7d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 16:21:57 +01:00
Jan Steemann ce2627619e create collection stub 2014-01-14 16:21:48 +01:00
Michael Hackstein 8816bfab14 Fixed merge confilct 2014-01-14 15:01:17 +01:00
Michael Hackstein e4976723b6 Added the cluster dashboard to hidden route, will not yet be reachable via navigation 2014-01-14 14:57:25 +01:00
Michael Hackstein 8948b87f12 Added the Cluster Dashboard to the karma tests 2014-01-14 14:55:52 +01:00
Michael Hackstein 6b8333207b Added first implementation of the Cluster Dashboard. Functionality is basic, displayed data is faked and design is comming soon 2014-01-14 14:52:52 +01:00
Jan Steemann b1c4f75e50 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-14 13:29:07 +01:00
Jan Steemann 4ec6f04932 return collection properties 2014-01-14 13:19:43 +01:00
Frank Celler 30252c1877 Merge pull request #731 from pluma/error-response-error-names 
Added support for error names instead of error types
 2014-01-14 00:27:39 -08:00
Jan Steemann f8c50ade6e force reloading of user functions 2014-01-13 17:50:36 +01:00
Jan Steemann 8ea145cd8f force reloading of user functions 2014-01-13 17:49:44 +01:00
Jan Steemann 50105fc0d9 fixed error in index documentation 2014-01-13 17:30:08 +01:00
Jan Steemann f3dd1431a8 Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 2014-01-13 17:26:20 +01:00
Jan Steemann 7458abceda fixed error in index documentation 2014-01-13 17:02:09 +01:00
Frank Celler 9a68feaa98 release version 1.4.5-rc2 2014-01-13 14:34:55 +01:00
Michael Hackstein 4bb630b030 Further additions to router tests 2014-01-12 22:05:41 +01:00
Michael Hackstein 93065b4a3d Added some more tests to web-interface router. Some routes are tested now. Fixed some minor bugs during tests 2014-01-12 14:44:21 +01:00
Alan Plum d055c778d4 Added support for error names instead of error types. 2014-01-11 21:37:59 +01:00
Frank Celler 13d1e5e5ab Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 12:02:25 +01:00
Frank Celler 2fd7bfcbc3 Merge pull request #727 from pluma/manifest-lib-default-local 
App requires should be module-relative by default. Fixes #721
 2014-01-11 02:35:31 -08:00
Jan Steemann 22a7f3e083 a few small corrections in the upload web interface 2014-01-10 18:38:12 +01:00
Jan Steemann 0e5c9c8a85 a few small corrections in the upload web interface 2014-01-10 18:05:06 +01:00
Michael Hackstein 9f3479f5b6 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	utils/Makefile.files
 2014-01-10 17:41:52 +01:00
Michael Hackstein 2d36879ab2 Updated the WebFrontend Font, this version is now at least rendered on Windows/Chrome+FF 2014-01-10 17:30:47 +01:00
Michael Hackstein 1302662f6d Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-10 17:30:14 +01:00
Michael Hackstein 583268c058 Updated API Documentation of the aardvark itself. The API Documentation is now Documenting itself properly 2014-01-10 17:30:08 +01:00
Jan Steemann f95a0dc6c1 defer evaluation of subqueries 2014-01-10 16:45:36 +01:00
Jan Steemann 269e50eb8f defer evaluation of logical operators 2014-01-10 16:45:07 +01:00
Jan Steemann a9c2dcc83d Merge branch '1.4' of https://github.com/triAGENS/ArangoDB into 1.4 
Conflicts:
	CHANGELOG
 2014-01-10 16:43:18 +01:00
Jan Steemann dc8fdf8ca0 defer evaluation of subqueries 2014-01-10 16:42:46 +01:00
Michael Hackstein e547a87c2d Updated the WebFrontend Font, this version is now at least rendered on Windows/Chrome+FF 2014-01-10 16:00:21 +01:00
Michael Hackstein 7d86b21a43 Merge branch 'devel' of github.com:triAGENS/ArangoDB into devel 2014-01-10 15:59:35 +01:00
Michael Hackstein dc6f83d561 Updated the WebFrontend Font, this version is now at least rendered on Windows/Chrome+FF 2014-01-10 15:59:28 +01:00
Jan Steemann 8277e7582c defer evaluation of logical operators 2014-01-10 10:58:30 +01:00
Frank Celler 005144ff05 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 23:07:38 +01:00
Frank Celler 9582ea8c94 Merge pull request #723 from pluma/npm-default-package-main 
Default package "main" to "index". Fixes #719.
 2014-01-09 14:05:06 -08:00
Alan Plum 1a5f4c98f2 Fixed package file resolution. Fixes #718, #720. 2014-01-09 23:03:30 +01:00
Alan Plum 3d511060ce App requires should be module-relative by default. Fixes #721 2014-01-09 22:06:57 +01:00
Alan Plum 6c0f9ef6b0 Fixed package file resolution. Fixes #718, #720. 2014-01-09 19:06:15 +01:00
Alan Plum 1b72d07efc Default package "main" to "index". Fixes #719. 2014-01-09 18:17:20 +01:00
Max Neunhoeffer 57f18783c4 Implement asking for databases in a cluster. 2014-01-09 14:56:44 +01:00
Max Neunhoeffer e809630bfc Remove unnecessary double check. 2014-01-09 10:37:55 +01:00
Michael Hackstein cccc98e6af JSLint fix 2014-01-08 13:50:07 +01:00
Michael Hackstein 7c2cd74798 Added Internal documentation for agency communication 2014-01-08 10:18:34 +01:00
Jan Steemann 7a3635adf9 fixed problem with AQL functions in multiple databases 2014-01-08 09:53:03 +01:00
Jan Steemann 56054d3e66 fixed problem with AQL functions in multiple databases 2014-01-08 09:51:56 +01:00
Michael Hackstein 1d47e5c901 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-08 08:36:23 +01:00
Michael Hackstein b00f9d1100 Added Diff for DBServers and Coordinators 2014-01-08 08:36:17 +01:00
Jan Steemann 8070f9a04f Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-07 17:51:16 +01:00
Jan Steemann 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Michael Hackstein 6998e4b2ce Fixed discrepancies between simulated Agency and real Agency communicating with the Agency. 2014-01-07 17:38:46 +01:00
Michael Hackstein 65bb8d2ae3 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-07 16:47:13 +01:00
Michael Hackstein 92488ab916 Updated to flat version of agency.list and JSLint fixes 2014-01-07 16:40:21 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Jan Steemann 45a5296e9e make agency.list() return a flat list if requested 2014-01-07 16:24:54 +01:00
Michael Hackstein f7183d6d5a Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-07 15:38:47 +01:00
Michael Hackstein 000260d701 Added Sync and convenience functions in high level agency communication 2014-01-07 15:38:41 +01:00
Jan Steemann 5a365cb2b1 removed shardLocation key 2014-01-07 14:00:27 +01:00
Max Neunhoeffer 4d329f477a Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-07 11:56:25 +01:00
Jan Steemann 7c5d145503 added documentation 2014-01-07 11:52:17 +01:00
Jan Steemann 141498e619 added /_admin/test 2014-01-07 11:50:53 +01:00
Max Neunhoeffer bbf28e3501 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 
Conflicts:
	arangod/Cluster/v8-cluster.cpp
 2014-01-07 11:45:43 +01:00
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +01:00
Max Neunhoeffer e21431cbd4 Allow /_admin/execute to return raw JSON. 2014-01-07 11:32:21 +01:00
Michael Hackstein 9b2cf1abe8 Added options to move shards in high level agency communication 2014-01-07 11:29:39 +01:00
Michael Hackstein 976ed07007 Added read collection/shard information to high level agency communication and massive code cleanup. 2014-01-07 11:13:35 +01:00
Jan Steemann 3309743c1a moved some collection parameters around 2014-01-07 11:02:49 +01:00
Jan Steemann 5c0e6e12e0 added tests for serverstate and clusterinfo 2014-01-06 18:19:14 +01:00
Michael Hackstein 5bfb936e02 Added plan Coordinators and DatabaseList to high level agency communication. 2014-01-06 13:40:36 +01:00
Jan Steemann 7fcabc2cbf Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-06 13:18:12 +01:00
Jan Steemann 4de2b916c4 added test for uniqid 2014-01-06 13:18:01 +01:00
Michael Hackstein 7605b33dd3 Added current Coordinators and DBservers to high level agency communication 2014-01-06 12:49:57 +01:00
Max Neunhoeffer 30415c6a73 Cleanup conversion C++ <-> Javascript of HttpRequest/HttpResponse. 2014-01-06 11:40:49 +01:00
Jan Steemann 02a84a4f92 allow functions results as parameters in all function calls 2014-01-06 11:15:48 +01:00
Jan Steemann ca1e6288a2 allow functions results as parameters in all function calls 2014-01-06 11:14:54 +01:00
Michael Hackstein 7b745854db Added target Coordinators and DatabaseList to high level agency communication. 2014-01-06 09:18:56 +01:00
Michael Hackstein 5bed79017e Optimized readability of routes in agency-comm tests 2014-01-06 00:01:25 +01:00
Michael Hackstein 17cbbcd092 Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-03 17:11:05 +01:00
Michael Hackstein ad99e44223 Started implementing of highlevel js agency communication. Right now it is possible to change the target by adding/removing Database servers 2014-01-03 17:10:57 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +01:00
Jan Steemann a7d9b3f578 added test for cluster helper functions 2014-01-03 16:04:40 +01:00
Jan Steemann 486bdc2d41 fixed jslint warnings 2014-01-03 15:49:37 +01:00
Jan Steemann f657e2c943 added cluster helper functions 2014-01-03 15:49:20 +01:00
Jan Steemann 3176c772cf allow locking/unlocking of arbitrary keys 2014-01-03 15:18:48 +01:00
Jan Steemann 84c46ddb4d added agency.list() 2014-01-03 15:11:03 +01:00
Frank Celler 5455f2eeee release version 1.4.5-rc1 2014-01-03 15:00:51 +01:00
Jan Steemann 03b55488b6 fixed client-side implementation of function registration 2014-01-03 13:58:35 +01:00
Jan Steemann 3023521535 fixed client-side implementation of function registration 2014-01-03 13:58:01 +01:00
Jan Steemann a4efa9fe1b Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-03 13:53:08 +01:00
Jan Steemann 532a59d0a3 added agency locks 2014-01-03 13:52:54 +01:00
Jan Steemann 91c52a3a2e fixed potential deadlock in global context execution 2014-01-03 13:47:11 +01:00
Jan Steemann ef84ba6705 fixed potential deadlock in global context execution 2014-01-03 13:45:43 +01:00
Jan Steemann 1dd385f52d use `--data-binary` instead of `--data` in curl examples 2014-01-03 12:12:54 +01:00
Max Neunhoeffer 2a0c85bc07 Finish documentation of ClusterComm test API call. 
Also fix bug in synchronous mode test.
 2014-01-03 11:36:05 +01:00
Michael Hackstein ea2a93103a Merge branch 'sharding' of https://github.com/triAGENS/ArangoDB into sharding 2014-01-02 18:05:26 +01:00
Michael Hackstein 920f5e6d4b Updated JSUnity, now equalitycheck for objects does not care for ordering anymore 2014-01-02 18:05:21 +01:00
Jan Steemann 87c1897c23 added lock and unlock functions, yet untested 2014-01-02 18:03:08 +01:00
Jan Steemann c48d54c49b conditional execution of agency tests 2014-01-02 17:22:37 +01:00
Michael Hackstein ccd231551e Moved the content a bit mor to the top 2014-01-02 14:01:52 +01:00
Michael Hackstein 605d6e9483 Moved the content a bit mor to the top 2014-01-02 14:00:09 +01:00
Jan Steemann 8070db37a2 changed heartbeat watch implementation 2014-01-02 13:36:26 +01:00
Max Neunhoeffer 95f94397b0 Add synchronous request to ClusterComm. 2013-12-30 23:21:41 +01:00
Max Neunhoeffer bd03094ba9 Better error handling in sharding test. 2013-12-30 15:23:31 +01:00
Max Neunhoeffer 5d51d7b3ba Get rid of many debugging messages. 2013-12-30 14:49:14 +01:00
Max Neunhoeffer c8b684dbd6 Generic test function for ClusterComm working. 2013-12-30 14:37:03 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00
Max Neunhoeffer 9801cc9d19 Timeout basically working. 2013-12-27 16:18:56 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Frank Celler 684464c935 release version 1.4.4 2013-12-24 10:15:45 +01:00
Frank Celler 046eb9df9d release version 1.4.4-rc1 2013-12-22 18:28:12 +01:00
Frank Celler 2e3956856e generated files 2013-12-22 14:59:37 +01:00
Jan Steemann b903d9080d Merge remote-tracking branch 'origin/devel' into sharding 
Conflicts:
	js/apps/system/aardvark/test/karma/karma.conf.js
 2013-12-20 15:35:50 +01:00
Jan Steemann 8bc1692d54 fixed issue #711, #687 2013-12-20 15:13:23 +01:00
Jan Steemann 55deb10126 fixed issue #711, #687 2013-12-20 15:12:21 +01:00
Max Neunhoeffer bfbbe18c57 Create a testing possibility for ClusterComm. 2013-12-19 11:33:34 +01:00
Jan Steemann 5d5035ed3a fixed JS error 2013-12-18 16:24:03 +01:00
Jan Steemann 2c8ef0125f ported web interface changes from devel to 1.4 2013-12-18 16:22:16 +01:00
Michael Hackstein ec83539390 The start view of the graph viewer now offers support for multiple label/colour attributes 2013-12-18 09:36:05 +01:00
Michael Hackstein bf520f652f GraphViewer it is now possible to define a list of label attributes and colour attributes 2013-12-17 23:25:06 +01:00
Michael Hackstein d3be3c37b8 GraphViewer: Nodes can now be coloured by a list of attributes also. Still Missing Interface 2013-12-17 11:04:05 +01:00
Michael Hackstein 521314c73a The nodeshaper will now cut down long word labels. Also it is able internally use an array of label attributes. TODO: Add list to colours and offer interface for it 2013-12-17 09:57:40 +01:00