cutting 2004/07/21 12:05:46
Modified: . CHANGES.txt
src/java/org/apache/lucene/search FieldCacheImpl.java
FieldSortedHitQueue.java
Log:
Fixed a performance bug in hit sorting code, #30240.
Revision Changes Path
1.95 +7 -1 jakarta-lucene/CHANGES.txt
Index: CHANGES.txt
===================================================================
RCS file: /home/cvs/jakarta-lucene/CHANGES.txt,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- CHANGES.txt 1 Jul 2004 17:40:41 -0000 1.94
+++ CHANGES.txt 21 Jul 2004 19:05:46 -0000 1.95
@@ -2,6 +2,12 @@
$Id$
+1.5 RC1
+
+ 1. Fixed a performance bug in hit sorting code, where values were not
+ correctly cached. (Aviran via cutting)
+
+
1.4 final
1. Added "an" to the list of stop words in StopAnalyzer, to complement
1.3 +31 -21
jakarta-lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java
Index: FieldCacheImpl.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/FieldCacheImpl.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- FieldCacheImpl.java 24 May 2004 22:51:42 -0000 1.2
+++ FieldCacheImpl.java 21 Jul 2004 19:05:46 -0000 1.3
@@ -24,6 +24,7 @@
import java.io.IOException;
import java.util.Map;
import java.util.WeakHashMap;
+import java.util.HashMap;
/**
* Expert: The default cache implementation, storing all values in memory.
@@ -40,35 +41,29 @@
/** Expert: Every key in the internal cache is of this type. */
static class Entry {
- final IndexReader reader; // which Reader
final String field; // which Field
final int type; // which SortField type
final Object custom; // which custom comparator
- final int hashcode; // unique for this object
/** Creates one of these objects. */
- Entry (IndexReader reader, String field, int type) {
- this.reader = reader;
+ Entry (String field, int type) {
this.field = field.intern();
this.type = type;
this.custom = null;
- this.hashcode = reader.hashCode() ^ field.hashCode() ^ type;
}
/** Creates one of these objects for a custom comparator. */
- Entry (IndexReader reader, String field, Object custom) {
- this.reader = reader;
+ Entry (String field, Object custom) {
this.field = field.intern();
this.type = SortField.CUSTOM;
this.custom = custom;
- this.hashcode = reader.hashCode() ^ field.hashCode() ^ type ^
custom.hashCode();
}
- /** Two of these are equal iff they reference the same reader, field and type.
*/
+ /** Two of these are equal iff they reference the same field and type. */
public boolean equals (Object o) {
if (o instanceof Entry) {
Entry other = (Entry) o;
- if (other.reader == reader && other.field == field && other.type == type) {
+ if (other.field == field && other.type == type) {
if (other.custom == null) {
if (custom == null) return true;
} else if (other.custom.equals (custom)) {
@@ -79,9 +74,9 @@
return false;
}
- /** Composes a hashcode based on the referenced reader, field and type. */
+ /** Composes a hashcode based on the field and type. */
public int hashCode() {
- return hashcode;
+ return field.hashCode() ^ type ^ (custom==null ? 0 : custom.hashCode());
}
}
@@ -91,33 +86,47 @@
/** See if an object is in the cache. */
Object lookup (IndexReader reader, String field, int type) {
- Entry entry = new Entry (reader, field, type);
+ Entry entry = new Entry (field, type);
synchronized (this) {
- return cache.get (entry);
+ HashMap readerCache = (HashMap)cache.get(reader);
+ if (readerCache == null) return null;
+ return readerCache.get (entry);
}
}
/** See if a custom object is in the cache. */
Object lookup (IndexReader reader, String field, Object comparer) {
- Entry entry = new Entry (reader, field, comparer);
+ Entry entry = new Entry (field, comparer);
synchronized (this) {
- return cache.get (entry);
+ HashMap readerCache = (HashMap)cache.get(reader);
+ if (readerCache == null) return null;
+ return readerCache.get (entry);
}
}
/** Put an object into the cache. */
Object store (IndexReader reader, String field, int type, Object value) {
- Entry entry = new Entry (reader, field, type);
+ Entry entry = new Entry (field, type);
synchronized (this) {
- return cache.put (entry, value);
+ HashMap readerCache = (HashMap)cache.get(reader);
+ if (readerCache == null) {
+ readerCache = new HashMap();
+ cache.put(reader,readerCache);
+ }
+ return readerCache.put (entry, value);
}
}
/** Put a custom object into the cache. */
Object store (IndexReader reader, String field, Object comparer, Object value) {
- Entry entry = new Entry (reader, field, comparer);
+ Entry entry = new Entry (field, comparer);
synchronized (this) {
- return cache.put (entry, value);
+ HashMap readerCache = (HashMap)cache.get(reader);
+ if (readerCache == null) {
+ readerCache = new HashMap();
+ cache.put(reader, readerCache);
+ }
+ return readerCache.put (entry, value);
}
}
@@ -383,3 +392,4 @@
}
}
+
1.11 +17 -7
jakarta-lucene/src/java/org/apache/lucene/search/FieldSortedHitQueue.java
Index: FieldSortedHitQueue.java
===================================================================
RCS file:
/home/cvs/jakarta-lucene/src/java/org/apache/lucene/search/FieldSortedHitQueue.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- FieldSortedHitQueue.java 24 May 2004 22:51:42 -0000 1.10
+++ FieldSortedHitQueue.java 21 Jul 2004 19:05:46 -0000 1.11
@@ -21,6 +21,7 @@
import java.io.IOException;
import java.util.WeakHashMap;
+import java.util.HashMap;
import java.util.Map;
import java.util.Locale;
import java.text.Collator;
@@ -130,19 +131,28 @@
/** Returns a comparator if it is in the cache. */
static ScoreDocComparator lookup (IndexReader reader, String field, int type,
Object factory) {
- FieldCacheImpl.Entry entry = (factory != null) ? new FieldCacheImpl.Entry
(reader, field, factory)
- : new FieldCacheImpl.Entry
(reader, field, type);
+ FieldCacheImpl.Entry entry = (factory != null)
+ ? new FieldCacheImpl.Entry (field, factory)
+ : new FieldCacheImpl.Entry (field, type);
synchronized (Comparators) {
- return (ScoreDocComparator) Comparators.get (entry);
+ HashMap readerCache = (HashMap)Comparators.get(reader);
+ if (readerCache == null) return null;
+ return (ScoreDocComparator) readerCache.get (entry);
}
}
/** Stores a comparator into the cache. */
static Object store (IndexReader reader, String field, int type, Object factory,
Object value) {
- FieldCacheImpl.Entry entry = (factory != null) ? new FieldCacheImpl.Entry
(reader, field, factory)
- : new FieldCacheImpl.Entry
(reader, field, type);
+ FieldCacheImpl.Entry entry = (factory != null)
+ ? new FieldCacheImpl.Entry (field, factory)
+ : new FieldCacheImpl.Entry (field, type);
synchronized (Comparators) {
- return Comparators.put (entry, value);
+ HashMap readerCache = (HashMap)Comparators.get(reader);
+ if (readerCache == null) {
+ readerCache = new HashMap();
+ Comparators.put(reader,readerCache);
+ }
+ return readerCache.put (entry, value);
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
