Commit 3df3199
committed
Save heap when dynamically mapping arrays
We can do the merging more eagerly to save on heap at the cost of some cycles (though the overhead should be reasonably limited
because we save a little down the line if all the mappers are the same instance).
Obviously a bit of a dirty trick but this logic is quite brittle now with things like the
vector mapper special case and this seems to me like the shortest path to avoiding runaway heap use.
This yet again shows the need to implement actual mapper equality checks and stronger deduplication
for them to avoid having mapping merging be our only mechanism for deduplication.
closes #1175931 parent 3057168 commit 3df3199
File tree
3 files changed
+32
-5
lines changed- server/src
- internalClusterTest/java/org/elasticsearch/index/mapper
- main/java/org/elasticsearch/index/mapper
- test/java/org/elasticsearch/index/mapper
3 files changed
+32
-5
lines changedLines changed: 3 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
122 | 122 | | |
123 | 123 | | |
124 | 124 | | |
125 | | - | |
126 | | - | |
127 | | - | |
| 125 | + | |
| 126 | + | |
| 127 | + | |
128 | 128 | | |
129 | 129 | | |
130 | 130 | | |
| |||
Lines changed: 27 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| |||
312 | 314 | | |
313 | 315 | | |
314 | 316 | | |
| 317 | + | |
| 318 | + | |
| 319 | + | |
| 320 | + | |
| 321 | + | |
315 | 322 | | |
316 | 323 | | |
317 | 324 | | |
| |||
320 | 327 | | |
321 | 328 | | |
322 | 329 | | |
| 330 | + | |
| 331 | + | |
| 332 | + | |
| 333 | + | |
| 334 | + | |
| 335 | + | |
| 336 | + | |
| 337 | + | |
| 338 | + | |
| 339 | + | |
| 340 | + | |
| 341 | + | |
| 342 | + | |
| 343 | + | |
| 344 | + | |
| 345 | + | |
| 346 | + | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
323 | 350 | | |
324 | 351 | | |
325 | 352 | | |
| |||
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
37 | 37 | | |
38 | 38 | | |
39 | 39 | | |
40 | | - | |
41 | | - | |
| 40 | + | |
| 41 | + | |
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
| |||
0 commit comments