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

1233 Commits

Author SHA1 Message Date
Andreas Streichardt 4d13e8fb1b _listDatabases() => _databases() 2016-05-11 15:30:47 +02:00
jsteemann d6e9b7b38b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-11 15:01:10 +02:00
jsteemann 3f1516eca7 bugfixes 2016-05-11 15:01:06 +02:00
Max Neunhoeffer 73bdf4b8b5 More silence at startup. 2016-05-11 14:48:31 +02:00
Max Neunhoeffer 071c51abe4 A paranoid change to avoid a use after free. Fixed a typo. 2016-05-11 14:48:12 +02:00
Max Neunhoeffer f41ab22098 Change a few startup messages from level INFO to DEBUG. 2016-05-11 11:42:33 +02:00
Jan Steemann 912383ca68 cppcheck 2016-05-10 20:13:55 +02:00
jsteemann 213ade22a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-10 19:01:30 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
Andreas Streichardt e88daf35c0 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 18:42:51 +02:00
Andreas Streichardt 2c7b7450e1 handlePlanChange() will now use the cache 2016-05-10 18:42:30 +02:00
jsteemann 30525fccee use StaticStrings 2016-05-10 17:01:34 +02:00
Max Neunhoeffer 39ecd9fd13 Rename prefix and prefixStripped in AgencyComm. 2016-05-10 16:00:07 +02:00
Max Neunhoeffer 825f010980 Rename getValues2 to getValues. 2016-05-10 15:52:54 +02:00
Max Neunhoeffer d44546296d Remove AgencyComm::getValues() for good and purge TRI_json_t in ClusterInfo. 2016-05-10 15:43:58 +02:00
Michael Hackstein ffb5ec8159 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-10 14:47:27 +02:00
Jan Steemann 4f138ce0f1 fixed handling of feature startup failures 2016-05-10 12:28:25 +02:00
jsteemann 0be8fddf12 fixed shutdown race 2016-05-09 18:34:14 +02:00
Michael Hackstein 77c4ae5738 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 17:50:19 +02:00
Andreas Streichardt f4a417bd9c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 17:49:34 +02:00
Andreas Streichardt 7f3af843fc Remove currentCollectionsProt 2016-05-09 17:49:18 +02:00
Michael Hackstein ba614c1a6a Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 17:49:00 +02:00
Michael Hackstein e9787018b3 The Pattern matching now allows a minDepth of 0 and even a complete search of depth 0. 2016-05-09 17:48:55 +02:00
Max Neunhoeffer a16c7e8f30 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 16:55:59 +02:00
Max Neunhoeffer d1e5b65737 Two fewer AgencyComm::getValues() calls. 2016-05-09 16:55:42 +02:00
Andreas Streichardt a69e7808c2 Fix unused variables 2016-05-09 16:25:20 +02:00
Andreas Streichardt 64c8c2d8ae Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 15:46:02 +02:00
Max Neunhoeffer 409ae6f7cd Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-09 15:43:08 +02:00
Max Neunhoeffer b571bf535d Fix AgencyComm. 
Result code precondition failed was overwritten with 200,
breaking all casValue calls.
 2016-05-09 15:37:57 +02:00
Kaveh Vahedipour 37c0ec4f54 more complete verbose output on custercomm connections 2016-05-09 15:05:33 +02:00
Andreas Streichardt 2fd528bb21 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 14:46:41 +02:00
Kaveh Vahedipour 5f2c72c4a9 broken sendTransactionWithFailover sent 200 regardless of actual error 2016-05-09 14:43:57 +02:00
Michael Hackstein ab13d1e3a6 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 13:45:20 +02:00
Andreas Streichardt 97a83e91c5 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-09 13:38:38 +02:00
Andreas Streichardt 3e42435c46 No more loadCurrentCollections() 2016-05-09 13:36:16 +02:00
Max Neunhoeffer 0b068fa3e4 Create log topics for AgencyComm and Heartbeat. 2016-05-09 13:19:23 +02:00
Michael Hackstein 7b8d3d6df7 Insertion of documents in Cluster (babies case) now passes through the X-Arango-Error-Codes. 2016-05-09 12:45:31 +02:00
Max Neunhoeffer 3bc89d5f8a Small fix to ClusterInfo::uniqid 2016-05-09 12:32:38 +02:00
Max Neunhoeffer 32e652a0ef Take out an empty line. 2016-05-09 11:27:41 +02:00
Max Neunhoeffer b00d3c5624 Finish overhaul of ClusterInfo.cpp w.r.t. callbacks. 2016-05-09 09:47:27 +02:00
Max Neunhoeffer f971c3cf82 Overhaul AgencyCallback. 2016-05-07 01:11:15 +02:00
Max Neunhoeffer 7ed306c2e7 Fix double locking of mutex of condition variable. 2016-05-06 23:25:19 +02:00
Max Neunhoeffer b37d8fff48 Better protection against multi-threading. 2016-05-06 23:06:10 +02:00
Max Neunhoeffer 1d8c7e4515 Take out a debug message. 2016-05-06 22:46:40 +02:00
Max Neunhoeffer ce9ca50b95 Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-05-06 22:33:55 +02:00
Max Neunhoeffer 0fbc48b83e Improve cluster in various ways. 
Finish implementation of AgencyReadTransaction.
Use AgencyReadTransaction in HeartbeatThread of coordinator (less requests).
Repair ClusterInfo::uniqid.
Repair AgencyComm::uniqid.
Remove x-etcd-index header.
Remove _index in AgencyCommResult.
Streamline HeartbeatThread of coordinator.
Remove lastCommandIndex from AgencyComm.
Fix HeartbeatThread::handleStateChange.
 2016-05-06 22:30:27 +02:00
Andreas Streichardt 016b79f4c7 Fix object requirement 2016-05-06 18:58:58 +02:00
Andreas Streichardt dc95f2b4c1 Merge branch 'json_agency_comm' into devel 2016-05-06 18:38:24 +02:00
Andreas Streichardt 1233186eba actually use swapDatabases variable 2016-05-06 18:32:55 +02:00
Andreas Streichardt 0a14a56cb9 mop trying to do c++ => fail 2016-05-06 18:29:33 +02:00
Andreas Streichardt a121aff1a0 Implement proper (database) current loading 2016-05-06 18:10:45 +02:00
Andreas Streichardt 9cbe13dd43 Merge branch 'json_agency_comm' into devel 2016-05-06 17:21:41 +02:00
Andreas Streichardt 3773b0e66c Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-06 17:04:04 +02:00
Andreas Streichardt 04ba5156e5 Rework planned collection loading 2016-05-06 17:03:13 +02:00
Max Neunhoeffer 5690c0410c Remove option replicationQuorum which was unused as of now. 2016-05-06 09:53:01 +02:00
Max Neunhoeffer 0256193a27 Handle int case for HeartbeatThreadMs in agency gracefully. 2016-05-06 09:22:18 +02:00
Max Neunhoeffer 7232432dce Fix usage of getValues2 in FollowerInfo class. 2016-05-06 09:15:33 +02:00
Kaveh Vahedipour 642fc70082 Heartbeat uses getValues2 2016-05-05 17:49:29 +02:00
Kaveh Vahedipour d1bf42a2b8 shards add/remove to getValues 2 2016-05-05 17:34:45 +02:00
Max Neunhoeffer e3dd2f0a94 Lose an unused local variable. 2016-05-05 00:27:48 +02:00
Max Neunhoeffer b98ea35a38 Change a debug message into an error. 2016-05-04 23:47:13 +02:00
Kaveh Vahedipour 0bb19c0955 Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 16:52:23 +02:00
Kaveh Vahedipour af7e490d2a wrong implementation of property collectionsetting through coordinator 2016-05-04 16:52:14 +02:00
Max Neunhoeffer cae72d0d61 Make _vpack of AgencyCommResult abstract. 2016-05-04 16:49:02 +02:00
Max Neunhoeffer cd39a884f9 Fix fix. 2016-05-04 16:28:54 +02:00
Max Neunhoeffer 441f1caa4e Fix new getValues2 calls. 2016-05-04 16:28:29 +02:00
Max Neunhoeffer 355a412cd4 Remove second argument of getValues2. 2016-05-04 16:02:05 +02:00
Max Neunhoeffer c2ff6c326f Fix a few possible crashes in HeartBeatThread. 2016-05-04 15:20:46 +02:00
Kaveh Vahedipour 7eed0ecc2f Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-04 15:00:41 +02:00
Kaveh Vahedipour 9d8037b62b added /supervision/jobs to initial agency structure 2016-05-04 15:00:33 +02:00
Max Neunhoeffer 0ac60a8fe7 Merge branch 'devel' into json_agency_comm 2016-05-04 11:15:02 +02:00
Max Neunhoeffer cc8c635beb Some cleanup in Agency init data. 2016-05-04 11:13:23 +02:00
Max Neunhoeffer 1b0b9ae5df Take out getTargetServerEndpoint. 
This used Target/MapIDToEndpoint which is now gone.
 2016-05-04 11:10:42 +02:00
Max Neunhoeffer b13b12960b Sort out AgencyReadTransactions and cleanup AgencyWriteTransactions. 2016-05-04 00:08:15 +02:00
Andreas Streichardt eeb1e769da loadPlan() instead of loadDatabases() 2016-05-03 18:36:08 +02:00
Wilfried Goesgens 4fb12c91b1 Revalidate dispatcher pointer before accessing it and throw appropriate error message if not. 2016-05-03 16:56:50 +02:00
Max Neunhoeffer 617dcafefe Fix unregisterCallback issue. 2016-05-03 16:29:12 +02:00
Kaveh Vahedipour 7ac2f7111a Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:48 +02:00
Kaveh Vahedipour 5d911bceb4 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:48:36 +02:00
Andreas Streichardt f882db1436 Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:48:17 +02:00
Andreas Streichardt f5f040e21a Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 15:47:00 +02:00
Kaveh Vahedipour 61c90432aa Merge branch 'json_agency_comm' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 15:40:38 +02:00
Kaveh Vahedipour 093445b999 wrong implementation of property collectionsetting through coordinator 2016-05-03 15:40:25 +02:00
Andreas Streichardt 8a281cfe78 Migrate ensure/drop index to proper callbacks 2016-05-03 15:28:46 +02:00
Max Neunhoeffer 4e14d6ddb8 Merge branch 'json_agency_comm' of ssh://github.com/ArangoDB/ArangoDB into json_agency_comm 2016-05-03 15:27:03 +02:00
Max Neunhoeffer 416c493534 Cleanup stuff in ClusterInfo, invalidate caches when needed. 2016-05-03 15:24:49 +02:00
Kaveh Vahedipour c6ab722f97 corrected for cluster shell agency test 2016-05-03 15:01:52 +02:00
Kaveh Vahedipour 0f1e961f2d removing debug output 2016-05-03 13:58:51 +02:00
Kaveh Vahedipour bc6edb856c removed debug output 2016-05-03 11:51:05 +00:00
Kaveh Vahedipour bd0c60f5e8 removed debug output 2016-05-03 11:49:09 +00:00
Max Neunhoeffer 3c6b4d1197 Ensure proper cleanup of stack local mutex. 2016-05-03 13:35:02 +02:00
Max Neunhoeffer 3e2bd943ed Merge branch 'json_agency_comm' of ssh://github.com/ArangoDB/ArangoDB into json_agency_comm 2016-05-03 12:55:23 +02:00
Max Neunhoeffer 7c7394b0fb Recheck Current/Version every 5 heartbeats. 2016-05-03 12:55:03 +02:00
Andreas Streichardt cad48bf844 Merge branch 'json_agency_comm' of github.com:arangodb/arangodb into json_agency_comm 2016-05-03 12:53:39 +02:00
Andreas Streichardt 5094190c32 createDatabase working properly using callbacks as intended 2016-05-03 12:52:39 +02:00
Andreas Streichardt b1c27a9707 Rename method name to better reflect what it is actually doing 2016-05-03 12:11:50 +02:00
Max Neunhoeffer 0a2c185dd9 Agency init nicer. 2016-05-03 11:08:13 +02:00
Kaveh Vahedipour b3c00c0c2f correct id for _system in agency is string 2016-05-03 08:52:05 +00:00
Max Neunhoeffer 1c2790f8b6 Improve logging at agency initialization. 2016-05-03 10:46:29 +02:00
Kaveh Vahedipour 3608d91f87 Corrected create database in coordinator 2016-05-03 10:06:20 +02:00
Kaveh Vahedipour dab8accd5b Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-03 08:57:09 +02:00
Kaveh Vahedipour d0e15bb046 create database is semifunctional 2016-05-02 19:03:00 +02:00
Andreas Streichardt 36b3a50bb8 Remove current callback leftovers (dead anyway) 2016-05-02 18:46:27 +02:00
jsteemann 3fac4cdcf1 cppcheck 2016-05-02 18:11:06 +02:00
jsteemann 76b9393211 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-05-02 17:49:12 +02:00
Kaveh Vahedipour b791188f18 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 17:49:11 +02:00
Andreas Streichardt 0790b00737 hotfix for cluster startup 2016-05-02 17:45:39 +02:00
Kaveh Vahedipour 00ce93b8d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-05-02 16:14:37 +02:00
Kaveh Vahedipour 88ea3473b0 too much output in logs 2016-05-02 16:07:00 +02:00
jsteemann fefdd33574 use xxHash for hashing id strings 2016-05-02 15:46:04 +02:00
Andreas Streichardt ae83410d40 Multithreading and V8 fixes 2016-05-02 14:18:23 +02:00
Andreas Streichardt 974ecdc208 Implement Current callback 2016-05-02 14:00:26 +02:00
Andreas Streichardt b1d4a9d9d7 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-05-02 12:21:00 +02:00
Andreas Streichardt 18ea698038 Restructure code so that the installed versions are being returned by 
the plan changer
 2016-05-02 12:19:07 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
jsteemann 352df5f3ea cleanup 2016-05-01 15:32:33 +02:00
jsteemann 1250fcf63e micro optimizations 2016-05-01 00:03:23 +02:00
jsteemann d6833b6862 potentially optimized lookups for _from and _to 2016-04-30 14:21:15 +02:00
Kaveh Vahedipour b962ee0b99 correct unit tests 2016-04-29 19:26:10 +02:00
Kaveh Vahedipour 4ab02dda5f fixed collection unload issue on coordinator 2016-04-29 15:23:20 +00:00
Kaveh Vahedipour 1f8f8d8bb9 remerging devel 2016-04-29 17:17:22 +02:00
Kaveh Vahedipour 86959d83a6 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-29 16:29:05 +02:00
Kaveh Vahedipour 77bd64aa32 go go go 2016-04-29 16:14:55 +02:00
jsteemann bb6c0aba37 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 15:18:29 +02:00
jsteemann 3a92773685 use StaticStrings 2016-04-29 15:18:20 +02:00
Andreas Streichardt e26d1e4a7d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-29 15:17:35 +02:00
Andreas Streichardt b784084cbc Fix uninitialised value 2016-04-29 15:17:19 +02:00
jsteemann 3bb0f5fbe1 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-29 14:52:30 +02:00
Max Neunhoeffer 017d4a56a7 Better logging. 2016-04-29 14:45:27 +02:00
Kaveh Vahedipour 1d00ad5e74 fixed drop index 2016-04-29 14:30:48 +02:00
jsteemann 64ee910e38 move system attributes to the front of objects 2016-04-29 13:13:39 +02:00
Andreas Streichardt 6ef558765c execute heartbeat logic at least once 2016-04-29 11:41:53 +02:00
Kaveh Vahedipour 4c3d906bd8 UserVersion, HB interval integers 2016-04-29 11:19:40 +02:00
Kaveh Vahedipour 7733e16392 UserVersion is a number 2016-04-29 10:45:27 +02:00
jsteemann b796e4cc7d use some static strings here and there 2016-04-29 01:37:44 +02:00
Kaveh Vahedipour ee2115ceeb remaining verbose output 2016-04-28 16:28:59 +02:00
Kaveh Vahedipour e81e3e51e0 javascript side of jsonified agency 2016-04-28 15:15:55 +02:00
Kaveh Vahedipour d886a85f31 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-28 10:47:10 +02:00
Kaveh Vahedipour b8badcb8ce one of db-servers went into recess after many news and drops 2016-04-28 08:46:21 +00:00
Kaveh Vahedipour 67bc4a879d Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-28 10:08:30 +02:00
jsteemann 1587931a98 fixed cluster startup 2016-04-28 10:05:54 +02:00
Kaveh Vahedipour e0261d056d cluster startup ok. execept of corrdinator. 2016-04-27 17:54:27 +02:00
Kaveh Vahedipour 6329d90155 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-27 17:27:52 +02:00
Kaveh Vahedipour bb834bb4a1 cluster startup ok. execept of corrdinator. 2016-04-27 17:27:06 +02:00
Kaveh Vahedipour 049cc8602e careful with loops :( 2016-04-27 16:53:09 +02:00
jsteemann 22a1c0bb08 use method 2016-04-27 13:08:24 +02:00
Andreas Streichardt 6719de1192 Fix agency redirect 2016-04-26 17:32:51 +02:00
Kaveh Vahedipour 4e2d86dc67 Merge branch 'devel' of https://github.com/arangodb/arangodb into json_agency_comm 2016-04-26 10:55:13 +02:00
Kaveh Vahedipour 1a30b0495d continous 2016-04-26 10:55:09 +02:00
Jan Steemann a0883fb0fc fixed busy wait 2016-04-26 10:48:42 +02:00
Kaveh Vahedipour d4fc6a1062 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 18:37:32 +02:00
Kaveh Vahedipour 0530603763 dirty yet 2016-04-25 18:37:28 +02:00
Andreas Streichardt 0dc0dc2df7 Fix use after free 2016-04-25 17:16:51 +02:00
Andreas Streichardt a889cf5710 Rework dispatchedPlanVersion...fix races 2016-04-25 16:40:35 +02:00
Jan Steemann d391e15680 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-25 15:31:51 +02:00
Jan Steemann c8c8625727 try to fix some undefined behavior on cluster startup 2016-04-25 15:31:23 +02:00
Jan Steemann f93017d880 fix Visual Studio warning 2016-04-25 14:17:35 +02:00
Andreas Streichardt 22e1292420 Reset to 1000ms again 2016-04-25 13:26:27 +02:00
Andreas Streichardt 5257c3fb52 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-25 13:19:34 +02:00
Andreas Streichardt c5cbc1ae7d Fix cluster collection handling 2016-04-25 13:19:13 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Frank Celler c46eb8e65e added LogfileManager as feature 2016-04-23 16:34:57 -07:00
jsteemann 82e814cc69 cppcheck 2016-04-23 20:49:58 +02:00
jsteemann 0da9ac7cdc micro optimizations 2016-04-23 16:23:15 +02:00
Jan Steemann e5b86bd814 fixed last compile warning 2016-04-22 21:06:02 +02:00
Jan Steemann 4cf847aecd fixed MSVC complaints 2016-04-22 21:04:03 +02:00
Frank Celler 82d0bac4fa should be optional 2016-04-22 10:39:21 -07:00
Jan Steemann 5fc0e71fa0 intialize status variable to something 2016-04-22 19:16:42 +02:00
Kaveh Vahedipour d2a95f2022 dirty yet 2016-04-22 19:04:59 +02:00
Kaveh Vahedipour 04fbad730a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-04-22 18:49:27 +02:00
Andreas Streichardt 14120af8aa Change default value 2016-04-22 18:34:32 +02:00
Jan Steemann 78a1e6a7ef fix uninitialized variable 2016-04-22 18:32:38 +02:00
Andreas Streichardt a01c5a4b40 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 17:32:57 +02:00
Andreas Streichardt ea32926e45 Properly callbackify create and dropcollection 2016-04-22 17:32:00 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
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
Jan Steemann e3db1236c6 fixed compile warnings 2016-04-22 15:31:47 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
Michael Hackstein f0f41b6f95 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 13:23:51 +02:00
Michael Hackstein 74ce6ccc1a The ClusterMethods for document interaction (CRUD) now use automatic retries in cluster communication. 2016-04-22 13:23:44 +02:00
Jan Steemann 143c2378af fixed leak 2016-04-22 13:01:32 +02:00
Andreas Streichardt 3f1b75c99f Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-22 11:22:20 +02:00
Andreas Streichardt 46b6561d78 Create planned collection in one transaction 2016-04-22 11:21:31 +02:00
Frank Celler 5335a5b0af moved to Random 2016-04-21 22:53:20 -07:00
Andreas Streichardt d58e3b5022 Remove useless move 2016-04-21 17:55:21 +02:00
Andreas Streichardt ef06a12e5d Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-04-21 17:40:54 +02:00
Max Neunhoeffer 4aa0764ff5 Fix dropCollectionCoordinator. 2016-04-21 16:52:50 +02:00
Max Neunhoeffer db7041db1e Fix transaction management in AgencyComm. 2016-04-21 16:52:36 +02:00
Max Neunhoeffer 877e42e7c5 Merge branch 'FMH' into devel 2016-04-21 14:04:39 +02:00
Andreas Streichardt 917255fa28 Remove traces 2016-04-21 13:54:46 +02:00
Max Neunhoeffer 80cd846702 Sort out start order of things w.r.t. cluster. 2016-04-21 11:13:11 +02:00
Max Neunhoeffer ef01814127 Add servers entry to getCollectionInfoCurrent in JS. 2016-04-21 09:29:05 +02:00
jsteemann 4a87925b41 fixed cluster start 2016-04-20 17:36:39 +02:00
Max Neunhoeffer aba651ad0d Better error handling. 2016-04-20 17:22:37 +02:00
Kaveh Vahedipour 2637666698 cluster start on fmh succeeds, however slow 2016-04-20 16:12:48 +02:00
Max Neunhoeffer 83f380aa2b Use vocbase. 2016-04-20 15:31:18 +02:00
Max Neunhoeffer cbd5f202bb Initialize ClusterInfo lib in cluster. 2016-04-20 15:31:08 +02:00
Kaveh Vahedipour 72eb968d99 vobase is now acquired through server feature 2016-04-20 15:13:24 +02:00
Frank Celler 3bb24146a6 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-19 19:18:02 -07:00
Andreas Streichardt c738773f22 Include guards instead of #pragma once 2016-04-19 17:40:51 +02:00
Max Neunhoeffer 2bfe7b8b24 Finishing touches to performRequests. 2016-04-19 16:17:41 +02:00
Max Neunhoeffer d1bea93518 Fix too short timeout in server shutdown /Current/Lock in agency. 2016-04-19 15:40:19 +02:00
Max Neunhoeffer 0d1a7239c1 Bugfixes for synchronous replication. 2016-04-19 14:44:23 +02:00
Frank Celler 007fe8e053 Merge branch 'devel' of https://github.com/arangodb/arangodb into FMH 
Conflicts:
	arangod/Agency/Constituent.cpp
	arangod/Agency/RestAgencyHandler.cpp
	arangod/Aql/Query.cpp
	arangod/Aql/grammar.cpp
	arangod/RestHandler/RestSimpleQueryHandler.cpp
	arangod/RestServer/ArangoServer.cpp
	js/client/modules/@arangodb/testing.js
 2016-04-19 07:44:00 +02:00
Michael Hackstein 22b6f3f7b0 CPPCheck improvements 2016-04-18 17:36:02 +02:00
Michael Hackstein 930b7216b1 Fixed a bug in ClusterTraverser. Moved a string too early 2016-04-18 09:29:46 +02:00
Michael Hackstein ca64e727a1 Entirely removed TRI_json_t and Json from ClusterMethods and RestEdgesHandler 2016-04-16 23:23:25 +02:00
Michael Hackstein afdadcdfe5 Transformed getFilteredDocuments on Coordinator in ClusterMethods to use only VelocyPack 2016-04-16 22:39:52 +02:00
Michael Hackstein 5ba68d76e5 Removed now obsolete function getAllEdgesOnCoordinator in ClusterMethods 2016-04-16 20:16:57 +02:00
Michael Hackstein be32214554 Removed now obsolete function getAllDocumentsOnCoordinator from CLusterMethods 2016-04-16 20:15:43 +02:00
Michael Hackstein 0a11583560 Removed now obsolete function mergeResponseHeaders in ClusterMethods 2016-04-16 20:13:34 +02:00
Frank Celler 2dd798cd48 WIP 2016-04-15 22:09:55 -07:00
Frank Celler e298ac9881 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-04-15 21:05:52 -07:00
Frank Celler dd44191a91 WIP 2016-04-15 21:03:53 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Michael Hackstein cd12a07a4d Fixed return codes in cluster. They are now forwarded properly from DBServer to Client 2016-04-15 17:58:06 +02:00
Michael Hackstein 5645d77d22 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 15:40:04 +02:00
Michael Hackstein 3dab8da1aa Now the cluster method to request documents babies slow case properly sets return code 2016-04-15 15:34:33 +02:00
Michael Hackstein df97260961 Fixed Error behaviour in baby variant of delete in Cluster 2016-04-15 15:31:47 +02:00
Michael Hackstein 20733a81ae Improved baby errors in cluster 2016-04-15 14:48:44 +02: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
Michael Hackstein 4dc69a0162 Fixed a bug in Shard distribution for Cluster Coordinator. 2016-04-15 10:32:07 +02:00
Michael Hackstein 59f7d1ec70 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-15 08:25:05 +02:00
Frank Celler 8254bd4bd6 WIP 2016-04-14 21:32:12 -07:00
Jan Steemann 46e5150272 micro optimizations 2016-04-14 20:57:24 +02:00
Michael Hackstein eee02b40cb Use proper URL encoding in Cluster Documents API (single case) 2016-04-14 20:26:11 +02:00
Michael Hackstein 8989c9e31c Fixed condition checking in SingleDocument Read Cluster case 2016-04-14 20:13:59 +02:00
Michael Hackstein 8c7023850e Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 19:37:28 +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
Michael Hackstein 483ca0d5b3 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 17:42:41 +02:00
Michael Hackstein 4411bb390b REmoved dead code 2016-04-14 17:41:25 +02:00
Michael Hackstein 3434be7b7a Implemented documents baby variant for cluster and also improved the baby tests. ALl errors will now have exactly one representation for each baby document even if they could be identified earlier. 2016-04-14 17:40:28 +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 79d709a01c Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-14 13:30:23 +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
Jan Steemann 5c17402536 reduce number of agency requests a bit 2016-04-14 11:40:21 +02:00
Michael Hackstein 66aa7aa17a Fixed a bug in baby-distribution. Merging of results from several shards did not work as expected 2016-04-14 10:52:36 +02:00
Michael Hackstein 1e92fd3485 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-14 08:28:28 +02:00
Frank Celler 0fa6435731 WIP 2016-04-13 21:12:16 +02:00
Andreas Streichardt b03d4e610a Remove watchValue from agency 2016-04-13 15:42:23 +02:00
Andreas Streichardt b77cc777ff Kill remaining watchValues 2016-04-13 15:35:17 +02:00