Fix DefaultChannelId#asLongText NPE
#13971
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
jchrys
force-pushed
the
4.1-fix-dcid-npe
branch
from
6b2e2e7
to
c40a4aa
Compare
chrisvest
reviewed
Apr 12, 2024
| public void testDeserialization() throws Exception { | ||
| // deseiralize DefaultChannelId with 8 byte machineId | ||
| final ObjectInputStream in8 = new ObjectInputStream(new ByteArrayInputStream(EIGHT_BYTES_MACHINE_ID)); | ||
| final DefaultChannelId c8 = (DefaultChannelId) in8.readObject(); |
There was a problem hiding this comment.
I'd prefer to see a @VisibleForTesting package-private constructor where you can pass in either the values or a finished byte array. Keeping the binaries around is troublesome for maintenance and debugging.
There was a problem hiding this comment.
I agree, Let me implement it :D
There was a problem hiding this comment.
Done. Could you please take a look?
jchrys
force-pushed
the
4.1-fix-dcid-npe
branch
3 times, most recently
from
1b966c3
to
9c3590f
Compare
chrisvest
reviewed
Apr 13, 2024
| final int machineIdLen = len - nonMachineIdLen; | ||
| final int otherMachineIdLen = otherLen - nonMachineIdLen; | ||
| final int minMachineIdLen = Math.min(machineIdLen, otherMachineIdLen); | ||
| assert machineIdLen != otherMachineIdLen; |
There was a problem hiding this comment.
I think this is over-thinking it. As long as the sort order is consistent, it should be fine. No need to make it match the long-text sorting, IMO.
jchrys
force-pushed
the
4.1-fix-dcid-npe
branch
2 times, most recently
from
b2361c0
to
9d8d2ae
Compare
chrisvest
approved these changes
Apr 15, 2024
Motivation: The DefaultChannelId class is serializable, but it does not account for variations in the length of machineId. Modifications: Adjusted code to accommodate varying lengths of MachineId. Result: Fixed NPE. Respects varying length of machineId.
jchrys
force-pushed
the
4.1-fix-dcid-npe
branch
from
4c03f4f
to
0d36515
Compare
|
I've just changed to use |
normanmaurer
approved these changes
Apr 15, 2024
|
Sure! I will check |
dongjoon-hyun
pushed a commit
to apache/spark
that referenced
this pull request
Apr 18, 2024
### What changes were proposed in this pull request? The pr aims to upgrade `netty` from `4.1.108.Final` to `4.1.109.Final`. ### Why are the changes needed? https://netty.io/news/2024/04/15/4-1-109-Final.html This version has brought some bug fixes and improvements, such as: - Fix DefaultChannelId#asLongText NPE ([#13971](netty/netty#13971)) - Rewrite ZstdDecoder to remove the need of allocate a huge byte[] internally ([#13928](netty/netty#13928)) - Don't send a RST frame when closing the stream in a write future while processing inbound frames ([#13973](netty/netty#13973)) ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? Pass GA. ### Was this patch authored or co-authored using generative AI tooling? No. Closes #46112 from panbingkun/netty_for_spark4. Authored-by: panbingkun <panbingkun@baidu.com> Signed-off-by: Dongjoon Hyun <dhyun@apple.com>
FMX
pushed a commit
to apache/celeborn
that referenced
this pull request
Apr 22, 2024
### What changes were proposed in this pull request? Bump Netty from 4.1.107.Final to 4.1.109.Final. ### Why are the changes needed? Netty has released v4.1.108.Final, v4.1.109.Final, which release note refers to [4.1.108.Final](https://netty.io/news/2024/03/21/4-1-108-Final.html), [4.1.109.Final](https://netty.io/news/2024/04/15/4-1-109-Final.html). This version includes some bugfixes and improvements including: - 4.1.108.Final - Epoll: Correctly handle splice tasks when Channel is closed: netty/netty#13848 - 4.1.109.Final - Don't send a RST frame when closing the stream in a write future while processing inbound frames: netty/netty#13973 - Fix DefaultChannelId#asLongText NPE: netty/netty#13971 - Rewrite ZstdDecoder to remove the need of allocate a huge byte[] internally: netty/netty#13928 ### Does this PR introduce _any_ user-facing change? No. ### How was this patch tested? No. Closes #2474 from SteNicholas/CELEBORN-1396. Authored-by: SteNicholas <programgeek@163.com> Signed-off-by: mingji <fengmingxiao.fmx@alibaba-inc.com>
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.
Motivation:
The DefaultChannelId class is serializable, but it does not account for variations in the length of machineId.
Modifications:
Adjusted code to accommodate varying lengths of MachineId.
Result:
Fixed NPE.
Respects varying length of machineId.