Skip to content

Commit

Permalink
Checkout submodules
Browse files Browse the repository at this point in the history
  • Loading branch information
gatesn committed Mar 2, 2024
1 parent db2c614 commit 377d7fd
Show file tree
Hide file tree
Showing 9 changed files with 23 additions and 23 deletions.
6 changes: 3 additions & 3 deletions bench-vortex/benches/compress_benchmark.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@ use std::fs::{create_dir_all, File};
use std::path::Path;

use arrow_array::RecordBatchReader;
use criterion::{black_box, Criterion, criterion_group, criterion_main};
use criterion::{black_box, criterion_group, criterion_main, Criterion};
use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
use rand::{Rng, thread_rng};
use rand::distributions::{Alphanumeric, Uniform};
use rand::prelude::SliceRandom;
use rand::{thread_rng, Rng};

use vortex::array::{Array, ArrayRef};
use vortex::array::chunked::ChunkedArray;
use vortex::array::primitive::PrimitiveArray;
use vortex::array::varbin::VarBinArray;
use vortex::array::{Array, ArrayRef};
use vortex::compress::CompressCtx;
use vortex::dtype::DType;
use vortex::error::{VortexError, VortexResult};
Expand Down
4 changes: 2 additions & 2 deletions bench-vortex/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ mod test {
use arrow_array::RecordBatchReader;
use log::LevelFilter;
use parquet::arrow::arrow_reader::ParquetRecordBatchReaderBuilder;
use simplelog::{ColorChoice, Config, TerminalMode, TermLogger};
use simplelog::{ColorChoice, Config, TermLogger, TerminalMode};

use vortex::array::{Array, ArrayRef};
use vortex::array::chunked::ChunkedArray;
use vortex::array::{Array, ArrayRef};
use vortex::compress::CompressCtx;
use vortex::dtype::DType;
use vortex::error::{VortexError, VortexResult};
Expand Down
2 changes: 1 addition & 1 deletion fastlanez-sys/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#![allow(non_camel_case_types)]
#![allow(non_snake_case)]

use std::mem::{MaybeUninit, size_of};
use std::mem::{size_of, MaybeUninit};

use arrayref::array_mut_ref;
use seq_macro::seq;
Expand Down
4 changes: 2 additions & 2 deletions vortex-fastlanes/src/bitpacking/compress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@ use arrayref::array_ref;
use log::debug;

use fastlanez_sys::TryBitPack;
use vortex::array::{Array, ArrayRef};
use vortex::array::downcast::DowncastArrayBuiltin;
use vortex::array::primitive::PrimitiveArray;
use vortex::array::sparse::SparseArray;
use vortex::array::{Array, ArrayRef};
use vortex::compress::{CompressConfig, CompressCtx, Compressor, EncodingCompression};
use vortex::match_each_integer_ptype;
use vortex::ptype::{NativePType, PType};
Expand Down Expand Up @@ -219,8 +219,8 @@ fn count_exceptions(bit_width: usize, bit_width_freq: &[usize]) -> usize {
mod test {
use std::collections::HashSet;

use vortex::array::Encoding;
use vortex::array::primitive::PrimitiveEncoding;
use vortex::array::Encoding;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion vortex-fastlanes/src/bitpacking/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ use std::collections::HashMap;
use std::sync::{Arc, RwLock};

use vortex::array::{
Array, ArrayRef, ArrowIterator, check_validity_buffer, Encoding, EncodingId, EncodingRef,
check_validity_buffer, Array, ArrayRef, ArrowIterator, Encoding, EncodingId, EncodingRef,
};
use vortex::compress::EncodingCompression;
use vortex::dtype::DType;
Expand Down
4 changes: 2 additions & 2 deletions vortex-fastlanes/src/for/compress.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
use itertools::Itertools;
use log::debug;

use vortex::array::{Array, ArrayRef};
use vortex::array::downcast::DowncastArrayBuiltin;
use vortex::array::primitive::PrimitiveArray;
use vortex::array::{Array, ArrayRef};
use vortex::compress::{CompressConfig, CompressCtx, Compressor, EncodingCompression};
use vortex::match_each_integer_ptype;
use vortex::stats::Stat;
Expand Down Expand Up @@ -86,8 +86,8 @@ fn for_compressor(array: &dyn Array, like: Option<&dyn Array>, ctx: CompressCtx)
mod test {
use std::collections::HashSet;

use vortex::array::Encoding;
use vortex::array::primitive::PrimitiveEncoding;
use vortex::array::Encoding;

use super::*;

Expand Down
2 changes: 1 addition & 1 deletion vortex-fastlanes/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ pub use r#for::*;
use vortex::array::{EncodingRef, ENCODINGS};

mod bitpacking;
mod serde;
mod r#for;
mod serde;

#[distributed_slice(ENCODINGS)]
static ENCODINGS_FL_BITPACKING: EncodingRef = &BitPackedEncoding;
Expand Down
2 changes: 1 addition & 1 deletion vortex-fastlanes/src/serde.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,4 @@ impl ArraySerde for FoRArray {
fn write(&self, _ctx: &mut WriteCtx) -> std::io::Result<()> {
todo!()
}
}
}
20 changes: 10 additions & 10 deletions vortex/src/ptype.rs
Original file line number Diff line number Diff line change
Expand Up @@ -38,16 +38,16 @@ pub enum PType {
}

pub trait NativePType:
Send
+ Sync
+ Sized
+ Debug
+ Display
+ PartialEq
+ Default
+ ArrowNativeType
+ RefUnwindSafe
+ TryFrom<Box<dyn Scalar>, Error=VortexError>
Send
+ Sync
+ Sized
+ Debug
+ Display
+ PartialEq
+ Default
+ ArrowNativeType
+ RefUnwindSafe
+ TryFrom<Box<dyn Scalar>, Error = VortexError>
{
const PTYPE: PType;
}
Expand Down

0 comments on commit 377d7fd

Please sign in to comment.