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

11099 Commits

Author SHA1 Message Date
jsteemann b9f8709104 renamed GeoIndex2 to GeoIndex 2016-08-29 13:02:07 +02:00
jsteemann 8fac72e8d6 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 12:52:47 +02:00
jsteemann b3ef2c8206 fix some leaks 2016-08-29 12:48:02 +02:00
Jan Steemann 7884f87a7c Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-29 12:45:11 +02:00
Jan Steemann dbd19cb48e hexify corrupted markers 2016-08-29 12:44:58 +02:00
Simran Brucherseifer dc8ced3a9b Fix comments 2016-08-29 11:52:09 +02:00
jsteemann 1b85c08b8d Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-29 11:22:24 +02:00
Kaveh Vahedipour 0c8b26f5b9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-29 08:52:31 +00:00
Michael Hackstein e444332def Removed all references to _info in TRI_collection_t. This commit does not start. Constructor is broken. 2016-08-29 10:44:31 +02:00
jsteemann b196383b6d some preparation work for response generalization 2016-08-29 10:07:31 +02:00
jsteemann 5d3946a6ba removed obsolete comment 2016-08-29 10:07:15 +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
jsteemann e8c8f286cb cleanup 2016-08-29 08:53:23 +02:00
Jan Christoph Uhde c31b93647a try to fix RestCursorHandler 2016-08-27 02:01:18 +02:00
Jan Christoph Uhde 3d26df27a0 prepare the fixing of resthandlers 2016-08-27 00:27:07 +02:00
Kaveh Vahedipour b94f17fb21 minor timing 2016-08-26 15:30:26 +00:00
Kaveh Vahedipour d7334c5616 minor timing 2016-08-26 15:29:41 +00:00
jsteemann 37258adb57 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:37:25 +02:00
jsteemann f5972cc701 moved _keyGenerator 2016-08-26 16:34:21 +02:00
Kaveh Vahedipour fb6e651525 Adding Foxx access to agency 2016-08-26 16:28:42 +02:00
Kaveh Vahedipour e07543c2e2 Adding Foxx access to agency 2016-08-26 16:25:03 +02:00
jsteemann cd666c303f Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 16:22:53 +02:00
Jan Christoph Uhde 8e56b1df7d improve logging 2016-08-26 16:22:49 +02:00
jsteemann 2ea5794a18 moved _datafileStatistics into engine 2016-08-26 16:22:41 +02:00
Michael Hackstein f473badc24 Fixed a bug where reloading a collection created an addition primary index. 2016-08-26 15:52:38 +02:00
Michael Hackstein b040edd9b4 Merge branch 'generic-col-types' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 15:35:56 +02:00
Michael Hackstein 1082963da0 Logical collection does not throw V8 exception any more. 2016-08-26 15:35:53 +02:00
jsteemann 40a07c1e4d assert that there are no indexes when primary and edge index are added 2016-08-26 15:27:13 +02:00
Jan Christoph Uhde d635b720b0 try to add statistics to VppCommTask 2016-08-26 15:15:33 +02:00
jsteemann 0f31e4ec5a do not set errno on fatal error 2016-08-26 15:04:08 +02:00
Michael Hackstein 4349c62773 Fixed index creation if an index id is given. 2016-08-26 14:58:14 +02:00
jsteemann c44649da00 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:29:45 +02:00
jsteemann afac92bc60 Merge branch 'generic-col-types' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:29:38 +02:00
jsteemann 4727c833c8 fixed some leaks 2016-08-26 14:29:31 +02:00
Michael Hackstein 957f20c4b5 Indexes should now be unloaded on onload instead of deleted. 2016-08-26 14:15:09 +02:00
Jan Christoph Uhde b30c3f8e85 Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  fix CMake so it finds the PythonInterpreter even with oder versions
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
 2016-08-26 14:09:38 +02:00
Jan Christoph Uhde a0ad27499d Merge remote-tracking branch 'origin/engine-vs-velocystream' into obi-velocystream 
* origin/engine-vs-velocystream:
  added unload() functionality for indexes (untested)
  Adding Foxx access to agenc
 2016-08-26 14:02:46 +02:00
jsteemann a31fe62c34 Merge branch 'engine-vs-velocystream' of https://github.com/arangodb/arangodb into generic-col-types 2016-08-26 14:02:27 +02:00
Michael Hackstein d546d2acf0 Fixed index mathces definition, special cases. 2016-08-26 14:00:37 +02:00
jsteemann 22b1b7b7e7 added unload() functionality for indexes (untested) 2016-08-26 14:00:03 +02:00
jsteemann 4b53310189 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-26 13:42:40 +02:00
Kaveh Vahedipour b409a1ff25 Adding Foxx access to agenc 2016-08-26 13:35:39 +02:00
Jan Christoph Uhde c2e2ff6744 Merge branch 'obi-velocystream' into obi-velocystream-agent 
* obi-velocystream:
  undo simrans change - building on linux works again
  added assertions to prevent buffer overruns
  moved _compactionLock out of TRI_collection_t
  cmake: don't allow Python 3 interpreter (gyp only works with Python 2)
  updated CHANGELOG
  throw OOM error in case no buffer can be allocated
  add note about potential performance issues
 2016-08-26 13:16:14 +02:00
Jan Christoph Uhde 3b3f33d74f Merge branch 'obi-velocystream' into engine-vs-velocystream 
* obi-velocystream:
  add note about potential performance issues
  fix usage of unique_ptr
  rename HttpServerJob -> GeneralServerJob
  improve error handling
  improve error handling
 2016-08-26 13:09:48 +02:00
Michael Hackstein 0985e7fc88 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-26 12:52:41 +02:00
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
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
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
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
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
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
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
Jan Christoph Uhde 975a3a8aa0 StatisticsAgent is no longer CommTask base - http_server tests ok! 2016-08-25 16:21:45 +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
Jan Christoph Uhde 2ba4901b86 fist changes to get request agents working 2016-08-25 13:28:19 +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
root c7f8046e48 raft bug. leader ship cannot be rendered to higher term and lower index. 2016-08-24 09:26:34 +00: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
Kaveh Vahedipour bb70ed3b8f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-08-19 18:00:21 +02:00
Kaveh Vahedipour 7c706ecdc8 weekend edition 2016-08-19 17:59:58 +02:00
Mark 3bd5c27c0c changes for Visual Studio 2016-08-19 17:22:57 +02:00
Andreas Streichardt 66e1bf7e4a Introduce --agency.my-address 2016-08-19 16:20:10 +02:00
jsteemann 1b0d40eff2 cppcheck 2016-08-19 15:27:47 +02:00
jsteemann ff45c3fd07 Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 15:19:51 +02:00
jsteemann 9f424553ca stub implementation for engine-specific collections 2016-08-19 15:19:23 +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
Kaveh Vahedipour 168431b6ba dumb warnings 2016-08-19 14:29:57 +02:00
Jan Christoph Uhde e2cc11e22a better reporting of errors 2016-08-19 14:23:11 +02:00
Kaveh Vahedipour 761b986312 warnings and correct handling of pool size 2016-08-19 14:19:56 +02:00
jsteemann eadf5ac842 use anonymous namespace 2016-08-19 13:55:57 +02:00
Jan Christoph Uhde 85a7d98b88 Merge branch 'obi-velocystream' of github.com:arangodb/arangodb into obi-velocystream 
* 'obi-velocystream' of github.com:arangodb/arangodb:
  fixed namespace
 2016-08-19 13:53:12 +02:00
Jan Christoph Uhde 5a236bbade fix number of payloads 2016-08-19 13:52:46 +02:00
jsteemann 59e65b060c cppcheck 2016-08-19 13:51:48 +02:00
Kaveh Vahedipour 4570320a5b dumb warnings 2016-08-19 13:44:01 +02:00
Michael Hackstein 635641d4e5 Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into engine-vs-velocystream 2016-08-19 13:15:48 +02:00
Mark 6da481ac47 fixed namespace 2016-08-19 12:43:58 +02:00
jsteemann c5e578917c removed useless include 2016-08-19 12:42:45 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Frank Celler d17f42379b fix errors during shutdown 2016-08-19 12:27:01 +02:00
Michael Hackstein 96f11c7e9f Merge branch 'engine-vs-velocystream' of github.com:arangodb/arangodb into generic-col-types 2016-08-19 12:26:07 +02:00
jsteemann e9866698aa removed JsonHelper 2016-08-19 12:24:12 +02:00
jsteemann 6580131731 Merge branch 'readcache' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-08-19 12:19:05 +02:00
Michael Hackstein 9e0d8ab477 Fixed another failed nullptr handling in LogicalCollection cluster case. 2016-08-19 11:27:44 +02:00
Michael Hackstein 68faea4ce2 Fixed undefined behaviour in rest error creation 2016-08-19 11:15:08 +02:00
Michael Hackstein 5f807900d7 Implemented updated of LogicalCollectionInfo. Right now this is only used in Cluster Mode 2016-08-19 11:14:23 +02:00
Kaveh Vahedipour b865f3a41c pool size default 2016-08-19 11:13:25 +02:00
jsteemann c5f151da5c Merge branch 'devel' of https://github.com/arangodb/arangodb into readcache 2016-08-19 11:01:15 +02:00
Kaveh Vahedipour 4177f6bef0 gossipping logs move from debug to trace 2016-08-19 10:59:26 +02:00
Kaveh Vahedipour 93995eba84 agency startup changed to bootstrapping 2016-08-19 10:45:52 +02:00
Kaveh Vahedipour fc67a7783f shutdown fixed 2016-08-19 10:26:57 +02:00
Michael Hackstein 82bc34db4d The logical colleciton now knows it's journalSize 2016-08-19 10:21:15 +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
Michael Hackstein 3f01c4680d Fixed a bug in collectionNameResolver. It now returns cid 0 for not found collections in cluster again. 2016-08-19 09:51:42 +02:00
Kaveh Vahedipour d8cb8a33ac pushing corrected unittest script and cluster startup scripts 2016-08-19 09:49:44 +02:00
Jan Christoph Uhde 104b71fa6f fix bug when trying to copy member form nullptr request 
response is generated by simple error so there is no request available
 2016-08-19 09:07:00 +02:00
Kaveh Vahedipour d54c090a01 missing source file added 2016-08-19 08:41:19 +02:00
Kaveh Vahedipour b3ba9be57f we have a bootstrapping agency 2016-08-19 06:05:33 +02:00
Kaveh Vahedipour 0bdfdc7cb6 votes are processed correctly again 2016-08-19 05:11:52 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
Kaveh Vahedipour 11776faa54 correct persistence after agency activation 2016-08-18 18:23:20 +02:00
Michael Hackstein efce89e3f4 Fixed database/collection lookup in cluster. It did not get the correct vocbase when using a Database other than _system 2016-08-18 17:39:25 +02:00
jsteemann 1b11096060 remove Json/JsonHelper/TRI_json_t 2016-08-18 17:28:43 +02:00
Kaveh Vahedipour c4bff54771 Merge branch 'devel' of https://github.com/arangodb/arangodb into agency-startup 2016-08-18 17:25:24 +02:00
Kaveh Vahedipour 15d2e9285c it seems as if the bootstrap is good to go 2016-08-18 17:24:32 +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