Skip to content

Commit c806e4a

Browse files
fmassotfmassot
committed
Fix go tests.
1 parent a35d46b commit c806e4a

File tree

3 files changed

+15
-69
lines changed

3 files changed

+15
-69
lines changed

‎pkg/quickwit/client/search_request.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -245,8 +245,8 @@ func (b *FilterQueryBuilder) Build() ([]Filter, error) {
245245
// AddDateRangeFilter adds a new time range filter
246246
func (b *FilterQueryBuilder) AddDateRangeFilter(timeField string, lteMillisecs int64, gteMillisecs int64) *FilterQueryBuilder {
247247
// Quickwit only supports datetime range filter with datetime formatted as RFC3339
248-
lteTime := time.Unix(0, lteMillisecs*int64(time.Millisecond))
249-
gteTime := time.Unix(0, gteMillisecs*int64(time.Millisecond))
248+
lteTime := time.Unix(0, lteMillisecs*int64(time.Millisecond)).UTC()
249+
gteTime := time.Unix(0, gteMillisecs*int64(time.Millisecond)).UTC()
250250
lteRfc3339 := lteTime.Format(time.RFC3339Nano)
251251
gteRfc3339 := gteTime.Format(time.RFC3339Nano)
252252
b.filters = append(b.filters, &DateRangeFilter{

‎pkg/quickwit/client/search_request_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,8 @@ func TestSearchRequest(t *testing.T) {
6767
t.Run("Should have range filter", func(t *testing.T) {
6868
f, ok := sr.Query.Bool.Filters[0].(*DateRangeFilter)
6969
require.True(t, ok)
70-
require.Equal(t, "2023-05-17T09:23:21+02:00", f.Gte)
71-
require.Equal(t, "2023-05-18T10:23:21+02:00", f.Lte)
70+
require.Equal(t, "2023-05-17T07:23:21Z", f.Gte)
71+
require.Equal(t, "2023-05-18T08:23:21Z", f.Lte)
7272
})
7373

7474
t.Run("Should have query string filter", func(t *testing.T) {
@@ -89,8 +89,8 @@ func TestSearchRequest(t *testing.T) {
8989
require.Equal(t, "desc", sort.Get("order").MustString())
9090

9191
timeRangeFilter := json.GetPath("query", "bool", "filter").GetIndex(0).Get("range").Get(timeField)
92-
require.Equal(t, "2023-05-17T09:23:21+02:00", timeRangeFilter.Get("gte").MustString())
93-
require.Equal(t, "2023-05-18T10:23:21+02:00", timeRangeFilter.Get("lte").MustString())
92+
require.Equal(t, "2023-05-17T07:23:21Z", timeRangeFilter.Get("gte").MustString())
93+
require.Equal(t, "2023-05-18T08:23:21Z", timeRangeFilter.Get("lte").MustString())
9494
// FIXME: no yet supported by quickwit.
9595
// require.Equal(t, DateFormatEpochMS, timeRangeFilter.Get("format").MustString(""))
9696

‎pkg/quickwit/data_query_test.go‎

Lines changed: 9 additions & 63 deletions
Original file line numberDiff line numberDiff line change
@@ -27,11 +27,10 @@ func TestExecuteElasticsearchDataQuery(t *testing.T) {
2727
}`, from, to)
2828
require.NoError(t, err)
2929
sr := c.multisearchRequests[0].Requests[0]
30-
// rangeFilter := sr.Query.Bool.Filters[0].(*es.RangeFilter)
31-
// require.Equal(t, rangeFilter.Key, c.configuredFields.TimeField)
32-
// require.Equal(t, rangeFilter.Lte, toMs)
33-
// require.Equal(t, rangeFilter.Gte, fromMs)
34-
// require.Equal(t, rangeFilter.Format, es.DateFormatEpochMS)
30+
rangeFilter := sr.Query.Bool.Filters[0].(*es.DateRangeFilter)
31+
require.Equal(t, rangeFilter.Key, c.configuredFields.TimeField)
32+
require.Equal(t, rangeFilter.Lte, "2018-05-15T17:55:00Z")
33+
require.Equal(t, rangeFilter.Gte, "2018-05-15T17:50:00Z")
3534
require.Equal(t, sr.Aggs[0].Key, "2")
3635
dateHistogramAgg := sr.Aggs[0].Aggregation.Aggregation.(*es.DateHistogramAgg)
3736
require.Equal(t, dateHistogramAgg.Field, "@timestamp")
@@ -1305,27 +1304,11 @@ func TestExecuteElasticsearchDataQuery(t *testing.T) {
13051304
sr := c.multisearchRequests[0].Requests[0]
13061305
require.Equal(t, sr.Size, defaultSize)
13071306

1308-
// rangeFilter := sr.Query.Bool.Filters[0].(*es.RangeFilter)
1309-
// require.Equal(t, rangeFilter.Key, c.configuredFields.TimeField)
1310-
// require.Equal(t, rangeFilter.Lte, toMs)
1311-
// require.Equal(t, rangeFilter.Gte, fromMs)
1312-
// require.Equal(t, rangeFilter.Format, es.DateFormatEpochMS)
1313-
1314-
// require.Equal(t, sr.Sort["@timestamp"], map[string]string{"order": "desc", "unmapped_type": "boolean"})
1315-
// require.Equal(t, sr.Sort["_doc"], map[string]string{"order": "desc"})
1316-
// require.Equal(t, sr.CustomProps["script_fields"], map[string]interface{}{})
1317-
1318-
firstLevel := sr.Aggs[0]
1319-
require.Equal(t, firstLevel.Key, "1")
1320-
require.Equal(t, firstLevel.Aggregation.Type, "date_histogram")
1321-
1322-
hAgg := firstLevel.Aggregation.Aggregation.(*es.DateHistogramAgg)
1323-
require.Equal(t, hAgg.ExtendedBounds.Max, toMs)
1324-
require.Equal(t, hAgg.ExtendedBounds.Min, fromMs)
1325-
require.Equal(t, hAgg.Field, "@timestamp")
1326-
//require.Equal(t, hAgg.Format, es.DateFormatEpochMS)
1327-
require.Equal(t, hAgg.FixedInterval, "$__interval_msms")
1328-
require.Equal(t, hAgg.MinDocCount, 0)
1307+
rangeFilter := sr.Query.Bool.Filters[0].(*es.DateRangeFilter)
1308+
require.Equal(t, rangeFilter.Key, c.configuredFields.TimeField)
1309+
require.Equal(t, rangeFilter.Lte, "2018-05-15T17:55:00Z")
1310+
require.Equal(t, rangeFilter.Gte, "2018-05-15T17:50:00Z")
1311+
require.Equal(t, sr.Sort[0]["@timestamp"]["order"], "desc")
13291312
})
13301313

13311314
t.Run("With log query with limit should return query with correct size", func(t *testing.T) {
@@ -1338,43 +1321,6 @@ func TestExecuteElasticsearchDataQuery(t *testing.T) {
13381321
require.Equal(t, sr.Size, 1000)
13391322
})
13401323

1341-
// Quickwit does not support highlight yet.
1342-
// t.Run("With log query should return highlight properties", func(t *testing.T) {
1343-
// c := newFakeClient()
1344-
// _, err := executeElasticsearchDataQuery(c, `{
1345-
// "metrics": [{ "type": "logs", "id": "1" }]
1346-
// }`, from, to)
1347-
// require.NoError(t, err)
1348-
// sr := c.multisearchRequests[0].Requests[0]
1349-
// require.Equal(t, sr.CustomProps["highlight"], map[string]interface{}{
1350-
// "fields": map[string]interface{}{
1351-
// "*": map[string]interface{}{},
1352-
// },
1353-
// "fragment_size": 2147483647,
1354-
// "post_tags": []string{"@/HIGHLIGHT@"},
1355-
// "pre_tags": []string{"@HIGHLIGHT@"},
1356-
// })
1357-
// })
1358-
1359-
t.Run("With log context query with sortDirection and searchAfter should return correct query", func(t *testing.T) {
1360-
c := newFakeClient()
1361-
_, err := executeElasticsearchDataQuery(c, `{
1362-
"metrics": [{ "type": "logs", "id": "1", "settings": { "limit": "1000", "sortDirection": "asc", "searchAfter": [1, "2"] }}]
1363-
}`, from, to)
1364-
require.NoError(t, err)
1365-
sr := c.multisearchRequests[0].Requests[0]
1366-
// require.Equal(t, sr.Sort["@timestamp"], map[string]string{"order": "asc", "unmapped_type": "boolean"})
1367-
// require.Equal(t, sr.Sort["_doc"], map[string]string{"order": "asc"})
1368-
1369-
searchAfter := sr.CustomProps["search_after"].([]interface{})
1370-
firstSearchAfter, err := searchAfter[0].(json.Number).Int64()
1371-
require.NoError(t, err)
1372-
require.Equal(t, firstSearchAfter, int64(1))
1373-
secondSearchAfter := searchAfter[1].(string)
1374-
require.NoError(t, err)
1375-
require.Equal(t, secondSearchAfter, "2")
1376-
})
1377-
13781324
t.Run("With invalid query should return error", (func(t *testing.T) {
13791325
c := newFakeClient()
13801326
_, err := executeElasticsearchDataQuery(c, `{

0 commit comments

Comments
 (0)