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

fix(core): handle schema Cache expandCapacity concurrent problem #2332

Merged
merged 1 commit into from
Oct 25, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ public final class IntObjectMap<V> implements RamMap {
private static final float DEFAULT_INITIAL_FACTOR = 0.25f;

private final int maxSize;
private int currentSize;
private Object[] array;
private volatile int currentSize;
private volatile Object[] array;
imbajin marked this conversation as resolved.
Show resolved Hide resolved

public IntObjectMap(int size) {
this.maxSize = size;
Expand Down Expand Up @@ -79,10 +79,11 @@ private synchronized void expandCapacity() {
if (this.currentSize == this.maxSize) {
return;
}
this.currentSize = Math.min(this.currentSize * 2, this.maxSize);
Object[] newArray = new Object[this.currentSize];
int newSize = Math.min(this.currentSize * 2, this.maxSize);
Object[] newArray = new Object[newSize];
System.arraycopy(this.array, 0, newArray, 0, this.array.length);
this.clear();
this.array = newArray;
this.currentSize = newSize;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
import org.apache.hugegraph.unit.rocksdb.RocksDBCountersTest;
import org.apache.hugegraph.unit.rocksdb.RocksDBSessionTest;
import org.apache.hugegraph.unit.rocksdb.RocksDBSessionsTest;
import org.apache.hugegraph.unit.store.RamIntObjectMapTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;

Expand Down Expand Up @@ -148,7 +149,10 @@
Int2IntsMapTest.class,
IdSetTest.class,
IntMapTest.class,
IntSetTest.class
IntSetTest.class,

/* store */
RamIntObjectMapTest.class
})
public class UnitTestSuite {
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
/*
* 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.hugegraph.unit.store;

import java.util.concurrent.CountDownLatch;

import org.apache.hugegraph.backend.store.ram.IntObjectMap;
import org.junit.Assert;
import org.junit.Test;

public class RamIntObjectMapTest {

@Test
public void testConcurrency() {
int size = 32;
IntObjectMap<Integer> map = new IntObjectMap<>(size);

final int numThreads = 10;
final CountDownLatch startSignal = new CountDownLatch(1);
final CountDownLatch doneSignal = new CountDownLatch(numThreads);

for (int i = 0; i < numThreads; i++) {
new Thread(() -> {
try {
startSignal.await();
} catch (InterruptedException e) {
e.printStackTrace();
Assert.fail(e.getMessage());
}

for (int j = 0; j < size; j++) {
map.set(j, j);
}

doneSignal.countDown();
}).start();
}

startSignal.countDown();

try {
doneSignal.await();
} catch (InterruptedException e) {
e.printStackTrace();
Assert.fail(e.getMessage());
}

for (int i = 0; i < numThreads; i++) {
new Thread(() -> {
for (int j = 0; j < size; j++) {
Integer value = map.get(j);
Assert.assertNotNull(value);
}
}).start();
}
}
}
Loading