Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion misc/python/materialize/mzcompose/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ def get_minimal_system_parameters(
"enable_rbac_checks": "true",
"enable_reduce_mfp_fusion": "true",
"enable_refresh_every_mvs": "true",
"enable_repr_typecheck": "true",
"enable_cluster_schedule_refresh": "true",
"enable_sql_server_source": "true",
"enable_statement_lifecycle_logging": "true",
Expand Down
6 changes: 0 additions & 6 deletions src/adapter/src/optimize/copy_to.rs
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@ use mz_transform::normalize_lets::normalize_lets;
use mz_transform::reprtypecheck::{
SharedContext as ReprTypecheckContext, empty_context as empty_repr_context,
};
use mz_transform::typecheck::{SharedContext as TypecheckContext, empty_context};
use mz_transform::{StatisticsOracle, TransformCtx};
use timely::progress::Antichain;
use tracing::warn;
Expand All @@ -49,8 +48,6 @@ use crate::optimize::{
};

pub struct Optimizer {
/// A typechecking context to use throughout the optimizer pipeline.
typecheck_ctx: TypecheckContext,
/// A representation typechecking context to use throughout the optimizer pipeline.
repr_typecheck_ctx: ReprTypecheckContext,
/// A snapshot of the catalog state.
Expand Down Expand Up @@ -79,7 +76,6 @@ impl Optimizer {
metrics: OptimizerMetrics,
) -> Self {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
catalog,
compute_instance,
Expand Down Expand Up @@ -175,7 +171,6 @@ impl Optimize<HirRelationExpr> for Optimizer {
let mut df_meta = DataflowMetainfo::default();
let mut transform_ctx = TransformCtx::local(
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down Expand Up @@ -353,7 +348,6 @@ impl<'s> Optimize<LocalMirPlan<Resolved<'s>>> for Optimizer {
&df_builder,
&*stats,
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down
5 changes: 0 additions & 5 deletions src/adapter/src/optimize/index.rs
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,6 @@ use mz_transform::notice::{IndexAlreadyExists, IndexKeyEmpty};
use mz_transform::reprtypecheck::{
SharedContext as ReprTypecheckContext, empty_context as empty_repr_context,
};
use mz_transform::typecheck::{SharedContext as TypecheckContext, empty_context};

use crate::optimize::dataflows::{
ComputeInstanceSnapshot, DataflowBuilder, ExprPrepStyle, prep_relation_expr, prep_scalar_expr,
Expand All @@ -52,8 +51,6 @@ use crate::optimize::{
};

pub struct Optimizer {
/// A typechecking context to use throughout the optimizer pipeline.
typecheck_ctx: TypecheckContext,
/// A representation typechecking context to use throughout the optimizer pipeline.
repr_typecheck_ctx: ReprTypecheckContext,
/// A snapshot of the catalog state.
Expand All @@ -79,7 +76,6 @@ impl Optimizer {
metrics: OptimizerMetrics,
) -> Self {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
catalog,
compute_instance,
Expand Down Expand Up @@ -182,7 +178,6 @@ impl Optimize<Index> for Optimizer {
&df_builder,
&mz_transform::EmptyStatisticsOracle, // TODO: wire proper stats
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down
6 changes: 0 additions & 6 deletions src/adapter/src/optimize/materialized_view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,6 @@ use mz_transform::normalize_lets::normalize_lets;
use mz_transform::reprtypecheck::{
SharedContext as ReprTypecheckContext, empty_context as empty_repr_context,
};
use mz_transform::typecheck::{SharedContext as TypecheckContext, empty_context};
use timely::progress::Antichain;

use crate::optimize::dataflows::{
Expand All @@ -57,8 +56,6 @@ use crate::optimize::{
};

pub struct Optimizer {
/// A typechecking context to use throughout the optimizer pipeline.
typecheck_ctx: TypecheckContext,
/// A representation typechecking context to use throughout the optimizer pipeline.
repr_typecheck_ctx: ReprTypecheckContext,
/// A snapshot of the catalog state.
Expand Down Expand Up @@ -119,7 +116,6 @@ impl Optimizer {
force_source_non_monotonic: BTreeSet<GlobalId>,
) -> Self {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
catalog,
compute_instance,
Expand Down Expand Up @@ -202,7 +198,6 @@ impl Optimize<HirRelationExpr> for Optimizer {
let mut df_meta = DataflowMetainfo::default();
let mut transform_ctx = TransformCtx::local(
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down Expand Up @@ -292,7 +287,6 @@ impl Optimize<LocalMirPlan> for Optimizer {
&df_builder,
&mz_transform::EmptyStatisticsOracle, // TODO: wire proper stats
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down
6 changes: 0 additions & 6 deletions src/adapter/src/optimize/peek.rs
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@ use mz_transform::normalize_lets::normalize_lets;
use mz_transform::reprtypecheck::{
SharedContext as ReprTypecheckContext, empty_context as empty_repr_context,
};
use mz_transform::typecheck::{SharedContext as TypecheckContext, empty_context};
use mz_transform::{StatisticsOracle, TransformCtx};
use timely::progress::Antichain;
use tracing::debug_span;
Expand All @@ -46,8 +45,6 @@ use crate::optimize::{
};

pub struct Optimizer {
/// A typechecking context to use throughout the optimizer pipeline.
typecheck_ctx: TypecheckContext,
/// A representation typechecking context to use throughout the optimizer pipeline.
repr_typecheck_ctx: ReprTypecheckContext,
/// A snapshot of the catalog state.
Expand Down Expand Up @@ -79,7 +76,6 @@ impl Optimizer {
metrics: OptimizerMetrics,
) -> Self {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
catalog,
compute_instance,
Expand Down Expand Up @@ -186,7 +182,6 @@ impl Optimize<HirRelationExpr> for Optimizer {
let mut df_meta = DataflowMetainfo::default();
let mut transform_ctx = TransformCtx::local(
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down Expand Up @@ -342,7 +337,6 @@ impl<'s> Optimize<LocalMirPlan<Resolved<'s>>> for Optimizer {
&df_builder,
&*stats,
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down
6 changes: 0 additions & 6 deletions src/adapter/src/optimize/subscribe.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use mz_transform::normalize_lets::normalize_lets;
use mz_transform::reprtypecheck::{
SharedContext as ReprTypecheckContext, empty_context as empty_repr_context,
};
use mz_transform::typecheck::{SharedContext as TypecheckContext, empty_context};
use timely::progress::Antichain;

use crate::CollectionIdBundle;
Expand All @@ -43,8 +42,6 @@ use crate::optimize::{
};

pub struct Optimizer {
/// A typechecking context to use throughout the optimizer pipeline.
typecheck_ctx: TypecheckContext,
/// A representation typechecking context to use throughout the optimizer pipeline.
repr_typecheck_ctx: ReprTypecheckContext,
/// A snapshot of the catalog state.
Expand Down Expand Up @@ -99,7 +96,6 @@ impl Optimizer {
metrics: OptimizerMetrics,
) -> Self {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
catalog,
compute_instance,
Expand Down Expand Up @@ -242,7 +238,6 @@ impl Optimize<SubscribeFrom> for Optimizer {
// MIR ⇒ MIR optimization (local)
let mut transform_ctx = TransformCtx::local(
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down Expand Up @@ -286,7 +281,6 @@ impl Optimize<SubscribeFrom> for Optimizer {
&df_builder,
&mz_transform::EmptyStatisticsOracle, // TODO: wire proper stats
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
Some(&mut self.metrics),
Expand Down
6 changes: 0 additions & 6 deletions src/adapter/src/optimize/view.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ use mz_transform::dataflow::DataflowMetainfo;
use mz_transform::reprtypecheck::{
SharedContext as ReprTypecheckContext, empty_context as empty_repr_context,
};
use mz_transform::typecheck::{SharedContext as TypecheckContext, empty_context};

use crate::optimize::dataflows::{ExprPrepStyle, prep_relation_expr};
use crate::optimize::{
Expand All @@ -38,8 +37,6 @@ use crate::optimize::{
};

pub struct Optimizer<'a> {
/// A typechecking context to use throughout the optimizer pipeline.
typecheck_ctx: TypecheckContext,
/// A representation typechecking context to use throughout the optimizer pipeline.
repr_typecheck_ctx: ReprTypecheckContext,
/// Optimizer config.
Expand All @@ -58,7 +55,6 @@ pub struct Optimizer<'a> {
impl<'a> Optimizer<'a> {
pub fn new(config: OptimizerConfig, metrics: Option<OptimizerMetrics>) -> Self {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
config,
metrics,
Expand All @@ -76,7 +72,6 @@ impl<'a> Optimizer<'a> {
expr_prep_style: ExprPrepStyle<'a>,
) -> Optimizer<'a> {
Self {
typecheck_ctx: empty_context(),
repr_typecheck_ctx: empty_repr_context(),
config,
metrics,
Expand All @@ -101,7 +96,6 @@ impl Optimize<HirRelationExpr> for Optimizer<'_> {
let mut df_meta = DataflowMetainfo::default();
let mut transform_ctx = TransformCtx::local(
&self.config.features,
&self.typecheck_ctx,
&self.repr_typecheck_ctx,
&mut df_meta,
self.metrics.as_mut(),
Expand Down
1 change: 0 additions & 1 deletion src/repr/src/optimize.rs
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,6 @@ optimizer_feature_flags!({
// See the feature flag of the same name.
enable_dequadratic_eqprop_map: bool,
enable_fast_path_plan_insights: bool,
enable_repr_typecheck: bool,
});

/// A trait used to implement layered config construction.
Expand Down
1 change: 0 additions & 1 deletion src/sql/src/plan/statement/ddl.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4913,7 +4913,6 @@ pub fn unplan_create_cluster(
enable_dequadratic_eqprop_map: _,
enable_eq_classes_withholding_errors: _,
enable_fast_path_plan_insights: _,
enable_repr_typecheck: _,
} = optimizer_feature_overrides;
// The ones from above that don't occur below are not wired up to cluster features.
let features_extracted = ClusterFeatureExtracted {
Expand Down
1 change: 0 additions & 1 deletion src/sql/src/plan/statement/dml.rs
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,6 @@ impl TryFrom<ExplainPlanOptionExtracted> for ExplainConfig {
enable_dequadratic_eqprop_map: Default::default(),
enable_eq_classes_withholding_errors: Default::default(),
enable_fast_path_plan_insights: Default::default(),
enable_repr_typecheck: Default::default(),
},
})
}
Expand Down
7 changes: 0 additions & 7 deletions src/sql/src/session/vars/definitions.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2218,12 +2218,6 @@ feature_flags!(
default: false,
enable_for_item_parsing: true,
},
{
name: enable_repr_typecheck,
desc: "Enable typechecking using representation types",
default: false,
enable_for_item_parsing: false,
},
{
name: enable_frontend_peek_sequencing, // currently, changes only take effect for new sessions
desc: "Enables the new peek sequencing code, which does most of its work in the Adapter Frontend instead of the Coordinator main task.",
Expand Down Expand Up @@ -2253,7 +2247,6 @@ impl From<&super::SystemVars> for OptimizerFeatures {
enable_dequadratic_eqprop_map: vars.enable_dequadratic_eqprop_map(),
enable_eq_classes_withholding_errors: vars.enable_eq_classes_withholding_errors(),
enable_fast_path_plan_insights: vars.enable_fast_path_plan_insights(),
enable_repr_typecheck: vars.enable_repr_typecheck(),
}
}
}
Loading