1
0
Fork 0
Commit Graph

193 Commits

Author SHA1 Message Date
Kaveh Vahedipour 610578ec03 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 15:50:06 +02:00
Kaveh Vahedipour aaf49fcdf4 removing strigified json from agencycomm 2016-04-22 15:50:02 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Max Neunhoeffer db7041db1e Fix transaction management in AgencyComm. 2016-04-21 16:52:36 +02:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Jan Steemann a071a2ffe2 fixed startup race 2016-04-15 12:01:14 +02:00
Jan Steemann 0073a86228 fix potential agency initialization race 2016-04-15 10:45:50 +02:00
Jan Steemann 46e5150272 micro optimizations 2016-04-14 20:57:24 +02:00
Andreas Streichardt 23af9480f6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-14 18:18:16 +02:00
Andreas Streichardt 612c387c56 Optimize version increase stuff 2016-04-14 18:17:25 +02:00
Kaveh Vahedipour 333d53e733 store's operator handling on non-keyword 'op' and consistent handling of keys as paths 2016-04-14 17:29:46 +02:00
Max Neunhoeffer c71788ef32 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 16:51:01 +02:00
Max Neunhoeffer bd1fd8fc3d Fix AgencyComm::getValues. 2016-04-14 16:50:46 +02:00
Andreas Streichardt 7a8f101cfc Merge branch 'devel' into agency 2016-04-14 15:31:14 +02:00
Andreas Streichardt 10461fe369 Fix cluster shutdown time 2016-04-14 15:30:19 +02:00
Max Neunhoeffer 87197cd843 Fix lock() in AgencyComm. 2016-04-14 13:30:07 +02:00
Andreas Streichardt 1794be7c30 Version is now an Uint64 consistently 2016-04-14 13:29:36 +02:00
Andreas Streichardt a9b282a231 Init done in one step 2016-04-14 13:12:57 +02:00
Andreas Streichardt b03d4e610a Remove watchValue from agency 2016-04-13 15:42:23 +02:00
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Kaveh Vahedipour a315997617 callback redesign 2016-04-07 10:20:08 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00
Kaveh Vahedipour 062a759bca Merge branch 'agency' of https://github.com/arangodb/arangodb into devel 2016-04-04 12:13:48 +00:00
Andreas Streichardt e5850658fb Merge branch 'devel' of github.com:arangodb/arangodb into agency 2016-04-04 13:36:22 +02:00
Frank Celler 6002ede1c4 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-03 21:46:30 +02:00
Andreas Streichardt 983c6f1b7e Merge branch 'agency' of github.com:arangodb/arangodb into agency 2016-04-01 17:21:42 +02:00
Andreas Streichardt 70d6f1259a Finally cluster is working with the new agency 2016-04-01 17:07:28 +02:00
Frank Celler 068f9defd7 splitted HttpResponse.h 2016-04-01 10:39:38 +02:00
Andreas Streichardt b2fc192dd2 implement new agency 2016-03-31 14:03:01 +02:00
Frank Celler 295c8a3809 MSVC fixes 2016-03-31 14:01:23 +02:00
Frank Celler 486011d399 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-03-31 13:41:09 +02:00
Frank Celler 494bdca847 splitted HttpRequest into GeneralRequest/HttpRequest 2016-03-31 11:45:21 +02:00
Andreas Streichardt efa2c658bb Remove obsolete addEndpoints 2016-03-29 13:44:15 +02:00
Frank Celler 86fe838a68 new logger 2016-03-22 21:09:48 +01:00
jsteemann 279fb105e2 cppcheck 2016-03-09 22:57:49 +01:00
Jan Steemann b393c3d9bb Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-03-09 09:42:10 +01:00
Frank Celler dfa9047484 switch arangosh to new ApplicationFeatures and ProgramOptions 2016-03-08 23:32:43 +01:00
Jan Steemann 78f07c6a31 less json 2016-03-03 14:23:39 +01:00
Jan Steemann e1745608e3 inject attribute translator everywhere 2016-02-25 11:13:32 +01:00
jsteemann 851d19a9d6 logging simplifications 2016-02-25 00:00:18 +01:00
Andreas Streichardt 370dbebec8 Allow existing directories during init 2016-02-24 17:31:14 +01:00
Andreas Streichardt 63b2cdbe1b fix code review comments 2016-02-04 13:40:15 +01:00
Andreas Streichardt 9e7beb9a6e Change LOG WARNING and ERROR 2016-02-04 11:43:10 +01:00
Andreas Streichardt f096580706 Merge remote-tracking branch 'upstream/devel' into initializecluster 2016-02-04 11:37:02 +01:00
Andreas Streichardt adce528373 Proper initialization
Also find a fitting spot for our role
2016-02-04 11:29:43 +01:00
Andreas Streichardt e5ec93223f Oops ... fix signature 2016-02-01 19:05:05 +01:00
Andreas Streichardt b8204d0f3c initialize cluster structure 2016-02-01 18:59:01 +01:00
Jan Steemann b7abf5a40d attempt to fix Windows build 2016-02-01 12:04:28 +01:00
jsteemann 2d7323a560 fixed warnings shown by clang-3.7 2016-01-31 02:17:36 +01:00
jsteemann ff21453255 logger transition: all files in arangod exception transactions.cpp 2016-01-29 23:28:44 +01:00
Michael Hackstein 436c377cb5 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-29 14:01:53 +01:00
Andreas Streichardt 54569ac01a Wait for agency to come up 2016-01-28 18:13:23 +01:00
Jan Steemann 9046e1831b clang-format 2016-01-27 13:43:46 +01:00
Jan Steemann 3fc862f0ef changed locking macros 2016-01-26 15:39:12 +01:00
Michael Hackstein 18b66d5c83 Removed TRI_json_t entirely from AgencyComm. Also no legacy support anymore. 2016-01-25 16:39:56 +01:00
Michael Hackstein 5b48989e8b Fixed bug in agency. Index was not read correctly 2016-01-25 10:42:23 +01:00
Michael Hackstein 191c2dc3a9 Merge branch 'devel' of github.com:arangodb/arangodb into vpack 2016-01-21 16:29:38 +01:00
jsteemann 842384016d namespace cleanup 2016-01-21 00:20:22 +01:00
Michael Hackstein 77b12f872f Explicitly deleted TRI_Json_t sending requests in Agency. To avoid invoking the wrong function again 2016-01-20 14:47:56 +01:00
Michael Hackstein 636d284607 Removed debug output 2016-01-20 14:20:50 +01:00
Michael Hackstein 3c6ac9f38f Removed all TRI_json_t inputs to AgencyComm and replaced them by VPack. This commit stil has an error s.t. indexes cannot be dropped in Cluster. WIP. 2016-01-20 12:53:55 +01:00
Michael Hackstein 1edd5b3007 Now AgencyComm only communicates via VPack to Agency. A mix of TRI_json_t and VPack is impossible do to different ordering when comparing values 2016-01-19 15:37:48 +01:00
Michael Hackstein 7f4980e87d Cluster internal communication now uses more VPack instead of TRI_json_t 2016-01-19 11:33:43 +01:00
Michael Hackstein 8a1b105986 Increasing versions in AgencyComm now uses VelocyPack (breaking change, uint64_t is not stored as strings any more 2016-01-17 12:39:43 +01:00
Michael Hackstein b2b73bc57d Server State in Cluster is now send as VelocyPack 2016-01-17 12:31:31 +01:00
Michael Hackstein c76c7df2aa Cluster Version counter nwo use VPack internally 2016-01-17 12:28:19 +01:00
Michael Hackstein bb4e1156ad AgencyLocker now internally uses VPack instead of TRI_json_t 2016-01-17 12:22:05 +01:00
jsteemann 431900f17a changed namespace from triagens to arangodb 2016-01-17 00:44:53 +01:00
Michael Hackstein fc8b45b06f Parsing the result in cluster is now done through VPack 2016-01-16 23:43:02 +01:00
Michael Hackstein e1a63aa5a0 Agency comm errorCode und Message are now parsed via VelocyPack. 2016-01-16 23:24:36 +01:00
jsteemann f66eb007cd some const unification 2016-01-15 00:03:03 +01:00
jsteemann 9f0576c65f don't rely so much on namespace std being present 2016-01-08 01:05:06 +01:00
Jan Steemann 3ad20c0cae auto-generated headers 2016-01-06 18:41:51 +01:00
Jan Steemann a3b026d9d1 removed useless sections from code, unified include guards 2016-01-06 14:15:22 +01:00
Jan Steemann f422576ee0 clang-format 2016-01-05 17:43:24 +01:00
Max Neunhoeffer 225c8cd843 Work on TODOs. 2015-12-22 16:50:09 +01:00
Max Neunhoeffer a0f6a3c9db Merge branch 'devel' into ClustUp1 2015-12-08 23:21:46 +01:00
Max Neunhoeffer 6cedb210df First try to fix deadlock problem. Tests not yet tried. 2015-12-08 18:54:05 +01:00
Max Neunhoeffer a674ff9629 Use no pretty printing in agency communication for VelocyPack. 2015-12-07 14:52:53 +01:00
Max Neunhoeffer 60df924ac1 Change data structures for collections in Agency.
Snapshot, compiles, untested, needs new VelocyPack.
2015-12-04 15:08:47 +01:00
Alan Plum 7538d71333 URL parameter -> {query,path} parameter 2015-11-24 18:09:43 +01:00
Max Neunhoeffer af3cb6868f Increase timeouts for larger clusters. 2015-11-10 10:21:36 +01:00
Jan Steemann efe643aee9 unique_ptr'ed 2015-07-31 15:55:56 +02:00
Jan Steemann dfd31975f6 potential fix 2015-07-31 14:57:32 +02:00
Jan Steemann 20c96b5e46 removed locks 2015-07-21 17:34:57 +02:00
Jan Steemann 4c7994597a cppcheck 2015-06-02 22:49:22 +02:00
Willi Goesgens 66c6fe6e2c When shutting down the Agency, don't delete connections which are just busy. 2015-05-06 18:05:55 +02:00
Willi Goesgens 8a407c6576 Give the Agency more time to reply before we retry. 2015-02-26 15:24:47 +01:00
Jan Steemann b54dfae96f removed several JSON functions 2015-01-13 01:31:04 +01:00
Jan Steemann 20e7fe7a7a the great rename: array => object, list => array 2014-12-18 21:07:06 +01:00
Willi Goesgens 26a0ce441c nullptr 2014-10-29 19:11:48 +01:00
Jan Steemann 8bb213e7ba sort and cache list expression values
emplace

fixed wrong assertion
2014-10-29 01:02:20 +01:00
Jan Steemann 13d240384f less namespace pollution 2014-10-28 00:24:37 +01:00
Jan Steemann 3c05701851 nullptr 2014-10-23 22:50:53 +02:00
Jan Steemann 506936dcdb rename orgy 2014-09-13 02:35:13 +02:00
Jan Steemann 87afcf5e8d the great rename 2014-09-13 00:10:11 +02:00
Frank Celler 4dcf5dc817 updated disclaimer 2014-06-20 16:40:35 +02:00