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
Jan Christoph Uhde
e511cd4ab9
silence complier warnings
2016-08-15 15:18:10 +02:00
Jan Christoph Uhde
e62b4f69d6
add better logging and clean up code
2016-08-12 15:05:03 +02:00
Jan Christoph Uhde
3d4e1f6922
clean up code
2016-08-11 16:44:12 +02:00
Jan Christoph Uhde
a1d6909f88
make use of generateBody in payload and fix some bugs in VppCommTask
2016-08-11 13:20:58 +02:00
Jan Christoph Uhde
fa42f55545
clang format
2016-08-10 20:08:17 +02:00
Jan Christoph Uhde
fe84762bef
fix header of velocypack chunks
2016-08-10 16:42:42 +02:00
Jan Christoph Uhde
c4444ae4e4
fix vppCommTask - do not return true when false should be returned
2016-08-10 15:17:31 +02:00
Jan Christoph Uhde
da0c40cff7
server should now reply
2016-08-10 11:11:26 +02:00
Jan Christoph Uhde
8f6ff64d00
fix errors in vpp protocol
2016-08-09 19:09:24 +02:00
Jan Christoph Uhde
01c1c09d5a
add first vpack test -- content type has to be fixed first
2016-08-04 13:32:25 +02:00
Jan Christoph Uhde
54eda61754
connect response to CommTask WriteBuffers
2016-08-03 16:08:04 +02:00
Jan Christoph Uhde
cae1d47e5d
fix build errors
2016-08-03 09:42:20 +02:00
Jan Christoph Uhde
cb275e239f
add: clean buffer for VppCommTask
2016-08-03 09:20:22 +02:00
Jan Christoph Uhde
08cc5c543e
remove unused code - small fixes
2016-08-02 15:57:30 +02:00