You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/12/15 00:59:00 UTC
svn commit: r1214565 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/src/java/org/apache/lucene/analysis/
lucene/src/test/org/apache/lucene/analysis/ solr/
solr/core/src/java/org/apache/solr/handler/admin/
solr/core/src/test/org/apache/solr/hand...
Author: hossman
Date: Wed Dec 14 23:58:59 2011
New Revision: 1214565
URL: http://svn.apache.org/viewvc?rev=1214565&view=rev
Log:
SOLR-2956: Fixed inconsistencies in the flags (and flag key) reported by the LukeRequestHandler (merge r1214540 from trunk)
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/src/java/org/apache/lucene/analysis/CharTokenizer.java (props changed)
lucene/dev/branches/branch_3x/lucene/src/test/org/apache/lucene/analysis/TestCharTokenizers.java (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1214565&r1=1214564&r2=1214565&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Wed Dec 14 23:58:59 2011
@@ -56,6 +56,9 @@ Bug Fixes
QueryElevationComponent fails to properly initialize (gsingers)
* SOLR-1520: QueryElevationComponent now supports non-string ids (gsingers)
+
+* SOLR-2956: Fixed inconsistencies in the flags (and flag key) reported by
+ the LukeRequestHandler (hossman)
Other Changes
----------------------
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1214565&r1=1214564&r2=1214565&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Dec 14 23:58:59 2011
@@ -35,6 +35,9 @@ import org.slf4j.LoggerFactory;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Fieldable;
+import org.apache.lucene.index.FieldInfo.IndexOptions;
+import static org.apache.lucene.index.FieldInfo.IndexOptions.DOCS_ONLY;
+import static org.apache.lucene.index.FieldInfo.IndexOptions.DOCS_AND_FREQS;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermEnum;
@@ -161,15 +164,26 @@ public class LukeRequestHandler extends
*/
private static String getFieldFlags( Fieldable f )
{
+ IndexOptions opts = (f == null) ? null : f.getIndexOptions();
+
StringBuilder flags = new StringBuilder();
+
flags.append( (f != null && f.isIndexed()) ? FieldFlag.INDEXED.getAbbreviation() : '-' );
flags.append( (f != null && f.isTokenized()) ? FieldFlag.TOKENIZED.getAbbreviation() : '-' );
flags.append( (f != null && f.isStored()) ? FieldFlag.STORED.getAbbreviation() : '-' );
flags.append( (false) ? FieldFlag.MULTI_VALUED.getAbbreviation() : '-' ); // SchemaField Specific
+
flags.append( (f != null && f.isTermVectorStored()) ? FieldFlag.TERM_VECTOR_STORED.getAbbreviation() : '-' );
flags.append( (f != null && f.isStoreOffsetWithTermVector()) ? FieldFlag.TERM_VECTOR_OFFSET.getAbbreviation() : '-' );
flags.append( (f != null && f.isStorePositionWithTermVector()) ? FieldFlag.TERM_VECTOR_POSITION.getAbbreviation() : '-' );
flags.append( (f != null && f.getOmitNorms()) ? FieldFlag.OMIT_NORMS.getAbbreviation() : '-' );
+
+ flags.append( (f != null && DOCS_ONLY == opts ) ?
+ FieldFlag.OMIT_TF.getAbbreviation() : '-' );
+
+ flags.append( (f != null && DOCS_AND_FREQS == opts ) ?
+ FieldFlag.OMIT_POSITIONS.getAbbreviation() : '-' );
+
flags.append( (f != null && f.isLazy()) ? FieldFlag.LAZY.getAbbreviation() : '-' );
flags.append( (f != null && f.isBinary()) ? FieldFlag.BINARY.getAbbreviation() : '-' );
flags.append( (false) ? FieldFlag.SORT_MISSING_FIRST.getAbbreviation() : '-' ); // SchemaField Specific
@@ -210,21 +224,11 @@ public class LukeRequestHandler extends
/**
* @return a key to what each character means
*/
- public static SimpleOrderedMap<String> getFieldFlagsKey()
- {
+ public static SimpleOrderedMap<String> getFieldFlagsKey() {
SimpleOrderedMap<String> key = new SimpleOrderedMap<String>();
- key.add(String.valueOf(FieldFlag.INDEXED.getAbbreviation()), FieldFlag.INDEXED.getDisplay() );
- key.add(String.valueOf(FieldFlag.TOKENIZED.getAbbreviation()), FieldFlag.TOKENIZED.getDisplay() );
- key.add( String.valueOf(FieldFlag.STORED.getAbbreviation()), FieldFlag.STORED.getDisplay() );
- key.add( String.valueOf(FieldFlag.MULTI_VALUED.getAbbreviation()), FieldFlag.MULTI_VALUED.getDisplay() );
- key.add( String.valueOf(FieldFlag.TERM_VECTOR_STORED.getAbbreviation()), FieldFlag.TERM_VECTOR_STORED.getDisplay() );
- key.add( String.valueOf(FieldFlag.TERM_VECTOR_OFFSET.getAbbreviation()), FieldFlag.TERM_VECTOR_OFFSET.getDisplay() );
- key.add( String.valueOf(FieldFlag.TERM_VECTOR_POSITION.getAbbreviation()), FieldFlag.TERM_VECTOR_POSITION.getDisplay() );
- key.add( String.valueOf(FieldFlag.OMIT_NORMS.getAbbreviation()), FieldFlag.OMIT_NORMS.getDisplay() );
- key.add( String.valueOf(FieldFlag.LAZY.getAbbreviation()), FieldFlag.LAZY.getDisplay() );
- key.add( String.valueOf(FieldFlag.BINARY.getAbbreviation()), FieldFlag.BINARY.getDisplay() );
- key.add( String.valueOf(FieldFlag.SORT_MISSING_FIRST.getAbbreviation()), FieldFlag.SORT_MISSING_FIRST.getDisplay() );
- key.add( String.valueOf(FieldFlag.SORT_MISSING_LAST.getAbbreviation()), FieldFlag.SORT_MISSING_LAST.getDisplay() );
+ for (FieldFlag f : FieldFlag.values()) {
+ key.add(String.valueOf(f.getAbbreviation()), f.getDisplay() );
+ }
return key;
}
Modified: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java?rev=1214565&r1=1214564&r2=1214565&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java Wed Dec 14 23:58:59 2011
@@ -17,8 +17,12 @@
package org.apache.solr.handler.admin;
+import org.apache.solr.common.luke.FieldFlag;
import org.apache.solr.util.AbstractSolrTestCase;
+import java.util.EnumSet;
+import java.util.Arrays;
+
/**
* :TODO: currently only tests some of the utilities in the LukeRequestHandler
*/
@@ -93,7 +97,40 @@ public class LukeRequestHandlerTest exte
// test that Luke can handle all of the field types
assertQ(req("qt","/admin/luke", "id","SOLR1000"));
- }
+ final int numFlags = EnumSet.allOf(FieldFlag.class).size();
+
+ assertQ("Not all flags ("+numFlags+") mentioned in info->key",
+ req("qt","/admin/luke"),
+ numFlags+"=count(//lst[@name='info']/lst[@name='key']/str)");
+
+ // code should be the same for all fields, but just in case do several
+ for (String f : Arrays.asList("solr_t","solr_s","solr_ti",
+ "solr_td","solr_pl","solr_dt","solr_b",
+ "solr_sS","solr_sI")) {
+
+ final String xp = getFieldXPathPrefix(f);
+ assertQ("Not as many schema flags as expected ("+numFlags+") for " + f,
+ req("qt","/admin/luke", "fl", f),
+ numFlags+"=string-length("+xp+"[@name='schema'])");
+
+ }
+
+ // diff loop for checking 'index' flags,
+ // only valid for fields that are indexed & stored
+ for (String f : Arrays.asList("solr_t","solr_s","solr_ti",
+ "solr_td","solr_pl","solr_dt","solr_b")) {
+
+ final String xp = getFieldXPathPrefix(f);
+ assertQ("Not as many index flags as expected ("+numFlags+") for " + f,
+ req("qt","/admin/luke", "fl", f),
+ numFlags+"=string-length("+xp+"[@name='index'])");
+ }
+
+ }
+ private static String getFieldXPathPrefix(String field) {
+ return "//lst[@name='fields']/lst[@name='"+field+"']/str";
+ }
+
}
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java?rev=1214565&r1=1214564&r2=1214565&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/luke/FieldFlag.java Wed Dec 14 23:58:59 2011
@@ -30,7 +30,7 @@ public enum FieldFlag {
TERM_VECTOR_OFFSET('o', "Store Offset With TermVector"),
TERM_VECTOR_POSITION('p', "Store Position With TermVector"),
OMIT_NORMS('O', "Omit Norms"),
- OMIT_TF('F', "Omit Tf"),
+ OMIT_TF('F', "Omit Term Frequencies & Positions"),
OMIT_POSITIONS('P', "Omit Positions"),
LAZY('L', "Lazy"),
BINARY('B', "Binary"),