Improve memtable allocator accounting when updating AtomicBTreePartition #2186
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Patch by Benedict Elliott Smith; review by Jon Meredith and Benjamin Lerer for CASSANDRA-18125
jonmeredith
commented
Mar 4, 2023
Comment on lines
232
to
259
| // Create the initial row to populate the partition with | ||
| Row.Builder initialRowBuilder = BTreeRow.unsortedBuilder(); | ||
| initialRowBuilder.newRow(regular.isStatic() ? Clustering.STATIC_CLUSTERING : Clustering.EMPTY); | ||
|
|
||
| initialRowBuilder.addCell(makeCell(regular, initialTS, initialTTL, initialLDT, initialValueBB, null)); | ||
| if (initialComplexDeletionTime != DeletionTime.LIVE) | ||
| initialRowBuilder.addComplexDeletion(complex, initialComplexDeletionTime); | ||
| int cellPath = 1000; | ||
| for (int i = 0; i < numC2InitialCells; i++) | ||
| initialRowBuilder.addCell(makeCell(complex, initialTS, initialTTL, initialLDT, | ||
| ByteBufferUtil.EMPTY_BYTE_BUFFER, | ||
| CellPath.create(ByteBufferUtil.bytes(cellPath--)))); | ||
| Row initialRow = initialRowBuilder.build(); | ||
|
|
||
| // Create the update row to modify the partition with | ||
| Row.Builder updateRowBuilder = BTreeRow.unsortedBuilder(); | ||
| updateRowBuilder.newRow(regular.isStatic() ? Clustering.STATIC_CLUSTERING : Clustering.EMPTY); | ||
|
|
||
| updateRowBuilder.addCell(makeCell(regular, updateTS, updateTTL, updateLDT, updateValueBB, null)); | ||
| if (updateComplexDeletionTime != DeletionTime.LIVE) | ||
| updateRowBuilder.addComplexDeletion(complex, updateComplexDeletionTime); | ||
|
|
||
| // Make multiple update cells to make any issues more pronounced | ||
| cellPath = 1000; | ||
| for (int i = 0; i < numC2UpdateCells; i++) | ||
| updateRowBuilder.addCell(makeCell(complex, updateTS, updateTTL, updateLDT, | ||
| ByteBufferUtil.EMPTY_BYTE_BUFFER, | ||
| CellPath.create(ByteBufferUtil.bytes(cellPath++)))); |
Contributor
Author
There was a problem hiding this comment.
nits: It seems that the 2 blocks are the same if I am not mistaken. They could be refactored as a method
The difference is the direction the cellPaths go to make some distinct and some overlapping elements. It could be factored out but felt like a lot more passing settings around.
|
|
||
| public long offHeapSize() | ||
| { | ||
| long size = simpleSize(MemoryUtil.getInt(peer + LENGTH)); |
Contributor
Author
There was a problem hiding this comment.
This
simpleSizename is really confusing. I think we should inline the method. It would be much clearer.
Also used in the constructor so want to keep it DRY. Could rename to offHeapSizeWithoutCellPath?
| return new BufferCell(column, timestamp, ttl, localDeletionTime, value, path); | ||
| } | ||
|
|
||
| void testCase(int initialTS, int initialTTL, int initialLDT, DeletionTime initialCDT, int numC2InitialCells, |
Contributor
Author
There was a problem hiding this comment.
nit: Would it not be more readable to have some object to bundle all those information together.
| <exclusion groupId="org.codehaus.jackson" artifactId="jackson-mapper-asl"/> | ||
| </dependency> | ||
| <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.6.0"/> | ||
| <dependency groupId="net.java.dev.jna" artifactId="jna" version="5.13.0"/> |
Contributor
Author
There was a problem hiding this comment.
will drop this from the patch - accidentally committed
Contributor
Author
|
Merged. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See CASSANDRA-18125