1
0
Fork 0
Commit Graph

4769 Commits

Author SHA1 Message Date
Jan Christoph Uhde 60956dc09c fix windows build 2017-04-06 10:17:17 +02:00
Michael Hackstein 039c6fbd16 Moved all logic of lib/Basics/PathFinder into seperated files in arangod/Graph. Preparation to detemplatify this code as we need some arangodb interna in it for Slice mangement 2017-04-05 15:31:44 +02:00
jsteemann 9f330881a2 constify method 2017-04-05 09:00:06 +02:00
jsteemann 429869d4f4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-04 15:27:38 +02:00
hkernbach c270667062 added log topic attribute to /_admin/log api 2017-04-04 12:06:44 +02:00
jsteemann a0cca4d295 remove usleeps 2017-04-03 15:15:51 +02:00
jsteemann 0c1ef188ea Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 15:11:50 +02:00
Simon Grätzer cf4294c9ca Integrated counters with collections 2017-04-03 13:24:22 +02:00
jsteemann e0ec315d38 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-04-03 13:20:02 +02:00
jsteemann dd9ea4b781 fix parsing for URLs starting with ldap:// 2017-04-03 13:06:31 +02:00
Jan Christoph Uhde 1c6e21a028 add engines LogTopic 2017-03-31 13:31:06 +02:00
Jan Christoph Uhde 95007fe28e Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api-arango-result
* 'engine-api' of https://github.com/arangodb/arangodb: (46 commits)
  Merged RocksDBPathBasedIndex into RocksDBVPackIndex.
  fix handling of externals
  fix toArray()
  fix returning documents
  Added hash-, skip list, persistent indexes
  harmonize filtering - filter on full filename.
  mini modifications
  standardize starting of servers for replication tests
  Edge index compliant with design doc
  another fix for #2404
  Moved „removeLargeRange“ method to commons
  Added length byte to IndexValue keys.
  fixed issue #2404
  Added drop to primary index
  Added drop() to indexes
  Fixes a coordinator crash in Clustered Traversal. In case of failover during query planning.
  Fixed edge index
  Expand on CORS documentation
  Let ArangoDB handle the allow-credentials header
  make the authentication tests run on directories
  ...
2017-03-30 19:46:17 +02:00
Jan Christoph Uhde 13d83da06f improve arangodb::Result 2017-03-30 14:58:58 +02:00
Jan Christoph Uhde b83ae2ab82 refactor some code to make use of arangodb::Result 2017-03-30 09:39:21 +02:00
jsteemann a0adeed1c3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 18:14:40 +02:00
Frank Celler 3f0915b436 do not require config for --version 2017-03-29 17:52:36 +02:00
jsteemann 3ff4f15a19 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:55 +02:00
jsteemann e73417aef1 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 17:50:49 +02:00
Simon Grätzer cd9e9a13cf Path based enumerator 2017-03-29 17:33:02 +02:00
jsteemann 2a6eade215 added LDAP url parser 2017-03-29 15:34:49 +02:00
jsteemann bd4a2eb6b6 make @dothebart happier 2017-03-29 15:04:54 +02:00
jsteemann f04f6e7cd4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 12:53:26 +02:00
Jan Christoph Uhde 408d7cab12 Merge branch 'engine-api' of https://github.com/arangodb/arangodb into engine-api
* 'engine-api' of https://github.com/arangodb/arangodb:
  fixed serialization bug
  warn before we run out of file descriptors
  updated CHANGELOG
  slightly simplify logging
2017-03-29 11:22:18 +02:00
jsteemann d99945e962 use ReadWriteLockCPP11 instead of ReadWriteLock
ReadWriteLock is now a typedef for ReadWriteLockCPP11
one of the classes will finally be removed when it is known which locking concept is superior
2017-03-29 11:13:50 +02:00
Jan Christoph Uhde 796c32a341 improve error handling in some places 2017-03-29 11:04:04 +02:00
jsteemann bf6e3bddbe fix MSVC warning 2017-03-29 10:11:46 +02:00
jsteemann 383239a14f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 09:17:44 +02:00
jsteemann f728fcdbb8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-29 02:41:00 +02:00
jsteemann e3ca787992 warn before we run out of file descriptors 2017-03-29 02:35:46 +02:00
jsteemann d4752433f0 slightly simplify logging 2017-03-29 01:16:55 +02:00
jsteemann f8a01fae54 comments 2017-03-29 01:06:47 +02:00
jsteemann e1aef394d8 delete useless DEV_TIMERS, fix rwlockcpp11 2017-03-28 22:38:27 +02:00
Simon Grätzer 913b60c983 Fix usleep 2017-03-28 17:15:05 +02:00
mpv1989 4b8c880486 added OPTIONS to cors methods header 2017-03-28 16:18:53 +02:00
Simon Grätzer 9e1a181393 Edge index tax changes 2017-03-28 14:02:29 +02:00
jsteemann a460f0e3bf remove alignas 2017-03-28 10:04:51 +02:00
Simon Grätzer 1a50029592 Edge Index work 2017-03-28 00:55:59 +02:00
jsteemann 922a8af392 turn off all MMFiles features in case RocksDB engine is selected 2017-03-27 14:22:00 +02:00
Dan Larkin 1d22d25c3f Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api 2017-03-24 13:19:43 -04:00
Dan Larkin fcb3c2f91e Added method to convert RocksDB Status to ArangoDB Result. 2017-03-24 13:19:34 -04:00
jsteemann 757794029f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-24 15:25:19 +01:00
Frank Celler 1185099501 raise limit fd as much as possible, warn if too small 2017-03-24 15:13:55 +01:00
jsteemann 2aa2fd65a4 more startup 2017-03-24 14:20:51 +01:00
jsteemann 2eeccd5f09 small simplifications for error handling 2017-03-23 21:18:53 +01:00
jsteemann 02c0dcc689 properly report error locations 2017-03-23 20:18:33 +01:00
jsteemann b87cc95038 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-23 19:42:10 +01:00
jsteemann 8e4e463239 don't call throwing functions in dtor 2017-03-23 19:40:13 +01:00
jsteemann 45da5ffe9c more diagnostic output for "not implemented" 2017-03-23 14:10:00 +01:00
jsteemann fa26d8ca6c this time fix the leak properly 2017-03-17 14:45:55 +01:00
jsteemann 650d1afad5 fix leaks during cleanup 2017-03-17 13:38:23 +01:00
jsteemann e3d8ae142e some fixes for view handling 2017-03-17 11:18:46 +01:00
jsteemann c46c52d8c8 Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-17 09:31:25 +01:00
jsteemann 67c1770f3e Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-17 09:29:03 +01:00
jsteemann 8a69f5716f show collection load time in slow queries 2017-03-17 09:28:53 +01:00
jsteemann 3d5ab2b6ae Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 17:26:28 +01:00
Simon Grätzer 3f29cf356b Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-16 17:03:45 +01:00
Simon Grätzer 70401fe5db Fixed JS_KillExternal 2017-03-16 17:03:29 +01:00
jsteemann e22586f40c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 16:45:31 +01:00
jsteemann a87b8c4f25 generalize usleep argument 2017-03-16 16:27:40 +01:00
jsteemann 25a380f77c Merge branch 'devel' of https://github.com/arangodb/arangodb into views 2017-03-16 12:50:11 +01:00
jsteemann 0bb2711abb Merge branch 'engine-api' of https://github.com/arangodb/arangodb into views 2017-03-16 12:16:23 +01:00
jsteemann 238fcae46a some simplifications 2017-03-16 10:54:08 +01:00
jsteemann 1a06f1e15e initial functionality for views - unstable 2017-03-14 16:35:45 +01:00
Simon Grätzer 876bbb98f9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-13 23:27:11 +01:00
jsteemann 894a558367 try to un-mess windows build 2017-03-13 17:28:46 +01:00
Simon Grätzer 7b35f75b23 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangod/CMakeLists.txt
#	arangod/GeneralServer/GeneralServerFeature.cpp
2017-03-13 12:25:28 +01:00
jsteemann 45a68f54f8 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-13 12:10:54 +01:00
Simon Grätzer 871272d7c1 Merge from devel 2017-03-12 12:32:22 +01:00
jsteemann 25a5a9c085 allow "yes" and "no" for boolean parameters 2017-03-11 00:00:16 +01:00
jsteemann 39d2445ee3 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-10 08:13:07 +01:00
jsteemann 30651604c6 provide more info in supervisor mode 2017-03-10 08:11:09 +01:00
jsteemann 94e1a92f6f added comment 2017-03-09 16:32:27 +01:00
jsteemann 645889949c move engine-specific V8 functions into storage engine 2017-03-09 12:59:44 +01:00
jsteemann 537757d9a3 added EnumIterator 2017-03-08 23:40:57 +01:00
Simon Grätzer 67066c64ad Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-08 18:20:44 +01:00
jsteemann 3e0969da37 fix memleak 2017-03-08 17:29:15 +01:00
jsteemann f02ebfc07b Merge branch 'engine-api' of https://github.com/arangodb/arangodb into devel 2017-03-08 17:07:18 +01:00
Frank Celler 7eefdf547b simplification: FileResult does only support ok, no additional result
header only, added FileResultString class for Result that return a string
2017-03-08 13:01:20 +01:00
Simon Grätzer 2c77f42486 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-07 15:08:06 +01:00
jsteemann 058b9a6c1b make log thread smarter 2017-03-07 09:40:03 +01:00
Wilfried Goesgens a7e154b27e improve error messages when trying to create indices 2017-03-06 19:10:46 +01:00
jsteemann d55e60cb2e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:17:02 +01:00
jsteemann f6414b38ba fixed constructors 2017-03-06 17:14:22 +01:00
jsteemann 39370aac2f Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 17:04:35 +01:00
Frank Celler b14dbe6435 added base class Result and an example FileResult 2017-03-06 10:33:32 -05:00
jsteemann e27cf1bc5e Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 15:55:00 +01:00
Simon Grätzer c0a390aefe Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-03-06 15:53:43 +01:00
jsteemann f7b819579d attempt to fix clang build 2017-03-06 15:40:03 +01:00
jsteemann aba8e423b0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 14:59:46 +01:00
jsteemann bbda3fa9f5 simplified some ostream kirmes 2017-03-06 14:44:56 +01:00
jsteemann 62eee2d9bf Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 14:31:36 +01:00
jsteemann d8dcba7d48 Revert "fix compile errors in new clangs"
This reverts commit 43a32b04c4.
2017-03-06 14:30:47 +01:00
jsteemann c7acebe3c0 Revert "another attempt to fix logger issues"
This reverts commit c6c9120e33.
2017-03-06 14:30:42 +01:00
jsteemann c6c9120e33 another attempt to fix logger issues 2017-03-06 14:20:45 +01:00
jsteemann 219fb4dbcc Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-06 13:25:50 +01:00
jsteemann 43a32b04c4 fix compile errors in new clangs 2017-03-06 13:25:19 +01:00
Simon Grätzer dfd3cc3869 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
# Conflicts:
#	arangosh/Import/ImportHelper.cpp
2017-03-04 02:08:27 +01:00
jsteemann b3f11af7a4 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-03-03 17:42:22 +01:00
jsteemann b4cdafaef9 cleanup 2017-03-03 16:53:48 +01:00
jsteemann e4c27b0f44 flush log thread buffer when we're logging with fatal|err|warn levels 2017-03-03 16:53:03 +01:00