Author: epbernard
Date: 2008-11-08 17:25:28 -0500 (Sat, 08 Nov 2008)
New Revision: 15534
Modified:
search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java
search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java
search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java
search/trunk/src/test/org/hibernate/search/test/filter/Driver.java
Log:
HSEARCH-294 rename to INSTANCE_AND_DOCIDSETRESULTS
Modified: search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java
===================================================================
---
search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java 2008-11-07
19:58:13 UTC (rev 15533)
+++
search/trunk/src/java/org/hibernate/search/annotations/FilterCacheModeType.java 2008-11-08
22:25:28 UTC (rev 15534)
@@ -15,7 +15,7 @@
/**
* The filter instance is cached by Hibernate Search and reused across
- * concurrent <code>Filter.bits()</code> calls.
+ * concurrent <code>Filter.getDocIdSet()</code> calls.
* Results are not cached by Hibernate Search.
*
* @see org.apache.lucene.search.Filter#bits(org.apache.lucene.index.IndexReader)
@@ -24,13 +24,13 @@
INSTANCE_ONLY,
/**
- * Both the filter instance and the <code>BitSet</code> results are cached.
+ * Both the filter instance and the <code>DocIdSet</code> results are
cached.
* The filter instance is cached by Hibernate Search and reused across
- * concurrent <code>Filter.bits()</code> calls.
- * <code>BitSet</code> results are cached per
<code>IndexReader</code>.
+ * concurrent <code>Filter.getDocIdSet()</code> calls.
+ * <code>DocIdSet</code> results are cached per
<code>IndexReader</code>.
*
* @see org.apache.lucene.search.Filter#bits(org.apache.lucene.index.IndexReader)
*/
- INSTANCE_AND_BITSETRESULTS
+ INSTANCE_AND_DOCIDSETRESULTS
}
Modified: search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java
===================================================================
---
search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java 2008-11-07
19:58:13 UTC (rev 15533)
+++
search/trunk/src/java/org/hibernate/search/annotations/FullTextFilterDef.java 2008-11-08
22:25:28 UTC (rev 15534)
@@ -37,5 +37,5 @@
/**
* Cache mode for the filter. Default to instance and results caching
*/
- FilterCacheModeType cache() default FilterCacheModeType.INSTANCE_AND_BITSETRESULTS;
+ FilterCacheModeType cache() default FilterCacheModeType.INSTANCE_AND_DOCIDSETRESULTS;
}
Modified: search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java
===================================================================
---
search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java 2008-11-07
19:58:13 UTC (rev 15533)
+++
search/trunk/src/java/org/hibernate/search/util/FilterCacheModeTypeHelper.java 2008-11-08
22:25:28 UTC (rev 15534)
@@ -13,7 +13,7 @@
switch ( type ) {
case NONE:
return false;
- case INSTANCE_AND_BITSETRESULTS:
+ case INSTANCE_AND_DOCIDSETRESULTS:
return true;
case INSTANCE_ONLY:
return true;
@@ -26,7 +26,7 @@
switch ( type ) {
case NONE:
return false;
- case INSTANCE_AND_BITSETRESULTS:
+ case INSTANCE_AND_DOCIDSETRESULTS:
return true;
case INSTANCE_ONLY:
return false;
Modified: search/trunk/src/test/org/hibernate/search/test/filter/Driver.java
===================================================================
--- search/trunk/src/test/org/hibernate/search/test/filter/Driver.java 2008-11-07 19:58:13
UTC (rev 15533)
+++ search/trunk/src/test/org/hibernate/search/test/filter/Driver.java 2008-11-08 22:25:28
UTC (rev 15534)
@@ -22,8 +22,8 @@
@Indexed
@FullTextFilterDefs( {
@FullTextFilterDef(name = "bestDriver", impl = BestDriversFilter.class, cache
= FilterCacheModeType.NONE), //actual Filter implementation
- @FullTextFilterDef(name = "security", impl = SecurityFilterFactory.class,
cache = FilterCacheModeType.INSTANCE_AND_BITSETRESULTS), //Filter factory with parameters
- @FullTextFilterDef(name = "cacheresultstest", impl =
ExcludeAllFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_BITSETRESULTS),
+ @FullTextFilterDef(name = "security", impl = SecurityFilterFactory.class,
cache = FilterCacheModeType.INSTANCE_AND_DOCIDSETRESULTS), //Filter factory with
parameters
+ @FullTextFilterDef(name = "cacheresultstest", impl =
ExcludeAllFilterFactory.class, cache = FilterCacheModeType.INSTANCE_AND_DOCIDSETRESULTS),
@FullTextFilterDef(name = "cacheinstancetest", impl =
InstanceBasedExcludeAllFilter.class, cache = FilterCacheModeType.INSTANCE_ONLY)
})
public class Driver {
Show replies by date