1
0
Fork 0
Commit Graph

312 Commits

Author SHA1 Message Date
Jan Steemann 64417d4423 Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding
Conflicts:
	arangod/V8Server/v8-vocbase.cpp
2014-01-21 09:29:45 +01:00
Michael Hackstein c7f86b3def Updated high-level js communication library for newest version of agency comm 2014-01-20 16:37:56 +01:00
Jan Steemann 9f69aae986 issue #736: AQL function to parse collection and key from document handle 2014-01-17 22:39:04 +01:00
Jan Steemann b0e4dc91dd adjusted listDatabases and doesDatabaseExist 2014-01-15 16:01:05 +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
Jan Steemann ce2627619e create collection stub 2014-01-14 16:21:48 +01:00
Jan Steemann 4ec6f04932 return collection properties 2014-01-14 13:19:43 +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
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
Michael Hackstein b00f9d1100 Added Diff for DBServers and Coordinators 2014-01-08 08:36:17 +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 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
Jan Steemann 3183e6d402 created global cluster object variables 2014-01-07 11:34:42 +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 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
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
Jan Steemann a7d9b3f578 added test for cluster helper functions 2014-01-03 16:04:40 +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
Jan Steemann 532a59d0a3 added agency locks 2014-01-03 13:52:54 +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
Jan Steemann 8070db37a2 changed heartbeat watch implementation 2014-01-02 13:36:26 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +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 7c4944de83 added --server.ssl-protocol option for client tools
Conflicts:
	arangosh/Benchmark/BenchmarkThread.h
	lib/GeneralServer/SslAsyncCommTask.h
2013-12-13 17:58:24 +01:00
Jan Steemann e7ba403998 added --server.ssl-protocol option for client tools 2013-12-13 17:53:51 +01:00
Jan Steemann 5b0713af9c added recursive watches and structured get 2013-12-12 11:16:41 +01:00
Jan Steemann 13bcc2bf7a Merge branch 'devel' of https://github.com/triAGENS/ArangoDB into sharding 2013-12-11 18:39:10 +01:00
Jan Steemann 025a11dbee fixed comments 2013-12-11 18:37:26 +01:00
Jan Steemann 620f4b1c47 added agency tests 2013-12-11 18:37:15 +01:00
Jan Steemann 44b3237882 moved server-only tests to js/server/tests
this hopefully removes some future confusion about the tests
also moved some graph stuff into js/common as client-side graphs did not fully work

make logfile path accessible
2013-12-04 22:05:00 +01:00
Jan Steemann c63655b64c make test more reliable 2013-12-04 20:38:07 +01:00
Jan Steemann 13b8b293bc increased test threshold 2013-11-25 09:40:51 +01:00