further simplify

Signed-off-by: remzi <13716567376yh@gmail.com>
apache · Sep 7, 2022 · 0187046 · 0187046
1 parent 5b20306
commit 0187046
Showing 1 changed file with 19 additions and 24 deletions.
diff --git a/datafusion/sql/src/planner.rs b/datafusion/sql/src/planner.rs
@@ -1310,28 +1310,25 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
         }
 
         let skip = match skip {
-            Some(skip_expr) => {
-                let skip = match self.sql_to_rex(
-                    skip_expr.value,
-                    input.schema(),
-                    &mut HashMap::new(),
-                )? {
-                    Expr::Literal(ScalarValue::Int64(Some(s))) => {
-                        if s < 0 {
-                            return Err(DataFusionError::Plan(format!(
-                                "Offset must be >= 0, '{}' was provided.",
-                                s
-                            )));
-                        }
-                        Ok(s as usize)
+            Some(skip_expr) => match self.sql_to_rex(
+                skip_expr.value,
+                input.schema(),
+                &mut HashMap::new(),
+            )? {
+                Expr::Literal(ScalarValue::Int64(Some(s))) => {
+                    if s < 0 {
+                        return Err(DataFusionError::Plan(format!(
+                            "Offset must be >= 0, '{}' was provided.",
+                            s
+                        )));
                     }
-                    _ => Err(DataFusionError::Plan(
-                        "Unexpected expression in OFFSET clause".to_string(),
-                    )),
-                }?;
-                Some(skip)
-            }
-            _ => None,
+                    Ok(s as usize)
+                }
+                _ => Err(DataFusionError::Plan(
+                    "Unexpected expression in OFFSET clause".to_string(),
+                )),
+            }?,
+            _ => 0,
         };
 
         let fetch = match fetch {
@@ -1351,9 +1348,7 @@ impl<'a, S: ContextProvider> SqlToRel<'a, S> {
             _ => None,
         };
 
-        LogicalPlanBuilder::from(input)
-            .limit(skip.unwrap_or(0), fetch)?
-            .build()
+        LogicalPlanBuilder::from(input).limit(skip, fetch)?.build()
     }
 
     /// Wrap the logical in a sort