Skip to content

refactor(types, frontends): column lineage replaces table qualifiers (#1207 PR 2b) #1233

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

Draft
zzylol wants to merge 4 commits into
base: refactor/1207-memo
Choose a base branch
from
Draft

refactor(types, frontends): column lineage replaces table qualifiers (#1207 PR 2b) #1233

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b5daf86
refactor(types, frontends): column lineage replaces table qualifiers …
zzylol Nov 6, 2026
efe0b52
docs(asap-primitive-schema): selections name columns by lineage (#120…
zzylol Nov 6, 2026
f2370de
test(types): example 1 asserts the selection's column lineage (#1207 …
zzylol Nov 6, 2026
e2b5456
refactor(types): one SourceColumn type, one top-k output name (#1207 …
zzylol Nov 7, 2026
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
8 changes: 1 addition & 7 deletions crates/devtools/src/planner_fuzz/relations.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,12 +954,7 @@ fn with_root_estimate(
estimate: Rc<OperatorNode>,
dropped: &[String],
) -> Result<Rc<OperatorNode>, String> {
let Some(NonASAPOp::Project {
cols,
qualifier,
child,
}) = root.non_asap()
else {
let Some(NonASAPOp::Project { cols, child }) = root.non_asap() else {
return Ok(estimate);
};
let mut kept = Vec::new();
Expand All @@ -980,7 +975,6 @@ fn with_root_estimate(
let cols = kept;
OperatorNode::new_shared(Operator::NonASAP(NonASAPOp::Project {
cols,
qualifier: qualifier.clone(),
child: estimate,
}))
.map_err(|e| format!("projection over the new estimate: {e}"))
Expand Down
1 change: 0 additions & 1 deletion crates/devtools/tests/viewer_contract.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ fn non_asap_samples() -> Vec<NonASAPOp<()>> {
},
NonASAPOp::Project {
cols: vec![],
qualifier: None,
child: (),
},
NonASAPOp::Aggregate {
Expand Down
1 change: 0 additions & 1 deletion crates/executor/src/expressions/columnar.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -812,7 +812,6 @@ mod tests {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable,
table: None,
}
}

Expand Down
2 changes: 0 additions & 2 deletions crates/executor/src/operators/aggregate/temporal.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,13 +341,11 @@ mod tests {
name: "time".into(),
dtype: SummaryFamilyType::Plain(DataType::Timestamp),
nullable: false,
table: None,
},
SummaryField {
name: "value".into(),
dtype: SummaryFamilyType::Plain(DataType::Float64),
nullable: false,
table: None,
},
],
time_index: Some(0),
Expand Down
1 change: 0 additions & 1 deletion crates/executor/src/operators/common.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ pub(super) fn result_field(name: &str, dtype: DataType, nullable: bool) -> Summa
name: name.into(),
dtype: SummaryFamilyType::Plain(dtype),
nullable,
table: None,
}
}

Expand Down
2 changes: 0 additions & 2 deletions crates/executor/src/operators/group_table.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,6 @@ mod tests {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: true,
table: None,
};
let schema = Arc::new(Schema {
fields: vec![
Expand Down Expand Up @@ -548,7 +547,6 @@ mod tests {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
};
let schema = Arc::new(Schema {
fields: vec![
Expand Down
1 change: 0 additions & 1 deletion crates/executor/src/operators/series_labels.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1130,7 +1130,6 @@ mod columnar_tests {
name: name.into(),
dtype: SummaryFamilyType::Plain(dtype),
nullable,
table: None,
}
}

Expand Down
2 changes: 0 additions & 2 deletions crates/executor/src/operators/summary/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ impl Operator {
name: "state".into(),
dtype: family.clone(),
nullable: false,
table: None,
});
Ok(Self {
kind: Kind::AllGroupsSummaryBuild {
Expand Down Expand Up @@ -177,7 +176,6 @@ impl Operator {
name: "state".into(),
dtype: family.clone(),
nullable: false,
table: None,
});
Ok(Self {
kind: Kind::PerGroupSummaryBuild {
Expand Down
8 changes: 0 additions & 8 deletions crates/executor/src/values/batch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,7 +616,6 @@ mod tests {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable,
table: None,
}
}

Expand Down Expand Up @@ -662,13 +661,11 @@ mod tests {
name: "a".into(),
dtype: DataType::Int64,
nullable: false,
table: None,
},
Field::<DataType> {
name: "b".into(),
dtype: DataType::Utf8,
nullable: true,
table: None,
},
];
let labels = DataType::Map {
Expand Down Expand Up @@ -786,7 +783,6 @@ mod tests {
name: "state".into(),
dtype: dd_family(),
nullable: false,
table: None,
},
],
time_index: None,
Expand Down Expand Up @@ -868,7 +864,6 @@ mod tests {
name: "state".into(),
dtype: family.clone(),
nullable: false,
table: None,
},
],
time_index: None,
Expand Down Expand Up @@ -1010,7 +1005,6 @@ mod tests {
name: "state".into(),
dtype: family,
nullable: false,
table: None,
},
],
time_index: None,
Expand Down Expand Up @@ -1063,7 +1057,6 @@ mod tests {
name: "state".into(),
dtype: family.clone(),
nullable: false,
table: None,
}],
time_index: None,
unique_keys: vec![],
Expand Down Expand Up @@ -1142,7 +1135,6 @@ mod tests {
name: "state".into(),
dtype: family,
nullable: false,
table: None,
}],
time_index: None,
unique_keys: vec![],
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/aggregate_memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,6 @@ fn run_aggregate(
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
};
let input = Arc::new(Schema {
fields: vec![
Expand Down
3 changes: 0 additions & 3 deletions crates/executor/tests/blocking_resources.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ fn schema(width: usize) -> SchemaRef {
closed: false,
fields: (0..width)
.map(|i| Field {
table: None,
name: format!("v{i}"),
dtype: FieldDataType::Plain(DataType::Int64),
nullable: false,
Expand Down Expand Up @@ -193,13 +192,11 @@ fn weighted_summary_build_yields_within_a_batch() {
closed: false,
fields: vec![
Field {
table: None,
name: "item".into(),
dtype: FieldDataType::Plain(DataType::Int64),
nullable: false,
},
Field {
table: None,
name: "weight".into(),
dtype: FieldDataType::Plain(DataType::Float64),
nullable: false,
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/cheap_measures_memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,6 @@ fn many_groups_of_cheap_measures_fail_near_the_memory_limit() {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
};
let input = Arc::new(Schema {
fields: vec![field("k", DataType::Int64), field("v", DataType::Float64)],
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/current_series_heap.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ fn schema() -> Arc<Schema> {
]
.into_iter()
.map(|(name, dtype)| Field {
table: None,
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/deployment.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,6 @@ fn heap_sketch_states_load_as_dag_summary_values() {
name: "state".into(),
dtype: family.clone(),
nullable: false,
table: None,
}],
unique_keys: vec![],
closed: false,
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/exact_state_columns.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ fn field(name: &str, dtype: DataType) -> Field {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
}
}

Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/grouped_limit_memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ fn many_groups_in_one_batch_fail_near_the_memory_limit() {
name: "k".into(),
dtype: FieldDataType::Plain(DataType::Int64),
nullable: false,
table: None,
}],
time_index: None,
unique_keys: vec![],
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/hydra_cms_execution.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,6 @@ fn summary_agg(update: SummaryUpdate, filter: Option<Predicate<usize>>) -> Physi
name: "state".into(),
dtype: family(),
nullable: false,
table: None,
},
]),
)
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/keyed_summary_row_weight.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,6 @@ fn query_time_count_heap_binds_a_constant_row_weight() {
name: "state".into(),
dtype: heap_family(),
nullable: false,
table: None,
},
]))
.clone(),
Expand Down
3 changes: 0 additions & 3 deletions crates/executor/tests/physical_dag.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ fn schema(fields: &[(&str, DataType, bool)]) -> SchemaRef {
fields: fields
.iter()
.map(|(name, dtype, nullable)| Field {
table: None,
name: (*name).into(),
dtype: FieldDataType::Plain(dtype.clone()),
nullable: *nullable,
Expand Down Expand Up @@ -468,7 +467,6 @@ fn exact_state_and_family_validation() {
unique_keys: vec![],
closed: false,
fields: vec![Field {
table: None,
name: "state".into(),
dtype: family.clone(),
nullable: false,
Expand Down Expand Up @@ -564,7 +562,6 @@ fn bind_physical_asap_dag_before_execution() {
)),
},
}],
qualifier: None,
child: 0,
}),
),
Expand Down
2 changes: 0 additions & 2 deletions crates/executor/tests/physical_semantics.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ fn schema(fields: &[(&str, DataType, bool)]) -> SchemaRef {
fields: fields
.iter()
.map(|(name, dtype, nullable)| Field {
table: None,
name: (*name).into(),
dtype: FieldDataType::Plain(dtype.clone()),
nullable: *nullable,
Expand Down Expand Up @@ -924,7 +923,6 @@ fn planner_node(
fields
.iter()
.map(|(name, dtype, nullable)| Field {
table: None,
name: (*name).into(),
dtype: dtype.clone(),
nullable: *nullable,
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/precompute_population.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ fn logical_schema(family: FieldDataType) -> Schema {
unique_keys: vec![],
closed: false,
fields: vec![Field {
table: None,
name: "value".into(),
dtype: family,
nullable: false,
Expand Down
4 changes: 0 additions & 4 deletions crates/executor/tests/promql_binary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ fn schema() -> SchemaRef {
closed: false,
fields: vec![
Field {
table: None,
name: "labels".into(),
dtype: FieldDataType::Plain(DataType::Map {
key: Box::new(DataType::Utf8),
Expand All @@ -35,7 +34,6 @@ fn schema() -> SchemaRef {
nullable: false,
},
Field {
table: None,
name: "value".into(),
dtype: FieldDataType::Plain(DataType::Float64),
nullable: false,
Expand Down Expand Up @@ -343,13 +341,11 @@ fn stored_series_evaluations_support_filters_and_sets() {
closed: false,
fields: vec![
Field {
table: None,
name: PROMQL_SERIES_IDENTITY.into(),
dtype: FieldDataType::Plain(DataType::Utf8),
nullable: false,
},
Field {
table: None,
name: "value".into(),
dtype: family.clone(),
nullable: false,
Expand Down
2 changes: 0 additions & 2 deletions crates/executor/tests/raw_scan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ fn fixture() -> (planner_types::ir::NonASAPOp, SchemaRef, Vec<Batch>) {
unique_keys: vec![],
closed: false,
fields: vec![Field {
table: None,
name: "value".into(),
dtype: FieldDataType::Plain(DataType::Int64),
nullable: true,
Expand Down Expand Up @@ -824,7 +823,6 @@ fn windowed_count_plan(shift_ms: Option<i64>) -> PhysicalASAPDAG {
dag.edges.retain(|edge| edge.consumer < 3);
let family = FieldDataType::ExactAggregate(ExactKind::Count, ExactParams::Count);
let state = planner_types::ir::schema::Schema::new(vec![Field {
table: None,
name: "count".into(),
dtype: family.clone(),
nullable: false,
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/series_window_memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ fn a_long_subquery_over_many_series_fails_near_the_memory_limit() {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
};
let input = Arc::new(Schema {
fields: vec![
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/state_column_updater.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ fn plain(name: &str, dtype: DataType) -> Field {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
}
}

Expand Down
2 changes: 0 additions & 2 deletions crates/executor/tests/stored_tumbling_window_memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,11 @@ fn tumbling_window_of(series_count: u32) -> (Arc<Schema>, Batch) {
name: "series".into(),
dtype: FieldDataType::Plain(DataType::Utf8),
nullable: false,
table: None,
},
Field {
name: "state".into(),
dtype: family.clone(),
nullable: false,
table: None,
},
],
time_index: None,
Expand Down
1 change: 0 additions & 1 deletion crates/executor/tests/summary_build_memory_limit.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ fn one_large_batch_fails_near_the_memory_limit() {
name: name.into(),
dtype: FieldDataType::Plain(dtype),
nullable: false,
table: None,
};
let input = Arc::new(Schema {
fields: vec![
Expand Down
Loading