Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: #808

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

WIP: #808

Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
111 changes: 66 additions & 45 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 2 additions & 4 deletions crates/hyperloglogplusplus/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ extern crate quickcheck;
extern crate quickcheck_macros;

use std::{
hash::{BuildHasher, Hash, Hasher},
hash::{BuildHasher, Hash},
marker::PhantomData,
};

Expand Down Expand Up @@ -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);
Expand Down
12 changes: 6 additions & 6 deletions crates/t-digest/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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),
}
}

Expand Down Expand Up @@ -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),
}
}
}
Expand Down Expand Up @@ -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() {
Expand Down
Loading
Loading