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

Refactor: separate insertions and updates in rel table local storage #2982

Merged
merged 1 commit into from
Mar 14, 2024

Conversation

ray6080
Copy link
Contributor

@ray6080 ray6080 commented Mar 2, 2024

In the middle of reworking local storage. This PR is mainly separating the storage of insertions and updates in local storage.

    LocalDataChunkCollection insertChunks;
    LocalDeletionInfo deleteInfo;
    std::vector<LocalDataChunkCollection> updateChunks;

Note that the following PR will replace the use of DataChunk with a vector of ColumnChunks.

This PR is becoming a bit messy as I did some other refactoring alongside:

  • unify nbrID column with property columns in RelTableData.
  • clean up unnecessary unique_ptr use of LogicalType and DataChunk.

NOTE: This PR breaks storage compatibility as it changes the layout of statistics.

@ray6080 ray6080 changed the title Rework local storage: separate insertions and updates Refactor: separate insertions and updates in rel table local storage Mar 3, 2024
@ray6080 ray6080 force-pushed the multi-copy-rel branch 3 times, most recently from d2bd0b0 to ca5d82a Compare March 3, 2024 17:57
Base automatically changed from multi-copy-rel to master March 3, 2024 18:25
@ray6080 ray6080 marked this pull request as ready for review March 3, 2024 18:35
Copy link

codecov bot commented Mar 4, 2024

Codecov Report

Attention: Patch coverage is 97.79736% with 10 lines in your changes are missing coverage. Please review.

Project coverage is 93.36%. Comparing base (f8efa2a) to head (1f88b3f).

Files Patch % Lines
src/storage/store/rel_table_data.cpp 94.87% 4 Missing ⚠️
src/common/data_chunk/data_chunk_collection.cpp 93.33% 1 Missing ⚠️
src/common/types/types.cpp 83.33% 1 Missing ⚠️
src/include/storage/store/rel_table_data.h 0.00% 1 Missing ⚠️
src/storage/local_storage/local_node_table.cpp 95.65% 1 Missing ⚠️
src/storage/local_storage/local_table.cpp 98.52% 1 Missing ⚠️
src/storage/store/struct_column.cpp 85.71% 1 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #2982      +/-   ##
==========================================
+ Coverage   93.27%   93.36%   +0.08%     
==========================================
  Files        1133     1133              
  Lines       43123    43060      -63     
==========================================
- Hits        40222    40201      -21     
+ Misses       2901     2859      -42     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@benjaminwinger benjaminwinger left a comment

Choose a reason for hiding this comment

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

I might take a look at this again if I have time before it's merged as I skimmed over a lot of it, but generally it seems fine.

const offset_set_t& deleteInfo) override {
// Avoid unused parameter warnings.
(void)updateInfo;
(void)deleteInfo;
Copy link
Collaborator

Choose a reason for hiding this comment

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

You can comment out the parameter names instead

Copy link
Contributor Author

@ray6080 ray6080 Mar 14, 2024

Choose a reason for hiding this comment

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

I still want to do assertions over them. that's why I kept these parameters, but they keep throwing warnings during release build. Might be better ways to handle these?

src/storage/store/column.cpp Show resolved Hide resolved
src/storage/store/column.cpp Outdated Show resolved Hide resolved
src/storage/store/rel_table_data.cpp Show resolved Hide resolved
@ray6080 ray6080 merged commit 4f06cf1 into master Mar 14, 2024
17 checks passed
@ray6080 ray6080 deleted the multi-copy-rel-s1 branch March 14, 2024 11:20
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.

None yet

2 participants