Return-Path: Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: (qmail 69281 invoked from network); 24 Apr 2010 02:37:33 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 24 Apr 2010 02:37:33 -0000 Received: (qmail 79571 invoked by uid 500); 24 Apr 2010 02:37:33 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 79564 invoked by uid 99); 24 Apr 2010 02:37:33 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Apr 2010 02:37:33 +0000 X-ASF-Spam-Status: No, hits=-1667.1 required=10.0 tests=ALL_TRUSTED,AWL X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 24 Apr 2010 02:37:32 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id CF0A423889B6; Sat, 24 Apr 2010 02:36:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r937579 - /lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Date: Sat, 24 Apr 2010 02:36:50 -0000 To: commits@lucene.apache.org From: koji@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100424023650.CF0A423889B6@eris.apache.org> Author: koji Date: Sat Apr 24 02:36:50 2010 New Revision: 937579 URL: http://svn.apache.org/viewvc?rev=937579&view=rev Log: SOLR-1887: add warning log when hl.useFastVectoryHighlighter=true specified on the field that termPositions or termOffsets are not stored. Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Modified: lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=937579&r1=937578&r2=937579&view=diff ============================================================================== --- lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original) +++ lucene/dev/trunk/solr/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Sat Apr 24 02:36:50 2010 @@ -354,10 +354,14 @@ public class DefaultSolrHighlighter exte */ private boolean useFastVectorHighlighter( SolrParams params, IndexSchema schema, String fieldName ){ SchemaField schemaField = schema.getFieldOrNull( fieldName ); - return schemaField != null && - schemaField.storeTermPositions() && - schemaField.storeTermOffsets() && - params.getFieldBool( fieldName, HighlightParams.USE_FVH, false ); + if( schemaField == null ) return false; + boolean useFvhParam = params.getFieldBool( fieldName, HighlightParams.USE_FVH, false ); + if( !useFvhParam ) return false; + boolean termPosOff = schemaField.storeTermPositions() && schemaField.storeTermOffsets(); + if( !termPosOff ) { + log.warn( "Solr will use Highlighter instead of FastVectorHighlighter because {} field does not store TermPositions and TermOffsets.", fieldName ); + } + return termPosOff; } private void doHighlightingByHighlighter( Query query, SolrQueryRequest req, NamedList docSummaries,