Skip to content

[HUDI-5630] Fixing flaky parquet projection tests #7768

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
nsivabalan merged 2 commits into from
Jan 28, 2023
Merged

[HUDI-5630] Fixing flaky parquet projection tests #7768

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
57d0a40
Fixing flaky parquet projection tests
nsivabalan Jan 28, 2023
28b8b5d
minor fixes
nsivabalan Jan 28, 2023
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
17 changes: 8 additions & 9 deletions ...ce/hudi-spark/src/test/scala/org/apache/hudi/functional/TestParquetColumnProjection.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.hudi.functional

import org.apache.avro.Schema
import org.apache.calcite.runtime.SqlFunctions.abs
Copy link
Member

@codope codope Apr 3, 2023

Choose a reason for hiding this comment

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

Wouldn't Math.abs be sufficient?

import org.apache.hudi.HoodieBaseRelation.projectSchema
import org.apache.hudi.common.config.{HoodieMetadataConfig, HoodieStorageConfig}
import org.apache.hudi.common.model.{HoodieRecord, OverwriteNonDefaultsWithLatestAvroPayload}
Expand All @@ -31,8 +32,9 @@ import org.apache.parquet.hadoop.util.counters.BenchmarkCounter
import org.apache.spark.internal.Logging
import org.apache.spark.sql.catalyst.InternalRow
import org.apache.spark.sql.{Dataset, HoodieUnsafeUtils, Row, SaveMode}
import org.junit.jupiter.api.Assertions.{assertEquals, fail}
import org.junit.jupiter.api.Assertions.{assertEquals, assertTrue, fail}
import org.junit.jupiter.api.{Disabled, Tag, Test}

import scala.collection.JavaConverters._

@Tag("functional")
Expand Down Expand Up @@ -235,9 +237,9 @@ class TestParquetColumnProjection extends SparkClientFunctionalTestHarness with
else if (HoodieSparkUtils.isSpark2)
// TODO re-enable tests (these tests are very unstable currently)
Array(
("rider", -1),
("rider,driver", -1),
("rider,driver,tip_history", -1))
("rider", 14160),
("rider,driver", 14160),
("rider,driver,tip_history", 14160))
else
fail("Only Spark 3 and Spark 2 are currently supported")

Expand Down Expand Up @@ -326,11 +328,8 @@ class TestParquetColumnProjection extends SparkClientFunctionalTestHarness with
else targetRecordCount

assertEquals(expectedRecordCount, rows.length)
if (expectedBytesRead != -1) {
assertEquals(expectedBytesRead, bytesRead)
} else {
logWarning(s"Not matching bytes read ($bytesRead)")
}
// verify within 10% of margin.
assertTrue((abs(expectedBytesRead - bytesRead) / expectedBytesRead) < 0.1)

val readColumns = targetColumns ++ relation.mandatoryFields
val (_, projectedStructType, _) = projectSchema(Left(tableState.schema), readColumns)
Expand Down