Skip to content

Commit 82066cf

Browse files
jtibshiranijtibshirani
committed
Fix some REST tests.
1 parent 93ec33f commit 82066cf

File tree

9 files changed

+80
-122
lines changed

9 files changed

+80
-122
lines changed

‎modules/lang-painless/src/test/resources/rest-api-spec/test/painless/80_script_score.yml‎

Lines changed: 15 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -14,26 +14,22 @@ setup:
1414
settings:
1515
number_of_shards: 2
1616
mappings:
17-
_doc:
18-
properties:
19-
dval:
20-
type: double
17+
properties:
18+
dval:
19+
type: double
2120
- do:
2221
index:
2322
index: test
24-
type: _doc
2523
id: d1
2624
body: {"dval": 10}
2725
- do:
2826
index:
2927
index: test
30-
type: _doc
3128
id: d2
3229
body: {"dval": 100}
3330
- do:
3431
index:
3532
index: test
36-
type: _doc
3733
id: d3
3834
body: {"dval": 1000}
3935

@@ -225,10 +221,9 @@ setup:
225221
settings:
226222
number_of_shards: 1
227223
mappings:
228-
_doc:
229-
properties:
230-
date:
231-
type: date
224+
properties:
225+
date:
226+
type: date
232227
- do:
233228
index:
234229
index: test
@@ -309,16 +304,15 @@ setup:
309304
settings:
310305
number_of_shards: 1
311306
mappings:
312-
_doc:
313-
properties:
314-
ival:
315-
type: integer
316-
lval:
317-
type: long
318-
fval:
319-
type: float
320-
dval:
321-
type: double
307+
properties:
308+
ival:
309+
type: integer
310+
lval:
311+
type: long
312+
fval:
313+
type: float
314+
dval:
315+
type: double
322316

323317
- do:
324318
index:

‎modules/reindex/src/test/resources/rest-api-spec/test/update_by_query/20_validation.yml‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@
4444
index: test
4545
body:
4646
mappings:
47-
_doc:
48-
_source:
49-
enabled: false
47+
_source:
48+
enabled: false
5049
- do:
5150
index:
5251
index: test

‎x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/delete_job.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ setup:
66
index: foo
77
body:
88
mappings:
9-
_doc:
10-
properties:
11-
the_field:
12-
type: date
13-
value_field:
14-
type: integer
9+
properties:
10+
the_field:
11+
type: date
12+
value_field:
13+
type: integer
1514

1615
- do:
1716
headers:

‎x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/get_jobs.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ setup:
66
index: foo
77
body:
88
mappings:
9-
_doc:
10-
properties:
11-
the_field:
12-
type: date
13-
value_field:
14-
type: integer
9+
properties:
10+
the_field:
11+
type: date
12+
value_field:
13+
type: integer
1514

1615
---
1716
"Test basic get_jobs":

‎x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/put_job.yml‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,11 @@ setup:
66
index: foo
77
body:
88
mappings:
9-
_doc:
10-
properties:
11-
the_field:
12-
type: date
13-
value_field:
14-
type: integer
9+
properties:
10+
the_field:
11+
type: date
12+
value_field:
13+
type: integer
1514

1615
---
1716
"Test basic put_job":

‎x-pack/plugin/src/test/resources/rest-api-spec/test/rollup/rollup_search.yml‎

Lines changed: 21 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,13 @@ setup:
66
index: foo
77
body:
88
mappings:
9-
_doc:
10-
properties:
11-
timestamp:
12-
type: date
13-
partition:
14-
type: keyword
15-
price:
16-
type: integer
9+
properties:
10+
timestamp:
11+
type: date
12+
partition:
13+
type: keyword
14+
price:
15+
type: integer
1716

1817
- do:
1918
headers:
@@ -51,7 +50,6 @@ setup:
5150
body:
5251
- index:
5352
_index: "foo_rollup"
54-
_type: "_doc"
5553
- timestamp.date_histogram.timestamp: "2017-01-01T05:00:00Z"
5654
timestamp.date_histogram.interval: "1h"
5755
timestamp.date_histogram.time_zone: "UTC"
@@ -67,7 +65,6 @@ setup:
6765

6866
- index:
6967
_index: "foo_rollup"
70-
_type: "_doc"
7168
- timestamp.date_histogram.timestamp: "2017-01-01T06:00:00Z"
7269
timestamp.date_histogram.interval: "1h"
7370
timestamp.date_histogram.time_zone: "UTC"
@@ -83,7 +80,6 @@ setup:
8380

8481
- index:
8582
_index: "foo_rollup"
86-
_type: "_doc"
8783
- timestamp.date_histogram.timestamp: "2017-01-01T07:00:00Z"
8884
timestamp.date_histogram.interval: "1h"
8985
timestamp.date_histogram.time_zone: "UTC"
@@ -99,7 +95,6 @@ setup:
9995

10096
- index:
10197
_index: "foo_rollup"
102-
_type: "_doc"
10398
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
10499
timestamp.date_histogram.interval: "1h"
105100
timestamp.date_histogram.time_zone: "UTC"
@@ -115,7 +110,6 @@ setup:
115110

116111
- index:
117112
_index: "foo_rollup"
118-
_type: "_doc"
119113
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
120114
timestamp.date_histogram.interval: "1h"
121115
timestamp.date_histogram.time_zone: "UTC"
@@ -319,7 +313,6 @@ setup:
319313
body:
320314
- index:
321315
_index: "foo_rollup"
322-
_type: "_doc"
323316
- timestamp.date_histogram.timestamp: "2017-01-01T05:00:00Z"
324317
timestamp.date_histogram.interval: "1h"
325318
timestamp.date_histogram.time_zone: "UTC"
@@ -335,7 +328,6 @@ setup:
335328

336329
- index:
337330
_index: "foo_rollup"
338-
_type: "_doc"
339331
- timestamp.date_histogram.timestamp: "2017-01-01T06:00:00Z"
340332
timestamp.date_histogram.interval: "1h"
341333
timestamp.date_histogram.time_zone: "UTC"
@@ -351,7 +343,6 @@ setup:
351343

352344
- index:
353345
_index: "foo_rollup"
354-
_type: "_doc"
355346
- timestamp.date_histogram.timestamp: "2017-01-01T07:00:00Z"
356347
timestamp.date_histogram.interval: "1h"
357348
timestamp.date_histogram.time_zone: "UTC"
@@ -367,7 +358,6 @@ setup:
367358

368359
- index:
369360
_index: "foo_rollup"
370-
_type: "_doc"
371361
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
372362
timestamp.date_histogram.interval: "1h"
373363
timestamp.date_histogram.time_zone: "UTC"
@@ -383,7 +373,6 @@ setup:
383373

384374
- index:
385375
_index: "foo_rollup"
386-
_type: "_doc"
387376
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
388377
timestamp.date_histogram.interval: "1h"
389378
timestamp.date_histogram.time_zone: "UTC"
@@ -467,7 +456,6 @@ setup:
467456
body:
468457
- index:
469458
_index: "foo_rollup"
470-
_type: "_doc"
471459
- timestamp.date_histogram.timestamp: "2017-01-01T05:00:00Z"
472460
timestamp.date_histogram.interval: "1h"
473461
timestamp.date_histogram.time_zone: "UTC"
@@ -483,7 +471,6 @@ setup:
483471

484472
- index:
485473
_index: "foo_rollup"
486-
_type: "_doc"
487474
- timestamp.date_histogram.timestamp: "2017-01-01T06:00:00Z"
488475
timestamp.date_histogram.interval: "1h"
489476
timestamp.date_histogram.time_zone: "UTC"
@@ -499,7 +486,6 @@ setup:
499486

500487
- index:
501488
_index: "foo_rollup"
502-
_type: "_doc"
503489
- timestamp.date_histogram.timestamp: "2017-01-01T07:00:00Z"
504490
timestamp.date_histogram.interval: "1h"
505491
timestamp.date_histogram.time_zone: "UTC"
@@ -515,7 +501,6 @@ setup:
515501

516502
- index:
517503
_index: "foo_rollup"
518-
_type: "_doc"
519504
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
520505
timestamp.date_histogram.interval: "1h"
521506
timestamp.date_histogram.time_zone: "UTC"
@@ -531,7 +516,6 @@ setup:
531516

532517
- index:
533518
_index: "foo_rollup"
534-
_type: "_doc"
535519
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
536520
timestamp.date_histogram.interval: "1h"
537521
timestamp.date_histogram.time_zone: "UTC"
@@ -617,7 +601,6 @@ setup:
617601
body:
618602
- index:
619603
_index: "foo_rollup"
620-
_type: "_doc"
621604
- timestamp.date_histogram.timestamp: "2017-01-01T05:00:00Z"
622605
timestamp.date_histogram.interval: "1h"
623606
timestamp.date_histogram.time_zone: "UTC"
@@ -633,7 +616,6 @@ setup:
633616

634617
- index:
635618
_index: "foo_rollup"
636-
_type: "_doc"
637619
- timestamp.date_histogram.timestamp: "2017-01-01T06:00:00Z"
638620
timestamp.date_histogram.interval: "1h"
639621
timestamp.date_histogram.time_zone: "UTC"
@@ -649,7 +631,6 @@ setup:
649631

650632
- index:
651633
_index: "foo_rollup"
652-
_type: "_doc"
653634
- timestamp.date_histogram.timestamp: "2017-01-01T07:00:00Z"
654635
timestamp.date_histogram.interval: "1h"
655636
timestamp.date_histogram.time_zone: "UTC"
@@ -665,7 +646,6 @@ setup:
665646

666647
- index:
667648
_index: "foo_rollup"
668-
_type: "_doc"
669649
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
670650
timestamp.date_histogram.interval: "1h"
671651
timestamp.date_histogram.time_zone: "UTC"
@@ -681,7 +661,6 @@ setup:
681661

682662
- index:
683663
_index: "foo_rollup"
684-
_type: "_doc"
685664
- timestamp.date_histogram.timestamp: "2017-01-01T08:00:00Z"
686665
timestamp.date_histogram.interval: "1h"
687666
timestamp.date_histogram.time_zone: "UTC"
@@ -760,14 +739,13 @@ setup:
760739
index: bar
761740
body:
762741
mappings:
763-
_doc:
764-
properties:
765-
timestamp:
766-
type: date
767-
partition:
768-
type: keyword
769-
price:
770-
type: integer
742+
properties:
743+
timestamp:
744+
type: date
745+
partition:
746+
type: keyword
747+
price:
748+
type: integer
771749

772750
- do:
773751
headers:
@@ -849,14 +827,13 @@ setup:
849827
index: bar
850828
body:
851829
mappings:
852-
_doc:
853-
properties:
854-
timestamp:
855-
type: date
856-
partition:
857-
type: keyword
858-
price:
859-
type: integer
830+
properties:
831+
timestamp:
832+
type: date
833+
partition:
834+
type: keyword
835+
price:
836+
type: integer
860837

861838
- do:
862839
headers:

0 commit comments

Comments
 (0)