Skip to content

Commit 77af4ab

Browse files
melihmutlumelihmutlu
authored
Fix debug_refresh_window to use correct min (#9968)
For timestamp types, the code skipped the internal to timestamp conversion, mis-rendering the minimum by the epoch difference. Use ts_internal_to_time_string() and regenerate cagg_policy_incremental, the only test exercising this debug line. Disable-check: force-changelog-file
1 parent cd4ca9d commit 77af4ab

2 files changed

Lines changed: 33 additions & 34 deletions

File tree

‎tsl/src/continuous_aggs/refresh.c‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1082,8 +1082,7 @@ debug_refresh_window(const ContinuousAgg *cagg, const InternalTimeRange *refresh
10821082
ts_internal_to_time_string(refresh_window->end, refresh_window->type),
10831083
refresh_window->start,
10841084
refresh_window->end,
1085-
ts_datum_to_string(Int64GetDatum(ts_time_get_min(refresh_window->type)),
1086-
refresh_window->type));
1085+
ts_internal_to_time_string(ts_time_get_min(refresh_window->type), refresh_window->type));
10871086
}
10881087

10891088
List *

‎tsl/test/expected/cagg_policy_incremental.out‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1063,12 +1063,12 @@ SET client_min_messages TO DEBUG1;
10631063
CALL run_job(:sparse_job_id);
10641064
LOG: statement: CALL run_job(1007);
10651065
DEBUG: Executing policy_refresh_continuous_aggregate with parameters {"end_offset": "@ 1 mon", "start_offset": "@ 10 years", "buckets_per_batch": 1, "mat_hypertable_id": 8, "refresh_newest_first": false}
1066-
DEBUG: begin "sparse_cagg" in window [ Wed Mar 11 00:00:00 2015 UTC, Tue Feb 11 00:00:00 2025 UTC ] internal [ 1426032000000000, 1739232000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1067-
DEBUG: before produce batches "sparse_cagg" in window [ Wed Apr 01 00:00:00 2015 UTC, Sat Feb 01 00:00:00 2025 UTC ] internal [ 1427846400000000, 1738368000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1068-
DEBUG: batch produced "sparse_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Mar 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1709251200000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1069-
DEBUG: batch produced "sparse_cagg" in window [ Fri Mar 01 00:00:00 2024 UTC, Mon Apr 01 00:00:00 2024 UTC ] internal [ 1709251200000000, 1711929600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1070-
DEBUG: batch produced "sparse_cagg" in window [ Wed May 01 00:00:00 2024 UTC, Sat Jun 01 00:00:00 2024 UTC ] internal [ 1714521600000000, 1717200000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1071-
DEBUG: batch produced "sparse_cagg" in window [ Tue Oct 01 00:00:00 2024 UTC, Fri Nov 01 00:00:00 2024 UTC ] internal [ 1727740800000000, 1730419200000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1066+
DEBUG: begin "sparse_cagg" in window [ Wed Mar 11 00:00:00 2015 UTC, Tue Feb 11 00:00:00 2025 UTC ] internal [ 1426032000000000, 1739232000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1067+
DEBUG: before produce batches "sparse_cagg" in window [ Wed Apr 01 00:00:00 2015 UTC, Sat Feb 01 00:00:00 2025 UTC ] internal [ 1427846400000000, 1738368000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1068+
DEBUG: batch produced "sparse_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Mar 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1709251200000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1069+
DEBUG: batch produced "sparse_cagg" in window [ Fri Mar 01 00:00:00 2024 UTC, Mon Apr 01 00:00:00 2024 UTC ] internal [ 1709251200000000, 1711929600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1070+
DEBUG: batch produced "sparse_cagg" in window [ Wed May 01 00:00:00 2024 UTC, Sat Jun 01 00:00:00 2024 UTC ] internal [ 1714521600000000, 1717200000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1071+
DEBUG: batch produced "sparse_cagg" in window [ Tue Oct 01 00:00:00 2024 UTC, Fri Nov 01 00:00:00 2024 UTC ] internal [ 1727740800000000, 1730419200000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
10721072
DEBUG: refreshing continuous aggregate "sparse_cagg" from Thu Feb 01 00:00:00 2024 UTC to Fri Mar 01 00:00:00 2024 UTC
10731073
DEBUG: hypertable 7 existing watermark >= new invalidation threshold 1719792000000000 1709251200000000
10741074
LOG: continuous aggregate refresh (individual invalidation) on "sparse_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Mar 01 00:00:00 2024 UTC ] (batch 1 of 4)
@@ -1159,19 +1159,19 @@ SET client_min_messages TO DEBUG1;
11591159
CALL run_job(:fixed_job_id);
11601160
LOG: statement: CALL run_job(1008);
11611161
DEBUG: Executing policy_refresh_continuous_aggregate with parameters {"end_offset": "@ 1 mon", "start_offset": "@ 10 years", "buckets_per_batch": 1, "mat_hypertable_id": 9, "refresh_newest_first": false}
1162-
DEBUG: begin "sparse_cagg_fixed" in window [ Wed Mar 11 00:00:00 2015 UTC, Tue Feb 11 00:00:00 2025 UTC ] internal [ 1426032000000000, 1739232000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1163-
DEBUG: before produce batches "sparse_cagg_fixed" in window [ Sun Mar 15 00:00:00 2015 UTC, Mon Feb 10 00:00:00 2025 UTC ] internal [ 1426377600000000, 1739145600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1164-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Fri Feb 16 00:00:00 2024 UTC, Mon Feb 26 00:00:00 2024 UTC ] internal [ 1708041600000000, 1708905600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1165-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Mon Feb 26 00:00:00 2024 UTC, Thu Mar 07 00:00:00 2024 UTC ] internal [ 1708905600000000, 1709769600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1166-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Thu Mar 07 00:00:00 2024 UTC, Sun Mar 17 00:00:00 2024 UTC ] internal [ 1709769600000000, 1710633600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1167-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Sun Mar 17 00:00:00 2024 UTC, Wed Mar 27 00:00:00 2024 UTC ] internal [ 1710633600000000, 1711497600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1168-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Mon May 06 00:00:00 2024 UTC, Thu May 16 00:00:00 2024 UTC ] internal [ 1714953600000000, 1715817600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1169-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Thu May 16 00:00:00 2024 UTC, Sun May 26 00:00:00 2024 UTC ] internal [ 1715817600000000, 1716681600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1170-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Sun May 26 00:00:00 2024 UTC, Wed Jun 05 00:00:00 2024 UTC ] internal [ 1716681600000000, 1717545600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1171-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Tue Jun 25 00:00:00 2024 UTC, Fri Jul 05 00:00:00 2024 UTC ] internal [ 1719273600000000, 1720137600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1172-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Thu Oct 03 00:00:00 2024 UTC, Sun Oct 13 00:00:00 2024 UTC ] internal [ 1727913600000000, 1728777600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1173-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Sun Oct 13 00:00:00 2024 UTC, Wed Oct 23 00:00:00 2024 UTC ] internal [ 1728777600000000, 1729641600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1174-
DEBUG: batch produced "sparse_cagg_fixed" in window [ Wed Oct 23 00:00:00 2024 UTC, Sat Nov 02 00:00:00 2024 UTC ] internal [ 1729641600000000, 1730505600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1162+
DEBUG: begin "sparse_cagg_fixed" in window [ Wed Mar 11 00:00:00 2015 UTC, Tue Feb 11 00:00:00 2025 UTC ] internal [ 1426032000000000, 1739232000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1163+
DEBUG: before produce batches "sparse_cagg_fixed" in window [ Sun Mar 15 00:00:00 2015 UTC, Mon Feb 10 00:00:00 2025 UTC ] internal [ 1426377600000000, 1739145600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1164+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Fri Feb 16 00:00:00 2024 UTC, Mon Feb 26 00:00:00 2024 UTC ] internal [ 1708041600000000, 1708905600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1165+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Mon Feb 26 00:00:00 2024 UTC, Thu Mar 07 00:00:00 2024 UTC ] internal [ 1708905600000000, 1709769600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1166+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Thu Mar 07 00:00:00 2024 UTC, Sun Mar 17 00:00:00 2024 UTC ] internal [ 1709769600000000, 1710633600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1167+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Sun Mar 17 00:00:00 2024 UTC, Wed Mar 27 00:00:00 2024 UTC ] internal [ 1710633600000000, 1711497600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1168+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Mon May 06 00:00:00 2024 UTC, Thu May 16 00:00:00 2024 UTC ] internal [ 1714953600000000, 1715817600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1169+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Thu May 16 00:00:00 2024 UTC, Sun May 26 00:00:00 2024 UTC ] internal [ 1715817600000000, 1716681600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1170+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Sun May 26 00:00:00 2024 UTC, Wed Jun 05 00:00:00 2024 UTC ] internal [ 1716681600000000, 1717545600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1171+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Tue Jun 25 00:00:00 2024 UTC, Fri Jul 05 00:00:00 2024 UTC ] internal [ 1719273600000000, 1720137600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1172+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Thu Oct 03 00:00:00 2024 UTC, Sun Oct 13 00:00:00 2024 UTC ] internal [ 1727913600000000, 1728777600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1173+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Sun Oct 13 00:00:00 2024 UTC, Wed Oct 23 00:00:00 2024 UTC ] internal [ 1728777600000000, 1729641600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1174+
DEBUG: batch produced "sparse_cagg_fixed" in window [ Wed Oct 23 00:00:00 2024 UTC, Sat Nov 02 00:00:00 2024 UTC ] internal [ 1729641600000000, 1730505600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
11751175
DEBUG: refreshing continuous aggregate "sparse_cagg_fixed" from Fri Feb 16 00:00:00 2024 UTC to Mon Feb 26 00:00:00 2024 UTC
11761176
DEBUG: hypertable 7 existing watermark >= new invalidation threshold 1730419200000000 1708905600000000
11771177
LOG: continuous aggregate refresh (individual invalidation) on "sparse_cagg_fixed" in window [ Fri Feb 16 00:00:00 2024 UTC, Mon Feb 26 00:00:00 2024 UTC ] (batch 1 of 11)
@@ -1284,11 +1284,11 @@ SET client_min_messages TO DEBUG1;
12841284
CALL run_job(:sparse_bp3_job_id);
12851285
LOG: statement: CALL run_job(1009);
12861286
DEBUG: Executing policy_refresh_continuous_aggregate with parameters {"end_offset": "@ 1 mon", "start_offset": "@ 10 years", "buckets_per_batch": 3, "mat_hypertable_id": 10, "refresh_newest_first": false}
1287-
DEBUG: begin "sparse_cagg_bp3" in window [ Wed Mar 11 00:00:00 2015 UTC, Tue Feb 11 00:00:00 2025 UTC ] internal [ 1426032000000000, 1739232000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1288-
DEBUG: before produce batches "sparse_cagg_bp3" in window [ Wed Apr 01 00:00:00 2015 UTC, Sat Feb 01 00:00:00 2025 UTC ] internal [ 1427846400000000, 1738368000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1289-
DEBUG: batch produced "sparse_cagg_bp3" in window [ Thu Feb 01 00:00:00 2024 UTC, Wed May 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1714521600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1290-
DEBUG: batch produced "sparse_cagg_bp3" in window [ Wed May 01 00:00:00 2024 UTC, Thu Aug 01 00:00:00 2024 UTC ] internal [ 1714521600000000, 1722470400000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1291-
DEBUG: batch produced "sparse_cagg_bp3" in window [ Tue Oct 01 00:00:00 2024 UTC, Wed Jan 01 00:00:00 2025 UTC ] internal [ 1727740800000000, 1735689600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1287+
DEBUG: begin "sparse_cagg_bp3" in window [ Wed Mar 11 00:00:00 2015 UTC, Tue Feb 11 00:00:00 2025 UTC ] internal [ 1426032000000000, 1739232000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1288+
DEBUG: before produce batches "sparse_cagg_bp3" in window [ Wed Apr 01 00:00:00 2015 UTC, Sat Feb 01 00:00:00 2025 UTC ] internal [ 1427846400000000, 1738368000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1289+
DEBUG: batch produced "sparse_cagg_bp3" in window [ Thu Feb 01 00:00:00 2024 UTC, Wed May 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1714521600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1290+
DEBUG: batch produced "sparse_cagg_bp3" in window [ Wed May 01 00:00:00 2024 UTC, Thu Aug 01 00:00:00 2024 UTC ] internal [ 1714521600000000, 1722470400000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1291+
DEBUG: batch produced "sparse_cagg_bp3" in window [ Tue Oct 01 00:00:00 2024 UTC, Wed Jan 01 00:00:00 2025 UTC ] internal [ 1727740800000000, 1735689600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
12921292
DEBUG: refreshing continuous aggregate "sparse_cagg_bp3" from Thu Feb 01 00:00:00 2024 UTC to Wed May 01 00:00:00 2024 UTC
12931293
DEBUG: hypertable 7 existing watermark >= new invalidation threshold 1730505600000000 1714521600000000
12941294
LOG: continuous aggregate refresh (individual invalidation) on "sparse_cagg_bp3" in window [ Thu Feb 01 00:00:00 2024 UTC, Wed May 01 00:00:00 2024 UTC ] (batch 1 of 3)
@@ -1395,14 +1395,14 @@ SET client_min_messages TO DEBUG1;
13951395
CALL run_job(:end_null_job_id);
13961396
LOG: statement: CALL run_job(1010);
13971397
DEBUG: Executing policy_refresh_continuous_aggregate with parameters {"end_offset": null, "start_offset": null, "buckets_per_batch": 1, "mat_hypertable_id": 12, "refresh_newest_first": false}
1398-
DEBUG: begin "end_null_cagg" in window [ -infinity, infinity ] internal [ -9223372036854775808, 9223372036854775807 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1399-
DEBUG: START IS NULL "end_null_cagg" in window [ -infinity, infinity ] internal [ -9223372036854775808, 9223372036854775807 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1400-
DEBUG: END IS NULL "end_null_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, infinity ] internal [ 1706745600000000, 9223372036854775807 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1401-
DEBUG: before produce batches "end_null_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Nov 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1730419200000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1402-
DEBUG: batch produced "end_null_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Mar 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1709251200000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1403-
DEBUG: batch produced "end_null_cagg" in window [ Fri Mar 01 00:00:00 2024 UTC, Mon Apr 01 00:00:00 2024 UTC ] internal [ 1709251200000000, 1711929600000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1404-
DEBUG: batch produced "end_null_cagg" in window [ Wed May 01 00:00:00 2024 UTC, Sat Jun 01 00:00:00 2024 UTC ] internal [ 1714521600000000, 1717200000000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1405-
DEBUG: batch produced "end_null_cagg" in window [ Tue Oct 01 00:00:00 2024 UTC, Fri Nov 01 00:00:00 2024 UTC ] internal [ 1727740800000000, 1730419200000000 ] minimum [ Wed Nov 24 00:00:00 4684 UTC BC ]
1398+
DEBUG: begin "end_null_cagg" in window [ -infinity, infinity ] internal [ -9223372036854775808, 9223372036854775807 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1399+
DEBUG: START IS NULL "end_null_cagg" in window [ -infinity, infinity ] internal [ -9223372036854775808, 9223372036854775807 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1400+
DEBUG: END IS NULL "end_null_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, infinity ] internal [ 1706745600000000, 9223372036854775807 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1401+
DEBUG: before produce batches "end_null_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Nov 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1730419200000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1402+
DEBUG: batch produced "end_null_cagg" in window [ Thu Feb 01 00:00:00 2024 UTC, Fri Mar 01 00:00:00 2024 UTC ] internal [ 1706745600000000, 1709251200000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1403+
DEBUG: batch produced "end_null_cagg" in window [ Fri Mar 01 00:00:00 2024 UTC, Mon Apr 01 00:00:00 2024 UTC ] internal [ 1709251200000000, 1711929600000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1404+
DEBUG: batch produced "end_null_cagg" in window [ Wed May 01 00:00:00 2024 UTC, Sat Jun 01 00:00:00 2024 UTC ] internal [ 1714521600000000, 1717200000000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
1405+
DEBUG: batch produced "end_null_cagg" in window [ Tue Oct 01 00:00:00 2024 UTC, Fri Nov 01 00:00:00 2024 UTC ] internal [ 1727740800000000, 1730419200000000 ] minimum [ Mon Nov 24 00:00:00 4714 UTC BC ]
14061406
DEBUG: refreshing continuous aggregate "end_null_cagg" from -infinity to Fri Mar 01 00:00:00 2024 UTC
14071407
DEBUG: hypertable 11 existing watermark >= new invalidation threshold 1719792000000000 1709251200000000
14081408
LOG: continuous aggregate refresh (individual invalidation) on "end_null_cagg" in window [ -infinity, Fri Mar 01 00:00:00 2024 UTC ] (batch 1 of 4)

0 commit comments

Comments
 (0)