inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-07 17:49:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for MOB-1221: Sorting on an indexed field that has not yet been applied to any node causes an exception in the SearchService

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@15702 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrew Hind
2009-08-12 14:27:38 +00:00
parent 5162e3e2e5
commit 93876b8079
4 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneSearcherImpl.java
View File

@@ -502,7 +502,7 @@ public class ADMLuceneSearcherImpl extends AbstractLuceneBase implements LuceneS
}
}
private static boolean fieldHasTerm(IndexReader indexReader, String field)
public static boolean fieldHasTerm(IndexReader indexReader, String field)
{
try
{

12
source/java/org/alfresco/repo/search/impl/lucene/ADMLuceneTest.java
View File

@@ -958,6 +958,18 @@ public class ADMLuceneTest extends TestCase
results.close();
sp = new SearchParameters();
sp.setLanguage(SearchService.LANGUAGE_FTS_ALFRESCO);
sp.addStore(rootNodeRef.getStoreRef());
sp.setQuery("-eager or -dog");
sp.addQueryTemplate("ANDY", "%cm:content");
sp.setNamespace(NamespaceService.CONTENT_MODEL_1_0_URI);
sp.excludeDataInTheCurrentTransaction(true);
sp.addSort("test:neverIndexed", false);
results = searcher.query(sp);
assertEquals(15, results.length());
results.close();
}

6
source/java/org/alfresco/repo/search/impl/lucene/LuceneTest_model.xml
View File

@@ -19,6 +19,12 @@
<title>Test Super Type</title>
<parent>sys:container</parent>
<properties>
<property name="test:neverIndexed">
<type>d:any</type>
<mandatory>false</mandatory>
<multiple>false</multiple>
<index enabled="false"/>
</property>
<property name="test:createdDate">
<type>d:date</type>
<mandatory>true</mandatory>

16
source/java/org/alfresco/repo/search/impl/querymodel/impl/lucene/LuceneQuery.java
View File

@@ -27,6 +27,7 @@ package org.alfresco.repo.search.impl.querymodel.impl.lucene;
import java.util.List;
import java.util.Set;
import org.alfresco.repo.search.impl.lucene.ADMLuceneSearcherImpl;
import org.alfresco.repo.search.impl.querymodel.Column;
import org.alfresco.repo.search.impl.querymodel.Constraint;
import org.alfresco.repo.search.impl.querymodel.FunctionEvaluationContext;
@@ -111,7 +112,7 @@ public class LuceneQuery extends BaseQuery implements LuceneQueryBuilder
Query constraintQuery = luceneQueryBuilderComponent.addComponent(selectors, null, luceneContext, functionContext);
if (constraintQuery != null)
{
switch(constraint.getOccur())
switch (constraint.getOccur())
{
case DEFAULT:
case MANDATORY:
@@ -139,9 +140,9 @@ public class LuceneQuery extends BaseQuery implements LuceneQueryBuilder
}
}
if(!must && must_not)
if (!must && must_not)
{
luceneQuery.add(new TermQuery(new Term("ISNODE", "T")), BooleanClause.Occur.MUST);
luceneQuery.add(new TermQuery(new Term("ISNODE", "T")), BooleanClause.Occur.MUST);
}
return luceneQuery;
@@ -182,7 +183,14 @@ public class LuceneQuery extends BaseQuery implements LuceneQueryBuilder
if (luceneField != null)
{
fields[index++] = new SortField(luceneField, (ordering.getOrder() == Order.DESCENDING));
if (ADMLuceneSearcherImpl.fieldHasTerm(luceneContext.getLuceneQueryParser().getIndexReader(), luceneField))
{
fields[index++] = new SortField(luceneField, (ordering.getOrder() == Order.DESCENDING));
}
else
{
fields[index++] = new SortField(null, SortField.DOC, (ordering.getOrder() == Order.DESCENDING));
}
}
else
{