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

899 Commits

Author SHA1 Message Date
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
Andreas Streichardt 4c27442bd9 Implement callbacks 2016-04-13 14:05:15 +02:00
Frank Celler dc3e8e6bdb WIP 2016-04-12 20:27:46 +02:00
Michael Hackstein 4430f22840 Cluster delete now forwards ignoreRevs properly 2016-04-12 13:24:32 +02:00
Michael Hackstein 1311f73775 Further fixes in cluster communication for baby case 2016-04-12 13:04:51 +02:00
Michael Hackstein b9a209fff2 Now sending non-babies request in modify to non babies endpoint instead of a faked babies object. Result was different. 2016-04-12 10:22:27 +02:00
Michael Hackstein 68951f3a04 Fixed a bug in URL parameters 2016-04-12 09:11:05 +02:00
Michael Hackstein 8760f10354 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-12 08:01:40 +02:00
Michael Hackstein 55ed0f52b0 Potential fix for some modifyDocument operations in cluster 2016-04-12 08:01:17 +02:00
Max Neunhoeffer c9031a648f Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2016-04-11 23:39:02 +02:00
Max Neunhoeffer a321d417a9 Add performRequests. 2016-04-11 23:37:46 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Michael Hackstein e043fb146b Fixed false initialisations of std::string. Was created with a nullptr. 2016-04-11 16:44:27 +02:00
Michael Hackstein 7990e05125 Fixed a nullptr initialisation of std::string 2016-04-11 14:21:56 +02:00
Michael Hackstein 83b13bb8b3 Implemented modifyDocument in cluster with babies. 2016-04-11 10:25:03 +02:00
Michael Hackstein df497eb8b2 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-10 14:09:25 +02:00
Michael Hackstein 31a77382b1 Added first implementation of slow-path in cluster communication (not all shard-keys are given) Right now used in remove 2016-04-10 14:07:57 +02:00
Michael Hackstein 1075181fcc Fixed a bug with the wrong body send on delete with babies. 2016-04-08 17:43:30 +02:00
Michael Hackstein 5ba4f5b813 Removed debug output 2016-04-08 17:10:10 +02:00
Michael Hackstein 184e702935 There was another bug in cluster create with babies. This is fixed now. Also started implementing DELETE with babies. 2016-04-08 17:02:01 +02:00
Kaveh Vahedipour 3b578da758 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency 2016-04-08 12:40:59 +00:00
Kaveh Vahedipour c949df2dfc agency compiles after pull from devel 2016-04-08 12:40:38 +00:00
Michael Hackstein d67b203382 Merge branch 'devel' of github.com:arangodb/arangodb into spdvpk 2016-04-08 13:15:16 +02:00
Jan Steemann 3a582af765 fix Windows build 2016-04-08 13:09:32 +02:00
Michael Hackstein 541395a262 Merge branch 'spdvpk' of github.com:arangodb/arangodb into spdvpk 2016-04-08 12:42:59 +02:00
Jan Steemann 0c00738aff fixes for Visual Studio 2016-04-08 12:07:53 +02:00
Michael Hackstein 12d973504c Fixed babies creation in cluster with undefined keys. 2016-04-08 10:53:11 +02:00
Jan Steemann e4b1dd8f5f fixed tests for TRI_HashJsonByAttributes() 2016-04-07 19:55:42 +02:00
Jan Steemann 19ab17ad3b Merge branch 'spdvpk' of https://github.com/arangodb/arangodb into spdvpk 2016-04-07 16:51:25 +02:00
Jan Steemann d65662fb62 pacify cppcheck 2016-04-07 16:41:35 +02:00
Michael Hackstein 9b8768ad46 Fixed a bug in createCluster. It crashed in some cases with invalid input. 2016-04-07 15:20:57 +02:00
Michael Hackstein 3a5ec5c25e Successfully inserted multiple documents via babies on Coordinator 2016-04-07 12:27:40 +02:00
Michael Hackstein 4d14c6de60 Create document babies variant now actually does something for babies. It should send the documents to each shard. However does not work yet. 2016-04-07 11:17:59 +02:00
Michael Hackstein d8c44e03d2 Fixed a minor problem with Babies API 2016-04-07 11:08:52 +02:00
Michael Hackstein 75e1627a85 Added implementation to rebuild the result in babies case 2016-04-07 11:00:33 +02:00