Skip to content

fix: negative numbers cannot be indexed for java arrays #2376

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.

Sign up for GitHub

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

Open
guanchengang wants to merge 1 commit into
base: dev
Choose a base branch
from
+38 −2
Open

fix: negative numbers cannot be indexed for java arrays #2376

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions src/main/java/com/zaxxer/hikari/util/ConcurrentBag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,8 +82,8 @@ public interface IConcurrentBagEntry
{
int STATE_NOT_IN_USE = 0;
int STATE_IN_USE = 1;
int STATE_REMOVED = -1;
int STATE_RESERVED = -2;
int STATE_REMOVED = 2;
int STATE_RESERVED = 3;

boolean compareAndSet(int expectState, int newState);
void setState(int newState);
Expand Down
36 changes: 36 additions & 0 deletions src/test/java/com/zaxxer/hikari/pool/TestConcurrentBag.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,10 @@
import static com.zaxxer.hikari.pool.TestElf.getPool;
import static com.zaxxer.hikari.pool.TestElf.newHikariConfig;
import static com.zaxxer.hikari.pool.TestElf.setSlf4jTargetStream;
import static com.zaxxer.hikari.util.ConcurrentBag.IConcurrentBagEntry.STATE_IN_USE;
import static com.zaxxer.hikari.util.ConcurrentBag.IConcurrentBagEntry.STATE_NOT_IN_USE;
import static com.zaxxer.hikari.util.ConcurrentBag.IConcurrentBagEntry.STATE_REMOVED;
import static com.zaxxer.hikari.util.ConcurrentBag.IConcurrentBagEntry.STATE_RESERVED;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
Expand All @@ -40,6 +44,7 @@
/**
*
* @author Brett Wooldridge
* @author Chengang Guan
*/
public class TestConcurrentBag
{
Expand Down Expand Up @@ -114,4 +119,35 @@ public void testConcurrentBag() throws Exception
assertNotNull(notinuse.toString());
}
}

@Test
public void testConcurrentBagStateCounts() throws Exception {
try (ConcurrentBag<PoolEntry> bag = new ConcurrentBag<>(x -> CompletableFuture.completedFuture(Boolean.TRUE))) {
PoolEntry inuse = pool.newPoolEntry(false);
bag.add(inuse);
bag.borrow(2, MILLISECONDS);

PoolEntry notInuse = pool.newPoolEntry(false);
bag.add(notInuse);

PoolEntry removed = pool.newPoolEntry(false);
bag.add(removed);
bag.reserve(removed);
bag.remove(removed);

PoolEntry reserved = pool.newPoolEntry(false);
bag.add(reserved);
bag.reserve(reserved);

final int SHARED_LIST_SIZE = 4;
final int WAITERS_COUNTS = 5;
int[] stateCounts = bag.getStateCounts();
assertEquals(1, stateCounts[STATE_NOT_IN_USE]);
assertEquals(1, stateCounts[STATE_IN_USE]);
assertEquals(0, stateCounts[STATE_REMOVED]); // no STATE_REMOVED intermediate state in a single thread
assertEquals(1, stateCounts[STATE_RESERVED]);
assertEquals(3, stateCounts[SHARED_LIST_SIZE]); // sharedList.size()
assertEquals(0, stateCounts[WAITERS_COUNTS]); // waiters counts
}
}
}