Save

Author: andygrove

native/core/src/execution/expressions/strings.rs

@@ -112,16 +112,15 @@ impl ExpressionBuilder for FromJsonBuilder {
     ) -> Result<Arc<dyn PhysicalExpr>, ExecutionError> {
         let expr = extract_expr!(spark_expr, FromJson);
         let child = planner.create_expr(
-            expr.child
-                .as_ref()
-                .ok_or_else(|| ExecutionError::GeneralError("FromJson missing child".to_string()))?,
+            expr.child.as_ref().ok_or_else(|| {
+                ExecutionError::GeneralError("FromJson missing child".to_string())
+            })?,
             input_schema,
         )?;
-        let schema = to_arrow_datatype(
-            expr.schema
-                .as_ref()
-                .ok_or_else(|| ExecutionError::GeneralError("FromJson missing schema".to_string()))?,
-        );
+        let schema =
+            to_arrow_datatype(expr.schema.as_ref().ok_or_else(|| {
+                ExecutionError::GeneralError("FromJson missing schema".to_string())
+            })?);
         Ok(Arc::new(FromJson::new(child, schema, &expr.timezone)))
     }
 }

native/spark-expr/src/json_funcs/from_json.rs

@@ -501,7 +501,11 @@ mod tests {
 
         // All rows should have non-null structs with null field values
         for i in 0..4 {
-            assert!(!struct_array.is_null(i), "Row {} struct should not be null", i);
+            assert!(
+                !struct_array.is_null(i),
+                "Row {} struct should not be null",
+                i
+            );
             assert!(a_array.is_null(i), "Row {} field a should be null", i);
             assert!(b_array.is_null(i), "Row {} field b should be null", i);
         }

spark/src/test/scala/org/apache/comet/CometJsonExpressionSuite.scala

@@ -33,8 +33,7 @@ class CometJsonExpressionSuite extends CometTestBase with AdaptiveSparkPlanHelpe
   override protected def test(testName: String, testTags: Tag*)(testFun: => Any)(implicit
       pos: Position): Unit = {
     super.test(testName, testTags: _*) {
-      withSQLConf(
-        CometConf.getExprAllowIncompatConfigKey(classOf[JsonToStructs]) -> "true") {
+      withSQLConf(CometConf.getExprAllowIncompatConfigKey(classOf[JsonToStructs]) -> "true") {
         testFun
       }
     }