jsteemann
4086c65e45
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-23 12:36:58 +01:00
jsteemann
90d81af098
fix compile error
2017-03-23 12:33:47 +01:00
Max Neunhoeffer
b07f302ce5
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-03-23 12:33:31 +01:00
Max Neunhoeffer
32953a4a97
Revert "Fix locking of shards in TraverserEngines."
...
This reverts commit 467088b8af
.
2017-03-23 12:33:11 +01:00
jsteemann
e5543f5ea2
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-23 12:25:50 +01:00
Max Neunhoeffer
467088b8af
Fix locking of shards in TraverserEngines.
2017-03-23 12:23:40 +01:00
jsteemann
e37ac1c4f8
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-23 12:18:36 +01:00
jsteemann
ed40426f09
increase default timeout from 30 to 900 seconds
2017-03-23 12:18:24 +01:00
Max Neunhoeffer
66a8ea1538
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-03-23 12:15:40 +01:00
jsteemann
6bb9863108
fixed issue #2392
2017-03-23 12:10:11 +01:00
Max Neunhoeffer
64a18f78e0
Fix SortedCollectBlock skipping issue. Resolves #1482 .
2017-03-23 12:08:54 +01:00
Max Neunhoeffer
09cc428e00
Increase standard intra cluster timeout from 90 to 120s.
2017-03-23 10:09:12 +01:00
Simon Grätzer
bac7081983
Pregel: Reduced logspam
2017-03-22 17:55:43 +01:00
jsteemann
e270ddb262
fixed failing test
2017-03-22 14:46:10 +01:00
jsteemann
d9d9eaac60
fixed two cluster tests
2017-03-22 14:03:27 +01:00
jsteemann
71bf18dd12
renaming
2017-03-22 13:01:40 +01:00
jsteemann
8e51e3ba50
fix slow queries
2017-03-22 11:20:07 +01:00
jsteemann
fbb14ceffc
added db._engine()
2017-03-22 11:19:31 +01:00
baslr
9582d6823a
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-22 10:50:38 +01:00
jsteemann
358e18d5af
fix wrong assertions
2017-03-22 09:45:02 +01:00
Frank Celler
a25932293b
added assert and only compact if no request is in flight
2017-03-22 08:52:37 +01:00
jsteemann
7659519606
finalize class
2017-03-22 08:36:41 +01:00
jsteemann
9960843fef
fix logic error
2017-03-22 08:36:33 +01:00
jsteemann
058e6002d3
try to fix shutdown races
2017-03-22 08:31:49 +01:00
baslr
8fa6f9c5e7
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-21 23:27:26 +01:00
Frank Celler
e997b791a8
fixed lost HTTP requests
2017-03-21 22:51:49 +01:00
Dan Larkin
6cedc0ba53
Merge branch 'views' into devel
2017-03-21 11:40:42 -04:00
Dan Larkin
85132e0eaf
Finished adding view support to ArangoShell.
2017-03-21 11:40:14 -04:00
Jan Christoph Uhde
f21f88c0d4
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
Pregel: fixed catch test
unify case in error messages
move collection keys into engine
2017-03-21 15:28:31 +01:00
Jan Christoph Uhde
cb3dd9683f
fix logtopic
2017-03-21 15:27:52 +01:00
jsteemann
d43a4073ad
unify case in error messages
2017-03-21 14:24:47 +01:00
jsteemann
63868b4378
move collection keys into engine
2017-03-21 14:23:29 +01:00
Jan Christoph Uhde
5a60a52db9
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
...
* 'devel' of https://github.com/arangodb/arangodb :
move replication-dump into engine
try to fix shutdown races
changelog
ui - fixed some event issues
moved export into engine
move attributes into engine
2017-03-21 14:10:43 +01:00
Jan Christoph Uhde
1c9ad06aa6
Avoid name resolution if given host is a valid address
2017-03-21 14:07:01 +01:00
jsteemann
7fb536387d
move replication-dump into engine
2017-03-21 13:55:57 +01:00
jsteemann
93423ba273
try to fix shutdown races
2017-03-21 12:59:46 +01:00
jsteemann
ec0e5e39a7
moved export into engine
2017-03-21 11:41:50 +01:00
jsteemann
b8e011eee5
move attributes into engine
2017-03-21 10:31:50 +01:00
baslr
c0fa6366f5
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-21 02:17:46 +01:00
jsteemann
6ba59eda5b
index API change
2017-03-20 14:40:54 +01:00
Simon Grätzer
1ab8c44330
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-20 12:41:32 +01:00
baslr
77d693d065
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-20 12:39:40 +01:00
jsteemann
c51f27c201
make waiting for free V8 contexts abort after 90 seconds
2017-03-20 12:38:04 +01:00
Simon Grätzer
7bc01b46e0
Pregel: Changed scheduler post call
2017-03-20 12:22:16 +01:00
jsteemann
29905e0e8b
constify and lower default lock timeout for collections
2017-03-20 11:37:39 +01:00
jsteemann
2ea436b3e9
a bit more debug messages
2017-03-20 11:33:27 +01:00
jsteemann
9349005191
wait longer before scheduler shutdown
2017-03-20 11:05:24 +01:00
baslr
90341c5efb
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-18 04:14:39 +01:00
baslr
bc14d53ff5
ldap authwork
2017-03-18 04:14:15 +01:00
Simon Grätzer
d778ab4587
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 19:54:38 +01:00
Simon Grätzer
553421196a
Pregel: Migrated to boost deadline_timer
2017-03-17 19:54:33 +01:00
jsteemann
5b1409dd40
make registerViewImplementation static
2017-03-17 17:24:09 +01:00
Simon Grätzer
79c2e87bac
Pregel: code reformatting
2017-03-17 16:21:25 +01:00
Simon Grätzer
782d63b79f
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 16:13:53 +01:00
jsteemann
8282aa61df
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 16:03:29 +01:00
jsteemann
6528ded053
commented the interface
2017-03-17 16:03:21 +01:00
Kaveh Vahedipour
68178599e0
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 15:59:31 +01:00
Simon Grätzer
31f30378cf
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 15:55:07 +01:00
Simon Grätzer
162a0476c3
Pregel: Removed ThreadPool, added test for memory mapping
2017-03-17 15:55:01 +01:00
Kaveh Vahedipour
a87fb6d71e
restructured the leadership takeover
2017-03-17 15:44:58 +01:00
jsteemann
5d6dcb3bf1
re-added constructionguard
2017-03-17 15:44:22 +01:00
jsteemann
a2a14652b2
re-added ConstructionGuard
2017-03-17 15:12:14 +01:00
jsteemann
650d1afad5
fix leaks during cleanup
2017-03-17 13:38:23 +01:00
Simon Grätzer
18989d1026
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 13:26:19 +01:00
jsteemann
1d772584b7
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-17 12:35:00 +01:00
Frank Celler
31de362d84
switch to uint64 for hidden options --server.minimal-threads and --server.maximal-threads
2017-03-17 12:34:47 +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
Frank Celler
5759414ec1
because VST supports pipelining, allows queue the request in the scheduler
2017-03-17 09:08:01 +01:00
Dan Larkin
a233b949c3
Updated rest handler and tests.
2017-03-16 22:36:15 -04:00
Dan Larkin
508aabeafe
Updated schema, added LoggerView, and added support for implementation properties.
2017-03-16 19:45:48 -04:00
Simon Grätzer
68f32177c6
Added test for mapped files in TypedBuffer.h
2017-03-16 17:17:05 +01:00
jsteemann
fd07af5216
renamed index type
2017-03-16 17:00:19 +01:00
jsteemann
e22586f40c
Merge branch 'devel' of https://github.com/arangodb/arangodb into views
2017-03-16 16:45:31 +01:00
jsteemann
1932fd1975
moved files
2017-03-16 16:45:02 +01:00
jsteemann
a87b8c4f25
generalize usleep argument
2017-03-16 16:27:40 +01:00
jsteemann
2c0f9d9369
Merge branch 'devel' of https://github.com/arangodb/arangodb into views
2017-03-16 15:47:48 +01:00
jsteemann
9eb8942af9
fix startup dependencies
2017-03-16 15:47:04 +01:00
Max Neunhoeffer
00cf48b638
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-03-16 14:13:44 +01:00
Max Neunhoeffer
d4d532faa4
Silence a compiler warning.
2017-03-16 14:13:28 +01:00
Simon Grätzer
a01c529d8a
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-16 14:12:50 +01:00
Simon Grätzer
5cc259e2a1
Pregel micro optimization
2017-03-16 14:12:43 +01:00
Max Neunhoeffer
bbcc20378a
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-03-16 13:54:02 +01:00
Max Neunhoeffer
428b6aa67f
Port thread fixes from 3.1 to devel.
2017-03-16 13:53:40 +01:00
baslr
5179c39fec
if enterprise add LdapFeature
2017-03-16 13:34:13 +01:00
jsteemann
060fe10d53
expose registerViewImplementation to the outside world
2017-03-16 13:00:33 +01:00
jsteemann
979f003538
added ViewTypesFeature
2017-03-16 12:50:22 +01:00
jsteemann
25a380f77c
Merge branch 'devel' of https://github.com/arangodb/arangodb into views
2017-03-16 12:50:11 +01:00
Simon Grätzer
a823442811
Changed Pregel LogLevels to debug where appropriate
2017-03-16 12:25:24 +01:00
jsteemann
ea0be728d7
fix compile error
2017-03-16 12:16:29 +01:00
jsteemann
0bb2711abb
Merge branch 'engine-api' of https://github.com/arangodb/arangodb into views
2017-03-16 12:16:23 +01:00
baslr
1a8c930179
Merge remote-tracking branch 'origin/devel' into feature/ldap-auth
2017-03-16 12:15:26 +01:00
baslr
8244d93594
ldapauth: upsert user into _users
2017-03-16 11:21:15 +01:00
Simon Grätzer
215937a884
Fixing cppcheck and jslint warnings
2017-03-16 11:20:35 +01:00
jsteemann
238fcae46a
some simplifications
2017-03-16 10:54:08 +01:00
Simon Grätzer
e6ad88f2a3
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-03-16 10:52:08 +01:00
Simon Grätzer
f2c133d5f6
Fix pregel test
2017-03-16 10:52:02 +01:00
jsteemann
6b7b4d1593
defer access to PersistentIndexFeature until later
2017-03-16 10:34:54 +01:00