Update to pgrx 0.12.8; add some comments; cleanup

Readme.md

@@ -53,7 +53,7 @@ sudo apt-get install make gcc pkg-config clang postgresql-server-dev-14 libssl-d
 Next you need [cargo-pgrx](https://github.com/tcdi/pgrx), which can be installed with
 
 ```bash
-cargo install --version '=0.12.7' --force cargo-pgrx
+cargo install --version '=0.12.8' --force cargo-pgrx
 ```
 
 You must reinstall cargo-pgrx whenever you update your Rust compiler, since cargo-pgrx needs to be built with the same compiler as Toolkit.

extension/Cargo.toml

@@ -23,9 +23,9 @@ pg_test = ["approx"]
 [dependencies]
 # Keep synchronized with `cargo install --version N.N.N cargo-pgrx` in Readme.md and docker/ci/Dockerfile
 # Also `pgrx-tests` down below in `dev-dependencies`.
-pgrx = "=0.12.7"
-pgrx-macros = "=0.12.7"
-pgrx-sql-entity-graph = "=0.12.7"
+pgrx = "=0.12.8"
+pgrx-macros = "=0.12.8"
+pgrx-sql-entity-graph = "=0.12.8"
 encodings = {path="../crates/encodings"}
 flat_serialize = {path="../crates/flat_serialize/flat_serialize"}
 flat_serialize_macro = {path="../crates/flat_serialize/flat_serialize_macro"}
@@ -62,5 +62,5 @@ spfunc = "0.1.0"
 statrs = "0.15.0"
 
 [dev-dependencies]
-pgrx-tests = "=0.12.7"
+pgrx-tests = "=0.12.8"
 approx = "0.4.0"

extension/src/raw.rs

@@ -98,7 +98,6 @@ unsafe impl pgrx::callconv::BoxRet for bytea {
     unsafe fn box_into<'fcx>(self, fcinfo: &mut pgrx::callconv::FcInfo<'fcx>)
         -> pgrx::datum::Datum<'fcx>
     {
-        // self.0
         unsafe { fcinfo.return_raw_datum(self.0) }
     }
 }
@@ -152,7 +151,6 @@ unsafe impl pgrx::callconv::BoxRet for Interval {
     unsafe fn box_into<'fcx>(self, fcinfo: &mut pgrx::callconv::FcInfo<'fcx>)
         -> pgrx::datum::Datum<'fcx>
     {
-        // self.0
         unsafe { fcinfo.return_raw_datum(self.0) }
     }
 }

extension/src/serialization.rs

@@ -1,6 +1,6 @@
 pub use self::collations::PgCollationId;
 pub use self::functions::PgProcId;
-pub use self::types::{PgTypId, ShortTypeId};
+pub use self::types::ShortTypeId;
 use std::{
     convert::TryInto,
     os::raw::{c_char, c_int},

extension/src/time_vector/pipeline/lambda/executor.rs

@@ -193,21 +193,16 @@ where
         //
         // https://github.com/rust-lang/rust/issues/116831
         //
-        // For now it seems OK to suppress these warnings here and below with
+        // For now it seems OK to suppress these warnings here with
         // #[allow(improper_ctypes)]
+        #[allow(improper_ctypes)]
         extern "C" {
-            #[allow(improper_ctypes)]
             fn interval_pl(fcinfo: pg_sys::FunctionCallInfo) -> pg_sys::Datum;
-            #[allow(improper_ctypes)]
             fn interval_mi(fcinfo: pg_sys::FunctionCallInfo) -> pg_sys::Datum;
-            #[allow(improper_ctypes)]
             fn interval_mul(fcinfo: pg_sys::FunctionCallInfo) -> pg_sys::Datum;
-            #[allow(improper_ctypes)]
             fn interval_div(fcinfo: pg_sys::FunctionCallInfo) -> pg_sys::Datum;
 
-            #[allow(improper_ctypes)]
             fn timestamptz_pl_interval(fcinfo: pg_sys::FunctionCallInfo) -> pg_sys::Datum;
-            #[allow(improper_ctypes)]
             fn timestamptz_mi_interval(fcinfo: pg_sys::FunctionCallInfo) -> pg_sys::Datum;
         }
 

extension/src/type_builder.rs

@@ -1,11 +1,8 @@
 #[derive(Copy, Clone, Debug, serde::Serialize)]
 pub enum CachedDatum<'r> {
-// pub enum CachedDatum {
     None,
     FromInput(&'r [u8]),
     Flattened(&'r [u8]),
-    // FromInput(pgrx::pgbox::PgBox<[u8]>),
-    // Flattened(pgrx::pgbox::PgBox<[u8]>),
 }
 
 impl PartialEq for CachedDatum<'_> {
@@ -14,12 +11,16 @@ impl PartialEq for CachedDatum<'_> {
     }
 }
 
+// XXX Required by [`pgrx::PostgresType`] for default [`pgrx::FromDatum`]
+// implementation but isn't used since we implement [`pgrx::FromDatum`]
+// ourselves. We need a custom implementation because with the default one the
+// compiler complains that `'input` and `'de` lifetimes are incompatible.
 impl<'de> serde::Deserialize<'de> for CachedDatum<'_> {
     fn deserialize<D>(_deserializer: D) -> Result<Self, D::Error>
     where
         D: serde::de::Deserializer<'de>,
     {
-        Ok(CachedDatum::None)
+        unimplemented!();
     }
 }
 
@@ -134,7 +135,6 @@ macro_rules! pg_type_impl {
             pub fn [<$name:lower _in>](input: Option<&::core::ffi::CStr>) -> Option<$name<'static>> {
                 input.map_or_else(|| {
                     while let Some(m) = <$name as ::pgrx::inoutfuncs::InOutFuncs>::NULL_ERROR_MESSAGE {
-                    // for m in <$name as ::pgrx::inoutfuncs::InOutFuncs>::NULL_ERROR_MESSAGE {
                         ::pgrx::pg_sys::error!("{m}");
                     }
                     None

extension/src/uddsketch.rs

@@ -179,10 +179,8 @@ impl SerializedUddSketch {
 
 // PG object for the sketch.
 pg_type! {
-    //#[derive(Debug, serde::Serialize, serde::Deserialize)]
     #[derive(Debug)]
     struct UddSketch<'input> {
-    // struct UddSketch {
         alpha: f64,
         max_buckets: u32,
         num_buckets: u32,
@@ -265,7 +263,6 @@ impl<'a, 'b> From<&'a ReadableUddSketch> for UddSketch<'b> {
 }
 
 impl<'input> InOutFuncs for UddSketch<'input> {
-// impl InOutFuncs for UddSketch {
     fn output(&self, buffer: &mut StringInfo) {
         use crate::serialization::{str_to_db_encoding, EncodedStr::*};
 
@@ -289,7 +286,6 @@ impl<'input> InOutFuncs for UddSketch<'input> {
 }
 
 impl<'input> UddSketch<'input> {
-// impl UddSketch {
     fn keys(&self) -> impl Iterator<Item = SketchHashKey> + '_ {
         // FIXME does this really need a slice?
         decompress_keys(
@@ -354,7 +350,6 @@ impl<'input> UddSketch<'input> {
 }
 
 impl<'input> FromIterator<f64> for UddSketch<'input> {
-// impl FromIterator<f64> for UddSketch {
     fn from_iter<T: IntoIterator<Item = f64>>(iter: T) -> Self {
         let mut sketch = UddSketchInternal::new(
             PERCENTILE_AGG_DEFAULT_SIZE.into(),

tools/dependencies.sh

@@ -14,7 +14,7 @@ TSDB_PG_VERSIONS='12 13 14 15 16 17'
 CARGO_EDIT=0.11.2
 
 # Keep synchronized with extension/Cargo.toml and `cargo install --version N.N.N cargo-pgrx` in Readme.md .
-PGRX_VERSION=0.12.7
+PGRX_VERSION=0.12.8
 
 RUST_TOOLCHAIN=1.82.0
 RUST_PROFILE=minimal