Skip to content

Commit 602a838

Browse files
dliappisdliappis
authored
Allow _doc type in master
elastic/elasticsearch#38270 made current master (7.0.0) reject mappings with type `_doc` unless `?include_type_name=true` is passed during index creation. Workaround the rejection for now by explicitly setting `include_type_name` to `true` in every create_index operation. Relates: #64
1 parent 0c76839 commit 602a838

File tree

10 files changed

+105
-21
lines changed

10 files changed

+105
-21
lines changed

‎eventdata/challenges/default.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{

‎geonames/challenges/default.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{
@@ -195,7 +198,10 @@
195198
{
196199
"operation": {
197200
"operation-type": "create-index",
198-
"settings": {{index_settings | default({}) | tojson}}
201+
"settings": {{index_settings | default({}) | tojson}},
202+
"request-params": {
203+
"include_type_name": "true"
204+
}
199205
}
200206
},
201207
{
@@ -233,6 +239,9 @@
233239
"settings": {
234240
"index.sort.field": ["country_code.raw", "admin1_code.raw"],
235241
"index.sort.order": ["asc", "asc"]
242+
},
243+
"request-params": {
244+
"include_type_name": "true"
236245
}
237246
}
238247
},
@@ -272,6 +281,9 @@
272281
"index.refresh_interval": "30s",
273282
"index.number_of_shards": 6,
274283
"index.translog.flush_threshold_size": "4g"
284+
},
285+
"request-params": {
286+
"include_type_name": "true"
275287
}
276288
}
277289
},

‎geopoint/challenges/default.json

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{
@@ -82,7 +85,10 @@
8285
{
8386
"operation": {
8487
"operation-type": "create-index",
85-
"settings": {{index_settings | default({}) | tojson}}
88+
"settings": {{index_settings | default({}) | tojson}},
89+
"request-params": {
90+
"include_type_name": "true"
91+
}
8692
}
8793
},
8894
{
@@ -131,6 +137,9 @@
131137
"index.refresh_interval": "30s",
132138
"index.number_of_shards": 6,
133139
"index.translog.flush_threshold_size": "4g"
140+
},
141+
"request-params": {
142+
"include_type_name": "true"
134143
}
135144
}
136145
},

‎http_logs/challenges/default.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{
@@ -90,7 +93,10 @@
9093
{
9194
"operation": {
9295
"operation-type": "create-index",
93-
"settings": {{index_settings | default({}) | tojson}}
96+
"settings": {{index_settings | default({}) | tojson}},
97+
"request-params": {
98+
"include_type_name": "true"
99+
}
94100
}
95101
},
96102
{
@@ -138,6 +144,9 @@
138144
"settings": {
139145
"index.sort.field": "@timestamp",
140146
"index.sort.order": "desc"
147+
},
148+
"request-params": {
149+
"include_type_name": "true"
141150
}
142151
}
143152
},
@@ -183,7 +192,10 @@
183192
{
184193
"operation": {
185194
"operation-type": "create-index",
186-
"settings": {{index_settings | default({}) | tojson}}
195+
"settings": {{index_settings | default({}) | tojson}},
196+
"request-params": {
197+
"include_type_name": "true"
198+
}
187199
}
188200
},
189201
{
@@ -234,7 +246,10 @@
234246
"index.number_of_shards": {{number_of_shards | default(1)}},
235247
"index.number_of_replicas": {{number_of_replicas | default(0)}},
236248
"index.store.type": "{{store_type | default('mmapfs')}}"
237-
}{%- endif %}
249+
}{%- endif %},
250+
"request-params": {
251+
"include_type_name": "true"
252+
}
238253
}
239254
},
240255
{

‎nested/challenges/default.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{
@@ -104,7 +107,10 @@
104107
{
105108
"operation": {
106109
"operation-type": "create-index",
107-
"settings": {{index_settings | default({}) | tojson}}
110+
"settings": {{index_settings | default({}) | tojson}},
111+
"request-params": {
112+
"include_type_name": "true"
113+
}
108114
}
109115
},
110116
{

‎noaa/challenges/default.json

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{
@@ -111,7 +114,10 @@
111114
{
112115
"operation": {
113116
"operation-type": "create-index",
114-
"settings": {{index_settings | default({}) | tojson}}
117+
"settings": {{index_settings | default({}) | tojson}},
118+
"request-params": {
119+
"include_type_name": "true"
120+
}
115121
}
116122
},
117123
{

‎nyc_taxis/challenges/default.json

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@
1313
"index.codec": "best_compression",
1414
"index.refresh_interval": "30s",
1515
"index.translog.flush_threshold_size": "4g"
16-
}{%- endif %}
16+
}{%- endif %},
17+
"request-params": {
18+
"include_type_name": "true"
19+
}
1720
}
1821
},
1922
{
@@ -88,7 +91,10 @@
8891
"index.codec": "best_compression",
8992
"index.refresh_interval": "30s",
9093
"index.translog.flush_threshold_size": "4g"
91-
}{%- endif %}
94+
}{%- endif %},
95+
"request-params": {
96+
"include_type_name": "true"
97+
}
9298
}
9399
},
94100
{
@@ -130,6 +136,9 @@
130136
"index.translog.flush_threshold_size": "4g",
131137
"index.sort.field": "pickup_datetime",
132138
"index.sort.order": "desc"
139+
},
140+
"request-params": {
141+
"include_type_name": "true"
133142
}
134143
}
135144
},
@@ -169,7 +178,10 @@
169178
"index.number_of_shards": {{number_of_shards | default(1)}},
170179
"index.number_of_replicas": {{number_of_replicas | default(0)}},
171180
"index.store.type": "{{store_type | default('mmapfs')}}"
172-
}{%- endif %}
181+
}{%- endif %},
182+
"request-params": {
183+
"include_type_name": "true"
184+
}
173185
}
174186
},
175187
{
@@ -220,7 +232,10 @@
220232
"index.codec": "best_compression",
221233
"index.refresh_interval": "30s",
222234
"index.translog.flush_threshold_size": "4g"
223-
}{%- endif %}
235+
}{%- endif %},
236+
"request-params": {
237+
"include_type_name": "true"
238+
}
224239
}
225240
},
226241
{

‎percolator/challenges/default.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{

‎pmc/challenges/default.json

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,10 @@
1212
{
1313
"operation": {
1414
"operation-type": "create-index",
15-
"settings": {{index_settings | default({}) | tojson}}
15+
"settings": {{index_settings | default({}) | tojson}},
16+
"request-params": {
17+
"include_type_name": "true"
18+
}
1619
}
1720
},
1821
{
@@ -99,7 +102,10 @@
99102
{
100103
"operation": {
101104
"operation-type": "create-index",
102-
"settings": {{index_settings | default({}) | tojson}}
105+
"settings": {{index_settings | default({}) | tojson}},
106+
"request-params": {
107+
"include_type_name": "true"
108+
}
103109
}
104110
},
105111
{
@@ -147,6 +153,9 @@
147153
"settings": {
148154
"index.sort.field": "timestamp",
149155
"index.sort.order": "desc"
156+
},
157+
"request-params": {
158+
"include_type_name": "true"
150159
}
151160
}
152161
},
@@ -196,6 +205,9 @@
196205
"index.refresh_interval": "30s",
197206
"index.number_of_shards": 6,
198207
"index.translog.flush_threshold_size": "4g"
208+
},
209+
"request-params": {
210+
"include_type_name": "true"
199211
}
200212
}
201213
},

‎so/challenges/default.json

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,10 @@
99
{
1010
"operation": {
1111
"operation-type": "create-index",
12-
"settings": {{index_settings | default({}) | tojson}}
12+
"settings": {{index_settings | default({}) | tojson}},
13+
"request-params": {
14+
"include_type_name": "true"
15+
}
1316
}
1417
},
1518
{

0 commit comments

Comments
 (0)