CTTY commented on code in PR #5943: URL: https://github.com/apache/hudi/pull/5943#discussion_r931598774
########## hudi-spark-datasource/hudi-spark3.3.x/src/main/scala/org/apache/spark/sql/adapter/Spark3_3Adapter.scala: ########## @@ -0,0 +1,80 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.spark.sql.adapter + +import org.apache.avro.Schema +import org.apache.hudi.Spark33HoodieFileScanRDD +import org.apache.spark.sql.avro._ +import org.apache.spark.sql.catalyst.expressions.{AttributeReference, Expression} +import org.apache.spark.sql.catalyst.parser.ParserInterface +import org.apache.spark.sql.catalyst.plans.logical._ +import org.apache.spark.sql.catalyst.InternalRow +import org.apache.spark.sql.execution.datasources.{FilePartition, FileScanRDD, PartitionedFile} +import org.apache.spark.sql.execution.datasources.parquet.{ParquetFileFormat, Spark33HoodieParquetFileFormat} +import org.apache.spark.sql.parser.HoodieSpark3_3ExtendedSqlParser +import org.apache.spark.sql.types.{DataType, StructType} +import org.apache.spark.sql.{HoodieCatalystExpressionUtils, HoodieCatalystPlansUtils, HoodieSpark33CatalystPlanUtils, HoodieSpark33CatalystExpressionUtils, SparkSession} + +/** + * Implementation of [[SparkAdapter]] for Spark 3.3.x branch + */ +class Spark3_3Adapter extends BaseSpark3Adapter { + + override def getCatalystExpressionUtils: HoodieCatalystExpressionUtils = HoodieSpark33CatalystExpressionUtils + + override def getCatalystPlanUtils: HoodieCatalystPlansUtils = HoodieSpark33CatalystPlanUtils + + override def createAvroSerializer(rootCatalystType: DataType, rootAvroType: Schema, nullable: Boolean): HoodieAvroSerializer = + new HoodieSpark3_3AvroSerializer(rootCatalystType, rootAvroType, nullable) + + override def createAvroDeserializer(rootAvroType: Schema, rootCatalystType: DataType): HoodieAvroDeserializer = + new HoodieSpark3_3AvroDeserializer(rootAvroType, rootCatalystType) + + override def createExtendedSparkParser: Option[(SparkSession, ParserInterface) => ParserInterface] = { + Some( + (spark: SparkSession, delegate: ParserInterface) => new HoodieSpark3_3ExtendedSqlParser(spark, delegate) + ) + } + + override def createHoodieParquetFileFormat(appendPartitionValues: Boolean): Option[ParquetFileFormat] = { + Some(new Spark33HoodieParquetFileFormat(appendPartitionValues)) + } + + override def createHoodieFileScanRDD(sparkSession: SparkSession, + readFunction: PartitionedFile => Iterator[InternalRow], + filePartitions: Seq[FilePartition], + readDataSchema: StructType, + metadataColumns: Seq[AttributeReference] = Seq.empty): FileScanRDD = { + new Spark33HoodieFileScanRDD(sparkSession, readFunction, filePartitions, readDataSchema, metadataColumns) + } + + override def resolveDeleteFromTable(deleteFromTable: Command, + resolveExpression: Expression => Expression): DeleteFromTable = { + val deleteFromTableCommand = deleteFromTable.asInstanceOf[DeleteFromTable] + DeleteFromTable(deleteFromTableCommand.table, resolveExpression(deleteFromTableCommand.condition)) + } + + override def extractCondition(deleteFromTable: Command): Expression = { + deleteFromTable.asInstanceOf[DeleteFromTable].condition + } + + override def getQueryParserFromExtendedSqlParser(session: SparkSession, delegate: ParserInterface, + sqlText: String): LogicalPlan = { + new HoodieSpark3_3ExtendedSqlParser(session, delegate).parseQuery(sqlText) Review Comment: > Created those Jiras below to follow up on improving the code quality: > > * https://issues.apache.org/jira/browse/HUDI-4466 Re-use common code between Spark 3.2/3.3 > * https://issues.apache.org/jira/browse/HUDI-4467 Port borrowed code from Spark 3.3 > * https://issues.apache.org/jira/browse/HUDI-4468 Time travel logic simplification > * https://issues.apache.org/jira/browse/HUDI-4489 Break down HoodieAnalysis rules into Spark-specific components > * https://issues.apache.org/jira/browse/HUDI-4481 Refactor HoodieCommonSqlParser > @alexeykudinkin @XuQianJin-Stars @yihua Updated follow-up jiras -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: commits-unsubscr...@hudi.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org
