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

4608 Commits

Author SHA1 Message Date
Kaveh Vahedipour 51b63027fe should not overimplement LoggerStream. allows unified behaviour of std::cout and LOG_TOPIC(.,.) 2017-03-01 11:51:27 +01:00
jsteemann cf5d20ddee Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-28 17:02:42 +01:00
jsteemann b6a265068a fix velocypack-over-HTTP responses 2017-02-28 17:01:59 +01:00
jsteemann fd516e1e1b give up waiting for V8 context after some time 2017-02-27 23:08:49 +01:00
jsteemann e6c66ae26e more performance logging 2017-02-27 23:08:18 +01:00
jsteemann 695d215b0c ensure that JobGuards are started and ended in the same thread 2017-02-27 22:41:58 +01:00
jsteemann 5e0fd0c8b2 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-27 22:27:51 +01:00
jsteemann b872aa59fd simplified performance logging 2017-02-27 22:22:41 +01:00
jsteemann d0df1952e8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-24 17:51:59 +01:00
jsteemann d4d3a00ff0 disable color escape sequences on Windows 2017-02-24 10:52:01 +01:00
jsteemann 6c4ecf28aa also sanitize vpack custom types when sending vpack data to clients 2017-02-23 10:12:20 +01:00
jsteemann eb293ba0d3 speedup for object comparisons 2017-02-21 17:21:25 +01:00
jsteemann 43d797132a improved error messages in case config file is not found 2017-02-21 16:19:26 +01:00
jsteemann c0c9fa4b19 Merge branch 'devel' of https://github.com/arangodb/arangodb into plan-cache 2017-02-21 12:18:55 +01:00
jsteemann 8941a3a177 simplifications for the ReadLocker 2017-02-21 12:06:44 +01:00
jsteemann 2aa6fda6d3 logger improvements (allows logging of std::pairs) 2017-02-21 12:06:27 +01:00
Wilfried Goesgens b75a9e7be0 fix calculation of relative include files - look in same directory as the current file 2017-02-20 16:43:54 +01:00
Jan Christoph Uhde 21cb8e3217 Merge branch 'engine-api' of github.com:arangodb/arangodb into obi-engine-api 
* 'engine-api' of github.com:arangodb/arangodb:
  Removed readRevision from LogicalCollection. You only get readDocument with a token. Moved it's logic into MMFilesCollection. removed the ignoreWal parameter from readDocumentConditional. It was always true anyways...
  Moved pre-commit document modifications out of logical-collection into the physical collection. They are only relevant when actually writing to disc.
  Moved useSecondaryIndexes check from Logical to MMFiles collection
  Some cleanup in Logical collection imports
  Moved index filling into the MMFiles collection
  changelog
  grunt build
  css
  ui: queries now using cursors api - issue #2065
  remove crosscompile hack - it doesn't work anymore
  updated CHANGELOG
  add changlog entry for stacktrace log messages
  clean up write lockers a bit
  fix too early closing of sockets
  Moved restoreIndex to Physical collection.
  Fix a shell script used during build.
  Lower log level to debug in shutdown message.
  fix spelling
  Moved saveIndex logic into the physical collection
  fix potential deadlock

Conflicts:
	arangod/MMFiles/MMFilesCollection.cpp
	arangod/MMFiles/MMFilesCollection.h
	arangod/VocBase/LogicalCollection.cpp
 2017-02-18 19:10:45 +01:00
Jan Christoph Uhde 2d5e74f7f6 move journaize() to PhysicalCollection 
MMFilesCollection ctor might be buggy
 2017-02-17 20:06:47 +01:00
jsteemann 3e7432ccd6 clean up write lockers a bit 2017-02-16 15:44:45 +01:00
jsteemann e7a0b181e6 fix potential deadlock 2017-02-16 12:04:36 +01:00
jsteemann c69eb0a7d5 protect some properties 2017-02-15 11:14:56 +01:00
jsteemann 581e280e2e log fatal, err and warn always in non-threaded mode 2017-02-15 00:09:02 +01:00
jsteemann 35fef99b61 nicer printing of possible values 2017-02-14 22:20:45 +01:00
jsteemann 8a2e353f3d move encoding functions into their own file 2017-02-14 12:57:15 +01:00
jsteemann c5fc5d3fe8 added assertions 2017-02-14 12:01:52 +01:00
jsteemann ff956f1696 expose rawSuffix 2017-02-14 11:25:12 +01:00
Kaveh Vahedipour 26ed19ca4d bug in randomgenerator for 64bit int 2017-02-13 17:25:00 +01:00
Frank Celler 9f63ca6d21 added topic SSL 2017-02-12 18:19:24 +01:00
Frank Celler 1298c0eaf5 fixed include to include the file at the place where include is issued 2017-02-10 17:17:11 +01:00
jsteemann 9708f7c4f1 fix some log topics 2017-02-10 11:34:44 +01:00
jsteemann 0417ed5a82 fix segfault 2017-02-10 11:34:36 +01:00
jsteemann 6ab65166a5 fix global loglevel adjustment 2017-02-10 11:02:29 +01:00
jsteemann d024a6d00a remove logging for non-topics 2017-02-10 09:32:50 +01:00
jsteemann d23084754c remove unused variable 2017-02-09 12:31:58 +01:00
jsteemann a896661714 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-09 12:10:32 +01:00
jsteemann 4da72d7aa9 added code for TLS tracing 2017-02-09 12:10:19 +01:00
jsteemann de75b9ec91 better help for options 2017-02-09 11:56:31 +01:00
jsteemann 15f371e5d1 fix typo 2017-02-09 11:54:07 +01:00
Michael Hackstein 7de0142fc1 Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-02-08 17:34:34 +01:00
Wilfried Goesgens d8cd84872f fix windows compile 2017-02-08 17:21:31 +01:00
Michael Hackstein 5dfd652d64 Merge branch 'devel' of github.com:arangodb/arangodb into engine-api 2017-02-08 15:57:30 +01:00
Wilfried Goesgens a3ac94d3b2 fix locating of relative ICU files 2017-02-08 15:18:16 +01:00
jsteemann 4fa4259c59 hide some infrequently used config options by default 2017-02-08 14:43:59 +01:00
Max Neunhoeffer bde48d524d Change undocumented behaviour in case of invalid rev in JS document ops. 
An invalid rev should lead to a 1200 ("conflict") error rather than a
1239 ("illegal document revision") error. This is more intuitive and
in line with the corresponding change in the HTTP API. No tests needed
adjustment.
 2017-02-08 10:59:04 +01:00
jsteemann 0040bc91e1 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-08 01:07:00 +01:00
jsteemann 9d0a210545 prevent memleaks in C++ UnitTests 2017-02-07 17:30:30 +01:00
jsteemann 073b53b20f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 14:50:46 +01:00
Wilfried Goesgens 0932d51904 Merge branch 'devel' of github.com:arangodb/ArangoDB into v8_subsubmodule 2017-02-07 13:48:57 +01:00
jsteemann f213d67de0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-07 13:04:40 +01:00