SGF-135: deleteAll() uses region.clear() if possible

spring-projects · Oct 17, 2012 · e97ab1d · e97ab1d
1 parent 321a964
commit e97ab1d
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 4 deletions.
diff --git a/...ain/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java b/...ain/java/org/springframework/data/gemfire/repository/support/SimpleGemfireRepository.java
@@ -177,9 +177,13 @@ public void deleteAll() {
 			@Override
 			@SuppressWarnings("rawtypes")
 			public Void doInGemfire(Region region) {
-
-				for (Object key : region.keySet()) {
-					region.remove(key);
+				//clear() does not work for partitioned regions
+				try {
+					region.clear();
+				} catch (UnsupportedOperationException e) {
+					for (Object key : region.keySet()) {
+						region.remove(key);
+					}
 				}
 
 				return null;

diff --git a/...ringframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTest.java b/...ringframework/data/gemfire/repository/support/SimpleGemfireRepositoryIntegrationTest.java
@@ -21,6 +21,8 @@
 import java.util.Arrays;
 import java.util.Collection;
 
+import javax.annotation.Resource;
+
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -32,7 +34,11 @@
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
+import com.gemstone.gemfire.cache.CacheListener;
+import com.gemstone.gemfire.cache.Region;
+import com.gemstone.gemfire.cache.RegionEvent;
 import com.gemstone.gemfire.cache.query.SelectResults;
+import com.gemstone.gemfire.cache.util.CacheListenerAdapter;
 
 /**
  * Integration tests for {@link SimpleGemfireRepository}.
@@ -45,12 +51,20 @@ public class SimpleGemfireRepositoryIntegrationTest {
 
 	@Autowired
 	GemfireTemplate template;
+
+	@Resource(name="simple")
+	Region<?,?> simpleRegion;
 
 	SimpleGemfireRepository<Person, Long> repository;
+
+	@SuppressWarnings("rawtypes")
+	RegionClearListener regionClearListener;
 
 	@Before
 	public void setUp() {
-
+		regionClearListener = new RegionClearListener();
+		simpleRegion.getAttributesMutator().addCacheListener(regionClearListener);
+
 		EntityInformation<Person, Long> information = new ReflectionEntityInformation<Person, Long>(Person.class);
 		repository = new SimpleGemfireRepository<Person, Long>(template, information);
 	}
@@ -72,6 +86,13 @@ public void storeAndDeleteEntity() {
 		assertThat(repository.findOne(person.id), is(nullValue()));
 		assertThat(repository.findAll().size(), is(0));
 	}
+
+	@Test
+	public void testDeleteAllFiresClearEvent() {
+		assertFalse(regionClearListener.eventFired);
+		repository.deleteAll();
+		assertTrue(regionClearListener.eventFired);
+	}
 
 	@Test
 	public void queryRegion() throws Exception {
@@ -101,4 +122,12 @@ public void findAllWithGivenIds() {
 		assertThat(result, hasItems(carter, leroi));
 		assertThat(result, not(hasItems(dave)));
 	}
+
+	public static class RegionClearListener extends CacheListenerAdapter {
+		public boolean eventFired;
+		@Override
+		public void afterRegionClear(RegionEvent ev) {
+			eventFired = true;
+		}
+	}
 }