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-30789 Add eclhelper interfaces for generic disk write #19599

Merged
merged 1 commit into from
Mar 10, 2025
Merged

HPCC-30789 Add eclhelper interfaces for generic disk write #19599

merged 1 commit into from
Mar 10, 2025

Conversation

ghalliday
Copy link
Member

@ghalliday ghalliday commented Mar 7, 2025 •
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:

@ghalliday ghalliday requested a review from dcamper March 7, 2025 13:04
@ghalliday
Copy link
Member Author

This change includes several things:

  • Delete the old generic disk read code
  • Rename NewDiskRead to GenericDiskRead
  • Add provider functions in preparation for cosmosDB support later
  • Remove the separate functions to indicate whether the format and provider options are dynamic (but retain flag so the engine can avoid recalculating them)
  • Ensure helper.queryFormat() is only called if the generic flag is set
  • Default to returning null for queryFormat, so we can support a disk read with no format which defaults to the format of the file.

Possibly a little bit more clearup. Let's discuss once you have had a look.

@github-actions GitHub Actions
Copy link

github-actions bot commented Mar 7, 2025

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

Jirabot Action Result:
Changing assignee from: [email protected] to: [email protected]
Workflow Transition To: Merge Pending
Updated PR

dcamper
dcamper approved these changes Mar 10, 2025
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 (though I may feel otherwise when I try to implement stuff using it). Found only typos in comments.

ecl/hthor/hthor.cpp Outdated
const char * readFormat = helper.queryFormat();

const char * readFormat = queryReadFormat();
//MORE: Later this should use the type of the file if it is a distibuted file and the format is not specified
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo: distibuted

rtl/include/eclhelper.hpp Outdated
@@ -1134,6 +1134,9 @@ enum
TDXjobtemp = 0x0040, // stay around while a wu is being executed.
TDXgeneric = 0x0080, // generic form of disk read/write

TDXdynprovideroptions = 0x40000000, // The provider options are dynamic and must be called after onStart()
TDXdynformatoptions = 0x80000000, // The format options are dynnamic and must be called after onStart()
Copy link
Contributor

Choose a reason for hiding this comment

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

Typo: dynnamic

@ghalliday ghalliday merged commit 8c53499 into hpcc-systems:master Mar 10, 2025
9 checks passed
@github-actions GitHub Actions
Copy link

Jirabot Action Result:
Added fix version: 9.12.0
Workflow Transition: 'Resolve issue'

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

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

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