Don't delete Hive and Iceberg schema locations with nonempty subdirectories #10485
Conversation
This file contains 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
jirassimok
force-pushed
the
drop-schema-files-fixup
branch
3 times, most recently
from
6b62bca
to
15b8e81
Compare
losipiuk
approved these changes
Jan 10, 2022
| @@ -82,19 +82,20 @@ public void testDropSchemaFilesWithLocationWithExternalFile() | |||
| { | |||
| String schemaName = "schema_with_nonempty_location_" + randomTableSuffix(); | |||
| String schemaDir = warehouseDirectory + "/schema-with-nonempty-location/"; | |||
| // Use subdirectory to make sure file check is recursive | |||
| String subDir = schemaDir + "subdir/"; | |||
There was a problem hiding this comment.
Is there case with EMPTY subdirectory also covered (that it does not prevent schema from being deleted)?
There was a problem hiding this comment.
I've changed that behavior so empty directories won't be deleted, and I added a test for that as well.
jirassimok
force-pushed
the
drop-schema-files-fixup
branch
3 times, most recently
from
39e1966
to
11aea45
Compare
jirassimok
commented
Jan 10, 2022
Comment on lines
-59
to
+62
| String schemaName = "schema_with_empty_location_" + randomTableSuffix(); | ||
| String schemaDir = warehouseDirectory + "/schema-with-empty-location/"; | ||
| String schemaName = "schema_without_location_" + randomTableSuffix(); | ||
| String schemaDir = format("%s/%s.db/", warehouseDirectory, schemaName); | ||
|
|
||
| onTrino().executeQuery(format("CREATE SCHEMA %s WITH (location = '%s')", schemaName, schemaDir)); | ||
| onTrino().executeQuery(format("CREATE SCHEMA %s", schemaName)); |
There was a problem hiding this comment.
These lines aren't actually changed; I just switched the order of this test and the next after renaming them, and they're so similar that git didn't realize.
jirassimok
force-pushed
the
drop-schema-files-fixup
branch
from
11aea45
to
6cd0c32
Compare
losipiuk
reviewed
Jan 11, 2022
| hdfsClient.delete(schemaDir); | ||
| } | ||
|
|
||
| @Test // make sure empty directories are noticed as well |
There was a problem hiding this comment.
nit move the comment to method body.
losipiuk
approved these changes
Jan 11, 2022
|
@jirassimok |
Previously, files in subdirectories weren't considered when deciding whether to delete Hive and Iceberg schema locations when the schema was dropped.
jirassimok
force-pushed
the
drop-schema-files-fixup
branch
from
6cd0c32
to
0b7fea6
Compare
7 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This fixes an error in #10146 and #9767 that caused files in subdirectories to be ignored when determining whether to delete schema locations when dropping Hive and Iceberg schemas.
(Any empty subdirectories will still be deleted with the schema, though.)