[
https://issues.apache.org/jira/browse/GEODE-4184?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16312314#comment-16312314
]
ASF GitHub Bot commented on GEODE-4184:
---------------------------------------
nabarunnag closed pull request #1221: GEODE-4184: Handled concurrent access of
HashSet
URL: https://github.com/apache/geode/pull/1221
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
index ab0ec14f3e..25765ff664 100755
---
a/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
+++
b/geode-core/src/main/java/org/apache/geode/cache/query/internal/index/PartitionedIndex.java
@@ -22,6 +22,7 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.query.Index;
@@ -77,7 +78,7 @@
*/
private String imports;
- private HashSet mapIndexKeys = new HashSet();
+ protected Set mapIndexKeys = Collections.newSetFromMap(new
ConcurrentHashMap());
// Flag indicating that the populationg of this index is in progress
private volatile boolean populateInProgress;
diff --git
a/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
new file mode 100644
index 0000000000..58b4ec243b
--- /dev/null
+++
b/geode-core/src/test/java/org/apache/geode/cache/query/internal/index/PartitionedIndexJUnitTest.java
@@ -0,0 +1,69 @@
+/*
+ * 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.geode.cache.query.internal.index;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.when;
+
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.query.IndexType;
+import org.apache.geode.distributed.DistributedSystem;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class PartitionedIndexJUnitTest {
+
+ @Test
+ public void
mapIndexKeysMustContainTheCorrectNumberOfKeysWhenThereIsConcurrentAccess() {
+
+ final int DATA_SIZE_TO_BE_POPULATED = 10000;
+ final int THREAD_POOL_SIZE = 20;
+
+ Region region = mock(Region.class);
+ Cache cache = mock(Cache.class);
+ when(region.getCache()).thenReturn(cache);
+ DistributedSystem distributedSystem = mock(DistributedSystem.class);
+ when(cache.getDistributedSystem()).thenReturn(distributedSystem);
+ PartitionedIndex partitionedIndex = new
PartitionedIndex(IndexType.FUNCTIONAL, "dummyString",
+ region, "dummyString", "dummyString", "dummyString");
+ Runnable populateSetTask = () -> {
+ for (int i = 0; i < DATA_SIZE_TO_BE_POPULATED; i++) {
+ partitionedIndex.mapIndexKeys.add("" + i);
+ }
+ };
+ Thread[] threads = new Thread[THREAD_POOL_SIZE];
+ for (int i = 0; i < threads.length; i++) {
+ threads[i] = new Thread(populateSetTask);
+ threads[i].start();
+ }
+ try {
+ for (int i = 0; i < threads.length; i++) {
+ threads[i].join();
+ }
+ } catch (InterruptedException e) {
+ e.printStackTrace();
+ fail();
+ }
+
+ assertEquals(DATA_SIZE_TO_BE_POPULATED,
partitionedIndex.mapIndexKeys.size());
+
+ }
+}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Change mapIndexKeys hash set to able to handle concurrent access
> ----------------------------------------------------------------
>
> Key: GEODE-4184
> URL: https://issues.apache.org/jira/browse/GEODE-4184
> Project: Geode
> Issue Type: Bug
> Components: querying
> Reporter: nabarun
> Assignee: nabarun
>
> Concurrent access to a HashSet results in inconsistent behavior.
> This needs to be changed to a set backed by a concurrent hash map
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
