-
Notifications
You must be signed in to change notification settings - Fork 1k
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
Add Binary Allocator #14201
Open
MrQuansy
wants to merge
12
commits into
apache:master
Choose a base branch
from
MrQuansy:binary_allocator
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+1,574
−0
Open
Add Binary Allocator #14201
Changes from 6 commits
Commits
Show all changes
12 commits
Select commit
Hold shift + click to select a range
1d0e7c4
add binary allocator
MrQuansy fdd6ef2
fix
MrQuansy cc35427
add gc evictor and hot load configuration
MrQuansy 45861b2
fix
MrQuansy 31286dd
fix
MrQuansy f01d84e
add license
MrQuansy 24d7082
resolve comments
MrQuansy eace54b
add comments
MrQuansy a79ed6a
modified adaptive weighted average
MrQuansy fad7ebe
fix unit test
MrQuansy 7da86e1
add necessary comments
MrQuansy 19f9fb4
restruct package
OneSizeFitsQuorum 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 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
136 changes: 136 additions & 0 deletions
136
iotdb-core/datanode/src/test/java/org/apache/iotdb/db/utils/BinaryAllocatorTest.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,136 @@ | ||
/* | ||
* 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.iotdb.db.utils; | ||
|
||
import org.apache.iotdb.commons.utils.binaryallocator.AllocatorConfig; | ||
import org.apache.iotdb.commons.utils.binaryallocator.BinaryAllocator; | ||
import org.apache.iotdb.commons.utils.binaryallocator.SizeClasses; | ||
|
||
import org.apache.tsfile.utils.PooledBinary; | ||
import org.junit.Test; | ||
|
||
import java.util.Collections; | ||
import java.util.Map; | ||
import java.util.concurrent.ConcurrentHashMap; | ||
import java.util.concurrent.CountDownLatch; | ||
|
||
import static org.junit.Assert.assertEquals; | ||
import static org.junit.Assert.assertNotNull; | ||
import static org.junit.Assert.assertTrue; | ||
|
||
public class BinaryAllocatorTest { | ||
@Test | ||
public void testAllocateBinary() { | ||
AllocatorConfig config = new AllocatorConfig(); | ||
config.arenaNum = 1; | ||
BinaryAllocator binaryAllocator = new BinaryAllocator(config); | ||
PooledBinary binary = binaryAllocator.allocateBinary(256); | ||
assertNotNull(binary); | ||
assertEquals(binary.getArenaIndex(), -1); | ||
assertEquals(binary.getLength(), 256); | ||
binaryAllocator.deallocateBinary(binary); | ||
|
||
binary = binaryAllocator.allocateBinary(65536); | ||
assertNotNull(binary); | ||
assertEquals(binary.getArenaIndex(), 0); | ||
assertEquals(binary.getLength(), 65536); | ||
binaryAllocator.deallocateBinary(binary); | ||
|
||
binary = binaryAllocator.allocateBinary(65535); | ||
assertNotNull(binary); | ||
assertEquals(binary.getArenaIndex(), 0); | ||
assertEquals(binary.getLength(), 65535); | ||
assertEquals(binary.getValues().length, 65536); | ||
binaryAllocator.deallocateBinary(binary); | ||
} | ||
|
||
@Test | ||
public void testStrategy() throws InterruptedException { | ||
BinaryAllocator binaryAllocator = new BinaryAllocator(AllocatorConfig.DEFAULT_CONFIG); | ||
|
||
PooledBinary binary1 = binaryAllocator.allocateBinary(4096); | ||
PooledBinary binary2 = binaryAllocator.allocateBinary(4096); | ||
assertEquals(binary1.getArenaIndex(), binary2.getArenaIndex()); | ||
binaryAllocator.deallocateBinary(binary1); | ||
binaryAllocator.deallocateBinary(binary2); | ||
|
||
int threadCount = 4; | ||
CountDownLatch latch = new CountDownLatch(threadCount); | ||
Map<Integer, Integer> arenaUsageCount = new ConcurrentHashMap<>(); | ||
for (int i = 0; i < threadCount; i++) { | ||
Thread thread = | ||
new Thread( | ||
() -> { | ||
try { | ||
PooledBinary firstBinary = binaryAllocator.allocateBinary(2048); | ||
int arenaId = firstBinary.getArenaIndex(); | ||
arenaUsageCount.merge(arenaId, 1, Integer::sum); | ||
binaryAllocator.deallocateBinary(firstBinary); | ||
} finally { | ||
latch.countDown(); | ||
} | ||
}); | ||
thread.start(); | ||
} | ||
|
||
latch.await(); | ||
int maxUsage = Collections.max(arenaUsageCount.values()); | ||
int minUsage = Collections.min(arenaUsageCount.values()); | ||
assertEquals(maxUsage, minUsage); | ||
} | ||
|
||
@Test | ||
public void testEviction() throws InterruptedException { | ||
AllocatorConfig config = new AllocatorConfig(); | ||
config.arenaNum = 1; | ||
config.minAllocateSize = config.maxAllocateSize = 4096; | ||
config.setTimeBetweenEvictorRunsMillis(1); | ||
BinaryAllocator binaryAllocator = new BinaryAllocator(config); | ||
|
||
PooledBinary binary = binaryAllocator.allocateBinary(4096); | ||
binaryAllocator.deallocateBinary(binary); | ||
assertEquals(binaryAllocator.getTotalUsedMemory(), 4096); | ||
Thread.sleep(200); | ||
assertEquals(binaryAllocator.getTotalUsedMemory(), 0); | ||
} | ||
|
||
@Test | ||
public void testSizeMapping() { | ||
AllocatorConfig config = new AllocatorConfig(); | ||
config.minAllocateSize = 4096; | ||
config.maxAllocateSize = 65536; | ||
SizeClasses sizeClasses = new SizeClasses(config); | ||
|
||
assertEquals(sizeClasses.getSizeClassNum(), 33); | ||
int[] testSizes = {4607, 8191, 16383, 32767, 65535}; | ||
|
||
for (int size : testSizes) { | ||
int sizeIdx = sizeClasses.size2SizeIdx(size); | ||
int mappedSize = sizeClasses.sizeIdx2size(sizeIdx); | ||
|
||
assertEquals("Mapped size should be >= original size", mappedSize, size + 1); | ||
|
||
if (sizeIdx > 0) { | ||
int previousSize = sizeClasses.sizeIdx2size(sizeIdx - 1); | ||
assertTrue("Previous size should be < original size", previousSize < size); | ||
} | ||
} | ||
} | ||
} |
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
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
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
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
78 changes: 78 additions & 0 deletions
78
...src/main/java/org/apache/iotdb/commons/utils/binaryallocator/AdaptiveWeightedAverage.java
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
/* | ||
* 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.iotdb.commons.utils.binaryallocator; | ||
|
||
import static java.lang.Math.max; | ||
|
||
public class AdaptiveWeightedAverage { | ||
OneSizeFitsQuorum marked this conversation as resolved.
Show resolved
Hide resolved
|
||
private float average; | ||
private int sampleCount; | ||
private final int weight; | ||
private boolean isOld; // Enable to have enough historical data | ||
private final int OLD_THRESHOLD = 100; | ||
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. final static |
||
|
||
public AdaptiveWeightedAverage(int weight) { | ||
this.weight = weight; | ||
average = 0f; | ||
sampleCount = 0; | ||
} | ||
|
||
public void sample(int newSample) { | ||
OneSizeFitsQuorum marked this conversation as resolved.
Show resolved
Hide resolved
|
||
incrementCount(); | ||
|
||
// Compute the new weighted average | ||
float newAverage = computeAdaptiveAverage(newSample, average); | ||
average = newAverage; | ||
} | ||
|
||
public float average() { | ||
return average; | ||
} | ||
|
||
public void clear() { | ||
average = 0f; | ||
sampleCount = 0; | ||
} | ||
|
||
void incrementCount() { | ||
sampleCount++; | ||
|
||
if (!isOld && sampleCount > OLD_THRESHOLD) { | ||
isOld = true; | ||
} | ||
} | ||
|
||
float computeAdaptiveAverage(int newSample, float average) { | ||
// We smooth the samples by not using weight() directly until we've | ||
// had enough data to make it meaningful. We'd like the first weight | ||
// used to be 1, the second to be 1/2, etc until we have | ||
// OLD_THRESHOLD/weight samples. | ||
int countWeight = 0; | ||
|
||
// Avoid division by zero if the counter wraps | ||
if (!isOld) { | ||
countWeight = OLD_THRESHOLD / sampleCount; | ||
} | ||
|
||
int adaptiveWeight = max(weight, countWeight); | ||
|
||
return (100.0f - adaptiveWeight) * average / 100.0f + adaptiveWeight * newSample / 100.0f; | ||
} | ||
} |
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
use Odd number like 255 is better to test jvm allocation?