1
0
Fork 0
Commit Graph

1278 Commits

Author SHA1 Message Date
Jan Steemann 4a805062bb changed internal APIs 2014-01-15 13:36:38 +01:00
Max Neunhoeffer ea3d3c0baa Add ConnectionManager. 2014-01-14 16:23:05 +01:00
Max Neunhoeffer f7a9acf592 Merge branch 'sharding' of ssh://github.com/triAGENS/ArangoDB into sharding 2014-01-14 15:05:41 +01:00
Max Neunhoeffer fc96df2244 Separate out ConnectionManager from ClusterComm. 2014-01-14 15:04:55 +01:00
Jan Steemann 9c63246d1c added TRI_SHARDING_COLLECTION_NOT_IMPLEMENTED macro 2014-01-14 14:04:29 +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 2cc44ba58e upgraded client version number 2014-01-14 13:27:35 +01:00
Max Neunhoeffer f50452259e Allow SimpleHttpClient to keep the connection open on destruction. 2014-01-14 12:52:03 +01:00
Max Neunhoeffer f7f8543fea Revert "Add stealConnection to SimpleHttpClient."
This reverts commit 3cf68a58526925d09556eaba2a3f4386563ffb31.
2014-01-14 12:44:21 +01:00
Max Neunhoeffer ebdc06c8b2 Revert "Fix bug in stealConnection."
This reverts commit f6fbcfcff07ebfe21364809d347fdc786689d57e.
2014-01-14 12:44:19 +01:00
Max Neunhoeffer 2e3f2132c3 Revert "One more change to SimpleHttpClient."
This reverts commit b8662d870e924de6d9a1ec0293937976b30701b2.
2014-01-14 12:44:12 +01:00
Max Neunhoeffer 2021240bc6 One more change to SimpleHttpClient. 2014-01-14 12:42:45 +01:00
Max Neunhoeffer 06999a5d25 Fix bug in stealConnection. 2014-01-14 09:44:27 +01:00
Max Neunhoeffer 4a66d69ad5 Add stealConnection to SimpleHttpClient. 2014-01-14 09:42:50 +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 5b965b2a21 added initialised() method 2014-01-07 17:50:52 +01:00
Jan Steemann bb7f550f7a for Michael... 2014-01-07 16:46:18 +01:00
Jan Steemann 9ce78430ac create collections, v0.0.0 2014-01-07 16:28:12 +01:00
Max Neunhoeffer 11e018e6b2 Make global ArangoClusterComm object in each thread. 2014-01-07 11:50:05 +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
Jan Steemann 3309743c1a moved some collection parameters around 2014-01-07 11:02:49 +01:00
Max Neunhoeffer 33d063d6d6 Start to move ClusterComm to JavaScript. 2014-01-06 16:18:24 +01:00
Jan Steemann 5571698555 serialize/unserialize collection data from agency 2014-01-03 19:04:50 +01:00
Max Neunhoeffer eb2afb2f04 Implement case distinction for create collection between cluster and not. 2014-01-03 16:17:34 +01:00
Max Neunhoeffer 6c36c268f0 Improve debugging output of ClusterComm asynchronous requests. 2014-01-03 09:36:37 +01:00
Jan Steemann d1bee4cf58 added functions to query the server state 2014-01-02 15:13:44 +01:00
Frank Celler 8dbdf55165 Merge remote-tracking branch 'origin/1.4' into devel
Conflicts:
	CHANGELOG
	arangosh/ArangoShell/ArangoClient.cpp
2013-12-30 17:27:17 +01:00
Frank Celler 9928cd645f added local config 2013-12-30 17:20:39 +01:00
Max Neunhoeffer 5d51d7b3ba Get rid of many debugging messages. 2013-12-30 14:49:14 +01:00
Max Neunhoeffer 3415e3c0c8 Some cleanup in asyncRequest setup. 2013-12-30 10:22:21 +01:00
Frank Celler 84507cfc44 merged changes from 1.4 back to devel 2013-12-27 14:59:23 +01:00
Max Neunhoeffer fec0c20012 Sort out one more allocation/deallocation issue. 2013-12-27 14:29:25 +01:00
Max Neunhoeffer 62976629f0 Various memory leaks and callback improvements. 2013-12-27 13:15:52 +01:00
Frank Celler 995a3b06da work-around for program-suffix 2013-12-23 18:02:06 +01:00
Max Neunhoeffer c9b2884def Full round trip implemented but not yet working. 2013-12-23 16:19:59 +01:00
Frank Celler a3ecc7cd5b fixed wrong type 2013-12-23 16:03:30 +01:00
Frank Celler f5759fa1b6 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-23 12:56:06 +01:00
Frank Celler 0a47caa535 fixed open mode for files 2013-12-23 12:12:13 +01:00
Frank Celler 36f29a573c fixed TRI_Basename 2013-12-22 23:57:42 +01:00
Frank Celler 2f28530bcc wrong prototype, wrong destroy 2013-12-22 15:41:15 +01:00
Frank Celler 9ac2e751c6 fixed wrong ifdefs and missing constructor for Logger 2013-12-22 14:58:51 +01:00
Frank Celler e30725e22d more file path normalisation 2013-12-22 13:27:33 +01:00
Frank Celler 9b49d60b0a fixed concatenate files 2013-12-22 12:45:54 +01:00
Frank Celler 2d5a8eb5ca added service functions 2013-12-22 00:48:31 +01:00
Frank Celler 87cc2c4104 Merge branch '1.4' of github.com:triAGENS/ArangoDB into 1.4 2013-12-21 13:10:15 +01:00
Frank Celler 12fcc9a025 added TRI_LocateInstallDirectory 2013-12-21 13:09:44 +01:00
Frank Celler 1ef596733d arangosh now uses config file name corresponding to binary name 2013-12-20 23:49:16 +01:00
Jan Steemann 16e16f705c some bugfixes for asyncRequest etc 2013-12-20 18:03:55 +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