Skip to content

Commit 3d79624

Browse files
romseygeekromseygeek
authored
Revert "Don't use user-supplied type when building DocumentMapper (#50960)" (#51214)
Reverts #50960 This commit has been causing test failures during upgrade tests: specifically, an upgraded node becomes master and sends a cluster state update to a 7.x node; this node sees that the mapping version of its .tasks index is the same as the master, so asserts that the serialized mappings are the same; however, because the master has rewritten the mapping to use _docinstead oftasks`, we get an assertion failure. The logical fix is for the master to increment its mapping version when it rewrites the mapping, but there isn't a simple way to do that currently. This reverts commit 774bfb5.
1 parent 7adb286 commit 3d79624

28 files changed

+367
-336
lines changed

‎modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureFieldMapperTests.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -64,11 +64,11 @@ static int getFrequency(TokenStream tk) throws IOException {
6464
}
6565

6666
public void testDefaults() throws Exception {
67-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
67+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
6868
.startObject("properties").startObject("field").field("type", "rank_feature").endObject().endObject()
6969
.endObject().endObject());
7070

71-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
71+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
7272

7373
assertEquals(mapping, mapper.mappingSource().toString());
7474

@@ -99,12 +99,12 @@ public void testDefaults() throws Exception {
9999
}
100100

101101
public void testNegativeScoreImpact() throws Exception {
102-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
102+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
103103
.startObject("properties").startObject("field").field("type", "rank_feature")
104104
.field("positive_score_impact", false).endObject().endObject()
105105
.endObject().endObject());
106106

107-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
107+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
108108

109109
assertEquals(mapping, mapper.mappingSource().toString());
110110

@@ -135,12 +135,12 @@ public void testNegativeScoreImpact() throws Exception {
135135
}
136136

137137
public void testRejectMultiValuedFields() throws MapperParsingException, IOException {
138-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
138+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
139139
.startObject("properties").startObject("field").field("type", "rank_feature").endObject().startObject("foo")
140140
.startObject("properties").startObject("field").field("type", "rank_feature").endObject().endObject()
141141
.endObject().endObject().endObject().endObject());
142142

143-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
143+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
144144

145145
assertEquals(mapping, mapper.mappingSource().toString());
146146

‎modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeatureMetaFieldMapperTests.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,13 +44,13 @@ public void setup() {
4444
protected Collection<Class<? extends Plugin>> getPlugins() {
4545
return pluginList(MapperExtrasPlugin.class);
4646
}
47-
47+
4848
public void testBasics() throws Exception {
49-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
49+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
5050
.startObject("properties").startObject("field").field("type", "rank_feature").endObject().endObject()
5151
.endObject().endObject());
5252

53-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
53+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
5454

5555
assertEquals(mapping, mapper.mappingSource().toString());
5656
assertNotNull(mapper.metadataMapper(RankFeatureMetaFieldMapper.class));

‎modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/RankFeaturesFieldMapperTests.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
5353
}
5454

5555
public void testDefaults() throws Exception {
56-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
56+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
5757
.startObject("properties").startObject("field").field("type", "rank_features").endObject().endObject()
5858
.endObject().endObject());
5959

60-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
60+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
6161

6262
assertEquals(mapping, mapper.mappingSource().toString());
6363

@@ -85,12 +85,12 @@ public void testDefaults() throws Exception {
8585
}
8686

8787
public void testRejectMultiValuedFields() throws MapperParsingException, IOException {
88-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
88+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
8989
.startObject("properties").startObject("field").field("type", "rank_features").endObject().startObject("foo")
9090
.startObject("properties").startObject("field").field("type", "rank_features").endObject().endObject()
9191
.endObject().endObject().endObject().endObject());
9292

93-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
93+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
9494

9595
assertEquals(mapping, mapper.mappingSource().toString());
9696

‎modules/mapper-extras/src/test/java/org/elasticsearch/index/mapper/ScaledFloatFieldMapperTests.java

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,12 @@ protected Collection<Class<? extends Plugin>> getPlugins() {
5858
}
5959

6060
public void testDefaults() throws Exception {
61-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
61+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
6262
.startObject("properties").startObject("field").field("type", "scaled_float")
6363
.field("scaling_factor", 10.0).endObject().endObject()
6464
.endObject().endObject());
6565

66-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
66+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
6767

6868
assertEquals(mapping, mapper.mappingSource().toString());
6969

@@ -108,12 +108,12 @@ public void testIllegalScalingFactor() throws IOException {
108108
}
109109

110110
public void testNotIndexed() throws Exception {
111-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
111+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
112112
.startObject("properties").startObject("field").field("type", "scaled_float")
113113
.field("index", false).field("scaling_factor", 10.0).endObject().endObject()
114114
.endObject().endObject());
115115

116-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
116+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
117117

118118
assertEquals(mapping, mapper.mappingSource().toString());
119119

@@ -132,12 +132,12 @@ public void testNotIndexed() throws Exception {
132132
}
133133

134134
public void testNoDocValues() throws Exception {
135-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
135+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
136136
.startObject("properties").startObject("field").field("type", "scaled_float")
137137
.field("doc_values", false).field("scaling_factor", 10.0).endObject().endObject()
138138
.endObject().endObject());
139139

140-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
140+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
141141

142142
assertEquals(mapping, mapper.mappingSource().toString());
143143

@@ -156,12 +156,12 @@ public void testNoDocValues() throws Exception {
156156
}
157157

158158
public void testStore() throws Exception {
159-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
159+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
160160
.startObject("properties").startObject("field").field("type", "scaled_float")
161161
.field("store", true).field("scaling_factor", 10.0).endObject().endObject()
162162
.endObject().endObject());
163163

164-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
164+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
165165

166166
assertEquals(mapping, mapper.mappingSource().toString());
167167

@@ -185,12 +185,12 @@ public void testStore() throws Exception {
185185
}
186186

187187
public void testCoerce() throws Exception {
188-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
188+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
189189
.startObject("properties").startObject("field").field("type", "scaled_float")
190190
.field("scaling_factor", 10.0).endObject().endObject()
191191
.endObject().endObject());
192192

193-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
193+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
194194

195195
assertEquals(mapping, mapper.mappingSource().toString());
196196

@@ -209,12 +209,12 @@ public void testCoerce() throws Exception {
209209
IndexableField dvField = fields[1];
210210
assertEquals(DocValuesType.SORTED_NUMERIC, dvField.fieldType().docValuesType());
211211

212-
mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
212+
mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
213213
.startObject("properties").startObject("field").field("type", "scaled_float")
214214
.field("scaling_factor", 10.0).field("coerce", false).endObject().endObject()
215215
.endObject().endObject());
216216

217-
DocumentMapper mapper2 = parser.parse("_doc", new CompressedXContent(mapping));
217+
DocumentMapper mapper2 = parser.parse("type", new CompressedXContent(mapping));
218218

219219
assertEquals(mapping, mapper2.mappingSource().toString());
220220

@@ -238,12 +238,12 @@ public void testIgnoreMalformed() throws Exception {
238238
}
239239

240240
private void doTestIgnoreMalformed(String value, String exceptionMessageContains) throws Exception {
241-
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
241+
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
242242
.startObject("properties").startObject("field").field("type", "scaled_float")
243243
.field("scaling_factor", 10.0).endObject().endObject()
244244
.endObject().endObject());
245245

246-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
246+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
247247

248248
assertEquals(mapping, mapper.mappingSource().toString());
249249

@@ -256,12 +256,12 @@ private void doTestIgnoreMalformed(String value, String exceptionMessageContains
256256
MapperParsingException e = expectThrows(MapperParsingException.class, runnable);
257257
assertThat(e.getCause().getMessage(), containsString(exceptionMessageContains));
258258

259-
mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("_doc")
259+
mapping = Strings.toString(XContentFactory.jsonBuilder().startObject().startObject("type")
260260
.startObject("properties").startObject("field").field("type", "scaled_float")
261261
.field("scaling_factor", 10.0).field("ignore_malformed", true).endObject().endObject()
262262
.endObject().endObject());
263263

264-
DocumentMapper mapper2 = parser.parse("_doc", new CompressedXContent(mapping));
264+
DocumentMapper mapper2 = parser.parse("type", new CompressedXContent(mapping));
265265

266266
ParsedDocument doc = mapper2.parse(new SourceToParse("test", "1", BytesReference
267267
.bytes(XContentFactory.jsonBuilder()
@@ -276,7 +276,7 @@ private void doTestIgnoreMalformed(String value, String exceptionMessageContains
276276

277277
public void testNullValue() throws IOException {
278278
String mapping = Strings.toString(XContentFactory.jsonBuilder().startObject()
279-
.startObject("_doc")
279+
.startObject("type")
280280
.startObject("properties")
281281
.startObject("field")
282282
.field("type", "scaled_float")
@@ -285,7 +285,7 @@ public void testNullValue() throws IOException {
285285
.endObject()
286286
.endObject().endObject());
287287

288-
DocumentMapper mapper = parser.parse("_doc", new CompressedXContent(mapping));
288+
DocumentMapper mapper = parser.parse("type", new CompressedXContent(mapping));
289289
assertEquals(mapping, mapper.mappingSource().toString());
290290

291291
ParsedDocument doc = mapper.parse(new SourceToParse("test", "1", BytesReference
@@ -297,7 +297,7 @@ public void testNullValue() throws IOException {
297297
assertArrayEquals(new IndexableField[0], doc.rootDoc().getFields("field"));
298298

299299
mapping = Strings.toString(XContentFactory.jsonBuilder().startObject()
300-
.startObject("_doc")
300+
.startObject("type")
301301
.startObject("properties")
302302
.startObject("field")
303303
.field("type", "scaled_float")
@@ -307,7 +307,7 @@ public void testNullValue() throws IOException {
307307
.endObject()
308308
.endObject().endObject());
309309

310-
mapper = parser.parse("_doc", new CompressedXContent(mapping));
310+
mapper = parser.parse("type", new CompressedXContent(mapping));
311311
assertEquals(mapping, mapper.mappingSource().toString());
312312

313313
doc = mapper.parse(new SourceToParse("test", "1", BytesReference

0 commit comments

Comments
 (0)