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

127 Commits

Author SHA1 Message Date
jsteemann d419d2606a prealloc _readBuffer 2016-09-02 17:01:43 +02:00
jsteemann 67de3f7bb2 work less on the heap 2016-09-02 15:51:02 +02:00
jsteemann fb04340937 Merge branch 'devel' of https://github.com/arangodb/arangodb into generic-col-types 2016-09-01 10:47:44 +02:00
jsteemann 4a911768dd fix some issues in shutdown 2016-09-01 10:46:45 +02:00
Jan Christoph Uhde 63c4986535 better exceptions form event loop 2016-08-22 08:58:16 +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
Mark 6da481ac47 fixed namespace 2016-08-19 12:43:58 +02:00
jsteemann f6ca78f9e7 removed JsonParser 2016-08-19 12:39:26 +02:00
Jan Christoph Uhde 3a9867f86d merge with frank 2016-08-19 10:00:43 +02:00
Frank Celler aed99f6b53 fixed ownership of handler 2016-08-18 23:06:36 +02:00
jsteemann ebaabdb076 Merge branch 'obi-velocystream-4' of https://github.com/arangodb/arangodb into engine-vs-velocystream 2016-07-28 16:11:26 +02:00
Frank Celler 24db83573a added thread affinity for MacOSX 2016-07-27 22:29:59 +02:00
Jan Christoph Uhde 3f57335fe4 with error 2016-07-27 11:48:21 +02:00
Jan Christoph Uhde 9965ca9c6a Merge branch 'obi-velocystream-2' into obi-velocystream-3 
* obi-velocystream-2: (21 commits)
  enable VPACK
  add some documentation
  add some documenation
  get rid fo cookies in non-http requests
  Documentation improvements
  Docs: Fix locking and isolation code examples (require db object and use AQL traversal)
  fix recovery edge case
  grunt build [ci skip]
  added edge hover event
  redirect to new gv
  ui added query execution of selected text
  gv improvements
  removed unused code path
  added convenience method getRegister()
  remove body() method from GeneralRequest
  Removing unnecessary library "z" by cross-compiling
  Adaptation of V8 architecture "arm64" with "aarch64" processor.
  Complete to __aarch64__ achritectur
  add: VppResponse
  cppcheck
  ...

Conflicts:
	arangod/GeneralServer/GeneralCommTask.cpp
	arangod/GeneralServer/GeneralCommTask.h
	arangod/GeneralServer/HttpCommTask.h
 2016-07-27 10:11:50 +02:00
Frank Celler 078457c302 cleanup of calls 2016-07-26 17:20:14 +02:00
Jan Christoph Uhde c17d6d0e3a add some documenation 2016-07-26 11:43:01 +02:00
Frank Celler 96e69b5b92 moved create of CommTask into ListenTask 2016-07-23 20:04:38 +02:00
Frank Celler 38a55ed13c Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-07-04 17:09:40 +02:00
Andreas Streichardt 76b89776fb Allow aborting cluster task startup...CTRL-C will now do a hard abort during startup 2016-06-16 16:00:43 +02:00
jsteemann e7be7730d2 fixed wrong assertion 2016-06-15 20:34:26 +02:00
jsteemann 0d2274edef Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2016-06-12 16:58:18 +02:00
Max Neunhoeffer be02c9c9fb Do not crash when registerTask is called after shutdown has begun. 2016-06-10 12:01:44 +02:00
jsteemann 90518c708b fix g++6 warning 2016-06-09 09:07:09 +02:00
Frank Celler 69e254d28a trying to fix cleanup 2016-06-06 23:53:53 +02:00
Frank Celler 16c6c2087d added unprepare 2016-06-06 18:27:51 +02:00
jsteemann 7c5e210f0c removed useless variable 2016-05-30 14:21:26 +02:00
jsteemann e171675371 avoid some unnecessary checks 2016-05-30 14:21:09 +02:00
jsteemann 4cf110db08 removed unused includes 2016-05-30 14:20:46 +02:00
jsteemann b8f99fa717 slightly adjusted wait times 2016-05-30 09:34:13 +02:00
Frank Celler c441700c20 Merge branch 'devel' of github.com:arangodb/arangodb into FMH 2016-05-22 21:45:40 +02:00
Frank Celler af0b0900af WIP 2016-05-22 21:08:37 +02:00
Frank Celler 806fce1dec WIP 2016-05-21 21:58:42 +02:00
jsteemann 7d9e93e61e removed unused includes of JsonHelper.h 2016-05-13 19:00:23 +02:00
jsteemann 98f0ad81a6 micro optimizations 2016-05-11 14:06:47 +02:00
jsteemann 0ce8599598 fixes for MSVC 2016-05-10 19:01:21 +02:00
jsteemann c1ddb9074a do not memset StringBuffers 2016-05-01 01:27:41 +02:00
jsteemann d62143ce83 make boolean command-line parameters optional 2016-04-27 11:37:42 +02:00
jsteemann dcc5825f93 cleaned up features a bit 2016-04-24 14:29:29 +02:00
Jan Steemann 38e543e0a8 cppcheck 2016-04-22 15:51:03 +02:00
Jan Steemann 943611143b fixed compile error 2016-04-22 15:36:16 +02:00
Jan Steemann 7d6994862e fixed startup/shutdown with specific features 2016-04-22 14:44:42 +02:00
Frank Celler 92dc9224c2 fixed startup 2016-04-17 16:18:03 +02:00
Frank Celler cf416c686c WIP 2016-04-16 18:44:10 -07:00
Frank Celler cd91d3654e Merge remote-tracking branch 'origin' into FMH 2016-04-15 19:01:38 -07:00
Frank Celler 3f9dd62d4c WIP 2016-04-13 12:30:18 +02:00
Frank Celler dc3e8e6bdb WIP 2016-04-12 20:27:46 +02:00
Frank Celler 922753ef3d WIP 2016-04-11 17:44:41 +02:00
Frank Celler 3d2cc31306 WIP 2016-04-11 00:05:37 +02:00
Frank Celler 1b7c47c6bc added --console 2016-04-10 13:47:53 +02:00
Jan Steemann 9f8c24b1cd Merge branch 'devel' of https://github.com/arangodb/arangodb into spdvpk 2016-04-06 15:43:27 +02:00