- Notifications
You must be signed in to change notification settings - Fork514
Add rkyv 0.8 and rend 0.5 support#1178
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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
novacrazy wants to merge1 commit intorust-postgres:masterChoose a base branch
base:master
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Draft
Changes fromall commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading.Please reload this page.
Diff view
Diff view
There are no files selected for viewing
5 changes: 5 additions & 0 deletionspostgres-types/Cargo.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
4 changes: 4 additions & 0 deletionspostgres-types/src/lib.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
41 changes: 41 additions & 0 deletionspostgres-types/src/rend_05.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,41 @@ | ||
| use crate::{IsNull, ToSql, Type}; | ||
| use bytes::BytesMut; | ||
| macro_rules! impl_rend { | ||
| ($($ty:ty => $orig:ty,)*) => {$( | ||
| impl ToSql for $ty { | ||
| #[inline] | ||
| fn to_sql( | ||
| &self, | ||
| ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn std::error::Error + Sync + Send>> { | ||
| self.to_native().to_sql(ty, out) | ||
| } | ||
| #[inline] | ||
| fn accepts(ty: &Type) -> bool { | ||
| <$orig as ToSql>::accepts(ty) | ||
| } | ||
| to_sql_checked!(); | ||
| } | ||
| )*}; | ||
| } | ||
| impl_rend! { | ||
| rend_05::f32_le => f32, | ||
| rend_05::f32_be => f32, | ||
| rend_05::f64_le => f64, | ||
| rend_05::f64_be => f64, | ||
| rend_05::i16_le => i16, | ||
| rend_05::i16_be => i16, | ||
| rend_05::i32_le => i32, | ||
| rend_05::i32_be => i32, | ||
| rend_05::i64_le => i64, | ||
| rend_05::i64_be => i64, | ||
| rend_05::u32_le => u32, | ||
| rend_05::u32_be => u32, | ||
| } |
136 changes: 136 additions & 0 deletionspostgres-types/src/rkyv_08.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,136 @@ | ||
| use std::{collections::HashMap, error::Error, hash::Hasher, net::IpAddr}; | ||
| use crate::{Format, IsNull, ToSql, Type}; | ||
| use bytes::BytesMut; | ||
| use postgres_protocol::types; | ||
| use rkyv_08::{ | ||
| collections::swiss_table::ArchivedHashMap, net::ArchivedIpAddr, | ||
| niche::option_box::ArchivedOptionBox, option::ArchivedOption, string::ArchivedString, | ||
| vec::ArchivedVec, | ||
| }; | ||
| macro_rules! fwd_accepts { | ||
| ($ty:ty) => { | ||
| #[inline] | ||
| fn accepts(ty: &Type) -> bool { | ||
| <$ty as ToSql>::accepts(ty) | ||
| } | ||
| }; | ||
| } | ||
| impl ToSql for ArchivedString { | ||
| fn to_sql( | ||
| &self, | ||
| ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn Error + Sync + Send>> { | ||
| self.as_str().to_sql(ty, out) | ||
| } | ||
| fwd_accepts!(&str); | ||
| to_sql_checked!(); | ||
| } | ||
| impl<T> ToSql for ArchivedVec<T> | ||
| where | ||
| T: ToSql, | ||
| { | ||
| fn to_sql( | ||
| &self, | ||
| ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn Error + Sync + Send>> { | ||
| self.as_slice().to_sql(ty, out) | ||
| } | ||
| fwd_accepts!(&[T]); | ||
| to_sql_checked!(); | ||
| } | ||
| impl<T> ToSql for ArchivedOption<T> | ||
| where | ||
| T: ToSql, | ||
| { | ||
| fn to_sql( | ||
| &self, | ||
| ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn Error + Sync + Send>> { | ||
| match self { | ||
| ArchivedOption::Some(value) => value.to_sql(ty, out), | ||
| ArchivedOption::None => Ok(IsNull::Yes), | ||
| } | ||
| } | ||
| fn encode_format(&self, ty: &Type) -> Format { | ||
| match self { | ||
| ArchivedOption::Some(ref val) => val.encode_format(ty), | ||
| ArchivedOption::None => Format::Binary, | ||
| } | ||
| } | ||
| fwd_accepts!(Option<T>); | ||
| to_sql_checked!(); | ||
| } | ||
| impl<T> ToSql for ArchivedOptionBox<T> | ||
| where | ||
| T: ToSql, | ||
| { | ||
| fn to_sql( | ||
| &self, | ||
| ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn Error + Sync + Send>> { | ||
| match self.as_ref() { | ||
| Some(value) => value.to_sql(ty, out), | ||
| None => Ok(IsNull::Yes), | ||
| } | ||
| } | ||
| fn encode_format(&self, ty: &Type) -> Format { | ||
| match self.as_ref() { | ||
| Some(val) => val.encode_format(ty), | ||
| None => Format::Binary, | ||
| } | ||
| } | ||
| fwd_accepts!(Option<T>); | ||
| to_sql_checked!(); | ||
| } | ||
| impl ToSql for ArchivedIpAddr { | ||
| fn to_sql( | ||
| &self, | ||
| ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn Error + Sync + Send>> { | ||
| self.as_ipaddr().to_sql(ty, out) | ||
| } | ||
| fwd_accepts!(IpAddr); | ||
| to_sql_checked!(); | ||
| } | ||
| impl<H> ToSql for ArchivedHashMap<ArchivedString, ArchivedOption<ArchivedString>, H> | ||
| where | ||
| H: Hasher, | ||
| { | ||
| fn to_sql( | ||
| &self, | ||
| _ty: &Type, | ||
| out: &mut BytesMut, | ||
| ) -> Result<IsNull, Box<dyn Error + Sync + Send>> { | ||
| types::hstore_to_sql( | ||
| self.iter() | ||
| .map(|(k, v)| (k.as_ref(), v.as_ref().map(|v| v.as_ref()))), | ||
| out, | ||
| )?; | ||
| Ok(IsNull::No) | ||
| } | ||
| fwd_accepts!(HashMap<String, Option<String>>); | ||
| to_sql_checked!(); | ||
| } |
Oops, something went wrong.
Uh oh!
There was an error while loading.Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.