ORC-978: Fix NPE in TestFlinkOrcReaderWriter #891
Merged
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
added 2 commits
September 2, 2021 00:05
|
Thank you so much for working on this, @guiyanakuang . cc @pgaref , @wgtmac , @williamhyun , @omalley |
| @@ -118,4 +118,12 @@ public void testStripes() throws Exception { | |||
| Reader r = OrcFile.createReader(testFilePath, OrcFile.readerOptions(conf)); | |||
| assertEquals(r.getStripes(), w.getStripes()); | |||
| } | |||
|
|
|||
| @Test | |||
| public void testCloseIsIdempotent() throws IOException { | |||
There was a problem hiding this comment.
Thank you for adding a test case for this.
dongjoon-hyun
approved these changes
Sep 2, 2021
dongjoon-hyun
pushed a commit
that referenced
this pull request
Sep 2, 2021
### What changes were proposed in this pull request? This PR aims to fix NPE in TestFlinkOrcReaderWriter. ```java @OverRide public void close() throws IOException { if (!isClosed) { try { if (batch.size > 0) { writer.addRowBatch(batch); batch.reset(); } } finally { writer.close(); this.isClosed = true; } } } ``` writer.addRowBatch(batch); ```java ....... checkMemory(); } catch (Throwable t) { try { close(); } catch (Throwable ignore) { // ignore } if (t instanceof IOException) { throw (IOException) t; } else { throw new IOException("Problem adding row to " + path, t); } } ``` addRowBatch method throws java.lang.OutOfMemoryError causing writerImpl to close twice in TestFlinkOrcReaderWriter case. The first close already set the rawWriter to null, so the second time throw a NullPointerException. I added status variables to ensure that close will only do the necessary action the first time. ### Why are the changes needed? Fix NPE in TestFlinkOrcReaderWriter. ### How was this patch tested? Add UT for this bug. (cherry picked from commit 8a4e24a) Signed-off-by: Dongjoon Hyun <dongjoon@apache.org>
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.
What changes were proposed in this pull request?
This PR aims to fix NPE in TestFlinkOrcReaderWriter.
writer.addRowBatch(batch);
....... checkMemory(); } catch (Throwable t) { try { close(); } catch (Throwable ignore) { // ignore } if (t instanceof IOException) { throw (IOException) t; } else { throw new IOException("Problem adding row to " + path, t); } }addRowBatch method throws java.lang.OutOfMemoryError causing writerImpl to close twice in TestFlinkOrcReaderWriter case.
The first close already set the rawWriter to null, so the second time throw a NullPointerException.
I added status variables to ensure that close will only do the necessary action the first time.
Why are the changes needed?
Fix NPE in TestFlinkOrcReaderWriter.
How was this patch tested?
Add UT for this bug.