-
Notifications
You must be signed in to change notification settings - Fork 28.2k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[SPARK-27049][SQL] Create util class to support handling partition va…
…lues in file source V2 ## What changes were proposed in this pull request? While I am migrating other data sources, I find that we should abstract the logic that: 1. converting safe `InternalRow`s into `UnsafeRow`s 2. appending partition values to the end of the result row if existed This PR proposes to support handling partition values in file source v2 abstraction by adding a util class `PartitionReaderWithPartitionValues`. ## How was this patch tested? Existing unit tests Closes #23987 from gengliangwang/SPARK-27049. Authored-by: Gengliang Wang <[email protected]> Signed-off-by: Wenchen Fan <[email protected]>
- Loading branch information
1 parent
340c8b8
commit a543f91
Showing
4 changed files
with
77 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
53 changes: 53 additions & 0 deletions
53
...la/org/apache/spark/sql/execution/datasources/v2/PartitionReaderWithPartitionValues.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,53 @@ | ||
/* | ||
* 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.execution.datasources.v2 | ||
|
||
import org.apache.spark.sql.catalyst.InternalRow | ||
import org.apache.spark.sql.catalyst.expressions.JoinedRow | ||
import org.apache.spark.sql.catalyst.expressions.codegen.GenerateUnsafeProjection | ||
import org.apache.spark.sql.sources.v2.reader.PartitionReader | ||
import org.apache.spark.sql.types.StructType | ||
|
||
/** | ||
* A wrapper reader that always appends partition values to [[InternalRow]]s produced by the input | ||
* reader [[fileReader]]. | ||
*/ | ||
class PartitionReaderWithPartitionValues( | ||
fileReader: PartitionReader[InternalRow], | ||
readDataSchema: StructType, | ||
partitionSchema: StructType, | ||
partitionValues: InternalRow) extends PartitionReader[InternalRow] { | ||
private val fullSchema = readDataSchema.toAttributes ++ partitionSchema.toAttributes | ||
private val unsafeProjection = GenerateUnsafeProjection.generate(fullSchema, fullSchema) | ||
// Note that we have to apply the converter even though `file.partitionValues` is empty. | ||
// This is because the converter is also responsible for converting safe `InternalRow`s into | ||
// `UnsafeRow`s | ||
private val rowConverter = { | ||
if (partitionSchema.isEmpty) { | ||
() => unsafeProjection(fileReader.get())} | ||
else { | ||
val joinedRow = new JoinedRow() | ||
() => unsafeProjection(joinedRow(fileReader.get(), partitionValues)) | ||
} | ||
} | ||
|
||
override def next(): Boolean = fileReader.next() | ||
|
||
override def get(): InternalRow = rowConverter() | ||
|
||
override def close(): Unit = fileReader.close() | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters