Author: sshafroi
Date: 2008-08-08 09:09:25 +0200 (Fri, 08 Aug 2008)
New Revision: 6756
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/AbstractClause.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndNotClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/DefaultOperatorClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/EmailClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/IntegerClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/NotClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/NumberGroupClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/OrClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhoneNumberClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhraseClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/UrlClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/WordClauseImpl.java
trunk/query-api/src/main/java/no/sesat/search/query/parser/XorClauseImpl.java
Log:
Make it easy to switch between different types of ReferenceMap types. This is
related to Issue SKER4940: (Use soft references for most of the clause caches.)
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/AbstractClause.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/AbstractClause.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/AbstractClause.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -70,8 +70,8 @@
private final Set<TokenPredicate> knownPredicates;
private final Set<TokenPredicate> possiblePredicates;
+ public static final ReferenceMap.Type DFAULT_REFERENCE_MAP_TYPE =
ReferenceMap.Type.WEAK;
-
/**
* See if there is an identical and immutable Clause already in use in the
JVM.
* @param <T>
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -97,7 +97,7 @@
if(weakCache == null){
weakCache = new ReferenceMap<String,AndClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<AndClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndNotClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndNotClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/AndNotClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -89,7 +89,7 @@
if( weakCache == null ){
weakCache = new ReferenceMap<String,AndNotClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new
ConcurrentHashMap<String,Reference<AndNotClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/DefaultOperatorClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/DefaultOperatorClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/DefaultOperatorClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -98,7 +98,7 @@
if(weakCache == null){
weakCache = new ReferenceMap<String,DefaultOperatorClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new
ConcurrentHashMap<String,Reference<DefaultOperatorClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/EmailClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/EmailClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/EmailClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -73,7 +73,7 @@
if( weakCache == null ){
weakCache = new ReferenceMap<String,EmailClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<EmailClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/IntegerClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/IntegerClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/IntegerClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -72,7 +72,7 @@
if(weakCache == null){
weakCache = new ReferenceMap<String,IntegerClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<IntegerClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/NotClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/NotClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/NotClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -86,7 +86,7 @@
if( weakCache == null ){
weakCache = new ReferenceMap<String,NotClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<NotClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/NumberGroupClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/NumberGroupClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/NumberGroupClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -75,7 +75,7 @@
if(weakCache == null){
weakCache = new ReferenceMap<String,NumberGroupClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new
ConcurrentHashMap<String,Reference<NumberGroupClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/OrClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/OrClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/OrClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -97,7 +97,7 @@
if(weakCache == null){
weakCache = new ReferenceMap<String,OrClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<OrClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhoneNumberClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhoneNumberClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhoneNumberClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -72,7 +72,7 @@
if(weakCache == null){
weakCache = new ReferenceMap<String,PhoneNumberClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new
ConcurrentHashMap<String,Reference<PhoneNumberClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhraseClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhraseClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/PhraseClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -71,7 +71,7 @@
if( weakCache == null ){
weakCache = new ReferenceMap<String,PhraseClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<PhraseClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/UrlClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/UrlClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/UrlClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -73,7 +73,7 @@
if( weakCache == null ){
weakCache = new ReferenceMap<String,UrlClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<UrlClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/WordClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/WordClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/WordClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -72,7 +72,7 @@
if(weakCache == null ){
weakCache = new ReferenceMap<String,WordClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<WordClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
Modified:
trunk/query-api/src/main/java/no/sesat/search/query/parser/XorClauseImpl.java
===================================================================
---
trunk/query-api/src/main/java/no/sesat/search/query/parser/XorClauseImpl.java
2008-08-04 14:10:26 UTC (rev 6755)
+++
trunk/query-api/src/main/java/no/sesat/search/query/parser/XorClauseImpl.java
2008-08-08 07:09:25 UTC (rev 6756)
@@ -107,7 +107,7 @@
if( weakCache == null ){
weakCache = new ReferenceMap<String,XorClauseImpl>(
- ReferenceMap.Type.WEAK,
+ DFAULT_REFERENCE_MAP_TYPE,
new ConcurrentHashMap<String,Reference<XorClauseImpl>>(
WEAK_CACHE_INITIAL_CAPACITY,
WEAK_CACHE_LOAD_FACTOR,
_______________________________________________
Kernel-commits mailing list
[email protected]
http://sesat.no/mailman/listinfo/kernel-commits
