Skip to content

Commit

Permalink
Add boxed variant comparisons
Browse files Browse the repository at this point in the history
  • Loading branch information
@jpschorr
jpschorr committed Jan 4, 2025
1 parent c0ac4e3 commit 3427fae
Show file tree
Hide file tree
Showing 14 changed files with 440 additions and 134 deletions.
2 changes: 1 addition & 1 deletion extension/partiql-extension-ion/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ unicase = "2.7"
rust_decimal = { version = "1.36.0", default-features = false, features = ["std"] }
rust_decimal_macros = "1.36"
ion-rs_old = { version = "0.18", package = "ion-rs" }
ion-rs = { version = "1.0.0-rc.10", features = ["experimental"], git = "https://github.com/amazon-ion/ion-rust", branch = "feat-decon-owned-elt" }
ion-rs = { version = "1.0.0-rc.10", features = ["experimental"], git = "https://github.com/amazon-ion/ion-rust" }

time = { version = "0.3", features = ["macros"] }
once_cell = "1"
Expand Down
164 changes: 123 additions & 41 deletions extension/partiql-extension-ion/src/boxed_ion.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ use ion_rs::{
};
use ion_rs_old::IonReader;

Check warning on line 6 in extension/partiql-extension-ion/src/boxed_ion.rs

View workflow job for this annotation

GitHub Actions / clippy

unused import: `ion_rs_old::IonReader` 

warning: unused import: `ion_rs_old::IonReader`
 --> extension/partiql-extension-ion/src/boxed_ion.rs:6:5
  |
6 | use ion_rs_old::IonReader;
  |     ^^^^^^^^^^^^^^^^^^^^^
use partiql_value::boxed_variant::{
BoxedVariant, BoxedVariantResult, BoxedVariantType, BoxedVariantValueIntoIterator,
BoxedVariant, BoxedVariantResult, BoxedVariantType, BoxedVariantTypeTag,
BoxedVariantValueIntoIterator, DynBoxedVariant,
};
use partiql_value::datum::{
Datum, DatumCategoryOwned, DatumCategoryRef, DatumLower, DatumLowerResult, DatumSeqOwned,
Expand All @@ -16,8 +17,10 @@ use partiql_value::{Bag, BindingsName, List, Tuple, Value, Variant};
use peekmore::{PeekMore, PeekMoreIterator};
#[cfg(feature = "serde")]
use serde::{Deserialize, Deserializer, Serialize, Serializer};
use std::any::Any;
use std::borrow::Cow;
use std::cell::RefCell;
use std::cmp::Ordering;
use std::fmt::{Debug, Display, Formatter};
use std::hash::{Hash, Hasher};
use std::ops::DerefMut;
Expand All @@ -27,15 +30,42 @@ use thiserror::Error;
#[derive(Default, Debug, Copy, Clone)]
pub struct BoxedIonType {}
impl BoxedVariantType for BoxedIonType {
type Doc = BoxedIon;

fn construct(&self, bytes: Vec<u8>) -> BoxedVariantResult<Self::Doc> {
BoxedIon::parse(bytes, BoxedIonStreamType::SingleTLV).map_err(Into::into)
fn construct(&self, bytes: Vec<u8>) -> BoxedVariantResult<DynBoxedVariant> {
BoxedIon::parse(bytes, BoxedIonStreamType::SingleTLV)
.map_err(Into::into)
.map(|b| Box::new(b) as DynBoxedVariant)
}

fn name(&self) -> &'static str {
"ion"
}

fn value_eq(&self, l: &DynBoxedVariant, r: &DynBoxedVariant) -> bool {
let (l, r) = get_values(l, r);

l.eq(r)
}

fn value_cmp(&self, l: &DynBoxedVariant, r: &DynBoxedVariant) -> Ordering {
let (l, r) = get_values(l, r);

l.cmp(r)
}
}

#[inline]
fn get_value(l: &DynBoxedVariant) -> &BoxedIon {
l.as_any().downcast_ref::<BoxedIon>().expect("IonValue")
}

#[inline]
fn get_values<'a, 'b>(
l: &'a DynBoxedVariant,
r: &'b DynBoxedVariant,
) -> (&'a BoxedIon, &'b BoxedIon) {
debug_assert_eq!(*l.type_tag(), *r.type_tag());

(get_value(l), get_value(r))
}

/// Errors in boxed Ion.
Expand Down Expand Up @@ -117,6 +147,14 @@ impl Hash for BoxedIon {

#[cfg_attr(feature = "serde", typetag::serde)]
impl BoxedVariant for BoxedIon {
fn type_tag(&self) -> BoxedVariantTypeTag {
Box::new(BoxedIonType {})
}

fn as_any(&self) -> &dyn Any {
self
}

fn into_dyn_iter(self: Box<Self>) -> BoxedVariantResult<BoxedVariantValueIntoIterator> {
let iter = self.try_into_iter()?;

Expand All @@ -128,13 +166,19 @@ impl BoxedVariant for BoxedIon {
match &self.doc {
BoxedIonValue::Stream() => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),
BoxedIonValue::Sequence(seq) => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),

Check warning on line 168 in extension/partiql-extension-ion/src/boxed_ion.rs

View workflow job for this annotation

GitHub Actions / clippy

unused variable: `seq` 

warning: unused variable: `seq`
   --> extension/partiql-extension-ion/src/boxed_ion.rs:168:37
    |
168 |             BoxedIonValue::Sequence(seq) => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),
    |                                     ^^^ help: if this is intentional, prefix it with an underscore: `_seq`
BoxedIonValue::Value(elt) => match elt.ion_type() {
IonType::List => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),
IonType::SExp => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),
IonType::Null => DatumCategoryRef::Null,
IonType::Struct => DatumCategoryRef::Tuple(DatumTupleRef::Dynamic(self)),
_ => DatumCategoryRef::Scalar(DatumValueRef::Lower(self)),
},
BoxedIonValue::Value(elt) => {
if elt.is_null() {
DatumCategoryRef::Null
} else {
match elt.ion_type() {
IonType::List => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),
IonType::SExp => DatumCategoryRef::Sequence(DatumSeqRef::Dynamic(self)),
IonType::Null => DatumCategoryRef::Null,
IonType::Struct => DatumCategoryRef::Tuple(DatumTupleRef::Dynamic(self)),
_ => DatumCategoryRef::Scalar(DatumValueRef::Lower(self)),
}
}
}
}
}

Expand All @@ -144,44 +188,70 @@ impl BoxedVariant for BoxedIon {
BoxedIonValue::Sequence(seq) => {

Check warning on line 188 in extension/partiql-extension-ion/src/boxed_ion.rs

View workflow job for this annotation

GitHub Actions / clippy

unused variable: `seq` 

warning: unused variable: `seq`
   --> extension/partiql-extension-ion/src/boxed_ion.rs:188:37
    |
188 |             BoxedIonValue::Sequence(seq) => {
    |                                     ^^^ help: if this is intentional, prefix it with an underscore: `_seq`
DatumCategoryOwned::Sequence(DatumSeqOwned::Dynamic(self))
}
BoxedIonValue::Value(elt) => match elt.ion_type() {
IonType::List => DatumCategoryOwned::Sequence(DatumSeqOwned::Dynamic(self)),
IonType::SExp => DatumCategoryOwned::Sequence(DatumSeqOwned::Dynamic(self)),
IonType::Null => DatumCategoryOwned::Null,
IonType::Struct => DatumCategoryOwned::Tuple(DatumTupleOwned::Dynamic(self)),
_ => DatumCategoryOwned::Scalar(DatumValueOwned::Value(self.into_value())),
},
BoxedIonValue::Value(elt) => {
if elt.is_null() {
DatumCategoryOwned::Null
} else {
match elt.ion_type() {
IonType::List => DatumCategoryOwned::Sequence(DatumSeqOwned::Dynamic(self)),
IonType::SExp => DatumCategoryOwned::Sequence(DatumSeqOwned::Dynamic(self)),
IonType::Null => DatumCategoryOwned::Null,
IonType::Struct => {
DatumCategoryOwned::Tuple(DatumTupleOwned::Dynamic(self))
}
_ => DatumCategoryOwned::Scalar(DatumValueOwned::Value(self.into_value())),
}
}
}
}
}
}

impl PartialEq<Self> for BoxedIon {
fn eq(&self, other: &Self) -> bool {
self.doc.eq(&other.doc)
}
}

impl Eq for BoxedIon {}

impl PartialOrd for BoxedIon {
fn partial_cmp(&self, other: &Self) -> Option<Ordering> {
Some(self.cmp(other))
}
}
impl Ord for BoxedIon {
fn cmp(&self, other: &Self) -> Ordering {
// TODO lowering just to compare is costly... Either find a better way, or lift this out of the extension
self.lower().unwrap().cmp(&other.lower().unwrap())
}
}

impl DatumLower<Value> for BoxedIon {
fn into_lower(self) -> DatumLowerResult<Value> {
let Self { ctx, doc } = self;
match doc {
let pval = match doc {
BoxedIonValue::Stream() => todo!("into_lower stream"),
BoxedIonValue::Sequence(seq) => todo!("into_lower seq"),
BoxedIonValue::Value(elt) => {
let pval = elt.into_partiql_value()?;
Ok(match pval {
PartiqlValueTarget::Atom(val) => val,
PartiqlValueTarget::List(l) => {
let vals = l.into_iter().map(|elt| Self::new_value(elt, ctx.clone()));
List::from_iter(vals).into()
}
PartiqlValueTarget::Bag(b) => {
let vals = b.into_iter().map(|elt| Self::new_value(elt, ctx.clone()));
Bag::from_iter(vals).into()
}
PartiqlValueTarget::Struct(s) => {
let vals = s
.into_iter()
.map(|(key, elt)| (key, Self::new_value(elt, ctx.clone())));
Tuple::from_iter(vals).into()
}
})
BoxedIonValue::Sequence(seq) => seq.into_partiql_value()?,
BoxedIonValue::Value(elt) => elt.into_partiql_value()?,
};
Ok(match pval {
PartiqlValueTarget::Atom(val) => val,
PartiqlValueTarget::List(l) => {
let vals = l.into_iter().map(|elt| Self::new_value(elt, ctx.clone()));
List::from_iter(vals).into()
}
}
PartiqlValueTarget::Bag(b) => {
let vals = b.into_iter().map(|elt| Self::new_value(elt, ctx.clone()));
Bag::from_iter(vals).into()
}
PartiqlValueTarget::Struct(s) => {
let vals = s
.into_iter()
.map(|(key, elt)| (key, Self::new_value(elt, ctx.clone())));
Tuple::from_iter(vals).into()
}
})
}

fn into_lower_boxed(self: Box<Self>) -> DatumLowerResult<Value> {
Expand Down Expand Up @@ -462,6 +532,18 @@ enum BoxedIonValue {
Sequence(Sequence),
}

impl PartialEq<Self> for BoxedIonValue {
fn eq(&self, other: &Self) -> bool {
match (self, other) {
(BoxedIonValue::Value(l), BoxedIonValue::Value(r)) => l == r,
(BoxedIonValue::Sequence(l), BoxedIonValue::Sequence(r)) => l == r,
_ => false,
}
}
}

impl Eq for BoxedIonValue {}

impl From<Element> for BoxedIonValue {
fn from(value: Element) -> Self {
BoxedIonValue::Value(value)
Expand Down
2 changes: 2 additions & 0 deletions extension/partiql-extension-ion/src/common.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ pub enum Encoding {
PartiqlEncodedAsIon,
}

pub(crate) const BOXED_ION_ANNOT: &str = "$ion";

pub(crate) const BAG_ANNOT: &str = "$bag";
pub(crate) const TIME_ANNOT: &str = "$time";
pub(crate) const DATE_ANNOT: &str = "$date";
Expand Down
Loading

0 comments on commit 3427fae

Please sign in to comment.