Skip to content

Commit 7a9dec4

Browse files
jordan-powersjordan-powers
committed
Fix timestamp default sort mode
1 parent 76a54c5 commit 7a9dec4

File tree

4 files changed

+23
-18
lines changed

4 files changed

+23
-18
lines changed

‎x-pack/plugin/logsdb/src/internalClusterTest/java/org/elasticsearch/xpack/logsdb/LogsdbSortConfigIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ public void testHostnameTimestampSortConfig() throws IOException {
119119
assertSettings(backingIndex, settings -> {
120120
assertThat(IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(settings), equalTo(List.of("host.name", "@timestamp")));
121121
assertThat(IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(settings), equalTo(List.of(SortOrder.ASC, SortOrder.DESC)));
122-
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(settings), equalTo(List.of(MultiValueMode.MIN, MultiValueMode.MIN)));
122+
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(settings), equalTo(List.of(MultiValueMode.MIN, MultiValueMode.MAX)));
123123
assertThat(IndexSortConfig.INDEX_SORT_MISSING_SETTING.get(settings), equalTo(List.of("_last", "_last")));
124124
});
125125
}
@@ -170,7 +170,7 @@ public void testTimestampOnlySortConfig() throws IOException {
170170
assertSettings(backingIndex, settings -> {
171171
assertThat(IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(settings), equalTo(List.of("@timestamp")));
172172
assertThat(IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(settings), equalTo(List.of(SortOrder.DESC)));
173-
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(settings), equalTo(List.of(MultiValueMode.MIN)));
173+
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(settings), equalTo(List.of(MultiValueMode.MAX)));
174174
assertThat(IndexSortConfig.INDEX_SORT_MISSING_SETTING.get(settings), equalTo(List.of("_last")));
175175
});
176176
}

‎x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -218,14 +218,14 @@ private static void applyHostnameTimestampSort(Settings.Builder builder) {
218218
DataStreamTimestampFieldMapper.DEFAULT_PATH
219219
);
220220
builder.putList(IndexSortConfig.INDEX_SORT_ORDER_SETTING.getKey(), "asc", "desc");
221-
builder.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min", "min");
221+
builder.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min", "max");
222222
builder.putList(IndexSortConfig.INDEX_SORT_MISSING_SETTING.getKey(), "_last", "_last");
223223
}
224224

225225
private static void applyTimestampSort(Settings.Builder builder) {
226226
builder.putList(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), DataStreamTimestampFieldMapper.DEFAULT_PATH);
227227
builder.putList(IndexSortConfig.INDEX_SORT_ORDER_SETTING.getKey(), "desc");
228-
builder.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min");
228+
builder.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "max");
229229
builder.putList(IndexSortConfig.INDEX_SORT_MISSING_SETTING.getKey(), "_last");
230230
}
231231

‎x-pack/plugin/logsdb/src/test/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProviderTests.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -792,7 +792,7 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSource() {
792792
assertTrue(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.get(result));
793793
assertThat(IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(result), contains("host.name", "@timestamp"));
794794
assertThat(IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(result), contains(SortOrder.ASC, SortOrder.DESC));
795-
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MIN));
795+
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MAX));
796796
assertThat(IndexSortConfig.INDEX_SORT_MISSING_SETTING.get(result), contains("_last", "_last"));
797797
assertThat(newMapperServiceCounter.get(), equalTo(4));
798798
}
@@ -882,7 +882,7 @@ public void testGetAdditionalIndexSettingsDowngradeFromSyntheticSourceFileMatch(
882882
assertTrue(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.get(result));
883883
assertThat(IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(result), contains("host.name", "@timestamp"));
884884
assertThat(IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(result), contains(SortOrder.ASC, SortOrder.DESC));
885-
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MIN));
885+
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MAX));
886886
assertThat(IndexSortConfig.INDEX_SORT_MISSING_SETTING.get(result), contains("_last", "_last"));
887887

888888
settingsBuilder = builder();
@@ -1004,7 +1004,7 @@ public void testPatternTextNotAllowedByLicense() throws IOException {
10041004
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
10051005
.putList(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name", "@timestamp")
10061006
.putList(IndexSortConfig.INDEX_SORT_ORDER_SETTING.getKey(), "asc", "desc")
1007-
.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min", "min")
1007+
.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min", "max")
10081008
.putList(IndexSortConfig.INDEX_SORT_MISSING_SETTING.getKey(), "_last", "_last")
10091009
.build();
10101010

@@ -1023,7 +1023,7 @@ public void testPatternTextNotAllowedByLicenseAlreadyDisallowed() throws IOExcep
10231023
.put(PatternTextFieldMapper.DISABLE_TEMPLATING_SETTING.getKey(), true)
10241024
.putList(IndexSortConfig.INDEX_SORT_FIELD_SETTING.getKey(), "host.name", "@timestamp")
10251025
.putList(IndexSortConfig.INDEX_SORT_ORDER_SETTING.getKey(), "asc", "desc")
1026-
.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min", "min")
1026+
.putList(IndexSortConfig.INDEX_SORT_MODE_SETTING.getKey(), "min", "max")
10271027
.putList(IndexSortConfig.INDEX_SORT_MISSING_SETTING.getKey(), "_last", "_last")
10281028
.build();
10291029
assertEquals(expected, result);
@@ -1066,8 +1066,13 @@ public void testSortAndHostNoHost() throws Exception {
10661066
}
10671067
""";
10681068
Settings result = generateLogsdbSettings(settings, mappings);
1069+
assertThat(result.size(), equalTo(6));
10691070
assertTrue(IndexSettings.LOGSDB_SORT_ON_HOST_NAME.get(result));
10701071
assertTrue(IndexSettings.LOGSDB_ADD_HOST_NAME_FIELD.get(result));
1072+
assertThat(IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(result), contains("host.name", "@timestamp"));
1073+
assertThat(IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(result), contains(SortOrder.ASC, SortOrder.DESC));
1074+
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MAX));
1075+
assertThat(IndexSortConfig.INDEX_SORT_MISSING_SETTING.get(result), contains("_last", "_last"));
10711076
assertEquals(1, newMapperServiceCounter.get());
10721077
}
10731078

@@ -1088,7 +1093,7 @@ public void testSortAndHostNoHostOldNode() throws Exception {
10881093
assertThat(result.size(), equalTo(4));
10891094
assertThat(IndexSortConfig.INDEX_SORT_FIELD_SETTING.get(result), contains("host.name", "@timestamp"));
10901095
assertThat(IndexSortConfig.INDEX_SORT_ORDER_SETTING.get(result), contains(SortOrder.ASC, SortOrder.DESC));
1091-
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MIN));
1096+
assertThat(IndexSortConfig.INDEX_SORT_MODE_SETTING.get(result), contains(MultiValueMode.MIN, MultiValueMode.MAX));
10921097
assertThat(IndexSortConfig.INDEX_SORT_MISSING_SETTING.get(result), contains("_last", "_last"));
10931098
}
10941099

‎x-pack/plugin/logsdb/src/yamlRestTest/resources/rest-api-spec/test/80_index_sort_defaults.yml‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ create logsdb data stream with host.name as keyword:
7575
- match: { .$backing_index.settings.index.logsdb.sort_on_host_name: "true" }
7676
- match: { .$backing_index.settings.index.sort.field: [ "host.name", "@timestamp" ] }
7777
- match: { .$backing_index.settings.index.sort.order: [ "asc", "desc" ] }
78-
- match: { .$backing_index.settings.index.sort.mode: [ "min", "min" ] }
78+
- match: { .$backing_index.settings.index.sort.mode: [ "min", "max" ] }
7979
- match: { .$backing_index.settings.index.sort.missing: [ "_last", "_last" ] }
8080

8181
---
@@ -126,7 +126,7 @@ create logsdb data stream with host.name as keyword and timestamp as date:
126126
- match: { .$backing_index.settings.index.logsdb.sort_on_host_name: "true" }
127127
- match: { .$backing_index.settings.index.sort.field: [ "host.name", "@timestamp" ] }
128128
- match: { .$backing_index.settings.index.sort.order: [ "asc", "desc" ] }
129-
- match: { .$backing_index.settings.index.sort.mode: [ "min", "min" ] }
129+
- match: { .$backing_index.settings.index.sort.mode: [ "min", "max" ] }
130130
- match: { .$backing_index.settings.index.sort.missing: [ "_last", "_last" ] }
131131

132132
---
@@ -177,7 +177,7 @@ create logsdb data stream with host.name as integer and timestamp as date:
177177
- match: { .$backing_index.settings.index.logsdb.sort_on_host_name: "true" }
178178
- match: { .$backing_index.settings.index.sort.field: [ "host.name", "@timestamp" ] }
179179
- match: { .$backing_index.settings.index.sort.order: [ "asc", "desc" ] }
180-
- match: { .$backing_index.settings.index.sort.mode: [ "min", "min" ] }
180+
- match: { .$backing_index.settings.index.sort.mode: [ "min", "max" ] }
181181
- match: { .$backing_index.settings.index.sort.missing: [ "_last", "_last" ] }
182182
---
183183

@@ -225,7 +225,7 @@ create logsdb data stream with no host.name and timestamp as date:
225225
- match: { .$backing_index.settings.index.logsdb.sort_on_host_name: "true" }
226226
- match: { .$backing_index.settings.index.sort.field: [ "host.name", "@timestamp" ] }
227227
- match: { .$backing_index.settings.index.sort.order: [ "asc", "desc" ] }
228-
- match: { .$backing_index.settings.index.sort.mode: [ "min", "min" ] }
228+
- match: { .$backing_index.settings.index.sort.mode: [ "min", "max" ] }
229229
- match: { .$backing_index.settings.index.sort.missing: [ "_last", "_last" ] }
230230

231231
---
@@ -277,7 +277,7 @@ create logsdb data stream with host as keyword and timestamp as date:
277277
- match: { .$backing_index.defaults.index.logsdb.sort_on_host_name: "false" }
278278
- match: { .$backing_index.settings.index.sort.field: [ "@timestamp" ] }
279279
- match: { .$backing_index.settings.index.sort.order: [ "desc" ] }
280-
- match: { .$backing_index.settings.index.sort.mode: [ "min" ] }
280+
- match: { .$backing_index.settings.index.sort.mode: [ "max" ] }
281281
- match: { .$backing_index.settings.index.sort.missing: [ "_last" ] }
282282

283283
---
@@ -331,7 +331,7 @@ create logsdb data stream with host as keyword:
331331
- match: { .$backing_index.defaults.index.logsdb.sort_on_host_name: "false" }
332332
- match: { .$backing_index.settings.index.sort.field: [ "@timestamp" ] }
333333
- match: { .$backing_index.settings.index.sort.order: [ "desc" ] }
334-
- match: { .$backing_index.settings.index.sort.mode: [ "min" ] }
334+
- match: { .$backing_index.settings.index.sort.mode: [ "max" ] }
335335
- match: { .$backing_index.settings.index.sort.missing: [ "_last" ] }
336336
---
337337
create logsdb data stream with host as text and multi fields:
@@ -391,7 +391,7 @@ create logsdb data stream with host as text and multi fields:
391391
- match: { .$backing_index.defaults.index.logsdb.sort_on_host_name: "false" }
392392
- match: { .$backing_index.settings.index.sort.field: [ "@timestamp" ] }
393393
- match: { .$backing_index.settings.index.sort.order: [ "desc" ] }
394-
- match: { .$backing_index.settings.index.sort.mode: [ "min" ] }
394+
- match: { .$backing_index.settings.index.sort.mode: [ "max" ] }
395395
- match: { .$backing_index.settings.index.sort.missing: [ "_last" ] }
396396

397397
---
@@ -448,7 +448,7 @@ create logsdb data stream with host as text:
448448
- match: { .$backing_index.defaults.index.logsdb.sort_on_host_name: "false" }
449449
- match: { .$backing_index.settings.index.sort.field: [ "@timestamp" ] }
450450
- match: { .$backing_index.settings.index.sort.order: [ "desc" ] }
451-
- match: { .$backing_index.settings.index.sort.mode: [ "min" ] }
451+
- match: { .$backing_index.settings.index.sort.mode: [ "max" ] }
452452
- match: { .$backing_index.settings.index.sort.missing: [ "_last" ] }
453453
---
454454
create logsdb data stream with host as text and name as double:
@@ -506,5 +506,5 @@ create logsdb data stream with host as text and name as double:
506506
- match: { .$backing_index.settings.index.logsdb.sort_on_host_name: "true" }
507507
- match: { .$backing_index.settings.index.sort.field: [ "host.name", "@timestamp" ] }
508508
- match: { .$backing_index.settings.index.sort.order: [ "asc", "desc" ] }
509-
- match: { .$backing_index.settings.index.sort.mode: [ "min", "min" ] }
509+
- match: { .$backing_index.settings.index.sort.mode: [ "min", "max" ] }
510510
- match: { .$backing_index.settings.index.sort.missing: [ "_last", "_last" ] }

0 commit comments

Comments
 (0)