fixing rebase conflicts

CTTY · CTTY · commit c4488cd4d453 · 2022-07-25T15:59:04.000-07:00
diff --git a/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/sql/hudi/SparkAdapter.scala b/hudi-client/hudi-spark-client/src/main/scala/org/apache/spark/sql/hudi/SparkAdapter.scala
@@ -168,7 +168,6 @@ trait SparkAdapter extends Serializable {
     // unsupported by default
     throw new UnsupportedOperationException(s"Unsupported parseQuery method in Spark earlier than Spark 3.3.0")
   }
-                                          sqlText: String): LogicalPlan
 
   /**
    * Converts instance of [[StorageLevel]] to a corresponding string

Original file line number	Diff line number	Diff line change
`@@ -168,7 +168,6 @@ trait SparkAdapter extends Serializable {`
`168`	`168`	`// unsupported by default`
`169`	`169`	`throw new UnsupportedOperationException(s"Unsupported parseQuery method in Spark earlier than Spark 3.3.0")`
`170`	`170`	`}`
`171`		`- sqlText: String): LogicalPlan`
`172`	`171`
`173`	`172`	`/**`
`174`	`173`	`* Converts instance of [[StorageLevel]] to a corresponding string`