You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by mr...@apache.org on 2008/02/12 18:12:37 UTC
svn commit: r620866 - in
/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene:
CachingIndexReader.java ConsistencyCheck.java SearchIndex.java
Author: mreutegg
Date: Tue Feb 12 09:12:29 2008
New Revision: 620866
URL: http://svn.apache.org/viewvc?rev=620866&view=rev
Log:
JCR-1375: Limit fields read from index
Modified:
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java
jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java?rev=620866&r1=620865&r2=620866&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/CachingIndexReader.java Tue Feb 12 09:12:29 2008
@@ -112,7 +112,7 @@
}
if (parent == null) {
- Document doc = document(n);
+ Document doc = document(n, FieldSelectors.UUID_AND_PARENT);
String parentUUID = doc.get(FieldNames.PARENT);
if (parentUUID == null || parentUUID.length() == 0) {
parent = DocId.NULL;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java?rev=620866&r1=620865&r2=620866&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/ConsistencyCheck.java Tue Feb 12 09:12:29 2008
@@ -162,7 +162,7 @@
if (reader.isDeleted(i)) {
continue;
}
- Document d = reader.document(i);
+ Document d = reader.document(i, FieldSelectors.UUID);
UUID uuid = UUID.fromString(d.get(FieldNames.UUID));
if (stateMgr.hasItemState(new NodeId(uuid))) {
if (!documentUUIDs.add(uuid)) {
@@ -192,7 +192,7 @@
if (reader.isDeleted(i)) {
continue;
}
- Document d = reader.document(i);
+ Document d = reader.document(i, FieldSelectors.UUID_AND_PARENT);
UUID uuid = UUID.fromString(d.get(FieldNames.UUID));
String parentUUIDString = d.get(FieldNames.PARENT);
UUID parentUUID = null;
Modified: jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java?rev=620866&r1=620865&r2=620866&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java (original)
+++ jackrabbit/trunk/jackrabbit-core/src/main/java/org/apache/jackrabbit/core/query/lucene/SearchIndex.java Tue Feb 12 09:12:29 2008
@@ -1143,7 +1143,7 @@
id.getUUID().toString());
tDocs.seek(aggregateUUIDs);
while (tDocs.next()) {
- Document doc = reader.document(tDocs.doc());
+ Document doc = reader.document(tDocs.doc(), FieldSelectors.UUID);
String uuid = doc.get(FieldNames.UUID);
NodeId nId = new NodeId(UUID.fromString(uuid));
map.put(nId, ism.getItemState(nId));