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

Commit 8ecb549

Browse files
pdelewskipdelewski
committed
More updates
1 parent ad1cde5 commit 8ecb549

File tree

6 files changed

+82
-82
lines changed

6 files changed

+82
-82
lines changed

‎platform/testdata/clients/clover.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -350,8 +350,8 @@ var CloverTests = []testdata.AggregationTestCase{
350350
countIf(NOT ("table.flower" __quesma_match 'clover')) AS
351351
"metric__timeseries__a2-numerator_col_0"
352352
FROM __quesma_table_name
353-
WHERE ("@timestamp">=fromUnixTimestamp64Milli(1728640683723) AND "@timestamp"<=
354-
fromUnixTimestamp64Milli(1728641583723))`,
353+
WHERE ("@timestamp">=__quesma_from_unixtime64mili(1728640683723) AND "@timestamp"<=
354+
__quesma_from_unixtime64mili(1728641583723))`,
355355
},
356356
{ // [2]
357357
TestName: "simplest auto_date_histogram",
@@ -477,8 +477,8 @@ var CloverTests = []testdata.AggregationTestCase{
477477
ExpectedPancakeSQL: `
478478
SELECT count(*) AS "aggr__timeseries__count"
479479
FROM __quesma_table_name
480-
WHERE ("timestamp">=fromUnixTimestamp64Milli(1728581627125) AND "timestamp"<=
481-
fromUnixTimestamp64Milli(1728635627125))`,
480+
WHERE ("timestamp">=__quesma_from_unixtime64mili(1728581627125) AND "timestamp"<=
481+
__quesma_from_unixtime64mili(1728635627125))`,
482482
AdditionalAcceptableDifference: []string{"key_as_string"}, // timezone differences between local and github runs... There's always 2h difference between those, need to investigate. Maybe come back to .UTC() so there's no "+timezone" (e.g. +02:00)?
483483
},
484484
{ // [3]
@@ -648,8 +648,8 @@ var CloverTests = []testdata.AggregationTestCase{
648648
countIf(NOT ("a.b_str" IS NOT NULL)) AS
649649
"metric__timeseries__f2-numerator_col_0"
650650
FROM __quesma_table_name
651-
WHERE ("@timestamp">=fromUnixTimestamp64Milli(1721399904783) AND "@timestamp"<=
652-
fromUnixTimestamp64Milli(1730475504783))`,
651+
WHERE ("@timestamp">=__quesma_from_unixtime64mili(1721399904783) AND "@timestamp"<=
652+
__quesma_from_unixtime64mili(1730475504783))`,
653653
},
654654
{ // [4]
655655
TestName: "todo",
@@ -949,8 +949,8 @@ var CloverTests = []testdata.AggregationTestCase{
949949
toInt64(toUnixTimestamp64Milli("@timestamp") / 604800000) AS
950950
"aggr__q__time_buckets__key_0", count(*) AS "aggr__q__time_buckets__count"
951951
FROM __quesma_table_name
952-
WHERE (("@timestamp">=fromUnixTimestamp64Milli(1728507729621) AND "@timestamp"<=
953-
fromUnixTimestamp64Milli(1728507732621)) AND "__quesma_fulltext_field_name"
952+
WHERE (("@timestamp">=__quesma_from_unixtime64mili(1728507729621) AND "@timestamp"<=
953+
__quesma_from_unixtime64mili(1728507732621)) AND "__quesma_fulltext_field_name"
954954
__quesma_match '%')
955955
GROUP BY toInt64(toUnixTimestamp64Milli("@timestamp") / 604800000) AS
956956
"aggr__q__time_buckets__key_0"

‎platform/testdata/kibana-visualize/aggregation_requests.go‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,8 @@ var AggregationTests = []testdata.AggregationTestCase{
251251
"aggr__0__1__parent_count", "severity" AS "aggr__0__1__key_0",
252252
"source" AS "aggr__0__1__key_1", count(*) AS "aggr__0__1__count"
253253
FROM __quesma_table_name
254-
WHERE ("@timestamp">=fromUnixTimestamp64Milli(1716811196627) AND
255-
"@timestamp"<=fromUnixTimestamp64Milli(1716812096627))
254+
WHERE ("@timestamp">=__quesma_from_unixtime64mili(1716811196627) AND
255+
"@timestamp"<=__quesma_from_unixtime64mili(1716812096627))
256256
GROUP BY toInt64((toUnixTimestamp64Milli("@timestamp")+timeZoneOffset(
257257
toTimezone("@timestamp", 'Europe/Warsaw'))*1000) / 30000) AS
258258
"aggr__0__key_0", "severity" AS "aggr__0__1__key_0",
@@ -1337,8 +1337,8 @@ var AggregationTests = []testdata.AggregationTestCase{
13371337
avgOrNull("FlightDelayMin") AS "metric__0__1_col_3",
13381338
sumOrNull("FlightDelayMin") AS "metric__0__1_col_4"
13391339
FROM __quesma_table_name
1340-
WHERE ("timestamp">=fromUnixTimestamp64Milli(1725723024239) AND "timestamp"<=
1341-
fromUnixTimestamp64Milli(1727019024239))
1340+
WHERE ("timestamp">=__quesma_from_unixtime64mili(1725723024239) AND "timestamp"<=
1341+
__quesma_from_unixtime64mili(1727019024239))
13421342
GROUP BY "Carrier" AS "aggr__0__key_0"
13431343
ORDER BY "metric__0__1_col_1" DESC, "metric__0__1_col_0" DESC,
13441344
"metric__0__1_col_3" DESC, "metric__0__1_col_2" ASC,
@@ -1505,8 +1505,8 @@ var AggregationTests = []testdata.AggregationTestCase{
15051505
stddevPop("FlightDelayMin") AS "metric__0__1_col_8",
15061506
stddevSamp("FlightDelayMin") AS "metric__0__1_col_9"
15071507
FROM __quesma_table_name
1508-
WHERE ("timestamp">=fromUnixTimestamp64Milli(1725723024239) AND "timestamp"<=
1509-
fromUnixTimestamp64Milli(1727019024239))
1508+
WHERE ("timestamp">=__quesma_from_unixtime64mili(1725723024239) AND "timestamp"<=
1509+
__quesma_from_unixtime64mili(1727019024239))
15101510
GROUP BY "Carrier" AS "aggr__0__key_0"
15111511
ORDER BY "metric__0__1_col_1" DESC, "metric__0__1_col_0" DESC,
15121512
"metric__0__1_col_3" DESC, "metric__0__1_col_2" ASC,
@@ -2098,8 +2098,8 @@ var AggregationTests = []testdata.AggregationTestCase{
20982098
toStartOfWeek(subDate(now(), INTERVAL 1 week)))) AND "timestamp"<toInt64(
20992099
toUnixTimestamp(now())))) AS "metric__2__3__4__1_col_0"
21002100
FROM __quesma_table_name
2101-
WHERE (("timestamp">=fromUnixTimestamp64Milli(1258014686584) AND "timestamp"
2102-
<=fromUnixTimestamp64Milli(1731400286584)) AND ("timestamp">=toInt64(
2101+
WHERE (("timestamp">=__quesma_from_unixtime64mili(1258014686584) AND "timestamp"
2102+
<=__quesma_from_unixtime64mili(1731400286584)) AND ("timestamp">=toInt64(
21032103
toUnixTimestamp(toStartOfWeek(subDate(now(), INTERVAL 1 week)))) AND
21042104
"timestamp"<toInt64(toUnixTimestamp(now()))))
21052105
GROUP BY "DistanceKilometers" AS "aggr__2__3__key_0",
@@ -2139,8 +2139,8 @@ var AggregationTests = []testdata.AggregationTestCase{
21392139
minOrNullIf("FlightDelayMin", "timestamp">=toInt64(toUnixTimestamp(subDate
21402140
(now(), INTERVAL 1 day)))) AS "metric__2__3__4__1_col_0"
21412141
FROM __quesma_table_name
2142-
WHERE (("timestamp">=fromUnixTimestamp64Milli(1258014686584) AND "timestamp"
2143-
<=fromUnixTimestamp64Milli(1731400286584)) AND "timestamp">=toInt64(
2142+
WHERE (("timestamp">=__quesma_from_unixtime64mili(1258014686584) AND "timestamp"
2143+
<=__quesma_from_unixtime64mili(1731400286584)) AND "timestamp">=toInt64(
21442144
toUnixTimestamp(subDate(now(), INTERVAL 1 day))))
21452145
GROUP BY "DistanceKilometers" AS "aggr__2__3__key_0",
21462146
toInt64((toUnixTimestamp64Milli("timestamp")+timeZoneOffset(toTimezone(
@@ -3916,8 +3916,8 @@ var AggregationTests = []testdata.AggregationTestCase{
39163916
sumOrNull("DistanceKilometers") AS "metric__2__second_col_0",
39173917
sumOrNull("DistanceKilometers") AS "metric__2__week_col_0"
39183918
FROM __quesma_table_name
3919-
WHERE ("timestamp">=fromUnixTimestamp64Milli(1731584141864) AND "timestamp"<=
3920-
fromUnixTimestamp64Milli(1731585041864))
3919+
WHERE ("timestamp">=__quesma_from_unixtime64mili(1731584141864) AND "timestamp"<=
3920+
__quesma_from_unixtime64mili(1731585041864))
39213921
GROUP BY toInt64((toUnixTimestamp64Milli("timestamp")+timeZoneOffset(toTimezone(
39223922
"timestamp", 'Europe/Warsaw'))*1000) / 30000) AS "aggr__2__key_0"
39233923
ORDER BY "aggr__2__key_0" ASC`,
@@ -4079,8 +4079,8 @@ var AggregationTests = []testdata.AggregationTestCase{
40794079
sumOrNull("DistanceKilometers") AS "metric__2__week_col_0",
40804080
count("DistanceKilometers") AS "metric__2__year_col_0"
40814081
FROM __quesma_table_name
4082-
WHERE ("timestamp">=fromUnixTimestamp64Milli(1668427553316) AND "timestamp"<=
4083-
fromUnixTimestamp64Milli(1731585953316))
4082+
WHERE ("timestamp">=__quesma_from_unixtime64mili(1668427553316) AND "timestamp"<=
4083+
__quesma_from_unixtime64mili(1731585953316))
40844084
GROUP BY toInt64(toUnixTimestamp(toStartOfMonth(toTimezone("timestamp",
40854085
'Europe/Warsaw'))))*1000 AS "aggr__2__key_0"
40864086
ORDER BY "aggr__2__key_0" ASC`,

‎platform/testdata/kibana-visualize/pipeline_aggregation_requests.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -198,8 +198,8 @@ var PipelineAggregationTests = []testdata.AggregationTestCase{
198198
"aggr__2__1-bucket__key_0", count(*) AS "aggr__2__1-bucket__count",
199199
maxOrNull("timestamp") AS "metric__2__1-bucket__1-metric_col_0"
200200
FROM __quesma_table_name
201-
WHERE ("timestamp">=fromUnixTimestamp64Milli(1726848963807) AND "timestamp"
202-
<=fromUnixTimestamp64Milli(1728144963807))
201+
WHERE ("timestamp">=__quesma_from_unixtime64mili(1726848963807) AND "timestamp"
202+
<=__quesma_from_unixtime64mili(1728144963807))
203203
GROUP BY toInt64((toUnixTimestamp64Milli("timestamp")+timeZoneOffset(
204204
toTimezone("timestamp", 'Europe/Warsaw'))*1000) / 43200000) AS
205205
"aggr__2__key_0",

0 commit comments

Comments
 (0)