Skip to content

Make StatsCache and ArrayAndStats have interior mutability #7583

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.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
connortsui20 merged 1 commit into from
Apr 21, 2026
Merged

Make StatsCache and ArrayAndStats have interior mutability #7583

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions vortex-btrblocks/public-api.lock
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions vortex-btrblocks/src/schemes/decimal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl Scheme for DecimalScheme {

fn expected_compression_ratio(
&self,
_data: &mut ArrayAndStats,
_data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -56,7 +56,7 @@ impl Scheme for DecimalScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down
20 changes: 10 additions & 10 deletions vortex-btrblocks/src/schemes/float.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl Scheme for ALPScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -104,7 +104,7 @@ impl Scheme for ALPScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -156,7 +156,7 @@ impl Scheme for ALPRDScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -171,7 +171,7 @@ impl Scheme for ALPRDScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -229,7 +229,7 @@ impl Scheme for NullDominatedSparseScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -254,7 +254,7 @@ impl Scheme for NullDominatedSparseScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -301,7 +301,7 @@ impl Scheme for PcoScheme {

fn expected_compression_ratio(
&self,
_data: &mut ArrayAndStats,
_data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -311,7 +311,7 @@ impl Scheme for PcoScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -349,7 +349,7 @@ impl Scheme for FloatRLEScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -368,7 +368,7 @@ impl Scheme for FloatRLEScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down
42 changes: 20 additions & 22 deletions vortex-btrblocks/src/schemes/integer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ impl Scheme for FoRScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand Down Expand Up @@ -182,7 +182,7 @@ impl Scheme for FoRScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand All @@ -198,10 +198,9 @@ impl Scheme for FoRScheme {
// NOTE: we could delegate in the future if we had another downstream codec that performs
// as well.
let leaf_ctx = compress_ctx.clone().as_leaf();
let mut biased_data =
let biased_data =
ArrayAndStats::new(biased.into_array(), compress_ctx.merged_stats_options());
let compressed =
BitPackingScheme.compress(compressor, &mut biased_data, leaf_ctx, exec_ctx)?;
let compressed = BitPackingScheme.compress(compressor, &biased_data, leaf_ctx, exec_ctx)?;

// TODO(connor): This should really be `new_unchecked`.
let for_compressed = FoR::try_new(compressed, for_array.reference_scalar().clone())?;
Expand Down Expand Up @@ -268,7 +267,7 @@ impl Scheme for ZigZagScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -290,7 +289,7 @@ impl Scheme for ZigZagScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -321,7 +320,7 @@ impl Scheme for BitPackingScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -338,7 +337,7 @@ impl Scheme for BitPackingScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -450,7 +449,7 @@ impl Scheme for SparseScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand Down Expand Up @@ -496,13 +495,12 @@ impl Scheme for SparseScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
let len = data.array_len();
// TODO(connor): Fight the borrow checker (needs interior mutability)!
let stats = data.integer_stats(exec_ctx).clone();
let stats = data.integer_stats(exec_ctx);
let array = data.array();

let (most_frequent_value, most_frequent_count) = stats
Expand Down Expand Up @@ -635,7 +633,7 @@ impl Scheme for RunEndScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -650,7 +648,7 @@ impl Scheme for RunEndScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -714,7 +712,7 @@ impl Scheme for SequenceScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand Down Expand Up @@ -760,7 +758,7 @@ impl Scheme for SequenceScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand All @@ -786,7 +784,7 @@ impl Scheme for PcoScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -803,7 +801,7 @@ impl Scheme for PcoScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand All @@ -821,7 +819,7 @@ impl Scheme for PcoScheme {
pub(crate) fn rle_compress(
scheme: &dyn Scheme,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -953,7 +951,7 @@ impl Scheme for IntRLEScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -971,7 +969,7 @@ impl Scheme for IntRLEScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down
16 changes: 8 additions & 8 deletions vortex-btrblocks/src/schemes/string.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ impl Scheme for FSSTScheme {

fn expected_compression_ratio(
&self,
_data: &mut ArrayAndStats,
_data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -83,7 +83,7 @@ impl Scheme for FSSTScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -167,7 +167,7 @@ impl Scheme for NullDominatedSparseScheme {

fn expected_compression_ratio(
&self,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -192,7 +192,7 @@ impl Scheme for NullDominatedSparseScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down Expand Up @@ -240,7 +240,7 @@ impl Scheme for ZstdScheme {

fn expected_compression_ratio(
&self,
_data: &mut ArrayAndStats,
_data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -250,7 +250,7 @@ impl Scheme for ZstdScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand All @@ -274,7 +274,7 @@ impl Scheme for ZstdBuffersScheme {

fn expected_compression_ratio(
&self,
_data: &mut ArrayAndStats,
_data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -284,7 +284,7 @@ impl Scheme for ZstdBuffersScheme {
fn compress(
&self,
_compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
_compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down
4 changes: 2 additions & 2 deletions vortex-btrblocks/src/schemes/temporal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ impl Scheme for TemporalScheme {

fn expected_compression_ratio(
&self,
_data: &mut ArrayAndStats,
_data: &ArrayAndStats,
_compress_ctx: CompressorContext,
_exec_ctx: &mut ExecutionCtx,
) -> CompressionEstimate {
Expand All @@ -72,7 +72,7 @@ impl Scheme for TemporalScheme {
fn compress(
&self,
compressor: &CascadingCompressor,
data: &mut ArrayAndStats,
data: &ArrayAndStats,
compress_ctx: CompressorContext,
exec_ctx: &mut ExecutionCtx,
) -> VortexResult<ArrayRef> {
Expand Down
Loading
Loading