Skip to content
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.

Sign up for GitHub

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

Jump to bottom

HPCC-31642 ParquetReader::readColumns not reading nested columns properly #18555

Merged
merged 1 commit into from
Apr 26, 2024
Merged

HPCC-31642 ParquetReader::readColumns not reading nested columns properly #18555

merged 1 commit into from
Apr 26, 2024

Conversation

jackdelv
Copy link
Contributor

@jackdelv jackdelv commented Apr 18, 2024 •
edited
Loading

Type of change:

  • This change is a bug fix (non-breaking change which fixes an issue).
  • This change is a new feature (non-breaking change which adds functionality).
  • This change improves the code (refactor or other change that does not change the functionality)
  • This change fixes warnings (the fix does not alter the functionality or the generated code)
  • This change is a breaking change (fix or feature that will cause existing behavior to change).
  • This change alters the query API (existing queries will have to be recompiled)

Checklist:

  • My code follows the code style of this project.
    • My code does not create any new warnings from compiler, build system, or lint.
  • The commit message is properly formatted and free of typos.
    • The commit message title makes sense in a changelog, by itself.
    • The commit is signed.
  • My change requires a change to the documentation.
    • I have updated the documentation accordingly, or...
    • I have created a JIRA ticket to update the documentation.
    • Any new interfaces or exported functions are appropriately commented.
  • I have read the CONTRIBUTORS document.
  • The change has been fully tested:
    • I have added tests to cover my changes.
    • All new and existing tests passed.
    • I have checked that this change does not introduce memory leaks.
    • I have used Valgrind or similar tools to check for potential issues.
  • I have given due consideration to all of the following potential concerns:
    • Scalability
    • Performance
    • Security
    • Thread-safety
    • Cloud-compatibility
    • Premature optimization
    • Existing deployed queries will not be broken
    • This change fixes the problem, not just the symptom
    • The target branch of this pull request is appropriate for such a change.
  • There are no similar instances of the same problem that should be addressed
    • I have addressed them here
    • I have raised JIRA issues to address them separately
  • This is a user interface / front-end modification
    • I have tested my changes in multiple modern browsers
    • The component(s) render as expected

Smoketest:

  • Send notifications about my Pull Request position in Smoketest queue.
  • Test my draft Pull Request.

Testing:

@jackdelv jackdelv requested review from ghalliday and dcamper April 18, 2024 16:26
@github-actions GitHub Actions
Copy link

Jira Issue: https://hpccsystems.atlassian.net//browse/HPCC-31642

Jirabot Action Result:
Workflow Transition: Merge Pending
Updated PR

dcamper
dcamper approved these changes Apr 18, 2024
View reviewed changes
Copy link
Contributor

@dcamper dcamper left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me.

ghalliday
ghalliday reviewed Apr 22, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sensible. One efficiency issue.

plugins/parquet/parquetembed.cpp Outdated
@@ -274,14 +310,16 @@ void divide_row_groups(const IThorActivityContext *activityCtx, __int64 totalRow
__int64 ParquetReader::readColumns(__int64 currTable)
{
auto rowGroupReader = queryCurrentTable(currTable); // Sets currentTableMetadata
for (int i = 0; i < expectedRecord->getNumFields(); i++)
for (int i = 0; i < getNumFields(expectedRecord); i++)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

efficiency: Assign getNumFields to a temporary first (otherwise it will be recalculated each time around the loop), or explicitly walk through the fields instead.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Assigned result to a temporary

@jackdelv jackdelv requested a review from ghalliday April 22, 2024 17:38
ghalliday
ghalliday approved these changes Apr 23, 2024
View reviewed changes
Copy link
Member

@ghalliday ghalliday left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jackdelv looks good. Please squash.

@jackdelv
Copy link
Contributor Author

@ghalliday Squashed.

@jackdelv jackdelv requested a review from ghalliday April 23, 2024 14:19
@ghalliday
Copy link
Member

@jackdelv should this target 9.6.x?

@jackdelv
Copy link
Contributor Author

@ghalliday Yes, I think it should since this is a bug fix.

@jackdelv jackdelv changed the base branch from master to candidate-9.6.x April 23, 2024 15:57
@jackdelv jackdelv requested a review from ghalliday April 23, 2024 17:44
@ghalliday ghalliday merged commit f7b5d42 into hpcc-systems:candidate-9.6.x Apr 26, 2024
49 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dcamper dcamper dcamper approved these changes

@ghalliday ghalliday ghalliday approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@jackdelv @ghalliday @dcamper