Skip to content

[HUDI-4161] Make sure partition values are taken from partition path #5699

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xushiyan merged 10 commits into from
May 27, 2022
Merged

[HUDI-4161] Make sure partition values are taken from partition path #5699

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
14d7399
Flip the config by default to fallback previous behavior of appending…
May 27, 2022
9c5b1b3
Fixed conditional incorrectly skipping parsing partition values
May 27, 2022
ebff831
Removing partition filters conversion for `TimestampBasedKeyGenerator`s;
May 27, 2022
9d076a9
Reset config to "true" by default, instead enabled partition values e…
May 27, 2022
b85426e
Reverting changes
May 27, 2022
55796fe
Added notes
May 27, 2022
a500ed8
Fixing tests
May 27, 2022
10ce9e5
Reverting changes
May 27, 2022
fa5feff
Make sure partition values are not extracted when Schema Evolution is…
May 27, 2022
49c0ebb
Typo
May 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/DataSourceOptions.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ object DataSourceReadOptions {

val EXTRACT_PARTITION_VALUES_FROM_PARTITION_PATH: ConfigProperty[Boolean] =
ConfigProperty.key("hoodie.datasource.read.extract.partition.values.from.path")
.defaultValue(false)
.defaultValue(true)
.sinceVersion("0.11.0")
.withDocumentation("When set to true, values for partition columns (partition values) will be extracted" +
" from physical partition path (default Spark behavior). When set to false partition values will be" +
Expand Down
8 changes: 4 additions & 4 deletions ...park-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieBaseRelation.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -399,7 +399,9 @@ abstract class HoodieBaseRelation(val sqlContext: SQLContext,
protected def getPartitionColumnsAsInternalRow(file: FileStatus): InternalRow = {
try {
val tableConfig = metaClient.getTableConfig
if (shouldExtractPartitionValuesFromPartitionPath) {
if (partitionColumns.isEmpty) {
Copy link
Contributor

@nsivabalan nsivabalan May 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are these required? I thought just flipping the config would suffice?

Copy link
Contributor Author

@alexeykudinkin alexeykudinkin May 27, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reverted

InternalRow.empty
} else {
val relativePath = new URI(metaClient.getBasePath).relativize(new URI(file.getPath.getParent.toString)).toString
val hiveStylePartitioningEnabled = tableConfig.getHiveStylePartitioningEnable.toBoolean
if (hiveStylePartitioningEnabled) {
Expand All @@ -414,12 +416,10 @@ abstract class HoodieBaseRelation(val sqlContext: SQLContext,
InternalRow.fromSeq(parts.map(UTF8String.fromString))
}
}
} else {
InternalRow.empty
}
} catch {
case NonFatal(e) =>
logWarning(s"Failed to get the right partition InternalRow for file : ${file.toString}")
logWarning(s"Failed to get the right partition InternalRow for file: ${file.toString}", e)
InternalRow.empty
}
}
Expand Down