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

Refactor block_fs file_node #3555

Merged
merged 10 commits into from
Jun 23, 2022
Merged

Refactor block_fs file_node #3555

merged 10 commits into from
Jun 23, 2022

Conversation

eivindjahren
Copy link
Contributor

@eivindjahren eivindjahren commented Jun 21, 2022 •
edited

Builds on #3557 and refactors file_node to a handle the logic of reading and writing blocks.

Pre review checklist

  • Added appropriate release note label
  • PR title captures the intent of the changes, and is fitting for release notes.
  • Commit history is consistent and clean, in line with the contribution guidelines.

Adding labels helps the maintainers when writing release notes. This is the list of release note labels.

@eivindjahren eivindjahren force-pushed the more_refactoring branch 2 times, most recently from bda8241 to 6860ece Compare June 21, 2022 12:14
@eivindjahren eivindjahren marked this pull request as draft June 21, 2022 12:15
@eivindjahren eivindjahren force-pushed the more_refactoring branch 12 times, most recently from db7883b to befbdde Compare June 21, 2022 17:20
@eivindjahren eivindjahren mentioned this pull request Jun 22, 2022
Closed
3 tasks
@eivindjahren eivindjahren changed the title More refactoring Refactor block_fs file_node to be a data transfer object Jun 22, 2022
@eivindjahren eivindjahren force-pushed the more_refactoring branch 13 times, most recently from 3d3b297 to 509298a Compare June 22, 2022 10:59
@eivindjahren eivindjahren force-pushed the more_refactoring branch 3 times, most recently from d3160ce to 45d21d9 Compare June 22, 2022 17:31
@eivindjahren eivindjahren changed the title Refactor block_fs file_node to be a data transfer object Refactor block_fs file_node Jun 22, 2022
@eivindjahren eivindjahren changed the title Refactor block_fs file_node Refactor block_fs file_node Jun 22, 2022
@eivindjahren eivindjahren added the maintenance Not a bug now but could be one day, repaying technical debt label Jun 22, 2022
@eivindjahren eivindjahren marked this pull request as ready for review June 22, 2022 18:02
@eivindjahren eivindjahren force-pushed the more_refactoring branch 2 times, most recently from 1732a22 to 6aaf231 Compare June 23, 2022 06:56
@pinkwah @eivindjahren
block_fs: Remove block_size
17ac47e 
This commit removes the `block_size` parameter, which pads each node to
the nearest multiple of `block_size`. This was done so that it is
possible to reuse free nodes, but we have removed node reuse, so this
parameter is superfluous.
@pinkwah @eivindjahren
block_fs: Remove data_file_size
826657d
@codecov-commenter
Copy link

codecov-commenter commented Jun 23, 2022 •
edited

Codecov Report

Merging #3555 (28b6bcc) into main (1f11f12) will decrease coverage by 0.16%.
The diff coverage is 63.12%.

@@            Coverage Diff             @@
##             main    #3555      +/-   ##
==========================================
- Coverage   65.00%   64.83%   -0.17%     
==========================================
  Files         599      592       -7     
  Lines       46989    46632     -357     
  Branches     4210     4220      +10     
==========================================
- Hits        30545    30235     -310     
+ Misses      15065    15022      -43     
+ Partials     1379     1375       -4
Impacted Files Coverage Δ
libres/lib/enkf/block_fs_driver.cpp 79.60% <50.00%> (+0.52%) ⬆️
libres/lib/res_util/block_fs.cpp 64.66% <63.30%> (-2.53%) ⬇️
ert_shared/dark_storage/common.py 67.46% <0.00%> (-9.28%) ⬇️
ert_shared/dark_storage/enkf.py 93.02% <0.00%> (-2.33%) ⬇️
ert_shared/dark_storage/app.py 78.78% <0.00%> (-1.22%) ⬇️
ert/data/record/_transformation.py 88.57% <0.00%> (-0.48%) ⬇️
ert_shared/dark_storage/graphql/experiments.py
ert_shared/dark_storage/graphql/ensembles.py
...rt_shared/dark_storage/graphql/unique_responses.py
ert_shared/dark_storage/graphql/updates.py
... and 5 more

📣 Codecov can now indicate which changes are the most critical in Pull Requests. Learn more

@eivindjahren eivindjahren force-pushed the more_refactoring branch 2 times, most recently from cc8c252 to 84615df Compare June 23, 2022 07:10
@eivindjahren eivindjahren force-pushed the more_refactoring branch 2 times, most recently from 0096a71 to 89e6988 Compare June 23, 2022 09:19
dafeda
dafeda approved these changes Jun 23, 2022
View reviewed changes
Copy link
Contributor

@dafeda dafeda left a comment

Choose a reason for hiding this comment

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

LGTM 👍

@eivindjahren eivindjahren merged commit f102f55 into equinor:main Jun 23, 2022
@eivindjahren eivindjahren deleted the more_refactoring branch June 23, 2022 11:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dafeda dafeda dafeda approved these changes

Assignees
No one assigned
Labels
maintenance Not a bug now but could be one day, repaying technical debt
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@eivindjahren @codecov-commenter @dafeda @pinkwah