-
Notifications
You must be signed in to change notification settings - Fork 13.4k
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
[FLINK-27805][Connectors/ORC] bump orc version to 1.7.5 #19844
Closed
Closed
Changes from 1 commit
Commits
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 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 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
65 changes: 0 additions & 65 deletions
65
...orc-nohive/src/main/java/org/apache/flink/orc/nohive/writer/NoHivePhysicalWriterImpl.java
This file was deleted.
Oops, something went wrong.
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
134 changes: 134 additions & 0 deletions
134
flink-formats/flink-orc/src/main/java/org/apache/flink/orc/writer/EncryptionProvider.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.flink.orc.writer; | ||
|
|
||
| import org.apache.hadoop.conf.Configuration; | ||
| import org.apache.orc.OrcFile; | ||
| import org.apache.orc.TypeDescription; | ||
| import org.apache.orc.impl.CryptoUtils; | ||
| import org.apache.orc.impl.HadoopShims; | ||
| import org.apache.orc.impl.KeyProvider; | ||
| import org.apache.orc.impl.writer.WriterEncryptionKey; | ||
| import org.apache.orc.impl.writer.WriterEncryptionVariant; | ||
|
|
||
| import java.io.IOException; | ||
| import java.security.SecureRandom; | ||
| import java.util.List; | ||
| import java.util.Map; | ||
| import java.util.SortedMap; | ||
| import java.util.TreeMap; | ||
|
|
||
| /** | ||
| * Copy encryption variants generation code from org.apache.orc:orc-core:1.7.2 {@link | ||
| * org.apache.orc.impl.WriterImpl}. It's used to get encryption variants which are same as {@link | ||
| * org.apache.orc.impl.WriterImpl} generated. | ||
| * | ||
| * <p>NOTE: This class will be removed after ORC-1200 is merged. | ||
| */ | ||
| public class EncryptionProvider { | ||
|
|
||
| private final SortedMap<String, WriterEncryptionKey> keys = new TreeMap<>(); | ||
|
|
||
| private WriterEncryptionVariant[] encryptionVariants; | ||
|
|
||
| public EncryptionProvider(OrcFile.WriterOptions opts) throws IOException { | ||
| TypeDescription schema = opts.getSchema(); | ||
| schema.annotateEncryption(opts.getEncryption(), opts.getMasks()); | ||
| this.encryptionVariants = | ||
| setupEncryption(opts.getKeyProvider(), schema, opts.getKeyOverrides()); | ||
| } | ||
|
|
||
| /** | ||
| * Iterate through the encryption options given by the user and set up our data structures. | ||
| * | ||
| * @param provider the KeyProvider to use to generate keys | ||
| * @param schema the type tree that we search for annotations | ||
| * @param keyOverrides user specified key overrides | ||
| */ | ||
| private WriterEncryptionVariant[] setupEncryption( | ||
| KeyProvider provider, | ||
| TypeDescription schema, | ||
| Map<String, HadoopShims.KeyMetadata> keyOverrides) | ||
| throws IOException { | ||
| KeyProvider keyProvider = | ||
| provider != null | ||
| ? provider | ||
| : CryptoUtils.getKeyProvider(new Configuration(), new SecureRandom()); | ||
| // Load the overrides into the cache so that we use the required key versions. | ||
| for (HadoopShims.KeyMetadata key : keyOverrides.values()) { | ||
| keys.put(key.getKeyName(), new WriterEncryptionKey(key)); | ||
| } | ||
| int variantCount = visitTypeTree(schema, false, keyProvider); | ||
|
|
||
| // Now that we have de-duped the keys and maskDescriptions, make the arrays | ||
| int nextId = 0; | ||
| int nextVariantId = 0; | ||
| WriterEncryptionVariant[] result = new WriterEncryptionVariant[variantCount]; | ||
| for (WriterEncryptionKey key : keys.values()) { | ||
| key.setId(nextId++); | ||
| key.sortRoots(); | ||
| for (WriterEncryptionVariant variant : key.getEncryptionRoots()) { | ||
| result[nextVariantId] = variant; | ||
| variant.setId(nextVariantId++); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| private int visitTypeTree(TypeDescription schema, boolean encrypted, KeyProvider provider) | ||
| throws IOException { | ||
| int result = 0; | ||
| String keyName = schema.getAttributeValue(TypeDescription.ENCRYPT_ATTRIBUTE); | ||
| if (keyName != null) { | ||
| if (provider == null) { | ||
| throw new IllegalArgumentException("Encryption requires a KeyProvider."); | ||
| } | ||
| if (encrypted) { | ||
| throw new IllegalArgumentException("Nested encryption type: " + schema); | ||
| } | ||
| encrypted = true; | ||
| result += 1; | ||
| WriterEncryptionKey key = getKey(keyName, provider); | ||
| HadoopShims.KeyMetadata metadata = key.getMetadata(); | ||
| WriterEncryptionVariant variant = | ||
| new WriterEncryptionVariant(key, schema, provider.createLocalKey(metadata)); | ||
| key.addRoot(variant); | ||
| } | ||
| List<TypeDescription> children = schema.getChildren(); | ||
| if (children != null) { | ||
| for (TypeDescription child : children) { | ||
| result += visitTypeTree(child, encrypted, provider); | ||
| } | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| private WriterEncryptionKey getKey(String keyName, KeyProvider provider) throws IOException { | ||
| WriterEncryptionKey result = keys.get(keyName); | ||
| if (result == null) { | ||
| result = new WriterEncryptionKey(provider.getCurrentKeyVersion(keyName)); | ||
| keys.put(keyName, result); | ||
| } | ||
| return result; | ||
| } | ||
|
|
||
| public WriterEncryptionVariant[] getEncryptionVariants() { | ||
| return encryptionVariants; | ||
| } | ||
| } |
43 changes: 43 additions & 0 deletions
43
flink-formats/flink-orc/src/main/java/org/apache/flink/orc/writer/HadoopNoCloseStream.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one | ||
| * or more contributor license agreements. See the NOTICE file | ||
| * distributed with this work for additional information | ||
| * regarding copyright ownership. The ASF licenses this file | ||
| * to you 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 org.apache.flink.orc.writer; | ||
|
|
||
| import org.apache.hadoop.fs.FSDataOutputStream; | ||
| import org.apache.hadoop.fs.FileSystem; | ||
|
|
||
| import java.io.IOException; | ||
| import java.io.OutputStream; | ||
|
|
||
| /** | ||
| * This class is designed to not close the underlying flink stream to avoid exceptions when | ||
| * checkpointing. | ||
| */ | ||
| public class HadoopNoCloseStream extends FSDataOutputStream { | ||
|
|
||
| public HadoopNoCloseStream(OutputStream out, FileSystem.Statistics stats) throws IOException { | ||
| super(out, stats); | ||
| } | ||
|
|
||
| @Override | ||
| public void close() throws IOException { | ||
| // Don't close the internal stream here to avoid | ||
| // Stream Closed or ClosedChannelException when Flink performs checkpoint. | ||
| // noop | ||
| } | ||
| } | ||
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks a bit scary, @gyfora?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@liujiawinds could you please clarify why we need the
HadoopNoCloseStreamhere?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@morhidi Because
BulkWriterneeds to rely on a flinkFSDataOutputStream, and ORC writer uses hadoopFSDataOutputStream. So I wrapped flinkFSDataOutputStream.Additionally, BulkWriter closes the underlying ORC writer stream at checkpoint, which will cause flink to throw a
ClosedChannelExceptionif the close action is passed to flinkFSDataOutputStream.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
qq: Is this covered in a test case somewhere?