-
Notifications
You must be signed in to change notification settings - Fork 15.4k
KAFKA-9700:Fix negative estimatedCompressionRatio issue #8285
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
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
61ae126
Fix negative estimatedCompressionRatio issue
jiameixie 36d7cb7
Fix negative estimatedCompressionRatio issue
jiameixie f998cdf
Merge branch 'trunk' of https://github.com/apache/kafka into negative
jiameixie 0153dc7
Merge remote-tracking branch 'origin/negative' into negative
jiameixie 7a34d39
Add test for CompressionRatioEstimator
jiameixie e50dfdc
Modify CompressionRatioEstimatorTest.java
jiameixie 537c402
Formatting fixes
ijuma File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
53 changes: 53 additions & 0 deletions
53
clients/src/test/java/org/apache/kafka/common/record/CompressionRatioEstimatorTest.java
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,53 @@ | ||
| /* | ||
| * Licensed to the Apache Software Foundation (ASF) under one or more | ||
| * contributor license agreements. See the NOTICE file distributed with | ||
| * this work for additional information regarding copyright ownership. | ||
| * The ASF licenses this file to You under the Apache License, Version 2.0 | ||
| * (the "License"); you may not use this file except in compliance with | ||
| * the License. You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
| package org.apache.kafka.common.record; | ||
|
|
||
| import org.junit.Test; | ||
| import static org.junit.Assert.assertTrue; | ||
| import java.util.ArrayList; | ||
|
|
||
| public class CompressionRatioEstimatorTest { | ||
| @Test | ||
| public void testUpdateEstimation() { | ||
| String topic = "tp"; | ||
| class EstimationsObservedRatios { | ||
| float currentEstimation; | ||
| float observedRatio; | ||
| EstimationsObservedRatios(float currentEstimation, float observedRatio) { | ||
| this.currentEstimation = currentEstimation; | ||
| this.observedRatio = observedRatio; | ||
| } | ||
| } | ||
|
|
||
| // If currentEstimation is smaller than observedRatio, the updatedCompressionRatio is currentEstimation plus | ||
| // COMPRESSION_RATIO_DETERIORATE_STEP 0.05, otherwise currentEstimation minus COMPRESSION_RATIO_IMPROVING_STEP | ||
| // 0.005. There are four cases,and updatedCompressionRatio shouldn't smaller than observedRatio in all of cases. | ||
| // Refer to non test code for more details. | ||
| ArrayList<EstimationsObservedRatios> estimationsObservedRatios = new ArrayList<EstimationsObservedRatios>(); | ||
| estimationsObservedRatios.add(new EstimationsObservedRatios(0.8f, 0.84f)); | ||
| estimationsObservedRatios.add(new EstimationsObservedRatios(0.6f, 0.7f)); | ||
| estimationsObservedRatios.add(new EstimationsObservedRatios(0.6f, 0.4f)); | ||
| estimationsObservedRatios.add(new EstimationsObservedRatios(0.004f, 0.001f)); | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: this can be written more concisely by using |
||
| float updatedCompressionRatio; | ||
| for(EstimationsObservedRatios estimationsObservedRatio:estimationsObservedRatios) | ||
|
ijuma marked this conversation as resolved.
Outdated
|
||
| { | ||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Nit: this brace should be on the previous line. |
||
| CompressionRatioEstimator.setEstimation(topic, CompressionType.ZSTD, estimationsObservedRatio.currentEstimation); | ||
| updatedCompressionRatio = CompressionRatioEstimator.updateEstimation(topic, CompressionType.ZSTD, estimationsObservedRatio.observedRatio); | ||
| assertTrue(updatedCompressionRatio < estimationsObservedRatio.observedRatio); | ||
| } | ||
| } | ||
| } | ||
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.
Uh oh!
There was an error while loading. Please reload this page.