You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/01/08 17:03:34 UTC
svn commit: r1556564 - in /lucene/dev/branches/lucene5376/lucene/server/src:
java/org/apache/lucene/server/handlers/SearchHandler.java
test/org/apache/lucene/server/TestVirtualFields.java
Author: mikemccand
Date: Wed Jan 8 16:03:33 2014
New Revision: 1556564
URL: http://svn.apache.org/r1556564
Log:
LUCENE-5376: add another expression test case; add nocommit for bcp47 cutover
Modified:
lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/SearchHandler.java
lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestVirtualFields.java
Modified: lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/SearchHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/SearchHandler.java?rev=1556564&r1=1556563&r2=1556564&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/SearchHandler.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/java/org/apache/lucene/server/handlers/SearchHandler.java Wed Jan 8 16:03:33 2014
@@ -2365,6 +2365,7 @@ public class SearchHandler extends Handl
/** Parses the {@link Request} into a {@link Locale}. */
public static Locale getLocale(Request r) {
+ // nocommit cutover to bcp47
Locale locale;
if (!r.hasParam("variant")) {
if (!r.hasParam("country")) {
Modified: lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestVirtualFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestVirtualFields.java?rev=1556564&r1=1556563&r2=1556564&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestVirtualFields.java (original)
+++ lucene/dev/branches/lucene5376/lucene/server/src/test/org/apache/lucene/server/TestVirtualFields.java Wed Jan 8 16:03:33 2014
@@ -108,6 +108,24 @@ public class TestVirtualFields extends S
assertEquals(0.0f, getFloat(result, "hits[1].fields.logboost"), .0001f);
}
+ public void testFieldUsingAnother() throws Exception {
+ deleteAllDocs();
+ send("registerFields", "{fields: {scoreboost2: {type: virtual, expression: '2*scoreboost'}}}");
+
+ send("addDocument", "{fields: {text: 'the wind is howling like this swirling storm inside', id: 0, boost: 1.0}}");
+ long gen = getLong(send("addDocument", "{fields: {text: 'I am one with the wind and sky', id: 1, boost: 2.0}}"), "indexGen");
+ JSONObject result = send("search", "{queryText: wind, sort: {fields: [{field: scoreboost2, reverse: true}]}, retrieveFields: [id, scoreboost2], searcher: {indexGen: " + gen + "}}");
+ assertEquals(2, getInt(result, "totalHits"));
+ assertEquals(1, getInt(result, "hits[0].fields.id"));
+ assertEquals(0, getInt(result, "hits[1].fields.id"));
+
+ assertEquals(1.60721f, getFloat(result, "hits[0].fields.scoreboost2"), .0001f);
+ assertEquals(0.22092f, getFloat(result, "hits[1].fields.scoreboost2"), .0001f);
+
+ assertEquals(1.60721f, getFloat(result, "hits[0].fields.sortFields.scoreboost2"), .0001f);
+ assertEquals(0.22092f, getFloat(result, "hits[1].fields.sortFields.scoreboost2"), .0001f);
+ }
+
public void testWithScore1() throws Exception {
deleteAllDocs();
send("addDocument", "{fields: {text: 'the wind is howling like this swirling storm inside', id: 0, boost: 1.0}}");