Michael Hackstein
72b8945254
Merge branch 'engine-api' of github.com:arangodb/arangodb into engine-api
2017-01-28 21:20:16 +01:00
Michael Hackstein
0027bc54c8
Create a StorageEngine-specific IndexFactory. Moved EnhanceIndexJson v8 -> IndexFactory.
2017-01-28 21:19:50 +01:00
Kaveh Vahedipour
7954512878
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-01-28 20:34:32 +01:00
Kaveh Vahedipour
bcfec215b8
tested restart from 3.1 database
2017-01-28 20:32:29 +01:00
Max Neunhoeffer
75e6714d19
Merge branch 'devel' of ssh://github.com/arangodb/arangodb into devel
2017-01-28 20:29:35 +01:00
Max Neunhoeffer
6993ca32c7
Add more debugging output on log level info around Schmutz script.
2017-01-28 20:28:58 +01:00
Kaveh Vahedipour
f98701a598
localId overrules persisted UUID
2017-01-28 12:25:57 +01:00
Kaveh Vahedipour
60e0622793
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-01-28 12:05:37 +01:00
Kaveh Vahedipour
daa1856aa0
localId overrules persisted UUID
2017-01-28 12:05:31 +01:00
Max Neunhoeffer
fbb32650a3
Prevent log spam.
2017-01-28 01:43:15 +01:00
Frank Celler
864bd451cf
wait longer for figures
2017-01-28 00:25:30 +01:00
jsteemann
11a36e48ac
fix wrong V8 version number
2017-01-28 00:21:27 +01:00
jsteemann
db9b4ace6d
fix lock timeout calculation
2017-01-28 00:05:34 +01:00
Max Neunhoeffer
542e9a0f10
Fix LogicalCollection::toVelocyPack after merge chaos.
2017-01-27 22:32:06 +01:00
Michael Hackstein
6aeb23ef2a
Added new traversal optimizer test.
2017-01-27 19:52:43 +01:00
Michael Hackstein
dcdc495c63
Fixed unintentially commited typo.
2017-01-27 19:30:26 +01:00
Michael Hackstein
2fe7a93f6e
Improved TraversalCondition finder. It now does not crash anymore when filtering on TraverserOutput e.g. p.edges[0] == p.edges[1] and can make use of Array Indexes in certain cases.
2017-01-27 19:22:17 +01:00
Michael Hackstein
57b6174ff1
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-01-27 17:57:21 +01:00
jsteemann
10c073daf5
updated CHANGELOG
2017-01-27 17:34:22 +01:00
jsteemann
044499e454
added startup option --query.memory-limit
2017-01-27 17:33:57 +01:00
Max Neunhoeffer
d8eeae13e0
Try to fix drop database bug with Collector.
...
Wait for a phase in the Collector with no queued operations before
actually destroying the LogicalCollections. This is to make sure that
no more DOCUMENT ditches are around.
2017-01-27 16:57:51 +01:00
jsteemann
09851cdf75
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-27 16:37:32 +01:00
jsteemann
65c45813e2
refactoring
2017-01-27 16:37:02 +01:00
Max Neunhoeffer
3289dd3151
Merge branch 'devel' of ssh://github.com/ArangoDB/ArangoDB into devel
2017-01-27 16:31:15 +01:00
Max Neunhoeffer
18f91ef09e
Debug log if an msync takes too long.
2017-01-27 16:30:44 +01:00
jsteemann
4d5875f42f
refactoring
2017-01-27 15:57:22 +01:00
Kaveh Vahedipour
693a1eddf4
Merge branch 'devel' of https://github.com/arangodb/arangodb into devel
2017-01-27 15:29:35 +01:00
Kaveh Vahedipour
3f3633bd2c
supervision to proper preconditioning of jobs on plan
2017-01-27 15:29:22 +01:00
Frank Celler
0457e2f587
safety check
2017-01-27 14:02:16 +01:00
jsteemann
67ac80a469
fixed after merge
2017-01-27 13:55:50 +01:00
jsteemann
bbca3dde1c
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-27 13:52:36 +01:00
jsteemann
a1a829451c
refactoring
2017-01-27 13:52:23 +01:00
Frank Celler
9a5a50e2d5
more cleanup on statistics
2017-01-27 13:17:08 +01:00
jsteemann
d9f0496cf4
fix segfault
2017-01-27 13:10:23 +01:00
jsteemann
f37a2d8014
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-27 12:11:57 +01:00
jsteemann
499add4735
refactoring
2017-01-27 12:11:44 +01:00
Frank Celler
4a0282cc2b
added missing mutex
2017-01-27 12:03:31 +01:00
Frank Celler
35c1b2258d
fixed keep-alive = false
2017-01-27 11:44:48 +01:00
hkernbach
c1a04dabb6
ui database refresh fix
2017-01-27 11:39:35 +01:00
Frank Celler
71ba997fba
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-01-27 11:30:39 +01:00
Frank Celler
30da97f2a5
RestHandler destructor should be virtual
2017-01-27 11:30:25 +01:00
Kaveh Vahedipour
ab22ffa8ee
shard jobs should check for the plan to be the same as expected
2017-01-27 11:27:45 +01:00
jsteemann
1089c7b2fd
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-27 11:27:16 +01:00
Max Neunhoeffer
8c7a0b5a48
Fix a used after free error.
2017-01-27 11:17:42 +01:00
jsteemann
f0d4770879
Merge branch 'devel' of https://github.com/arangodb/arangodb into engine-api
2017-01-27 11:16:37 +01:00
jsteemann
972496a2af
refactoring
2017-01-27 11:16:21 +01:00
Frank Celler
c4a62cb108
release from unique_ptr when adding as response
2017-01-27 10:52:00 +01:00
Michael Hackstein
d5d316b971
Merge branch 'devel' of github.com:arangodb/arangodb into devel
2017-01-27 09:58:02 +01:00
Michael Hackstein
9b5810d84b
The TraversalConditionFinder will now normalize all filters, before checking if they are valid
2017-01-27 09:57:46 +01:00
Michael Hackstein
f7ce2c9de6
Added a name to the dump indention variable.
2017-01-27 09:55:15 +01:00