Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into ngates/fastlanes-d…
Browse files Browse the repository at this point in the history
…elta
  • Loading branch information
lwwmanning committed Mar 20, 2024
2 parents e6636b7 + 69701eb commit 7b9992f
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 1 deletion.
1 change: 1 addition & 0 deletions bench-vortex/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ mod test {
.unwrap();
}

#[ignore]
#[test]
fn compression_ratio() {
setup_logger(LevelFilter::Debug);
Expand Down
3 changes: 2 additions & 1 deletion vortex-array/src/array/composite/compress.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
use crate::array::{Array, ArrayRef};
use crate::array::composite::{CompositeArray, CompositeEncoding};
use crate::array::downcast::DowncastArrayBuiltin;
use crate::array::{Array, ArrayRef};
use crate::compress::{CompressConfig, CompressCtx, EncodingCompression};
use crate::error::VortexResult;

impl EncodingCompression for CompositeEncoding {
fn cost(&self) -> u8 {
0
Expand Down
18 changes: 18 additions & 0 deletions vortex-array/src/ptype.rs
Original file line number Diff line number Diff line change
Expand Up @@ -203,6 +203,24 @@ impl Display for PType {
}
}

impl Display for PType {
fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
match self {
PType::U8 => write!(f, "u8"),
PType::U16 => write!(f, "u16"),
PType::U32 => write!(f, "u32"),
PType::U64 => write!(f, "u64"),
PType::I8 => write!(f, "i8"),
PType::I16 => write!(f, "i16"),
PType::I32 => write!(f, "i32"),
PType::I64 => write!(f, "i64"),
PType::F16 => write!(f, "f16"),
PType::F32 => write!(f, "f32"),
PType::F64 => write!(f, "f64"),
}
}
}

impl TryFrom<&DType> for PType {
type Error = VortexError;

Expand Down

0 comments on commit 7b9992f

Please sign in to comment.