-
Notifications
You must be signed in to change notification settings - Fork 4k
GH-35033: [Java] [Datasets] Add support for multi-file datasets from Java #35034
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.
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
Merged
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
d48991e
Add support for multi-file datasets from Java
noahfrn f006299
Better error message for unrecognized URI + test
noahfrn f2dcdf8
Handle empty URI array
noahfrn 3e71957
Fix lint
noahfrn 34c68a9
Merge remote-tracking branch 'origin' into multifile-datasets-java
noahfrn 8b7ffdb
Additional test, and clean up implementation
noahfrn 920be7e
Merge branch 'main' into multifile-datasets-java
noahfrn File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -101,6 +101,49 @@ public void testBaseParquetRead() throws Exception { | |
| AutoCloseables.close(factory); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultipleParquetReadFromUris() throws Exception { | ||
| ParquetWriteSupport writeSupport1 = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), | ||
| 1, "a"); | ||
| ParquetWriteSupport writeSupport2 = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), | ||
| 2, "b"); | ||
| String expectedJsonUnordered = "[[1,\"a\"],[2,\"b\"]]"; | ||
|
|
||
| ScanOptions options = new ScanOptions(1); | ||
| FileSystemDatasetFactory factory = new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(), | ||
| FileFormat.PARQUET, new String[]{writeSupport1.getOutputURI(), writeSupport2.getOutputURI()}); | ||
| Schema schema = inferResultSchemaFromFactory(factory, options); | ||
| List<ArrowRecordBatch> datum = collectResultFromFactory(factory, options); | ||
|
|
||
| assertScanBatchesProduced(factory, options); | ||
| assertEquals(2, datum.size()); | ||
| datum.forEach(batch -> assertEquals(1, batch.getLength())); | ||
| checkParquetReadResult(schema, expectedJsonUnordered, datum); | ||
|
|
||
| AutoCloseables.close(datum); | ||
| AutoCloseables.close(factory); | ||
| } | ||
|
|
||
|
|
||
| @Test | ||
| public void testMultipleParquetInvalidUri() throws Exception { | ||
| RuntimeException exc = assertThrows(RuntimeException.class, | ||
| () -> new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(), | ||
| FileFormat.PARQUET, new String[]{"https://example.com", "file:///test/location"})); | ||
| Assertions.assertEquals("Unrecognized filesystem type in URI: https://example.com", exc.getMessage()); | ||
| } | ||
|
|
||
| @Test | ||
| public void testMultipleParquetMultipleFilesystemTypes() throws Exception { | ||
| RuntimeException exc = assertThrows(RuntimeException.class, | ||
| () -> new FileSystemDatasetFactory(rootAllocator(), NativeMemoryPool.getDefault(), | ||
| FileFormat.PARQUET, new String[]{"file:///test/location", "s3:///test/bucket/file" })); | ||
| Assertions.assertTrue( | ||
| exc.getMessage().startsWith("The filesystem expected a URI with one of the schemes (file) but received s3" | ||
| ) | ||
| ); | ||
| } | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could be possible to add testing for exception throws: (1) Invalid URI , (2) ensure that they all share a FileSystem type |
||
|
|
||
| @Test | ||
| public void testParquetProjectSingleColumn() throws Exception { | ||
| ParquetWriteSupport writeSupport = ParquetWriteSupport.writeTempFile(AVRO_SCHEMA_USER, TMP.newFolder(), 1, "a"); | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.