You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by up...@apache.org on 2016/07/01 18:54:38 UTC
[1/2] incubator-geode git commit: GEODE-11: Pagination of Lucene
Query Results after entries are destroyed from the region
Repository: incubator-geode
Updated Branches:
refs/heads/develop f8f9454d4 -> 1a3c38af1
GEODE-11: Pagination of Lucene Query Results after entries are destroyed from the region
If a region entry is destroyed after a query is executed, the pages.next() call returns
a null value for the deleted entry. The code is changed to ignore deleted entries and
fetch the next available entry so that the page count remains consistent. Added tests to
verify scenarios of single, multiple and all region entry deletions.
Added a test to verify that all entries are fetched in one page when pagination is
disabled.
Signed-off-by: Anilkumar Gingade <ag...@pivotal.io>
This closes #178
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/1a3c38af
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/1a3c38af
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/1a3c38af
Branch: refs/heads/develop
Commit: 1a3c38af10ad0b3dc0e6e9222a2c44f4f6598a3e
Parents: 6a9a83c
Author: Aparna Dharmakkan <ad...@pivotal.io>
Authored: Wed Jun 29 16:06:38 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Jul 1 11:46:40 2016 -0700
----------------------------------------------------------------------
.../PageableLuceneQueryResultsImpl.java | 66 ++++++----
.../lucene/LuceneQueriesIntegrationTest.java | 119 +++++++++++++++++--
2 files changed, 158 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a3c38af/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
index 17668a7..1563df0 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImpl.java
@@ -20,6 +20,7 @@
package com.gemstone.gemfire.cache.lucene.internal;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.NoSuchElementException;
@@ -42,7 +43,11 @@ public class PageableLuceneQueryResultsImpl<K,V> implements PageableLuceneQueryR
* list of docs matching search query
*/
private final List<EntryScore<K>> hits;
-
+
+ /**
+ * * Current page of results
+ */
+ private List<LuceneResultStruct<K,V>> currentPage;
/**
* The maximum score. Lazily evaluated
*/
@@ -69,38 +74,59 @@ public class PageableLuceneQueryResultsImpl<K,V> implements PageableLuceneQueryR
this.pageSize = pageSize == 0 ? Integer.MAX_VALUE : pageSize;
}
- @Override
- public List<LuceneResultStruct<K,V>> next() {
- if(!hasNext()) {
- throw new NoSuchElementException();
- }
-
- int end = currentHit + pageSize;
- end = end > hits.size() ? hits.size() : end;
- List<EntryScore<K>> scores = hits.subList(currentHit, end);
-
- ArrayList<K> keys = new ArrayList<K>(hits.size());
+
+ public List<LuceneResultStruct<K,V>> getHitEntries(int fromIndex, int toIndex) {
+ List<EntryScore<K>> scores = hits.subList(fromIndex, toIndex);
+ ArrayList<K> keys = new ArrayList<K>(scores.size());
for(EntryScore<K> score : scores) {
keys.add(score.getKey());
}
-
+
Map<K,V> values = userRegion.getAll(keys);
- ArrayList<LuceneResultStruct<K,V>> results = new ArrayList<LuceneResultStruct<K,V>>(hits.size());
+ ArrayList<LuceneResultStruct<K,V>> results = new ArrayList<LuceneResultStruct<K,V>>(scores.size());
for(EntryScore<K> score : scores) {
V value = values.get(score.getKey());
- results.add(new LuceneResultStructImpl(score.getKey(), value, score.getScore()));
+ if (value!=null)
+ results.add(new LuceneResultStructImpl(score.getKey(), value, score.getScore()));
}
-
-
- currentHit = end;
-
return results;
}
@Override
+ public List<LuceneResultStruct<K,V>> next() {
+ if(!hasNext()) {
+ throw new NoSuchElementException();
+ }
+ List<LuceneResultStruct<K,V>> result = advancePage();
+ currentPage = null;
+ return result;
+ }
+
+ private List<LuceneResultStruct<K, V>> advancePage() {
+ if(currentPage != null) {
+ return currentPage;
+ }
+
+ int resultSize = (pageSize != Integer.MAX_VALUE) ? pageSize : hits.size();
+ currentPage = new ArrayList<LuceneResultStruct<K,V>>(resultSize);
+ while (currentPage.size()<pageSize && currentHit < hits.size()) {
+ int end = currentHit + pageSize - currentPage.size();
+ end = end > hits.size() ? hits.size() : end;
+ currentPage.addAll(getHitEntries(currentHit, end));
+ currentHit = end;
+ }
+ return currentPage;
+ }
+
+ @Override
public boolean hasNext() {
- return hits.size() > currentHit;
+
+ advancePage();
+ if ( currentPage.isEmpty() ) {
+ return false;
+ }
+ return true;
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/1a3c38af/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
index 988e4f5..ccd6d41 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesIntegrationTest.java
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import java.util.stream.Collectors;
import org.apache.lucene.analysis.Analyzer;
@@ -35,6 +36,7 @@ import org.apache.lucene.analysis.standard.StandardAnalyzer;
import org.apache.lucene.analysis.util.CharTokenizer;
import org.junit.Rule;
import org.junit.Test;
+import org.junit.contrib.java.lang.system.SystemOutRule;
import org.junit.experimental.categories.Category;
import org.junit.rules.ExpectedException;
@@ -43,6 +45,7 @@ import com.gemstone.gemfire.cache.RegionShortcut;
import com.gemstone.gemfire.cache.lucene.test.TestObject;
import com.gemstone.gemfire.pdx.JSONFormatter;
import com.gemstone.gemfire.pdx.PdxInstance;
+import com.gemstone.gemfire.pdx.internal.AutoSerializableManager.ObjectArrayField;
import com.gemstone.gemfire.test.junit.categories.IntegrationTest;
/**
@@ -119,28 +122,32 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
@Test()
public void shouldPaginateResults() throws Exception {
- final LuceneQuery<Object, Object> query = addValuesAndCreateQuery();
+ final LuceneQuery<Object, Object> query = addValuesAndCreateQuery(2);
final PageableLuceneQueryResults<Object, Object> pages = query.findPages();
assertTrue(pages.hasNext());
- assertEquals(3, pages.size());
+ assertEquals(7, pages.size());
final List<LuceneResultStruct<Object, Object>> page1 = pages.next();
final List<LuceneResultStruct<Object, Object>> page2 = pages.next();
+ final List<LuceneResultStruct<Object, Object>> page3 = pages.next();
+ final List<LuceneResultStruct<Object, Object>> page4 = pages.next();
List<LuceneResultStruct<Object, Object>> allEntries=new ArrayList<>();
allEntries.addAll(page1);
allEntries.addAll(page2);
+ allEntries.addAll(page3);
+ allEntries.addAll(page4);
assertEquals(region.keySet(), allEntries.stream().map(entry -> entry.getKey()).collect(Collectors.toSet()));
assertEquals(region.values(), allEntries.stream().map(entry -> entry.getValue()).collect(Collectors.toSet()));
-
}
+
@Test
public void shouldReturnValuesFromFindValues() throws Exception {
- final LuceneQuery<Object, Object> query = addValuesAndCreateQuery();
+ final LuceneQuery<Object, Object> query = addValuesAndCreateQuery(2);
assertEquals(region.values(), new HashSet(query.findValues()));
}
- private LuceneQuery<Object, Object> addValuesAndCreateQuery() {
+ private LuceneQuery<Object, Object> addValuesAndCreateQuery(int pagesize) {
luceneService.createIndex(INDEX_NAME, REGION_NAME, "field1", "field2");
region = cache.createRegionFactory(RegionShortcut.PARTITION)
.create(REGION_NAME);
@@ -153,10 +160,14 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
region.put("A", new TestObject(value1, value1));
region.put("B", new TestObject(value2, value2));
region.put("C", new TestObject(value3, value3));
+ region.put("D", new TestObject(value1, value1));
+ region.put("E", new TestObject(value2, value2));
+ region.put("F", new TestObject(value3, value3));
+ region.put("G", new TestObject(value1, value2));
index.waitUntilFlushed(60000);
return luceneService.createLuceneQueryFactory()
- .setPageSize(2)
+ .setPageSize(pagesize)
.create(INDEX_NAME, REGION_NAME,
"one", "field1");
}
@@ -260,7 +271,101 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest {
thrown.expect(LuceneQueryException.class);
query.findPages();
}
-
+
+ @Test
+ public void shouldReturnAllResultsWhenPaginationIsDisabled() throws Exception {
+ // Pagination disabled by setting page size = 0.
+ final LuceneQuery<Object, Object> query = addValuesAndCreateQuery(0);
+ final PageableLuceneQueryResults<Object, Object> pages = query.findPages();
+ assertTrue(pages.hasNext());
+ assertEquals(7, pages.size());
+ final List<LuceneResultStruct<Object, Object>> page = pages.next();
+ assertFalse(pages.hasNext());
+ assertEquals(region.keySet(), page.stream().map(entry -> entry.getKey()).collect(Collectors.toSet()));
+ assertEquals(region.values(), page.stream().map(entry -> entry.getValue()).collect(Collectors.toSet()));
+ }
+
+ @Test
+ public void shouldReturnCorrectResultsOnDeletionAfterQueryExecution() throws Exception {
+ final LuceneQuery<Object, Object> query = addValuesAndCreateQuery(2);
+ final PageableLuceneQueryResults<Object, Object> pages = query.findPages();
+ List<LuceneResultStruct<Object, Object>> allEntries=new ArrayList<>();
+ assertTrue(pages.hasNext());
+ assertEquals(7, pages.size());
+ // Destroying an entry from the region after the query is executed.
+ region.destroy("C");
+ final List<LuceneResultStruct<Object, Object>> page1 = pages.next();
+ assertEquals(2, page1.size());
+ final List<LuceneResultStruct<Object, Object>> page2 = pages.next();
+ assertEquals(2, page2.size());
+ final List<LuceneResultStruct<Object, Object>> page3 = pages.next();
+ assertEquals(2, page3.size());
+ assertFalse(pages.hasNext());
+
+ allEntries.addAll(page1);
+ allEntries.addAll(page2);
+ allEntries.addAll(page3);
+ assertEquals(region.keySet(), allEntries.stream().map(entry -> entry.getKey()).collect(Collectors.toSet()));
+ assertEquals(region.values(), allEntries.stream().map(entry -> entry.getValue()).collect(Collectors.toSet()));
+ }
+
+ @Test
+ public void shouldReturnCorrectResultsOnMultipleDeletionsAfterQueryExecution() throws Exception {
+ final LuceneQuery<Object, Object> query = addValuesAndCreateQuery(2);
+
+ final PageableLuceneQueryResults<Object, Object> pages = query.findPages();
+ List<LuceneResultStruct<Object, Object>> allEntries=new ArrayList<>();
+
+ assertTrue(pages.hasNext());
+ assertEquals(7, pages.size());
+
+ // Destroying an entry from the region after the query is executed.
+ region.destroy("C");
+ allEntries.addAll(pages.next());
+
+ // Destroying an entry from allEntries and the region after it is fetched through pages.next().
+ Object removeKey = ((LuceneResultStruct)allEntries.remove(0)).getKey();
+ region.destroy(removeKey);
+ allEntries.addAll(pages.next());
+
+ // Destroying a region entry which has't been fetched through pages.next() yet.
+ Set resultKeySet = allEntries.stream().map(entry -> entry.getKey()).collect(Collectors.toSet());
+
+ for(Object key : region.keySet()) {
+ if (!resultKeySet.contains(key)) {
+ region.destroy(key);
+ break;
+ }
+ }
+
+ allEntries.addAll(pages.next());
+ assertFalse(pages.hasNext());
+
+ assertEquals(region.keySet(), allEntries.stream().map(entry -> entry.getKey()).collect(Collectors.toSet()));
+ assertEquals(region.values(), allEntries.stream().map(entry -> entry.getValue()).collect(Collectors.toSet()));
+ }
+
+ @Test
+ public void shouldReturnCorrectResultsOnAllDeletionsAfterQueryExecution() throws Exception {
+ final LuceneQuery<Object, Object> query = addValuesAndCreateQuery(2);
+
+ final PageableLuceneQueryResults<Object, Object> pages = query.findPages();
+ assertTrue(pages.hasNext());
+ assertEquals(7, pages.size());
+ region.destroy("A");
+ region.destroy("B");
+ region.destroy("C");
+ region.destroy("D");
+ region.destroy("E");
+ region.destroy("F");
+ region.destroy("G");
+ assertTrue(pages.hasNext());
+ final List<LuceneResultStruct<Object, Object>> page1 = pages.next();
+ assertEquals(2, page1.size());
+ assertFalse(pages.hasNext());
+
+ }
+
private PdxInstance insertAJson(Region region, String key) {
String jsonCustomer = "{"
+ "\"name\": \""+key+"\","
[2/2] incubator-geode git commit: GEODE-11: Index and AEQ stored in
the same disk store as the region
Posted by up...@apache.org.
GEODE-11: Index and AEQ stored in the same disk store as the region
The index and AEQ were stored in the default disk store. Changed the code to set the RegionAtrributes of
the index and AEQ to use the same Disk Store Name as the region. Added a test to verify the disk store name.
Signed-off-by: Dan Smith <ds...@pivotal.io>
This closes #177
Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/6a9a83c0
Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/6a9a83c0
Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/6a9a83c0
Branch: refs/heads/develop
Commit: 6a9a83c01f42271f3208ce50224b8e4a5d3ddb8b
Parents: f8f9454
Author: Aparna Dharmakkan <ad...@pivotal.io>
Authored: Tue Jun 28 18:10:40 2016 -0700
Committer: Dan Smith <up...@apache.org>
Committed: Fri Jul 1 11:46:40 2016 -0700
----------------------------------------------------------------------
.../LuceneIndexForPartitionedRegion.java | 31 ++++++++------
...IndexCreationPersistenceIntegrationTest.java | 17 ++++++++
.../LuceneIndexForPartitionedRegionTest.java | 44 ++++++++++----------
3 files changed, 58 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6a9a83c0/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
index 891a658..af05e7d 100644
--- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
+++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegion.java
@@ -51,10 +51,10 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
/* create index region */
PartitionedRegion dataRegion = getDataRegion();
//assert dataRegion != null;
- RegionAttributes ra = dataRegion.getAttributes();
- DataPolicy dp = ra.getDataPolicy();
+ RegionAttributes regionAttributes = dataRegion.getAttributes();
+ DataPolicy dp = regionAttributes.getDataPolicy();
final boolean withPersistence = dp.withPersistence();
- final boolean withStorage = ra.getPartitionAttributes().getLocalMaxMemory()>0;
+ final boolean withStorage = regionAttributes.getPartitionAttributes().getLocalMaxMemory()>0;
RegionShortcut regionShortCut;
if (withPersistence) {
// TODO: add PartitionedRegionAttributes instead
@@ -63,8 +63,6 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
regionShortCut = RegionShortcut.PARTITION;
}
- // final boolean isOffHeap = ra.getOffHeap();
-
// TODO: 1) dataRegion should be withStorage
// 2) Persistence to Persistence
// 3) Replicate to Replicate, Partition To Partition
@@ -77,13 +75,13 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
final String fileRegionName = createFileRegionName();
PartitionAttributes partitionAttributes = dataRegion.getPartitionAttributes();
if (!fileRegionExists(fileRegionName)) {
- fileRegion = createFileRegion(regionShortCut, fileRegionName, partitionAttributes);
+ fileRegion = createFileRegion(regionShortCut, fileRegionName, partitionAttributes, regionAttributes);
}
// create PR chunkRegion, but not to create its buckets for now
final String chunkRegionName = createChunkRegionName();
if (!chunkRegionExists(chunkRegionName)) {
- chunkRegion = createChunkRegion(regionShortCut, fileRegionName, partitionAttributes, chunkRegionName);
+ chunkRegion = createChunkRegion(regionShortCut, fileRegionName, partitionAttributes, chunkRegionName, regionAttributes);
}
fileSystemStats.setFileSupplier(() -> (int) getFileRegion().getLocalSize());
fileSystemStats.setChunkSupplier(() -> (int) getChunkRegion().getLocalSize());
@@ -123,6 +121,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
if(dataRegion.getAttributes().getDataPolicy().withPersistence()) {
factory.setPersistent(true);
}
+ factory.setDiskStoreName(dataRegion.getAttributes().getDiskStoreName());
factory.setDiskSynchronous(dataRegion.getAttributes().isDiskSynchronous());
factory.setForwardExpirationDestroy(true);
return factory;
@@ -145,8 +144,9 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
Region createFileRegion(final RegionShortcut regionShortCut,
final String fileRegionName,
- final PartitionAttributes partitionAttributes) {
- return createRegion(fileRegionName, regionShortCut, this.regionPath, partitionAttributes);
+ final PartitionAttributes partitionAttributes,
+ final RegionAttributes regionAttributes) {
+ return createRegion(fileRegionName, regionShortCut, this.regionPath, partitionAttributes, regionAttributes);
}
public String createFileRegionName() {
@@ -159,8 +159,8 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
Region<ChunkKey, byte[]> createChunkRegion(final RegionShortcut regionShortCut,
final String fileRegionName,
- final PartitionAttributes partitionAttributes, final String chunkRegionName) {
- return createRegion(chunkRegionName, regionShortCut, fileRegionName, partitionAttributes);
+ final PartitionAttributes partitionAttributes, final String chunkRegionName, final RegionAttributes regionAttributes) {
+ return createRegion(chunkRegionName, regionShortCut, fileRegionName, partitionAttributes, regionAttributes);
}
public String createChunkRegionName() {
@@ -173,8 +173,12 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
return attributesFactory;
}
- protected <K, V> Region<K, V> createRegion(final String regionName, final RegionShortcut regionShortCut,
- final String colocatedWithRegionName, final PartitionAttributes partitionAttributes) {
+ protected <K, V> Region<K, V> createRegion(final String regionName,
+ final RegionShortcut regionShortCut,
+ final String colocatedWithRegionName,
+ final PartitionAttributes partitionAttributes,
+ final RegionAttributes regionAttributes)
+ {
PartitionAttributesFactory partitionAttributesFactory = new PartitionAttributesFactory<String, File>();
partitionAttributesFactory.setColocatedWith(colocatedWithRegionName);
configureLuceneRegionAttributesFactory(partitionAttributesFactory, partitionAttributes);
@@ -183,6 +187,7 @@ public class LuceneIndexForPartitionedRegion extends LuceneIndexImpl {
RegionAttributes baseAttributes = this.cache.getRegionAttributes(regionShortCut.toString());
AttributesFactory factory = new AttributesFactory(baseAttributes);
factory.setPartitionAttributes(partitionAttributesFactory.create());
+ factory.setDiskStoreName(regionAttributes.getDiskStoreName());
RegionAttributes<K, V> attributes = factory.create();
return createRegion(regionName, attributes);
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6a9a83c0/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
index f2fd67c..f121694 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexCreationPersistenceIntegrationTest.java
@@ -159,6 +159,23 @@ public class LuceneIndexCreationPersistenceIntegrationTest extends LuceneIntegra
});
}
+ @Test
+ public void shouldStoreIndexAndQueueInTheSameDiskStoreAsTheRegion() {
+ createIndex(cache, "text");
+ cache.createDiskStoreFactory()
+ .setDiskDirs(new File[] {diskDirRule.get()})
+ .create("DiskStore");
+ cache.createRegionFactory(RegionShortcut.PARTITION_PERSISTENT)
+ .setDiskStoreName("DiskStore")
+ .create(REGION_NAME);
+ final String diskStoreName = cache.getRegion(REGION_NAME).getAttributes().getDiskStoreName();
+ verifyInternalRegions(region -> {
+ assertEquals(diskStoreName, region.getAttributes().getDiskStoreName());
+ });
+ AsyncEventQueue queue = getIndexQueue(cache);
+ assertEquals(diskStoreName, queue.getDiskStoreName());
+ }
+
private void verifyQueryResultSize(String indexName, String regionName, String queryString, String defaultField, int size) throws Exception {
LuceneQuery query = luceneService.createLuceneQueryFactory().create(indexName, regionName, queryString, defaultField);
Awaitility.await().atMost(60, TimeUnit.SECONDS).until(() -> {
http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/6a9a83c0/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
----------------------------------------------------------------------
diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
index 394a2bf..6f38ff4 100644
--- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
+++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneIndexForPartitionedRegionTest.java
@@ -214,8 +214,8 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index.setSearchableFields(new String[]{"field"});
LuceneIndexForPartitionedRegion spy = spy(index);
- doReturn(null).when(spy).createFileRegion(any(), any(), any());
- doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createFileRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ(eq(region));
spy.initialize();
@@ -233,12 +233,12 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index.setSearchableFields(new String[]{"field"});
LuceneIndexForPartitionedRegion spy = spy(index);
- doReturn(null).when(spy).createFileRegion(any(), any(), any());
- doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createFileRegion(any(), any(), any(),any());
+ doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any(),any());
doReturn(null).when(spy).createAEQ(eq(region));
spy.initialize();
- verify(spy).createChunkRegion(eq(RegionShortcut.PARTITION), eq(index.createFileRegionName()), any(), eq(index.createChunkRegionName()));
+ verify(spy).createChunkRegion(eq(RegionShortcut.PARTITION), eq(index.createFileRegionName()), any(), eq(index.createChunkRegionName()),any());
}
@Test
@@ -252,12 +252,12 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index.setSearchableFields(new String[]{"field"});
LuceneIndexForPartitionedRegion spy = spy(index);
- doReturn(null).when(spy).createFileRegion(any(), any(), any());
- doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createFileRegion(any(), any(), any(),any());
+ doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any(),any());
doReturn(null).when(spy).createAEQ(eq(region));
spy.initialize();
- verify(spy).createFileRegion(eq(RegionShortcut.PARTITION), eq(index.createFileRegionName()), any());
+ verify(spy).createFileRegion(eq(RegionShortcut.PARTITION), eq(index.createFileRegionName()), any(),any());
}
@Test
@@ -265,12 +265,13 @@ public class LuceneIndexForPartitionedRegionTest {
String name = "indexName";
String regionPath = "regionName";
GemFireCacheImpl cache = Fakes.cache();
+ RegionAttributes regionAttributes = mock(RegionAttributes.class);
PartitionAttributes partitionAttributes = initializeAttributes(cache);
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
LuceneIndexForPartitionedRegion indexSpy = spy(index);
- indexSpy.createFileRegion(RegionShortcut.PARTITION, index.createFileRegionName(), partitionAttributes);
+ indexSpy.createFileRegion(RegionShortcut.PARTITION, index.createFileRegionName(), partitionAttributes, regionAttributes);
String fileRegionName = index.createFileRegionName();
- verify(indexSpy).createRegion(fileRegionName, RegionShortcut.PARTITION, regionPath, partitionAttributes);
+ verify(indexSpy).createRegion(fileRegionName, RegionShortcut.PARTITION, regionPath, partitionAttributes, regionAttributes);
verify(cache).createVMRegion(eq(fileRegionName), any(), any());
}
@@ -280,12 +281,13 @@ public class LuceneIndexForPartitionedRegionTest {
String regionPath = "regionName";
GemFireCacheImpl cache = Fakes.cache();
PartitionAttributes partitionAttributes = initializeAttributes(cache);
+ RegionAttributes regionAttributes = mock(RegionAttributes.class);
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
LuceneIndexForPartitionedRegion indexSpy = spy(index);
String chunkRegionName = index.createChunkRegionName();
String fileRegionName = index.createFileRegionName();
- indexSpy.createChunkRegion(RegionShortcut.PARTITION, fileRegionName, partitionAttributes, chunkRegionName);
- verify(indexSpy).createRegion(chunkRegionName, RegionShortcut.PARTITION, fileRegionName, partitionAttributes);
+ indexSpy.createChunkRegion(RegionShortcut.PARTITION, fileRegionName, partitionAttributes, chunkRegionName, regionAttributes);
+ verify(indexSpy).createRegion(chunkRegionName, RegionShortcut.PARTITION, fileRegionName, partitionAttributes, regionAttributes);
verify(cache).createVMRegion(eq(chunkRegionName), any(), any());
}
@@ -300,12 +302,12 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index.setSearchableFields(new String[]{"field"});
LuceneIndexForPartitionedRegion spy = spy(index);
- doReturn(null).when(spy).createFileRegion(any(), any(), any());
- doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createFileRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ(any());
spy.initialize();
- verify(spy).createChunkRegion(eq(RegionShortcut.PARTITION_PERSISTENT), eq(index.createFileRegionName()), any(), eq(index.createChunkRegionName()));
+ verify(spy).createChunkRegion(eq(RegionShortcut.PARTITION_PERSISTENT), eq(index.createFileRegionName()), any(), eq(index.createChunkRegionName()), any());
}
@Test
@@ -319,12 +321,12 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index.setSearchableFields(new String[]{"field"});
LuceneIndexForPartitionedRegion spy = spy(index);
- doReturn(null).when(spy).createFileRegion(any(), any(), any());
- doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createFileRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ(any());
spy.initialize();
- verify(spy).createFileRegion(eq(RegionShortcut.PARTITION_PERSISTENT), eq(index.createFileRegionName()), any());
+ verify(spy).createFileRegion(eq(RegionShortcut.PARTITION_PERSISTENT), eq(index.createFileRegionName()), any(), any());
}
@Test
@@ -338,13 +340,13 @@ public class LuceneIndexForPartitionedRegionTest {
LuceneIndexForPartitionedRegion index = new LuceneIndexForPartitionedRegion(name, regionPath, cache);
index.setSearchableFields(new String[]{"field"});
LuceneIndexForPartitionedRegion spy = spy(index);
- doReturn(null).when(spy).createFileRegion(any(), any(), any());
- doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createFileRegion(any(), any(), any(), any());
+ doReturn(null).when(spy).createChunkRegion(any(), any(), any(), any(), any());
doReturn(null).when(spy).createAEQ(any());
spy.initialize();
spy.initialize();
- verify(spy).createFileRegion(eq(RegionShortcut.PARTITION_PERSISTENT), eq(index.createFileRegionName()), any());
+ verify(spy).createFileRegion(eq(RegionShortcut.PARTITION_PERSISTENT), eq(index.createFileRegionName()), any(), any());
}
@Test