forked from elastic/kibana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add numeric_type option for correct sort order on mixed date and date…
…_nanos fields (elastic#44212) (elastic#46212) * Implement getSortForSearchSource for add-on of 'numeric_type' to the ES request. Then sorting on a field that can be of date or date_nanos type works correctly * Add functional test
- Loading branch information
Showing
8 changed files
with
252 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
45 changes: 45 additions & 0 deletions
45
src/legacy/core_plugins/kibana/public/discover/doc_table/lib/get_sort_for_search_source.ts
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
| import { IndexPattern } from 'ui/index_patterns'; | ||
| import { SortOrder } from '../components/table_header/helpers'; | ||
| import { getSort } from './get_sort'; | ||
|
|
||
| /** | ||
| * prepares sort for search source, that's sending the request to ES | ||
| * handles the special case when there's sorting by date_nanos typed fields | ||
| * the addon of the numeric_type guarantees the right sort order | ||
| * when there are indices with date and indices with date_nanos field | ||
| */ | ||
| export function getSortForSearchSource(sort?: SortOrder[], indexPattern?: IndexPattern) { | ||
| if (!sort || !indexPattern) { | ||
| return []; | ||
| } | ||
| const { timeFieldName } = indexPattern; | ||
| return getSort(sort, indexPattern).map((sortPair: Record<string, string>) => { | ||
| if (indexPattern.isTimeNanosBased() && timeFieldName && sortPair[timeFieldName]) { | ||
| return { | ||
| [timeFieldName]: { | ||
| order: sortPair[timeFieldName], | ||
| numeric_type: 'date_nanos', | ||
| }, | ||
| }; | ||
| } | ||
| return sortPair; | ||
| }); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,54 @@ | ||
| /* | ||
| * Licensed to Elasticsearch B.V. under one or more contributor | ||
| * license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright | ||
| * ownership. Elasticsearch B.V. licenses this file to you under | ||
| * the Apache License, Version 2.0 (the "License"); you may | ||
| * not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, | ||
| * software distributed under the License is distributed on an | ||
| * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY | ||
| * KIND, either express or implied. See the License for the | ||
| * specific language governing permissions and limitations | ||
| * under the License. | ||
| */ | ||
|
|
||
| import expect from '@kbn/expect'; | ||
|
|
||
| export default function ({ getService, getPageObjects }) { | ||
| const esArchiver = getService('esArchiver'); | ||
| const PageObjects = getPageObjects(['common', 'timePicker', 'discover']); | ||
| const kibanaServer = getService('kibanaServer'); | ||
| const fromTime = '2019-01-01 00:00:00.000'; | ||
| const toTime = '2019-01-01 23:59:59.999'; | ||
|
|
||
| describe('date_nanos_mixed', function () { | ||
|
|
||
| before(async function () { | ||
| await esArchiver.loadIfNeeded('date_nanos_mixed'); | ||
| await kibanaServer.uiSettings.replace({ 'defaultIndex': 'timestamp-*' }); | ||
| await PageObjects.common.navigateToApp('discover'); | ||
| await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime); | ||
| }); | ||
|
|
||
| after(function unloadMakelogs() { | ||
| return esArchiver.unload('date_nanos_mixed'); | ||
| }); | ||
|
|
||
| it('shows a list of records of indices with date & date_nanos fields in the right order', async function () { | ||
| const rowData1 = await PageObjects.discover.getDocTableIndex(1); | ||
| expect(rowData1.startsWith('Jan 1, 2019 @ 12:10:30.124000000')).to.be.ok(); | ||
| const rowData2 = await PageObjects.discover.getDocTableIndex(3); | ||
| expect(rowData2.startsWith('Jan 1, 2019 @ 12:10:30.123498765')).to.be.ok(); | ||
| const rowData3 = await PageObjects.discover.getDocTableIndex(5); | ||
| expect(rowData3.startsWith('Jan 1, 2019 @ 12:10:30.123456789')).to.be.ok(); | ||
| const rowData4 = await PageObjects.discover.getDocTableIndex(7); | ||
| expect(rowData4.startsWith('Jan 1, 2019 @ 12:10:30.123000000')).to.be.ok(); | ||
| }); | ||
| }); | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
test/functional/fixtures/es_archiver/date_nanos_mixed/data.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| { | ||
| "type": "doc", | ||
| "value": { | ||
| "id": "index-pattern:timestamp-*", | ||
| "index": ".kibana", | ||
| "source": { | ||
| "index-pattern": { | ||
| "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"esTypes\":[\"_id\"],\"count\":1,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"esTypes\":[\"_index\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"esTypes\":[\"_source\"],\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"esTypes\":[\"_type\"],\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"timestamp\",\"type\":\"date\",\"esTypes\":[\"date\",\"date_nanos\"],\"count\":2,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]", | ||
| "timeFieldName": "timestamp", | ||
| "title": "timestamp-*", | ||
| "fieldFormatMap": "{\"timestamp\":{\"id\":\"date_nanos\"}}" | ||
| }, | ||
| "type": "index-pattern" | ||
| }, | ||
| "type": "_doc" | ||
| } | ||
| } | ||
|
|
||
| { | ||
| "type": "doc", | ||
| "value": { | ||
| "id": "search:82116b30-d407-11e9-8004-932185690e7b", | ||
| "index": ".kibana", | ||
| "source": { | ||
| "search": { | ||
| "columns": [ | ||
| "_source" | ||
| ], | ||
| "description": "", | ||
| "hits": 0, | ||
| "kibanaSavedObjectMeta": { | ||
| "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[{\"$state\":{\"store\":\"appState\"},\"meta\":{\"alias\":null,\"disabled\":false,\"key\":\"number\",\"negate\":false,\"params\":{\"query\":123},\"type\":\"phrase\",\"value\":\"123\",\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.filter[0].meta.index\"},\"query\":{\"match\":{\"number\":{\"query\":123,\"type\":\"phrase\"}}}}],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}" | ||
| }, | ||
| "sort": [ | ||
| [ | ||
| "@timestamp", | ||
| "desc" | ||
| ] | ||
| ], | ||
| "title": "New Saved Search", | ||
| "version": 1 | ||
| }, | ||
| "type": "search" | ||
| }, | ||
| "type": "_doc" | ||
| } | ||
| } | ||
|
|
||
| { | ||
| "type": "doc", | ||
| "value": { | ||
| "id": "2", | ||
| "index": "timestamp-millis", | ||
| "source": { | ||
| "timestamp": "2019-01-01T12:10:30.124Z" | ||
| }, | ||
| "type": "_doc" | ||
| } | ||
| } | ||
|
|
||
| { | ||
| "type": "doc", | ||
| "value": { | ||
| "id": "1", | ||
| "index": "timestamp-millis", | ||
| "source": { | ||
| "timestamp": "2019-01-01T12:10:30.123Z" | ||
| }, | ||
| "type": "_doc" | ||
| } | ||
| } | ||
|
|
||
| { | ||
| "type": "doc", | ||
| "value": { | ||
| "id": "3", | ||
| "index": "timestamp-nanos", | ||
| "source": { | ||
| "timestamp": "2019-01-01T12:10:30.123456789Z" | ||
| }, | ||
| "type": "_doc" | ||
| } | ||
| } | ||
|
|
||
| { | ||
| "type": "doc", | ||
| "value": { | ||
| "id": "4", | ||
| "index": "timestamp-nanos", | ||
| "source": { | ||
| "timestamp": "2019-01-01T12:10:30.123498765Z" | ||
| }, | ||
| "type": "_doc" | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
test/functional/fixtures/es_archiver/date_nanos_mixed/mappings.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| { | ||
| "type": "index", | ||
| "value": { | ||
| "aliases": { | ||
| }, | ||
| "index": "timestamp-millis", | ||
| "mappings": { | ||
| "properties": { | ||
| "timestamp": { | ||
| "type": "date" | ||
| } | ||
| } | ||
| }, | ||
| "settings": { | ||
| "index": { | ||
| "number_of_replicas": "1", | ||
| "number_of_shards": "1" | ||
| } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| { | ||
| "type": "index", | ||
| "value": { | ||
| "aliases": { | ||
| }, | ||
| "index": "timestamp-nanos", | ||
| "mappings": { | ||
| "properties": { | ||
| "timestamp": { | ||
| "type": "date_nanos" | ||
| } | ||
| } | ||
| }, | ||
| "settings": { | ||
| "index": { | ||
| "number_of_replicas": "1", | ||
| "number_of_shards": "1" | ||
| } | ||
| } | ||
| } | ||
| } |