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

Preserve existing inc_metrics in update_inclusive_columns #18

Merged
merged 6 commits into from Apr 27, 2022

Conversation

ilumsden
Copy link
Collaborator

@ilumsden ilumsden commented Feb 9, 2022

This is a small PR to fix a bug in GraphFrame.update_inclusive_columns that causes existing values in GraphFrame.inc_columns to be dropped.

As an example, consider a GraphFrame with the following metrics:

  • exc_metrics: ["time"]
  • inc_metrics: ["foo"]

Currently, after calling update_inclusive_columns, inc_metrics will no longer contain "foo". Instead, inc_metrics will simply be ["time (inc)"].

This PR will extend inc_metrics instead of overriding. So, in the above example, inc_metrics will now be ["foo", "time (inc)"].

@ilumsden ilumsden added area-graphframe Issues and PRs involving Hatchet's core GraphFrame datastructure and associated classes priority-normal Normal priority issues and PRs status-ready-for-review This PR is ready to be reviewed by assigned reviewers type-bug Identifies bugs in issues and identifies bug fixes in PRs labels Feb 9, 2022
@ilumsden ilumsden self-assigned this Feb 9, 2022
@ilumsden ilumsden added this to the 1.10.0 milestone Feb 10, 2022
@ilumsden
Copy link
Collaborator Author

ilumsden commented Feb 17, 2022

I realized that this branch does not currently have additional unit tests to test the preservation of inclusive columns.

@ilumsden ilumsden added status-work-in-progress PR is currently being worked on and removed status-ready-for-review This PR is ready to be reviewed by assigned reviewers labels Feb 17, 2022
@ilumsden ilumsden force-pushed the preserve_inc_update_inclusive branch from fddb018 to a6fd3a2 Compare February 21, 2022 23:08
@ilumsden ilumsden force-pushed the preserve_inc_update_inclusive branch from a6fd3a2 to 1cfa613 Compare February 21, 2022 23:13
@ilumsden ilumsden added status-ready-for-review This PR is ready to be reviewed by assigned reviewers and removed status-work-in-progress PR is currently being worked on labels Feb 21, 2022
hatchet/tests/conftest.py Outdated Show resolved Hide resolved
hatchet/tests/conftest.py Outdated Show resolved Hide resolved
Copy link
Collaborator

@slabasan slabasan left a comment

Choose a reason for hiding this comment

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

Remove if statements in unit test

hatchet/tests/graphframe.py Outdated Show resolved Hide resolved
@slabasan slabasan added status-revisions-needed Revisions have been requested from a reviewer for this PR and removed status-ready-for-review This PR is ready to be reviewed by assigned reviewers labels Feb 24, 2022
@ilumsden ilumsden added status-ready-for-review This PR is ready to be reviewed by assigned reviewers and removed status-revisions-needed Revisions have been requested from a reviewer for this PR labels Mar 1, 2022
@slabasan slabasan merged commit 02c26ec into LLNL:develop Apr 27, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
area-graphframe Issues and PRs involving Hatchet's core GraphFrame datastructure and associated classes priority-normal Normal priority issues and PRs status-ready-for-review This PR is ready to be reviewed by assigned reviewers type-bug Identifies bugs in issues and identifies bug fixes in PRs
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants