-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Propagate selected compression codec to Avro file writer #12639
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
3 commits
Select commit
Hold shift + click to select a range
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
28 changes: 28 additions & 0 deletions
28
...rino-delta-lake/src/test/java/io/trino/plugin/deltalake/DeltaTestingConnectorSession.java
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 |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.plugin.deltalake; | ||
|
|
||
| import io.trino.plugin.hive.parquet.ParquetReaderConfig; | ||
| import io.trino.plugin.hive.parquet.ParquetWriterConfig; | ||
| import io.trino.spi.connector.ConnectorSession; | ||
| import io.trino.testing.TestingConnectorSession; | ||
|
|
||
| public final class DeltaTestingConnectorSession | ||
| { | ||
| public static final ConnectorSession SESSION = TestingConnectorSession.builder() | ||
| .setPropertyMetadata(new DeltaLakeSessionProperties(new DeltaLakeConfig(), new ParquetReaderConfig(), new ParquetWriterConfig()).getSessionProperties()) | ||
| .build(); | ||
|
|
||
| private DeltaTestingConnectorSession() {} | ||
| } |
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
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
82 changes: 82 additions & 0 deletions
82
plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionCodecs.java
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 |
|---|---|---|
| @@ -0,0 +1,82 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.plugin.hive; | ||
|
|
||
| import io.trino.plugin.hive.metastore.StorageFormat; | ||
| import io.trino.spi.TrinoException; | ||
| import io.trino.spi.connector.ConnectorSession; | ||
|
|
||
losipiuk marked this conversation as resolved.
Outdated
Show resolved
Hide resolved
|
||
| public final class HiveCompressionCodecs | ||
| { | ||
| private HiveCompressionCodecs() {} | ||
|
|
||
| public static HiveCompressionCodec selectCompressionCodec(ConnectorSession session, StorageFormat storageFormat) | ||
| { | ||
| HiveCompressionOption compressionOption = HiveSessionProperties.getCompressionCodec(session); | ||
| return HiveStorageFormat.getHiveStorageFormat(storageFormat) | ||
| .map(format -> selectCompressionCodec(compressionOption, format)) | ||
| .orElse(selectCompressionCodecForUnknownStorageFormat(compressionOption)); | ||
| } | ||
|
|
||
| public static HiveCompressionCodec selectCompressionCodec(ConnectorSession session, HiveStorageFormat storageFormat) | ||
| { | ||
| return selectCompressionCodec(HiveSessionProperties.getCompressionCodec(session), storageFormat); | ||
| } | ||
|
|
||
| public static HiveCompressionCodec selectCompressionCodec(HiveCompressionOption compressionOption, HiveStorageFormat storageFormat) | ||
| { | ||
| HiveCompressionCodec selectedCodec = selectCompressionCodec(compressionOption); | ||
|
|
||
| // perform codec vs format validation | ||
| if (storageFormat == HiveStorageFormat.AVRO && selectedCodec.getAvroCompressionCodec().isEmpty()) { | ||
| throw new TrinoException(HiveErrorCode.HIVE_UNSUPPORTED_FORMAT, "Compression codec " + selectedCodec + " not supported for " + storageFormat); | ||
| } | ||
|
|
||
| return selectedCodec; | ||
| } | ||
|
|
||
| private static HiveCompressionCodec selectCompressionCodec(HiveCompressionOption compressionOption) | ||
| { | ||
| switch (compressionOption) { | ||
| case NONE: | ||
| return HiveCompressionCodec.NONE; | ||
| case SNAPPY: | ||
| return HiveCompressionCodec.SNAPPY; | ||
| case LZ4: | ||
| return HiveCompressionCodec.LZ4; | ||
| case ZSTD: | ||
| return HiveCompressionCodec.ZSTD; | ||
| case GZIP: | ||
| return HiveCompressionCodec.GZIP; | ||
| } | ||
| throw new IllegalArgumentException("Unknown compressionOption " + compressionOption); | ||
| } | ||
|
|
||
| private static HiveCompressionCodec selectCompressionCodecForUnknownStorageFormat(HiveCompressionOption compressionOption) | ||
| { | ||
| switch (compressionOption) { | ||
| case NONE: | ||
| return HiveCompressionCodec.NONE; | ||
| case SNAPPY: | ||
| return HiveCompressionCodec.SNAPPY; | ||
| case LZ4: | ||
| return HiveCompressionCodec.LZ4; | ||
| case ZSTD: | ||
| return HiveCompressionCodec.ZSTD; | ||
| case GZIP: | ||
| return HiveCompressionCodec.GZIP; | ||
| } | ||
| throw new IllegalArgumentException("Unknown compressionOption " + compressionOption); | ||
| } | ||
| } | ||
24 changes: 24 additions & 0 deletions
24
plugin/trino-hive/src/main/java/io/trino/plugin/hive/HiveCompressionOption.java
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 |
|---|---|---|
| @@ -0,0 +1,24 @@ | ||
| /* | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package io.trino.plugin.hive; | ||
|
|
||
| public enum HiveCompressionOption | ||
| { | ||
| NONE, | ||
| SNAPPY, | ||
| LZ4, | ||
| ZSTD, | ||
| GZIP, | ||
| /**/; | ||
| } |
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
Oops, something went wrong.
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.