Bump pgrx -> 0.11.4

timescale · Jul 1, 2024 · 1489adf · 1489adf
1 parent bf62454
commit 1489adf
Show file tree

Hide file tree

Showing 16 changed files with 99 additions and 91 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -47,12 +47,6 @@ jobs:
           # Building TSDB in CI is only supported on Debian/Ubuntu
           skip: ${{ inputs.tsdb-commit != '' }}
           schedule: ${{ !(github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') }}
-        - os: centos
-          version: "7"
-          image: centos-7-x86_64
-          # Building TSDB in CI is only supported on Debian/Ubuntu
-          skip: ${{ inputs.tsdb-commit != '' }}
-          schedule: ${{ !(github.event_name == 'schedule' && github.event.schedule == '0 8 * * 1-4') }}
         - os: debian
           version: "11"
           image: debian-11-amd64
@@ -75,11 +69,6 @@ jobs:
             skip: true
         - container:
             schedule: false
-        # CentOS 7 does not have PostgreSQL 16 packages
-        - container:
-            os: centos
-            version: "7"
-          pgversion: 16
         # TimescaleDB as of 2.12.0 no longer supports PostgreSQL 12.
         # To allow us to do run CI against PostgreSQL 12, we therefore explicitly
         # remove all CI's, except if we are run against the latest supported TimescaleDB

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Readme.md b/Readme.md
@@ -51,7 +51,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.10.2' --force cargo-pgrx
+cargo install --version '=0.11.4' --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.

diff --git a/crates/hyperloglogplusplus/src/lib.rs b/crates/hyperloglogplusplus/src/lib.rs
@@ -5,7 +5,7 @@ extern crate quickcheck;
 extern crate quickcheck_macros;
 
 use std::{
-    hash::{BuildHasher, Hash, Hasher},
+    hash::{BuildHasher, Hash},
     marker::PhantomData,
 };
 
@@ -131,9 +131,7 @@ where
     pub fn add(&mut self, value: &T) {
         use HyperLogLogStorage::*;
 
-        let mut hasher = self.buildhasher.build_hasher();
-        value.hash(&mut hasher);
-        let hash = hasher.finish();
+        let hash = self.buildhasher.hash_one(value);
         match &mut self.storage {
             Sparse(s) => {
                 let overflowing = s.add_hash(hash);

diff --git a/crates/t-digest/src/lib.rs b/crates/t-digest/src/lib.rs
@@ -123,8 +123,8 @@ impl TDigest {
             max_size,
             sum: OrderedFloat::from(0.0),
             count: 0,
-            max: OrderedFloat::from(std::f64::NAN),
-            min: OrderedFloat::from(std::f64::NAN),
+            max: OrderedFloat::from(f64::NAN),
+            min: OrderedFloat::from(f64::NAN),
         }
     }
 
@@ -243,8 +243,8 @@ impl Default for TDigest {
             max_size: 100,
             sum: OrderedFloat::from(0.0),
             count: 0,
-            max: OrderedFloat::from(std::f64::NAN),
-            min: OrderedFloat::from(std::f64::NAN),
+            max: OrderedFloat::from(f64::NAN),
+            min: OrderedFloat::from(f64::NAN),
         }
     }
 }
@@ -429,8 +429,8 @@ impl TDigest {
         let mut starts: Vec<usize> = Vec::with_capacity(digests.len());
 
         let mut count: u64 = 0;
-        let mut min = OrderedFloat::from(std::f64::INFINITY);
-        let mut max = OrderedFloat::from(std::f64::NEG_INFINITY);
+        let mut min = OrderedFloat::from(f64::INFINITY);
+        let mut max = OrderedFloat::from(f64::NEG_INFINITY);
 
         let mut start: usize = 0;
         for digest in digests.into_iter() {