refactor(rust): Don't enable ir_serde together with serde

Author: JakubValtar

crates/polars-lazy/src/frame/mod.rs

@@ -2516,7 +2516,6 @@ impl JoinBuilder {
                     allow_parallel: self.allow_parallel,
                     force_parallel: self.force_parallel,
                     args,
-                    ..Default::default()
                 }
                 .into(),
             )
@@ -2600,7 +2599,6 @@ impl JoinBuilder {
             allow_parallel: self.allow_parallel,
             force_parallel: self.force_parallel,
             args,
-            ..Default::default()
         };
 
         let lp = DslPlan::Join {

crates/polars-ops/src/frame/join/args.rs

@@ -197,12 +197,10 @@ impl Debug for CrossJoinOptions {
 }
 
 #[derive(Clone, PartialEq, Eq, Hash, IntoStaticStr, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[strum(serialize_all = "snake_case")]
 pub enum JoinTypeOptions {
     #[cfg(feature = "iejoin")]
     IEJoin(IEJoinOptions),
-    #[cfg_attr(feature = "serde", serde(skip))]
     Cross(CrossJoinOptions),
 }
 

crates/polars-ops/src/frame/join/iejoin/mod.rs

@@ -26,7 +26,6 @@ use crate::frame::_finish_join;
 
 #[derive(Copy, Clone, Debug, Default, PartialEq, Eq, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "dsl-schema", derive(schemars::JsonSchema))]
 pub enum InequalityOperator {
     #[default]
     Lt,
@@ -42,7 +41,6 @@ impl InequalityOperator {
 }
 #[derive(Clone, Debug, PartialEq, Eq, Default, Hash)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "dsl-schema", derive(schemars::JsonSchema))]
 pub struct IEJoinOptions {
     pub operator1: InequalityOperator,
     pub operator2: Option<InequalityOperator>,

crates/polars-pipe/src/pipeline/convert.rs

@@ -685,7 +685,7 @@ where
     ))
 }
 
-pub fn swap_join_order(options: &JoinOptions) -> bool {
+pub fn swap_join_order(options: &JoinOptionsIR) -> bool {
     matches!(options.args.how, JoinType::Left)
         || match (options.rows_left, options.rows_right) {
             ((Some(left), _), (Some(right), _)) => left > right,

crates/polars-plan/Cargo.toml

@@ -54,7 +54,6 @@ version_check = { workspace = true }
 debugging = []
 python = ["dep:pyo3", "polars-utils/python", "polars-ffi", "polars-core/object"]
 serde = [
-  "ir_serde",
   "dep:serde",
   "polars-core/serde-lazy",
   "polars-time/serde",

crates/polars-plan/dsl-schema.sha256

@@ -1 +1 @@
-e014c056d5a8fa3f83eb414d0153a3359e17d326d1cb77aca36a69aaaf155c59
+0ead21af3cf8bf9d7a7dd51bde1d034b3cd477f0e9bd1a8043d71529116e8805

crates/polars-plan/src/dsl/mod.rs

@@ -508,7 +508,6 @@ impl Expr {
     /// Returns the `k` smallest rows by given column.
     ///
     /// For single column, use [`Expr::bottom_k`].
-    // #[cfg(feature = "top_k")]
     #[cfg(feature = "top_k")]
     pub fn bottom_k_by<K: Into<Expr>, E: AsRef<[IE]>, IE: Into<Expr> + Clone>(
         self,

crates/polars-plan/src/dsl/options/mod.rs

@@ -70,21 +70,15 @@ impl Default for StrptimeOptions {
 }
 
 #[derive(Clone, PartialEq, Eq, IntoStaticStr, Debug)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "dsl-schema", derive(schemars::JsonSchema))]
+#[cfg_attr(feature = "ir_serde", derive(Serialize, Deserialize))]
 #[strum(serialize_all = "snake_case")]
 pub enum JoinTypeOptionsIR {
     #[cfg(feature = "iejoin")]
     IEJoin(IEJoinOptions),
-    #[cfg_attr(
-        all(
-            any(feature = "serde", feature = "dsl-schema"),
-            not(feature = "ir_serde")
-        ),
-        serde(skip)
-    )]
     // Fused cross join and filter (only in in-memory engine)
-    Cross { predicate: ExprIR },
+    Cross {
+        predicate: ExprIR,
+    },
 }
 
 impl Hash for JoinTypeOptionsIR {
@@ -117,9 +111,8 @@ impl JoinTypeOptionsIR {
 }
 
 #[derive(Clone, Debug, PartialEq, Eq, Hash)]
-#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
-#[cfg_attr(feature = "dsl-schema", derive(schemars::JsonSchema))]
-pub struct JoinOptions {
+#[cfg_attr(feature = "ir_serde", derive(Serialize, Deserialize))]
+pub struct JoinOptionsIR {
     pub allow_parallel: bool,
     pub force_parallel: bool,
     pub args: JoinArgs,
@@ -130,16 +123,45 @@ pub struct JoinOptions {
     pub rows_right: (Option<usize>, usize),
 }
 
+impl From<JoinOptions> for JoinOptionsIR {
+    fn from(opts: JoinOptions) -> Self {
+        Self {
+            allow_parallel: opts.allow_parallel,
+            force_parallel: opts.force_parallel,
+            args: opts.args,
+            options: Default::default(),
+            rows_left: (None, usize::MAX),
+            rows_right: (None, usize::MAX),
+        }
+    }
+}
+
+#[derive(Clone, Debug, PartialEq, Eq, Hash)]
+#[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
+#[cfg_attr(feature = "dsl-schema", derive(schemars::JsonSchema))]
+pub struct JoinOptions {
+    pub allow_parallel: bool,
+    pub force_parallel: bool,
+    pub args: JoinArgs,
+}
+
 impl Default for JoinOptions {
     fn default() -> Self {
         JoinOptions {
             allow_parallel: true,
             force_parallel: false,
             // Todo!: make default
             args: JoinArgs::new(JoinType::Left),
-            options: Default::default(),
-            rows_left: (None, usize::MAX),
-            rows_right: (None, usize::MAX),
+        }
+    }
+}
+
+impl From<JoinOptionsIR> for JoinOptions {
+    fn from(opts: JoinOptionsIR) -> Self {
+        Self {
+            allow_parallel: opts.allow_parallel,
+            force_parallel: opts.force_parallel,
+            args: opts.args,
         }
     }
 }

crates/polars-plan/src/dsl/options/sink.rs

@@ -184,6 +184,7 @@ pub struct FileSinkType {
 pub enum SinkTypeIR {
     Memory,
     File(FileSinkType),
+    #[cfg_attr(all(feature = "serde", not(feature = "ir_serde")), serde(skip))]
     Partition(PartitionSinkTypeIR),
 }
 
@@ -443,7 +444,7 @@ pub struct SortColumn {
     pub nulls_last: bool,
 }
 
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "ir_serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, PartialEq)]
 pub struct SortColumnIR {
     pub expr: ExprIR,
@@ -465,7 +466,7 @@ pub struct PartitionSinkType {
     pub finish_callback: Option<SinkFinishCallback>,
 }
 
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "ir_serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, PartialEq)]
 pub struct PartitionSinkTypeIR {
     pub base_path: Arc<PathBuf>,
@@ -502,7 +503,7 @@ pub enum PartitionVariant {
     },
 }
 
-#[cfg_attr(feature = "serde", derive(serde::Serialize, serde::Deserialize))]
+#[cfg_attr(feature = "ir_serde", derive(serde::Serialize, serde::Deserialize))]
 #[derive(Clone, Debug, PartialEq, Eq)]
 pub enum PartitionVariantIR {
     MaxSize(IdxSize),

crates/polars-plan/src/plans/builder_ir.rs

@@ -320,7 +320,7 @@ impl<'a> IRBuilder<'a> {
         other: Node,
         left_on: Vec<ExprIR>,
         right_on: Vec<ExprIR>,
-        options: Arc<JoinOptions>,
+        options: Arc<JoinOptionsIR>,
     ) -> Self {
         let schema_left = self.schema();
         let schema_right = self.lp_arena.get(other).schema(self.lp_arena);