SOLR-1520: support trie types, fix issues with failing tests

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1215352 13f79535-47bb-0310-9956-ffa450edef68

solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java

@@ -157,9 +157,9 @@ public class QueryElevationComponent extends SearchComponent implements SolrCore
     }
 
     SchemaField sf = core.getSchema().getUniqueKeyField();
-    if( sf == null || sf.getType().isTokenized() == true) {
+    if( sf == null) {
       throw new SolrException( SolrException.ErrorCode.SERVER_ERROR, 
-          "QueryElevationComponent requires the schema to have a uniqueKeyField implemented using a non-tokenized field" );
+          "QueryElevationComponent requires the schema to have a uniqueKeyField." );
     }
     idSchemaFT = sf.getType();
     idField = sf.getName();

solr/core/src/java/org/apache/solr/response/transform/EditorialMarkerFactory.java

@@ -20,9 +20,12 @@ package org.apache.solr.response.transform;
 import java.util.Set;
 
 import org.apache.lucene.document.Field;
+import org.apache.lucene.document.NumericField;
 import org.apache.solr.common.SolrDocument;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.schema.FieldType;
+import org.apache.solr.schema.SchemaField;
 
 /**
  *
@@ -32,8 +35,9 @@ public class EditorialMarkerFactory extends TransformerFactory
 {
   @Override
   public DocTransformer create(String field, SolrParams params, SolrQueryRequest req) {
-    String idfield = req.getSchema().getUniqueKeyField().getName();
+    SchemaField uniqueKeyField = req.getSchema().getUniqueKeyField();
-    return new MarkTransformer(field,idfield);
+    String idfield = uniqueKeyField.getName();
+    return new MarkTransformer(field,idfield, uniqueKeyField.getType());
   }
 }
 
@@ -41,11 +45,13 @@ class MarkTransformer extends TransformerWithContext
 {
   final String name;
   final String idFieldName;
+  final FieldType ft;
 
-  public MarkTransformer( String name, String idFieldName)
+  public MarkTransformer( String name, String idFieldName, FieldType ft)
   {
     this.name = name;
     this.idFieldName = idFieldName;
+    this.ft = ft;
   }
 
   @Override
@@ -60,11 +66,15 @@ class MarkTransformer extends TransformerWithContext
     if(ids!=null) {
       String key;
       Object field = doc.get(idFieldName);
-      if (field instanceof Field){
+      if (field instanceof NumericField){
+        key = ((Field)field).stringValue();
+        key = ft.readableToIndexed(key);
+      } else if (field instanceof Field){
         key = ((Field)field).stringValue();
       } else {
         key = field.toString();
       }
+
       doc.setField(name, ids.contains(key));
     } else {
       //if we have no ids, that means we weren't boosting, but the user still asked for the field to be added, so just mark everything as false

solr/core/src/test-files/solr/conf/elevate.xml

@@ -34,7 +34,7 @@
  </query>
 
  <query text="AAAA">
-  <doc id="7.0" />
+  <doc id="7" />
  </query>
 
 

solr/core/src/test-files/solr/conf/solrconfig.xml

@@ -425,7 +425,6 @@
 			</arr>
  </requestHandler>
 
-
   <searchComponent name="tvComponent" class="org.apache.solr.handler.component.TermVectorComponent"/>
 
   <requestHandler name="tvrh" class="org.apache.solr.handler.component.SearchHandler">

solr/core/src/test/org/apache/solr/handler/component/QueryElevationComponentTest.java

@@ -53,6 +53,10 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
   }
 
   private void init(String schema) throws Exception {
+    init("solrconfig-elevate.xml", schema);
+  }
+
+  private void init(String config, String schema) throws Exception {
     //write out elevate-data.xml to the Data dir first by copying it from conf, which we know exists, this way we can test both conf and data configurations
     createTempDir();
     File parent = new File(TEST_HOME(), "conf");
@@ -60,7 +64,7 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
     File elevateDataFile = new File(dataDir, "elevate-data.xml");
     FileUtils.copyFile(elevateFile, elevateDataFile);
 
-    initCore("solrconfig-elevate.xml",schema);
+    initCore(config,schema);
     clearIndex();
     assertU(commit());
   }
@@ -102,6 +106,40 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
     }
   }
 
+  @Test
+  public void testTrieFieldType() throws Exception {
+    try {
+      init("schema.xml");
+      clearIndex();
+      assertU(commit());
+      assertU(adoc("id", "1", "text", "XXXX XXXX",           "str_s", "a" ));
+      assertU(adoc("id", "2", "text", "YYYY",      "str_s", "b" ));
+      assertU(adoc("id", "3", "text", "ZZZZ", "str_s", "c" ));
+
+      assertU(adoc("id", "4", "text", "XXXX XXXX",                 "str_s", "x" ));
+      assertU(adoc("id", "5", "text", "YYYY YYYY",         "str_s", "y" ));
+      assertU(adoc("id", "6", "text", "XXXX XXXX", "str_s", "z" ));
+      assertU(adoc("id", "7", "text", "AAAA", "str_s", "a" ));
+      assertU(adoc("id", "8", "text", "AAAA", "str_s", "a" ));
+      assertU(adoc("id", "9", "text", "AAAA AAAA", "str_s", "a" ));
+      assertU(commit());
+
+      assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",
+          CommonParams.FL, "id, score, [elevated]")
+              ,"//*[@numFound='3']"
+              ,"//result/doc[1]/int[@name='id'][.='7']"
+              ,"//result/doc[2]/int[@name='id'][.='8']"
+              ,"//result/doc[3]/int[@name='id'][.='9']",
+              "//result/doc[1]/bool[@name='[elevated]'][.='true']",
+              "//result/doc[2]/bool[@name='[elevated]'][.='false']",
+              "//result/doc[3]/bool[@name='[elevated]'][.='false']"
+              );
+    } finally{
+      delete();
+    }
+  }
+
+
   @Test
   public void testInterface() throws Exception
   {
@@ -188,7 +226,7 @@ public class QueryElevationComponentTest extends SolrTestCaseJ4 {
           CommonParams.FL, "id, score, [elevated]")
               ,"//*[@numFound='1']"
               ,"//result/doc[1]/str[@name='id'][.='7']",
-              "//result/doc[1]/bool[@name='[elevated]'][.='false']"
+              "//result/doc[1]/bool[@name='[elevated]'][.='true']"
               );
 
       assertQ("", req(CommonParams.Q, "AAAA", CommonParams.QT, "/elevate",