1
0
Fork 0
Commit Graph

12540 Commits

Author SHA1 Message Date
jsteemann fa917937c4 do not use namespaces in header files 2017-02-01 13:41:31 +01:00
jsteemann 2383548270 use initializer 2017-02-01 13:03:59 +01:00
jsteemann fae1f7ba63 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-02-01 13:00:34 +01:00
jsteemann e9709763f7 removed a left-over usleep 2017-02-01 13:00:18 +01:00
jsteemann e2a312450f fix out-of-memory handling at startup 2017-02-01 13:00:05 +01:00
jsteemann 5939ff249f remove now unused files 2017-02-01 12:39:24 +01:00
jsteemann c314f9190d added assertions 2017-02-01 11:44:30 +01:00
jsteemann 769d58ec82 fix MSVC compile warning 2017-02-01 10:57:54 +01:00
jsteemann 9a8e2bc57a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-02-01 10:39:42 +01:00
jsteemann 126f9a21fe fix index ids 2017-02-01 10:39:21 +01:00
Max Neunhoeffer 48be25bdde Add diagnostics to see background jobs that do not run.
If a job is only executed more than 5 seconds later than it was
scheduled, an error is logged.
2017-02-01 09:36:33 +01:00
jsteemann fc4977157d fix static_assert in MSVC 2017-01-31 17:35:31 +01:00
jsteemann 600bd60edd fix MSVC compile warnings 2017-01-31 17:02:17 +01:00
jsteemann b8e1eb8d47 fix compile warnings in MSVC 2017-01-31 16:47:22 +01:00
jsteemann c62b952beb fixed class/struct confusion 2017-01-31 16:46:59 +01:00
jsteemann 62827583d4 try to fix compile error 2017-01-31 16:12:16 +01:00
jsteemann 62145baa2a Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-31 15:54:39 +01:00
Michael Hackstein e98c7d3b7c Merge branch 'devel' of github.com:arangodb/arangodb into devel 2017-01-31 15:31:25 +01:00
Michael Hackstein ef8ca78dfb Added more tests for traversal optimization. Fixed an crash-error when optimizing . 2017-01-31 15:30:59 +01:00
jsteemann fc5d7311b5 use general BlockCollector in all cases in which it is appropriate 2017-01-31 15:03:24 +01:00
jsteemann 4fa2a6a1d0 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 14:57:17 +01:00
jsteemann 4d06ac7648 use std::string 2017-01-31 14:57:05 +01:00
Max Neunhoeffer 460e27d31c Log level down to debug for Schmutz-Startung. 2017-01-31 14:39:34 +01:00
Michael Hackstein 7ab8e823d6 Added a forgotten VPackBuilder.close() in Traversalnode to VPack. This caused the query planner to fail at certain cases 2017-01-31 14:33:10 +01:00
Max Neunhoeffer c4d5d982c7 Fix bugs of threads not announcing that they are busy. 2017-01-31 14:07:54 +01:00
jsteemann 37b7a18040 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 13:55:55 +01:00
jsteemann eec173c4ee optimize `IS_NULL(x)` to `x == null` 2017-01-31 12:17:35 +01:00
jsteemann 3c2a466c48 use block collector for IndexBlock 2017-01-31 12:16:53 +01:00
jsteemann 8b62579789 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 10:04:56 +01:00
Kaveh Vahedipour b7b8a6cf88 lowering log output in agencycomm 2017-01-31 09:37:47 +01:00
jsteemann 991e65dd37 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-31 09:07:47 +01:00
jsteemann d7f2ee7e2f fix comment 2017-01-31 09:07:34 +01:00
Max Neunhoeffer d8171651bf Fix assert. 2017-01-31 09:03:48 +01:00
Max Neunhoeffer d8d8ef9755 Add an assertion. 2017-01-31 09:03:41 +01:00
jsteemann 5cb4e3e685 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 08:51:42 +01:00
jsteemann 6598828449 Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api 2017-01-31 00:33:42 +01:00
Max Neunhoeffer 91c97d301a Lower timeout in query registry to 10min from 1h. 2017-01-30 23:59:46 +01:00
Max Neunhoeffer 9525f46b2b Some cleanup of comments for better understandability. 2017-01-30 23:22:58 +01:00
jsteemann 16c19ad927 cppcheck 2017-01-30 23:02:05 +01:00
jsteemann 52655b0cd9 Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 22:54:18 +01:00
jsteemann 4172b3e0e4 turn down loglevel a bit 2017-01-30 22:54:00 +01:00
Max Neunhoeffer cbae239aea Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel 2017-01-30 22:32:40 +01:00
Max Neunhoeffer af3c206d89 Try to solve sporadic shutdown blockage in heartbeat thread. 2017-01-30 22:32:05 +01:00
Dan Larkin b4ec71d33a Fixed compilation bug 2017-01-30 14:26:06 -05:00
Dan Larkin 5b736dc319 Changed index-filling to dispatch batch insertion tasks to scheduler, obsoleted index-threads option. 2017-01-30 13:05:10 -05:00
jsteemann ec1e05975f Merge branch 'devel' of https://github.com/arangodb/arangodb into devel 2017-01-30 17:06:13 +01:00
jsteemann cb9bf7c2ff added obsolete parameter optionality 2017-01-30 17:06:02 +01:00
Wilfried Goesgens 73f4f04f8e fix binary name 2017-01-30 16:56:55 +01:00
jsteemann ba398494d0 make option hidden 2017-01-30 16:01:12 +01:00
jsteemann 4b98e961f6 fix loglevel 2017-01-30 15:51:37 +01:00