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

169 Commits

Author SHA1 Message Date
jsteemann 07055384b8 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-24 17:34:59 +02:00
Andreas Streichardt 6fa9bab7d0 Fix the logspam 2016-08-24 13:51:23 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde 4873a9be71 finish ContentType enum 2016-08-23 15:02:55 +02:00
Jan Christoph Uhde d3654d99d8 finish RequestType enum 2016-08-23 14:49:29 +02:00
Jan Christoph Uhde e1e7e2da0b Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream: (91 commits)
  removed useless include
  removed JsonParser
  removed JsonHelper
  Fixed another failed nullptr handling in LogicalCollection cluster case.
  Fixed undefined behaviour in rest error creation
  Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode
  agency startup changed to bootstrapping
  Mention howto control core files on linux.
  shutdown fixed
  Removed create / drop system collection from Cluster test. This is forbidden now
  The logical colleciton now knows it's journalSize
  Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again.
  pushing corrected unittest script and cluster startup scripts
  adjusting startup scripts
  missing source file added
  we have a bootstrapping agency
  votes are processed correctly again
  Add module.context.createDocumentationRouter
  Don't implicitely build the windows packages.
  remove debug print
  ...

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	arangod/GeneralServer/VppCommTask.h
	arangod/RestHandler/RestBaseHandler.cpp
	lib/Rest/VppRequest.h
 2016-08-19 14:35:05 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
jsteemann 21dd73074a cppcheck 2016-08-18 16:57:55 +02:00
jsteemann d7b2141da0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-18 16:22:00 +02:00
Andreas Streichardt dc74a0b681 Throw exceptions to avoid any circus behaviour 2016-08-18 14:52:45 +02:00
Andreas Streichardt 887da49edf Fix segfault when backend fails 2016-08-18 13:02:55 +02:00
jsteemann bc6633e4c0 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-04 13:33:10 +02:00
jsteemann 8a200f754c WG beautification 2016-08-04 12:36:14 +02:00
jsteemann 8baa7ec955 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-03 13:39:00 +02:00
Jan Steemann fe87b25ebb produce more meaningful error messages 2016-08-03 13:36:13 +02:00
Jan Christoph Uhde c59a553723 fix some errors -- http tests failing in cluster 2016-08-01 15:19:11 +02:00
Jan Christoph Uhde ef12d8dc2c struggle with ctor 2016-08-01 11:48:30 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
jsteemann 2aa2e0dab4 removed server.h 2016-07-25 16:49:52 +02:00
Jan Christoph Uhde da81c32539 remove body() method from GeneralRequest 2016-07-25 16:46:53 +02:00
Max Neunhoeffer 410bd3d95b Default to JSON for the moment. 2016-07-20 16:19:17 -07:00
Max Neunhoeffer 2aa6cae452 Fix performance improvements w.r.t. headers. 2016-07-20 16:05:21 -07:00
Max Neunhoeffer 6f4b48cfcf Try to fix performance issue with single documents in cluster. 
This creates a fast path in performRequests for the case that only
one request is given. We use syncRequest instead of asyncRequest
to save a network roundtrip. Furthermore, all queues and locks
in ClusterComm are circumvented.
 2016-07-20 15:15:41 -07:00
Jan Christoph Uhde 6e9304cdc4 Merge remote-tracking branch 'origin/devel' into obi-rest-changes 
* origin/devel: (43 commits)
  added dev button to graphs view [ci skip]
  grunt build [ci skip]
  Remove jshint
  Mention updating license info
  Prevent World War 3
  Always use --global-style when installing npm deps
  gv - editable & createable nodes, edges [ci skip]
  Rebuild aardvark
  Make sure Show Interface check asks for HTML
  oops, @not supported here.
  Fix phrase explaining when the collections are dropped alongside the graph definition.
  fixed issue #1941
  gv [ci skip]
  added test for "fake" _key values
  fixed issue #1942
  In Farbe und in STEREREOOOUU!
  grunt [ci skip]
  gv [ci skip]
  Fix documentation.
  Fix fix.
  ...
 2016-07-15 09:20:04 +00:00
Jan Christoph Uhde 682cf7a2f1 virtualize functions of request/response 2016-07-14 08:40:05 +02:00
Max Neunhoeffer a78fd42b67 Merge branch 'HLC' into devel 2016-07-13 12:52:33 +02:00
Max Neunhoeffer 4649036943 Add and read out HLC time stamps in HTTP headers. 2016-07-12 23:36:14 +02:00
Max Neunhoeffer 985723e468 Add HLC timestamp as HTTP header in asyncRequst and syncRequest. 2016-07-12 23:11:57 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Kaveh Vahedipour 34aed57a6d adding IN operator to kv-store 2016-06-22 14:44:43 +02:00
Max Neunhoeffer 4ba6d8acbb Next iteration of performRequests improvement. 
asyncRequest has now two timeouts, one for the connection phase
leading to retries for failover situations, the other for the
completion of the whole operation.
 2016-06-07 14:12:09 +02:00
Max Neunhoeffer f9fc22d0b4 Minor tweak to error handling in performRequests. 2016-06-06 23:51:58 +02:00
Max Neunhoeffer 297cfa4e86 Fix behaviour of ClusterComm::performRequests. 2016-06-06 14:40:25 +02:00
Max Neunhoeffer d54030eaac Fix bug in ClusterComm::asyncRequest. 2016-06-06 13:37:04 +02:00
Max Neunhoeffer 19747c8b6c Fix crash due to wrong usage of asyncRequest. 2016-06-06 11:30:39 +02:00
Max Neunhoeffer 20ef93d76b Cleanup of error handling for asyncRequest and syncRequest. 
I have added a thorough description of events to the comments
in ClusterComm.h. This should enable everybody to do proper
error handling when using ClusterComm::asyncRequest and
ClusterComm::syncRequest.
 2016-06-04 23:05:48 -06:00
Max Neunhoeffer 7ab83d4050 Slightly change signature of asyncRequest. 
Error handling was inconsistent. This is cleaned up now.
 2016-06-04 16:19:54 -06:00
Max Neunhoeffer 7afd1cb197 Fixes in ClusterComm for sync. replication and failover. 2016-05-31 01:15:09 -06:00
jsteemann 3d831b2e2b remove unnecessary checks 2016-05-30 14:45:11 +02:00
jsteemann b8f99fa717 slightly adjusted wait times 2016-05-30 09:34:13 +02:00
Frank Celler 3e0930aa16 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-24 10:21:18 +02:00
Max Neunhoeffer d988736ea9 Lower a logging level to DEBUG in performRequests. 
Errors will be reported elsewhere.
 2016-05-24 09:53:05 +02:00
Max Neunhoeffer 1e6fe40149 Reduce follower timeout to 3.0 seconds. 2016-05-24 08:38:01 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
Kaveh Vahedipour 37c0ec4f54 more complete verbose output on custercomm connections 2016-05-09 15:05:33 +02:00
jsteemann 96fceb4411 use std::unordered_maps for headers 2016-05-01 20:52:47 +02:00
Max Neunhoeffer 2bfe7b8b24 Finishing touches to performRequests. 2016-04-19 16:17:41 +02:00
Max Neunhoeffer 0d1a7239c1 Bugfixes for synchronous replication. 2016-04-19 14:44:23 +02:00