renamed interval to duration, formatted extension_sql! blocks

Author: thatzopoulos

extension/src/counter_agg.rs

@@ -622,9 +622,13 @@ fn counter_agg_extrapolated_delta<'a>(summary: CounterSummary<'a>, method: &str)
 // Public facing interpolated_delta
 extension_sql!(
     "\n\
-CREATE FUNCTION toolkit_experimental.interpolated_delta(summary countersummary, start timestamptz, intervalparam interval, prev countersummary, next countersummary) RETURNS double precision AS $$\n\
-SELECT interpolated_delta(summary,start,intervalparam,prev,next)\n\
-$$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
+     CREATE FUNCTION toolkit_experimental.interpolated_delta(summary countersummary,\n\
+          start timestamptz,\n\
+          duration interval,\n\
+          prev countersummary,\n\
+          next countersummary) RETURNS DOUBLE PRECISION\n\
+     AS $$\n\
+          SELECT interpolated_delta(summary,start,duration,prev,next) $$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
 ",
     name = "experimental_interpolated_delta", requires=[counter_agg_interpolated_delta]
 );
@@ -633,11 +637,11 @@ $$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
 fn counter_agg_interpolated_delta<'a>(
     summary: CounterSummary<'a>,
     start: crate::raw::TimestampTz,
-    intervalparam: crate::raw::Interval,
+    duration: crate::raw::Interval,
     prev: Option<CounterSummary<'a>>,
     next: Option<CounterSummary<'a>>,
 ) -> f64 {
-    let interval = crate::datum_utils::interval_to_ms(&start, &intervalparam);
+    let interval = crate::datum_utils::interval_to_ms(&start, &duration);
     summary
         .interpolate(start.into(), interval, prev, next)
         .to_internal_counter_summary()
@@ -667,22 +671,27 @@ fn counter_agg_extrapolated_rate<'a>(summary: CounterSummary<'a>, method: &str)
 // Public facing interpolated_rate
 extension_sql!(
     "\n\
-CREATE FUNCTION toolkit_experimental.interpolated_rate(summary countersummary, start timestamptz, intervalparam interval, prev countersummary, next countersummary) RETURNS double precision AS $$\n\
-SELECT interpolated_rate(summary,start,intervalparam,prev,next)\n\
-$$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
+     CREATE FUNCTION toolkit_experimental.interpolated_rate(summary countersummary,\n\
+          start timestamptz,\n\
+          duration interval,\n\
+          prev countersummary,\n\
+          next countersummary) RETURNS DOUBLE PRECISION\n\
+     AS $$\n\
+          SELECT interpolated_rate(summary,start,duration,prev,next) $$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
 ",
-    name = "experimental_interpolated_rate", requires=[counter_agg_interpolated_rate]
+    name = "experimental_interpolated_rate",
+    requires = [counter_agg_interpolated_rate]
 );
 
 #[pg_extern(name = "interpolated_rate", immutable, parallel_safe)]
 fn counter_agg_interpolated_rate<'a>(
     summary: CounterSummary<'a>,
     start: crate::raw::TimestampTz,
-    intervalparam: crate::raw::Interval,
+    duration: crate::raw::Interval,
     prev: Option<CounterSummary<'a>>,
     next: Option<CounterSummary<'a>>,
 ) -> Option<f64> {
-    let interval = crate::datum_utils::interval_to_ms(&start, &intervalparam);
+    let interval = crate::datum_utils::interval_to_ms(&start, &duration);
     summary
         .interpolate(start.into(), interval, prev, next)
         .to_internal_counter_summary()

extension/src/stabilization_info.rs

@@ -11,10 +11,10 @@
 
 crate::functions_stabilized_at! {
     STABLE_FUNCTIONS
-    "1.13.0" => {
-    interpolated_average(timeweightsummary,timestamp with time zone,interval,timeweightsummary,timeweightsummary),
-    interpolated_delta(countersummary,timestamp with time zone,interval,countersummary,countersummary),
-    interpolated_rate(countersummary,timestamp with time zone,interval,countersummary,countersummary),
+    "1.14.0" => {
+        interpolated_average(timeweightsummary,timestamp with time zone,interval,timeweightsummary,timeweightsummary),
+        interpolated_delta(countersummary,timestamp with time zone,interval,countersummary,countersummary),
+        interpolated_rate(countersummary,timestamp with time zone,interval,countersummary,countersummary),
     }
     "1.12.0" => {
         stats1d_tf_inv_trans(internal,double precision),

extension/src/time_weighted_average.rs

@@ -475,14 +475,14 @@ pub fn time_weighted_average_integral<'a>(
 fn interpolate<'a>(
     tws: Option<TimeWeightSummary>,
     start: crate::raw::TimestampTz,
-    interval: crate::raw::Interval,
+    duration: crate::raw::Interval,
     prev: Option<TimeWeightSummary>,
     next: Option<TimeWeightSummary>,
 ) -> Option<TimeWeightSummary<'a>> {
     match tws {
         None => None,
         Some(tws) => {
-            let interval = crate::datum_utils::interval_to_ms(&start, &interval);
+            let interval = crate::datum_utils::interval_to_ms(&start, &duration);
             Some(tws.interpolate(start.into(), interval, prev, next))
         }
     }
@@ -491,9 +491,13 @@ fn interpolate<'a>(
 // Public facing interpolated_average
 extension_sql!(
     "\n\
-CREATE FUNCTION toolkit_experimental.interpolated_average(tws timeweightsummary, start timestamptz, intervalparam interval, prev  timeweightsummary, next timeweightsummary) RETURNS double precision AS $$\n\
-SELECT interpolated_average(tws,start,intervalparam,prev,next)\n\
-$$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
+     CREATE FUNCTION toolkit_experimental.interpolated_average(tws timeweightsummary,\n\
+          start timestamptz,\n\
+          duration interval,\n\
+          prev timeweightsummary,\n\
+          next timeweightsummary) RETURNS DOUBLE PRECISION\n\
+     AS $$\n\
+          SELECT interpolated_average(tws,start,duration,prev,next) $$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
 ",
     name = "experimental_interpolated_average", requires = [time_weighted_average_interpolated_average]
 );
@@ -502,11 +506,11 @@ $$ LANGUAGE SQL IMMUTABLE PARALLEL SAFE;\n\
 pub fn time_weighted_average_interpolated_average<'a>(
     tws: Option<TimeWeightSummary<'a>>,
     start: crate::raw::TimestampTz,
-    intervalparam: crate::raw::Interval,
+    duration: crate::raw::Interval,
     prev: Option<TimeWeightSummary<'a>>,
     next: Option<TimeWeightSummary<'a>>,
 ) -> Option<f64> {
-    let target = interpolate(tws, start, intervalparam, prev, next);
+    let target = interpolate(tws, start, duration, prev, next);
     time_weighted_average_average(target)
 }