jsteemann
8a6d054642
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-26 12:37:07 +02:00
Michael Hackstein
1c883a811c
Potential fix for unload->load. Needs to be validated.
2016-08-26 12:35:33 +02:00
jsteemann
900c28aec9
moved _compactionLock out of TRI_collection_t
2016-08-26 11:53:42 +02:00
Michael Hackstein
6a04156dc3
Fixed undefined behaviour in OpenIteratorState. The TRI_collection_t* could be a nullptr
2016-08-26 11:15:06 +02:00
jsteemann
8025ec0266
removed define that was used only once
2016-08-26 11:07:50 +02:00
Jan Steemann
0392ba9b1a
throw OOM error in case no buffer can be allocated
2016-08-26 11:00:05 +02:00
jsteemann
9ae2cb36e9
fix dumping of VPackSlices without CustomTypeHandler
2016-08-26 10:51:54 +02:00
Jan Christoph Uhde
77262f064d
add note about potential performance issues
2016-08-26 10:20:24 +02:00
jsteemann
83cc1a1d5a
remove includes
2016-08-26 10:18:30 +02:00
Michael Hackstein
b31cf711b9
Now properly fill the indexes when creating a new one. Also slight modifiaction of drop
2016-08-26 10:11:29 +02:00
Michael Hackstein
3c8b8933ed
More verbose index error output.
2016-08-26 10:10:46 +02:00
jsteemann
bcd3e927a9
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-26 09:18:58 +02:00
Jan Christoph Uhde
999991bd44
fix usage of unique_ptr
2016-08-26 09:15:54 +02:00
jsteemann
7a308c1d76
add no-throttling hint for compactor, too
2016-08-26 09:14:43 +02:00
jsteemann
6150da7420
remove function pointers from TRI_datafile_t, added constructor and destructor
2016-08-26 09:08:24 +02:00
Jan Christoph Uhde
b5cd47e579
rename HttpServerJob -> GeneralServerJob
2016-08-26 09:04:06 +02:00
Michael Hackstein
b01a7ac0d5
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
2016-08-26 08:02:54 +02:00
Michael Hackstein
e75567dae5
Further fixes for tests: Fixed unitialized count. Fixed some false CORRUPTED_COLLECTION states.
2016-08-26 08:02:34 +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
jsteemann
999e2dab1b
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-25 15:38:12 +02:00
jsteemann
e9fe772469
moved functionality into engine
2016-08-25 15:37:55 +02:00
Michael Hackstein
7d6402b15c
Fixed soem crashes and undefined behaviuor. Server does not crash during tests, however a lot of them are still red
2016-08-25 14:51:03 +02:00
Jan Steemann
f7da4d9bbf
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-08-25 14:38:23 +02:00
jsteemann
4020d8f2e9
finalize classes
2016-08-25 14:25:17 +02:00
jsteemann
257aefc5c5
fix agency shutdown
2016-08-25 14:06:08 +02:00
jsteemann
c6efe26198
cppcheck
2016-08-25 14:04:23 +02:00
jsteemann
667dc8af49
fix agency shutdown
2016-08-25 14:04:11 +02:00
Jan Steemann
3600ed40f8
more diagnostic output
2016-08-25 14:02:47 +02:00
Jan Steemann
34a31f2b97
issue #2006 : added more diagnostic output for some replication errors
2016-08-25 14:02:35 +02:00
jsteemann
6af38d3c80
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-25 12:50:19 +02:00
jsteemann
396ab41736
allow dropping system collections in some rare cases
2016-08-25 12:47:06 +02:00
Jan Steemann
4769501804
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2016-08-25 12:41:35 +02:00
Jan Steemann
0601224cba
fixed issue #2012
2016-08-25 12:41:23 +02:00
jsteemann
bbb2cfabdc
make key generator throw on invalid key options
2016-08-25 11:32:38 +02:00
jsteemann
3469b63449
fixed a replication test
2016-08-25 11:29:47 +02:00
Michael Hackstein
e1ac5175b1
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
2016-08-25 11:09:11 +02:00
Michael Hackstein
1f3dabc8e1
Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types
2016-08-25 11:08:39 +02:00
Andreas Streichardt
378c800fb4
Rework extra threads
2016-08-25 10:53:18 +02:00
jsteemann
22d3a1eb9a
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-25 10:41:09 +02:00
jsteemann
3175c1a84f
Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-25 10:38:31 +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
jsteemann
08ad2dcb4a
clean up
2016-08-25 10:23:48 +02:00
Jan Christoph Uhde
dd9cd50904
add comments to statistics members
2016-08-25 10:11:29 +02:00
Wilfried Goesgens
4939e02fb2
Make the existance of the database directory non-mandatory again.
2016-08-25 10:07:37 +02:00
jsteemann
a71ed2a09d
privatize methods
2016-08-25 10:07:23 +02:00
Michael Hackstein
2af30f056d
Moved index creation to use LogicalCollection instead of TRI_collection_t. Involved changes of the constructor, all can now be created using iid and Slice. Removed specialized functions to create/find indixes in v8-voc index. Also the iteration is modified. This commit compiles but tests will fail. Merge commit.
2016-08-25 09:57:36 +02:00
jsteemann
2e48293c52
privatize methods
2016-08-25 09:56:00 +02:00
jsteemann
76bef45f39
privatize method
2016-08-25 09:43:33 +02:00
Jan Christoph Uhde
dbe3caa46f
Merge branch 'obi-velocystream' into engine-vs-velocystream
...
* obi-velocystream:
fix adding to array (without keys:)
fix header access
VPP Header is now and Array instead of Object
2016-08-25 08:51:44 +02:00
jsteemann
1dab450622
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-24 17:35:10 +02:00
jsteemann
07055384b8
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-24 17:34:59 +02:00
jsteemann
04f5fbbdb2
fixed issue #2018
2016-08-24 17:33:49 +02:00
Andreas Streichardt
c15c6a31b9
Improve extrathreads handling
2016-08-24 17:02:36 +02:00
jsteemann
33a61dd031
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache
2016-08-24 16:32:39 +02:00
jsteemann
ff3776ca01
fixed dumping
2016-08-24 16:32:20 +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
Wilfried Goesgens
1688655509
Merge branch 'devel' of github.com:arangodb/ArangoDB into pipeline
2016-08-24 14:46:48 +02:00
Wilfried Goesgens
1f162ac882
Implement scheme to more clever pass the directories from the build process to the run-time
...
We will now try to evaluate the toplevel install directory from the configured binary dir.
We will use this toplever directory when searching for other directories.
2016-08-24 14:45:08 +02:00
jsteemann
0ceea8e4cd
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache
2016-08-24 14:36:16 +02:00
jsteemann
c5f847a912
fix figures and volatile collection counts
2016-08-24 14:35:55 +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
df0d080512
Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream
...
* origin/engine-vs-velocystream:
fix compile errors after merge
fix collector inactivity in shutdown
grunt
Attempt not to bypass error handling so we hopefully get some more information on issue #2011
updated agency pool
fixed wrong default values for _sslOptions
validate default value for DiscreteValuesParameter
Coorect agency path (no more / duplicates)
Better shutdown handling
change build output name once more.
I love you too, Richard.
Add uname -o to the filename to make shure build pipelines pick the right ones.
weekend edition
gv improvements
2016-08-24 14:18:10 +02:00
Andreas Streichardt
89ebeefbb9
Proper shutdown
2016-08-24 13:51:23 +02:00
Andreas Streichardt
6fa9bab7d0
Fix the logspam
2016-08-24 13:51:23 +02:00
jsteemann
fb4b3d0a3c
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache
2016-08-24 11:07:45 +02:00
jsteemann
7794b76b33
intermediate commit
2016-08-24 10:54:47 +02:00
jsteemann
6fc162d5a1
fix compile errors after merge
2016-08-24 09:44:05 +02:00
jsteemann
f92815b09b
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream
2016-08-24 09:38:06 +02:00
jsteemann
b29103c1f1
fix collector inactivity in shutdown
2016-08-24 09:37:47 +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
Wilfried Goesgens
6934baa6a4
Attempt not to bypass error handling so we hopefully get some more information on issue #2011
2016-08-23 17:02:28 +02:00
Jan Christoph Uhde
5be5030983
Merge branch 'obi-velocystream-enums' into engine-vs-velocystream
...
* obi-velocystream-enums:
clean up - remove enumToEnum magic
finish ResponseCode enum
finish ProtocolVersion, ProtocolType and ConnectionType
finish ContentType enum
preapre move of ContentTypes
finish RequestType enum
prepare replacement of request types
even more error messages
slightly better error messages
better exceptions form event loop
mark len constexpr
Conflicts:
arangod/Agency/Inception.cpp
2016-08-23 16:01:58 +02:00
Jan Christoph Uhde
0184399ba7
clean up - remove enumToEnum magic
2016-08-23 15:58:50 +02:00
Kaveh Vahedipour
be51564141
updated agency pool
2016-08-23 15:57:13 +02:00
Jan Christoph Uhde
1febeadfd7
finish ResponseCode enum
2016-08-23 15:46:42 +02:00
Kaveh Vahedipour
fb8173b1ec
rest handler now timeouts when no leadership established and reports 503
2016-08-23 15:38:32 +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
Andreas Streichardt
a9253c7ba5
Coorect agency path (no more / duplicates)
2016-08-23 14:03:41 +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
Andreas Streichardt
47a0f8602a
Better shutdown handling
2016-08-23 12:51:38 +02:00
jsteemann
5f06a5c025
Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache
2016-08-23 12:13:08 +02:00
jsteemann
405a66a269
fix default value for compactionStepSize
2016-08-23 12:08:10 +02:00
jsteemann
817fa1cdf4
Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into readcache
2016-08-23 12:04:31 +02:00
Jan Steemann
57fa55921c
fix execution of AQL traversal expressions when there are multiple conditions that refer to variables set outside the traversal
2016-08-23 10:48:08 +02:00
Jan Christoph Uhde
86f887db92
even more error messages
2016-08-23 09:33:03 +02:00
Jan Steemann
b296468a18
more optimizations
2016-08-22 17:36:04 +02:00
Andreas Streichardt
374f24fbd7
Remove implicit cast
2016-08-22 11:05:19 +02:00
Jan Christoph Uhde
e2d41278af
slightly better error messages
2016-08-22 09:18:35 +02:00
Jan Christoph Uhde
63c4986535
better exceptions form event loop
2016-08-22 08:58:16 +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