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

126 Commits

Author SHA1 Message Date
Jan Christoph Uhde af8649479f clean up code 2016-09-06 14:46:37 +02:00
Jan Steemann 536e928329 fixed invalid pointers 2016-09-06 14:22:32 +02:00
Jan Christoph Uhde 44d7f0ffad do not even try to answer on error on protocol level 2016-09-06 13:55:35 +02:00
Jan Christoph Uhde 275ebf566f add patch requested by mark 2016-09-06 13:42:47 +02:00
Jan Christoph Uhde 905c06d88e add new agent to allow 2 answers to one message 2016-09-06 13:26:27 +02:00
jsteemann df808cd665 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-05 11:51:09 +02:00
jsteemann e2d0f4342f respond with proper error message in case queue is full 2016-09-05 11:02:11 +02:00
jsteemann 67de3f7bb2 work less on the heap 2016-09-02 15:51:02 +02:00
jsteemann 1823cff3a9 removed TRI_collection_t 2016-09-02 14:54:13 +02:00
Jan Christoph Uhde ee10949dcf fix cursor test for vpp 2016-09-01 12:12:28 +02:00
Jan Christoph Uhde 63fa20fb42 Merge remote-tracking branch 'origin/devel' into obi-velocystream-try-merge-devel 
* origin/devel:
  don't leak on help
  Abort compilation process if the cmake configure run fails
  || exit 1
  Handle 503 answer from dbservers properly
  return service unavailable during shutdown
  Add cxgcc snippets
  fix users home directory.
  Fix debian scripted password documentation.
  slighty improved error handling in import API
  fixed issue #2026
  Fix release matching for alpha/beta versions
  We mustn't use minuses in the releases since that will collide later on with packaging.
  Pass arguments along to build.sh
  Fix windows NSIS client package
  fix typo
  - properly use armhf for armv7 packages - specify CPACK_DEBIAN_PACKAGE_ARCHITECTURE so one can cx-compile packages.

Conflicts:
	arangod/Cluster/ClusterComm.cpp
	lib/Rest/FakeRequest.cpp
 2016-08-31 15:06:27 +02:00
Jan Christoph Uhde f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +02:00
jsteemann a845aa5e78 fix memleak 2016-08-31 11:43:10 +02:00
jsteemann c8ee419a80 fix calls 2016-08-31 11:23:48 +02:00
jsteemann 71e13cb071 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-31 11:12:44 +02:00
jsteemann f116ae4cc3 fixed leak 2016-08-31 11:12:24 +02:00
Frank Celler 9bb239b737 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2016-08-31 10:38:59 +02:00
Frank Celler 52c2c4a3ac return service unavailable during shutdown 2016-08-31 10:38:53 +02:00
Jan Christoph Uhde ed111a39a1 Merge branch 'devel' into obi-velocystream-try-merge-devel 
* devel: (24 commits)
  minor fixes
  fix effect that on second install we will complain about mismatching passwords
  only test for cleaning up 3rdparty if we're parametrized to do so.
  fix CMake so it finds the PythonInterpreter even with oder versions
  hexify corrupted markers
  Fix comments
  fixed cluster start
  issue #2022: double max allowed request body size, cap --batch-size value in arangoimp
  fixed issue #2023: added replicationFactor to docs
  improve the perf script
  fix perfsetupscript
  clean up perf script
  add SYSTEM flag to boost includes to avoid warnings
  Adding Foxx access to agency
  Adding Foxx access to agency
  fix compile warning
  Add missing windows library.
  fix windows compile problems.
  Fix syntax error in windows client installer.
  If we have relative paths that are working, make them absolute so they still work after CWD's of arangod
  ...

Conflicts:
	arangod/Agency/AgentConfiguration.cpp
	arangod/GeneralServer/HttpCommTask.cpp
	arangod/RestServer/DatabaseFeature.cpp
	arangod/VocBase/datafile.cpp
 2016-08-30 22:04:31 +02:00
jsteemann 2134afaa83 renamed method 2016-08-30 10:36:34 +02:00
Simran Brucherseifer dc8ced3a9b Fix comments 2016-08-29 11:52:09 +02:00
Jan Steemann 4b5249dc5e issue #2022: double max allowed request body size, cap --batch-size value in arangoimp 2016-08-29 09:34:23 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Jan Christoph Uhde 8e56b1df7d improve logging 2016-08-26 16:22:49 +02:00
Jan Christoph Uhde d635b720b0 try to add statistics to VppCommTask 2016-08-26 15:15:33 +02:00
Jan Christoph Uhde 221b35267c Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-agent 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (29 commits)
  removed define that was used only once
  fix dumping of VPackSlices without CustomTypeHandler
  remove includes
  add no-throttling hint for compactor, too
  remove function pointers from TRI_datafile_t, added constructor and destructor
  moved functionality into engine
  fixed tests
  finalize classes
  fix agency shutdown
  cppcheck
  cppcheck
  fix agency shutdown
  removed unused file
  more diagnostic output
  issue #2006: added more diagnostic output for some replication errors
  allow dropping system collections in some rare cases
  updated CHANGELOG
  fixed issue #2012
  explain why we fail to fetch the git revision.
  Cleanup cmake process so it doesn't barf on problems to detect the git version.
  ...
 2016-08-26 11:47:23 +02:00
Jan Christoph Uhde ae77145651 clean up commtaks - and prepare for merge with jan that will avoid exceptions 2016-08-26 10:58:36 +02:00
Jan Christoph Uhde c42bc4016a Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  fix usage of unique_ptr
  rename HttpServerJob -> GeneralServerJob
  improve error handling
  improve error handling

Conflicts:
	arangod/GeneralServer/GeneralServer.cpp
 2016-08-26 09:20:12 +02:00
Jan Christoph Uhde 999991bd44 fix usage of unique_ptr 2016-08-26 09:15:54 +02:00
Jan Christoph Uhde b5cd47e579 rename HttpServerJob -> GeneralServerJob 2016-08-26 09:04:06 +02:00
Jan Christoph Uhde 2f8e27af0c Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  improve error handling
 2016-08-25 16:49:05 +02:00
Jan Christoph Uhde 88695ea334 improve error handling 2016-08-25 16:46:56 +02:00
Jan Christoph Uhde 8e950a9d2a improve error handling 2016-08-25 16:39:49 +02:00
Jan Christoph Uhde 975a3a8aa0 StatisticsAgent is no longer CommTask base - http_server tests ok! 2016-08-25 16:21:45 +02:00
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +02:00
jsteemann f4aa60ed0d Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-25 10:38:26 +02:00
Wilfried Goesgens 4939e02fb2 Make the existance of the database directory non-mandatory again. 2016-08-25 10:07:37 +02:00
Jan Christoph Uhde 54249cb5ae fix header access 2016-08-24 16:24:09 +02:00
Jan Christoph Uhde f9feb14a6e Revert "Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream" 
This reverts commit 76679e1636, reversing
changes made to 5be5030983.

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-24 15:26:49 +02:00
Jan Christoph Uhde e0d914fcc1 Revert "add options to Slice::get and use them for VPackHeader" 
This reverts commit b2f99adaaa.
 2016-08-24 15:11:22 +02:00
Jan Christoph Uhde 44b54425e3 fix: move extra ProcessRead to correct file:) 2016-08-24 14:33:31 +02:00
Jan Christoph Uhde c4f96cec7c fix: add missing processRead() at the end of addResponse 2016-08-24 14:20:06 +02:00
Jan Christoph Uhde 76679e1636 Merge branch 'obi-velocystream-attribute-translator' into obi-velocystream 
* obi-velocystream-attribute-translator:
  add options to Slice::get and use them for VPackHeader
  add translator to VelocyPackHelper and headerOption to Vpp Protocol

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
	lib/Rest/CommonDefines.h
 2016-08-24 09:18:35 +02:00
Jan Christoph Uhde 0184399ba7 clean up - remove enumToEnum magic 2016-08-23 15:58:50 +02:00
Jan Christoph Uhde 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +02:00
Jan Christoph Uhde a6f5fc97de finish ProtocolVersion, ProtocolType and ConnectionType 2016-08-23 15:36:36 +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 b2f99adaaa add options to Slice::get and use them for VPackHeader 2016-08-23 13:44:10 +02:00
Jan Christoph Uhde 8f5e6f65d6 add translator to VelocyPackHelper and headerOption to Vpp Protocol 2016-08-23 13:05:50 +02:00