Skip to content

[SPARK-46643][SQL][TESTS] Fix ORC tests to be independent from default compression #44648

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

Closed
dongjoon-hyun wants to merge 2 commits into from
Closed

[SPARK-46643][SQL][TESTS] Fix ORC tests to be independent from default compression #44648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9697cdb
[SPARK-46643][SQL][TESTS] Fix ORC tests to be independent from defaul…
dongjoon-hyun Jan 10, 2024
47532fb
Update comment
dongjoon-hyun Jan 10, 2024
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 sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcQuerySuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ abstract class OrcQueryTest extends OrcTest {
conf.setBoolean("hive.io.file.read.all.columns", false)

val orcRecordReader = {
val file = new File(path).listFiles().find(_.getName.endsWith(".snappy.orc")).head
Copy link
Member Author

@dongjoon-hyun dongjoon-hyun Jan 10, 2024

Choose a reason for hiding this comment

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

This test case should be independent from the default codec, snappy.

val file = new File(path).listFiles().find(_.getName.endsWith(".orc")).head
val split = new FileSplit(new Path(file.toURI), 0, file.length, Array.empty[String])
val attemptId = new TaskAttemptID(new TaskID(new JobID(), TaskType.MAP, 0), 0)
val hadoopAttemptContext = new TaskAttemptContextImpl(conf, attemptId)
Expand Down
5 changes: 3 additions & 2 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/orc/OrcSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,8 +332,9 @@ abstract class OrcSuite

test("SPARK-21839: Add SQL config for ORC compression") {
val conf = spark.sessionState.conf
// Test if the default of spark.sql.orc.compression.codec is snappy
assert(new OrcOptions(Map.empty[String, String], conf).compressionCodec == SNAPPY.name())
// Test if the default of spark.sql.orc.compression.codec is used.
assert(new OrcOptions(Map.empty[String, String], conf).compressionCodec ==
SQLConf.ORC_COMPRESSION.defaultValueString.toUpperCase(Locale.ROOT))

// OrcOptions's parameters have a higher priority than SQL configuration.
// `compression` -> `orc.compression` -> `spark.sql.orc.compression.codec`
Expand Down
10 changes: 0 additions & 10 deletions sql/hive/src/test/scala/org/apache/spark/sql/hive/orc/OrcHadoopFsRelationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,16 +107,6 @@ class OrcHadoopFsRelationSuite extends HadoopFsRelationTest {
checkAnswer(df, copyDf)
}
}

test("Default compression codec is snappy for ORC compression") {
withTempPath { file =>
spark.range(0, 10).write
.orc(file.getCanonicalPath)
val expectedCompressionKind =
OrcFileOperator.getFileReader(file.getCanonicalPath).get.getCompression
assert(OrcCompressionCodec.SNAPPY.name() === expectedCompressionKind.name())
}
}
}

class HiveOrcHadoopFsRelationSuite extends OrcHadoopFsRelationSuite {
Expand Down