You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by yo...@apache.org on 2006/03/01 23:24:24 UTC
svn commit: r382181 - in /incubator/solr/trunk: example/conf/schema.xml
example/exampledocs/solr.xml src/apps/SolrTest/conf/solrconfig.xml
src/apps/SolrTest/newtest.txt src/apps/SolrTest/src/SolrTest.java
Author: yonik
Date: Wed Mar 1 14:24:22 2006
New Revision: 382181
URL: http://svn.apache.org/viewcvs?rev=382181&view=rev
Log:
partial solar->solr changes
Modified:
incubator/solr/trunk/example/conf/schema.xml
incubator/solr/trunk/example/exampledocs/solr.xml
incubator/solr/trunk/src/apps/SolrTest/conf/solrconfig.xml
incubator/solr/trunk/src/apps/SolrTest/newtest.txt
incubator/solr/trunk/src/apps/SolrTest/src/SolrTest.java
Modified: incubator/solr/trunk/example/conf/schema.xml
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/example/conf/schema.xml?rev=382181&r1=382180&r2=382181&view=diff
==============================================================================
--- incubator/solr/trunk/example/conf/schema.xml (original)
+++ incubator/solr/trunk/example/conf/schema.xml Wed Mar 1 14:24:22 2006
@@ -129,7 +129,7 @@
<!-- Less flexible matching, but less false matches. Probably not ideal for product names
but may be good for SKUs. Can insert dashes in the wrong place and still match. -->
- <fieldtype name="textTight" class="solar.TextField" positionIncrementGap="100" >
+ <fieldtype name="textTight" class="solr.TextField" positionIncrementGap="100" >
<analyzer>
<tokenizer class="solr.WhitespaceTokenizerFactory"/>
<filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/>
Modified: incubator/solr/trunk/example/exampledocs/solr.xml
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/example/exampledocs/solr.xml?rev=382181&r1=382180&r2=382181&view=diff
==============================================================================
--- incubator/solr/trunk/example/exampledocs/solr.xml (original)
+++ incubator/solr/trunk/example/exampledocs/solr.xml Wed Mar 1 14:24:22 2006
@@ -9,7 +9,7 @@
<field name="features">Optimizied for High Volume Web Traffic</field>
<field name="features">Standards Based Open Interfaces - XML and HTTP</field>
<field name="features">Comprehensive HTML Administration Interfaces</field>
- <field name="features">Scalability - Efficient Replication to other Solar Search Servers</field>
+ <field name="features">Scalability - Efficient Replication to other Solr Search Servers</field>
<field name="features">Flexible and Adaptable with XML configuration and Schema</field>
<field name="price">0</field>
<field name="popularity">10</field>
Modified: incubator/solr/trunk/src/apps/SolrTest/conf/solrconfig.xml
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/apps/SolrTest/conf/solrconfig.xml?rev=382181&r1=382180&r2=382181&view=diff
==============================================================================
--- incubator/solr/trunk/src/apps/SolrTest/conf/solrconfig.xml (original)
+++ incubator/solr/trunk/src/apps/SolrTest/conf/solrconfig.xml Wed Mar 1 14:24:22 2006
@@ -40,7 +40,7 @@
<unlockOnStartup>true</unlockOnStartup>
</mainIndex>
- <updateHandler class="solar.DirectUpdateHandler2">
+ <updateHandler class="solr.DirectUpdateHandler2">
<!-- autocommit pending docs if certain criteria are met -->
<autocommit> <!-- NOTE: autocommit not implemented yet -->
@@ -61,8 +61,8 @@
env - environment variables to set. default=nothing
-->
<!-- A postCommit event is fired after every commit
- <listener event="postCommit" class="solar.RunExecutableListener">
- <str name="exe">/var/opt/resin3/__PORT__/scripts/solar/snapshooter</str>
+ <listener event="postCommit" class="solr.RunExecutableListener">
+ <str name="exe">/var/opt/resin3/__PORT__/scripts/solr/snapshooter</str>
<str name="dir">/var/opt/resin3/__PORT__</str>
<bool name="wait">true</bool>
<arr name="args"> <str>arg1</str> <str>arg2</str> </arr>
@@ -86,26 +86,26 @@
that match a particular query.
-->
<filterCache
- class="solar.search.LRUCache"
+ class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="256"/>
<queryResultCache
- class="solar.search.LRUCache"
+ class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="1024"/>
<documentCache
- class="solar.search.LRUCache"
+ class="solr.search.LRUCache"
size="512"
initialSize="512"
autowarmCount="0"/>
<!--
<cache name="myUserCache"
- class="solar.search.LRUCache"
+ class="solr.search.LRUCache"
size="4096"
initialSize="1024"
autowarmCount="1024"
@@ -133,9 +133,9 @@
<!-- QuerySenderListener takes an array of NamedList and executes a
local query request for each NamedList in sequence. -->
<!--
- <listener event="newSearcher" class="solar.QuerySenderListener">
+ <listener event="newSearcher" class="solr.QuerySenderListener">
<arr name="queries">
- <lst> <str name="q">solar</str> <str name="start">0</str> <str name="rows">10</str> </lst>
+ <lst> <str name="q">solr</str> <str name="start">0</str> <str name="rows">10</str> </lst>
<lst> <str name="q">rocks</str> <str name="start">0</str> <str name="rows">10</str> </lst>
</arr>
</listener>
@@ -145,7 +145,7 @@
prepared but there is no current registered searcher to handle
requests or to gain prewarming data from. -->
<!--
- <listener event="firstSearcher" class="solar.QuerySenderListener">
+ <listener event="firstSearcher" class="solr.QuerySenderListener">
<arr name="queries">
<lst> <str name="q">fast_warm</str> <str name="start">0</str> <str name="rows">10</str> </lst>
</arr>
@@ -166,24 +166,24 @@
The "standard" request handler is the default and will be used if qt
is not specified in the request.
-->
- <requestHandler name="standard" class="solar.StandardRequestHandler" />
- <requestHandler name="old" class="solar.tst.OldRequestHandler" >
+ <requestHandler name="standard" class="solr.StandardRequestHandler" />
+ <requestHandler name="old" class="solr.tst.OldRequestHandler" >
<int name="myparam">1000</int>
<float name="ratio">1.4142135</float>
<arr name="myarr"><int>1</int><int>2</int></arr>
<str>foo</str>
</requestHandler>
- <requestHandler name="oldagain" class="solar.tst.OldRequestHandler" >
+ <requestHandler name="oldagain" class="solr.tst.OldRequestHandler" >
<lst name="lst1"> <str name="op">sqrt</str> <int name="val">2</int> </lst>
<lst name="lst2"> <str name="op">log</str> <float name="val">10</float> </lst>
</requestHandler>
- <requestHandler name="test" class="solar.tst.TestRequestHandler" />
+ <requestHandler name="test" class="solr.tst.TestRequestHandler" />
<admin>
- <defaultQuery>solar</defaultQuery>
- <gettableFiles>solarconfig.xml conf/solar/WEB-INF/web.external.xml conf/resin.conf </gettableFiles>
+ <defaultQuery>solr</defaultQuery>
+ <gettableFiles>solrconfig.xml scheam.xml</gettableFiles>
</admin>
Modified: incubator/solr/trunk/src/apps/SolrTest/newtest.txt
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/apps/SolrTest/newtest.txt?rev=382181&r1=382180&r2=382181&view=diff
==============================================================================
--- incubator/solr/trunk/src/apps/SolrTest/newtest.txt (original)
+++ incubator/solr/trunk/src/apps/SolrTest/newtest.txt Wed Mar 1 14:24:22 2006
@@ -460,7 +460,7 @@
<add><doc><field name="id">42</field><field name="subword">10FooBar</field></doc></add>
<add><doc><field name="id">42</field><field name="subword">BAZ</field></doc></add>
<add><doc><field name="id">42</field><field name="subword">10</field></doc></add>
-<add><doc><field name="id">42</field><field name="subword">Mark, I found what's the problem! It turns to be from the latest schema. I found tons of exceptions in the resin.stdout that prevented the builder from performing. It's all coming from the WordDelimiterFilter which was just added to the latest schema: [2005-08-29 15:11:38.375] java.lang.IndexOutOfBoundsException: Index: 3, Size: 3 673804 [2005-08-29 15:11:38.375] at java.util.ArrayList.RangeCheck(ArrayList.java:547) 673805 [2005-08-29 15:11:38.375] at java.util.ArrayList.get(ArrayList.java:322) 673806 [2005-08-29 15:11:38.375] at solar.analysis.WordDelimiterFilter.addCombos(WordDelimiterFilter.java:349) 673807 [2005-08-29 15:11:38.375] at solar.analysis.WordDelimiterFilter.next(WordDelimiterFilter.java:325) 673808 [2005-08-29 15:11:38.375] at org.apache.lucene.analysis.LowerCaseFilter.next(LowerCaseFilter.java:32) 673809 [2005-08-29 15:11:38.375] at org.apache.lucene.analysis.StopFilter.next(StopFilter.java:98)
673810 [2005-08-29 15:11:38.375] at solar.EnglishPorterFilter.next(TokenizerFactory.java:163) 673811 [2005-08-29 15:11:38.375] at org.apache.lucene.index.DocumentWriter.invertDocument(DocumentWriter.java:143) 673812 [2005-08-29 15:11:38.375] at org.apache.lucene.index.DocumentWriter.addDocument(DocumentWriter.java:81) 673813 [2005-08-29 15:11:38.375] at org.apache.lucene.index.IndexWriter.addDocument(IndexWriter.java:307) 673814 [2005-08-29 15:11:38.375] at org.apache.lucene.index.IndexWriter.addDocument(IndexWriter.java:294) 673815 [2005-08-29 15:11:38.375] at solar.DirectUpdateHandler2.doAdd(DirectUpdateHandler2.java:170) 673816 [2005-08-29 15:11:38.375] at solar.DirectUpdateHandler2.overwriteBoth(DirectUpdateHandler2.java:317) 673817 [2005-08-29 15:11:38.375] at solar.DirectUpdateHandler2.addDoc(DirectUpdateHandler2.java:191) 673818 [2005-08-29 15:11:38.375] at solar.SolarCore.update(SolarCore.java:795) 673819 [2005-08-29 15:11:38.375] at solarserver.SolarServl
et.doPost(SolarServlet.java:71) 673820 [2005-08-29 15:11:38.375] at javax.servlet.http.HttpServlet.service(HttpServlet.java:154) 673821 [2005-08-29 15:11:38.375] at javax.servlet.http.HttpServlet.service(HttpServlet.java:92) 673822 [2005-08-29 15:11:38.375] at com.caucho.server.dispatch.ServletFilterChain.doFilter(ServletFilterChain.java:99) 673823 [2005-08-29 15:11:38.375] at com.caucho.server.cache.CacheFilterChain.doFilter(CacheFilterChain.java:188) 673824 [2005-08-29 15:11:38.375] at com.caucho.server.webapp.WebAppFilterChain.doFilter(WebAppFilterChain.java:163) 673825 [2005-08-29 15:11:38.375] at com.caucho.server.dispatch.ServletInvocation.service(ServletInvocation.java:208) 673826 [2005-08-29 15:11:38.375] at com.caucho.server.http.HttpRequest.handleRequest(HttpRequest.java:259) 673827 [2005-08-29 15:11:38.375] at com.caucho.server.port.TcpConnection.run(TcpConnection.java:363) 673828 [2005-08-29 15:11:38.375] at com.caucho.util.ThreadPool.runTasks(ThreadPool
.java:490) 673829 [2005-08-29 15:11:38.375] at com.caucho.util.ThreadPool.run(ThreadPool.java:423) 673830 [2005-08-29 15:11:38.375] at java.lang.Thread.run(Thread.java:595) With the previous schema I'm able to perform a successful full build: http://c12-ssa-dev40-so-mas1.cnet.com:5078/select/?stylesheet=q=docTypeversion=2.0start=0rows=10indent=on Do you want to rollback to the previous schema version</field></doc></add>
+<add><doc><field name="id">42</field><field name="subword">Mark, I found what's the problem! It turns to be from the latest schema. I found tons of exceptions in the resin.stdout that prevented the builder from performing. It's all coming from the WordDelimiterFilter which was just added to the latest schema: [2005-08-29 15:11:38.375] java.lang.IndexOutOfBoundsException: Index: 3, Size: 3 673804 [2005-08-29 15:11:38.375] at java.util.ArrayList.RangeCheck(ArrayList.java:547) 673805 [2005-08-29 15:11:38.375] at java.util.ArrayList.get(ArrayList.java:322) 673806 [2005-08-29 15:11:38.375] at solr.analysis.WordDelimiterFilter.addCombos(WordDelimiterFilter.java:349) 673807 [2005-08-29 15:11:38.375] at solr.analysis.WordDelimiterFilter.next(WordDelimiterFilter.java:325) 673808 [2005-08-29 15:11:38.375] at org.apache.lucene.analysis.LowerCaseFilter.next(LowerCaseFilter.java:32) 673809 [2005-08-29 15:11:38.375] at org.apache.lucene.analysis.StopFilter.next(StopFilter.java:98) 6
73810 [2005-08-29 15:11:38.375] at solr.EnglishPorterFilter.next(TokenizerFactory.java:163) 673811 [2005-08-29 15:11:38.375] at org.apache.lucene.index.DocumentWriter.invertDocument(DocumentWriter.java:143) 673812 [2005-08-29 15:11:38.375] at org.apache.lucene.index.DocumentWriter.addDocument(DocumentWriter.java:81) 673813 [2005-08-29 15:11:38.375] at org.apache.lucene.index.IndexWriter.addDocument(IndexWriter.java:307) 673814 [2005-08-29 15:11:38.375] at org.apache.lucene.index.IndexWriter.addDocument(IndexWriter.java:294) 673815 [2005-08-29 15:11:38.375] at solr.DirectUpdateHandler2.doAdd(DirectUpdateHandler2.java:170) 673816 [2005-08-29 15:11:38.375] at solr.DirectUpdateHandler2.overwriteBoth(DirectUpdateHandler2.java:317) 673817 [2005-08-29 15:11:38.375] at solr.DirectUpdateHandler2.addDoc(DirectUpdateHandler2.java:191) 673818 [2005-08-29 15:11:38.375] at solr.SolrCore.update(SolrCore.java:795) 673819 [2005-08-29 15:11:38.375] at solrserver.SolrServlet.doPost(S
olrServlet.java:71) 673820 [2005-08-29 15:11:38.375] at javax.servlet.http.HttpServlet.service(HttpServlet.java:154) 673821 [2005-08-29 15:11:38.375] at javax.servlet.http.HttpServlet.service(HttpServlet.java:92) 673822 [2005-08-29 15:11:38.375] at com.caucho.server.dispatch.ServletFilterChain.doFilter(ServletFilterChain.java:99) 673823 [2005-08-29 15:11:38.375] at com.caucho.server.cache.CacheFilterChain.doFilter(CacheFilterChain.java:188) 673824 [2005-08-29 15:11:38.375] at com.caucho.server.webapp.WebAppFilterChain.doFilter(WebAppFilterChain.java:163) 673825 [2005-08-29 15:11:38.375] at com.caucho.server.dispatch.ServletInvocation.service(ServletInvocation.java:208) 673826 [2005-08-29 15:11:38.375] at com.caucho.server.http.HttpRequest.handleRequest(HttpRequest.java:259) 673827 [2005-08-29 15:11:38.375] at com.caucho.server.port.TcpConnection.run(TcpConnection.java:363) 673828 [2005-08-29 15:11:38.375] at com.caucho.util.ThreadPool.runTasks(ThreadPool.java:490) 6
73829 [2005-08-29 15:11:38.375] at com.caucho.util.ThreadPool.run(ThreadPool.java:423) 673830 [2005-08-29 15:11:38.375] at java.lang.Thread.run(Thread.java:595) With the previous schema I'm able to perform a successful full build: http://c12-ssa-dev40-so-mas1.cnet.com:5078/select/?stylesheet=q=docTypeversion=2.0start=0rows=10indent=on Do you want to rollback to the previous schema version</field></doc></add>
#
Modified: incubator/solr/trunk/src/apps/SolrTest/src/SolrTest.java
URL: http://svn.apache.org/viewcvs/incubator/solr/trunk/src/apps/SolrTest/src/SolrTest.java?rev=382181&r1=382180&r2=382181&view=diff
==============================================================================
--- incubator/solr/trunk/src/apps/SolrTest/src/SolrTest.java (original)
+++ incubator/solr/trunk/src/apps/SolrTest/src/SolrTest.java Wed Mar 1 14:24:22 2006
@@ -284,7 +284,7 @@
int requests=1;
int writers=0;
- Logger log = Logger.getLogger("solar");
+ Logger log = Logger.getLogger("org.apache.solr");
log.setUseParentHandlers(false);
log.setLevel(Level.FINEST);
Handler handler = new ConsoleHandler();