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

73 Commits

Author SHA1 Message Date
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 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 f09bf540bc change setPayload and add requested ContentType in response 2016-08-31 14:32:04 +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 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 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 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +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 1febeadfd7 finish ResponseCode enum 2016-08-23 15:46:42 +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
Jan Christoph Uhde 86f887db92 even more error messages 2016-08-23 09:33:03 +02:00
Jan Christoph Uhde e2d41278af slightly better error messages 2016-08-22 09:18:35 +02:00
Jan Christoph Uhde 487ec78430 mark len constexpr 2016-08-22 08:38:03 +02:00
Jan Christoph Uhde aff54b2da9 Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream-merge 
* origin/engine-vs-velocystream:
  changes for Visual Studio
 2016-08-21 12:39:18 +02:00
Jan Christoph Uhde 2b5a0f1eec shorten code 2016-08-21 00:57:07 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Jan Christoph Uhde e2cc11e22a better reporting of errors 2016-08-19 14:23:11 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Jan Christoph Uhde 61cb8f561f Merge remote-tracking branch 'origin/obi-velocystream-frank' into obi-velocystream 
* origin/obi-velocystream-frank:
  fixed ownership of handler

Conflicts:
	arangod/GeneralServer/VppCommTask.cpp
 2016-08-19 09:58:27 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Jan Christoph Uhde e5794ac583 enable handling of multiple vpacks in a message 2016-08-18 11:44:03 +02:00
Jan Christoph Uhde 48ac791dd6 prepare auth 2016-08-18 08:36:42 +02:00
Jan Christoph Uhde 34c0aa3540 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into obi-velocystream-test 
* 'engine-vs-velocystream' of github.com:arangodb/arangodb: (30 commits)
  potentially fix thread pool shutdown issues
  Remove the boost documentation. The wintendo can't stand long filenames in 2016
  move CleanupThread into engine
  Revert "Disable testcases for now, it triggers the crash on windows."
  slightly improve execution logic
  grunt build
  improved gv
  removed obsolete defines
  assert a certain size
  removed unused version attribute
  removed unused method
  removed unused attributes
  removed unused enum
  privatized
  Revert "Remove iconv-lite"
  privatize some compaction infos
  changed index detection
  removed unused files
  privatize method
  privatized method
  ...
 2016-08-17 13:25:37 +02:00
Jan Christoph Uhde 3fb68c632d handleSimpleError now respects messageId 2016-08-17 13:22:31 +02:00
Jan Christoph Uhde 21a9f64538 remove: _request from CommTask and contentType from setPayload() 2016-08-17 09:29:23 +02:00
Jan Christoph Uhde 341891ed74 clang format 2016-08-16 13:33:16 +02:00
Jan Christoph Uhde 6f2ce0cd5a make better use of readbuffer 2016-08-16 13:32:30 +02:00
jsteemann d5af72f47f fix typo in method name 2016-08-16 13:11:39 +02:00
Jan Christoph Uhde 9afe3a1016 fix buffer clean up 2016-08-16 10:58:20 +02:00
Jan Christoph Uhde a3328dc944 avoid bug that occurred during buffer resize by allocating up front 2016-08-16 10:28:31 +02:00
Jan Christoph Uhde a7229bb698 i fix type of execepton so it gets caught 2016-08-16 09:29:02 +02:00
Jan Christoph Uhde b50659ed27 avoid dumper exception 2016-08-16 09:12:54 +02:00
Jan Christoph Uhde d142dc6b08 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  added handleSimpleError for database not found
 2016-08-16 08:52:51 +02:00
Jan Christoph Uhde 1d1e19678d failed try to resolve externals 2016-08-15 22:58:21 +02:00
a-brandt 758cc8c985 added handleSimpleError for database not found 2016-08-15 17:05:35 +02:00