You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/01/05 21:25:44 UTC
svn commit: r1055622 [14/14] - in /lucene/dev/branches/docvalues: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/ dev-tools/idea/.idea/
dev-tools/idea/.idea/libraries/ dev-tools/idea/lucene/
dev-tools/idea/lucene/contrib/ dev-tools/idea/lucene/contrib...
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/NoCacheHeaderTest.java Wed Jan 5 20:25:17 2011
@@ -24,8 +24,6 @@ import org.apache.commons.httpclient.uti
import org.junit.BeforeClass;
import org.junit.Test;
-import static junit.framework.Assert.*;
-
/**
* A test case for the several HTTP cache headers emitted by Solr
@@ -33,7 +31,7 @@ import static junit.framework.Assert.*;
public class NoCacheHeaderTest extends CacheHeaderTestBase {
@BeforeClass
public static void beforeTest() throws Exception {
- createJetty("solr/", "solr/conf/solrconfig-nocache.xml", null);
+ createJetty(TEST_HOME, "solr/conf/solrconfig-nocache.xml", null);
}
// The tests
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/servlet/SolrRequestParserTest.java Wed Jan 5 20:25:17 2011
@@ -43,8 +43,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
public class SolrRequestParserTest extends SolrTestCaseJ4 {
@BeforeClass
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/FileBasedSpellCheckerTest.java Wed Jan 5 20:25:17 2011
@@ -27,8 +27,6 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
import java.io.File;
import java.util.Date;
import java.util.Map;
@@ -67,8 +65,7 @@ public class FileBasedSpellCheckerTest e
spellchecker.add("classname", FileBasedSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
- File spelling = new File("spellings.txt");
- spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
+ spellchecker.add(AbstractLuceneSpellChecker.LOCATION, "spellings.txt");
spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
@@ -104,8 +101,7 @@ public class FileBasedSpellCheckerTest e
NamedList spellchecker = new NamedList();
spellchecker.add("classname", FileBasedSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
- File spelling = new File("spellings.txt");
- spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
+ spellchecker.add(AbstractLuceneSpellChecker.LOCATION, "spellings.txt");
spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
File indexDir = new File(TEMP_DIR, "spellingIdx" + new Date().getTime());
@@ -151,8 +147,7 @@ public class FileBasedSpellCheckerTest e
spellchecker.add("classname", FileBasedSpellChecker.class.getName());
spellchecker.add(SolrSpellChecker.DICTIONARY_NAME, "external");
- File spelling = new File("spellings.txt");
- spellchecker.add(AbstractLuceneSpellChecker.LOCATION, spelling.getAbsolutePath());
+ spellchecker.add(AbstractLuceneSpellChecker.LOCATION, "spellings.txt");
spellchecker.add(FileBasedSpellChecker.SOURCE_FILE_CHAR_ENCODING, "UTF-8");
spellchecker.add(IndexBasedSpellChecker.FIELD, "teststop");
spellchecker.add(FileBasedSpellChecker.FIELD_TYPE, "teststop");
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/IndexBasedSpellCheckerTest.java Wed Jan 5 20:25:17 2011
@@ -16,8 +16,6 @@
*/
package org.apache.solr.spelling;
-import static org.junit.Assert.*;
-
import org.apache.lucene.analysis.Token;
import org.apache.lucene.analysis.core.WhitespaceAnalyzer;
import org.apache.lucene.document.Document;
@@ -31,11 +29,9 @@ import org.apache.lucene.search.spell.St
import org.apache.lucene.search.spell.SuggestWord;
import org.apache.lucene.search.spell.SuggestWordFrequencyComparator;
import org.apache.lucene.store.Directory;
-import org.apache.lucene.store.FSDirectory;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.component.SearchComponent;
import org.apache.solr.handler.component.SpellCheckComponent;
import org.apache.solr.util.RefCounted;
import org.apache.solr.search.SolrIndexSearcher;
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java Wed Jan 5 20:25:17 2011
@@ -16,10 +16,6 @@ package org.apache.solr.spelling;
* limitations under the License.
*/
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
-
import java.util.HashSet;
import java.util.List;
import java.util.Set;
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/spelling/SpellPossibilityIteratorTest.java Wed Jan 5 20:25:17 2011
@@ -16,8 +16,6 @@ package org.apache.solr.spelling;
* limitations under the License.
*/
-import static org.junit.Assert.*;
-
import java.util.LinkedHashMap;
import java.util.Map;
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java Wed Jan 5 20:25:17 2011
@@ -19,6 +19,7 @@ package org.apache.solr.update;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.util.AbstractSolrTestCase;
import java.io.File;
@@ -36,7 +37,8 @@ public class DirectUpdateHandlerOptimize
}
public String getSolrConfigFile() {
- return "solrconfig-duh-optimize.xml";
+ // return "solrconfig-duh-optimize.xml";
+ return "solrconfig.xml";
}
@@ -44,10 +46,9 @@ public class DirectUpdateHandlerOptimize
SolrCore core = h.getCore();
UpdateHandler updater = core.getUpdateHandler();
- AddUpdateCommand cmd = new AddUpdateCommand();
- cmd.overwriteCommitted = true;
- cmd.overwritePending = true;
- cmd.allowDups = false;
+ SolrQueryRequest req = req();
+ AddUpdateCommand cmd = new AddUpdateCommand(req);
+
//add just under the merge factor, so no segments are merged
//the merge factor is 100 and the maxBufferedDocs is 2, so there should be 50 segments
for (int i = 0; i < 99; i++) {
@@ -58,7 +59,7 @@ public class DirectUpdateHandlerOptimize
updater.addDoc(cmd);
}
- CommitUpdateCommand cmtCmd = new CommitUpdateCommand(false);
+ CommitUpdateCommand cmtCmd = new CommitUpdateCommand(req, false);
updater.commit(cmtCmd);
updater.commit(cmtCmd); // commit twice to give systems such as windows a chance to delete the old files
@@ -66,7 +67,7 @@ public class DirectUpdateHandlerOptimize
assertNumSegments(indexDir, 50);
//now do an optimize
- cmtCmd = new CommitUpdateCommand(true);
+ cmtCmd = new CommitUpdateCommand(req, true);
cmtCmd.maxOptimizeSegments = 25;
updater.commit(cmtCmd);
updater.commit(cmtCmd);
@@ -82,6 +83,8 @@ public class DirectUpdateHandlerOptimize
updater.commit(cmtCmd);
updater.commit(cmtCmd);
assertNumSegments(indexDir, 1);
+
+ req.close();
}
private void assertNumSegments(String indexDir, int numSegs) {
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java Wed Jan 5 20:25:17 2011
@@ -36,8 +36,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
*
*
@@ -55,141 +53,64 @@ public class DirectUpdateHandlerTest ext
clearIndex();
assertU(commit());
}
-
+
@Test
- public void testRequireUniqueKey() throws Exception
- {
- SolrCore core = h.getCore();
-
- UpdateHandler updater = core.getUpdateHandler();
-
- AddUpdateCommand cmd = new AddUpdateCommand();
- cmd.overwriteCommitted = true;
- cmd.overwritePending = true;
- cmd.allowDups = false;
-
+ public void testRequireUniqueKey() throws Exception {
// Add a valid document
- cmd.doc = new Document();
- cmd.doc.add( new Field( "id", "AAA", Store.YES, Index.NOT_ANALYZED ) );
- cmd.doc.add( new Field( "subject", "xxxxx", Store.YES, Index.NOT_ANALYZED ) );
- updater.addDoc( cmd );
-
- // Add a document with multiple ids
- cmd.indexedId = null; // reset the id for this add
- cmd.doc = new Document();
- cmd.doc.add( new Field( "id", "AAA", Store.YES, Index.NOT_ANALYZED ) );
- cmd.doc.add( new Field( "id", "BBB", Store.YES, Index.NOT_ANALYZED ) );
- cmd.doc.add( new Field( "subject", "xxxxx", Store.YES, Index.NOT_ANALYZED ) );
- try {
- updater.addDoc( cmd );
- fail( "added a document with multiple ids" );
- }
- catch( SolrException ex ) { } // expected
-
- // Add a document without an id
- cmd.indexedId = null; // reset the id for this add
- cmd.doc = new Document();
- cmd.doc.add( new Field( "subject", "xxxxx", Store.YES, Index.NOT_ANALYZED ) );
- try {
- updater.addDoc( cmd );
- fail( "added a document without an ids" );
- }
- catch( SolrException ex ) { } // expected
- }
+ assertU(adoc("id","1"));
- @Test
- public void testUncommit() throws Exception {
- addSimpleDoc("A");
+ // More than one id should fail
+ assertFailedU(adoc("id","2", "id","ignore_exception", "text","foo"));
- // search - not committed - "A" should not be found.
- Map<String,String> args = new HashMap<String, String>();
- args.put( CommonParams.Q, "id:A" );
- args.put( "indent", "true" );
- SolrQueryRequest req = new LocalSolrQueryRequest( h.getCore(), new MapSolrParams( args) );
- assertQ("\"A\" should not be found.", req
- ,"//*[@numFound='0']"
- );
+ // No id should fail
+ ignoreException("id");
+ assertFailedU(adoc("text","foo"));
+ resetExceptionIgnores();
}
- @Test
- public void testAddCommit() throws Exception {
- addSimpleDoc("A");
-
- // commit "A"
- SolrCore core = h.getCore();
- UpdateHandler updater = core.getUpdateHandler();
- CommitUpdateCommand cmtCmd = new CommitUpdateCommand(false);
- cmtCmd.waitSearcher = true;
- updater.commit(cmtCmd);
- // search - "A" should be found.
- Map<String,String> args = new HashMap<String, String>();
- args.put( CommonParams.Q, "id:A" );
- args.put( "indent", "true" );
- SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
- assertQ("\"A\" should be found.", req
- ,"//*[@numFound='1']"
- ,"//result/doc[1]/str[@name='id'][.='A']"
- );
- }
@Test
- public void testDeleteCommit() throws Exception {
- addSimpleDoc("A");
- addSimpleDoc("B");
+ public void testBasics() throws Exception {
+ assertU(adoc("id","5"));
- // commit "A", "B"
- SolrCore core = h.getCore();
- UpdateHandler updater = core.getUpdateHandler();
- CommitUpdateCommand cmtCmd = new CommitUpdateCommand(false);
- cmtCmd.waitSearcher = true;
- updater.commit(cmtCmd);
+ // search - not committed - "5" should not be found.
+ assertQ(req("q","id:5"), "//*[@numFound='0']");
- // search - "A","B" should be found.
- Map<String,String> args = new HashMap<String, String>();
- args.put( CommonParams.Q, "id:A OR id:B" );
- args.put( "indent", "true" );
- SolrQueryRequest req = new LocalSolrQueryRequest( core, new MapSolrParams( args) );
- assertQ("\"A\" and \"B\" should be found.", req
- ,"//*[@numFound='2']"
- ,"//result/doc[1]/str[@name='id'][.='A']"
- ,"//result/doc[2]/str[@name='id'][.='B']"
- );
+ assertU(commit());
- // delete "B"
- deleteSimpleDoc("B");
+ // now it should be there
+ assertQ(req("q","id:5"), "//*[@numFound='1']");
- // search - "A","B" should be found.
- assertQ("\"A\" and \"B\" should be found.", req
- ,"//*[@numFound='2']"
- ,"//result/doc[1]/str[@name='id'][.='A']"
- ,"//result/doc[2]/str[@name='id'][.='B']"
- );
-
- // commit
- updater.commit(cmtCmd);
+ // now delete it
+ assertU(delI("5"));
+
+ // not committed yet
+ assertQ(req("q","id:5"), "//*[@numFound='1']");
+
+ assertU(commit());
- // search - "B" should not be found.
- assertQ("\"B\" should not be found.", req
- ,"//*[@numFound='1']"
- ,"//result/doc[1]/str[@name='id'][.='A']"
- );
+ // should be gone
+ assertQ(req("q","id:5"), "//*[@numFound='0']");
+
}
+
@Test
public void testAddRollback() throws Exception {
// re-init the core
deleteCore();
initCore("solrconfig.xml", "schema12.xml");
- addSimpleDoc("A");
+ assertU(adoc("id","A"));
// commit "A"
SolrCore core = h.getCore();
UpdateHandler updater = core.getUpdateHandler();
assertTrue( updater instanceof DirectUpdateHandler2 );
DirectUpdateHandler2 duh2 = (DirectUpdateHandler2)updater;
- CommitUpdateCommand cmtCmd = new CommitUpdateCommand(false);
+ SolrQueryRequest ureq = req();
+ CommitUpdateCommand cmtCmd = new CommitUpdateCommand(ureq, false);
cmtCmd.waitSearcher = true;
assertEquals( 1, duh2.addCommands.get() );
assertEquals( 1, duh2.addCommandsCumulative.get() );
@@ -198,11 +119,13 @@ public class DirectUpdateHandlerTest ext
assertEquals( 0, duh2.addCommands.get() );
assertEquals( 1, duh2.addCommandsCumulative.get() );
assertEquals( 1, duh2.commitCommands.get() );
+ ureq.close();
- addSimpleDoc("B");
+ assertU(adoc("id","B"));
// rollback "B"
- RollbackUpdateCommand rbkCmd = new RollbackUpdateCommand();
+ ureq = req();
+ RollbackUpdateCommand rbkCmd = new RollbackUpdateCommand(ureq);
assertEquals( 1, duh2.addCommands.get() );
assertEquals( 2, duh2.addCommandsCumulative.get() );
assertEquals( 0, duh2.rollbackCommands.get() );
@@ -210,6 +133,7 @@ public class DirectUpdateHandlerTest ext
assertEquals( 0, duh2.addCommands.get() );
assertEquals( 1, duh2.addCommandsCumulative.get() );
assertEquals( 1, duh2.rollbackCommands.get() );
+ ureq.close();
// search - "B" should not be found.
Map<String,String> args = new HashMap<String, String>();
@@ -223,7 +147,7 @@ public class DirectUpdateHandlerTest ext
// Add a doc after the rollback to make sure we can continue to add/delete documents
// after a rollback as normal
- addSimpleDoc("ZZZ");
+ assertU(adoc("id","ZZZ"));
assertU(commit());
assertQ("\"ZZZ\" must be found.", req("q", "id:ZZZ")
,"//*[@numFound='1']"
@@ -237,15 +161,16 @@ public class DirectUpdateHandlerTest ext
deleteCore();
initCore("solrconfig.xml", "schema12.xml");
- addSimpleDoc("A");
- addSimpleDoc("B");
+ assertU(adoc("id","A"));
+ assertU(adoc("id","B"));
// commit "A", "B"
SolrCore core = h.getCore();
UpdateHandler updater = core.getUpdateHandler();
assertTrue( updater instanceof DirectUpdateHandler2 );
DirectUpdateHandler2 duh2 = (DirectUpdateHandler2)updater;
- CommitUpdateCommand cmtCmd = new CommitUpdateCommand(false);
+ SolrQueryRequest ureq = req();
+ CommitUpdateCommand cmtCmd = new CommitUpdateCommand(ureq, false);
cmtCmd.waitSearcher = true;
assertEquals( 2, duh2.addCommands.get() );
assertEquals( 2, duh2.addCommandsCumulative.get() );
@@ -254,6 +179,7 @@ public class DirectUpdateHandlerTest ext
assertEquals( 0, duh2.addCommands.get() );
assertEquals( 2, duh2.addCommandsCumulative.get() );
assertEquals( 1, duh2.commitCommands.get() );
+ ureq.close();
// search - "A","B" should be found.
Map<String,String> args = new HashMap<String, String>();
@@ -267,8 +193,8 @@ public class DirectUpdateHandlerTest ext
);
// delete "B"
- deleteSimpleDoc("B");
-
+ assertU(delI("B"));
+
// search - "A","B" should be found.
assertQ("\"A\" and \"B\" should be found.", req
,"//*[@numFound='2']"
@@ -277,11 +203,13 @@ public class DirectUpdateHandlerTest ext
);
// rollback "B"
- RollbackUpdateCommand rbkCmd = new RollbackUpdateCommand();
+ ureq = req();
+ RollbackUpdateCommand rbkCmd = new RollbackUpdateCommand(ureq);
assertEquals( 1, duh2.deleteByIdCommands.get() );
assertEquals( 1, duh2.deleteByIdCommandsCumulative.get() );
assertEquals( 0, duh2.rollbackCommands.get() );
updater.rollback(rbkCmd);
+ ureq.close();
assertEquals( 0, duh2.deleteByIdCommands.get() );
assertEquals( 0, duh2.deleteByIdCommandsCumulative.get() );
assertEquals( 1, duh2.rollbackCommands.get() );
@@ -295,7 +223,7 @@ public class DirectUpdateHandlerTest ext
// Add a doc after the rollback to make sure we can continue to add/delete documents
// after a rollback as normal
- addSimpleDoc("ZZZ");
+ assertU(adoc("id","ZZZ"));
assertU(commit());
assertQ("\"ZZZ\" must be found.", req("q", "id:ZZZ")
,"//*[@numFound='1']"
@@ -330,33 +258,6 @@ public class DirectUpdateHandlerTest ext
sr.close();
}
- private void addSimpleDoc(String id) throws Exception {
- SolrCore core = h.getCore();
-
- UpdateHandler updater = core.getUpdateHandler();
-
- AddUpdateCommand cmd = new AddUpdateCommand();
- cmd.overwriteCommitted = true;
- cmd.overwritePending = true;
- cmd.allowDups = false;
-
- // Add a document
- cmd.doc = new Document();
- cmd.doc.add( new Field( "id", id, Store.YES, Index.NOT_ANALYZED ) );
- updater.addDoc( cmd );
- }
-
- private void deleteSimpleDoc(String id) throws Exception {
- SolrCore core = h.getCore();
-
- UpdateHandler updater = core.getUpdateHandler();
-
- // Delete the document
- DeleteUpdateCommand cmd = new DeleteUpdateCommand();
- cmd.id = id;
- cmd.fromCommitted = true;
- cmd.fromPending = true;
-
- updater.delete(cmd);
- }
+
+
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/DocumentBuilderTest.java Wed Jan 5 20:25:17 2011
@@ -26,8 +26,6 @@ import org.apache.solr.schema.FieldType;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
*
*
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/TestIndexingPerformance.java Wed Jan 5 20:25:17 2011
@@ -19,6 +19,7 @@ package org.apache.solr.update;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
+import org.apache.lucene.document.Fieldable;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.util.AbstractSolrTestCase;
@@ -87,10 +88,7 @@ public class TestIndexingPerformance ext
long start = System.currentTimeMillis();
- AddUpdateCommand add = new AddUpdateCommand();
- add.allowDups = !overwrite;
- add.overwriteCommitted = overwrite;
- add.overwritePending = overwrite;
+ AddUpdateCommand add = new AddUpdateCommand(req);
Field idField=null;
@@ -102,7 +100,7 @@ public class TestIndexingPerformance ext
for (int j=0; j<fields.length; j+=2) {
String field = fields[j];
String val = fields[j+1];
- Field f = schema.getField(field).createField(val, 1.0f);
+ Fieldable f = schema.getField(field).createField(val, 1.0f);
add.doc.add(f);
}
}
@@ -114,7 +112,7 @@ public class TestIndexingPerformance ext
log.info("iter="+iter +" time=" + (end-start) + " throughput=" + ((long)iter*1000)/(end-start));
//discard all the changes
- updateHandler.rollback(new RollbackUpdateCommand());
+ updateHandler.rollback(new RollbackUpdateCommand(req));
req.close();
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Wed Jan 5 20:25:17 2011
@@ -37,8 +37,6 @@ import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
/**
*
*/
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/AbstractSolrTestCase.java Wed Jan 5 20:25:17 2011
@@ -20,6 +20,7 @@ package org.apache.solr.util;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrInputDocument;
@@ -84,6 +85,14 @@ public abstract class AbstractSolrTestCa
public abstract String getSolrConfigFile();
/**
+ * Subclasses can override this to change a test's solr home
+ * (default is in test-files)
+ */
+ public String getSolrHome() {
+ return SolrTestCaseJ4.TEST_HOME;
+ }
+
+ /**
* The directory used to story the index managed by the TestHarness h
*/
protected File dataDir;
@@ -113,8 +122,8 @@ public abstract class AbstractSolrTestCa
dataDir = new File(TEMP_DIR,
getClass().getName() + "-" + System.currentTimeMillis());
dataDir.mkdirs();
-
String configFile = getSolrConfigFile();
+ System.setProperty("solr.solr.home", getSolrHome());
if (configFile != null) {
solrConfig = h.createConfig(getSolrConfigFile());
@@ -408,4 +417,9 @@ public abstract class AbstractSolrTestCa
}
return f.delete();
}
+
+ /** @see SolrTestCaseJ4#getFile */
+ public static File getFile(String name) throws IOException {
+ return SolrTestCaseJ4.getFile(name);
+ }
}
Modified: lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java (original)
+++ lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/util/SolrPluginUtilsTest.java Wed Jan 5 20:25:17 2011
@@ -18,14 +18,12 @@
package org.apache.solr.util;
import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.QParser;
import org.apache.solr.util.SolrPluginUtils;
import org.apache.solr.util.SolrPluginUtils.DisjunctionMaxQueryParser;
-import org.apache.solr.core.SolrCore;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.search.DocList;
-import org.apache.solr.search.DocSlice;
-import org.apache.solr.response.SolrQueryResponse;
-import org.apache.solr.common.util.*;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrDocumentList;
@@ -41,8 +39,6 @@ import org.apache.lucene.search.BooleanC
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-
import java.util.List;
import java.util.Map;
import java.util.HashMap;
@@ -162,9 +158,12 @@ public class SolrPluginUtilsTest extends
Query out;
String t;
-
+
+ SolrQueryRequest req = req();
+ QParser qparser = QParser.getParser("hi", "dismax", req);
+
DisjunctionMaxQueryParser qp =
- new SolrPluginUtils.DisjunctionMaxQueryParser(h.getCore().getSchema());
+ new SolrPluginUtils.DisjunctionMaxQueryParser(qparser, req.getSchema().getDefaultSearchFieldName());
qp.addAlias("hoss", 0.01f, SolrPluginUtils.parseFieldBoosts
("title^2.0 title_stemmed name^1.2 subject^0.5"));
@@ -296,11 +295,11 @@ public class SolrPluginUtilsTest extends
/* zero is zero is zero */
assertEquals(0, calcMSM(5, "0"));
assertEquals(0, calcMSM(5, "0%"));
- assertEquals(0, calcMSM(5, "-5"));
- assertEquals(0, calcMSM(5, "-100%"));
+ assertEquals(0, calcMSM(5, " -5 "));
+ assertEquals(0, calcMSM(5, "\n -100% \n"));
/* basic integers */
- assertEquals(3, calcMSM(5, "3"));
+ assertEquals(3, calcMSM(5, " \n3\n "));
assertEquals(2, calcMSM(5, "-3"));
assertEquals(3, calcMSM(3, "3"));
assertEquals(0, calcMSM(3, "-3"));
@@ -308,13 +307,13 @@ public class SolrPluginUtilsTest extends
assertEquals(0, calcMSM(3, "-5"));
/* positive percentages with rounding */
- assertEquals(0, calcMSM(3, "25%"));
+ assertEquals(0, calcMSM(3, " \n25% \n"));
assertEquals(1, calcMSM(4, "25%"));
- assertEquals(1, calcMSM(5, "25%"));
+ assertEquals(1, calcMSM(5, " 25% "));
assertEquals(2, calcMSM(10, "25%"));
/* negative percentages with rounding */
- assertEquals(3, calcMSM(3, "-25%"));
+ assertEquals(3, calcMSM(3, " \n-25%\n "));
assertEquals(3, calcMSM(4, "-25%"));
assertEquals(4, calcMSM(5, "-25%"));
assertEquals(8, calcMSM(10, "-25%"));
@@ -326,22 +325,22 @@ public class SolrPluginUtilsTest extends
assertEquals(0, calcMSM(4, "3<0"));
assertEquals(0, calcMSM(5, "3<0"));
assertEquals(1, calcMSM(1, "3<25%"));
- assertEquals(2, calcMSM(2, "3<25%"));
+ assertEquals(2, calcMSM(2, " 3\n<\n25% "));
assertEquals(3, calcMSM(3, "3<25%"));
- assertEquals(1, calcMSM(4, "3<25%"));
+ assertEquals(1, calcMSM(4, "\n 3 < \n25%\n "));
assertEquals(1, calcMSM(5, "3<25%"));
/* multiple conditionals */
- assertEquals(1, calcMSM(1, "3<-25% 10<-3"));
- assertEquals(2, calcMSM(2, "3<-25% 10<-3"));
- assertEquals(3, calcMSM(3, "3<-25% 10<-3"));
- assertEquals(3, calcMSM(4, "3<-25% 10<-3"));
- assertEquals(4, calcMSM(5, "3<-25% 10<-3"));
+ assertEquals(1, calcMSM(1, "\n3 < -25% 10 < -3 \n"));
+ assertEquals(2, calcMSM(2, " 3 < -25% 10 < -3\n"));
+ assertEquals(3, calcMSM(3, " 3 < -25% \n 10 < -3 \n"));
+ assertEquals(3, calcMSM(4, " 3 < -25% 10 < -3 "));
+ assertEquals(4, calcMSM(5, " 3 < -25% 10 < -3"));
assertEquals(5, calcMSM(6, "3<-25% 10<-3"));
- assertEquals(6, calcMSM(7, "3<-25% 10<-3"));
- assertEquals(6, calcMSM(8, "3<-25% 10<-3"));
- assertEquals(7, calcMSM(9, "3<-25% 10<-3"));
- assertEquals(8, calcMSM(10, "3<-25% 10<-3"));
+ assertEquals(6, calcMSM(7, " 3 < -25% 10 < -3 "));
+ assertEquals(6, calcMSM(8, " 3 < -25% 10 \n < -3\n"));
+ assertEquals(7, calcMSM(9, " 3 < -25% 10 < -3 \n"));
+ assertEquals(8, calcMSM(10, " 3 < -25% 10 < -3"));
assertEquals(8, calcMSM(11, "3<-25% 10<-3"));
assertEquals(9, calcMSM(12, "3<-25% 10<-3"));
assertEquals(97, calcMSM(100, "3<-25% 10<-3"));
Modified: lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/client/solrj/embedded/JettySolrRunner.java Wed Jan 5 20:25:17 2011
@@ -30,7 +30,6 @@ import org.mortbay.jetty.Connector;
import org.mortbay.jetty.Handler;
import org.mortbay.jetty.Server;
import org.mortbay.jetty.bio.SocketConnector;
-import org.mortbay.jetty.nio.SelectChannelConnector;
import org.mortbay.jetty.servlet.Context;
import org.mortbay.jetty.servlet.FilterHolder;
import org.mortbay.jetty.servlet.HashSessionIdManager;
Modified: lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/DirectSolrConnection.java Wed Jan 5 20:25:17 2011
@@ -53,19 +53,8 @@ import org.apache.solr.schema.IndexSchem
*/
public class DirectSolrConnection
{
- final SolrCore core;
- final SolrRequestParsers parser;
-
- /**
- * Initialize using the static singleton SolrCore.getSolrCore().
- *
- * @deprecated use {@link #DirectSolrConnection(SolrCore)}
- */
- @Deprecated
- public DirectSolrConnection()
- {
- this( SolrCore.getSolrCore() );
- }
+ protected final SolrCore core;
+ protected final SolrRequestParsers parser;
/**
* Initialize using an explicit SolrCore
@@ -75,54 +64,6 @@ public class DirectSolrConnection
core = c;
parser = new SolrRequestParsers( c.getSolrConfig() );
}
-
- /**
- * This constructor is designed to make it easy for JNI embedded applications
- * to setup the entire solr environment with a simple interface. It takes three parameters:
- *
- * <code>instanceDir:</code> The solr instance directory. If null, it will check the standard
- * places first (JNDI,properties,"solr" directory)
- *
- * <code>dataDir:</code> where the index is stored.
- *
- * <code>loggingPath:</code> Path to a java.util.logging.config.file. If the path represents
- * an absolute path or is relative to the CWD, it will use that. Next it will try a path
- * relative to the instanceDir. If none of these files exist, it will error.
- */
- public DirectSolrConnection( String instanceDir, String dataDir, String loggingPath )
- {
- // If a loggingPath is specified, try using that (this needs to happen first)
- if( loggingPath != null ) {
- File loggingConfig = new File( loggingPath );
- if( !loggingConfig.exists() && instanceDir != null ) {
- loggingConfig = new File( new File(instanceDir), loggingPath );
- }
- if( loggingConfig.exists() ) {
- System.setProperty("java.util.logging.config.file", loggingConfig.getAbsolutePath() );
- }
- else {
- throw new SolrException( SolrException.ErrorCode.SERVER_ERROR, "can not find logging file: "+loggingConfig );
- }
- }
-
- if( instanceDir == null ) {
- instanceDir = SolrResourceLoader.locateInstanceDir();
- }
-
- // Initialize
- try {
- CoreContainer cores = new CoreContainer(new SolrResourceLoader(instanceDir));
- SolrConfig solrConfig = new SolrConfig(instanceDir, SolrConfig.DEFAULT_CONF_FILE, null);
- CoreDescriptor dcore = new CoreDescriptor(cores, "", solrConfig.getResourceLoader().getInstanceDir());
- IndexSchema indexSchema = new IndexSchema(solrConfig, instanceDir+"/conf/schema.xml", null);
- core = new SolrCore( null, dataDir, solrConfig, indexSchema, dcore);
- cores.register("", core, false);
- parser = new SolrRequestParsers( solrConfig );
- }
- catch (Exception ee) {
- throw new RuntimeException(ee);
- }
- }
/**
Modified: lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/SolrDispatchFilter.java Wed Jan 5 20:25:17 2011
@@ -81,7 +81,6 @@ public class SolrDispatchFilter implemen
try {
// web.xml configuration
this.pathPrefix = config.getInitParameter( "path-prefix" );
- init.setSolrConfigFilename(config.getInitParameter("solrconfig-filename"));
this.cores = init.initialize();
abortOnConfigurationError = init.isAbortOnConfigurationError();
Modified: lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/src/org/apache/solr/servlet/cache/HttpCacheHeaderUtil.java Wed Jan 5 20:25:17 2011
@@ -35,7 +35,6 @@ import org.apache.solr.common.SolrExcept
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.search.SolrIndexSearcher;
import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.response.SolrQueryResponse;
import org.apache.commons.codec.binary.Base64;
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/WEB-INF/web.xml?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/WEB-INF/web.xml (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/WEB-INF/web.xml Wed Jan 5 20:25:17 2011
@@ -83,62 +83,16 @@
<url-pattern>/*</url-pattern>
</filter-mapping>
- <!-- Otherwise it will continue to the old servlets -->
-
- <servlet>
- <servlet-name>SolrServer</servlet-name>
- <display-name>Solr</display-name>
- <description>Solr Server</description>
- <servlet-class>org.apache.solr.servlet.SolrServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
-
- <servlet>
- <servlet-name>SolrUpdate</servlet-name>
- <display-name>SolrUpdate</display-name>
- <description>Solr Update Handler</description>
- <servlet-class>org.apache.solr.servlet.SolrUpdateServlet</servlet-class>
- <load-on-startup>2</load-on-startup>
- </servlet>
-
<servlet>
<servlet-name>Logging</servlet-name>
<servlet-class>org.apache.solr.servlet.LogLevelSelection</servlet-class>
</servlet>
- <!-- @Deprecated -->
- <servlet>
- <servlet-name>ping</servlet-name>
- <jsp-file>/admin/ping.jsp</jsp-file>
- </servlet>
-
- <servlet-mapping>
- <servlet-name>SolrServer</servlet-name>
- <url-pattern>/select/*</url-pattern>
- </servlet-mapping>
-
- <servlet-mapping>
- <servlet-name>SolrUpdate</servlet-name>
- <url-pattern>/update/*</url-pattern>
- </servlet-mapping>
-
<servlet-mapping>
<servlet-name>Logging</servlet-name>
<url-pattern>/admin/logging</url-pattern>
</servlet-mapping>
- <!-- @Deprecated -->
- <servlet-mapping>
- <servlet-name>ping</servlet-name>
- <url-pattern>/admin/ping</url-pattern>
- </servlet-mapping>
-
- <!-- @Deprecated -->
- <servlet-mapping>
- <servlet-name>Logging</servlet-name>
- <url-pattern>/admin/logging.jsp</url-pattern>
- </servlet-mapping>
-
<mime-mapping>
<extension>.xsl</extension>
<!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ -->
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/admin/_info.jsp Wed Jan 5 20:25:17 2011
@@ -63,7 +63,7 @@
isEnabled = new File(enabledFile).exists();
}
- String collectionName = schema!=null ? schema.getName():"unknown";
+ String collectionName = schema!=null ? schema.getSchemaName():"unknown";
String defaultSearch = "";
{
@@ -114,7 +114,7 @@
}
String cwd=System.getProperty("user.dir");
- String solrHome= solrConfig.getInstanceDir();
+ String solrHome= solrConfig.getResourceLoader().getInstanceDir();
boolean cachingEnabled = !solrConfig.getHttpCachingConfig().isNever304();
%>
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/admin/index.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/admin/index.jsp?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/admin/index.jsp (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/admin/index.jsp Wed Jan 5 20:25:17 2011
@@ -97,7 +97,7 @@
<%
// a quick hack to get rid of get-file.jsp -- note this still spits out invalid HTML
- out.write( org.apache.solr.handler.admin.ShowFileRequestHandler.getFileContents( "admin-extra.html" ) );
+ out.write( org.apache.solr.handler.admin.ShowFileRequestHandler.getFileContents(core, "admin-extra.html" ) );
%>
</table><P>
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/admin/registry.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/admin/registry.jsp?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/admin/registry.jsp (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/admin/registry.jsp Wed Jan 5 20:25:17 2011
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ page import="org.apache.solr.core.SolrInfoMBean,
- org.apache.solr.core.SolrInfoRegistry,
java.net.URL,
java.util.Date,
java.util.Map"%>
Modified: lucene/dev/branches/docvalues/solr/src/webapp/web/admin/stats.jsp
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/solr/src/webapp/web/admin/stats.jsp?rev=1055622&r1=1055621&r2=1055622&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/solr/src/webapp/web/admin/stats.jsp (original)
+++ lucene/dev/branches/docvalues/solr/src/webapp/web/admin/stats.jsp Wed Jan 5 20:25:17 2011
@@ -16,7 +16,6 @@
limitations under the License.
--%>
<%@ page import="org.apache.solr.core.SolrInfoMBean,
- org.apache.solr.core.SolrInfoRegistry,
org.apache.solr.common.util.NamedList,
java.util.Date,
java.util.Map"%>