Reverting changes

Alexey Kudinkin · Alexey Kudinkin · commit 10ce9e596c71 · 2022-05-26T20:29:46.000-07:00
diff --git a/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieBaseRelation.scala b/hudi-spark-datasource/hudi-spark-common/src/main/scala/org/apache/hudi/HoodieBaseRelation.scala
@@ -399,9 +399,7 @@ abstract class HoodieBaseRelation(val sqlContext: SQLContext,
   protected def getPartitionColumnsAsInternalRow(file: FileStatus): InternalRow = {
     try {
       val tableConfig = metaClient.getTableConfig
-      if (partitionColumns.isEmpty) {
-        InternalRow.empty
-      } else {
+      if (shouldExtractPartitionValuesFromPartitionPath) {
         val relativePath = new URI(metaClient.getBasePath).relativize(new URI(file.getPath.getParent.toString)).toString
         val hiveStylePartitioningEnabled = tableConfig.getHiveStylePartitioningEnable.toBoolean
         if (hiveStylePartitioningEnabled) {
@@ -416,6 +414,8 @@ abstract class HoodieBaseRelation(val sqlContext: SQLContext,
             InternalRow.fromSeq(parts.map(UTF8String.fromString))
           }
         }
+      } else {
+        InternalRow.empty
       }
     } catch {
       case NonFatal(e) =>

Original file line number	Diff line number	Diff line change
`@@ -399,9 +399,7 @@ abstract class HoodieBaseRelation(val sqlContext: SQLContext,`
`399`	`399`	`protected def getPartitionColumnsAsInternalRow(file: FileStatus): InternalRow = {`
`400`	`400`	`try {`
`401`	`401`	`val tableConfig = metaClient.getTableConfig`
`402`		`- if (partitionColumns.isEmpty) {`
`403`		`- InternalRow.empty`
`404`		`- } else {`
	`402`	`+ if (shouldExtractPartitionValuesFromPartitionPath) {`
`405`	`403`	`val relativePath = new URI(metaClient.getBasePath).relativize(new URI(file.getPath.getParent.toString)).toString`
`406`	`404`	`val hiveStylePartitioningEnabled = tableConfig.getHiveStylePartitioningEnable.toBoolean`
`407`	`405`	`if (hiveStylePartitioningEnabled) {`
`@@ -416,6 +414,8 @@ abstract class HoodieBaseRelation(val sqlContext: SQLContext,`
`416`	`414`	`InternalRow.fromSeq(parts.map(UTF8String.fromString))`
`417`	`415`	`}`
`418`	`416`	`}`
	`417`	`+ } else {`
	`418`	`+ InternalRow.empty`
`419`	`419`	`}`
`420`	`420`	`} catch {`
`421`	`421`	`case NonFatal(e) =>`