Skip to content
This repository was archived by the owner on Nov 7, 2025. It is now read-only.

Commit 49fb4c8

Browse files
author
trzysiek
committed
fix all tests
1 parent 357325d commit 49fb4c8

File tree

6 files changed

+72
-72
lines changed

6 files changed

+72
-72
lines changed

‎platform/frontend_connectors/search_common_table_test.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ func TestSearchCommonTable(t *testing.T) {
187187
WantedSql: []string{
188188
`SELECT countIf("@timestamp"<now()) AS "range_0__aggr__2__count", ` +
189189
`countIf(("@timestamp">=toStartOfDay(subDate(now(),INTERVAL 3 week)) AND "@timestamp"<now())) AS "range_1__aggr__2__count", ` +
190-
`countIf("@timestamp">=__quesma_from_unix_timestamp_ms(1713052800000)) AS "range_2__aggr__2__count" ` +
190+
`countIf("@timestamp">=fromUnixTimestamp64Milli(1713052800000)) AS "range_2__aggr__2__count" ` +
191191
`FROM quesma_common_table ` +
192192
`WHERE ("__quesma_index_name"='logs-1' OR "__quesma_index_name"='logs-2')
193193
-- optimizations: pancake(half)`,

‎platform/frontend_connectors/search_test.go‎

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -588,42 +588,38 @@ func TestHandlingDateTimeFields(t *testing.T) {
588588
}
589589
expectedSelectStatement := map[string]string{
590590
dateTimeTimestampField: `
591-
SELECT toInt64(__quesma_to_unix_timestamp_ms("timestamp") / 1m0s) AS
592-
"aggr__0__key_0", count(*) AS "aggr__0__count"
591+
SELECT toInt64(toUnixTimestamp("timestamp") / 60) AS "aggr__0__key_0",
592+
count(*) AS "aggr__0__count"
593593
FROM __quesma_table_name
594-
WHERE ((("timestamp64">=__quesma_from_unix_timestamp_ms(1706542596491) AND
595-
"timestamp64"<=__quesma_from_unix_timestamp_ms(1706551896491)) AND (
596-
"timestamp">=__quesma_from_unix_timestamp_ms(1706542596491) AND "timestamp"<=
597-
__quesma_from_unix_timestamp_ms(1706551896491))) AND NOT (("@timestamp">=
598-
__quesma_from_unix_timestamp_ms(1706542596491) AND "@timestamp"<=
599-
__quesma_from_unix_timestamp_ms(1706551896491))))
600-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("timestamp") / 1m0s) AS
601-
"aggr__0__key_0"
594+
WHERE ((("timestamp64">=fromUnixTimestamp64Milli(1706542596491) AND
595+
"timestamp64"<=fromUnixTimestamp64Milli(1706551896491)) AND ("timestamp">=
596+
fromUnixTimestamp(1706542596) AND "timestamp"<=fromUnixTimestamp(1706551896)))
597+
AND NOT (("@timestamp">=fromUnixTimestamp64Milli(1706542596491) AND
598+
"@timestamp"<=fromUnixTimestamp64Milli(1706551896491))))
599+
GROUP BY toInt64(toUnixTimestamp("timestamp") / 60) AS "aggr__0__key_0"
602600
ORDER BY "aggr__0__key_0" ASC`,
603601
dateTime64TimestampField: `
604-
SELECT toInt64(__quesma_to_unix_timestamp_ms("timestamp64") / 1m0s) AS
602+
SELECT toInt64(toUnixTimestamp64Milli("timestamp64") / 60000) AS
605603
"aggr__0__key_0", count(*) AS "aggr__0__count"
606604
FROM __quesma_table_name
607-
WHERE ((("timestamp64">=__quesma_from_unix_timestamp_ms(1706542596491) AND
608-
"timestamp64"<=__quesma_from_unix_timestamp_ms(1706551896491)) AND (
609-
"timestamp">=__quesma_from_unix_timestamp_ms(1706542596491) AND "timestamp"<=
610-
__quesma_from_unix_timestamp_ms(1706551896491))) AND NOT (("@timestamp">=
611-
__quesma_from_unix_timestamp_ms(1706542596491) AND "@timestamp"<=
612-
__quesma_from_unix_timestamp_ms(1706551896491))))
613-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("timestamp64") / 1m0s) AS
605+
WHERE ((("timestamp64">=fromUnixTimestamp64Milli(1706542596491) AND
606+
"timestamp64"<=fromUnixTimestamp64Milli(1706551896491)) AND ("timestamp">=
607+
fromUnixTimestamp(1706542596) AND "timestamp"<=fromUnixTimestamp(1706551896)))
608+
AND NOT (("@timestamp">=fromUnixTimestamp64Milli(1706542596491) AND
609+
"@timestamp"<=fromUnixTimestamp64Milli(1706551896491))))
610+
GROUP BY toInt64(toUnixTimestamp64Milli("timestamp64") / 60000) AS
614611
"aggr__0__key_0"
615612
ORDER BY "aggr__0__key_0" ASC`,
616613
dateTime64OurTimestampField: `
617-
SELECT toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 1m0s) AS
618-
"aggr__0__key_0", count(*) AS "aggr__0__count"
614+
SELECT toInt64(toUnixTimestamp64Milli("@timestamp") / 60000) AS "aggr__0__key_0"
615+
, count(*) AS "aggr__0__count"
619616
FROM __quesma_table_name
620-
WHERE ((("timestamp64">=__quesma_from_unix_timestamp_ms(1706542596491) AND
621-
"timestamp64"<=__quesma_from_unix_timestamp_ms(1706551896491)) AND (
622-
"timestamp">=__quesma_from_unix_timestamp_ms(1706542596491) AND "timestamp"<=
623-
__quesma_from_unix_timestamp_ms(1706551896491))) AND NOT (("@timestamp">=
624-
__quesma_from_unix_timestamp_ms(1706542596491) AND "@timestamp"<=
625-
__quesma_from_unix_timestamp_ms(1706551896491))))
626-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 1m0s) AS
617+
WHERE ((("timestamp64">=fromUnixTimestamp64Milli(1706542596491) AND
618+
"timestamp64"<=fromUnixTimestamp64Milli(1706551896491)) AND ("timestamp">=
619+
fromUnixTimestamp(1706542596) AND "timestamp"<=fromUnixTimestamp(1706551896)))
620+
AND NOT (("@timestamp">=fromUnixTimestamp64Milli(1706542596491) AND
621+
"@timestamp"<=fromUnixTimestamp64Milli(1706551896491))))
622+
GROUP BY toInt64(toUnixTimestamp64Milli("@timestamp") / 60000) AS
627623
"aggr__0__key_0"
628624
ORDER BY "aggr__0__key_0" ASC`,
629625
}
@@ -863,6 +859,10 @@ func TestSearchTrackTotalCount(t *testing.T) {
863859
for i, tt := range testdata.FullSearchRequests {
864860
for _, handlerName := range handlers {
865861
t.Run(strconv.Itoa(i)+" "+tt.Name, func(t *testing.T) {
862+
fmt.Println("test i", i)
863+
if i != 6 {
864+
//t.Skip()
865+
}
866866
test(handlerName, tt)
867867
})
868868
}

‎platform/testdata/full_search_requests.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -436,15 +436,15 @@ var FullSearchRequests = []FullSearchTestCase{
436436
"aggr__2__3__order_1_rank"
437437
FROM (
438438
SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
439-
toInt64((__quesma_to_unix_timestamp_ms("@timestamp")+timeZoneOffset(toTimezone(
440-
"@timestamp", 'Europe/Warsaw'))*1s) / 12h0m0s) AS "aggr__2__key_0",
439+
toInt64((toUnixTimestamp64Milli("@timestamp")+timeZoneOffset(toTimezone(
440+
"@timestamp", 'Europe/Warsaw'))*1000) / 43200000) AS "aggr__2__key_0",
441441
sum(count(*)) OVER (PARTITION BY "aggr__2__key_0") AS "aggr__2__count",
442442
sum(count(*)) OVER (PARTITION BY "aggr__2__key_0") AS
443443
"aggr__2__3__parent_count", NULL AS "aggr__2__3__key_0",
444444
count(*) AS "aggr__2__3__count"
445445
FROM __quesma_table_name
446-
GROUP BY toInt64((__quesma_to_unix_timestamp_ms("@timestamp")+timeZoneOffset(
447-
toTimezone("@timestamp", 'Europe/Warsaw'))*1s) / 12h0m0s) AS
446+
GROUP BY toInt64((toUnixTimestamp64Milli("@timestamp")+timeZoneOffset(
447+
toTimezone("@timestamp", 'Europe/Warsaw'))*1000) / 43200000) AS
448448
"aggr__2__key_0", NULL AS "aggr__2__3__key_0"))
449449
WHERE "aggr__2__3__order_1_rank"<=6
450450
ORDER BY "aggr__2__order_1_rank" ASC, "aggr__2__3__order_1_rank" ASC`,

‎platform/testdata/opensearch_requests.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,16 +86,16 @@ var OpensearchSearchTests = []SearchTestCase{
8686
WantedQueries: []string{
8787
`SELECT "__bytes", "__timestamp", "message_____"
8888
FROM __quesma_table_name
89-
WHERE ("__timestamp">=__quesma_from_unix_timestamp_ms(1712236698149) AND "__timestamp"<=__quesma_from_unix_timestamp_ms(1712237598149))
89+
WHERE ("__timestamp">=fromUnixTimestamp64Milli(1712236698149) AND "__timestamp"<=fromUnixTimestamp64Milli(1712237598149))
9090
ORDER BY "__timestamp" DESC LIMIT 500`,
9191
`SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
92-
toInt64((__quesma_to_unix_timestamp_ms("__timestamp")+timeZoneOffset(toTimezone(
93-
"__timestamp", 'Europe/Warsaw'))*1s) / 30s) AS "aggr__2__key_0",
92+
toInt64((toUnixTimestamp64Milli("__timestamp")+timeZoneOffset(toTimezone(
93+
"__timestamp", 'Europe/Warsaw'))*1000) / 30000) AS "aggr__2__key_0",
9494
count(*) AS "aggr__2__count"
9595
FROM __quesma_table_name
96-
WHERE ("__timestamp">=__quesma_from_unix_timestamp_ms(1712236698149) AND "__timestamp"<=__quesma_from_unix_timestamp_ms(1712237598149))
97-
GROUP BY toInt64((__quesma_to_unix_timestamp_ms("__timestamp")+timeZoneOffset(
98-
toTimezone("__timestamp", 'Europe/Warsaw'))*1s) / 30s) AS "aggr__2__key_0"
96+
WHERE ("__timestamp">=fromUnixTimestamp64Milli(1712236698149) AND "__timestamp"<=fromUnixTimestamp64Milli(1712237598149))
97+
GROUP BY toInt64((toUnixTimestamp64Milli("__timestamp")+timeZoneOffset(
98+
toTimezone("__timestamp", 'Europe/Warsaw'))*1000) / 30000) AS "aggr__2__key_0"
9999
ORDER BY "aggr__2__key_0" ASC`,
100100
},
101101
},
@@ -176,11 +176,11 @@ var OpensearchSearchTests = []SearchTestCase{
176176
WantedQueryType: model.Normal,
177177
WantedQueries: []string{
178178
`SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
179-
toInt64(__quesma_to_unix_timestamp_ms("__timestamp") / 30s) AS "aggr__2__key_0",
179+
toInt64(toUnixTimestamp64Milli("__timestamp") / 30000) AS "aggr__2__key_0",
180180
count(*) AS "aggr__2__count"
181181
FROM __quesma_table_name
182-
WHERE ("__timestamp">=__quesma_from_unix_timestamp_ms(1712236698149) AND "__timestamp"<=__quesma_from_unix_timestamp_ms(1712237598149))
183-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("__timestamp") / 30s) AS "aggr__2__key_0"
182+
WHERE ("__timestamp">=fromUnixTimestamp64Milli(1712236698149) AND "__timestamp"<=fromUnixTimestamp64Milli(1712237598149))
183+
GROUP BY toInt64(toUnixTimestamp64Milli("__timestamp") / 30000) AS "aggr__2__key_0"
184184
ORDER BY "aggr__2__key_0" ASC`,
185185
},
186186
},

‎platform/testdata/requests.go‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -156,8 +156,8 @@ var TestsAsyncSearch = []AsyncSearchTestCase{
156156
FROM (
157157
SELECT "host_name"
158158
FROM __quesma_table_name
159-
WHERE (("@timestamp">=__quesma_from_unix_timestamp_ms(1706009236820) AND
160-
"@timestamp"<=__quesma_from_unix_timestamp_ms(1706010136820)) AND "message" iLIKE '%user%')
159+
WHERE (("@timestamp">=fromUnixTimestamp64Milli(1706009236820) AND
160+
"@timestamp"<=fromUnixTimestamp64Milli(1706010136820)) AND "message" iLIKE '%user%')
161161
LIMIT 20000)
162162
GROUP BY "host_name" AS "aggr__sample__top_values__key_0"
163163
ORDER BY "aggr__sample__top_values__count" DESC,
@@ -306,13 +306,13 @@ var TestsAsyncSearch = []AsyncSearchTestCase{
306306
[]string{
307307
`SELECT "message"
308308
FROM __quesma_table_name
309-
WHERE ((("@timestamp">=__quesma_from_unix_timestamp_ms(1706020999481) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1706021899481))
309+
WHERE ((("@timestamp">=fromUnixTimestamp64Milli(1706020999481) AND "@timestamp"<=fromUnixTimestamp64Milli(1706021899481))
310310
AND "message" iLIKE '%user%') AND "message" IS NOT NULL)
311311
ORDER BY "@timestamp" DESC
312312
LIMIT 100`,
313313
`SELECT count(*) AS "column_0"
314314
FROM __quesma_table_name
315-
WHERE ((("@timestamp">=__quesma_from_unix_timestamp_ms(1706020999481) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1706021899481))
315+
WHERE ((("@timestamp">=fromUnixTimestamp64Milli(1706020999481) AND "@timestamp"<=fromUnixTimestamp64Milli(1706021899481))
316316
AND "message" iLIKE '%user%') AND "message" IS NOT NULL)`,
317317
},
318318
false,
@@ -557,7 +557,7 @@ var TestsAsyncSearch = []AsyncSearchTestCase{
557557
[]string{`
558558
SELECT "@timestamp", "event_dataset", "host_name", "message", "properties_isreg"
559559
FROM __quesma_table_name
560-
WHERE ("message" iLIKE '%user%' AND ("@timestamp">=__quesma_from_unix_timestamp_ms(1706020999481) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1706021899481)))
560+
WHERE ("message" iLIKE '%user%' AND ("@timestamp">=fromUnixTimestamp64Milli(1706020999481) AND "@timestamp"<=fromUnixTimestamp64Milli(1706021899481)))
561561
ORDER BY "@timestamp" DESC
562562
LIMIT 500`,
563563
},
@@ -694,15 +694,15 @@ var TestsAsyncSearch = []AsyncSearchTestCase{
694694
model.HitsCountInfo{Type: model.ListByField, RequestedFields: []string{"@timestamp"}, Size: 100},
695695
[]string{
696696
`SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
697-
toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS "aggr__0__key_0",
697+
toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS "aggr__0__key_0",
698698
count(*) AS "aggr__0__count"
699699
FROM __quesma_table_name
700-
WHERE ("message" iLIKE '%user%' AND ("@timestamp">=__quesma_from_unix_timestamp_ms(1706020999481) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1706021899481)))
701-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS "aggr__0__key_0"
700+
WHERE ("message" iLIKE '%user%' AND ("@timestamp">=fromUnixTimestamp64Milli(1706020999481) AND "@timestamp"<=fromUnixTimestamp64Milli(1706021899481)))
701+
GROUP BY toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS "aggr__0__key_0"
702702
ORDER BY "aggr__0__key_0" ASC`,
703703
`SELECT "@timestamp"
704704
FROM __quesma_table_name
705-
WHERE ("message" iLIKE '%user%' AND ("@timestamp">=__quesma_from_unix_timestamp_ms(1706020999481) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1706021899481)))
705+
WHERE ("message" iLIKE '%user%' AND ("@timestamp">=fromUnixTimestamp64Milli(1706020999481) AND "@timestamp"<=fromUnixTimestamp64Milli(1706021899481)))
706706
LIMIT 100`,
707707
},
708708
true,
@@ -758,12 +758,12 @@ var TestsAsyncSearch = []AsyncSearchTestCase{
758758
COALESCE("event_dataset", 'unknown') AS "aggr__stats__key_0",
759759
sum(count(*)) OVER (PARTITION BY "aggr__stats__key_0") AS
760760
"aggr__stats__count",
761-
toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 1m0s) AS
761+
toInt64(toUnixTimestamp64Milli("@timestamp") / 60000) AS
762762
"aggr__stats__series__key_0", count(*) AS "aggr__stats__series__count"
763763
FROM __quesma_table_name
764-
WHERE ("@timestamp">__quesma_from_unix_timestamp_ms(1706194439033) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1706195339033))
764+
WHERE ("@timestamp">fromUnixTimestamp64Milli(1706194439033) AND "@timestamp"<=fromUnixTimestamp64Milli(1706195339033))
765765
GROUP BY COALESCE("event_dataset", 'unknown') AS "aggr__stats__key_0",
766-
toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 1m0s) AS
766+
toInt64(toUnixTimestamp64Milli("@timestamp") / 60000) AS
767767
"aggr__stats__series__key_0"))
768768
WHERE "aggr__stats__order_1_rank"<=4
769769
ORDER BY "aggr__stats__order_1_rank" ASC,
@@ -941,10 +941,10 @@ var TestsAsyncSearch = []AsyncSearchTestCase{
941941
[]string{`
942942
SELECT "properties_isreg"
943943
FROM __quesma_table_name
944-
WHERE ((("@timestamp">=__quesma_from_unix_timestamp_ms(1710171234276) AND
945-
"@timestamp"<=__quesma_from_unix_timestamp_ms(1710172134276)) AND
946-
("@timestamp">=__quesma_from_unix_timestamp_ms(1710171234276) AND
947-
"@timestamp"<=__quesma_from_unix_timestamp_ms(1710172134276))) AND "properties_isreg" IS NOT NULL)
944+
WHERE ((("@timestamp">=fromUnixTimestamp64Milli(1710171234276) AND
945+
"@timestamp"<=fromUnixTimestamp64Milli(1710172134276)) AND
946+
("@timestamp">=fromUnixTimestamp64Milli(1710171234276) AND
947+
"@timestamp"<=fromUnixTimestamp64Milli(1710172134276))) AND "properties_isreg" IS NOT NULL)
948948
LIMIT 100`,
949949
},
950950
false,
@@ -1058,7 +1058,7 @@ var TestsSearch = []SearchTestCase{
10581058
model.ListAllFields,
10591059
[]string{
10601060
`SELECT "message" FROM ` + TableName + ` WHERE ("message" iLIKE '%user%' ` +
1061-
`AND ("@timestamp">=__quesma_from_unix_timestamp_ms(1705487298815) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1705488198815))) ` +
1061+
`AND ("@timestamp">=fromUnixTimestamp64Milli(1705487298815) AND "@timestamp"<=fromUnixTimestamp64Milli(1705488198815))) ` +
10621062
`LIMIT 10`,
10631063
`SELECT count(*) AS "column_0" FROM ` + TableName,
10641064
},
@@ -2087,7 +2087,7 @@ var TestsSearch = []SearchTestCase{
20872087
model.ListAllFields,
20882088
// TestSearchHandler is pretty blunt with config loading so the test below can't be used.
20892089
// We will probably refactor it as we move forwards with schema which will get even more side-effecting
2090-
[]string{`SELECT "message" FROM ` + TableName + ` WHERE ("@timestamp">=__quesma_from_unix_timestamp_ms(1705915570299) AND "@timestamp" = toDateTime64('2024-05-24 13:32:47.307',3)) LIMIT 10`},
2090+
[]string{`SELECT "message" FROM ` + TableName + ` WHERE ("@timestamp">=fromUnixTimestamp64Milli(1705915570299) AND "@timestamp" = toDateTime64('2024-05-24 13:32:47.307',3)) LIMIT 10`},
20912091
[]string{},
20922092
},
20932093
{ // [35] Comments in queries
@@ -2142,7 +2142,7 @@ var TestsSearch = []SearchTestCase{
21422142
`SELECT "message" ` +
21432143
`FROM ` + TableName + ` ` +
21442144
`WHERE ("cliIP" IN tuple('2601:204:c503:c240:9c41:5531:ad94:4d90', '50.116.43.98', '75.246.0.64') ` +
2145-
`AND ("@timestamp">=__quesma_from_unix_timestamp_ms(1715817600000) AND "@timestamp"<=__quesma_from_unix_timestamp_ms(1715990399000))) ` +
2145+
`AND ("@timestamp">=fromUnixTimestamp64Milli(1715817600000) AND "@timestamp"<=fromUnixTimestamp64Milli(1715990399000))) ` +
21462146
`LIMIT 1`,
21472147
},
21482148
[]string{},
@@ -2558,10 +2558,10 @@ var TestSearchFilter = []SearchTestCase{
25582558
model.Normal,
25592559
[]string{},
25602560
[]string{`
2561-
SELECT toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS "aggr__0__key_0",
2561+
SELECT toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS "aggr__0__key_0",
25622562
count(*) AS "aggr__0__count"
25632563
FROM __quesma_table_name
2564-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS
2564+
GROUP BY toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS
25652565
"aggr__0__key_0"
25662566
ORDER BY "aggr__0__key_0" ASC`,
25672567
},
@@ -2616,11 +2616,11 @@ var TestSearchFilter = []SearchTestCase{
26162616
[]string{},
26172617
[]string{
26182618
`SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
2619-
toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS "aggr__0__key_0",
2619+
toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS "aggr__0__key_0",
26202620
count(*) AS "aggr__0__count"
26212621
FROM __quesma_table_name
26222622
WHERE "@timestamp">subDate(now(), INTERVAL 15 minute)
2623-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS
2623+
GROUP BY toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS
26242624
"aggr__0__key_0"
26252625
ORDER BY "aggr__0__key_0" ASC`,
26262626
},
@@ -2677,12 +2677,12 @@ var TestSearchFilter = []SearchTestCase{
26772677
[]string{},
26782678
[]string{`
26792679
SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
2680-
toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS "aggr__0__key_0"
2681-
, count(*) AS "aggr__0__count"
2680+
toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS "aggr__0__key_0",
2681+
count(*) AS "aggr__0__count"
26822682
FROM __quesma_table_name
2683-
WHERE ("@timestamp">=__quesma_from_unix_timestamp_ms(1727858503270) AND
2684-
"@timestamp"<=__quesma_from_unix_timestamp_ms(1727859403270))
2685-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("@timestamp") / 30s) AS
2683+
WHERE ("@timestamp">=fromUnixTimestamp64Milli(1727858503270) AND
2684+
"@timestamp"<=fromUnixTimestamp64Milli(1727859403270))
2685+
GROUP BY toInt64(toUnixTimestamp64Milli("@timestamp") / 30000) AS
26862686
"aggr__0__key_0"
26872687
ORDER BY "aggr__0__key_0" ASC`,
26882688
},

‎platform/testdata/requests_with_special_characters.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -146,11 +146,11 @@ var AggregationTestsWithSpecialCharactersInFieldNames = []AggregationTestCase{
146146
ExpectedPancakeResults: []model.QueryResultRow{}, // checking only the SQLs is enough for now
147147
ExpectedPancakeSQL: `WITH quesma_top_hits_group_table AS (
148148
SELECT sum(count(*)) OVER () AS "metric____quesma_total_count_col_0",
149-
toInt64(__quesma_to_unix_timestamp_ms("__timestamp") / 12h0m0s) AS
149+
toInt64(toUnixTimestamp64Milli("__timestamp") / 43200000) AS
150150
"aggr__0__key_0", count(*) AS "aggr__0__count"
151151
FROM __quesma_table_name
152152
WHERE "message_____" IS NOT NULL
153-
GROUP BY toInt64(__quesma_to_unix_timestamp_ms("__timestamp") / 12h0m0s) AS
153+
GROUP BY toInt64(toUnixTimestamp64Milli("__timestamp") / 43200000) AS
154154
"aggr__0__key_0"
155155
ORDER BY "aggr__0__key_0" ASC) ,
156156
quesma_top_hits_join AS (
@@ -164,7 +164,7 @@ var AggregationTestsWithSpecialCharactersInFieldNames = []AggregationTestCase{
164164
"__timestamp" DESC) AS "top_hits_rank"
165165
FROM quesma_top_hits_group_table AS "group_table" LEFT OUTER JOIN
166166
__quesma_table_name AS "hit_table" ON ("group_table"."aggr__0__key_0"=
167-
toInt64(__quesma_to_unix_timestamp_ms("__timestamp") / 12h0m0s))
167+
toInt64(toUnixTimestamp64Milli("__timestamp") / 43200000))
168168
WHERE "message_____" IS NOT NULL)
169169
SELECT "metric____quesma_total_count_col_0", "aggr__0__key_0", "aggr__0__count",
170170
"top_metrics__0__1_col_0", "top_metrics__0__1_col_1", "top_hits_rank"

0 commit comments

Comments
 (0)