diff --git a/quickwit/rest-api-tests/scenarii/es_field_capabilities/0001-field-capabilities.yaml b/quickwit/rest-api-tests/scenarii/es_field_capabilities/0001-field-capabilities.yaml index 1ed8000f83f..1cf8954c67e 100644 --- a/quickwit/rest-api-tests/scenarii/es_field_capabilities/0001-field-capabilities.yaml +++ b/quickwit/rest-api-tests/scenarii/es_field_capabilities/0001-field-capabilities.yaml @@ -243,10 +243,11 @@ method: [GET] engines: - quickwit - elasticsearch -endpoint: fieldcaps/_field_caps?fields=host +endpoint: fieldcaps*/_field_caps?fields=host expected: indices: - fieldcaps + - fieldcaps-2 fields: host: ip: @@ -254,6 +255,9 @@ expected: metadata_field: false searchable: true aggregatable: true + indices: + - fieldcaps + - fieldcaps-2 --- # Compare ip field with elastic search method: [GET] @@ -277,17 +281,29 @@ method: [GET] engines: - quickwit - elasticsearch -endpoint: fieldca*/_field_caps?fields=date +endpoint: fieldca*/_field_caps?fields=tags* expected: indices: - fieldcaps + - fieldcaps-2 fields: - date: - date_nanos: - type: date_nanos + tags: + keyword: + type: keyword metadata_field: false searchable: true aggregatable: true + indices: + - fieldcaps + - fieldcaps-2 + tags-2: + keyword: + type: keyword + metadata_field: false + searchable: true + aggregatable: true + indices: + - fieldcaps-2 --- # Wildcard on index name + Wildcard without match method: [GET] @@ -298,6 +314,7 @@ endpoint: fieldca*,blub*/_field_caps?fields=date expected: indices: - fieldcaps + - fieldcaps-2 fields: date: date_nanos: diff --git a/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.elasticsearch.yaml b/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.elasticsearch.yaml index 200e60cb3c0..2d056c0afbf 100644 --- a/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.elasticsearch.yaml +++ b/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.elasticsearch.yaml @@ -3,6 +3,14 @@ method: DELETE endpoint: fieldcaps status_code: null --- +method: DELETE +endpoint: fieldcaps-2 +status_code: null +--- +method: DELETE +endpoint: fieldcaps-1 +status_code: null +--- # Create index 1 method: PUT endpoint: fieldcaps @@ -20,6 +28,23 @@ json: { } } --- +# Create index 2 +method: PUT +endpoint: fieldcaps-2 +json: { + "mappings": { + "properties": { + "host": { + "type": "ip", + "store": true + }, + "date": { + "type": "date_nanos" + }, + } + } +} +--- # Ingest documents in fieldcaps method: POST endpoint: _bulk @@ -31,4 +56,5 @@ ndjson: - {"name": "Fritz", "response": 30, "id": 5, "host": "192.168.0.1", "tags": ["nice", "cool"]} - "index": { "_index": "fieldcaps" } - {"nested": {"name": "Fritz", "response": 30}, "date": "2015-01-11T12:10:30Z", "host": "192.168.0.11", "tags": ["nice"]} - + - "index": { "_index": "fieldcaps-2" } + - {"name": "Fritz", "response": 30, "id": 6, "host": "192.168.0.1", "tags": ["nice", "cool"], "tags-2": ["awesome"]} diff --git a/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.quickwit.yaml b/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.quickwit.yaml index 0af4612d051..ecdcd2944dd 100644 --- a/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.quickwit.yaml +++ b/quickwit/rest-api-tests/scenarii/es_field_capabilities/_setup.quickwit.yaml @@ -4,6 +4,11 @@ api_root: http://localhost:7280/api/v1/ endpoint: indexes/fieldcaps status_code: null --- +method: DELETE +api_root: http://localhost:7280/api/v1/ +endpoint: indexes/fieldcaps-2 +status_code: null +--- # Create index method: POST api_root: http://localhost:7280/api/v1/ @@ -27,6 +32,29 @@ json: type: ip fast: true --- +# Create index +method: POST +api_root: http://localhost:7280/api/v1/ +endpoint: indexes/ +json: + version: "0.6" + index_id: fieldcaps-2 + doc_mapping: + mode: dynamic + dynamic_mapping: + tokenizer: default + fast: true + field_mappings: + - name: date + type: datetime + input_formats: + - rfc3339 + fast_precision: seconds + fast: true + - name: host + type: ip + fast: true +--- # Ingest documents method: POST api_root: http://localhost:7280/api/v1/ @@ -56,4 +84,12 @@ params: ndjson: - {"mixed": 5} # inter split mixed type - {"mixed": -5.5} - +--- +# Ingest documents in index 2 +method: POST +api_root: http://localhost:7280/api/v1/ +endpoint: fieldcaps-2/ingest +params: + commit: force +ndjson: + - {"name": "Fritz", "response": 30, "id": 6, "host": "192.168.0.1", "tags": ["nice", "cool"], "tags-2": ["awesome"]}