[core] Add limitation to the buffer spill disk usage #3108
Merged
Conversation
This file contains 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
JingsongLi
reviewed
Mar 29, 2024
paimon-common/src/test/java/org/apache/paimon/fs/ByteArraySeekableStreamTest.java
Outdated
Show resolved
Hide resolved
JingsongLi
reviewed
Mar 29, 2024
| @@ -154,7 +161,16 @@ public long getOccupancy() { | |||
| @Override | |||
| public boolean flushMemory() throws IOException { | |||
| spill(); | |||
| return true; | |||
| return getDiskUsage() < maxDiskSize.getBytes(); | |||
There was a problem hiding this comment.
also modify ExternalBuffer for append table.
JingsongLi
reviewed
Mar 29, 2024
|
|
||
| public ChannelWithMeta(FileIOChannel.ID channel, int blockCount, int numBytesInLastBlock) { | ||
| this.channel = channel; | ||
| this.blockCount = blockCount; | ||
| this.numBytesInLastBlock = numBytesInLastBlock; | ||
| this.size = channel.getPathFile().length(); |
There was a problem hiding this comment.
pass size from outside instead of access file again.
JingsongLi
reviewed
Apr 1, 2024
| @@ -90,7 +96,16 @@ public void reset() { | |||
| @Override | |||
| public boolean flushMemory() throws IOException { | |||
| spill(); | |||
| return true; | |||
| return getDiskUsage() < maxDiskSize.getBytes(); | |||
There was a problem hiding this comment.
Should check first before spill?
JingsongLi
reviewed
Apr 1, 2024
| @@ -147,6 +163,7 @@ private void spill() throws IOException { | |||
| ? inMemoryBuffer.getNumBytesInLastBuffer() | |||
| : segment.size(); | |||
| writer.writeBlock(Buffer.create(segment, bufferSize)); | |||
| numEstimatedBytes += bufferSize; | |||
| } | |||
| LOG.info( | |||
There was a problem hiding this comment.
You can just cache writer.getSize().
There was a problem hiding this comment.
Get it, directly use FileChannel.getSize() can avoid an extra system call to get the file length, Right ?
JingsongLi
reviewed
Apr 1, 2024
| @@ -24,11 +24,17 @@ public class ChannelWithMeta { | |||
| private final FileIOChannel.ID channel; | |||
| private final int blockCount; | |||
| private final int numBytesInLastBlock; | |||
| private final long numEstimatedBytes; | |||
There was a problem hiding this comment.
You can get real size, see comments.
JingsongLi
reviewed
Apr 1, 2024
paimon-core/src/main/java/org/apache/paimon/sort/BinaryExternalSortBuffer.java
Outdated
Show resolved
Hide resolved
JingsongLi
reviewed
Apr 1, 2024
| @@ -309,6 +309,13 @@ public class CoreOptions implements Serializable { | |||
| .withDescription( | |||
| "Amount of data to build up in memory before converting to a sorted on-disk file."); | |||
|
|
|||
| public static final ConfigOption<MemorySize> WRITE_BUFFER_MAX_DISK_SIZE = | |||
There was a problem hiding this comment.
@Documentation.OverrideDefault("infinite")？
|
Looks good to me! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Purpose
Linked issue: close #3104
Tests
API and Format
Documentation