Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 8DEBE18F5A for ; Mon, 9 Nov 2015 21:37:30 +0000 (UTC) Received: (qmail 88790 invoked by uid 500); 9 Nov 2015 21:37:30 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 88764 invoked by uid 500); 9 Nov 2015 21:37:30 -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 88755 invoked by uid 99); 9 Nov 2015 21:37:30 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2015 21:37:30 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 22E381A0A1F for ; Mon, 9 Nov 2015 21:37:30 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.77 X-Spam-Level: * X-Spam-Status: No, score=1.77 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id F59lU9azu8nc for ; Mon, 9 Nov 2015 21:37:19 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A6ECF25475 for ; Mon, 9 Nov 2015 21:36:56 +0000 (UTC) Received: (qmail 77862 invoked by uid 99); 9 Nov 2015 21:36:53 -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, 09 Nov 2015 21:36:53 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B395DE0991; Mon, 9 Nov 2015 21:36:53 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ashvin@apache.org To: commits@geode.incubator.apache.org Date: Mon, 09 Nov 2015 21:37:38 -0000 Message-Id: <97e2496b5cbf4e2e870072fa26ba8baf@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [47/50] [abbrv] incubator-geode git commit: GEODE-11: Mark Lucene API as experimental GEODE-11: Mark Lucene API as experimental Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/3e87134e Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/3e87134e Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/3e87134e Branch: refs/heads/feature/GEODE-11 Commit: 3e87134eb5aeee6514286727c294cef87fdbf6ee Parents: afa0a6e Author: Ashvin Agrawal Authored: Sun Nov 8 21:37:25 2015 -0800 Committer: Ashvin Agrawal Committed: Sun Nov 8 21:37:25 2015 -0800 ---------------------------------------------------------------------- gemfire-lucene/build.gradle | 2 ++ .../java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java | 4 +++- .../java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java | 3 +++ .../com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java | 4 +++- .../com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java | 2 ++ .../com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java | 5 +++-- .../com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java | 3 ++- .../java/com/gemstone/gemfire/cache/lucene/LuceneService.java | 5 ++--- .../gemstone/gemfire/cache/lucene/LuceneServiceProvider.java | 2 ++ .../cache/lucene/internal/distributed/CollectorManager.java | 2 ++ .../cache/lucene/internal/repository/IndexResultCollector.java | 3 +++ 11 files changed, 27 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/build.gradle ---------------------------------------------------------------------- diff --git a/gemfire-lucene/build.gradle b/gemfire-lucene/build.gradle index 3303a69..40313c5 100644 --- a/gemfire-lucene/build.gradle +++ b/gemfire-lucene/build.gradle @@ -1,5 +1,7 @@ dependencies { provided project(':gemfire-core') + provided project(':gemfire-common') + compile 'org.apache.lucene:lucene-analyzers-common:5.3.0' compile 'org.apache.lucene:lucene-core:5.3.0' compile 'org.apache.lucene:lucene-queries:5.3.0' http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java index 49b74b1..11c4e95 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneIndex.java @@ -21,6 +21,8 @@ import java.util.Map; import org.apache.lucene.analysis.Analyzer; +import com.gemstone.gemfire.annotations.Experimental; + /** * An lucene index is built over the data stored in a GemFire Region. @@ -31,8 +33,8 @@ import org.apache.lucene.analysis.Analyzer; *

* * @author Xiaojian Zhou - * @since 8.5 */ +@Experimental public interface LuceneIndex { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java index e10b686..2de9c0b 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQuery.java @@ -16,12 +16,15 @@ */ package com.gemstone.gemfire.cache.lucene; +import com.gemstone.gemfire.annotations.Experimental; + /** * Provides wrapper object of Lucene's Query object and execute the search. *

Instances of this interface are created using * {@link LuceneQueryFactory#create}. * */ +@Experimental public interface LuceneQuery { /** * Execute the search and get results. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java index 6604926..b707c52 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryFactory.java @@ -18,6 +18,8 @@ package com.gemstone.gemfire.cache.lucene; import org.apache.lucene.queryparser.classic.ParseException; +import com.gemstone.gemfire.annotations.Experimental; + /** * Factory for creating instances of {@link LuceneQuery}. * To get an instance of this factory call {@link LuceneService#createLuceneQueryFactory}. @@ -26,8 +28,8 @@ import org.apache.lucene.queryparser.classic.ParseException; * call {@link #create} to produce a {@link LuceneQuery} instance. * * @author Xiaojian Zhou - * @since 8.5 */ +@Experimental public interface LuceneQueryFactory { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java index cad9095..82f486c 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryProvider.java @@ -4,6 +4,7 @@ import java.io.Serializable; import org.apache.lucene.search.Query; +import com.gemstone.gemfire.annotations.Experimental; import com.gemstone.gemfire.cache.query.QueryException; /** @@ -14,6 +15,7 @@ import com.gemstone.gemfire.cache.query.QueryException; * distributed system. Implementation of DataSerializable can provide a zero-argument constructor that will be invoked * when they are read with DataSerializer.readObject. */ +@Experimental public interface LuceneQueryProvider extends Serializable { /** * @return A Lucene Query object which could be used for executing Lucene Search on indexed data http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java index 62aada2..cdc8b10 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneQueryResults.java @@ -2,17 +2,18 @@ package com.gemstone.gemfire.cache.lucene; import java.util.List; +import com.gemstone.gemfire.annotations.Experimental; + /** *

* Defines the interface for a container of lucene query result collected from function execution.
* * @author Xiaojian Zhou - * @since 8.5 * * @param The type of the key * @param The type of the value */ - +@Experimental public interface LuceneQueryResults { /** * @return total number of hits for this query http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java index 1cf3c7c..f904d93 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneResultStruct.java @@ -16,14 +16,15 @@ */ package com.gemstone.gemfire.cache.lucene; +import com.gemstone.gemfire.annotations.Experimental; /** *

* Abstract data structure for one item in query result. * * @author Xiaojian Zhou - * @since 8.5 */ +@Experimental public interface LuceneResultStruct { /** * Return the value associated with the given field name http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java index 6bbb4fd..fbd6dad 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneService.java @@ -21,10 +21,8 @@ import java.util.Map; import org.apache.lucene.analysis.Analyzer; -import com.gemstone.gemfire.cache.Cache; +import com.gemstone.gemfire.annotations.Experimental; import com.gemstone.gemfire.cache.GemFireCache; -import com.gemstone.gemfire.cache.lucene.internal.LuceneServiceImpl; -import com.gemstone.gemfire.internal.cache.extension.Extensible; /** * LuceneService instance is a singleton for each cache. It will be created in cache @@ -70,6 +68,7 @@ import com.gemstone.gemfire.internal.cache.extension.Extensible; * @author Xiaojian Zhou * */ +@Experimental public interface LuceneService { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java index 35427ae..72ec554 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/LuceneServiceProvider.java @@ -1,5 +1,6 @@ package com.gemstone.gemfire.cache.lucene; +import com.gemstone.gemfire.annotations.Experimental; import com.gemstone.gemfire.cache.Cache; import com.gemstone.gemfire.cache.lucene.internal.InternalLuceneService; import com.gemstone.gemfire.internal.cache.InternalCache; @@ -9,6 +10,7 @@ import com.gemstone.gemfire.internal.cache.InternalCache; * instance of the LuceneService. * */ +@Experimental public class LuceneServiceProvider { /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java index 41c3f5f..904a47e 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/distributed/CollectorManager.java @@ -3,6 +3,7 @@ package com.gemstone.gemfire.cache.lucene.internal.distributed; import java.io.IOException; import java.util.Collection; +import com.gemstone.gemfire.annotations.Experimental; import com.gemstone.gemfire.cache.lucene.internal.repository.IndexRepository; import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollector; @@ -16,6 +17,7 @@ import com.gemstone.gemfire.cache.lucene.internal.repository.IndexResultCollecto * * @param Type of IndexResultCollector created by this manager */ +@Experimental public interface CollectorManager { /** * @param name Name/Identifier for this collector. For e.g. region/bucketId. http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/3e87134e/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java ---------------------------------------------------------------------- diff --git a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java index 94931a4..fa867e1 100644 --- a/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java +++ b/gemfire-lucene/src/main/java/com/gemstone/gemfire/cache/lucene/internal/repository/IndexResultCollector.java @@ -1,9 +1,12 @@ package com.gemstone.gemfire.cache.lucene.internal.repository; +import com.gemstone.gemfire.annotations.Experimental; + /** * Interface for collection results of a query on * an IndexRepository. See {@link IndexRepository#query(org.apache.lucene.search.Query, int, IndexResultCollector)} */ +@Experimental public interface IndexResultCollector { /** * @return Name/identifier of this collector