You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@orc.apache.org by GitBox <gi...@apache.org> on 2021/08/23 00:55:41 UTC
[GitHub] [orc] stiga-huang opened a new pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
stiga-huang opened a new pull request #877:
URL: https://github.com/apache/orc/pull/877
<!--
Thanks for sending a pull request! Here are some tips for you:
1. File a JIRA issue first and use it as a prefix of your PR title, e.g., `ORC-001: Fix ABC`.
2. Use your PR title to summarize what this PR proposes instead of describing the problem.
3. Make PR title and description complete because these will be the permanent commit log.
4. If possible, provide a concise and reproducible example to reproduce the issue for a faster review.
5. If the PR is unfinished, use GitHub PR Draft feature.
-->
### What changes were proposed in this pull request?
<!--
Please clarify what changes you are proposing. The purpose of this section is to outline the changes and how this PR fixes the issue.
If possible, please consider writing useful notes for better and faster reviews in your PR. See the examples below.
1. If you refactor some codes with changing classes, showing the class hierarchy will help reviewers.
2. If there is a discussion in the mailing list, please add the link.
-->
This patch fixes a crash in the C++ reader when SearchArgument is created on nested columns of collection types (e.g. array/map). Only STRUCT type has field names for subtypes. So we should check the current node type before checking any field names. JIRA description contains details on how to reproduce the crash.
### Why are the changes needed?
<!--
Please clarify why the changes are needed. For instance,
1. If you propose a new API, clarify the use case for a new API.
2. If you fix a bug, you can clarify why it is a bug.
-->
Same as the above.
### How was this patch tested?
<!--
If tests were added, say they were added here. Please make sure to add some test cases that check the changes thoroughly including negative and positive cases if possible.
If it was tested in a way different from regular unit tests, please clarify how you tested step by step, ideally copy and paste-able, so that other reviewers can test and check, and descendants can verify in the future.
If tests were not added, please describe why they were not added and/or why it was difficult to add.
-->
Added unit tests in c++/test/TestSargsApplier.cc to reproduce the crash and verify the fix on ARRAY and MAP types.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun commented on a change in pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #877:
URL: https://github.com/apache/orc/pull/877#discussion_r693626263
##########
File path: c++/src/sargs/SargsApplier.cc
##########
@@ -25,7 +25,8 @@ namespace orc {
uint64_t SargsApplier::findColumn(const Type& type,
const std::string& colName) {
for (uint64_t i = 0; i != type.getSubtypeCount(); ++i) {
- if (type.getFieldName(i) == colName) {
+ // Only STRUCT type has field names
+ if (type.getKind() == STRUCT && type.getFieldName(i) == colName) {
Review comment:
Great. Thank you for the confirmation.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] stiga-huang commented on a change in pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
stiga-huang commented on a change in pull request #877:
URL: https://github.com/apache/orc/pull/877#discussion_r693612641
##########
File path: c++/src/sargs/SargsApplier.cc
##########
@@ -25,7 +25,8 @@ namespace orc {
uint64_t SargsApplier::findColumn(const Type& type,
const std::string& colName) {
for (uint64_t i = 0; i != type.getSubtypeCount(); ++i) {
- if (type.getFieldName(i) == colName) {
+ // Only STRUCT type has field names
+ if (type.getKind() == STRUCT && type.getFieldName(i) == colName) {
Review comment:
No, predicate push down in the C++ reader is supported since 1.7.0. ORC-1.6.x doesn't have these codes.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun commented on a change in pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on a change in pull request #877:
URL: https://github.com/apache/orc/pull/877#discussion_r693593710
##########
File path: c++/src/sargs/SargsApplier.cc
##########
@@ -25,7 +25,8 @@ namespace orc {
uint64_t SargsApplier::findColumn(const Type& type,
const std::string& colName) {
for (uint64_t i = 0; i != type.getSubtypeCount(); ++i) {
- if (type.getFieldName(i) == colName) {
+ // Only STRUCT type has field names
+ if (type.getKind() == STRUCT && type.getFieldName(i) == colName) {
Review comment:
The directly previous code seems to be ORC-40 at 1.7.0.
Does 1.6.x has the same issue, @stiga-huang ?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun commented on pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on pull request #877:
URL: https://github.com/apache/orc/pull/877#issuecomment-903454359
Merged to main/1.7. Thank you, @stiga-huang .
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] wgtmac edited a comment on pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
wgtmac edited a comment on pull request #877:
URL: https://github.com/apache/orc/pull/877#issuecomment-903473058
Thanks @stiga-huang for a quick fix and @dongjoon-hyun for the review!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun commented on pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun commented on pull request #877:
URL: https://github.com/apache/orc/pull/877#issuecomment-903369375
cc @wgtmac and @pgaref
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] dongjoon-hyun merged pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
dongjoon-hyun merged pull request #877:
URL: https://github.com/apache/orc/pull/877
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] stiga-huang commented on pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
stiga-huang commented on pull request #877:
URL: https://github.com/apache/orc/pull/877#issuecomment-903476166
Thank @dongjoon-hyun for the quick review!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
[GitHub] [orc] wgtmac commented on pull request #877: ORC-959: [C++] Fix crash of SargsApplier in finding nested field names
Posted by GitBox <gi...@apache.org>.
wgtmac commented on pull request #877:
URL: https://github.com/apache/orc/pull/877#issuecomment-903473058
Thanks @stiga-huang for a quick fix!
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscribe@orc.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org