Revert "fix(rust!, python): Reject literal input in sort_by_exprs() (…

…#17606)"

This reverts commit f55cc5b.

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

@@ -342,28 +342,20 @@ impl LazyFrame {
     /// fn example(df: DataFrame) -> LazyFrame {
     ///       df.lazy()
     ///         .sort_by_exprs(vec![col("sepal_width")], Default::default())
-    ///         .unwrap()
     /// }
     /// ```
     pub fn sort_by_exprs<E: AsRef<[Expr]>>(
         self,
         by_exprs: E,
         sort_options: SortMultipleOptions,
-    ) -> PolarsResult<Self> {
+    ) -> Self {
         let by_exprs = by_exprs.as_ref().to_vec();
         if by_exprs.is_empty() {
-            Ok(self)
+            self
         } else {
-            let is_include_literal = by_exprs.iter().any(|expr| matches!(expr, Expr::Literal(_)));
-
-            polars_ensure!(
-                !is_include_literal,
-                ComputeError: "literal expressions are not allowed for sorting"
-            );
-
             let opt_state = self.get_opt_state();
             let lp = self.get_plan_builder().sort(by_exprs, sort_options).build();
-            Ok(Self::from_logical_plan(lp, opt_state))
+            Self::from_logical_plan(lp, opt_state)
         }
     }
 
@@ -372,26 +364,24 @@ impl LazyFrame {
         k: IdxSize,
         by_exprs: E,
         sort_options: SortMultipleOptions,
-    ) -> PolarsResult<Self> {
+    ) -> Self {
         // this will optimize to top-k
-        Ok(self
-            .sort_by_exprs(
-                by_exprs,
-                sort_options.with_order_reversed().with_nulls_last(true),
-            )?
-            .slice(0, k))
+        self.sort_by_exprs(
+            by_exprs,
+            sort_options.with_order_reversed().with_nulls_last(true),
+        )
+        .slice(0, k)
     }
 
     pub fn bottom_k<E: AsRef<[Expr]>>(
         self,
         k: IdxSize,
         by_exprs: E,
         sort_options: SortMultipleOptions,
-    ) -> PolarsResult<Self> {
+    ) -> Self {
         // this will optimize to bottom-k
-        Ok(self
-            .sort_by_exprs(by_exprs, sort_options.with_nulls_last(true))?
-            .slice(0, k))
+        self.sort_by_exprs(by_exprs, sort_options.with_nulls_last(true))
+            .slice(0, k)
     }
 
     /// Reverse the `DataFrame` from top to bottom.

crates/polars-lazy/src/tests/queries.rs

@@ -1911,7 +1911,7 @@ fn test_sort_maintain_order_true() -> PolarsResult<()> {
             SortMultipleOptions::default()
                 .with_maintain_order(true)
                 .with_nulls_last(true),
-        )?
+        )
         .slice(0, 3)
         .collect()?;
     println!("{:?}", res);

crates/polars-lazy/src/tests/streaming.rs

@@ -105,7 +105,7 @@ fn test_streaming_multiple_keys_aggregate() -> PolarsResult<()> {
         .sort_by_exprs(
             [col("sugars_g"), col("calories")],
             SortMultipleOptions::default().with_order_descending_multi([false, false]),
-        )?;
+        );
 
     assert_streaming_with_default(q, true, false);
     Ok(())
@@ -138,7 +138,7 @@ fn test_streaming_unique() -> PolarsResult<()> {
         .sort_by_exprs(
             [cols(["sugars_g", "calories"])],
             SortMultipleOptions::default(),
-        )?;
+        );
 
     assert_streaming_with_default(q, true, false);
     Ok(())
@@ -392,7 +392,7 @@ fn test_sort_maintain_order_streaming() -> PolarsResult<()> {
             SortMultipleOptions::default()
                 .with_nulls_last(true)
                 .with_maintain_order(true),
-        )?
+        )
         .slice(0, 3)
         .with_streaming(true)
         .collect()?;
@@ -419,7 +419,7 @@ fn test_streaming_full_outer_join() -> PolarsResult<()> {
 
     let q = lf_left
         .full_join(lf_right, col("a"), col("a"))
-        .sort_by_exprs([all()], SortMultipleOptions::default())?;
+        .sort_by_exprs([all()], SortMultipleOptions::default());
 
     // Toggle so that the join order is swapped.
     for toggle in [true, true] {

crates/polars-lazy/src/tests/tpch.rs

@@ -81,7 +81,7 @@ fn test_q2() -> PolarsResult<()> {
             SortMultipleOptions::default()
                 .with_order_descending_multi([true, false, false, false])
                 .with_maintain_order(true),
-        )?
+        )
         .limit(100)
         .with_comm_subplan_elim(true);
 

crates/polars-sql/src/context.rs

@@ -1098,13 +1098,13 @@ impl SQLContext {
                 )?)
             }
         }
-        lf.sort_by_exprs(
+        Ok(lf.sort_by_exprs(
             &by,
             SortMultipleOptions::default()
                 .with_order_descending_multi(descending)
                 .with_nulls_last_multi(nulls_last)
                 .with_maintain_order(true),
-        )
+        ))
     }
 
     fn process_group_by(

crates/polars-sql/tests/ops_distinct_on.rs

@@ -1,11 +1,10 @@
 use polars_core::chunked_array::ops::SortMultipleOptions;
 use polars_core::df;
-use polars_error::PolarsResult;
 use polars_lazy::prelude::*;
 use polars_sql::*;
 
 #[test]
-fn test_distinct_on() -> PolarsResult<()> {
+fn test_distinct_on() {
     let df = df! {
       "Name" => ["Bob", "Pete", "Pete", "Pete", "Martha", "Martha"],
       "Record Date" => [1, 1, 2, 4, 1, 3],
@@ -34,10 +33,9 @@ fn test_distinct_on() -> PolarsResult<()> {
             SortMultipleOptions::default()
                 .with_order_descending_multi([false, true])
                 .with_maintain_order(true),
-        )?
+        )
         .group_by_stable(vec![col("Name")])
         .agg(vec![col("*").first()]);
     let expected = expected.collect().unwrap();
-    assert!(actual.equals(&expected));
-    Ok(())
+    assert!(actual.equals(&expected))
 }

crates/polars-sql/tests/simple_exprs.rs

@@ -603,7 +603,7 @@ fn test_group_by_2() -> PolarsResult<()> {
         .sort_by_exprs(
             vec![col("count"), col("category")],
             SortMultipleOptions::default().with_order_descending_multi([false, true]),
-        )?
+        )
         .limit(2);
 
     let expected = expected.collect()?;

crates/polars/src/docs/lazy.rs

@@ -85,7 +85,7 @@
 //! let descending = vec![true, false];
 //!
 //! let sorted = df.lazy()
-//!     .sort_by_exprs(vec![col("b"), col("a")], descending, false, false)?
+//!     .sort_by_exprs(vec![col("b"), col("a")], descending, false, false)
 //!     .collect()?;
 //!
 //! // sorted:

py-polars/src/lazyframe/mod.rs

@@ -547,47 +547,41 @@ impl PyLazyFrame {
         nulls_last: Vec<bool>,
         maintain_order: bool,
         multithreaded: bool,
-    ) -> PyResult<Self> {
+    ) -> Self {
         let ldf = self.ldf.clone();
         let exprs = by.to_exprs();
-        let out = ldf
-            .sort_by_exprs(
-                exprs,
-                SortMultipleOptions {
-                    descending,
-                    nulls_last,
-                    maintain_order,
-                    multithreaded,
-                },
-            )
-            .map_err(PyPolarsErr::from)?;
-        Ok(out.into())
+        ldf.sort_by_exprs(
+            exprs,
+            SortMultipleOptions {
+                descending,
+                nulls_last,
+                maintain_order,
+                multithreaded,
+            },
+        )
+        .into()
     }
 
-    fn top_k(&self, k: IdxSize, by: Vec<PyExpr>, reverse: Vec<bool>) -> PyResult<Self> {
+    fn top_k(&self, k: IdxSize, by: Vec<PyExpr>, reverse: Vec<bool>) -> Self {
         let ldf = self.ldf.clone();
         let exprs = by.to_exprs();
-        let out = ldf
-            .top_k(
-                k,
-                exprs,
-                SortMultipleOptions::new().with_order_descending_multi(reverse),
-            )
-            .map_err(PyPolarsErr::from)?;
-        Ok(out.into())
+        ldf.top_k(
+            k,
+            exprs,
+            SortMultipleOptions::new().with_order_descending_multi(reverse),
+        )
+        .into()
     }
 
-    fn bottom_k(&self, k: IdxSize, by: Vec<PyExpr>, reverse: Vec<bool>) -> PyResult<Self> {
+    fn bottom_k(&self, k: IdxSize, by: Vec<PyExpr>, reverse: Vec<bool>) -> Self {
         let ldf = self.ldf.clone();
         let exprs = by.to_exprs();
-        let out = ldf
-            .bottom_k(
-                k,
-                exprs,
-                SortMultipleOptions::new().with_order_descending_multi(reverse),
-            )
-            .map_err(PyPolarsErr::from)?;
-        Ok(out.into())
+        ldf.bottom_k(
+            k,
+            exprs,
+            SortMultipleOptions::new().with_order_descending_multi(reverse),
+        )
+        .into()
     }
 
     fn cache(&self) -> Self {

py-polars/tests/unit/dataframe/test_df.py

@@ -271,10 +271,6 @@ def test_sort() -> None:
     assert_frame_equal(
         df.sort(["a", "b"]), pl.DataFrame({"a": [1, 2, 3], "b": [2, 1, 3]})
     )
-    with pytest.raises(ComputeError):
-        df.sort([1, 2])
-    with pytest.raises(ComputeError):
-        df.sort(1)
 
 
 def test_sort_maintain_order() -> None: