Skip to content

Commit dd555d9

Browse files
gatesngatesn
committed
Rename stats rewrite session
Signed-off-by: Nicholas Gates <nick@nickgates.com>
1 parent 9b2057c commit dd555d9

4 files changed

Lines changed: 52 additions & 49 deletions

File tree

‎vortex-array/public-api.lock‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -20524,21 +20524,21 @@ pub mod vortex_array::stats::flatbuffers
2052420524

2052520525
pub mod vortex_array::stats::session
2052620526

20527-
pub struct vortex_array::stats::session::StatsRewriteSession
20527+
pub struct vortex_array::stats::session::StatsSession
2052820528

20529-
impl core::default::Default for vortex_array::stats::StatsRewriteSession
20529+
impl core::default::Default for vortex_array::stats::StatsSession
2053020530

20531-
pub fn vortex_array::stats::StatsRewriteSession::default() -> vortex_array::stats::StatsRewriteSession
20531+
pub fn vortex_array::stats::StatsSession::default() -> vortex_array::stats::StatsSession
2053220532

20533-
impl core::fmt::Debug for vortex_array::stats::StatsRewriteSession
20533+
impl core::fmt::Debug for vortex_array::stats::StatsSession
2053420534

20535-
pub fn vortex_array::stats::StatsRewriteSession::fmt(&self, &mut core::fmt::Formatter<'_>) -> core::fmt::Result
20535+
pub fn vortex_array::stats::StatsSession::fmt(&self, &mut core::fmt::Formatter<'_>) -> core::fmt::Result
2053620536

20537-
impl vortex_session::SessionVar for vortex_array::stats::StatsRewriteSession
20537+
impl vortex_session::SessionVar for vortex_array::stats::StatsSession
2053820538

20539-
pub fn vortex_array::stats::StatsRewriteSession::as_any(&self) -> &dyn core::any::Any
20539+
pub fn vortex_array::stats::StatsSession::as_any(&self) -> &dyn core::any::Any
2054020540

20541-
pub fn vortex_array::stats::StatsRewriteSession::as_any_mut(&mut self) -> &mut dyn core::any::Any
20541+
pub fn vortex_array::stats::StatsSession::as_any_mut(&mut self) -> &mut dyn core::any::Any
2054220542

2054320543
pub struct vortex_array::stats::ArrayStats
2054420544

@@ -20600,21 +20600,21 @@ pub fn vortex_array::stats::MutTypedStatsSetRef<'_, '_>::is_empty(&self) -> bool
2060020600

2060120601
pub fn vortex_array::stats::MutTypedStatsSetRef<'_, '_>::len(&self) -> usize
2060220602

20603-
pub struct vortex_array::stats::StatsRewriteSession
20603+
pub struct vortex_array::stats::StatsSession
2060420604

20605-
impl core::default::Default for vortex_array::stats::StatsRewriteSession
20605+
impl core::default::Default for vortex_array::stats::StatsSession
2060620606

20607-
pub fn vortex_array::stats::StatsRewriteSession::default() -> vortex_array::stats::StatsRewriteSession
20607+
pub fn vortex_array::stats::StatsSession::default() -> vortex_array::stats::StatsSession
2060820608

20609-
impl core::fmt::Debug for vortex_array::stats::StatsRewriteSession
20609+
impl core::fmt::Debug for vortex_array::stats::StatsSession
2061020610

20611-
pub fn vortex_array::stats::StatsRewriteSession::fmt(&self, &mut core::fmt::Formatter<'_>) -> core::fmt::Result
20611+
pub fn vortex_array::stats::StatsSession::fmt(&self, &mut core::fmt::Formatter<'_>) -> core::fmt::Result
2061220612

20613-
impl vortex_session::SessionVar for vortex_array::stats::StatsRewriteSession
20613+
impl vortex_session::SessionVar for vortex_array::stats::StatsSession
2061420614

20615-
pub fn vortex_array::stats::StatsRewriteSession::as_any(&self) -> &dyn core::any::Any
20615+
pub fn vortex_array::stats::StatsSession::as_any(&self) -> &dyn core::any::Any
2061620616

20617-
pub fn vortex_array::stats::StatsRewriteSession::as_any_mut(&mut self) -> &mut dyn core::any::Any
20617+
pub fn vortex_array::stats::StatsSession::as_any_mut(&mut self) -> &mut dyn core::any::Any
2061820618

2061920619
pub struct vortex_array::stats::StatsSet
2062020620

‎vortex-array/src/stats/rewrite.rs‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ use crate::dtype::DType;
1414
use crate::expr::Expression;
1515
use crate::expr::or_collect;
1616
use crate::scalar_fn::ScalarFnId;
17-
use crate::stats::session::StatsRewriteSessionExt;
17+
use crate::stats::session::StatsSessionExt;
1818

1919
/// Shared reference to a stats rewrite rule.
2020
pub(crate) type StatsRewriteRuleRef = Arc<dyn StatsRewriteRule>;
@@ -108,8 +108,8 @@ fn rewrite(
108108
) -> VortexResult<Option<Expression>> {
109109
let rules = ctx
110110
.session()
111-
.stats_rewrites()
112-
.rules_for(expr.scalar_fn().id());
111+
.stats()
112+
.rewrite_rules_for(expr.scalar_fn().id());
113113
let Some(rules) = rules else {
114114
return Ok(None);
115115
};
@@ -140,8 +140,8 @@ mod tests {
140140
use crate::scalar_fn::ScalarFnId;
141141
use crate::scalar_fn::ScalarFnVTable;
142142
use crate::scalar_fn::fns::literal::Literal;
143-
use crate::stats::session::StatsRewriteSession;
144-
use crate::stats::session::StatsRewriteSessionExt;
143+
use crate::stats::session::StatsSession;
144+
use crate::stats::session::StatsSessionExt;
145145

146146
#[derive(Debug)]
147147
struct StaticLiteralRule {
@@ -173,13 +173,13 @@ mod tests {
173173

174174
#[test]
175175
fn combines_multiple_falsifiers_with_or() -> VortexResult<()> {
176-
let session = VortexSession::empty().with::<StatsRewriteSession>();
176+
let session = VortexSession::empty().with::<StatsSession>();
177177
let dtype = DType::Primitive(PType::I32, Nullability::NonNullable);
178-
session.stats_rewrites().register(StaticLiteralRule {
178+
session.stats().register_rewrite(StaticLiteralRule {
179179
falsifier: Some(lit(false)),
180180
satisfier: None,
181181
});
182-
session.stats_rewrites().register(StaticLiteralRule {
182+
session.stats().register_rewrite(StaticLiteralRule {
183183
falsifier: Some(lit(true)),
184184
satisfier: None,
185185
});
@@ -193,13 +193,13 @@ mod tests {
193193

194194
#[test]
195195
fn combines_multiple_satisfiers_with_or() -> VortexResult<()> {
196-
let session = VortexSession::empty().with::<StatsRewriteSession>();
196+
let session = VortexSession::empty().with::<StatsSession>();
197197
let dtype = DType::Primitive(PType::I32, Nullability::NonNullable);
198-
session.stats_rewrites().register(StaticLiteralRule {
198+
session.stats().register_rewrite(StaticLiteralRule {
199199
falsifier: None,
200200
satisfier: Some(lit(false)),
201201
});
202-
session.stats_rewrites().register(StaticLiteralRule {
202+
session.stats().register_rewrite(StaticLiteralRule {
203203
falsifier: None,
204204
satisfier: Some(lit(true)),
205205
});
@@ -213,7 +213,7 @@ mod tests {
213213

214214
#[test]
215215
fn unregistered_expression_has_no_rewrite() -> VortexResult<()> {
216-
let session = VortexSession::empty().with::<StatsRewriteSession>();
216+
let session = VortexSession::empty().with::<StatsSession>();
217217
let dtype = DType::Primitive(PType::I32, Nullability::NonNullable);
218218

219219
assert_eq!(lit(true).falsify(&dtype, &session)?, None);
@@ -223,7 +223,7 @@ mod tests {
223223

224224
#[test]
225225
fn non_predicate_expression_errors() {
226-
let session = VortexSession::empty().with::<StatsRewriteSession>();
226+
let session = VortexSession::empty().with::<StatsSession>();
227227
let dtype = DType::Primitive(PType::I32, Nullability::NonNullable);
228228

229229
assert!(lit(7).falsify(&dtype, &session).is_err());

‎vortex-array/src/stats/session.rs‎

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// SPDX-License-Identifier: Apache-2.0
22
// SPDX-FileCopyrightText: Copyright the Vortex contributors
33

4-
//! Session state for stats rewrite rules.
4+
//! Session state for stats APIs.
55
66
use std::any::Any;
77
use std::sync::Arc;
@@ -18,23 +18,23 @@ use crate::stats::rewrite::StatsRewriteRuleRef;
1818

1919
type StatsRewriteRuleSet = Arc<[StatsRewriteRuleRef]>;
2020

21-
/// Session state for stats rewrite rules.
21+
/// Session state for stats APIs.
2222
#[derive(Debug, Default)]
23-
pub struct StatsRewriteSession {
24-
rules: RwLock<HashMap<ScalarFnId, StatsRewriteRuleSet>>,
23+
pub struct StatsSession {
24+
rewrite_rules: RwLock<HashMap<ScalarFnId, StatsRewriteRuleSet>>,
2525
}
2626

27-
impl StatsRewriteSession {
27+
impl StatsSession {
2828
/// Register a stats rewrite rule.
2929
#[allow(dead_code)]
30-
pub(crate) fn register<R: StatsRewriteRule>(&self, rule: R) {
31-
self.register_ref(Arc::new(rule));
30+
pub(crate) fn register_rewrite<R: StatsRewriteRule>(&self, rule: R) {
31+
self.register_rewrite_ref(Arc::new(rule));
3232
}
3333

3434
/// Register a shared stats rewrite rule.
3535
#[allow(dead_code)]
36-
pub(crate) fn register_ref(&self, rule: StatsRewriteRuleRef) {
37-
let mut rules = self.rules.write();
36+
pub(crate) fn register_rewrite_ref(&self, rule: StatsRewriteRuleRef) {
37+
let mut rules = self.rewrite_rules.write();
3838
let rule_id = rule.scalar_fn_id();
3939
let mut updated_rules = rules
4040
.get(&rule_id)
@@ -45,12 +45,15 @@ impl StatsRewriteSession {
4545
}
4646

4747
/// Return the rewrite rules registered for `scalar_fn_id`.
48-
pub(crate) fn rules_for(&self, scalar_fn_id: ScalarFnId) -> Option<StatsRewriteRuleSet> {
49-
self.rules.read().get(&scalar_fn_id).cloned()
48+
pub(crate) fn rewrite_rules_for(
49+
&self,
50+
scalar_fn_id: ScalarFnId,
51+
) -> Option<StatsRewriteRuleSet> {
52+
self.rewrite_rules.read().get(&scalar_fn_id).cloned()
5053
}
5154
}
5255

53-
impl SessionVar for StatsRewriteSession {
56+
impl SessionVar for StatsSession {
5457
fn as_any(&self) -> &dyn Any {
5558
self
5659
}
@@ -60,11 +63,11 @@ impl SessionVar for StatsRewriteSession {
6063
}
6164
}
6265

63-
/// Extension trait for accessing stats rewrite session data.
64-
pub(crate) trait StatsRewriteSessionExt: SessionExt {
65-
/// Returns the stats rewrite rule registry.
66-
fn stats_rewrites(&self) -> Ref<'_, StatsRewriteSession> {
67-
self.get::<StatsRewriteSession>()
66+
/// Extension trait for accessing stats session data.
67+
pub(crate) trait StatsSessionExt: SessionExt {
68+
/// Returns the stats session state.
69+
fn stats(&self) -> Ref<'_, StatsSession> {
70+
self.get::<StatsSession>()
6871
}
6972
}
70-
impl<S: SessionExt> StatsRewriteSessionExt for S {}
73+
impl<S: SessionExt> StatsSessionExt for S {}

‎vortex/src/lib.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ use vortex_array::optimizer::kernels::ArrayKernels;
1616
pub use vortex_array::scalar_fn;
1717
use vortex_array::scalar_fn::session::ScalarFnSession;
1818
use vortex_array::session::ArraySession;
19-
use vortex_array::stats::session::StatsRewriteSession;
19+
use vortex_array::stats::session::StatsSession;
2020
use vortex_io::session::RuntimeSession;
2121
use vortex_layout::session::LayoutSession;
2222
use vortex_session::VortexSession;
@@ -168,7 +168,7 @@ impl VortexSessionDefault for VortexSession {
168168
.with::<ArraySession>()
169169
.with::<LayoutSession>()
170170
.with::<ScalarFnSession>()
171-
.with::<StatsRewriteSession>()
171+
.with::<StatsSession>()
172172
.with::<ArrayKernels>()
173173
.with::<AggregateFnSession>()
174174
.with::<RuntimeSession>();

0 commit comments

Comments
 (0)