Encapsulate the TimestampTz output behavior

tsl/src/continuous_aggs/materialize.c

@@ -369,23 +369,35 @@ spi_update_watermark(Hypertable *mat_ht, SchemaAndName materialization_table,
  }
 }
 
-static int SavedDateStyle;
-static int SavedDateOrder;
-
-static inline void
-set_date_config(int newDateStyle, int newDateOrder)
+static char *
+OidSafeTimestampTzOutputFunctionCall(Oid type, Datum val)
 {
- SavedDateStyle = DateStyle;
- SavedDateOrder = DateOrder;
- DateStyle = newDateStyle;
- DateOrder = newDateOrder;
-}
+ char *result;
+ int SavedDateStyle, SavedDateOrder;
+ Oid functionId;
+ bool type_is_varlena;
 
-static inline void
-unset_date_config()
-{
- DateStyle = SavedDateStyle;
- DateOrder = SavedDateOrder;
+ getTypeOutputInfo(type, &functionId, &type_is_varlena);
+
+ /* Save DateStyle and DateOrder and force it to use ISO dates and YMD order */
+ if (functionId == TIMESTAMPTZOID)
+ {
+ SavedDateStyle = DateStyle;
+ SavedDateOrder = DateOrder;
+ DateStyle = USE_ISO_DATES;
+ DateOrder = DATEORDER_YMD;
+ }
+
+ result = OidOutputFunctionCall(functionId, val);
+
+ /* Restore previous date style and order configuration */
+ if (functionId == TIMESTAMPTZOID)
+ {
+ DateStyle = SavedDateStyle;
+ DateOrder = SavedDateOrder;
+ }
+
+ return result;
 }
 
 static void
@@ -394,18 +406,15 @@ spi_update_materializations(Hypertable *mat_ht, const ContinuousAgg *cagg,
  const NameData *time_column_name, TimeRange invalidation_range,
  const int32 chunk_id)
 {
- Oid out_fn;
- bool type_is_varlena;
  char *invalidation_start;
  char *invalidation_end;
  StringInfo chunk_condition = makeStringInfo();
  uint64 rows_processed = 0;
 
- getTypeOutputInfo(invalidation_range.type, &out_fn, &type_is_varlena);
- set_date_config(USE_ISO_DATES, DATEORDER_YMD);
- invalidation_start = OidOutputFunctionCall(out_fn, invalidation_range.start);
- invalidation_end = OidOutputFunctionCall(out_fn, invalidation_range.end);
- unset_date_config();
+ invalidation_start =
+ OidSafeTimestampTzOutputFunctionCall(invalidation_range.type, invalidation_range.start);
+ invalidation_end =
+ OidSafeTimestampTzOutputFunctionCall(invalidation_range.type, invalidation_range.end);
 
  /* MERGE statement is available starting on PG15 and we'll support it only in the new format of
  * CAggs and for non-compressed hypertables */