Commit 7743104
committed
Throw exception on duplicate mappings metadata fields
In elastic#57701 we changed mappings merging so that duplicate fields specified in mappings caused an
exception during validation. This change makes the same exception thrown when metadata fields are
duplicated. This will allow us to be strict currently with plans to make the merging more
fine-grained in a later release.1 parent eda4da1 commit 7743104
File tree
2 files changed
+6
-11
lines changed- server/src/main/java/org/elasticsearch/cluster/metadata
2 files changed
+6
-11
lines changedLines changed: 2 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
585 | 585 | | |
586 | 586 | | |
587 | 587 | | |
588 | | - | |
589 | | - | |
590 | | - | |
| 588 | + | |
591 | 589 | | |
592 | 590 | | |
593 | 591 | | |
| |||
600 | 598 | | |
601 | 599 | | |
602 | 600 | | |
603 | | - | |
604 | | - | |
605 | | - | |
| 601 | + | |
606 | 602 | | |
607 | 603 | | |
608 | 604 | | |
| |||
Lines changed: 4 additions & 5 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
949 | 949 | | |
950 | 950 | | |
951 | 951 | | |
| 952 | + | |
| 953 | + | |
952 | 954 | | |
953 | | - | |
954 | | - | |
955 | | - | |
956 | | - | |
957 | | - | |
| 955 | + | |
| 956 | + | |
958 | 957 | | |
959 | 958 | | |
960 | 959 | | |
| |||
0 commit comments