Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 0EAE3200B57 for ; Mon, 27 Jun 2016 23:20:57 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 0DA6C160A73; Mon, 27 Jun 2016 21:20:57 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 88627160A5B for ; Mon, 27 Jun 2016 23:20:55 +0200 (CEST) Received: (qmail 36460 invoked by uid 500); 27 Jun 2016 21:20:54 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 36443 invoked by uid 99); 27 Jun 2016 21:20:54 -0000 Received: from pnap-us-west-generic-nat.apache.org (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2016 21:20:54 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 499C2CB753 for ; Mon, 27 Jun 2016 21:20:54 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -4.507 X-Spam-Level: X-Spam-Status: No, score=-4.507 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_DNSWL_HI=-5, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=-1.287] autolearn=disabled Received: from mx2-lw-us.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id zGMjrEE_nNkL for ; Mon, 27 Jun 2016 21:20:52 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx2-lw-us.apache.org (ASF Mail Server at mx2-lw-us.apache.org) with SMTP id 59AB95FE66 for ; Mon, 27 Jun 2016 21:20:52 +0000 (UTC) Received: (qmail 35967 invoked by uid 99); 27 Jun 2016 21:20:51 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 27 Jun 2016 21:20:51 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A24FDE9601; Mon, 27 Jun 2016 21:20:51 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jinmeiliao@apache.org To: commits@geode.incubator.apache.org Date: Mon, 27 Jun 2016 21:21:18 -0000 Message-Id: <9012ccfbc4964768a43084f091b344e7@git.apache.org> In-Reply-To: <24ba314e899c4361b472ed9567d1f7cb@git.apache.org> References: <24ba314e899c4361b472ed9567d1f7cb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [28/50] [abbrv] incubator-geode git commit: GEODE-11: PageableLuceneQueryResults extends Iterator archived-at: Mon, 27 Jun 2016 21:20:57 -0000 GEODE-11: PageableLuceneQueryResults extends Iterator Changing PageableLuceneQueryResults to extend Iterator> so that it can be used with utilities that expect an iterator. This closes #169 Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/8bbea5b5 Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/8bbea5b5 Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/8bbea5b5 Branch: refs/heads/feature/GEODE-1571 Commit: 8bbea5b5809ffefb43f669b3ab59830797f50897 Parents: 2c4e17f Author: Aparna Dharmakkan Authored: Mon Jun 20 15:31:22 2016 -0700 Committer: Dan Smith Committed: Fri Jun 24 14:41:42 2016 -0700 ---------------------------------------------------------------------- .../lucene/PageableLuceneQueryResults.java | 7 ++-- .../cache/lucene/internal/LuceneQueryImpl.java | 8 ++-- .../PageableLuceneQueryResultsImpl.java | 11 ++--- .../LuceneIndexMaintenanceIntegrationTest.java | 2 +- .../gemfire/cache/lucene/LuceneQueriesBase.java | 2 +- .../lucene/LuceneQueriesIntegrationTest.java | 6 +-- .../internal/LuceneQueryImplJUnitTest.java | 13 +----- ...PageableLuceneQueryResultsImplJUnitTest.java | 44 ++++++++++++++------ .../cache/lucene/test/LuceneTestUtilities.java | 5 +-- 9 files changed, 53 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/PageableLuceneQueryResults.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/PageableLuceneQueryResults.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/PageableLuceneQueryResults.java index ef229da..c2def44 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/PageableLuceneQueryResults.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/PageableLuceneQueryResults.java @@ -19,6 +19,7 @@ package com.gemstone.gemfire.cache.lucene; +import java.util.Iterator; import java.util.List; import com.gemstone.gemfire.annotations.Experimental; @@ -32,7 +33,7 @@ import com.gemstone.gemfire.annotations.Experimental; * @param The type of the value */ @Experimental -public interface PageableLuceneQueryResults { +public interface PageableLuceneQueryResults extends Iterator>> { /** * @return total number of hits for this query */ @@ -48,10 +49,10 @@ public interface PageableLuceneQueryResults { * * @return a page of results, or null if there are no more pages */ - public List> getNextPage(); + public List> next(); /** * True if there another page of results. */ - public boolean hasNextPage(); + public boolean hasNext(); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java index 3125193..ef2f4ee 100644 --- a/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java +++ b/geode-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImpl.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache.lucene.internal; -import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.List; @@ -87,12 +86,11 @@ public class LuceneQueryImpl implements LuceneQuery { @Override public List> findResults() throws LuceneQueryException { PageableLuceneQueryResults pages = findPages(0); - final List> page = pages.getNextPage(); - - if(page == null) { + if(!pages.hasNext()) { return Collections.emptyList(); } - return page; + + return pages.next(); } @Override http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/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 487b740..17668a7 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 @@ -22,6 +22,7 @@ package com.gemstone.gemfire.cache.lucene.internal; import java.util.ArrayList; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.lucene.PageableLuceneQueryResults; @@ -69,9 +70,9 @@ public class PageableLuceneQueryResultsImpl implements PageableLuceneQueryR } @Override - public List> getNextPage() { - if(!hasNextPage()) { - return null; + public List> next() { + if(!hasNext()) { + throw new NoSuchElementException(); } int end = currentHit + pageSize; @@ -84,7 +85,7 @@ public class PageableLuceneQueryResultsImpl implements PageableLuceneQueryR } Map values = userRegion.getAll(keys); - + ArrayList> results = new ArrayList>(hits.size()); for(EntryScore score : scores) { V value = values.get(score.getKey()); @@ -98,7 +99,7 @@ public class PageableLuceneQueryResultsImpl implements PageableLuceneQueryR } @Override - public boolean hasNextPage() { + public boolean hasNext() { return hits.size() > currentHit; } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java index d0c91e5..7d7fa3d 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneIndexMaintenanceIntegrationTest.java @@ -155,7 +155,7 @@ public class LuceneIndexMaintenanceIntegrationTest extends LuceneIntegrationTest index.waitUntilFlushed(WAIT_FOR_FLUSH_TIME); // Execute query to fetch all the values for "description" field. LuceneQuery query = luceneService.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "description:\"hello world\"", DEFAULT_FIELD); - LuceneQueryResults results = query.search(); + PageableLuceneQueryResults results = query.findPages(); // The query should return 0 results. assertEquals(0, results.size()); } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java index 77ce0bb..301d5af 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/LuceneQueriesBase.java @@ -152,7 +152,7 @@ public abstract class LuceneQueriesBase extends LuceneDUnitTest { query = service.createLuceneQueryFactory().create(INDEX_NAME, REGION_NAME, "text:world", DEFAULT_FIELD); PageableLuceneQueryResults results = query.findPages(); assertEquals(3, results.size()); - List> page = results.getNextPage(); + List> page = results.next(); Map data = new HashMap(); for (LuceneResultStruct row : page) { http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/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 d563f4e..988e4f5 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 @@ -122,10 +122,10 @@ public class LuceneQueriesIntegrationTest extends LuceneIntegrationTest { final LuceneQuery query = addValuesAndCreateQuery(); final PageableLuceneQueryResults pages = query.findPages(); - assertTrue(pages.hasNextPage()); + assertTrue(pages.hasNext()); assertEquals(3, pages.size()); - final List> page1 = pages.getNextPage(); - final List> page2 = pages.getNextPage(); + final List> page1 = pages.next(); + final List> page2 = pages.next(); List> allEntries=new ArrayList<>(); allEntries.addAll(page1); allEntries.addAll(page2); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java index 95371e4..c325f55 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/LuceneQueryImplJUnitTest.java @@ -19,7 +19,6 @@ package com.gemstone.gemfire.cache.lucene.internal; -import static com.gemstone.gemfire.cache.lucene.test.LuceneTestUtilities.DEFAULT_FIELD; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.mockito.Matchers.any; @@ -32,20 +31,14 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.After; import org.junit.Before; import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.ArgumentCaptor; import com.gemstone.gemfire.cache.Region; -import com.gemstone.gemfire.cache.RegionShortcut; import com.gemstone.gemfire.cache.execute.Execution; -import com.gemstone.gemfire.cache.execute.FunctionAdapter; -import com.gemstone.gemfire.cache.execute.FunctionContext; -import com.gemstone.gemfire.cache.execute.FunctionService; import com.gemstone.gemfire.cache.execute.ResultCollector; -import com.gemstone.gemfire.cache.lucene.LuceneIntegrationTest; import com.gemstone.gemfire.cache.lucene.LuceneQueryException; import com.gemstone.gemfire.cache.lucene.LuceneQueryProvider; import com.gemstone.gemfire.cache.lucene.PageableLuceneQueryResults; @@ -55,10 +48,6 @@ import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunction; import com.gemstone.gemfire.cache.lucene.internal.distributed.LuceneFunctionContext; import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntries; import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollector; -import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntriesCollectorManager; -import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector; -import com.gemstone.gemfire.internal.cache.ValidatingDiskRegion; -import com.gemstone.gemfire.test.junit.categories.IntegrationTest; import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) @@ -151,7 +140,7 @@ public class LuceneQueryImplJUnitTest { assertEquals("index", context.getIndexName()); assertEquals(5, results.getMaxScore(), 0.01); - final List> page = results.getNextPage(); + final List> page = results.next(); assertEquals(1, page.size()); LuceneResultStruct element = page.iterator().next(); assertEquals("hi", element.getKey()); http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java index 7703a74..902052b 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/internal/PageableLuceneQueryResultsImplJUnitTest.java @@ -22,13 +22,17 @@ import static org.junit.Assert.*; import java.util.ArrayList; import java.util.Collection; +import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.NoSuchElementException; import org.junit.Before; +import org.junit.Rule; import org.junit.Test; import org.junit.experimental.categories.Category; +import org.junit.rules.ExpectedException; import org.mockito.Mockito; import org.mockito.invocation.InvocationOnMock; import org.mockito.stubbing.Answer; @@ -36,11 +40,15 @@ import org.mockito.stubbing.Answer; import com.gemstone.gemfire.cache.Region; import com.gemstone.gemfire.cache.lucene.LuceneResultStruct; import com.gemstone.gemfire.cache.lucene.internal.distributed.EntryScore; +import com.gemstone.gemfire.cache.lucene.internal.distributed.TopEntries; import com.gemstone.gemfire.test.junit.categories.UnitTest; @Category(UnitTest.class) public class PageableLuceneQueryResultsImplJUnitTest { + @Rule + public ExpectedException thrown = ExpectedException.none(); + private List> hits; private List expected = new ArrayList(); private Region userRegion; @@ -86,22 +94,23 @@ public class PageableLuceneQueryResultsImplJUnitTest { assertEquals(23, results.size()); - assertTrue(results.hasNextPage()); + assertTrue(results.hasNext()); - List> next = results.getNextPage(); + List> next = results.next(); assertEquals(expected.subList(0, 10), next); - assertTrue(results.hasNextPage()); - next = results.getNextPage(); + assertTrue(results.hasNext()); + next = results.next(); assertEquals(expected.subList(10, 20), next); - assertTrue(results.hasNextPage()); - next = results.getNextPage(); + assertTrue(results.hasNext()); + next = results.next(); assertEquals(expected.subList(20, 23), next); - assertFalse(results.hasNextPage()); - assertNull(results.getNextPage()); + assertFalse(results.hasNext()); + thrown.expect(NoSuchElementException.class); + results.next(); } @Test @@ -110,13 +119,24 @@ public class PageableLuceneQueryResultsImplJUnitTest { assertEquals(23, results.size()); - assertTrue(results.hasNextPage()); + assertTrue(results.hasNext()); - List> next = results.getNextPage(); + List> next = results.next(); assertEquals(expected, next); - assertFalse(results.hasNextPage()); - assertNull(results.getNextPage()); + assertFalse(results.hasNext()); + thrown.expect(NoSuchElementException.class); + results.next(); + } + + @Test + public void shouldThrowNoSuchElementExceptionFromNextWithNoMorePages() { + PageableLuceneQueryResultsImpl results = new PageableLuceneQueryResultsImpl<>( + Collections.emptyList(), userRegion, 0); + + assertFalse(results.hasNext()); + thrown.expect(NoSuchElementException.class); + results.next(); } } http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/8bbea5b5/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java ---------------------------------------------------------------------- diff --git a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java index 06c3c7d..8aca11c 100644 --- a/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java +++ b/geode-lucene/src/test/java/com/gemstone/gemfire/cache/lucene/test/LuceneTestUtilities.java @@ -21,7 +21,6 @@ package com.gemstone.gemfire.cache.lucene.test; import static org.junit.Assert.*; import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.HashSet; import java.util.Set; @@ -100,8 +99,8 @@ public class LuceneTestUtilities { public static void verifyQueryKeyAndValues(LuceneQuery query, HashMap expectedResults) throws LuceneQueryException { HashMap actualResults = new HashMap<>(); final PageableLuceneQueryResults results = query.findPages(); - while(results.hasNextPage()) { - results.getNextPage().stream() + while(results.hasNext()) { + results.next().stream() .forEach(struct -> { Object value = struct.getValue(); if (value instanceof PdxInstance) {