You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ko...@apache.org on 2011/05/23 15:56:31 UTC
svn commit: r1126492 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/ solr/ solr/src/java/org/apache/solr/search/function/
solr/src/test-files/solr/conf/ solr/src/test/org/apache/solr/search/function/
Author: koji
Date: Mon May 23 13:56:30 2011
New Revision: 1126492
URL: http://svn.apache.org/viewvc?rev=1126492&view=rev
Log:
SOLR-2536: add ReloadCacheRequestHandler
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-functionquery.xml
lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.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=1126492&r1=1126491&r2=1126492&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Mon May 23 13:56:30 2011
@@ -115,6 +115,10 @@ Bug Fixes
in strings since those characters are not valid in javascript strings
(although they are valid in JSON strings). (yonik)
+* SOLR-2536: Add ReloadCacheRequestHandler to fix ExternalFileField bug (if reopenReaders
+ set to true and no index segments have been changed, commit cannot trigger reload
+ external file). (koji)
+
Other Changes
----------------------
Modified: lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java?rev=1126492&r1=1126491&r2=1126492&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/java/org/apache/solr/search/function/FileFloatSource.java Mon May 23 13:56:30 2011
@@ -16,20 +16,35 @@
*/
package org.apache.solr.search.function;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.WeakHashMap;
+
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.TermDocs;
import org.apache.lucene.index.TermEnum;
import org.apache.lucene.index.Term;
import org.apache.lucene.util.StringHelper;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.schema.SchemaField;
+import org.apache.solr.handler.RequestHandlerBase;
+import org.apache.solr.handler.RequestHandlerUtils;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.response.SolrQueryResponse;
import org.apache.solr.schema.FieldType;
+import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.QParser;
import org.apache.solr.search.SolrIndexReader;
+import org.apache.solr.update.processor.UpdateRequestProcessor;
import org.apache.solr.util.VersionedFile;
-
-import java.io.*;
-import java.util.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Obtains float field values from an external file.
@@ -123,6 +138,10 @@ public class FileFloatSource extends Val
+ ",defVal="+defVal+",dataDir="+dataDir+")";
}
+
+ public static void resetCache(){
+ floatCache.resetCache();
+ }
private final float[] getCachedFloats(IndexReader reader) {
return (float[])floatCache.get(reader, new Entry(this));
@@ -174,6 +193,14 @@ public class FileFloatSource extends Val
return value;
}
+
+ public void resetCache(){
+ synchronized(readerCache){
+ // Map.clear() is optional and can throw UnsipportedOperationException,
+ // but readerCache is WeakHashMap and it supports clear().
+ readerCache.clear();
+ }
+ }
}
static Object onlyForTesting; // set to the last value
@@ -368,5 +395,44 @@ public class FileFloatSource extends Val
return vals;
}
+ public static class ReloadCacheRequestHandler extends RequestHandlerBase {
+
+ static final Logger log = LoggerFactory.getLogger(ReloadCacheRequestHandler.class);
+
+ @Override
+ public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp)
+ throws Exception {
+ FileFloatSource.resetCache();
+ log.debug("readerCache has been reset.");
+
+ UpdateRequestProcessor processor =
+ req.getCore().getUpdateProcessingChain(null).createProcessor(req, rsp);
+ try{
+ RequestHandlerUtils.handleCommit(processor, req.getParams(), true);
+ }
+ finally{
+ processor.finish();
+ }
+ }
+ @Override
+ public String getDescription() {
+ return "Reload readerCache request handler";
+ }
+
+ @Override
+ public String getSource() {
+ return "$URL$";
+ }
+
+ @Override
+ public String getSourceId() {
+ return "$Id$";
+ }
+
+ @Override
+ public String getVersion() {
+ return "$Revision$";
+ }
+ }
}
Modified: lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-functionquery.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-functionquery.xml?rev=1126492&r1=1126491&r2=1126492&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-functionquery.xml (original)
+++ lucene/dev/branches/branch_3x/solr/src/test-files/solr/conf/solrconfig-functionquery.xml Mon May 23 13:56:30 2011
@@ -311,6 +311,9 @@
<propTest attr1="${solr.test.sys.prop1}-$${literal}"
attr2="${non.existent.sys.prop:default-from-config}">prefix-${solr.test.sys.prop2}-suffix</propTest>
+ <requestHandler name="/reloadCache"
+ class="org.apache.solr.search.function.FileFloatSource$ReloadCacheRequestHandler" />
+
<!-- test ValueSourceParser plugins -->
<valueSourceParser name="nvl" class="org.apache.solr.search.function.NvlValueSourceParser">
<float name="nvlFloatValue">0.0</float>
Modified: lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java?rev=1126492&r1=1126491&r2=1126492&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java (original)
+++ lucene/dev/branches/branch_3x/solr/src/test/org/apache/solr/search/function/TestFunctionQuery.java Mon May 23 13:56:30 2011
@@ -19,6 +19,8 @@ package org.apache.solr.search.function;
import org.apache.lucene.search.FieldCache;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.common.params.SolrParams;
+import org.apache.solr.common.util.NamedList;
import org.junit.BeforeClass;
import org.junit.Test;
import java.io.FileOutputStream;
@@ -189,7 +191,7 @@ public class TestFunctionQuery extends S
}
@Test
- public void testExternalField() {
+ public void testExternalField() throws Exception {
String field = "foo_extf";
float[] ids = {100,-4,0,10,25,5,77,23,55,-78,-45,-24,63,78,94,22,34,54321,261,-627};
@@ -208,8 +210,7 @@ public class TestFunctionQuery extends S
assertTrue(orig == FileFloatSource.onlyForTesting);
makeExternalFile(field, "0=1","UTF-8");
- assertU(adoc("id", "10000")); // will get same reader if no index change
- assertU(commit());
+ assertU(h.query("/reloadCache",lrf.makeRequest("","")));
singleTest(field, "sqrt(\0)");
assertTrue(orig != FileFloatSource.onlyForTesting);
@@ -245,8 +246,7 @@ public class TestFunctionQuery extends S
makeExternalFile(field, sb.toString(),"UTF-8");
// make it visible
- assertU(adoc("id", "10001")); // will get same reader if no index change
- assertU(commit());
+ assertU(h.query("/reloadCache",lrf.makeRequest("","")));
// test it
float[] answers = new float[ids.length*2];