You are viewing a plain text version of this content. The canonical link for it is here.
Posted to reviews@spark.apache.org by "tigrulya-exe (via GitHub)" <gi...@apache.org> on 2023/10/20 09:28:24 UTC
[PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
tigrulya-exe opened a new pull request, #43463:
URL: https://github.com/apache/spark/pull/43463
<!--
Thanks for sending a pull request! Here are some tips for you:
1. If this is your first time, please read our contributor guidelines: https://spark.apache.org/contributing.html
2. Ensure you have added or run the appropriate tests for your PR: https://spark.apache.org/developer-tools.html
3. If the PR is unfinished, add '[WIP]' in your PR title, e.g., '[WIP][SPARK-XXXX] Your PR title ...'.
4. Be sure to keep the PR description updated to reflect all changes.
5. Please write your PR title to summarize what this PR proposes.
6. If possible, provide a concise example to reproduce the issue for a faster review.
7. If you want to add a new configuration, please read the guideline first for naming configurations in
'core/src/main/scala/org/apache/spark/internal/config/ConfigEntry.scala'.
8. If you want to add or modify an error type or message, please read the guideline first in
'core/src/main/resources/error/README.md'.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If you fix some SQL features, you can provide some references of other DBMSes.
3. If there is design documentation, please add the link.
4. If there is a discussion in the mailing list, please add the link.
-->
In current version `DataSource#checkAndGlobPathIfNecessary` qualifies paths via `Path#makeQualified` and `PartitioningAwareFileIndex` qualifies via `FileSystem#makeQualified`. Most `FileSystem` implementations simply delegate to `Path#makeQualified`, but others, like `HarFileSystem` contain fs-specific logic, that can produce different result. Such inconsistencies can lead to a situation, when spark can't find partitions for the file source, because qualified paths, built by `Path` and `FileSystem` are different. Therefore, for uniformity, the `FileSystem` path qualification should be used in `DataSource#checkAndGlobPathIfNecessary`.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Allow users to read files from hadoop archives (.har) using DataFrameReader API
### Does this PR introduce _any_ user-facing change?
<!--
Note that it means *any* user-facing change including all aspects such as the documentation fix.
If yes, please clarify the previous behavior and the change this PR proposes - provide the console output, description and/or an example to show the behavior difference if possible.
If possible, please also clarify if this is a user-facing change compared to the released Spark versions or within the unreleased branches such as master.
If no, write 'No'.
-->
No
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
If benchmark tests were added, please run the benchmarks in GitHub Actions for the consistent environment, and the instructions could accord to: https://spark.apache.org/developer-tools.html#github-workflow-benchmarks.
-->
New tests were added in `DataSourceSuite` and `DataFrameReaderWriterSuite`
### Was this patch authored or co-authored using generative AI tooling?
<!--
If generative AI tooling has been used in the process of authoring this patch, please include the
phrase: 'Generated-by: ' followed by the name of the tool and its version.
If no, write 'No'.
Please refer to the [ASF Generative Tooling Guidance](https://www.apache.org/legal/generative-tooling.html) for details.
-->
No
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1900078190
@cloud-fan Hi! I've rebased on master and fixed conflicts. Could you please take a look?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1776753389
@beliefer I re-ran tests several times, but they failed either due to lack of resources or due to flaky ProtobufCatalystDataConversionSuite. I will rebase on #43493 after it will be merged
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1482569087
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -214,4 +216,6 @@ class MockFileSystem extends RawLocalFileSystem {
override def globStatus(pathPattern: Path): Array[FileStatus] = {
mockGlobResults.getOrElse(pathPattern, Array())
}
+
+ override def getUri: URI = URI.create("mockFs://mockFs/")
Review Comment:
Yes, if we don't override this method, then path check inside `fs.makeQualified(path)` will fail, because it expects path with `file://` scheme (`MockFileSystem` inherits `RawLocalFileSystem`)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1778611179
Please fix the conflicts.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1775070594
@tigrulya-exe Please re-trigger GA tests.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1481586528
##########
sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala:
##########
@@ -1363,4 +1363,19 @@ class DataFrameReaderWriterSuite extends QueryTest with SharedSparkSession with
}
}
}
+
+ test("SPARK-39910: read files from Hadoop archives") {
+ val fileSchema = new StructType().add("str", StringType)
+ val harPath = testFile("test-data/test-archive.har")
+ .replaceFirst("file:/", "har:/")
Review Comment:
Yes, the `HarFileSystem` support is included in the HDFS client by default. Ok, removed tests from `DataSourceSuite`, left only `MockFileSystem#getUri` method to correctly qualify paths with `mockFs://` scheme.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1934013053
thanks, merging to master/3.5!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1798443089
@cloud-fan Hi! Could you take a look please?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1829430527
@cloud-fan Hi! Could you take a look please?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1482325524
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -214,4 +216,6 @@ class MockFileSystem extends RawLocalFileSystem {
override def globStatus(pathPattern: Path): Array[FileStatus] = {
mockGlobResults.getOrElse(pathPattern, Array())
}
+
+ override def getUri: URI = URI.create("mockFs://mockFs/")
Review Comment:
is this change needed?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1366881061
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -197,11 +233,35 @@ object TestPaths {
)
)
+ val txtRelativeHarPath = new Path("/test.txt")
+ val csvRelativeHarPath = new Path("/test.csv")
+ val jsonRelativeHarPath = new Path("/test.json")
+ val parquetRelativeHarPath = new Path("/test.parquet")
+ val orcRelativeHarPath = new Path("/test.orc")
+ val globeRelativeHarPath = new Path("/test.*")
Review Comment:
They're needed to test globe path. I decided to reuse har from `DataFrameReaderWriterSuite` tests instead of creating new archive.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1479914443
##########
sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala:
##########
@@ -1363,4 +1363,19 @@ class DataFrameReaderWriterSuite extends QueryTest with SharedSparkSession with
}
}
}
+
+ test("SPARK-39910: read files from Hadoop archives") {
+ val fileSchema = new StructType().add("str", StringType)
+ val harPath = testFile("test-data/test-archive.har")
+ .replaceFirst("file:/", "har:/")
Review Comment:
So Spark works with `har:/` paths out of the box? BTW, I think this test is good enough, we don't need to add more tests in `DataSourceSuite`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1929611462
@cloud-fan we construct absolute file paths with `har://` scheme in the [DataSourceSuite#buildFullHarPaths](https://github.com/apache/spark/blob/a005f6526eaf212cb5b60b500006d67375103709/sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala#L252) method and then check that they're correctly qualified. Then we [test](https://github.com/apache/spark/blob/a005f6526eaf212cb5b60b500006d67375103709/sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala#L1367) reading files inside har archive by their absolute paths.
We don't need to create or test `HarFileSystem` itself, it is extracted from path in the [DataSource#checkAndGlobPathIfNecessary](https://github.com/apache/spark/blob/a005f6526eaf212cb5b60b500006d67375103709/sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/DataSource.scala#L762) method.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan closed pull request #43463: [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing
URL: https://github.com/apache/spark/pull/43463
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1482326766
##########
sql/core/src/test/resources/test-data/test-archive.har/_index:
##########
@@ -0,0 +1,7 @@
+%2F dir 1697722622766+493+tigrulya+hadoop 0 0 test.txt test.orc test.parquet test.json test.csv
Review Comment:
can we clean up the test files a bit? We only test csv now.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1921563767
The fix is straightforward but the test is convoluted. How do you test `HarFileSystem`? I can't find any code setting the file system, but only the directory name contains `har`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "beliefer (via GitHub)" <gi...@apache.org>.
beliefer commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1366851439
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -25,6 +27,7 @@ import org.apache.spark.sql.AnalysisException
import org.apache.spark.sql.test.SharedSparkSession
class DataSourceSuite extends SharedSparkSession with PrivateMethodTester {
+
Review Comment:
Please restore this line.
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -156,6 +159,39 @@ class DataSourceSuite extends SharedSparkSession with PrivateMethodTester {
val expectMessage = "No FileSystem for scheme nonexistentFs"
assert(message.filterNot(Set(':', '"').contains) == expectMessage)
}
+
+ test("SPARK-39910: test Hadoop archive non glob paths") {
+ val absoluteHarPaths = buildFullHarPaths(allRelativeHarPaths)
+
+ val resultPaths = DataSource.checkAndGlobPathIfNecessary(
+ absoluteHarPaths.map(_.toString),
+ hadoopConf,
+ checkEmptyGlobPath = true,
+ checkFilesExist = true,
+ enableGlobbing = true
+ )
+
+ assert(
+ resultPaths.toSet === absoluteHarPaths.toSet
+ )
Review Comment:
```suggestion
assert(resultPaths.toSet === absoluteHarPaths.toSet)
```
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -156,6 +159,39 @@ class DataSourceSuite extends SharedSparkSession with PrivateMethodTester {
val expectMessage = "No FileSystem for scheme nonexistentFs"
assert(message.filterNot(Set(':', '"').contains) == expectMessage)
}
+
+ test("SPARK-39910: test Hadoop archive non glob paths") {
+ val absoluteHarPaths = buildFullHarPaths(allRelativeHarPaths)
+
+ val resultPaths = DataSource.checkAndGlobPathIfNecessary(
+ absoluteHarPaths.map(_.toString),
+ hadoopConf,
+ checkEmptyGlobPath = true,
+ checkFilesExist = true,
+ enableGlobbing = true
+ )
+
+ assert(
+ resultPaths.toSet === absoluteHarPaths.toSet
+ )
+ }
+
+ test("SPARK-39910: test Hadoop archive glob paths") {
+ val harGlobePaths = buildFullHarPaths(Seq(globeRelativeHarPath))
+
+ val resultPaths = DataSource.checkAndGlobPathIfNecessary(
+ harGlobePaths.map(_.toString),
+ hadoopConf,
+ checkEmptyGlobPath = true,
+ checkFilesExist = true,
+ enableGlobbing = true
+ )
+
+ val expectedHarPaths = buildFullHarPaths(allRelativeHarPaths)
+ assert(
+ resultPaths.toSet === expectedHarPaths.toSet
+ )
Review Comment:
ditto.
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -197,11 +233,35 @@ object TestPaths {
)
)
+ val txtRelativeHarPath = new Path("/test.txt")
+ val csvRelativeHarPath = new Path("/test.csv")
+ val jsonRelativeHarPath = new Path("/test.json")
+ val parquetRelativeHarPath = new Path("/test.parquet")
+ val orcRelativeHarPath = new Path("/test.orc")
+ val globeRelativeHarPath = new Path("/test.*")
Review Comment:
Do we really need to test all the file format?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1366881061
##########
sql/core/src/test/scala/org/apache/spark/sql/execution/datasources/DataSourceSuite.scala:
##########
@@ -197,11 +233,35 @@ object TestPaths {
)
)
+ val txtRelativeHarPath = new Path("/test.txt")
+ val csvRelativeHarPath = new Path("/test.csv")
+ val jsonRelativeHarPath = new Path("/test.json")
+ val parquetRelativeHarPath = new Path("/test.parquet")
+ val orcRelativeHarPath = new Path("/test.orc")
+ val globeRelativeHarPath = new Path("/test.*")
Review Comment:
They're needed to test glob path. I decided to reuse har from `DataFrameReaderWriterSuite` tests instead of creating new archive.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on PR #43463:
URL: https://github.com/apache/spark/pull/43463#issuecomment-1784591198
@beliefer Hi! I fixed the conflicts and rebased on master
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "cloud-fan (via GitHub)" <gi...@apache.org>.
cloud-fan commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1479915986
##########
sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala:
##########
@@ -1363,4 +1363,19 @@ class DataFrameReaderWriterSuite extends QueryTest with SharedSparkSession with
}
}
}
+
+ test("SPARK-39910: read files from Hadoop archives") {
+ val fileSchema = new StructType().add("str", StringType)
+ val harPath = testFile("test-data/test-archive.har")
+ .replaceFirst("file:/", "har:/")
+
+ testRead(spark.read.textFile(s"$harPath/test.txt").toDF(), data, textSchema)
Review Comment:
Since we only want to test path globbing, I think testing one file format is sufficient.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org
Re: [PR] [SPARK-39910][SQL] Delegate path qualification to filesystem during DataSource file path globbing [spark]
Posted by "tigrulya-exe (via GitHub)" <gi...@apache.org>.
tigrulya-exe commented on code in PR #43463:
URL: https://github.com/apache/spark/pull/43463#discussion_r1481571956
##########
sql/core/src/test/scala/org/apache/spark/sql/test/DataFrameReaderWriterSuite.scala:
##########
@@ -1363,4 +1363,19 @@ class DataFrameReaderWriterSuite extends QueryTest with SharedSparkSession with
}
}
}
+
+ test("SPARK-39910: read files from Hadoop archives") {
+ val fileSchema = new StructType().add("str", StringType)
+ val harPath = testFile("test-data/test-archive.har")
+ .replaceFirst("file:/", "har:/")
+
+ testRead(spark.read.textFile(s"$harPath/test.txt").toDF(), data, textSchema)
Review Comment:
Ok, removed file formats other than csv
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscribe@spark.apache.org
For additional commands, e-mail: reviews-help@spark.apache.org