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.

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

HPCC-31458 Fix incorrect specification of Type enum in ws_topology #18455

Merged
merged 1 commit into from
Apr 4, 2024

Conversation

kenrowland
Copy link
Contributor

@kenrowland kenrowland commented Mar 26, 2024

Changed field 'Type' to properly use defined machine type enum.
Expanded enum to include all internal expected values,

Signed-Off-By: Kenneth.Rowland [email protected]

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:

Changed field 'Type' to properly use defined machine type enum.
Expanded enum to include all internal expected values,

Signed-Off-By: Kenneth.Rowland [email protected]
@rpastrana
Copy link
Member

@kenrowland is this related to the WSDL issues we discussed offline?

@kenrowland kenrowland requested a review from wangkx March 28, 2024 18:29
@kenrowland
Copy link
Contributor Author

@rpastrana Yes.

Copy link
Member

@wangkx wangkx left a comment

Choose a reason for hiding this comment

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

@kenrowland looks fine.

@kenrowland
Copy link
Contributor Author

kenrowland commented Mar 29, 2024

@ghalliday Please merge

@ghalliday ghalliday closed this Apr 4, 2024
@ghalliday ghalliday reopened this Apr 4, 2024
Copy link

github-actions bot commented Apr 4, 2024

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

Jirabot Action Result:
Workflow Transition: Merge Pending

@ghalliday ghalliday merged commit 41c725a into hpcc-systems:candidate-9.6.x Apr 4, 2024
72 of 74 checks passed
@ghalliday
Copy link
Member

@kenrowland I merged this - but there was one commented out line that should really have been removed, and should the macro definitions for eqTHORMACHINES etc. have also been deleted?

@kenrowland
Copy link
Contributor Author

@ghalliday Looks like the commented line was missed in review. I can remove with another Jira. For removal of eqTHORMACHINES, that decision would be made by someone else. It is currently supported by the code. If the option no longer exists, please open a Jira (or let me know and I will) to have it removed.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants