From 4c0244488c63bf588db47f15ec23514cc789a5f1 Mon Sep 17 00:00:00 2001 From: James H <32926722+jayy-lmao@users.noreply.github.com> Date: Fri, 12 Jul 2024 15:30:49 +1000 Subject: [PATCH] feat(cube): support postgres cube (#3188) * feat: add cube * docs: cube docs * docs: update readme * fix: cube is now not feature flagged * fix: formatting * fix: typeo for PgCube vs Cube * fix: correct types * fix: postgres only types for cube * fix: cube readme * fix: dont unwrap cubes * fix: typo on interval * fix: zero volume cube array * fix: return type * fix: update tests * fix: run with one test type * fix: log bytes in error * fix: typo in test * fix: log bytes for failed length * fix: string deser * docs: remove cube from readme * fix: int to float * fix: trim floats * fix: exttra test * fix: type safe into vectors * fix: improve error messages * docs: remove comments * fix: front load most important logic and const at start * fix: extract constants * fix: flags * fix: avoid redundant buffer creation and use FromStr trait * fix: handle serializing * test: cube vec test * fix: no array cube test * fix: update test with array for cube * fix: dont use try from for u8 * fix: conditionally remove padding * fix: conditional trimming * fix: idiomatic trimming * fix: linting * fix: remove whitespace * fix: lower case array * fix: spacing input * test: one more vec test * fix: trim square brackets in case they are using postgres spec page * fix: result types * fix: format * fix: box error * fix: the borrow produces a value * fix: self serialise * chore: merge main * fix: borrow * fix: clippy --------- Co-authored-by: James Holman --- sqlx-postgres/src/type_checking.rs | 2 + sqlx-postgres/src/types/cube.rs | 427 +++++++++++++++++++++++++++++ sqlx-postgres/src/types/mod.rs | 4 + tests/postgres/setup.sql | 3 + tests/postgres/types.rs | 17 ++ 5 files changed, 453 insertions(+) create mode 100644 sqlx-postgres/src/types/cube.rs diff --git a/sqlx-postgres/src/type_checking.rs b/sqlx-postgres/src/type_checking.rs index f30a737399..e22d3b9007 100644 --- a/sqlx-postgres/src/type_checking.rs +++ b/sqlx-postgres/src/type_checking.rs @@ -30,6 +30,8 @@ impl_type_checking!( sqlx::postgres::types::PgLQuery, + sqlx::postgres::types::PgCube, + #[cfg(feature = "uuid")] sqlx::types::Uuid, diff --git a/sqlx-postgres/src/types/cube.rs b/sqlx-postgres/src/types/cube.rs new file mode 100644 index 0000000000..bf778b8b91 --- /dev/null +++ b/sqlx-postgres/src/types/cube.rs @@ -0,0 +1,427 @@ +use crate::decode::Decode; +use crate::encode::{Encode, IsNull}; +use crate::error::BoxDynError; +use crate::types::Type; +use crate::{PgArgumentBuffer, PgHasArrayType, PgTypeInfo, PgValueFormat, PgValueRef, Postgres}; +use sqlx_core::Error; +use std::str::FromStr; + +const BYTE_WIDTH: usize = 8; +const CUBE_TYPE_ZERO_VOLUME: usize = 128; +const CUBE_TYPE_DEFAULT: usize = 0; +const CUBE_DIMENSION_ONE: usize = 1; +const DIMENSIONALITY_POSITION: usize = 3; +const START_INDEX: usize = 4; + +#[derive(Debug, Clone, PartialEq)] +pub enum PgCube { + Point(f64), + ZeroVolume(Vec), + OneDimensionInterval(f64, f64), + MultiDimension(Vec>), +} + +impl Type for PgCube { + fn type_info() -> PgTypeInfo { + PgTypeInfo::with_name("cube") + } +} + +impl PgHasArrayType for PgCube { + fn array_type_info() -> PgTypeInfo { + PgTypeInfo::with_name("_cube") + } +} + +impl<'r> Decode<'r, Postgres> for PgCube { + fn decode(value: PgValueRef<'r>) -> Result> { + match value.format() { + PgValueFormat::Text => Ok(PgCube::from_str(value.as_str()?)?), + PgValueFormat::Binary => Ok(pg_cube_from_bytes(value.as_bytes()?)?), + } + } +} + +impl<'q> Encode<'q, Postgres> for PgCube { + fn produces(&self) -> Option { + Some(PgTypeInfo::with_name("cube")) + } + + fn encode_by_ref(&self, buf: &mut PgArgumentBuffer) -> Result { + self.serialize(buf)?; + Ok(IsNull::No) + } +} + +impl FromStr for PgCube { + type Err = Error; + + fn from_str(s: &str) -> Result { + let content = s + .trim_start_matches('(') + .trim_start_matches('[') + .trim_end_matches(')') + .trim_end_matches(']') + .replace(' ', ""); + + if !content.contains('(') && !content.contains(',') { + return parse_point(&content); + } + + if !content.contains("),(") { + return parse_zero_volume(&content); + } + + let point_vecs = content.split("),(").collect::>(); + if point_vecs.len() == 2 && !point_vecs.iter().any(|pv| pv.contains(',')) { + return parse_one_dimensional_interval(point_vecs); + } + + parse_multidimensional_interval(point_vecs) + } +} + +fn pg_cube_from_bytes(bytes: &[u8]) -> Result { + let cube_type = bytes + .first() + .map(|&byte| byte as usize) + .ok_or(Error::Decode( + format!("Could not decode cube bytes: {:?}", bytes).into(), + ))?; + + let dimensionality = bytes + .get(DIMENSIONALITY_POSITION) + .map(|&byte| byte as usize) + .ok_or(Error::Decode( + format!("Could not decode cube bytes: {:?}", bytes).into(), + ))?; + + match (cube_type, dimensionality) { + (CUBE_TYPE_ZERO_VOLUME, CUBE_DIMENSION_ONE) => { + let point = get_f64_from_bytes(bytes, 4)?; + Ok(PgCube::Point(point)) + } + (CUBE_TYPE_ZERO_VOLUME, _) => { + Ok(PgCube::ZeroVolume(deserialize_vector(bytes, START_INDEX)?)) + } + (CUBE_TYPE_DEFAULT, CUBE_DIMENSION_ONE) => { + let x_start = 4; + let y_start = x_start + BYTE_WIDTH; + let x = get_f64_from_bytes(bytes, x_start)?; + let y = get_f64_from_bytes(bytes, y_start)?; + Ok(PgCube::OneDimensionInterval(x, y)) + } + (CUBE_TYPE_DEFAULT, dim) => Ok(PgCube::MultiDimension(deserialize_matrix( + bytes, + START_INDEX, + dim, + )?)), + (flag, dimension) => Err(Error::Decode( + format!( + "Could not deserialise cube with flag {} and dimension {}: {:?}", + flag, dimension, bytes + ) + .into(), + )), + } +} + +impl PgCube { + fn serialize(&self, buff: &mut PgArgumentBuffer) -> Result<(), Error> { + match self { + PgCube::Point(value) => { + buff.extend(&[CUBE_TYPE_ZERO_VOLUME as u8, 0, 0, CUBE_DIMENSION_ONE as u8]); + buff.extend_from_slice(&value.to_be_bytes()); + } + PgCube::ZeroVolume(values) => { + let dimension = values.len() as u8; + buff.extend_from_slice(&[CUBE_TYPE_ZERO_VOLUME as u8, 0, 0]); + buff.extend_from_slice(&dimension.to_be_bytes()); + let bytes = values + .iter() + .flat_map(|v| v.to_be_bytes()) + .collect::>(); + buff.extend_from_slice(&bytes); + } + PgCube::OneDimensionInterval(x, y) => { + buff.extend_from_slice(&[0, 0, 0, CUBE_DIMENSION_ONE as u8]); + buff.extend_from_slice(&x.to_be_bytes()); + buff.extend_from_slice(&y.to_be_bytes()); + } + PgCube::MultiDimension(multi_values) => { + let dimension = multi_values + .first() + .map(|arr| arr.len() as u8) + .unwrap_or(1_u8); + buff.extend_from_slice(&[0, 0, 0]); + buff.extend_from_slice(&dimension.to_be_bytes()); + let bytes = multi_values + .iter() + .flatten() + .flat_map(|v| v.to_be_bytes()) + .collect::>(); + buff.extend_from_slice(&bytes); + } + }; + Ok(()) + } + + #[cfg(test)] + fn serialize_to_vec(&self) -> Vec { + let mut buff = PgArgumentBuffer::default(); + self.serialize(&mut buff).unwrap(); + buff.to_vec() + } +} + +fn get_f64_from_bytes(bytes: &[u8], start: usize) -> Result { + bytes + .get(start..start + BYTE_WIDTH) + .ok_or(Error::Decode( + format!("Could not decode cube bytes: {:?}", bytes).into(), + ))? + .try_into() + .map(f64::from_be_bytes) + .map_err(|err| Error::Decode(format!("Invalid bytes slice: {:?}", err).into())) +} + +fn deserialize_vector(bytes: &[u8], start_index: usize) -> Result, Error> { + let steps = (bytes.len() - start_index) / BYTE_WIDTH; + (0..steps) + .map(|i| get_f64_from_bytes(bytes, start_index + i * BYTE_WIDTH)) + .collect() +} + +fn deserialize_matrix( + bytes: &[u8], + start_index: usize, + dim: usize, +) -> Result>, Error> { + let step = BYTE_WIDTH * dim; + let steps = (bytes.len() - start_index) / step; + + (0..steps) + .map(|step_idx| { + (0..dim) + .map(|dim_idx| { + get_f64_from_bytes(bytes, start_index + step_idx * step + dim_idx * BYTE_WIDTH) + }) + .collect() + }) + .collect() +} + +fn parse_float_from_str(s: &str, error_msg: &str) -> Result { + s.parse().map_err(|_| Error::Decode(error_msg.into())) +} + +fn parse_point(str: &str) -> Result { + Ok(PgCube::Point(parse_float_from_str( + str, + "Failed to parse point", + )?)) +} + +fn parse_zero_volume(content: &str) -> Result { + content + .split(',') + .map(|p| parse_float_from_str(p, "Failed to parse into zero-volume cube")) + .collect::, _>>() + .map(PgCube::ZeroVolume) +} + +fn parse_one_dimensional_interval(point_vecs: Vec<&str>) -> Result { + let x = parse_float_from_str( + &remove_parentheses(point_vecs.first().ok_or(Error::Decode( + format!("Could not decode cube interval x: {:?}", point_vecs).into(), + ))?), + "Failed to parse X in one-dimensional interval", + )?; + let y = parse_float_from_str( + &remove_parentheses(point_vecs.get(1).ok_or(Error::Decode( + format!("Could not decode cube interval y: {:?}", point_vecs).into(), + ))?), + "Failed to parse Y in one-dimensional interval", + )?; + Ok(PgCube::OneDimensionInterval(x, y)) +} + +fn parse_multidimensional_interval(point_vecs: Vec<&str>) -> Result { + point_vecs + .iter() + .map(|&point_vec| { + point_vec + .split(',') + .map(|point| { + parse_float_from_str( + &remove_parentheses(point), + "Failed to parse into multi-dimension cube", + ) + }) + .collect::, _>>() + }) + .collect::, _>>() + .map(PgCube::MultiDimension) +} + +fn remove_parentheses(s: &str) -> String { + s.trim_matches(|c| c == '(' || c == ')').to_string() +} + +#[cfg(test)] +mod cube_tests { + + use std::str::FromStr; + + use crate::types::{cube::pg_cube_from_bytes, PgCube}; + + const POINT_BYTES: &[u8] = &[128, 0, 0, 1, 64, 0, 0, 0, 0, 0, 0, 0]; + const ZERO_VOLUME_BYTES: &[u8] = &[ + 128, 0, 0, 2, 64, 0, 0, 0, 0, 0, 0, 0, 64, 8, 0, 0, 0, 0, 0, 0, + ]; + const ONE_DIMENSIONAL_INTERVAL_BYTES: &[u8] = &[ + 0, 0, 0, 1, 64, 28, 0, 0, 0, 0, 0, 0, 64, 32, 0, 0, 0, 0, 0, 0, + ]; + const MULTI_DIMENSION_2_DIM_BYTES: &[u8] = &[ + 0, 0, 0, 2, 63, 240, 0, 0, 0, 0, 0, 0, 64, 0, 0, 0, 0, 0, 0, 0, 64, 8, 0, 0, 0, 0, 0, 0, + 64, 16, 0, 0, 0, 0, 0, 0, + ]; + const MULTI_DIMENSION_3_DIM_BYTES: &[u8] = &[ + 0, 0, 0, 3, 64, 0, 0, 0, 0, 0, 0, 0, 64, 8, 0, 0, 0, 0, 0, 0, 64, 16, 0, 0, 0, 0, 0, 0, 64, + 20, 0, 0, 0, 0, 0, 0, 64, 24, 0, 0, 0, 0, 0, 0, 64, 28, 0, 0, 0, 0, 0, 0, + ]; + + #[test] + fn can_deserialise_point_type_byes() { + let cube = pg_cube_from_bytes(POINT_BYTES).unwrap(); + assert_eq!(cube, PgCube::Point(2.)) + } + + #[test] + fn can_deserialise_point_type_str() { + let cube_1 = PgCube::from_str("(2)").unwrap(); + assert_eq!(cube_1, PgCube::Point(2.)); + let cube_2 = PgCube::from_str("2").unwrap(); + assert_eq!(cube_2, PgCube::Point(2.)); + } + + #[test] + fn can_serialise_point_type() { + assert_eq!(PgCube::Point(2.).serialize_to_vec(), POINT_BYTES,) + } + #[test] + fn can_deserialise_zero_volume_bytes() { + let cube = pg_cube_from_bytes(ZERO_VOLUME_BYTES).unwrap(); + assert_eq!(cube, PgCube::ZeroVolume(vec![2., 3.])); + } + + #[test] + fn can_deserialise_zero_volume_string() { + let cube_1 = PgCube::from_str("(2,3,4)").unwrap(); + assert_eq!(cube_1, PgCube::ZeroVolume(vec![2., 3., 4.])); + let cube_2 = PgCube::from_str("2,3,4").unwrap(); + assert_eq!(cube_2, PgCube::ZeroVolume(vec![2., 3., 4.])); + } + + #[test] + fn can_serialise_zero_volume() { + assert_eq!( + PgCube::ZeroVolume(vec![2., 3.]).serialize_to_vec(), + ZERO_VOLUME_BYTES + ); + } + + #[test] + fn can_deserialise_one_dimension_interval_bytes() { + let cube = pg_cube_from_bytes(ONE_DIMENSIONAL_INTERVAL_BYTES).unwrap(); + assert_eq!(cube, PgCube::OneDimensionInterval(7., 8.)) + } + + #[test] + fn can_deserialise_one_dimension_interval_string() { + let cube_1 = PgCube::from_str("((7),(8))").unwrap(); + assert_eq!(cube_1, PgCube::OneDimensionInterval(7., 8.)); + let cube_2 = PgCube::from_str("(7),(8)").unwrap(); + assert_eq!(cube_2, PgCube::OneDimensionInterval(7., 8.)); + } + + #[test] + fn can_serialise_one_dimension_interval() { + assert_eq!( + PgCube::OneDimensionInterval(7., 8.).serialize_to_vec(), + ONE_DIMENSIONAL_INTERVAL_BYTES + ) + } + + #[test] + fn can_deserialise_multi_dimension_2_dimension_byte() { + let cube = pg_cube_from_bytes(MULTI_DIMENSION_2_DIM_BYTES).unwrap(); + assert_eq!( + cube, + PgCube::MultiDimension(vec![vec![1., 2.], vec![3., 4.]]) + ) + } + + #[test] + fn can_deserialise_multi_dimension_2_dimension_string() { + let cube_1 = PgCube::from_str("((1,2),(3,4))").unwrap(); + assert_eq!( + cube_1, + PgCube::MultiDimension(vec![vec![1., 2.], vec![3., 4.]]) + ); + let cube_2 = PgCube::from_str("((1, 2), (3, 4))").unwrap(); + assert_eq!( + cube_2, + PgCube::MultiDimension(vec![vec![1., 2.], vec![3., 4.]]) + ); + let cube_3 = PgCube::from_str("(1,2),(3,4)").unwrap(); + assert_eq!( + cube_3, + PgCube::MultiDimension(vec![vec![1., 2.], vec![3., 4.]]) + ); + let cube_4 = PgCube::from_str("(1, 2), (3, 4)").unwrap(); + assert_eq!( + cube_4, + PgCube::MultiDimension(vec![vec![1., 2.], vec![3., 4.]]) + ) + } + + #[test] + fn can_serialise_multi_dimension_2_dimension() { + assert_eq!( + PgCube::MultiDimension(vec![vec![1., 2.], vec![3., 4.]]).serialize_to_vec(), + MULTI_DIMENSION_2_DIM_BYTES + ) + } + + #[test] + fn can_deserialise_multi_dimension_3_dimension_bytes() { + let cube = pg_cube_from_bytes(MULTI_DIMENSION_3_DIM_BYTES).unwrap(); + assert_eq!( + cube, + PgCube::MultiDimension(vec![vec![2., 3., 4.], vec![5., 6., 7.]]) + ) + } + + #[test] + fn can_deserialise_multi_dimension_3_dimension_string() { + let cube = PgCube::from_str("((2,3,4),(5,6,7))").unwrap(); + assert_eq!( + cube, + PgCube::MultiDimension(vec![vec![2., 3., 4.], vec![5., 6., 7.]]) + ); + let cube_2 = PgCube::from_str("(2,3,4),(5,6,7)").unwrap(); + assert_eq!( + cube_2, + PgCube::MultiDimension(vec![vec![2., 3., 4.], vec![5., 6., 7.]]) + ); + } + + #[test] + fn can_serialise_multi_dimension_3_dimension() { + assert_eq!( + PgCube::MultiDimension(vec![vec![2., 3., 4.], vec![5., 6., 7.]]).serialize_to_vec(), + MULTI_DIMENSION_3_DIM_BYTES + ) + } +} diff --git a/sqlx-postgres/src/types/mod.rs b/sqlx-postgres/src/types/mod.rs index 5550b6979b..3219480cb7 100644 --- a/sqlx-postgres/src/types/mod.rs +++ b/sqlx-postgres/src/types/mod.rs @@ -20,6 +20,7 @@ //! | [`PgLTree`] | LTREE | //! | [`PgLQuery`] | LQUERY | //! | [`PgCiText`] | CITEXT1 | +//! | [`PgCube`] | CUBE | //! //! 1 SQLx generally considers `CITEXT` to be compatible with `String`, `&str`, etc., //! but this wrapper type is available for edge cases, such as `CITEXT[]` which Postgres @@ -207,6 +208,8 @@ mod time_tz; #[cfg(feature = "bigdecimal")] mod bigdecimal; +mod cube; + #[cfg(any(feature = "bigdecimal", feature = "rust_decimal"))] mod numeric; @@ -236,6 +239,7 @@ mod bit_vec; pub use array::PgHasArrayType; pub use citext::PgCiText; +pub use cube::PgCube; pub use interval::PgInterval; pub use lquery::PgLQuery; pub use lquery::PgLQueryLevel; diff --git a/tests/postgres/setup.sql b/tests/postgres/setup.sql index ac5a18e66c..db83645582 100644 --- a/tests/postgres/setup.sql +++ b/tests/postgres/setup.sql @@ -1,6 +1,9 @@ -- https://www.postgresql.org/docs/current/ltree.html CREATE EXTENSION IF NOT EXISTS ltree; +-- https://www.postgresql.org/docs/current/cube.html +CREATE EXTENSION IF NOT EXISTS cube; + -- https://www.postgresql.org/docs/current/citext.html CREATE EXTENSION IF NOT EXISTS citext; diff --git a/tests/postgres/types.rs b/tests/postgres/types.rs index 184007ce4b..5d758104e6 100644 --- a/tests/postgres/types.rs +++ b/tests/postgres/types.rs @@ -477,6 +477,23 @@ test_type!(numrange_bigdecimal>(Postgres, Bound::Excluded("2.4".parse::().unwrap()))) )); +#[cfg(any(postgres_14, postgres_15))] +test_type!(cube(Postgres, + "cube(2)" == sqlx::postgres::types::PgCube::Point(2.), + "cube(2.1)" == sqlx::postgres::types::PgCube::Point(2.1), + "cube(2,3)" == sqlx::postgres::types::PgCube::OneDimensionInterval(2., 3.), + "cube(2.2,-3.4)" == sqlx::postgres::types::PgCube::OneDimensionInterval(2.2, -3.4), + "cube(array[2,3])" == sqlx::postgres::types::PgCube::ZeroVolume(vec![2., 3.]), + "cube(array[2,3],array[4,5])" == sqlx::postgres::types::PgCube::MultiDimension(vec![vec![2.,3.],vec![4.,5.]]), + "cube(array[2,3,4],array[4,5,6])" == sqlx::postgres::types::PgCube::MultiDimension(vec![vec![2.,3.,4.],vec![4.,5.,6.]]), +)); + +#[cfg(any(postgres_14, postgres_15))] +test_type!(_cube>(Postgres, + "array[cube(2),cube(2)]" == vec![sqlx::postgres::types::PgCube::Point(2.), sqlx::postgres::types::PgCube::Point(2.)], + "array[cube(2.2,-3.4)]" == vec![sqlx::postgres::types::PgCube::OneDimensionInterval(2.2, -3.4)], +)); + #[cfg(feature = "rust_decimal")] test_type!(decimal(Postgres, "0::numeric" == sqlx::types::Decimal::from_str("0").unwrap(),