update API for logical expr Limit

Ref: apache/datafusion#12836

Author: Michael-J-Ward

python/tests/test_expr.py

@@ -85,14 +85,18 @@ def test_limit(test_ctx):
 
     plan = plan.to_variant()
     assert isinstance(plan, Limit)
-    assert plan.skip() == 0
+    # TODO: Upstream now has expressions for skip and fetch
+    # REF: https://github.com/apache/datafusion/pull/12836
+    # assert plan.skip() == 0
 
     df = test_ctx.sql("select c1 from test LIMIT 10 OFFSET 5")
     plan = df.logical_plan()
 
     plan = plan.to_variant()
     assert isinstance(plan, Limit)
-    assert plan.skip() == 5
+    # TODO: Upstream now has expressions for skip and fetch
+    # REF: https://github.com/apache/datafusion/pull/12836
+    # assert plan.skip() == 5
 
 
 def test_aggregate_query(test_ctx):

src/expr/limit.rs

@@ -46,7 +46,7 @@ impl Display for PyLimit {
         write!(
             f,
             "Limit
-            Skip: {}
+            Skip: {:?}
             Fetch: {:?}
             Input: {:?}",
             &self.limit.skip, &self.limit.fetch, &self.limit.input
@@ -56,15 +56,19 @@ impl Display for PyLimit {
 
 #[pymethods]
 impl PyLimit {
-    /// Retrieves the skip value for this `Limit`
-    fn skip(&self) -> usize {
-        self.limit.skip
-    }
+    // NOTE: Upstream now has expressions for skip and fetch
+    // TODO: Do we still want to expose these?
+    // REF: https://github.com/apache/datafusion/pull/12836
 
-    /// Retrieves the fetch value for this `Limit`
-    fn fetch(&self) -> Option<usize> {
-        self.limit.fetch
-    }
+    // /// Retrieves the skip value for this `Limit`
+    // fn skip(&self) -> usize {
+    //     self.limit.skip
+    // }
+
+    // /// Retrieves the fetch value for this `Limit`
+    // fn fetch(&self) -> Option<usize> {
+    //     self.limit.fetch
+    // }
 
     /// Retrieves the input `LogicalPlan` to this `Limit` node
     fn input(&self) -> PyResult<Vec<PyLogicalPlan>> {