December 2010 - Wikitty-commits - mailman.cloud.codelutin.com

r624 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 18:10:51 +0100 (Fri, 17 Dec 2010) New Revision: 624 Url: http://nuiton.org/repositories/revision/wikitty/624 Log: - change package of solr RAMDirectory Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-12-17 16:58:06 UTC (rev 623) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-12-17 17:10:51 UTC (rev 624) @@ -32,6 +32,7 @@ import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; +import org.nuiton.wikitty.storage.solr.RAMDirectoryFactory; import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; /** @@ -60,7 +61,7 @@ "jdbc:h2:mem:" + dbName); config.setOption(WikittyConfig.WikittyOption. WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(), - "org.nuiton.wikitty.solr.RAMDirectoryFactory"); + RAMDirectoryFactory.class.getName()); // others defaults value in config normaly is correct // - WIKITTY_STORAGE_JDBC* // - WIKITTY_STORAGE_JDBC_XADATASOURCE*

1 0

r623 - in trunk/wikitty-solr-impl/src: main/resources test/resources
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 17:58:06 +0100 (Fri, 17 Dec 2010) New Revision: 623 Url: http://nuiton.org/repositories/revision/wikitty/623 Log: - change queryParser package after repackage of solr implementation - remove unused file Removed: trunk/wikitty-solr-impl/src/test/resources/solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-17 16:42:54 UTC (rev 622) +++ trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-17 16:58:06 UTC (rev 623) @@ -531,8 +531,8 @@ </fragmenter> </highlighting> - <queryParser name="lucene" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> - <queryParser name="wikitty" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> + <queryParser name="lucene" class="org.nuiton.wikitty.storage.solr.WikittyQueryParser"/> + <queryParser name="wikitty" class="org.nuiton.wikitty.storage.solr.WikittyQueryParser"/>  - -<config> -  - <abortOnConfigurationError>${solr.abortOnConfigurationError:true}</abortOnConfigurationError> - -  - <dataDir>${wikitty.searchengine.solr.directory.data:./solr/data}</dataDir> - -  - <directoryFactory name="DirectoryFactory" class="${wikitty.searchengine.solr.directory.factory:solr.StandardDirectoryFactory}"/> - - - <indexDefaults> -  - <useCompoundFile>false</useCompoundFile> - - <mergeFactor>10</mergeFactor> -  -  -  - <ramBufferSizeMB>32</ramBufferSizeMB> - <maxMergeDocs>2147483647</maxMergeDocs> - <maxFieldLength>10000</maxFieldLength> - <writeLockTimeout>1000</writeLockTimeout> - <commitLockTimeout>10000</commitLockTimeout> - -  -  -  -  - -  -  - -  - <lockType>simple</lockType> - </indexDefaults> - - <mainIndex> -  - <useCompoundFile>false</useCompoundFile> - <ramBufferSizeMB>32</ramBufferSizeMB> - <mergeFactor>10</mergeFactor> -  -  - <maxMergeDocs>2147483647</maxMergeDocs> - <maxFieldLength>10000</maxFieldLength> - -  - <unlockOnStartup>true</unlockOnStartup> - </mainIndex> - -  - <jmx /> - -  - <updateHandler class="solr.DirectUpdateHandler2"> - -  - -  - -  -  -  - - </updateHandler> - - - <query> -  - <maxBooleanClauses>1024</maxBooleanClauses> - - -  - <filterCache - class="solr.LRUCache" - size="512" - initialSize="512" - autowarmCount="128"/> - -  - <queryResultCache - class="solr.LRUCache" - size="512" - initialSize="512" - autowarmCount="32"/> - -  - <documentCache - class="solr.LRUCache" - size="512" - initialSize="512" - autowarmCount="0"/> - -  - <enableLazyFieldLoading>true</enableLazyFieldLoading> - -  -  - -  - -  - <queryResultWindowSize>50</queryResultWindowSize> - -  - <queryResultMaxDocsCached>200</queryResultMaxDocsCached> - -  - <HashDocSet maxSize="3000" loadFactor="0.75"/> - -  -  - <listener event="newSearcher" class="solr.QuerySenderListener"> - <arr name="queries"> - <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> - <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst> - </arr> - </listener> - -  - <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> - <lst><str name="q">static firstSearcher warming query from solrconfig.xml</str></lst> - </arr> - </listener> - -  - <useColdSearcher>false</useColdSearcher> - -  - <maxWarmingSearchers>2</maxWarmingSearchers> - - </query> - -  - <requestDispatcher handleSelect="true" > -  - <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" /> - -  -  - <httpCaching lastModifiedFrom="openTime" - etagSeed="Solr"> -  -  -  - </httpCaching> - </requestDispatcher> - - -  - <requestHandler name="standard" class="solr.SearchHandler" default="true"> -  - <lst name="defaults"> - <str name="echoParams">explicit</str> -  - </lst> - </requestHandler> - - -  - <requestHandler name="dismax" class="solr.SearchHandler" > - <lst name="defaults"> - <str name="defType">dismax</str> - <str name="echoParams">explicit</str> - <float name="tie">0.01</float> - <str name="qf"> - text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0 manu^1.1 cat^1.4 - </str> - <str name="pf"> - text^0.2 features^1.1 name^1.5 manu^1.4 manu_exact^1.9 - </str> - <str name="bf"> - ord(popularity)^0.5 recip(rord(price),1,1000,1000)^0.3 - </str> - <str name="fl"> - id,name,price,score - </str> - <str name="mm"> - 2<-1 5<-2 6<90% - </str> - <int name="ps">100</int> - <str name="q.alt">*:*</str> -  - <str name="hl.fl">text features name</str> -  - <str name="f.name.hl.fragsize">0</str> -  - <str name="f.name.hl.alternateField">name</str> - <str name="f.text.hl.fragmenter">regex</str>  - </lst> - </requestHandler> - -  - <requestHandler name="partitioned" class="solr.SearchHandler" > - <lst name="defaults"> - <str name="defType">dismax</str> - <str name="echoParams">explicit</str> - <str name="qf">text^0.5 features^1.0 name^1.2 sku^1.5 id^10.0</str> - <str name="mm">2<-1 5<-2 6<90%</str> -  - <str name="bq">incubationdate_dt:[* TO NOW/DAY-1MONTH]^2.2</str> - </lst> -  - <lst name="appends"> - <str name="fq">inStock:true</str> - </lst> -  - <lst name="invariants"> - <str name="facet.field">cat</str> - <str name="facet.field">manu_exact</str> - <str name="facet.query">price:[* TO 500]</str> - <str name="facet.query">price:[500 TO *]</str> - </lst> - </requestHandler> - - -  - -  - <searchComponent name="spellcheck" class="solr.SpellCheckComponent"> - - <str name="queryAnalyzerFieldType">textSpell</str> - - <lst name="spellchecker"> - <str name="name">default</str> - <str name="field">spell</str> - <str name="spellcheckIndexDir">./spellchecker1</str> - - </lst> - <lst name="spellchecker"> - <str name="name">jarowinkler</str> - <str name="field">spell</str> -  - <str name="distanceMeasure">org.apache.lucene.search.spell.JaroWinklerDistance</str> - <str name="spellcheckIndexDir">./spellchecker2</str> - - </lst> - - <lst name="spellchecker"> - <str name="classname">solr.FileBasedSpellChecker</str> - <str name="name">file</str> - <str name="sourceLocation">spellings.txt</str> - <str name="characterEncoding">UTF-8</str> - <str name="spellcheckIndexDir">./spellcheckerFile</str> - </lst> - </searchComponent> - -  - <requestHandler name="/spellCheckCompRH" class="solr.SearchHandler"> - <lst name="defaults"> -  - <str name="spellcheck.onlyMorePopular">false</str> -  - <str name="spellcheck.extendedResults">false</str> -  - <str name="spellcheck.count">1</str> - </lst> - <arr name="last-components"> - <str>spellcheck</str> - </arr> - </requestHandler> - -  - - -  - - -  - <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" /> - -  - <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" /> - - -  - <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" /> - - -  - <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" /> - -  - <requestHandler name="/admin/ping" class="PingRequestHandler"> - <lst name="defaults"> - <str name="qt">standard</str> - <str name="q">solrpingquery</str> - <str name="echoParams">all</str> - </lst> - </requestHandler> - -  - <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > - <lst name="defaults"> - <str name="echoParams">explicit</str>  - <str name="echoHandler">true</str> - </lst> - </requestHandler> - - <highlighting> -  -  - <fragmenter name="gap" class="org.apache.solr.highlight.GapFragmenter" default="true"> - <lst name="defaults"> - <int name="hl.fragsize">100</int> - </lst> - </fragmenter> - -  - <fragmenter name="regex" class="org.apache.solr.highlight.RegexFragmenter"> - <lst name="defaults"> -  - <int name="hl.fragsize">70</int> -  - <float name="hl.regex.slop">0.5</float> -  - <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str> - </lst> - </fragmenter> - -  - <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true"> - <lst name="defaults"> - <str name="hl.simple.pre"><![CDATA[<em>]]></str> - <str name="hl.simple.post"><![CDATA[</em>]]></str> - </lst> - </formatter> - </highlighting> - - -  - -  - <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter"> - <int name="xsltCacheLifetimeSeconds">5</int> - </queryResponseWriter> - - - <queryParser name="wikitty" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> - -  - -  - -  - <admin> - <defaultQuery>solr</defaultQuery> - -  - </admin> - -</config>

1 0

r622 - trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 17:42:54 +0100 (Fri, 17 Dec 2010) New Revision: 622 Url: http://nuiton.org/repositories/revision/wikitty/622 Log: delete old package Removed: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/

1 0

r621 - trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 17:41:36 +0100 (Fri, 17 Dec 2010) New Revision: 621 Url: http://nuiton.org/repositories/revision/wikitty/621 Log: delete old package Removed: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/

1 0

r620 - trunk/wikitty-solr-impl/src/main/resources
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 17:38:41 +0100 (Fri, 17 Dec 2010) New Revision: 620 Url: http://nuiton.org/repositories/revision/wikitty/620 Log: try to commit purged version of solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml Modified: trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-17 16:33:52 UTC (rev 619) +++ trunk/wikitty-solr-impl/src/main/resources/solrconfig.xml 2010-12-17 16:38:41 UTC (rev 620) @@ -71,33 +71,6 @@ <commitLockTimeout>10000</commitLockTimeout>  -  -  -  - -  -  - -  <updateHandler class="solr.DirectUpdateHandler2"> - -  - -  - -  -  -  - </updateHandler> @@ -215,7 +148,7 @@ class="solr.LRUCache" size="512" initialSize="512" - autowarmCount="128"/> + autowarmCount="0"/>  @@ -242,36 +175,19 @@ --> <enableLazyFieldLoading>true</enableLazyFieldLoading> -  -  - -  -  - <queryResultWindowSize>50</queryResultWindowSize> +  + <queryResultWindowSize>1</queryResultWindowSize>  @@ -283,28 +199,6 @@ iterate over, and faster to take intersections. --> <HashDocSet maxSize="3000" loadFactor="0.75"/> -  -  - <listener event="newSearcher" class="solr.QuerySenderListener"> - <arr name="queries"> - <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> - <lst><str name="q">static newSearcher warming query from solrconfig.xml</str></lst> - </arr> - </listener> - -  - <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> - <lst><str name="q">static firstSearcher warming query from solrconfig.xml</str></lst> - </arr> - </listener> -  - <maxWarmingSearchers>2</maxWarmingSearchers> + <maxWarmingSearchers>5</maxWarmingSearchers> </query> @@ -326,48 +220,17 @@ <requestDispatcher handleSelect="true" >  <requestParsers enableRemoteStreaming="false" multipartUploadLimitInKB="2048" /> - -  -  - <httpCaching lastModifiedFrom="openTime" - etagSeed="Solr"> -  -  -  - </httpCaching> - </requestDispatcher> - - -  + + + +  <lst name="defaults"> <str name="echoParams">explicit</str> -  <requestHandler name="dismax" class="solr.SearchHandler" > @@ -414,7 +277,7 @@ </str> <int name="ps">100</int> <str name="q.alt">*:*</str> -  +  <str name="hl.fl">text features name</str>  <str name="f.name.hl.fragsize">0</str> @@ -478,13 +341,13 @@ <str name="facet.query">price:[500 TO *]</str> </lst> </requestHandler> - +  @@ -578,12 +441,12 @@ </requestHandler> --> -  <requestHandler name="/update" class="solr.XmlUpdateRequestHandler" /> @@ -593,33 +456,33 @@ for debugging and as a token server for other types of applications --> <requestHandler name="/analysis" class="solr.AnalysisRequestHandler" /> - +  <requestHandler name="/update/csv" class="solr.CSVRequestHandler" startup="lazy" /> -  <requestHandler name="/admin/" class="org.apache.solr.handler.admin.AdminHandlers" /> - +  <requestHandler name="/admin/ping" class="PingRequestHandler"> <lst name="defaults"> @@ -628,7 +491,7 @@ <str name="echoParams">all</str> </lst> </requestHandler> - +  <requestHandler name="/debug/dump" class="solr.DumpRequestHandler" > <lst name="defaults"> @@ -636,7 +499,16 @@ <str name="echoHandler">true</str> </lst> </requestHandler> - + + + + + + + + + + <highlighting>   @@ -657,43 +529,9 @@ <str name="hl.regex.pattern">[-\w ,/\n\"']{20,200}</str> </lst> </fragmenter> - -  - <formatter name="html" class="org.apache.solr.highlight.HtmlFormatter" default="true"> - <lst name="defaults"> - <str name="hl.simple.pre"><![CDATA[<em>]]></str> - <str name="hl.simple.post"><![CDATA[</em>]]></str> - </lst> - </formatter> </highlighting> - - -  - -  - <queryResponseWriter name="xslt" class="org.apache.solr.request.XSLTResponseWriter"> - <int name="xsltCacheLifetimeSeconds">5</int> - </queryResponseWriter> - - + <queryParser name="lucene" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> <queryParser name="wikitty" class="org.nuiton.wikitty.solr.WikittyQueryParser"/> <!-- example of registering a query parser

1 0

r619 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-api/src/main/resources wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services wikitty-publication/src/main/resources wikitty-solr-impl/src/main/java/org/nuiton/wikitty wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage wikitty-solr-impl/src/main/
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 17:33:52 +0100 (Fri, 17 Dec 2010) New Revision: 619 Url: http://nuiton.org/repositories/revision/wikitty/619 Log: - repackage de de org.nuiton.wikitty.solr en org.nuiton.wikitty.storage.solr - in WikittySearchEngine Interface suppress strange method delete(Collection) - refactor indexation to store less field - rename meta field in solr index (prefix with #) - try to purge solr config file to have only necessary configuration (solrconfig.xml, schema.xml) only strage test with like("...", toLowerCase) failed and marked @Ignore, because like with toLowerCase perhaps desapare in near futur Added: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/TypeFieldModifier.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryParser.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java trunk/wikitty-solr-impl/src/main/resources/stopwords_en.txt trunk/wikitty-solr-impl/src/main/resources/stopwords_fr.txt trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java Removed: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/RAMDirectoryFactory.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/SolrUtil.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/package-info.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngine.java trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties trunk/wikitty-solr-impl/src/main/resources/schema.xml Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/WikittyConfig.java 2010-12-17 16:33:52 UTC (rev 619) @@ -182,7 +182,7 @@ WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY( "wikitty.searchengine.solr.directory.factory", _("SolR storage type possible value: solr.StandardDirectoryFactory" - + " or org.nuiton.wikitty.solr.RAMDirectoryFactory" + + " or org.nuiton.wikitty.storage.solr.RAMDirectoryFactory" + " (or when solr 4.0 will be used org.apache.solr.core.RAMDirectoryFactory)"), "solr.StandardDirectoryFactory", String.class, false, false), @@ -208,7 +208,7 @@ _("WikittyServiceStorage component to use (ExtensionStorage, WikittyStorage, SearchEngine)"), "org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC," + "org.nuiton.wikitty.jdbc.WikittyStorageJDBC," - + "org.nuiton.wikitty.solr.WikittySearchEngineSolr", String.class, false, false), + + "org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr", String.class, false, false), WIKITTY_WIKITTYSERVICENOTIFIER_COMPONENTS( "wikitty.WikittyServiceNotifier.components", Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngine.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngine.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngine.java 2010-12-17 16:33:52 UTC (rev 619) @@ -52,30 +52,30 @@ /** * Store wikitty in storage - * @return information usefull for client side update data + * Tree are reindexed if necessary. */ public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties); /** * Delete all object with idList argument. If id is not valid or don't exist. + * Tree are reindexed if necessary. * * @param idList list of ids to delete - * @return <code>UpdateResponse</code>> * @throws WikittyException */ public void delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException; - /** - * Delete all object with idList argument. idList is directly passed to search engine - * and is processed without any other kind of treatment. - * - * @param idList list of ids to delete - * @return <code>UpdateResponse</code> - * @throws WikittyException - */ - public void delete(Collection<String> idList) throws WikittyException; + // NOTE poussin 20101216 i don't know why this method exists, i suppress it +// /** +// * Delete all object with idList argument. idList is directly passed to search engine +// * and is processed without any other kind of treatment. +// * +// * @param idList list of ids to delete +// * @throws WikittyException +// */ +// public void delete(Collection<String> idList) throws WikittyException; public PagedResult<String> findAllByCriteria(WikittyTransaction transaction, Criteria criteria); @@ -87,7 +87,34 @@ public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter); /** - * Find all children ids with count for a node wikitty. + * Find all children ids with attachment count for a node wikitty. + * If same attachment found many time in subtree this attachment is count + * only once. + * + * If we have: + * <ul> + * <li> w Node (4) + * <ul> + * <li> child1 (3) </li> + * <li> child2 (4) </li> + * <li> child3 (2) + * <ul> + * <li> subchild1 (1) </li> + * <li> subchild2 (5) </li> + * </ul> + * </li> + * <li> child4 (3) </li> + * <li> child5 (7) </li> + * </ul> + * </li> + * </ul> + * + * return count for: child1(3), child2(4), child3(8), child4(3), child5(7) + * and for the child3 count we have count of subchild1 and subchild2 in + * + * but Node and subchild are not returned. This method return only one level + * of tree + * * @param w * @return */ Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittySearchEngineInMemory.java 2010-12-17 16:33:52 UTC (rev 619) @@ -63,9 +63,9 @@ public void delete(WikittyTransaction transaction, Collection<String> idList) throws WikittyException { } - @Override - public void delete(Collection<String> idList) throws WikittyException { - } +// @Override +// public void delete(Collection<String> idList) throws WikittyException { +// } public boolean checkRestriction(Restriction restriction, Wikitty w) { if (restriction instanceof BinaryOperator) { Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-inmemory.properties 2010-12-17 16:33:52 UTC (rev 619) @@ -38,8 +38,8 @@ org.nuiton.wikitty.services.WikittyServiceSecurity wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.solr.WikittySearchEngineSolr -wikitty.searchengine.solr.directory.factory=org.nuiton.wikitty.solr.RAMDirectoryFactory +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr +wikitty.searchengine.solr.directory.factory=org.nuiton.wikitty.storage.solr.RAMDirectoryFactory wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=false wikitty.service.event.listen=false Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server-slave.properties 2010-12-17 16:33:52 UTC (rev 619) @@ -42,7 +42,7 @@ org.nuiton.wikitty.services.WikittyServiceHessianServer wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.solr.WikittySearchEngineSolr +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr wikitty.WikittyServiceNotifier.components=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.service.server.url=http://services-slave.codelutin.com/wikitty wikitty.service.cache.allwaysRestoreCopies=false Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-server.properties 2010-12-17 16:33:52 UTC (rev 619) @@ -41,7 +41,7 @@ org.nuiton.wikitty.services.WikittyServiceHessianServer wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.solr.WikittySearchEngineSolr +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr wikitty.WikittyServiceNotifier.components=org.nuiton.wikitty.services.XMPPNotifierTransporter wikitty.service.server.url=http://services.codelutin.com/wikitty wikitty.service.cache.listenevents=false Modified: trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties =================================================================== --- trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-api/src/main/resources/wikitty-config-sample-standalone.properties 2010-12-17 16:33:52 UTC (rev 619) @@ -40,7 +40,7 @@ org.nuiton.wikitty.services.WikittyServiceSecurity wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.solr.WikittySearchEngineSolr +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr wikitty.service.cache.listenevents=false wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=false Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyServiceJDBC.java 2010-12-17 16:33:52 UTC (rev 619) @@ -30,7 +30,7 @@ import org.nuiton.util.ApplicationConfig; import org.nuiton.wikitty.WikittyServiceFactory; import org.nuiton.wikitty.services.WikittyServiceStorage; -import org.nuiton.wikitty.solr.WikittySearchEngineSolr; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; /** * @author poussin Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/services/WikittyServiceInMemoryJdbcSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -32,7 +32,7 @@ import org.nuiton.wikitty.WikittyConfig; import org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC; import org.nuiton.wikitty.jdbc.WikittyStorageJDBC; -import org.nuiton.wikitty.solr.WikittySearchEngineSolr; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; /** * In memory implementation that use in memory h2 and in memory solr Modified: trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties =================================================================== --- trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-publication/src/main/resources/wikitty-publication-ws-default.properties 2010-12-17 16:33:52 UTC (rev 619) @@ -41,7 +41,7 @@ org.nuiton.wikitty.services.WikittyServiceAccessStat wikitty.WikittyServiceStorage.components=org.nuiton.wikitty.jdbc.WikittyExtensionStorageJDBC,\ org.nuiton.wikitty.jdbc.WikittyStorageJDBC,\ -org.nuiton.wikitty.solr.WikittySearchEngineSolr +org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr wikitty.service.cache.listenevents=false wikitty.service.cache.allwaysRestoreCopies=false wikitty.service.event.propagate=false Deleted: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/RAMDirectoryFactory.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/RAMDirectoryFactory.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/RAMDirectoryFactory.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,120 +0,0 @@ -/** - * %%Ignore-License - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.nuiton.wikitty.solr; - -import java.io.File; -import java.util.HashMap; -import java.util.Map; - -import org.apache.solr.core.StandardDirectoryFactory; -import java.io.IOException; -import java.util.concurrent.atomic.AtomicInteger; - -import org.apache.lucene.store.Directory; -import org.apache.lucene.store.RAMDirectory; - -/** - * Directory provider for using lucene RAMDirectory - * - * Only exists in version 4.0 of solr, but we used 1.4.1. Remove this class - * when solr 4.0 will be used - */ -public class RAMDirectoryFactory extends StandardDirectoryFactory { - - private static Map<String, RefCntRamDirectory> directories = new HashMap<String, RefCntRamDirectory>(); - - @Override - public Directory open(String path) throws IOException { - synchronized (RAMDirectoryFactory.class) { - RefCntRamDirectory directory = directories.get(path); - if (directory == null || !directory.isOpen()) { - directory = (RefCntRamDirectory) openNew(path); - directories.put(path, directory); - } else { - directory.incRef(); - } - - return directory; - } - } - - public boolean exists(String path) { - synchronized (RAMDirectoryFactory.class) { - RefCntRamDirectory directory = directories.get(path); - if (directory == null || !directory.isOpen()) { - return false; - } else { - return true; - } - } - } - - /** - * Non-public for unit-test access only. Do not use directly - */ - Directory openNew(String path) throws IOException { - Directory directory; - File dirFile = new File(path); - boolean indexExists = dirFile.canRead(); - if (indexExists) { - Directory dir = super.open(path); - directory = new RefCntRamDirectory(dir); - } else { - directory = new RefCntRamDirectory(); - } - return directory; - } - - static public class RefCntRamDirectory extends RAMDirectory { - - private final AtomicInteger refCount = new AtomicInteger(); - - public RefCntRamDirectory() { - super(); - refCount.set(1); - } - - public RefCntRamDirectory(Directory dir) throws IOException { - this(); - Directory.copy(dir, this, false); -// for (String file : dir.listAll()) { -// dir.copy(this, file, file); -// } - } - - public void incRef() { - ensureOpen(); - refCount.incrementAndGet(); - } - - public void decRef() { - ensureOpen(); - if (refCount.getAndDecrement() == 1) { - super.close(); - } - } - - public final synchronized void close() { - decRef(); - } - - public boolean isOpen() { - return isOpen; - } - } -} Deleted: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,451 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty.solr; - -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - -import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; -import org.nuiton.wikitty.WikittyException; -import org.nuiton.wikitty.services.WikittyTransaction; -import org.nuiton.wikitty.search.operators.And; -import org.nuiton.wikitty.search.operators.AssociatedRestriction; -import org.nuiton.wikitty.search.operators.Between; -import org.nuiton.wikitty.search.operators.Contains; -import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.search.operators.EndsWith; -import org.nuiton.wikitty.search.operators.Equals; -import org.nuiton.wikitty.search.operators.Greater; -import org.nuiton.wikitty.search.operators.GreaterOrEqual; -import org.nuiton.wikitty.search.operators.In; -import org.nuiton.wikitty.search.operators.Keyword; -import org.nuiton.wikitty.search.operators.Less; -import org.nuiton.wikitty.search.operators.LessOrEqual; -import org.nuiton.wikitty.search.operators.Like; -import org.nuiton.wikitty.search.operators.Not; -import org.nuiton.wikitty.search.operators.NotEquals; -import org.nuiton.wikitty.search.operators.Or; -import org.nuiton.wikitty.search.operators.Restriction; -import org.nuiton.wikitty.search.RestrictionHelper; -import org.nuiton.wikitty.search.operators.StartsWith; -import org.nuiton.wikitty.search.operators.Unlike; -import org.nuiton.wikitty.search.operators.Like.SearchAs; -import org.nuiton.wikitty.search.operators.Null; - -/** - * @author "Nicolas Chapurlat" <nicolas.chapurlat(a)logica.com> - * @author "Guillaume Dufrêne" <dufrene(a)argia.fr> - * - * This class is used to parse Restriction to create lucene request on - * content. Every operators describe in RestrictionName is handle. Parsing may - * throw exception when restriction parameters are incorrect. - */ -public class Restriction2Solr { - - private static final int MAX_SUBQUERY_RESULT = 100; - - final static protected WikittySearchEngineSolr.FieldModifier dummyFieldModifier = new WikittySearchEngineSolr.FieldModifier() { - public String convertToSolr(WikittyTransaction transaction, String fieldname) { - return fieldname; - } - public String convertToField(WikittyTransaction transaction, String solrName) { - return solrName; - } - }; - - protected WikittySearchEngineSolr.FieldModifier fieldModifer; - protected WikittyTransaction transaction; - - public Restriction2Solr() { - this(null, dummyFieldModifier); - } - - // TODO 20101201 jru improve manage transaction and fieldModifeir in helper - public Restriction2Solr(WikittyTransaction transaction, WikittySearchEngineSolr.FieldModifier fieldModifer) { - this.transaction = transaction; - this.fieldModifer = fieldModifer; - } - - public String toSolr(Restriction restriction) { - return toSolr(restriction, null); - } - - public String toSolr(Restriction restriction, SolrServer solr) - throws WikittyException { - // ParameterValidator.checkNullParameter(restriction, "restriction"); - switch (restriction.getName()) { - case TRUE: - return true2solr(); - case FALSE: - return false2solr(); - case NOT: - Not not = (Not) restriction; - return not2solr(not); - case AND: - And and = (And) restriction; - return and2solr(and); - case OR: - Or or = (Or) restriction; - return or2solr(or); - case EQUALS: - Equals eq = (Equals) restriction; - return eq2solr(eq); - case LIKE: - Like like = (Like) restriction; - return like2solr(like); - case UNLIKE: - Unlike unlike = (Unlike) restriction; - return unlike2solr(unlike); - case NOT_EQUALS: - NotEquals neq = (NotEquals) restriction; - return neq2solr(neq); - case LESS: - Less less = (Less) restriction; - return less2solr(less); - case LESS_OR_EQUAL: - LessOrEqual lessEq = (LessOrEqual) restriction; - return lessEq2solr(lessEq); - case GREATER: - Greater great = (Greater) restriction; - return great2solr(great); - case GREATER_OR_EQUAL: - GreaterOrEqual greatEq = (GreaterOrEqual) restriction; - return greatEq2solr(greatEq); - case BETWEEN: - Between between = (Between) restriction; - return between2solr(between); - case CONTAINS: - Contains contains = (Contains) restriction; - return contains2solr(contains); - case IN: - In in = (In) restriction; - return in2solr(in); - case STARTS_WITH: - StartsWith start = (StartsWith) restriction; - return start2solr(start); - case ENDS_WITH: - EndsWith end = (EndsWith) restriction; - return end2solr(end); - case ASSOCIATED: - AssociatedRestriction associated = (AssociatedRestriction) restriction; - return associated2solr(associated, solr); - case KEYWORD: - Keyword keyword = (Keyword) restriction; - return keyword2solr(keyword); - case IS_NULL: - Null isNull = (Null) restriction; - return isNull2solr(isNull); - case IS_NOT_NULL: - Null isNotNull = (Null) restriction; - return isNotNull2solr(isNotNull); - default: - throw new WikittyException("this kind of restriction is not supported : " - + restriction.getName().toString()); - } - } - - private String in2solr(In in) { - boolean first = true; - String result = in.getElement().getName() + ":["; - for( String value : in.getValue() ) { - if ( !first ) { result += ", "; first = false; } - result += value; - } - result +="]"; - return result; - } - - private String associated2solr(AssociatedRestriction associated, SolrServer solr) throws WikittyException { - String subQuery = toSolr( associated.getRestriction() ); - SolrQuery query = new SolrQuery(WikittySearchEngineSolr.SOLR_QUERY_PARSER + subQuery); - query.setRows(MAX_SUBQUERY_RESULT); - QueryResponse resp = null; - try { - resp = solr.query(query); - } catch (SolrServerException e) { - throw new WikittyException("Unable to execute associative query on " + associated.getElement().getName(), e); - } - SolrDocumentList solrResults = resp.getResults(); - - Restriction generatedRestriction = null; - long size = solrResults.size(); - if ( size == 0 ) { - throw new WikittyException("Associated " + associated.getElement().getName() + " do not retrieved any result"); - } - if ( size == 1 ) { - generatedRestriction = RestrictionHelper.eq( associated.getElement(), (String) solrResults.get(0).getFieldValue(WikittySearchEngineSolr.SOLR_ID) ); - } else { - List<String> ids = new ArrayList<String>(solrResults.size()); - for (SolrDocument doc : solrResults) { - String id = (String) doc.getFieldValue(WikittySearchEngineSolr.SOLR_ID); - ids.add(id); - } - generatedRestriction = new In(associated.getElement(), ids); - } - Restriction parent = associated.getParentRestrictionDto(); - And and; - if ( parent instanceof And ) { - and = (And) parent; - and.getRestrictions().add( generatedRestriction ); - } else { - and = RestrictionHelper.and( Arrays.asList(new Restriction[]{ associated.getParentRestrictionDto(), generatedRestriction }) ); - } - return toSolr(and); - } - - private String not2solr(Not not) throws WikittyException { - if (not.getRestriction() == null) { - throw new WikittyException( "not.restriction" ); - } - return "( *:* - " + toSolr(not.getRestriction()) + " )"; - } - - private String and2solr(And and) throws WikittyException { - if (and.getRestrictions() == null) { - throw new WikittyException( "and.restrictions is null" ); - } - if (and.getRestrictions().size() < 2) { - throw new WikittyException( "AND is an operator that handle 2 operand at least"); - } - boolean first = true; - StringBuffer result = new StringBuffer(); - for (Restriction restriction : and.getRestrictions()) { - if (first) { - result.append("( ").append(toSolr(restriction)); - first = false; - } else { - result.append(" AND ").append(toSolr(restriction)); - } - } - return result.append(" )").toString(); - } - - private String or2solr(Or or) throws WikittyException { - if (or.getRestrictions() == null) { - throw new WikittyException("or.restrictions is null"); - } - if (or.getRestrictions().size() < 2) { - throw new WikittyException("OR is an operator that handle 2 operand at least"); - } - boolean first = true; - StringBuffer result = new StringBuffer(); - for (Restriction restriction : or.getRestrictions()) { - if (first) { - result.append("( "); - first = false; - } else { - result.append(" OR "); - } - result.append(toSolr(restriction)); - } - return result.append(" )").toString(); - } - - private String eq2solr(Equals eq) throws WikittyException { - return element2solr(eq.getElement()) + ":" + value2solr(eq.getValue()); - } - - private String like2solr(Like like) throws WikittyException { - SearchAs searchAs = like.getSearchAs(); - String element2solr = element2solr(like.getElement()); - if(element2solr.endsWith(WikittySearchEngineSolr.SUFFIX_STRING)) { // is string - switch(searchAs) { - case AsText: - element2solr += WikittySearchEngineSolr.SUFFIX_STRING_FULLTEXT; - break; - case ToLowerCase: - element2solr += WikittySearchEngineSolr.SUFFIX_STRING_LOWERCASE; - break; - } - } - - // Warning if you need add searchAs, AsText and ToLowerCase need search - // at lowercase - String value2solr = value2solr(like.getValue()); - if(!element2solr.endsWith(WikittySearchEngineSolr.SUFFIX_DATE)) { // is not date - value2solr = value2solr.toLowerCase(); - } - - return element2solr + ":" + value2solr; - } - - private String unlike2solr(Unlike unlike) throws WikittyException { - SearchAs searchAs = unlike.getSearchAs(); - String element2solr = element2solr(unlike.getElement()); - if(element2solr.endsWith(WikittySearchEngineSolr.SUFFIX_STRING)) { // is string - switch(searchAs) { - case AsText: - element2solr += WikittySearchEngineSolr.SUFFIX_STRING_FULLTEXT; - break; - case ToLowerCase: - element2solr += WikittySearchEngineSolr.SUFFIX_STRING_LOWERCASE; - break; - } - } - - // Warning if you need add searchAs, AsText and ToLowerCase need search - // at lowercase - String value2solr = value2solr(unlike.getValue()); - if(!element2solr.endsWith(WikittySearchEngineSolr.SUFFIX_DATE)) { // is not date - value2solr = value2solr.toLowerCase(); - } - - return "-" + element2solr + ":" + value2solr; - } - - private String neq2solr(NotEquals neq) - throws WikittyException { - return "-" + element2solr(neq.getElement()) + ":" - + value2solr(neq.getValue()); - } - - private String less2solr(Less less) throws WikittyException { - return element2solr(less.getElement()) + ":{* TO " - + value2solr(less.getValue()) + "}"; - } - - private String lessEq2solr(LessOrEqual lessEq) - throws WikittyException { - return element2solr(lessEq.getElement()) + ":[* TO " - + value2solr(lessEq.getValue()) + "]"; - } - - private String great2solr(Greater great) - throws WikittyException { - return element2solr(great.getElement()) + ":{" - + value2solr(great.getValue()) + " TO *}"; - } - - private String greatEq2solr(GreaterOrEqual greatEq) - throws WikittyException { - return element2solr(greatEq.getElement()) + ":[" - + value2solr(greatEq.getValue()) + " TO *]"; - } - - private String between2solr(Between between) - throws WikittyException { - if (between.getElement() == null) { - throw new WikittyException("contains.element"); - } - if (between.getMin() == null) { - throw new WikittyException("contains.min"); - } - if (between.getMax() == null) { - throw new WikittyException("contains.max"); - } - return element2solr(between.getElement()) + ":[" - + value2solr(between.getMin()) + " TO " - + value2solr(between.getMax()) + "]"; - } - - private String contains2solr(Contains contains) - throws WikittyException { - if (contains.getElement() == null) { - throw new WikittyException("contains.element"); - } - if (contains.getValue() == null) { - throw new WikittyException("contains.values"); - } - if (contains.getValue().size() < 1) { - throw new WikittyException("CONTAINS is an operator that handle 1 operand at least"); - } - - String operand = ""; - StringBuffer result = new StringBuffer(); - result.append("("); - for (String value : contains.getValue()) { - result.append(operand); - result.append(element2solr(contains.getElement())) - .append(":").append(value2solr(value)); - operand = " OR "; - } - result.append(")"); - return result.toString(); - } - - private String start2solr(StartsWith start) - throws WikittyException { - return element2solr(start.getElement()) + ":" - + value2solr(start.getValue()) + "*"; - } - - private String end2solr(EndsWith end) { - return element2solr(end.getElement()) + ":*" - + value2solr(end.getValue()); - } - - private String true2solr() { - return "( *:* )"; - } - - private String false2solr() { - return "( *:* - *:* )"; - } - - private String keyword2solr(Keyword keyword) { - return value2solr(keyword.getValue()); - } - - private String isNull2solr(Null isNull) { - return "( *:* - " + WikittySearchEngineSolr.SOLR_NOT_NULL_FIELDS + ":" + isNull.getFieldName() + ")"; - } - - private String isNotNull2solr(Null isNotNull) { - return WikittySearchEngineSolr.SOLR_NOT_NULL_FIELDS + ":" + isNotNull.getFieldName(); - } - - private String element2solr(Element element) throws WikittyException { - String result = element.getName(); - result = fieldModifer.convertToSolr(transaction, result); - return result; - } - - private String value2solr(String value) { - String result; - if (value != null) { - result = Restriction2Solr.escapeValue(value); - } else { - throw new WikittyException("Parse error, value must be not empty"); - } - - if (result.contains(" ")) { - result = "\"" + result + "\""; - } - return result; - } - - private static String escapeValue(String value) { - final String LUCENE_REPLACE_PATTERN = "\\+" + "|-" + "|&&" + "|\\|" - + "|!" + "|\$|\$" + "|\\[|\\]" + "|\\{|\\}" + "|\"" + "|:"; - return value.replaceAll(LUCENE_REPLACE_PATTERN, "\\\\$0"); - } -} - Deleted: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/SolrUtil.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/SolrUtil.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/SolrUtil.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,78 +0,0 @@ -package org.nuiton.wikitty.solr; - - -import java.util.Collection; -import java.util.HashSet; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrInputDocument; - -/** - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class SolrUtil { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(SolrUtil.class); - - /** - * copy all field of source in new document. - * If include is true copy only field specified in fields - * if include is false copy all field except field in fields. - * - * example: - * if doc contains field: abc, aabbcc, aaabbbccc, toto - * copySolrDocument(doc, true, "aa.*", ".*bbb.*") - * field copied are: aabbcc, aaabbbccc - * - * copySolrDocument(doc, false, "aa.*", ".*bbb.*") - * field copied are: abc, toto - * - * @param source - * @param include - * @param fields - * @return - */ - static public SolrInputDocument copySolrDocument( - SolrDocument source, boolean include, String... fields) { - SolrInputDocument result = new SolrInputDocument(); - Collection<String> fieldNames = source.getFieldNames(); - - Set<String> fieldToCopy = new HashSet<String>(); - if (include) { - for (String fieldName : fieldNames) { - for (String fieldRegexp : fields) { - if (fieldName.matches(fieldRegexp)) { - fieldToCopy.add(fieldName); - } - } - } - } else { // exclude - fieldToCopy.addAll(fieldNames); - for (String fieldName : fieldNames) { - for (String fieldRegexp : fields) { - if (fieldName.matches(fieldRegexp)) { - fieldToCopy.remove(fieldName); - } - } - } - } - - for (String fieldName : fieldToCopy) { - Collection<Object> fieldValues = source.getFieldValues(fieldName); - for (Object fieldValue : fieldValues) { - result.addField(fieldName, fieldValue); - } - } - return result; - } -} Deleted: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,96 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty.solr; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.lucene.queryParser.ParseException; -import org.apache.lucene.queryParser.QueryParser; -import org.apache.lucene.search.Query; -import org.apache.solr.common.params.CommonParams; -import org.apache.solr.common.params.SolrParams; -import org.apache.solr.common.util.NamedList; -import org.apache.solr.request.SolrQueryRequest; -import org.apache.solr.search.LuceneQParserPlugin; -import org.apache.solr.search.QParser; -import org.apache.solr.search.QueryParsing; -import org.apache.solr.search.SolrQueryParser; - -/** - * Add allow leading wildcard - * setAllowLeadingWildcard(true); - * <br>Example: <code>{!wikitty q.op=AND df=text sort='price asc'}myfield:foo +bar -baz</code> - * More information @see LuceneQParserPlugin - */ -public class WikittyQueryParser extends LuceneQParserPlugin { - - public static String NAME = "wikitty"; - - @Override - public void init(NamedList args) { - } - - @Override - public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { - return new SolrQParser(qstr, localParams, params, req); - } -} - -class SolrQParser extends QParser { - - static private Log log = LogFactory.getLog(SolrQParser.class); - String sortStr; - SolrQueryParser lparser; - - public SolrQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { - super(qstr, localParams, params, req); - } - - @Override - public Query parse() throws ParseException { - - String defaultField = getParam(CommonParams.DF); - if(defaultField == null) { - defaultField = "text"; - } - - lparser = new SolrQueryParser(this, defaultField); - lparser.setAllowLeadingWildcard(true); - - String opParam = getParam(QueryParsing.OP); - if (opParam != null) { - lparser.setDefaultOperator("AND".equals(opParam) ? QueryParser.Operator.AND : QueryParser.Operator.OR); - } - - String qstr = getString(); - log.debug("Query parse : " + qstr); - return lparser.parse(qstr); - } - - @Override - public String[] getDefaultHighlightFields() { - return new String[]{lparser.getField()}; - } -} Deleted: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,1005 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin POUSSIN - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.solr; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; -import org.apache.solr.client.solrj.response.FacetField; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; -import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.core.CoreContainer; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.FacetTopic; -import org.nuiton.wikitty.entities.FieldType; -import org.nuiton.wikitty.entities.FieldType.TYPE; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.entities.WikittyTreeNode; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.WikittyException; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.storage.WikittyExtensionStorage; -import org.nuiton.wikitty.storage.WikittySearchEngine; -import org.nuiton.wikitty.services.WikittyTransaction; -import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.search.Search; - -import com.arjuna.ats.arjuna.coordinator.BasicAction; -import com.arjuna.ats.arjuna.coordinator.OnePhaseResource; -import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome; -import com.arjuna.ats.arjuna.state.InputObjectState; -import com.arjuna.ats.arjuna.state.OutputObjectState; -import com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord; -import java.io.File; -import java.util.regex.Pattern; -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; - -/** - * - * @author poussin - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittySearchEngineSolr implements WikittySearchEngine { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); - - /** id field in solr */ - static final protected String SOLR_ID = "id"; - - /** extensions field name in solr */ - static final public String SOLR_EXTENSIONS = "extensions"; - - /** group all fields is not null */ - static final public String SOLR_NOT_NULL_FIELDS = "not_null_fields"; - - /** extension use to store field without extension to search on all extesnion */ - static final public String SOLR_ALL_EXTENSIONS = "all"; - - /** Precise the query parser to use, is allow leading wildcard */ - static final public String SOLR_QUERY_PARSER = "{!wikitty}"; - - // Use for indexation tree node - static final public String TREENODE_PREFIX = WikittyTreeNode.EXT_WIKITTYTREENODE + "."; - static final public String TREENODE_EMPTY = TREENODE_PREFIX + "empty"; - static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; - static final public String TREENODE_PATH = TREENODE_PREFIX + "path"; - - static final public String SUFFIX_BINARY = "_bi"; - static final public String SUFFIX_BOOLEAN = "_b"; - static final public String SUFFIX_DATE = "_dt"; - static final public String SUFFIX_STRING = "_s"; - static final public String SUFFIX_NUMERIC = "_d"; - static final public String SUFFIX_WIKITTY = "_w"; // not used yet - static final public String SUFFIX_STRING_LOWERCASE = "_c"; - static final public String SUFFIX_STRING_FULLTEXT = "_t"; - - static final public String[] fieldNotToCopyPattern = { - Pattern.quote(TREENODE_PREFIX) + ".*" - }; - - static final public String[] fieldToCopyPattern = { - // match: id, extensions, not_null_fields - SOLR_ID, SOLR_EXTENSIONS, SOLR_NOT_NULL_FIELDS, - // match: "(?!(all\.)).*_bi" accept ce qui fini par _bi sauf si ca commence par "all." - "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_BINARY, - "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_BOOLEAN, - "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_DATE, - "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_NUMERIC, - "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_STRING, - "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_WIKITTY - }; - - /** use to permit client to modify fieldname during query generation */ - static public interface FieldModifier { - public String convertToSolr(WikittyTransaction transaction, String fieldname); - public String convertToField(WikittyTransaction transaction, String solrName); - } - - static protected class TypeFieldModifer implements FieldModifier { - protected WikittyExtensionStorage extensionStorage; - public TypeFieldModifer(WikittyExtensionStorage extensionStorage) { - this.extensionStorage = extensionStorage; - } - - @Override - public String convertToSolr(WikittyTransaction transaction, String fqfieldname) { - String result = fqfieldname; - String[] searchField = fqfieldname.split(WikittyUtil.FQ_FIELD_NAME_SEPARATOR_REGEX); - - if (Element.ELT_EXTENSION.equals(fqfieldname)) { - result = SOLR_EXTENSIONS; - - } else if (Element.ELT_ID.equals(fqfieldname)) { - result = SOLR_ID; - - } else if (searchField.length >= 2) { - String extName = searchField[0]; - String fieldName = searchField[1]; - - if (Criteria.ALL_EXTENSIONS.equals(extName)) { - fqfieldname = SOLR_ALL_EXTENSIONS - + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + fieldName; - } - - if (searchField.length >= 3) { - // TODO poussin 20101209 je ne vois pas dans quel cas on passe ici - String fieldNameType = searchField[2]; - TYPE type = FieldType.TYPE.valueOf(fieldNameType); - result = WikittySearchEngineSolr.getSolrFieldName(fqfieldname, type); - return result; - } - - // Search type of field in extension - String version = extensionStorage.getLastVersion(transaction, extName); - if (version != null) { // not valid extension is version == null - WikittyExtension ext = extensionStorage.restore(transaction, extName, version); - FieldType fieldType = ext.getFieldType(fieldName); - log.debug(ext.toDefinition() + " for " + fieldName); - if (fieldType != null) { // type can be null if extension version differ - TYPE type = fieldType.getType(); - result = WikittySearchEngineSolr.getSolrFieldName(fqfieldname, type); - return result; - } - } - } - - return result; - } - - /** - * if you change this, change - * {@link WikittySearchEngineSolr#getSolrFieldName(java.lang.String, org.nuiton.wikitty.entities.FieldType.TYPE)} - * too - */ - @Override - public String convertToField(WikittyTransaction transaction, String solrName) { - String fieldName = solrName.replaceAll( - "(" + SUFFIX_BINARY + "$)" - + "|(" + SUFFIX_BOOLEAN + "$)" - + "|(" + SUFFIX_DATE + "$)" - + "|(" + SUFFIX_STRING + "$)" - + "|(" + SUFFIX_WIKITTY + "$)" - + "|(" + SUFFIX_NUMERIC + "$)", ""); - if (SOLR_EXTENSIONS.equals(fieldName)) { - fieldName = Element.ELT_EXTENSION; - } - return fieldName; - } - } - - /** - * Helper to get information nodes and elements for reindexation. - */ - static protected class ReindexChildTreeNode { - - protected SolrResource solrResource; - protected SolrServer solrServer; - - protected Map<String, Collection<String>> includedNodeIds; - protected Map<String, Collection<String>> excludedNodeIds; - protected Map<String, String> parents; - - public ReindexChildTreeNode(SolrServer solrServer, SolrResource solrResource) { - this.solrServer = solrServer; - this.solrResource = solrResource; - includedNodeIds = new HashMap<String, Collection<String>>(); - excludedNodeIds = new HashMap<String, Collection<String>>(); - parents = new HashMap<String, String>(); - } - - public void putIncludedAttachments(String nodeId, Collection<String> attchmentIds) { - putAttachements(includedNodeIds, nodeId, attchmentIds); - } - - public void putExcludedAttachments(String nodeId, Collection<String> attachmentIds) { - putAttachements(excludedNodeIds, nodeId, attachmentIds); - } - - public void putIncludedAttachment(String nodeId, String attachmentId) { - putAttachment(includedNodeIds, nodeId, attachmentId); - } - - public void putExcludedAttachment(String nodeId, String attachmentId) { - putAttachment(excludedNodeIds, nodeId, attachmentId); - } - - public Collection<String> getExcludedNodeIds(String attachmentId) { - Collection<String> result = excludedNodeIds.get(attachmentId); - if (result == null) { - result = new HashSet<String>(); - } - return result; - } - - public Collection<String> getIncludedNodeIds(String attachmentId) { - Collection<String> result = includedNodeIds.get(attachmentId); - if (result == null) { - result = new HashSet<String>(); - } - return result; - } - - protected void putAttachements(Map<String, Collection<String>> map, String nodeId, Collection<String> attachmentIds) { - if (attachmentIds != null) { - for (String attachmentId : attachmentIds) { - putAttachment(map, nodeId, attachmentId); - } - } - } - - protected void putAttachment(Map<String, Collection<String>> map, String nodeId, String attachmentId) { - Collection<String> values = map.get(attachmentId); - if(values == null) { - values = new HashSet<String>(); - map.put(attachmentId, values); - } - values.add(nodeId); - } - - public void putParent(String nodeId, String parentId) { - parents.put(nodeId, parentId); - } - - public String getParent(String nodeId) { - String parentId = parents.get(nodeId); - - // If not found in map, search in index - if(parentId == null) { - SolrDocument doc = findById(solrServer, nodeId); - if(doc == null) { - // is root - return null; - } - parentId = (String) doc.getFieldValue(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT); - putParent(nodeId, parentId); - } - - Collection<String> deletedDocIds = solrResource.getDeletedDocs(); - if(deletedDocIds.contains(parentId)) { - return null; - } - return parentId; - } - - public Collection<String> getReindexIds() { - Collection<String> result = new HashSet<String>(); - result.addAll(includedNodeIds.keySet()); - result.addAll(excludedNodeIds.keySet()); - result.addAll(solrResource.getAddedDocIds()); - return result; - } - - /** - * Add in doc fields on association between nodes. - * - * For example if you have a element in node with parent, like this - * A -> B -> C => element, the method add field in document solr : - * TreeNode.root : A - * TreeNode.A : B - * TreeNode.B : C - * TreeNode.C : TreeNode.empty - * - * @throws SolrServerException - */ - public void reindex() throws SolrServerException { - for (String id : getReindexIds()) { - - // Get documents - SolrInputDocument doc = solrResource.getAddedDoc(id); - if(doc == null) { - // Copy old field value - SolrDocument found = findById(solrServer, id); - if (found != null) { - // FIXME poussin 20101209 a finir en ne copiant que le necessaire voir javadoc du package - doc = SolrUtil.copySolrDocument(found, false, fieldNotToCopyPattern); - solrResource.addDoc(id, doc); - } else { - - if (log.isWarnEnabled()) { - log.warn("Can't find wikitty id '" + id + "' in index. Skip this wikitty."); - } - - // If not found, use new one - doc = new SolrInputDocument(); - - // FIXME sletellier 13/12/2010 : we must skip in this case ? - } - } - - // Add tree node fields - Collection<String> includedChildNodeIds = getIncludedNodeIds(id); - Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); - - // Find all node contain child - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + ":" + id); - QueryResponse response = solrServer.query(query); - SolrDocumentList updateDocs = response.getResults(); - - for (Iterator<SolrDocument> iterator = updateDocs.iterator(); - iterator.hasNext();) { - SolrDocument solrDocument = iterator.next(); - - String nodeId = (String) solrDocument.getFieldValue(SOLR_ID); - includedChildNodeIds.add(nodeId); - } - - // Excluded nodes - includedChildNodeIds.removeAll(excludedChildNodeIds); - includedChildNodeIds.removeAll(solrResource.getDeletedDocs()); - - // Add paths in doc - Map<String, String> paths = new HashMap<String, String>(); - for (String nodeId : includedChildNodeIds) { - doc.addField(TREENODE_PREFIX + nodeId, TREENODE_EMPTY); - - // Add path - String childParent = nodeId; - String parent = getParent(childParent); - while (parent != null) { - String parentPath = paths.get(childParent); - if(parentPath == null) { - doc.addField(TREENODE_PREFIX + parent, childParent); - paths.put(childParent, parent); - } - - childParent = parent; - parent = getParent(childParent); - } - - String parentPath = paths.get(childParent); - if(parentPath == null) { - doc.addField(TREENODE_ROOT, childParent); - paths.put(childParent, TREENODE_ROOT); - } - } - } - } - } - - /** - * Use to plug solr indexation in JTA transaction. - */ - static protected class SolrResource implements OnePhaseResource { - - protected SolrServer solrServer; - protected ThreadLocal<Map<String, SolrInputDocument>> addedDocs; - protected ThreadLocal<List<String>> deletedDocs; - - public SolrResource(SolrServer solrServer) { - this.solrServer = solrServer; - addedDocs = new ThreadLocal<Map<String, SolrInputDocument>>(); - deletedDocs = new ThreadLocal<List<String>>(); - - clear(); - } - - protected void init() { - // Add resource on phase in current transaction - LastResourceRecord lastResourceRecord = new LastResourceRecord(this); - BasicAction.Current().add(lastResourceRecord); - } - - public Map<String, SolrInputDocument> getAddedDocs() { - Map<String, SolrInputDocument> result = addedDocs.get(); - if(result == null) { - result = new HashMap<String, SolrInputDocument>(); - addedDocs.set(result); - } - return result; - } - - public List<String> getDeletedDocs() { - List<String> result = deletedDocs.get(); - if(result == null) { - result = new ArrayList<String>(); - deletedDocs.set(result); - } - return result; - } - - public void clear() { - addedDocs.set(new HashMap<String, SolrInputDocument>()); - deletedDocs.set(new ArrayList<String>()); - } - - public void addDoc(String id, SolrInputDocument doc) { - getAddedDocs().put(id, doc); - } - - public SolrInputDocument getAddedDoc(String id) { - SolrInputDocument result = getAddedDocs().get(id); - return result; - } - - public Collection<String> getAddedDocIds() { - Collection<String> result = getAddedDocs().keySet(); - return result; - } - - public void deleteDoc(String docId) { - getDeletedDocs().add(docId); - } - - @Override - public int commit() { - try { - synchronized(this) { - Collection<SolrInputDocument> docs = getAddedDocs().values(); - if(!docs.isEmpty()) { - solrServer.add(docs); - } - List<String> ids = getDeletedDocs(); - if(!ids.isEmpty()) { - solrServer.deleteById(ids); - } - solrServer.commit(); - } - clear(); - return TwoPhaseOutcome.FINISH_OK; - } catch (Exception eee) { - log.error("Error commit solr", eee); - return TwoPhaseOutcome.FINISH_ERROR; - } - } - - @Override - public int rollback() { - clear(); - return TwoPhaseOutcome.FINISH_OK; - } - - @Override - public void pack(OutputObjectState arg0) throws IOException { - } - - @Override - public void unpack(InputObjectState arg0) throws IOException { - } - } - - /** solr server */ - protected SolrServer solrServer; - - /** Field modifier use to transform to solr format */ - protected TypeFieldModifer fieldModifier; - - /** JTA resource */ - protected SolrResource solrResource; - - /** - * Init wikitty search engine on solr embedded server. - * - * @param extensionStorage extension storage - * @param properties properties (can be null) - */ - public WikittySearchEngineSolr( - ApplicationConfig config, WikittyExtensionStorage extensionStorage) { - - // init system env solr.data.dir - if (config != null) { - // choix du storage (file or Ram) - String solrDirFactoryKey = - WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); - String solrDirFactory = config.getOption(solrDirFactoryKey); - if (solrDirFactory != null) { - System.setProperty(solrDirFactoryKey, solrDirFactory); - } - - // on utilise le directory que si on est pas en Ram - if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { - String solrDataDirKey = - WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); - String solrDataDir = config.getOption(solrDataDirKey); - // make sure that dir exists - if (solrDataDir != null) { - File file = new File(solrDataDir); - file.mkdirs(); - System.setProperty(solrDataDirKey, solrDataDir); - } - } - } - - try { - CoreContainer.Initializer initializer = new CoreContainer.Initializer(); - CoreContainer coreContainer = initializer.initialize(); - solrServer = new EmbeddedSolrServer(coreContainer, ""); - - fieldModifier = new TypeFieldModifer(extensionStorage); - solrResource = new SolrResource(solrServer); - - } catch (Exception eee) { - throw new WikittyException("SolR initialization error", eee); - } - } - - @Override - public void clear(WikittyTransaction transaction) { - try { - // FIXME poussin 20100618 pourquoi n'est pas fait dans la transaction ? - solrResource.init(); - solrServer.deleteByQuery("*:*"); - } catch (Exception eee) { - throw new WikittyException("Error during clearing SolR data", eee); - } - } - - @Override - public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties) { - try { - solrResource.init(); - ReindexChildTreeNode reindexChildTreeNode = - new ReindexChildTreeNode(solrServer, solrResource); - for (Wikitty w : wikitties) { - String id = w.getId(); - - if (w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { - - Set<String> attachments = WikittyTreeNodeHelper.getAttachment(w); - reindexChildTreeNode.putIncludedAttachments(id, attachments); - - // Search deleted children - SolrDocument treeNodeDoc = findById(solrServer, id); - if (treeNodeDoc != null) { - Collection oldAttachments = treeNodeDoc.getFieldValues(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT); - if (oldAttachments != null) { - // if no more children, remove all old children - if(attachments == null) { - reindexChildTreeNode.putExcludedAttachments(id, oldAttachments); - } else { - // exclude only the removed children - for (Object oldAttachment : oldAttachments) { - if(!attachments.contains(oldAttachment)) { - reindexChildTreeNode.putExcludedAttachment(id,(String) oldAttachment); - } - } - } - } - } - - // Get new parent id (may be the same old parent) - String parentId = WikittyTreeNodeHelper.getParent(w); - reindexChildTreeNode.putParent(id, parentId); - } - - // Index - SolrInputDocument doc = createIndexDocument(w); - solrResource.addDoc(id, doc); - } - - // Reindex child in tree node - reindexChildTreeNode.reindex(); - } catch (Exception eee) { - throw new WikittyException("Can't store wikitty", eee); - } - } - - @Override - public void delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { - try { - solrResource.init(); - ReindexChildTreeNode reindexChildTreeNode = - new ReindexChildTreeNode(solrServer, solrResource); - for (String id : ids) { - - // Find child in node id - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PREFIX + id + ":*"); - QueryResponse response = solrServer.query(query); - SolrDocumentList updateDocs = response.getResults(); - - for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { - SolrDocument solrDocument = iterator.next(); - String childId = (String) solrDocument.getFieldValue(SOLR_ID); - reindexChildTreeNode.putExcludedAttachment(id, childId); - } - - solrResource.deleteDoc(id); - } - - // Reindex child in tree node - reindexChildTreeNode.reindex(); - } catch (Exception eee) { - throw new WikittyException("Can't delete wikitty in index", eee); - } - } - - @Override - public void delete(Collection<String> idList) throws WikittyException { - try { - for (String id : idList) { - solrServer.deleteById(id); - } - solrServer.commit(); - } catch (Exception eee) { - throw new WikittyException("Can't delete wikitty in index", eee); - } - } - - @Override - public PagedResult<String> findAllByCriteria(WikittyTransaction transaction, Criteria criteria) { - try { - // Create query with restriction - Restriction2Solr restriction2Solr = new Restriction2Solr(transaction, fieldModifier); - String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); - SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); - - // Add paged - int firstIndex = criteria.getFirstIndex(); - int endIndex = criteria.getEndIndex(); - - query.setStart(firstIndex); - int nbRows; - if (endIndex == -1) { - // WARNING It is necessary to substract 'start' otherwise, - // there is a capacity overlow in solR - nbRows = Integer.MAX_VALUE - firstIndex; - } else { - nbRows = endIndex - firstIndex + 1; - } - query.setRows(nbRows); - - // Add sorting - List<String> sortAscending = criteria.getSortAscending(); - if(sortAscending != null) { - for (String sort : sortAscending) { - String tranform = fieldModifier.convertToSolr(transaction, sort); - query.addSortField(tranform, SolrQuery.ORDER.asc); - } - } - - List<String> sortDescending = criteria.getSortDescending(); - if(sortDescending != null) { - for (String sort : sortDescending) { - String tranform = fieldModifier.convertToSolr(transaction, sort); - query.addSortField(tranform, SolrQuery.ORDER.desc); - } - } - - // Add faceting - List<String> facetField = criteria.getFacetField(); - log.debug("facetField : " + facetField); - List<Criteria> facetCriteria = criteria.getFacetCriteria(); - - // use to map query string to criteria facet name - Map<String, String> facetQueryToName = new HashMap<String, String>(); - - if ((facetField != null && !facetField.isEmpty()) - || (facetCriteria != null && !facetCriteria.isEmpty())) { - query.setFacet(true); - query.setFacetMinCount(1); - // query.setFacetLimit(8); // no limit actualy - - // field facetisation - if (facetField != null) { - for (String fqfieldName : facetField) { - String tranform = fieldModifier.convertToSolr(transaction, fqfieldName); - query.addFacetField(tranform); - } - } - - // query facetisation - if (facetCriteria != null) { - for (Criteria facet : facetCriteria) { - String queryFacet = - restriction2Solr.toSolr(facet.getRestriction()); - facetQueryToName.put(queryFacet, facet.getName()); - query.addFacetQuery(queryFacet); - } - } - } - - QueryResponse resp = solrServer.query(query); - SolrDocumentList solrResults = resp.getResults(); - - Map<String, List<FacetTopic>> facets = new HashMap<String, List<FacetTopic>>(); - if (facetField != null && !facetField.isEmpty()) { - for (FacetField facet : resp.getFacetFields()) { - String facetName = fieldModifier.convertToField(transaction, facet.getName()); - List<FacetTopic> topics = new ArrayList<FacetTopic>(); - if (facet.getValues() != null) { - for (FacetField.Count value : facet.getValues()) { - String topicName = value.getName(); - if(!topicName.endsWith(TREENODE_EMPTY)) { - int topicCount = (int) value.getCount(); - FacetTopic topic = new FacetTopic(facetName, topicName, topicCount); - topics.add(topic); - } - } - } - facets.put(facetName, topics); - } - } - if (facetCriteria != null && !facetCriteria.isEmpty()) { - for (Map.Entry<String, Integer> facet : resp.getFacetQuery().entrySet()) { - String facetName = facet.getKey(); - // don't use contains because, map can have key with null value - if (null != facetQueryToName.get(facetName)) { - facetName = facetQueryToName.get(facetName); - } - Integer count = facet.getValue(); - List<FacetTopic> topics = new ArrayList<FacetTopic>(); - FacetTopic topic = new FacetTopic(facetName, facetName, count); - topics.add(topic); - facets.put(facetName, topics); - } - } - - List<String> ids = new ArrayList<String>(solrResults.size()); - for (SolrDocument doc : solrResults) { - String id = (String) doc.getFieldValue(SOLR_ID); - ids.add(id); - } - - int numFound = (int)resp.getResults().getNumFound(); - PagedResult<String> result = new PagedResult<String>( - firstIndex, numFound, queryString, facets, ids); - - return result; - } catch (SolrServerException eee) { - throw new WikittyException("Error during find", eee); - } - } - - @Override - public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { - String wikittyId = w.getId(); - - String parent = WikittyTreeNodeHelper.getParent(w); - if(parent == null) { - parent = TREENODE_ROOT; - } else { - parent = TREENODE_PREFIX + parent; - } - - Criteria criteria = Search.query(filter) - .eq(parent, wikittyId).criteria() - .setFirstIndex(0).setEndIndex(0); - PagedResult<String> search = findAllByCriteria(transaction, criteria); - - int numFound = search.getNumFound(); - return numFound; - } - - - @Override - public Map<String, Integer> findAllChildrenCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { - String wikittyId = w.getId(); - - String parent = WikittyTreeNodeHelper.getParent(w); - if(parent == null) { - parent = TREENODE_ROOT; - } else { - parent = TREENODE_PREFIX + parent; - } - - // Find count with facet, if the node not contain recurcively content, - // the node not found with facet - Criteria criteria = Search.query(filter).eq(parent, wikittyId).criteria() - .setFirstIndex(0).setEndIndex(0) - .addFacetField(TREENODE_PREFIX + wikittyId); - PagedResult<String> search = findAllByCriteria(transaction, criteria); - - Map<String, Integer> counts = new HashMap<String, Integer>(); - List<FacetTopic> topics = search.getTopic(TREENODE_PREFIX + wikittyId); - if(topics != null) { - for (FacetTopic topic : topics) { - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - counts.put(topicName, topicCount); - } - } - - log.debug("Facet result " + counts); - - // Find all children, add the other node not found with facet - criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, wikittyId).criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - search = findAllByCriteria(transaction, criteria); - - List<String> children = search.getAll(); - for (String child : children) { - if(!counts.containsKey(child)) { - counts.put(child, 0); - } - } - - return counts; - } - - /** - * Create all index document to used to modify indexation. - * this method don't modify index. - * - * The document looks like : - * SolrId : wikittyId - * extensions : extensionNames - * fieldName : fieldValue - * - * FIXME poussin 20101209 beaucoup trop de champs redondant sauver. - * - * Une champs de type chaine est indexer 7 fois :(. _s et _s_c sont indexe - * exactement de la meme facon sauf qu'avant l'envoi a solr _s_c en mis en - * minuscule (ce qui devrait etre le role de solr en mettant la bonne config) - * _s et _s_c sont indexer en string et _s_t est indexe en text. - * - * string est indexer sans traitement - * text est indexer apres traitement - * (ce qui permet lors de la recherche des ecarts. ex: wifi matchera wi-fi) - * - * _s_c et _s_t ne sont utilise que pour - * {@link Restriction2Solr#like2solr}{@link Restriction2Solr#unlike2solr} - * n'y a-t-il pas moyen d'utiliser un champs deja indexe ? - * - * On a aujourd'hui: - * <li> text (qui rassemble tous les champs et est le champs de recherche par defaut) - * <li> ext.field_s (verbatime) - * <li> ext.field_s_c (verbatime lowercase) - * <li> ext.field_s_t (travaille) - * <li> all.field_s (verbatime) - * <li> all.field_s_c (verbatime lowercase) - * <li> all.field_s_t (travaille) - * - * et surtout ils sont tous stored :( - * - * @param w all wikitties object to index - * @return solrInputDocument used to modify index - */ - protected SolrInputDocument createIndexDocument(Wikitty w) { - if (log.isDebugEnabled()) { - log.debug("index wikitty " + w.getId()); - } - - SolrInputDocument doc = new SolrInputDocument(); - String id = w.getId(); - doc.addField(SOLR_ID, id); - - for (String name : w.getExtensionNames()) { - doc.addField(SOLR_EXTENSIONS, name); - } - - for (String fqfieldName : w.fieldNames()) { - FieldType fieldType = w.getFieldType(fqfieldName); - TYPE type = fieldType.getType(); - String solrFqFieldName = getSolrFieldName(fqfieldName, type); - - String solrAllFieldName = SOLR_ALL_EXTENSIONS - + WikittyUtil.FQ_FIELD_NAME_SEPARATOR - + WikittyUtil.getFieldNameFromFQFieldName(solrFqFieldName); - - Object objectValue = w.getFqField(fqfieldName); - if(objectValue != null) { - if (fieldType.isCollection()) { - Collection collectionValue = (Collection) objectValue; - for (Object itemValue : collectionValue) { - if (itemValue != null) { - doc.addField(solrFqFieldName, itemValue); - doc.addField(solrAllFieldName, itemValue); - - // Store string field in differents styles - if(type == TYPE.STRING) { - doc.addField(solrFqFieldName + SUFFIX_STRING_FULLTEXT, itemValue); - doc.addField(solrAllFieldName + SUFFIX_STRING_FULLTEXT, itemValue); - String itemValueLowerCase = itemValue.toString().toLowerCase(); - doc.addField(solrFqFieldName + SUFFIX_STRING_LOWERCASE, itemValueLowerCase); - doc.addField(solrAllFieldName + SUFFIX_STRING_LOWERCASE, itemValueLowerCase); - } - - doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); - log.debug("index field " + solrFqFieldName + " with value '" + itemValue + "'"); - } - } - } else { - doc.addField(solrFqFieldName, objectValue); - doc.addField(solrAllFieldName, objectValue); - - // Store string field in differents styles - if(type == TYPE.STRING) { - doc.addField(solrFqFieldName + SUFFIX_STRING_FULLTEXT, objectValue); - doc.addField(solrAllFieldName + SUFFIX_STRING_FULLTEXT, objectValue); - String objectValueLowerCase = objectValue.toString().toLowerCase(); - doc.addField(solrFqFieldName + SUFFIX_STRING_LOWERCASE, objectValueLowerCase); - doc.addField(solrAllFieldName + SUFFIX_STRING_LOWERCASE, objectValueLowerCase); - } - - doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); - if (log.isDebugEnabled()) { - log.debug("index field " + solrFqFieldName + " with value '" + objectValue + "'"); - } - } - } - } - return doc; - } - - /** - * Find solr document by id - */ - protected static SolrDocument findById(SolrServer solrServer, String id) { - SolrQuery query = new SolrQuery(SOLR_ID + ":" + id); - QueryResponse response; - try { - response = solrServer.query(query); - } catch (SolrServerException eee) { - throw new WikittyException("Error during find", eee); - } - - SolrDocumentList results = response.getResults(); - long numFound = results.getNumFound(); - if(numFound == 1) { - return results.get(0); - } - - return null; - } - - /** - * if you change this method, change - * {@link TypeFieldModifer#convertToField(org.nuiton.wikitty.services.WikittyTransaction, java.lang.String)} - * too - * - * @param fqfieldName - * @param type - * @return - */ - public static String getSolrFieldName(String fqfieldName, TYPE type) { - switch (type) { - case BINARY: - return fqfieldName + SUFFIX_BINARY; - case BOOLEAN: - return fqfieldName + SUFFIX_BOOLEAN; - case DATE: - return fqfieldName + SUFFIX_DATE; - case STRING: - return fqfieldName + SUFFIX_STRING; - case NUMERIC: - return fqfieldName + SUFFIX_NUMERIC; - // FIXME poussin 20101209 pourquoi ne pas mettre explicitement un suffix pour le type WIKITTY ? - default: - return fqfieldName; - } - } -} Deleted: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/package-info.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/package-info.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/package-info.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,133 +0,0 @@ -/** - * <h1>Indexation</h1> - * - * Ce module sert a l'indexation des wikitties dans SolR. Chaque champs d'un - * wikitty est indexe de differente facon selon son type. - * - * Chaque type de champs est suffixe par un marqueur. - * - * <table border="2"> - * <tr> - * <th>Type wikitty</th><th>Suffixe</th><th>Type d'indexation</th><th>valeur</th><th>stored</th><th>multiValued</th> - * </tr> - * <tr> - * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#BINARY}</td><td>_bi {@link WikittySearchEngineSolr#SUFFIX_BINARY}</td><td>aucun</td><td>vide</td><td>non</td><td>true</td> - * </tr> - * <tr> - * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#BOOLEAN}</td><td>_b {@link WikittySearchEngineSolr#SUFFIX_BOOLEAN}</td><td>boolean</td><td>la valeur du champs</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#DATE}</td><td>_dt {@link WikittySearchEngineSolr#SUFFIX_DATE}</td><td>date</td><td>la valeur du champs</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#NUMBER}</td><td>_d {@link WikittySearchEngineSolr#SUFFIX_NUMERIC}</td><td>sdouble</td><td>la valeur du champs</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#WIKITTY}</td><td>_w {@link WikittySearchEngineSolr#SUFFIX_WIKITTY}</td><td>string</td><td>l'id du wikitty</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td rowspan="3">{@link org.nuiton.wikitty.entities.FieldType.TYPE#STRING}</td><td>_s {@link WikittySearchEngineSolr#SUFFIX_STRING}</td><td>string</td><td>la valeur du champs</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>_s_c {@link WikittySearchEngineSolr#SUFFIX_STRING_LOWERCASE}</td><td>string</td><td>la valeur du champs en minuscule</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>_s_t {@link WikittySearchEngineSolr#SUFFIX_STRING_FULLTEXT}</td><td>text</td><td>la valeur du champs</td><td>true</td><td>true</td> - * </tr> - * </table> - * - * D'autres champs sont indexes - * <table border="2"> - * <tr> - * <th>champs</th><th>Type d'indexation</th><th>valeur</th><th>stored</th><th>multiValued</th> - * </tr> - * <tr> - * <td>id</td><td>string</td><td>l'id du wikitty</td><td>true</td><td>false</td> - * </tr> - * <tr> - * <td>extensions</td><td>string</td><td>la liste des extensions</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>not_null_fields</td><td>string</td><td>la liste des champs qui doivent etre non null</td><td>true</td><td>true</td> - * </tr> - * <tr> - * <td>text</td><td>text</td><td>la valeur de tous les champs ayant un suffix</td><td>true</td><td>true</td> - * </tr> - * </table> - * - * <p> - * Les champs sont tous restockes dans une extension 'all' pour pouvoir faire - * des recherches sur toutes les extensions en meme temps. Par exemple rechercher - * tout ce qui porte le 'nom' 'portable' quelque soit l'extension (*.nom:portable) - * <p> - * Les chaines de caracteres doivent obligatoirement etre indexee en type string - * si l'on veut pouvoir faire des facettes dessus. Il faut donc obligatoirement - * indexer les chaines en 'string' et aussi en 'text' pour pouvoir les utiliser - * dans les facettes mais aussi que la recheche soit plus permissive. - * <p> - * SolR copie tous les champs dans le champs 'text' pour la recherche fulltext - * ce champs est le champs par defaut de recherche. - * <p> - * id est marque comme devant etre un champs unique (et donc lorsqu'on enregistre - * un nouveau document avec le meme id, l'ancien est supprime) - * <p> - * Tous les champs sont marque stored car lors de la reindexation des arbres - * on a besoin de faire une copie de l'ancien document et donc de pouvoir - * recuperer la valeur des champs (voir alternative) - * <p> - * Par exemple si on a un champs <b>product.description: String</b> nous le - * retrouverons dans 7 champs de l'index: - * - * <li> text : text (car est la copie de tous les champs) - * <li> product.description_s : string (necessaire pour la facetisation) - * <li> product.description_s_c : string - * <li> product.description_s_t : text - * <li> all.description_s : string - * <li> all.description_s_c : string - * <li> all.description_s_t : text - * - * il faudrait que les 5 derniers soit autogenere par solr en utilisant un - * <b>copyField</b> dans le schema.xml et qu'il ne soit pas stocke. Mais pour - * cela il faudrait que <b>copyField</b> permette l'utilisation de regexp - * (faire un patch a SolR ?) - * - * <copyField source="*_s" dest="*_s_c"/> - * <copyField source="*_s" dest="*_s_t"/> - * - * <copyField source="*.*_s" dest="all.*_s"/> - * <copyField source="*.*_s" dest="all.*_s_c"/> - * <copyField source="*.*_s" dest="all.*_s_t"/> - * - * et aussi definir les all pour les autres types - * <copyField source="*.*_b" dest="all.*_b"/> - * <copyField source="*.*_dt" dest="all.*_dt"/> - * <copyField source="*.*_d" dest="all.*_d"/> - * <copyField source="*.*_w" dest="all.*_w"/> - * - * copyField ne support que une * et au debut ou a la fin, donc actuellement - * il serait possible de d'avoir - * - * <copyField source="*_s" dest="*_s_c"/> - * <copyField source="*_s" dest="*_s_t"/> - * - * et d'enregistrer les champs deux fois en <b>extName.fieldName</b> et en - * <b>all.fieldName</b> ensuite lorsqu'on a besoin de copier un document - * il ne faut prendre les champs id, extensions, not_null_fields et les champs - * ne commencant pas par 'all.' et se finissant exclusivement par - * _bi, _b, _dt, _d, _s, _w. Cest dernier seront enregistrer aussi en all. - * - * Ainsi on passe de 6 champs stocke + 1, a 1 champ stocker + 6. Pour les chaines - * et de 2 champs stockes a 1 champ stocke + 1. - * - * - * <h2>alternative au stockage de tout les champs</h2> - * <p> - * Une alternative serait de ne reprendre que les champs reels (pas les copies) - * et recreer les copies a partir de ceux la. Les copies pourront ne plus etre - * stored=true. - * <p> - * Une autre alternative serait de récuperer l'objet dans le Storage et de le - * reindexer completement - * - */ -package org.nuiton.wikitty.solr; Added: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/FieldModifier.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,18 @@ +package org.nuiton.wikitty.storage.solr; + +import org.nuiton.wikitty.services.WikittyTransaction; + + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +/** use to permit client to modify fieldname during query generation */ +public interface FieldModifier { + public String convertToSolr(WikittyTransaction transaction, String fieldname); + public String convertToField(WikittyTransaction transaction, String solrName); +} Copied: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java (from rev 618, trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/RAMDirectoryFactory.java) =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/RAMDirectoryFactory.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,120 @@ +/** + * %%Ignore-License + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.nuiton.wikitty.storage.solr; + +import java.io.File; +import java.util.HashMap; +import java.util.Map; + +import org.apache.solr.core.StandardDirectoryFactory; +import java.io.IOException; +import java.util.concurrent.atomic.AtomicInteger; + +import org.apache.lucene.store.Directory; +import org.apache.lucene.store.RAMDirectory; + +/** + * Directory provider for using lucene RAMDirectory + * + * Only exists in version 4.0 of solr, but we used 1.4.1. Remove this class + * when solr 4.0 will be used + */ +public class RAMDirectoryFactory extends StandardDirectoryFactory { + + private static Map<String, RefCntRamDirectory> directories = new HashMap<String, RefCntRamDirectory>(); + + @Override + public Directory open(String path) throws IOException { + synchronized (RAMDirectoryFactory.class) { + RefCntRamDirectory directory = directories.get(path); + if (directory == null || !directory.isOpen()) { + directory = (RefCntRamDirectory) openNew(path); + directories.put(path, directory); + } else { + directory.incRef(); + } + + return directory; + } + } + + public boolean exists(String path) { + synchronized (RAMDirectoryFactory.class) { + RefCntRamDirectory directory = directories.get(path); + if (directory == null || !directory.isOpen()) { + return false; + } else { + return true; + } + } + } + + /** + * Non-public for unit-test access only. Do not use directly + */ + Directory openNew(String path) throws IOException { + Directory directory; + File dirFile = new File(path); + boolean indexExists = dirFile.canRead(); + if (indexExists) { + Directory dir = super.open(path); + directory = new RefCntRamDirectory(dir); + } else { + directory = new RefCntRamDirectory(); + } + return directory; + } + + static public class RefCntRamDirectory extends RAMDirectory { + + private final AtomicInteger refCount = new AtomicInteger(); + + public RefCntRamDirectory() { + super(); + refCount.set(1); + } + + public RefCntRamDirectory(Directory dir) throws IOException { + this(); + Directory.copy(dir, this, false); +// for (String file : dir.listAll()) { +// dir.copy(this, file, file); +// } + } + + public void incRef() { + ensureOpen(); + refCount.incrementAndGet(); + } + + public void decRef() { + ensureOpen(); + if (refCount.getAndDecrement() == 1) { + super.close(); + } + } + + public final synchronized void close() { + decRef(); + } + + public boolean isOpen() { + return isOpen; + } + } +} Copied: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java (from rev 618, trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/Restriction2Solr.java) =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/Restriction2Solr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,452 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty.storage.solr; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.services.WikittyTransaction; +import org.nuiton.wikitty.search.operators.And; +import org.nuiton.wikitty.search.operators.AssociatedRestriction; +import org.nuiton.wikitty.search.operators.Between; +import org.nuiton.wikitty.search.operators.Contains; +import org.nuiton.wikitty.search.operators.Element; +import org.nuiton.wikitty.search.operators.EndsWith; +import org.nuiton.wikitty.search.operators.Equals; +import org.nuiton.wikitty.search.operators.Greater; +import org.nuiton.wikitty.search.operators.GreaterOrEqual; +import org.nuiton.wikitty.search.operators.In; +import org.nuiton.wikitty.search.operators.Keyword; +import org.nuiton.wikitty.search.operators.Less; +import org.nuiton.wikitty.search.operators.LessOrEqual; +import org.nuiton.wikitty.search.operators.Like; +import org.nuiton.wikitty.search.operators.Not; +import org.nuiton.wikitty.search.operators.NotEquals; +import org.nuiton.wikitty.search.operators.Or; +import org.nuiton.wikitty.search.operators.Restriction; +import org.nuiton.wikitty.search.RestrictionHelper; +import org.nuiton.wikitty.search.operators.StartsWith; +import org.nuiton.wikitty.search.operators.Unlike; +import org.nuiton.wikitty.search.operators.Like.SearchAs; +import org.nuiton.wikitty.search.operators.Null; + +/** + * @author "Nicolas Chapurlat" <nicolas.chapurlat(a)logica.com> + * @author "Guillaume Dufrêne" <dufrene(a)argia.fr> + * + * This class is used to parse Restriction to create lucene request on + * content. Every operators describe in RestrictionName is handle. Parsing may + * throw exception when restriction parameters are incorrect. + */ +public class Restriction2Solr { + + private static final int MAX_SUBQUERY_RESULT = 100; + + final static protected FieldModifier dummyFieldModifier = new FieldModifier() { + public String convertToSolr(WikittyTransaction transaction, String fieldname) { + return fieldname; + } + public String convertToField(WikittyTransaction transaction, String solrName) { + return solrName; + } + }; + + protected FieldModifier fieldModifer; + protected WikittyTransaction transaction; + + public Restriction2Solr() { + this(null, dummyFieldModifier); + } + + // TODO 20101201 jru improve manage transaction and fieldModifeir in helper + public Restriction2Solr(WikittyTransaction transaction, FieldModifier fieldModifer) { + this.transaction = transaction; + this.fieldModifer = fieldModifer; + } + + public String toSolr(Restriction restriction) { + return toSolr(restriction, null); + } + + public String toSolr(Restriction restriction, SolrServer solr) + throws WikittyException { + // ParameterValidator.checkNullParameter(restriction, "restriction"); + switch (restriction.getName()) { + case TRUE: + return true2solr(); + case FALSE: + return false2solr(); + case NOT: + Not not = (Not) restriction; + return not2solr(not); + case AND: + And and = (And) restriction; + return and2solr(and); + case OR: + Or or = (Or) restriction; + return or2solr(or); + case EQUALS: + Equals eq = (Equals) restriction; + return eq2solr(eq); + case LIKE: + Like like = (Like) restriction; + return like2solr(like); + case UNLIKE: + Unlike unlike = (Unlike) restriction; + return unlike2solr(unlike); + case NOT_EQUALS: + NotEquals neq = (NotEquals) restriction; + return neq2solr(neq); + case LESS: + Less less = (Less) restriction; + return less2solr(less); + case LESS_OR_EQUAL: + LessOrEqual lessEq = (LessOrEqual) restriction; + return lessEq2solr(lessEq); + case GREATER: + Greater great = (Greater) restriction; + return great2solr(great); + case GREATER_OR_EQUAL: + GreaterOrEqual greatEq = (GreaterOrEqual) restriction; + return greatEq2solr(greatEq); + case BETWEEN: + Between between = (Between) restriction; + return between2solr(between); + case CONTAINS: + Contains contains = (Contains) restriction; + return contains2solr(contains); + case IN: + In in = (In) restriction; + return in2solr(in); + case STARTS_WITH: + StartsWith start = (StartsWith) restriction; + return start2solr(start); + case ENDS_WITH: + EndsWith end = (EndsWith) restriction; + return end2solr(end); + case ASSOCIATED: + AssociatedRestriction associated = (AssociatedRestriction) restriction; + return associated2solr(associated, solr); + case KEYWORD: + Keyword keyword = (Keyword) restriction; + return keyword2solr(keyword); + case IS_NULL: + Null isNull = (Null) restriction; + return isNull2solr(isNull); + case IS_NOT_NULL: + Null isNotNull = (Null) restriction; + return isNotNull2solr(isNotNull); + default: + throw new WikittyException("this kind of restriction is not supported : " + + restriction.getName().toString()); + } + } + + private String in2solr(In in) { + boolean first = true; + String result = in.getElement().getName() + ":["; + for( String value : in.getValue() ) { + if ( !first ) { result += ", "; first = false; } + result += value; + } + result +="]"; + return result; + } + + private String associated2solr(AssociatedRestriction associated, SolrServer solr) throws WikittyException { + String subQuery = toSolr( associated.getRestriction() ); + SolrQuery query = new SolrQuery(WikittySolrConstant.SOLR_QUERY_PARSER + subQuery); + query.setRows(MAX_SUBQUERY_RESULT); + QueryResponse resp = null; + try { + resp = solr.query(query); + } catch (SolrServerException e) { + throw new WikittyException("Unable to execute associative query on " + associated.getElement().getName(), e); + } + SolrDocumentList solrResults = resp.getResults(); + + Restriction generatedRestriction = null; + long size = solrResults.size(); + if ( size == 0 ) { + throw new WikittyException("Associated " + associated.getElement().getName() + " do not retrieved any result"); + } + if ( size == 1 ) { + generatedRestriction = RestrictionHelper.eq( associated.getElement(), + (String) solrResults.get(0).getFieldValue(WikittySolrConstant.SOLR_ID) ); + } else { + List<String> ids = new ArrayList<String>(solrResults.size()); + for (SolrDocument doc : solrResults) { + String id = (String) doc.getFieldValue(WikittySolrConstant.SOLR_ID); + ids.add(id); + } + generatedRestriction = new In(associated.getElement(), ids); + } + Restriction parent = associated.getParentRestrictionDto(); + And and; + if ( parent instanceof And ) { + and = (And) parent; + and.getRestrictions().add( generatedRestriction ); + } else { + and = RestrictionHelper.and( Arrays.asList(new Restriction[]{ associated.getParentRestrictionDto(), generatedRestriction }) ); + } + return toSolr(and); + } + + private String not2solr(Not not) throws WikittyException { + if (not.getRestriction() == null) { + throw new WikittyException( "not.restriction" ); + } + return "( *:* - " + toSolr(not.getRestriction()) + " )"; + } + + private String and2solr(And and) throws WikittyException { + if (and.getRestrictions() == null) { + throw new WikittyException( "and.restrictions is null" ); + } + if (and.getRestrictions().size() < 2) { + throw new WikittyException( "AND is an operator that handle 2 operand at least"); + } + boolean first = true; + StringBuffer result = new StringBuffer(); + for (Restriction restriction : and.getRestrictions()) { + if (first) { + result.append("( ").append(toSolr(restriction)); + first = false; + } else { + result.append(" AND ").append(toSolr(restriction)); + } + } + return result.append(" )").toString(); + } + + private String or2solr(Or or) throws WikittyException { + if (or.getRestrictions() == null) { + throw new WikittyException("or.restrictions is null"); + } + if (or.getRestrictions().size() < 2) { + throw new WikittyException("OR is an operator that handle 2 operand at least"); + } + boolean first = true; + StringBuffer result = new StringBuffer(); + for (Restriction restriction : or.getRestrictions()) { + if (first) { + result.append("( "); + first = false; + } else { + result.append(" OR "); + } + result.append(toSolr(restriction)); + } + return result.append(" )").toString(); + } + + private String eq2solr(Equals eq) throws WikittyException { + return element2solr(eq.getElement()) + ":" + value2solr(eq.getValue()); + } + + private String like2solr(Like like) throws WikittyException { + SearchAs searchAs = like.getSearchAs(); + String element2solr = element2solr(like.getElement()); + if(element2solr.endsWith(WikittySolrConstant.SUFFIX_STRING)) { // is string + switch(searchAs) { + case AsText: + element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; + break; + case ToLowerCase: + element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; + break; + } + } + + // Warning if you need add searchAs, AsText and ToLowerCase need search + // at lowercase + String value2solr = value2solr(like.getValue()); + if(!element2solr.endsWith(WikittySolrConstant.SUFFIX_DATE)) { // is not date + value2solr = value2solr.toLowerCase(); + } + + return element2solr + ":" + value2solr; + } + + private String unlike2solr(Unlike unlike) throws WikittyException { + SearchAs searchAs = unlike.getSearchAs(); + String element2solr = element2solr(unlike.getElement()); + if(element2solr.endsWith(WikittySolrConstant.SUFFIX_STRING)) { // is string + switch(searchAs) { + case AsText: + element2solr += WikittySolrConstant.SUFFIX_STRING_FULLTEXT; + break; + case ToLowerCase: + element2solr += WikittySolrConstant.SUFFIX_STRING_LOWERCASE; + break; + } + } + + // Warning if you need add searchAs, AsText and ToLowerCase need search + // at lowercase + String value2solr = value2solr(unlike.getValue()); + if(!element2solr.endsWith(WikittySolrConstant.SUFFIX_DATE)) { // is not date + value2solr = value2solr.toLowerCase(); + } + + return "-" + element2solr + ":" + value2solr; + } + + private String neq2solr(NotEquals neq) + throws WikittyException { + return "-" + element2solr(neq.getElement()) + ":" + + value2solr(neq.getValue()); + } + + private String less2solr(Less less) throws WikittyException { + return element2solr(less.getElement()) + ":{* TO " + + value2solr(less.getValue()) + "}"; + } + + private String lessEq2solr(LessOrEqual lessEq) + throws WikittyException { + return element2solr(lessEq.getElement()) + ":[* TO " + + value2solr(lessEq.getValue()) + "]"; + } + + private String great2solr(Greater great) + throws WikittyException { + return element2solr(great.getElement()) + ":{" + + value2solr(great.getValue()) + " TO *}"; + } + + private String greatEq2solr(GreaterOrEqual greatEq) + throws WikittyException { + return element2solr(greatEq.getElement()) + ":[" + + value2solr(greatEq.getValue()) + " TO *]"; + } + + private String between2solr(Between between) + throws WikittyException { + if (between.getElement() == null) { + throw new WikittyException("contains.element"); + } + if (between.getMin() == null) { + throw new WikittyException("contains.min"); + } + if (between.getMax() == null) { + throw new WikittyException("contains.max"); + } + return element2solr(between.getElement()) + ":[" + + value2solr(between.getMin()) + " TO " + + value2solr(between.getMax()) + "]"; + } + + private String contains2solr(Contains contains) + throws WikittyException { + if (contains.getElement() == null) { + throw new WikittyException("contains.element"); + } + if (contains.getValue() == null) { + throw new WikittyException("contains.values"); + } + if (contains.getValue().size() < 1) { + throw new WikittyException("CONTAINS is an operator that handle 1 operand at least"); + } + + String operand = ""; + StringBuffer result = new StringBuffer(); + result.append("("); + for (String value : contains.getValue()) { + result.append(operand); + result.append(element2solr(contains.getElement())) + .append(":").append(value2solr(value)); + operand = " OR "; + } + result.append(")"); + return result.toString(); + } + + private String start2solr(StartsWith start) + throws WikittyException { + return element2solr(start.getElement()) + ":" + + value2solr(start.getValue()) + "*"; + } + + private String end2solr(EndsWith end) { + return element2solr(end.getElement()) + ":*" + + value2solr(end.getValue()); + } + + private String true2solr() { + return "( *:* )"; + } + + private String false2solr() { + return "( *:* - *:* )"; + } + + private String keyword2solr(Keyword keyword) { + return value2solr(keyword.getValue()); + } + + private String isNull2solr(Null isNull) { + return "( *:* - " + WikittySolrConstant.SOLR_NOT_NULL_FIELDS + ":" + isNull.getFieldName() + ")"; + } + + private String isNotNull2solr(Null isNotNull) { + return WikittySolrConstant.SOLR_NOT_NULL_FIELDS + ":" + isNotNull.getFieldName(); + } + + private String element2solr(Element element) throws WikittyException { + String result = element.getName(); + result = fieldModifer.convertToSolr(transaction, result); + return result; + } + + private String value2solr(String value) { + String result; + if (value != null) { + result = Restriction2Solr.escapeValue(value); + } else { + throw new WikittyException("Parse error, value must be not empty"); + } + + if (result.contains(" ")) { + result = "\"" + result + "\""; + } + return result; + } + + private static String escapeValue(String value) { + final String LUCENE_REPLACE_PATTERN = "\\+" + "|-" + "|&&" + "|\\|" + + "|!" + "|\$|\$" + "|\\[|\\]" + "|\\{|\\}" + "|\"" + "|:"; + return value.replaceAll(LUCENE_REPLACE_PATTERN, "\\\\$0"); + } +} + Added: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrResource.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,129 @@ +package org.nuiton.wikitty.storage.solr; + + +import com.arjuna.ats.arjuna.coordinator.BasicAction; +import com.arjuna.ats.arjuna.coordinator.OnePhaseResource; +import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome; +import com.arjuna.ats.arjuna.state.InputObjectState; +import com.arjuna.ats.arjuna.state.OutputObjectState; +import com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.common.SolrInputDocument; + +/** + * Use to plug solr indexation in JTA transaction. + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SolrResource implements OnePhaseResource { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(SolrResource.class); + + protected SolrServer solrServer; + protected ThreadLocal<Map<String, SolrInputDocument>> addedDocs; + protected ThreadLocal<List<String>> deletedDocs; + + public SolrResource(SolrServer solrServer) { + this.solrServer = solrServer; + addedDocs = new ThreadLocal<Map<String, SolrInputDocument>>(); + deletedDocs = new ThreadLocal<List<String>>(); + + clear(); + } + + protected void init() { + // Add resource on phase in current transaction + LastResourceRecord lastResourceRecord = new LastResourceRecord(this); + BasicAction.Current().add(lastResourceRecord); + } + + public Map<String, SolrInputDocument> getAddedDocs() { + Map<String, SolrInputDocument> result = addedDocs.get(); + if (result == null) { + result = new HashMap<String, SolrInputDocument>(); + addedDocs.set(result); + } + return result; + } + + public List<String> getDeletedDocs() { + List<String> result = deletedDocs.get(); + if (result == null) { + result = new ArrayList<String>(); + deletedDocs.set(result); + } + return result; + } + + public void clear() { + addedDocs.set(new HashMap<String, SolrInputDocument>()); + deletedDocs.set(new ArrayList<String>()); + } + + public void addDoc(String id, SolrInputDocument doc) { + getAddedDocs().put(id, doc); + } + + public SolrInputDocument getAddedDoc(String id) { + SolrInputDocument result = getAddedDocs().get(id); + return result; + } + + public Collection<String> getAddedDocIds() { + Collection<String> result = getAddedDocs().keySet(); + return result; + } + + public void deleteDoc(String docId) { + getDeletedDocs().add(docId); + } + + @Override + public int commit() { + try { + synchronized (this) { + Collection<SolrInputDocument> docs = getAddedDocs().values(); + if (!docs.isEmpty()) { + solrServer.add(docs); + } + List<String> ids = getDeletedDocs(); + if (!ids.isEmpty()) { + solrServer.deleteById(ids); + } + solrServer.commit(); + } + clear(); + return TwoPhaseOutcome.FINISH_OK; + } catch (Exception eee) { + log.error("Error commit solr", eee); + return TwoPhaseOutcome.FINISH_ERROR; + } + } + + @Override + public int rollback() { + clear(); + return TwoPhaseOutcome.FINISH_OK; + } + + @Override + public void pack(OutputObjectState arg0) throws IOException { + } + + @Override + public void unpack(InputObjectState arg0) throws IOException { + } +} Copied: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java (from rev 618, trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/SolrUtil.java) =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/SolrUtil.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,141 @@ +package org.nuiton.wikitty.storage.solr; + +import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.*; + +import java.util.Collection; +import java.util.HashSet; +import java.util.Set; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; +import org.apache.solr.common.SolrInputDocument; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.entities.FieldType.TYPE; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SolrUtil { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(SolrUtil.class); + + /** + * Find solr document by id + */ + static public SolrDocument findById(SolrServer solrServer, String id) { + SolrQuery query = new SolrQuery(SOLR_ID + ":" + id); + QueryResponse response; + try { + response = solrServer.query(query); + } catch (SolrServerException eee) { + throw new WikittyException("Error during find", eee); + } + + SolrDocumentList results = response.getResults(); + long numFound = results.getNumFound(); + if(numFound == 1) { + return results.get(0); + } + + return null; + } + + /** + * if you change this method, change + * {@link TypeFieldModifer#convertToField(org.nuiton.wikitty.services.WikittyTransaction, java.lang.String)} + * too + * + * @param fqfieldName + * @param type + * @return + */ + static public String getSolrFieldName(String fqfieldName, TYPE type) { + switch (type) { + case BINARY: + return fqfieldName + SUFFIX_BINARY; + case BOOLEAN: + return fqfieldName + SUFFIX_BOOLEAN; + case DATE: + return fqfieldName + SUFFIX_DATE; + case STRING: + return fqfieldName + SUFFIX_STRING; + case NUMERIC: + return fqfieldName + SUFFIX_NUMERIC; + case WIKITTY: + return fqfieldName + SUFFIX_WIKITTY; + default: + return fqfieldName; + } + } + + /** + * copy all field of source in new document. + * If include is true copy only field specified in fields + * if include is false copy all field except field in fields. + * + * example: + * if doc contains field: abc, aabbcc, aaabbbccc, toto + * copySolrDocument(doc, true, "aa.*", ".*bbb.*") + * field copied are: aabbcc, aaabbbccc + * + * copySolrDocument(doc, false, "aa.*", ".*bbb.*") + * field copied are: abc, toto + * + * @param source + * @param include + * @param fields + * @return + */ + static public SolrInputDocument copySolrDocument( + SolrDocument source, boolean include, String... fields) { + SolrInputDocument result = new SolrInputDocument(); + Collection<String> fieldNames = source.getFieldNames(); + + Set<String> fieldToCopy = new HashSet<String>(); + if (include) { + for (String fieldName : fieldNames) { + for (String fieldRegexp : fields) { + if (fieldName.matches(fieldRegexp)) { + fieldToCopy.add(fieldName); + break; + } + } + } + } else { // exclude + fieldToCopy.addAll(fieldNames); + for (String fieldName : fieldNames) { + for (String fieldRegexp : fields) { + if (fieldName.matches(fieldRegexp)) { + fieldToCopy.remove(fieldName); + break; + } + } + } + } + + if (log.isDebugEnabled()) { + log.debug(String.format( + "Copiable field are %s but only field %s are copied", + fieldNames, fieldToCopy)); + } + + for (String fieldName : fieldToCopy) { + Collection<Object> fieldValues = source.getFieldValues(fieldName); + for (Object fieldValue : fieldValues) { + result.addField(fieldName, fieldValue); + } + } + return result; + } +} Added: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/TypeFieldModifier.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/TypeFieldModifier.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/TypeFieldModifier.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,103 @@ +package org.nuiton.wikitty.storage.solr; + +import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.*; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.operators.Element; +import org.nuiton.wikitty.services.WikittyTransaction; +import org.nuiton.wikitty.storage.WikittyExtensionStorage; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class TypeFieldModifier implements FieldModifier { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(TypeFieldModifier.class); + + protected WikittyExtensionStorage extensionStorage; + + public TypeFieldModifier(WikittyExtensionStorage extensionStorage) { + this.extensionStorage = extensionStorage; + } + + @Override + public String convertToSolr(WikittyTransaction transaction, String fqfieldname) { + String result = fqfieldname; + String[] searchField = fqfieldname.split(WikittyUtil.FQ_FIELD_NAME_SEPARATOR_REGEX); + + if (Element.ELT_EXTENSION.equals(fqfieldname)) { + result = SOLR_EXTENSIONS; + + } else if (Element.ELT_ID.equals(fqfieldname)) { + result = SOLR_ID; + + } else if (searchField.length >= 2) { + String extName = searchField[0]; + String fieldName = searchField[1]; + + if (Criteria.ALL_EXTENSIONS.equals(extName)) { + fqfieldname = SOLR_ALL_EXTENSIONS + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + fieldName; + } + + if (searchField.length >= 3) { + // TODO poussin 20101209 je ne vois pas dans quel cas on passe ici + String fieldNameType = searchField[2]; + TYPE type = FieldType.TYPE.valueOf(fieldNameType); + result = SolrUtil.getSolrFieldName(fqfieldname, type); + return result; + } + + // Search type of field in extension + String version = + extensionStorage.getLastVersion(transaction, extName); + if (version != null) { // not valid extension if version == null + WikittyExtension ext = extensionStorage.restore( + transaction, extName, version); + FieldType fieldType = ext.getFieldType(fieldName); + if (log.isDebugEnabled()) { + log.debug(ext.toDefinition() + " for " + fieldName); + } + if (fieldType != null) { // type can be null if extension version differ + TYPE type = fieldType.getType(); + result = SolrUtil.getSolrFieldName(fqfieldname, type); + return result; + } + } + } + + return result; + } + + /** + * if you change this, change + * {@link WikittySearchEngineSolr#getSolrFieldName(java.lang.String, org.nuiton.wikitty.entities.FieldType.TYPE)} + * too + */ + @Override + public String convertToField(WikittyTransaction transaction, String solrName) { + String fieldName = solrName.replaceAll( + "(" + SUFFIX_BINARY + "$)" + + "|(" + SUFFIX_BOOLEAN + "$)" + + "|(" + SUFFIX_DATE + "$)" + + "|(" + SUFFIX_STRING + "$)" + + "|(" + SUFFIX_WIKITTY + "$)" + + "|(" + SUFFIX_NUMERIC + "$)", ""); + if (SOLR_EXTENSIONS.equals(fieldName)) { + fieldName = Element.ELT_EXTENSION; + } + return fieldName; + } +} Copied: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryParser.java (from rev 618, trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittyQueryParser.java) =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryParser.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittyQueryParser.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,102 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty.storage.solr; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.lucene.queryParser.ParseException; +import org.apache.lucene.queryParser.QueryParser; +import org.apache.lucene.search.Query; +import org.apache.solr.common.params.CommonParams; +import org.apache.solr.common.params.SolrParams; +import org.apache.solr.common.util.NamedList; +import org.apache.solr.request.SolrQueryRequest; +import org.apache.solr.search.LuceneQParserPlugin; +import org.apache.solr.search.QParser; +import org.apache.solr.search.QueryParsing; +import org.apache.solr.search.SolrQueryParser; + +/** + * Add allow leading wildcard + * setAllowLeadingWildcard(true); + * <br>Example: <code>{!wikitty q.op=AND df=text sort='price asc'}myfield:foo +bar -baz</code> + * More information @see LuceneQParserPlugin + */ +public class WikittyQueryParser extends LuceneQParserPlugin { + + public static String NAME = "wikitty"; + + @Override + public void init(NamedList args) { + } + + @Override + public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { + return new SolrQParser(qstr, localParams, params, req); + } + + static public class SolrQParser extends QParser { + + static private Log log = LogFactory.getLog(SolrQParser.class); + String sortStr; + SolrQueryParser lparser; + + public SolrQParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { + super(qstr, localParams, params, req); + } + + @Override + public Query parse() throws ParseException { + + String defaultField = getParam(CommonParams.DF); + if (defaultField == null) { + // TODO poussin 20101216 normalement on devrait retrouver cette + // valeur dans la config. Mais en fait a chaque fois on passe + // ici car defaultField est null :( alors que dans schema.xml + // on a bien defini le defaultField :( + defaultField = WikittySolrConstant.SOLR_DEFAULT_FIELD; + } + + lparser = new SolrQueryParser(this, defaultField); + lparser.setAllowLeadingWildcard(true); + + String opParam = getParam(QueryParsing.OP); + if (opParam != null) { + lparser.setDefaultOperator("AND".equals(opParam) ? QueryParser.Operator.AND : QueryParser.Operator.OR); + } + + String qstr = getString(); + if (log.isDebugEnabled()) { + log.debug("Query parse : " + qstr); + } + return lparser.parse(qstr); + } + + @Override + public String[] getDefaultHighlightFields() { + return new String[]{lparser.getField()}; + } + } +} Copied: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java (from rev 618, trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/WikittySearchEngineSolr.java) =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,756 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin POUSSIN + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.solr; + +import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.*; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; +import org.apache.solr.client.solrj.response.FacetField; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; +import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.core.CoreContainer; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.storage.WikittyExtensionStorage; +import org.nuiton.wikitty.storage.WikittySearchEngine; +import org.nuiton.wikitty.services.WikittyTransaction; +import org.nuiton.wikitty.search.operators.Element; +import org.nuiton.wikitty.search.Search; + +import com.arjuna.ats.arjuna.coordinator.BasicAction; +import com.arjuna.ats.arjuna.coordinator.OnePhaseResource; +import com.arjuna.ats.arjuna.coordinator.TwoPhaseOutcome; +import com.arjuna.ats.arjuna.state.InputObjectState; +import com.arjuna.ats.arjuna.state.OutputObjectState; +import com.arjuna.ats.internal.arjuna.abstractrecords.LastResourceRecord; +import java.io.File; +import java.util.regex.Pattern; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittySearchEngineSolr implements WikittySearchEngine { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); + +// static final public String[] fieldNotToCopyPattern = { +// Pattern.quote(TREENODE_PREFIX) + ".*" +// }; + + /** pattern to copy field from solr document to another solr document + * copy field s_c and s_t are not copied + * tree fields are not copied + * #all. fields are not copied + */ + static final public String[] fieldToCopyPattern = { + // match: id, extensions, not_null_fields + SOLR_ID, SOLR_EXTENSIONS, SOLR_NOT_NULL_FIELDS, + // match: ".*_bi" accepte ce qui fini par _bi + ".*" + SUFFIX_BINARY, + ".*" + SUFFIX_BOOLEAN, + ".*" + SUFFIX_DATE, + ".*" + SUFFIX_NUMERIC, + ".*" + SUFFIX_STRING, + ".*" + SUFFIX_WIKITTY + }; + + /** + * NOTE: On ne pourra utiliser ces patterns pour la copie que lorsque la config + * solr acceptera de creer des copyField avec des expressions regulieres + * Ce qui permettra de genere les champs #all.* via la config solr et non + * pas de devoir les ajouter via le code Java. + * <copyField source="[^.]+\.(.*)" dest="#all.#1"/> + */ + static final public String[] fieldToCopyPatternWithExcludeAll = { + // match: id, extensions, not_null_fields + SOLR_ID, SOLR_EXTENSIONS, SOLR_NOT_NULL_FIELDS, + // match: "(?!(all\.)).*_bi" accept ce qui fini par _bi sauf si ca commence par "all." + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_BINARY, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_BOOLEAN, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_DATE, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_NUMERIC, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_STRING, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_WIKITTY + }; + + /** + * Helper to get information nodes and elements for reindexation. + */ + static protected class ReindexChildTreeNode { + + protected SolrResource solrResource; + protected SolrServer solrServer; + + protected Map<String, Collection<String>> includedNodeIds; + protected Map<String, Collection<String>> excludedNodeIds; + protected Map<String, String> parents; + + public ReindexChildTreeNode(SolrServer solrServer, SolrResource solrResource) { + this.solrServer = solrServer; + this.solrResource = solrResource; + includedNodeIds = new HashMap<String, Collection<String>>(); + excludedNodeIds = new HashMap<String, Collection<String>>(); + parents = new HashMap<String, String>(); + } + + public void putIncludedAttachments(String nodeId, Collection<String> attchmentIds) { + putAttachements(includedNodeIds, nodeId, attchmentIds); + } + + public void putExcludedAttachments(String nodeId, Collection<String> attachmentIds) { + putAttachements(excludedNodeIds, nodeId, attachmentIds); + } + + public void putIncludedAttachment(String nodeId, String attachmentId) { + putAttachment(includedNodeIds, nodeId, attachmentId); + } + + public void putExcludedAttachment(String nodeId, String attachmentId) { + putAttachment(excludedNodeIds, nodeId, attachmentId); + } + + public Collection<String> getExcludedNodeIds(String attachmentId) { + Collection<String> result = excludedNodeIds.get(attachmentId); + if (result == null) { + result = new HashSet<String>(); + } + return result; + } + + public Collection<String> getIncludedNodeIds(String attachmentId) { + Collection<String> result = includedNodeIds.get(attachmentId); + if (result == null) { + result = new HashSet<String>(); + } + return result; + } + + protected void putAttachements(Map<String, Collection<String>> map, String nodeId, Collection<String> attachmentIds) { + if (attachmentIds != null) { + for (String attachmentId : attachmentIds) { + putAttachment(map, nodeId, attachmentId); + } + } + } + + protected void putAttachment(Map<String, Collection<String>> map, String nodeId, String attachmentId) { + Collection<String> values = map.get(attachmentId); + if(values == null) { + values = new HashSet<String>(); + map.put(attachmentId, values); + } + values.add(nodeId); + } + + public void putParent(String nodeId, String parentId) { + parents.put(nodeId, parentId); + } + + public String getParent(String nodeId) { + String parentId = parents.get(nodeId); + + // If not found in map, search in index + if(parentId == null) { + SolrDocument doc = SolrUtil.findById(solrServer, nodeId); + if(doc == null) { + // is root + return null; + } + parentId = (String) doc.getFieldValue(WikittyTreeNode + .FQ_FIELD_WIKITTYTREENODE_PARENT + SUFFIX_WIKITTY); + putParent(nodeId, parentId); + } + + Collection<String> deletedDocIds = solrResource.getDeletedDocs(); + if(deletedDocIds.contains(parentId)) { + return null; + } + return parentId; + } + + public Collection<String> getReindexIds() { + Collection<String> result = new HashSet<String>(); + result.addAll(includedNodeIds.keySet()); + result.addAll(excludedNodeIds.keySet()); + result.addAll(solrResource.getAddedDocIds()); + return result; + } + + /** + * Add in doc fields on association between nodes. + * + * For example if you have a element in node with parent, like this + * A -> B -> C => element, the method add field in document solr : + * TreeNode.root : A + * TreeNode.A : B + * TreeNode.B : C + * TreeNode.C : TreeNode.empty + * + * @throws SolrServerException + */ + public void reindex() throws SolrServerException { + for (String id : getReindexIds()) { + + // Get documents + SolrInputDocument doc = solrResource.getAddedDoc(id); + if(doc == null) { + // Copy old field value + SolrDocument found = SolrUtil.findById(solrServer, id); + if (found != null) { + // FIXME poussin 20101209 a finir en ne copiant que le necessaire voir javadoc du package + doc = SolrUtil.copySolrDocument(found, true, fieldToCopyPattern); + solrResource.addDoc(id, doc); + } else { + + if (log.isWarnEnabled()) { + log.warn(String.format("Can't find wikitty id '%s'" + + " in index. Skip this wikitty.", id)); + } + + // If not found just pass + continue; + } + } + + // Add tree node fields + Collection<String> includedChildNodeIds = getIncludedNodeIds(id); + Collection<String> excludedChildNodeIds = getExcludedNodeIds(id); + + // Find all node contain child + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + + SUFFIX_WIKITTY + ":" + id); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); + iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + + String nodeId = (String) solrDocument.getFieldValue(SOLR_ID); + includedChildNodeIds.add(nodeId); + } + + // Excluded nodes + includedChildNodeIds.removeAll(excludedChildNodeIds); + includedChildNodeIds.removeAll(solrResource.getDeletedDocs()); + + // Add paths in doc + Map<String, String> paths = new HashMap<String, String>(); + for (String nodeId : includedChildNodeIds) { + doc.addField(TREENODE_PREFIX + nodeId, TREENODE_EMPTY); + + // Add path + String childParent = nodeId; + String parent = getParent(childParent); + while (parent != null) { + String parentPath = paths.get(childParent); + if(parentPath == null) { + doc.addField(TREENODE_PREFIX + parent, childParent); + paths.put(childParent, parent); + } + + childParent = parent; + parent = getParent(childParent); + } + + String parentPath = paths.get(childParent); + if(parentPath == null) { + doc.addField(TREENODE_ROOT, childParent); + paths.put(childParent, TREENODE_ROOT); + } + } + } + } + } + + /** solr server */ + protected SolrServer solrServer; + + /** Field modifier use to transform to solr format */ + protected TypeFieldModifier fieldModifier; + + /** JTA resource */ + protected SolrResource solrResource; + + /** + * Init wikitty search engine on solr embedded server. + * + * @param extensionStorage extension storage + * @param properties properties (can be null) + */ + public WikittySearchEngineSolr( + ApplicationConfig config, WikittyExtensionStorage extensionStorage) { + + // init system env solr.data.dir + if (config != null) { + // choix du storage (file or Ram) + String solrDirFactoryKey = + WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); + String solrDirFactory = config.getOption(solrDirFactoryKey); + if (solrDirFactory != null) { + System.setProperty(solrDirFactoryKey, solrDirFactory); + } + + // on utilise le directory que si on est pas en Ram + if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { + String solrDataDirKey = + WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); + String solrDataDir = config.getOption(solrDataDirKey); + // make sure that dir exists + if (solrDataDir != null) { + File file = new File(solrDataDir); + file.mkdirs(); + System.setProperty(solrDataDirKey, solrDataDir); + } + } + } + + try { + CoreContainer.Initializer initializer = new CoreContainer.Initializer(); + CoreContainer coreContainer = initializer.initialize(); + solrServer = new EmbeddedSolrServer(coreContainer, ""); + + fieldModifier = new TypeFieldModifier(extensionStorage); + solrResource = new SolrResource(solrServer); + + } catch (Exception eee) { + throw new WikittyException("SolR initialization error", eee); + } + } + + @Override + public void clear(WikittyTransaction transaction) { + try { + // FIXME poussin 20100618 pourquoi n'est pas fait dans la transaction ? + solrResource.init(); + solrServer.deleteByQuery("*:*"); + } catch (Exception eee) { + throw new WikittyException("Error during clearing SolR data", eee); + } + } + + @Override + public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties) { + try { + solrResource.init(); + ReindexChildTreeNode reindexChildTreeNode = + new ReindexChildTreeNode(solrServer, solrResource); + for (Wikitty w : wikitties) { + String id = w.getId(); + + if (w.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { + + Set<String> attachments = WikittyTreeNodeHelper.getAttachment(w); + reindexChildTreeNode.putIncludedAttachments(id, attachments); + + // Search deleted children + SolrDocument treeNodeDoc = SolrUtil.findById(solrServer, id); + if (treeNodeDoc != null) { + Collection oldAttachments = treeNodeDoc.getFieldValues( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + SUFFIX_WIKITTY); + if (oldAttachments != null) { + // if no more children, remove all old children + if(attachments == null) { + reindexChildTreeNode.putExcludedAttachments(id, oldAttachments); + } else { + // exclude only the removed children + for (Object oldAttachment : oldAttachments) { + if(!attachments.contains(oldAttachment)) { + reindexChildTreeNode.putExcludedAttachment(id,(String) oldAttachment); + } + } + } + } + } + + // Get new parent id (may be the same old parent) + String parentId = WikittyTreeNodeHelper.getParent(w); + reindexChildTreeNode.putParent(id, parentId); + } + + // Index + SolrInputDocument doc = createIndexDocument(w); + solrResource.addDoc(id, doc); + } + + // Reindex child in tree node + reindexChildTreeNode.reindex(); + } catch (Exception eee) { + throw new WikittyException("Can't store wikitty", eee); + } + } + + @Override + public void delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { + try { + solrResource.init(); + ReindexChildTreeNode reindexChildTreeNode = + new ReindexChildTreeNode(solrServer, solrResource); + for (String id : ids) { + + // Find child in node id + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PREFIX + id + ":*"); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + String childId = (String) solrDocument.getFieldValue(SOLR_ID); + reindexChildTreeNode.putExcludedAttachment(id, childId); + } + + solrResource.deleteDoc(id); + } + + // Reindex child in tree node + reindexChildTreeNode.reindex(); + } catch (Exception eee) { + throw new WikittyException("Can't delete wikitty in index", eee); + } + } + +// @Override +// public void delete(Collection<String> idList) throws WikittyException { +// try { +// for (String id : idList) { +// solrServer.deleteById(id); +// } +// solrServer.commit(); +// } catch (Exception eee) { +// throw new WikittyException("Can't delete wikitty in index", eee); +// } +// } + + @Override + public PagedResult<String> findAllByCriteria(WikittyTransaction transaction, Criteria criteria) { + try { + // Create query with restriction + Restriction2Solr restriction2Solr = new Restriction2Solr(transaction, fieldModifier); + String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); + + // Add paged + int firstIndex = criteria.getFirstIndex(); + int endIndex = criteria.getEndIndex(); + + query.setStart(firstIndex); + int nbRows; + if (endIndex == -1) { + // WARNING It is necessary to substract 'start' otherwise, + // there is a capacity overlow in solR + nbRows = Integer.MAX_VALUE - firstIndex; + } else { + nbRows = endIndex - firstIndex + 1; + } + query.setRows(nbRows); + + // Add sorting + List<String> sortAscending = criteria.getSortAscending(); + if(sortAscending != null) { + for (String sort : sortAscending) { + String tranform = fieldModifier.convertToSolr(transaction, sort); + query.addSortField(tranform, SolrQuery.ORDER.asc); + } + } + + List<String> sortDescending = criteria.getSortDescending(); + if(sortDescending != null) { + for (String sort : sortDescending) { + String tranform = fieldModifier.convertToSolr(transaction, sort); + query.addSortField(tranform, SolrQuery.ORDER.desc); + } + } + + // Add faceting + List<String> facetField = criteria.getFacetField(); + log.debug("facetField : " + facetField); + List<Criteria> facetCriteria = criteria.getFacetCriteria(); + + // use to map query string to criteria facet name + Map<String, String> facetQueryToName = new HashMap<String, String>(); + + if ((facetField != null && !facetField.isEmpty()) + || (facetCriteria != null && !facetCriteria.isEmpty())) { + query.setFacet(true); + query.setFacetMinCount(1); + // query.setFacetLimit(8); // no limit actualy + + // field facetisation + if (facetField != null) { + for (String fqfieldName : facetField) { + String tranform = fieldModifier.convertToSolr(transaction, fqfieldName); + query.addFacetField(tranform); + } + } + + // query facetisation + if (facetCriteria != null) { + for (Criteria facet : facetCriteria) { + String queryFacet = + restriction2Solr.toSolr(facet.getRestriction()); + facetQueryToName.put(queryFacet, facet.getName()); + query.addFacetQuery(queryFacet); + } + } + } + + QueryResponse resp = solrServer.query(query); + SolrDocumentList solrResults = resp.getResults(); + + Map<String, List<FacetTopic>> facets = new HashMap<String, List<FacetTopic>>(); + if (facetField != null && !facetField.isEmpty()) { + for (FacetField facet : resp.getFacetFields()) { + String facetName = fieldModifier.convertToField(transaction, facet.getName()); + List<FacetTopic> topics = new ArrayList<FacetTopic>(); + if (facet.getValues() != null) { + for (FacetField.Count value : facet.getValues()) { + String topicName = value.getName(); + if(!topicName.endsWith(TREENODE_EMPTY)) { + int topicCount = (int) value.getCount(); + FacetTopic topic = new FacetTopic(facetName, topicName, topicCount); + topics.add(topic); + } + } + } + facets.put(facetName, topics); + } + } + if (facetCriteria != null && !facetCriteria.isEmpty()) { + for (Map.Entry<String, Integer> facet : resp.getFacetQuery().entrySet()) { + String facetName = facet.getKey(); + // don't use contains because, map can have key with null value + if (null != facetQueryToName.get(facetName)) { + facetName = facetQueryToName.get(facetName); + } + Integer count = facet.getValue(); + List<FacetTopic> topics = new ArrayList<FacetTopic>(); + FacetTopic topic = new FacetTopic(facetName, facetName, count); + topics.add(topic); + facets.put(facetName, topics); + } + } + + List<String> ids = new ArrayList<String>(solrResults.size()); + for (SolrDocument doc : solrResults) { + String id = (String) doc.getFieldValue(SOLR_ID); + ids.add(id); + } + + int numFound = (int)resp.getResults().getNumFound(); + PagedResult<String> result = new PagedResult<String>( + firstIndex, numFound, queryString, facets, ids); + + return result; + } catch (SolrServerException eee) { + throw new WikittyException("Error during find", eee); + } + } + + @Override + public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { + String wikittyId = w.getId(); + + String parent = WikittyTreeNodeHelper.getParent(w); + if(parent == null) { + parent = TREENODE_ROOT; + } else { + parent = TREENODE_PREFIX + parent; + } + + Criteria criteria = Search.query(filter) + .eq(parent, wikittyId).criteria() + .setFirstIndex(0).setEndIndex(0); + PagedResult<String> search = findAllByCriteria(transaction, criteria); + + int numFound = search.getNumFound(); + return numFound; + } + + + @Override + public Map<String, Integer> findAllChildrenCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { + String wikittyId = w.getId(); + + String parent = WikittyTreeNodeHelper.getParent(w); + if(parent == null) { + parent = TREENODE_ROOT; + } else { + parent = TREENODE_PREFIX + parent; + } + + // Find count with facet, if the node not contain recurcively content, + // the node not found with facet + Criteria criteria = Search.query(filter).eq(parent, wikittyId).criteria() + .setFirstIndex(0).setEndIndex(0) + .addFacetField(TREENODE_PREFIX + wikittyId); + PagedResult<String> search = findAllByCriteria(transaction, criteria); + + Map<String, Integer> counts = new HashMap<String, Integer>(); + List<FacetTopic> topics = search.getTopic(TREENODE_PREFIX + wikittyId); + if(topics != null) { + for (FacetTopic topic : topics) { + String topicName = topic.getTopicName(); + int topicCount = topic.getCount(); + counts.put(topicName, topicCount); + } + } + + log.debug("Facet result " + counts); + + // Find all children, add the other node not found with facet + criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT, wikittyId).criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + search = findAllByCriteria(transaction, criteria); + + List<String> children = search.getAll(); + for (String child : children) { + if(!counts.containsKey(child)) { + counts.put(child, 0); + } + } + + return counts; + } + + /** + * Create all index document to used to modify indexation. + * this method don't modify index. + * + * The document looks like : + * SolrId : wikittyId + * extensions : extensionNames + * fieldName : fieldValue + * + * @param w all wikitties object to index + * @return solrInputDocument used to modify index + */ + protected SolrInputDocument createIndexDocument(Wikitty w) { + if (log.isDebugEnabled()) { + log.debug("index wikitty " + w.getId()); + } + + SolrInputDocument doc = new SolrInputDocument(); + String id = w.getId(); + doc.addField(SOLR_ID, id); + + for (String name : w.getExtensionNames()) { + doc.addField(SOLR_EXTENSIONS, name); + } + + for (String fqfieldName : w.fieldNames()) { + FieldType fieldType = w.getFieldType(fqfieldName); + TYPE type = fieldType.getType(); + String solrFqFieldName = SolrUtil.getSolrFieldName(fqfieldName, type); + + String solrAllFieldName = SOLR_ALL_EXTENSIONS + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + + WikittyUtil.getFieldNameFromFQFieldName(solrFqFieldName); + + Object objectValue = w.getFqField(fqfieldName); + if(objectValue != null) { + if (fieldType.isCollection()) { + Collection collectionValue = (Collection) objectValue; + for (Object itemValue : collectionValue) { + if (itemValue != null) { + doc.addField(solrFqFieldName, itemValue); + doc.addField(solrAllFieldName, itemValue); +// +// // Store string field in differents styles +// if(type == TYPE.STRING) { +// doc.addField(solrFqFieldName + SUFFIX_STRING_FULLTEXT, itemValue); +// doc.addField(solrAllFieldName + SUFFIX_STRING_FULLTEXT, itemValue); +// String itemValueLowerCase = itemValue.toString().toLowerCase(); +// doc.addField(solrFqFieldName + SUFFIX_STRING_LOWERCASE, itemValueLowerCase); +// doc.addField(solrAllFieldName + SUFFIX_STRING_LOWERCASE, itemValueLowerCase); +// } +// + doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); + if (log.isDebugEnabled()) { + log.debug("index field " + solrFqFieldName + + " with value '" + itemValue + "'"); + } + } + } + } else { + doc.addField(solrFqFieldName, objectValue); + doc.addField(solrAllFieldName, objectValue); +// +// // Store string field in differents styles +// if(type == TYPE.STRING) { +// doc.addField(solrFqFieldName + SUFFIX_STRING_FULLTEXT, objectValue); +// doc.addField(solrAllFieldName + SUFFIX_STRING_FULLTEXT, objectValue); +// String objectValueLowerCase = objectValue.toString().toLowerCase(); +// doc.addField(solrFqFieldName + SUFFIX_STRING_LOWERCASE, objectValueLowerCase); +// doc.addField(solrAllFieldName + SUFFIX_STRING_LOWERCASE, objectValueLowerCase); +// } +// + doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); + if (log.isDebugEnabled()) { + log.debug("index field " + solrFqFieldName + + " with value '" + objectValue + "'"); + } + } + } + } + return doc; + } + +} Added: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrIndexInTreeNode.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,641 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id: WikittySearchEngineSolr.java 588 2010-12-09 23:30:35Z bpoussin $ + * $HeadURL: http://svn.nuiton.org/svn/wikitty/trunk/wikitty-solr-impl/src/main/java/org… $ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin POUSSIN + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.solr; + +import static org.nuiton.wikitty.storage.solr.WikittySolrConstant.*; + +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; +import org.apache.solr.client.solrj.response.FacetField; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; +import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.core.CoreContainer; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; +import org.nuiton.wikitty.entities.FieldType; +import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.WikittyException; +import org.nuiton.wikitty.storage.WikittyExtensionStorage; +import org.nuiton.wikitty.storage.WikittySearchEngine; +import org.nuiton.wikitty.services.WikittyTransaction; + +import java.io.File; +import java.util.LinkedHashSet; +import java.util.LinkedList; +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; + +/** + * + * @author poussin + * @version $Revision: 588 $ + * + * Last update: $Date: 2010-12-10 00:30:35 +0100 (ven. 10 déc. 2010) $ + * by : $Author: bpoussin $ + */ +public class WikittySearchEngineSolrIndexInTreeNode implements WikittySearchEngine { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittySearchEngineSolr.class); + +// static final public String[] fieldNotToCopyPattern = { +// Pattern.quote(TREENODE_PREFIX) + ".*" +// }; + + /** pattern to copy field from solr document to another solr document + * copy field s_c and s_t are not copied + * tree fields are not copied + * #all. fields are not copied + */ + static final public String[] fieldToCopyPattern = { + // match: id, extensions, not_null_fields + SOLR_ID, SOLR_EXTENSIONS, SOLR_NOT_NULL_FIELDS, + // match: ".*_bi" accepte ce qui fini par _bi + ".*" + SUFFIX_BINARY, + ".*" + SUFFIX_BOOLEAN, + ".*" + SUFFIX_DATE, + ".*" + SUFFIX_NUMERIC, + ".*" + SUFFIX_STRING, + ".*" + SUFFIX_WIKITTY + }; + + /** + * NOTE: On ne pourra utiliser ces patterns pour la copie que lorsque la config + * solr acceptera de creer des copyField avec des expressions regulieres + * Ce qui permettra de genere les champs #all.* via la config solr et non + * pas de devoir les ajouter via le code Java. + * <copyField source="[^.]+\.(.*)" dest="#all.#1"/> + */ + static final public String[] fieldToCopyPatternWithExcludeAll = { + // match: id, extensions, not_null_fields + SOLR_ID, SOLR_EXTENSIONS, SOLR_NOT_NULL_FIELDS, + // match: "(?!(all\.)).*_bi" accept ce qui fini par _bi sauf si ca commence par "all." + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_BINARY, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_BOOLEAN, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_DATE, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_NUMERIC, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_STRING, + "(?!(" + SOLR_ALL_EXTENSIONS + "\\.)).*" + SUFFIX_WIKITTY + }; + + /** solr server */ + protected SolrServer solrServer; + + /** Field modifier use to transform to solr format */ + protected TypeFieldModifier fieldModifier; + + /** JTA resource */ + protected SolrResource solrResource; + + /** + * Init wikitty search engine on solr embedded server. + * + * @param extensionStorage extension storage + * @param properties properties (can be null) + */ + public WikittySearchEngineSolrIndexInTreeNode( + ApplicationConfig config, WikittyExtensionStorage extensionStorage) { + + // init system env solr.data.dir + if (config != null) { + // choix du storage (file or Ram) + String solrDirFactoryKey = + WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_FACTORY.getKey(); + String solrDirFactory = config.getOption(solrDirFactoryKey); + if (solrDirFactory != null) { + System.setProperty(solrDirFactoryKey, solrDirFactory); + } + + // on utilise le directory que si on est pas en Ram + if (solrDirFactory != null && !solrDirFactory.contains("RAMDirectoryFactory")) { + String solrDataDirKey = + WikittyConfig.WikittyOption.WIKITTY_SEARCHENGINE_SOLR_DIRECTORY_DATA.getKey(); + String solrDataDir = config.getOption(solrDataDirKey); + // make sure that dir exists + if (solrDataDir != null) { + File file = new File(solrDataDir); + file.mkdirs(); + System.setProperty(solrDataDirKey, solrDataDir); + } + } + } + + try { + CoreContainer.Initializer initializer = new CoreContainer.Initializer(); + CoreContainer coreContainer = initializer.initialize(); + solrServer = new EmbeddedSolrServer(coreContainer, ""); + + fieldModifier = new TypeFieldModifier(extensionStorage); + solrResource = new SolrResource(solrServer); + + } catch (Exception eee) { + throw new WikittyException("SolR initialization error", eee); + } + } + + @Override + public void clear(WikittyTransaction transaction) { + try { + // FIXME poussin 20100618 pourquoi n'est pas fait dans la transaction ? + solrResource.init(); + solrServer.deleteByQuery("*:*"); + } catch (Exception eee) { + throw new WikittyException("Error during clearing SolR data", eee); + } + } + + @Override + public void store(WikittyTransaction transaction, Collection<Wikitty> wikitties) { + try { + solrResource.init(); + LinkedHashSet<String> treeNodeToIndex = new LinkedHashSet<String>(); + for (Wikitty w : wikitties) { + String id = w.getId(); + // Index + SolrInputDocument doc = createIndexDocument(w); + solrResource.addDoc(id, doc); + + if (WikittyTreeNodeHelper.hasExtension(w)) { + if (w.getDirty().contains(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT) + || null == WikittyTreeNodeHelper.getParent(w) + || WikittyUtil.versionGreaterThan("1", w.getVersion())) { + // si le pere a change + // ou qu'il est null (creation d'un nouvel arbre) + // ou que l'objet n'a jamais ete sauve 1 > version + // il faut indexer le noeud + treeNodeToIndex.add(id); + } else { + // on recupere l'ancienne indexation + SolrDocument oldDoc = SolrUtil.findById(solrServer, id); + String root = (String)oldDoc.getFieldValue(TREENODE_ROOT); + Collection parents = oldDoc.getFieldValues(TREENODE_PARENTS); + + doc.addField(TREENODE_ROOT, root); + for (Object parent : parents) { + doc.addField(TREENODE_PARENTS, parent); + } + } + } + + } + + // Reindex child in tree node + reindexTreeNode(solrResource, treeNodeToIndex); + } catch (Exception eee) { + throw new WikittyException("Can't store wikitty", eee); + } + } + + protected String getTreeRoot(SolrResource solrResource, SolrServer solrServer, + String node) throws Exception { + String result = null; + String parent = node; + while (parent != null) { + SolrInputDocument doc = solrResource.getAddedDoc(parent); + if (doc != null) { + result = (String)doc.getFieldValue(TREENODE_ROOT); + parent = (String) doc.getFieldValue(WikittyTreeNode + .FQ_FIELD_WIKITTYTREENODE_PARENT + SUFFIX_WIKITTY); + } else { + SolrDocument parentDoc = SolrUtil.findById(solrServer, parent); + result = (String) parentDoc.getFirstValue(TREENODE_ROOT); + parent = (String) parentDoc.getFieldValue(WikittyTreeNode + .FQ_FIELD_WIKITTYTREENODE_PARENT + SUFFIX_WIKITTY); + } + } + // on a pas retrouve le root, cela veut dire que node et le root + if (result == null) { + result = node; + } + return result; + } + + protected void reindexTreeNode(SolrResource solrResource, + LinkedHashSet<String> treeNodeToIndex) throws Exception { + LinkedList<String> todo = new LinkedList<String>(treeNodeToIndex); + Set<String> done = new HashSet<String>(); + + Set<String> deleted = new HashSet<String>(solrResource.getDeletedDocs()); + + // key: child id, value: parent id + HashMap<String, String> tree = new HashMap<String, String>(); + while(todo.size() > 0) { + String id = todo.poll(); + if (done.contains(id)) { + continue; + } + done.add(id); + + // on recherche tout les fils du noeud que l'on reindex pour les reindexer aussi + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PARENTS + ":" + id); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + String childId = (String) solrDocument.getFieldValue(SOLR_ID); + todo.offer(childId); + } + + if (deleted.contains(id)) { + continue; + } + + // Get documents associated with this id + SolrInputDocument doc = solrResource.getAddedDoc(id); + if (doc == null) { + // Copy old field value + SolrDocument found = SolrUtil.findById(solrServer, id); + if (found != null) { + // copy only necessary field (other are regenerated) + doc = SolrUtil.copySolrDocument(found, true, fieldToCopyPattern); + solrResource.addDoc(id, doc); + } else { + if (log.isWarnEnabled()) { + log.warn("Can't find wikitty id '" + id + "' in index. Skip this wikitty."); + } + } + } + + // ajout du nouveau champs tree.root + String root = getTreeRoot(solrResource, solrServer, id); + doc.addField(TREENODE_ROOT, root); + + // ajout dans le nouveau champs tree.parents tous les parents du noeud + // et le noeud lui meme + String parent = id; + while (parent != null) { + String oldParent = parent; + doc.addField(TREENODE_PARENTS, parent); + if (tree.containsKey(parent)) { + parent = tree.get(parent); + } else if (null != solrResource.getAddedDoc(parent)) { + SolrInputDocument parentDoc = solrResource.getAddedDoc(id); + parent = (String) parentDoc.getFieldValue(WikittyTreeNode + .FQ_FIELD_WIKITTYTREENODE_PARENT + SUFFIX_WIKITTY); + } else { + SolrDocument parentDoc = SolrUtil.findById(solrServer, parent); + if (parentDoc != null) { + parent = (String) parentDoc.getFieldValue(WikittyTreeNode + .FQ_FIELD_WIKITTYTREENODE_PARENT + SUFFIX_WIKITTY); + } else { + parent = null; + } + } + tree.put(oldParent, parent); + } + } + } + + @Override + public void delete(WikittyTransaction transaction, Collection<String> ids) throws WikittyException { + try { + solrResource.init(); + LinkedHashSet<String> treeNodeToIndex = new LinkedHashSet<String>(); + for (String id : ids) { + SolrDocument doc = SolrUtil.findById(solrServer, id); + if (doc.containsKey(TREENODE_ROOT)) { + treeNodeToIndex.add(id); + } + solrResource.deleteDoc(id); + } + + // Reindex child in tree node + reindexTreeNode(solrResource, treeNodeToIndex); + } catch (Exception eee) { + throw new WikittyException("Can't delete wikitty in index", eee); + } + } + + @Override + public PagedResult<String> findAllByCriteria(WikittyTransaction transaction, Criteria criteria) { + try { + // Create query with restriction + Restriction2Solr restriction2Solr = new Restriction2Solr(transaction, fieldModifier); + String queryString = restriction2Solr.toSolr(criteria.getRestriction(), solrServer); + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + queryString); + + // Add paged + int firstIndex = criteria.getFirstIndex(); + int endIndex = criteria.getEndIndex(); + + query.setStart(firstIndex); + int nbRows; + if (endIndex == -1) { + // WARNING It is necessary to substract 'start' otherwise, + // there is a capacity overlow in solR + nbRows = Integer.MAX_VALUE - firstIndex; + } else { + nbRows = endIndex - firstIndex + 1; + } + query.setRows(nbRows); + + // Add sorting + List<String> sortAscending = criteria.getSortAscending(); + if(sortAscending != null) { + for (String sort : sortAscending) { + String tranform = fieldModifier.convertToSolr(transaction, sort); + query.addSortField(tranform, SolrQuery.ORDER.asc); + } + } + + List<String> sortDescending = criteria.getSortDescending(); + if(sortDescending != null) { + for (String sort : sortDescending) { + String tranform = fieldModifier.convertToSolr(transaction, sort); + query.addSortField(tranform, SolrQuery.ORDER.desc); + } + } + + // Add faceting + List<String> facetField = criteria.getFacetField(); + log.debug("facetField : " + facetField); + List<Criteria> facetCriteria = criteria.getFacetCriteria(); + + // use to map query string to criteria facet name + Map<String, String> facetQueryToName = new HashMap<String, String>(); + + if ((facetField != null && !facetField.isEmpty()) + || (facetCriteria != null && !facetCriteria.isEmpty())) { + query.setFacet(true); + query.setFacetMinCount(1); + // query.setFacetLimit(8); // no limit actualy + + // field facetisation + if (facetField != null) { + for (String fqfieldName : facetField) { + String tranform = fieldModifier.convertToSolr(transaction, fqfieldName); + query.addFacetField(tranform); + } + } + + // query facetisation + if (facetCriteria != null) { + for (Criteria facet : facetCriteria) { + String queryFacet = + restriction2Solr.toSolr(facet.getRestriction()); + facetQueryToName.put(queryFacet, facet.getName()); + query.addFacetQuery(queryFacet); + } + } + } + + if(log.isDebugEnabled()) { + log.debug(String.format("Try to execute query %s", query)); + } + QueryResponse resp = solrServer.query(query); + SolrDocumentList solrResults = resp.getResults(); + + Map<String, List<FacetTopic>> facets = new HashMap<String, List<FacetTopic>>(); + if (facetField != null && !facetField.isEmpty()) { + for (FacetField facet : resp.getFacetFields()) { + String facetName = fieldModifier.convertToField(transaction, facet.getName()); + List<FacetTopic> topics = new ArrayList<FacetTopic>(); + if (facet.getValues() != null) { + for (FacetField.Count value : facet.getValues()) { + String topicName = value.getName(); +// if(!topicName.endsWith(TREENODE_EMPTY)) { + int topicCount = (int) value.getCount(); + FacetTopic topic = new FacetTopic(facetName, topicName, topicCount); + topics.add(topic); +// } + } + } + facets.put(facetName, topics); + } + } + if (facetCriteria != null && !facetCriteria.isEmpty()) { + for (Map.Entry<String, Integer> facet : resp.getFacetQuery().entrySet()) { + String facetName = facet.getKey(); + // don't use contains because, map can have key with null value + if (null != facetQueryToName.get(facetName)) { + facetName = facetQueryToName.get(facetName); + } + Integer count = facet.getValue(); + List<FacetTopic> topics = new ArrayList<FacetTopic>(); + FacetTopic topic = new FacetTopic(facetName, facetName, count); + topics.add(topic); + facets.put(facetName, topics); + } + } + + List<String> ids = new ArrayList<String>(solrResults.size()); + for (SolrDocument doc : solrResults) { + String id = (String) doc.getFieldValue(SOLR_ID); + ids.add(id); + } + + int numFound = (int)resp.getResults().getNumFound(); + PagedResult<String> result = new PagedResult<String>( + firstIndex, numFound, queryString, facets, ids); + + return result; + } catch (SolrServerException eee) { + throw new WikittyException("Error during find", eee); + } + } + + @Override + public Integer findNodeCount(WikittyTransaction transaction, Wikitty w, Criteria filter) { + try { + int result = 0; + + String id = w.getId(); + if (filter == null) { + // we used hashSet to count only once same attachments in many node + Collection allAttachments = new HashSet(); + + // on recherche tout les fils du noeud + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PARENTS + ":" + id); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + Collection attachments = solrDocument.getFieldValues( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + + SUFFIX_WIKITTY); + if (attachments != null) { + allAttachments.addAll(attachments); + } + } + result = allAttachments.size(); + } else { + throw new UnsupportedOperationException("Not yet implemented with filter!"); + } + return result; + } catch (SolrServerException eee) { + throw new WikittyException("Can't find node count", eee); + } + } + + @Override + public Map<String, Integer> findAllChildrenCount( + WikittyTransaction transaction, Wikitty w, Criteria filter) { + try { + // key: id node; value: attachment count for this node (with sub*node) + Map<String, Integer> result = new HashMap<String, Integer>(); + + String id = w.getId(); + if (filter == null) { + // key: id node; value: attachment count for this node (with sub*node) + Map<String, Collection> allAttachments = new HashMap<String, Collection>(); + + // les id des fils direct du wikitty passe en parametre + Set<String> child = new HashSet<String>(); + + // on recherche tout les fils et sous fils, lui compris + SolrQuery query = new SolrQuery(SOLR_QUERY_PARSER + TREENODE_PARENTS + ":" + id); + QueryResponse response = solrServer.query(query); + SolrDocumentList updateDocs = response.getResults(); + + for (Iterator<SolrDocument> iterator = updateDocs.iterator(); iterator.hasNext();) { + SolrDocument solrDocument = iterator.next(); + String childId = (String)solrDocument.getFieldValue(SOLR_ID); + String parentId = (String)solrDocument.getFieldValue( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_PARENT + SUFFIX_WIKITTY); + Collection attachments = solrDocument.getFieldValues( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_ATTACHMENT + SUFFIX_WIKITTY); + Collection parents = solrDocument.getFieldValues( + TREENODE_PARENTS); + + if (id.equals(parentId)) { + // c'est un fils direct on l'ajoute a la liste des fils + child.add(childId); + } + + for (Object p : parents) { + String parent = (String) p; + Collection col = allAttachments.get(parent); + if (col == null) { + // we used hashSet to count only once same attachments in many node + col = new HashSet(); + allAttachments.put(parent, col); + } + if (attachments != null) { + col.addAll(attachments); + } + } + } + + for (Map.Entry<String, Collection> e : allAttachments.entrySet()) { + // on ne garde que les fils directs + if (child.contains(e.getKey())) { + result.put(e.getKey(), e.getValue().size()); + } + } + } else { + throw new UnsupportedOperationException("Not yet implemented with filter!"); + } + return result; + } catch (SolrServerException eee) { + throw new WikittyException("Can't find node count", eee); + } + + } + + /** + * Create all index document to used to modify indexation. + * this method don't modify index. + * + * The document looks like : + * SolrId : wikittyId + * extensions : extensionNames + * fieldName : fieldValue + * + * @param w all wikitties object to index + * @return solrInputDocument used to modify index + */ + protected SolrInputDocument createIndexDocument(Wikitty w) { + if (log.isDebugEnabled()) { + log.debug("index wikitty " + w.getId()); + } + + SolrInputDocument doc = new SolrInputDocument(); + String id = w.getId(); + doc.addField(SOLR_ID, id); + + for (String name : w.getExtensionNames()) { + doc.addField(SOLR_EXTENSIONS, name); + } + + for (String fqfieldName : w.fieldNames()) { + FieldType fieldType = w.getFieldType(fqfieldName); + TYPE type = fieldType.getType(); + String solrFqFieldName = SolrUtil.getSolrFieldName(fqfieldName, type); + + String solrAllFieldName = SOLR_ALL_EXTENSIONS + + WikittyUtil.FQ_FIELD_NAME_SEPARATOR + + WikittyUtil.getFieldNameFromFQFieldName(solrFqFieldName); + + Object objectValue = w.getFqField(fqfieldName); + if(objectValue != null) { + if (fieldType.isCollection()) { + Collection collectionValue = (Collection) objectValue; + for (Object itemValue : collectionValue) { + if (itemValue != null) { + doc.addField(solrFqFieldName, itemValue); + doc.addField(solrAllFieldName, itemValue); + doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); + if (log.isDebugEnabled()) { + log.debug("index field " + solrFqFieldName + + " with value '" + itemValue + "'"); + } + } + } + } else { + doc.addField(solrFqFieldName, objectValue); + doc.addField(solrAllFieldName, objectValue); + doc.addField(SOLR_NOT_NULL_FIELDS, fqfieldName); + if (log.isDebugEnabled()) { + log.debug("index field " + solrFqFieldName + + " with value '" + objectValue + "'"); + } + } + } + } + return doc; + } + +} Added: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/WikittySolrConstant.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,64 @@ +package org.nuiton.wikitty.storage.solr; + +/** + * Extraction des constantes de WikittySearchEngineSolr pour pouvoir les + * utiliser dans les différentes implantations de WikittySearchEngine car il + * est très lié au fichier de configuration Solr partagé par les différentes + * implantation (car impossible de trouver comment specifier les fichiers de + * configuration a utiliser pour une implantation donnees :() + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittySolrConstant { + + /** + * Prefix utiliser pour les champs ajouter lors de l'indexation. Ce prefix + * evite d'avoir des conflits entre un nom d'extension et un champs ajoute + */ + static final public String SOLR_WIKITTY_PREFIX = "#"; + + /** id field in solr */ + static final public String SOLR_ID = SOLR_WIKITTY_PREFIX + "id"; + + /** extensions field name in solr */ + static final public String SOLR_EXTENSIONS = SOLR_WIKITTY_PREFIX + "extensions"; + + /** group all fields is not null */ + static final public String SOLR_NOT_NULL_FIELDS = + SOLR_WIKITTY_PREFIX + "not_null_fields"; + + /** extension use to store field without extension to search on all extesnion */ + static final public String SOLR_ALL_EXTENSIONS = SOLR_WIKITTY_PREFIX + "all"; + + /** default field to fulltext search */ + static final public String SOLR_DEFAULT_FIELD = SOLR_WIKITTY_PREFIX + "fulltext"; + + /** Precise the query parser to use, is allow leading wildcard */ + static final public String SOLR_QUERY_PARSER = "{!wikitty}"; + + // Use for indexation tree node + static final public String TREENODE_PREFIX = SOLR_WIKITTY_PREFIX + "tree."; + static final public String TREENODE_ROOT = TREENODE_PREFIX + "root"; + static final public String TREENODE_PARENTS = TREENODE_PREFIX + "parents"; + + static final public String SUFFIX_BINARY = "_bi"; + static final public String SUFFIX_BOOLEAN = "_b"; + static final public String SUFFIX_NUMERIC = "_d"; + static final public String SUFFIX_DATE = "_dt"; + static final public String SUFFIX_STRING = "_s"; + static final public String SUFFIX_WIKITTY = "_w"; + + static final public String SUFFIX_STRING_LOWERCASE = "_c"; + static final public String SUFFIX_STRING_FULLTEXT = "_t"; + + + + // for old WikittySearchEngineSolr + static final public String TREENODE_EMPTY = TREENODE_PREFIX + "empty"; + static final public String TREENODE_PATH = TREENODE_PREFIX + "path"; + +} Copied: trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java (from rev 618, trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/solr/package-info.java) =================================================================== --- trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java (rev 0) +++ trunk/wikitty-solr-impl/src/main/java/org/nuiton/wikitty/storage/solr/package-info.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,133 @@ +/** + * <h1>Indexation</h1> + * + * Ce module sert a l'indexation des wikitties dans SolR. Chaque champs d'un + * wikitty est indexe de differente facon selon son type. + * + * Chaque type de champs est suffixe par un marqueur. + * + * <table border="2"> + * <tr> + * <th>Type wikitty</th><th>Suffixe</th><th>Type d'indexation</th><th>valeur</th><th>stored</th><th>multiValued</th> + * </tr> + * <tr> + * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#BINARY}</td><td>_bi {@link WikittySearchEngineSolr#SUFFIX_BINARY}</td><td>aucun</td><td>vide</td><td>non</td><td>true</td> + * </tr> + * <tr> + * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#BOOLEAN}</td><td>_b {@link WikittySearchEngineSolr#SUFFIX_BOOLEAN}</td><td>boolean</td><td>la valeur du champs</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#DATE}</td><td>_dt {@link WikittySearchEngineSolr#SUFFIX_DATE}</td><td>date</td><td>la valeur du champs</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#NUMBER}</td><td>_d {@link WikittySearchEngineSolr#SUFFIX_NUMERIC}</td><td>sdouble</td><td>la valeur du champs</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>{@link org.nuiton.wikitty.entities.FieldType.TYPE#WIKITTY}</td><td>_w {@link WikittySearchEngineSolr#SUFFIX_WIKITTY}</td><td>string</td><td>l'id du wikitty</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td rowspan="3">{@link org.nuiton.wikitty.entities.FieldType.TYPE#STRING}</td><td>_s {@link WikittySearchEngineSolr#SUFFIX_STRING}</td><td>string</td><td>la valeur du champs</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>_s_c {@link WikittySearchEngineSolr#SUFFIX_STRING_LOWERCASE}</td><td>string</td><td>la valeur du champs en minuscule</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>_s_t {@link WikittySearchEngineSolr#SUFFIX_STRING_FULLTEXT}</td><td>text</td><td>la valeur du champs</td><td>true</td><td>true</td> + * </tr> + * </table> + * + * D'autres champs sont indexes + * <table border="2"> + * <tr> + * <th>champs</th><th>Type d'indexation</th><th>valeur</th><th>stored</th><th>multiValued</th> + * </tr> + * <tr> + * <td>#id</td><td>string</td><td>l'id du wikitty</td><td>true</td><td>false</td> + * </tr> + * <tr> + * <td>#extensions</td><td>string</td><td>la liste des extensions</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>#not_null_fields</td><td>string</td><td>la liste des champs qui doivent etre non null</td><td>true</td><td>true</td> + * </tr> + * <tr> + * <td>#fulltext</td><td>text</td><td>la valeur de tous les champs ayant un suffix</td><td>true</td><td>true</td> + * </tr> + * </table> + * + * <p> + * Les champs sont tous restockes dans une extension 'all' pour pouvoir faire + * des recherches sur toutes les extensions en meme temps. Par exemple rechercher + * tout ce qui porte le 'nom' 'portable' quelque soit l'extension (*.nom:portable) + * <p> + * Les chaines de caracteres doivent obligatoirement etre indexee en type string + * si l'on veut pouvoir faire des facettes dessus. Il faut donc obligatoirement + * indexer les chaines en 'string' et aussi en 'text' pour pouvoir les utiliser + * dans les facettes mais aussi que la recheche soit plus permissive. + * <p> + * SolR copie tous les champs dans le champs 'text' pour la recherche fulltext + * ce champs est le champs par defaut de recherche. + * <p> + * id est marque comme devant etre un champs unique (et donc lorsqu'on enregistre + * un nouveau document avec le meme id, l'ancien est supprime) + * <p> + * Tous les champs sont marque stored car lors de la reindexation des arbres + * on a besoin de faire une copie de l'ancien document et donc de pouvoir + * recuperer la valeur des champs (voir alternative) + * <p> + * Par exemple si on a un champs <b>product.description: String</b> nous le + * retrouverons dans 7 champs de l'index: + * + * <li> text : text (car est la copie de tous les champs) + * <li> product.description_s : string (necessaire pour la facetisation) + * <li> product.description_s_c : string + * <li> product.description_s_t : text + * <li> all.description_s : string + * <li> all.description_s_c : string + * <li> all.description_s_t : text + * + * il faudrait que les 5 derniers soit autogenere par solr en utilisant un + * <b>copyField</b> dans le schema.xml et qu'il ne soit pas stocke. Mais pour + * cela il faudrait que <b>copyField</b> permette l'utilisation de regexp + * (faire un patch a SolR ?) + * + * <copyField source="*_s" dest="*_s_c"/> + * <copyField source="*_s" dest="*_s_t"/> + * + * <copyField source="*.*_s" dest="all.*_s"/> + * <copyField source="*.*_s" dest="all.*_s_c"/> + * <copyField source="*.*_s" dest="all.*_s_t"/> + * + * et aussi definir les all pour les autres types + * <copyField source="*.*_b" dest="all.*_b"/> + * <copyField source="*.*_dt" dest="all.*_dt"/> + * <copyField source="*.*_d" dest="all.*_d"/> + * <copyField source="*.*_w" dest="all.*_w"/> + * + * copyField ne support que une * et au debut ou a la fin, donc actuellement + * il serait possible d'avoir + * + * <copyField source="*_s" dest="*_s_c"/> + * <copyField source="*_s" dest="*_s_t"/> + * + * et d'enregistrer les champs deux fois en <b>extName.fieldName</b> et en + * <b>all.fieldName</b> ensuite lorsqu'on a besoin de copier un document + * il ne faut prendre les champs id, extensions, not_null_fields et les champs + * ne commencant pas par 'all.' et se finissant exclusivement par + * _bi, _b, _dt, _d, _s, _w. Cest dernier seront enregistrer aussi en all. + * + * Ainsi on passe de 6 champs stocke + 1, a 1 champ stocker + 6. Pour les chaines + * et de 2 champs stockes a 1 champ stocke + 1. + * + * + * <h2>alternative au stockage de tout les champs</h2> + * <p> + * Une alternative serait de ne reprendre que les champs reels (pas les copies) + * et recreer les copies a partir de ceux la. Les copies pourront ne plus etre + * stored=true. + * <p> + * Une autre alternative serait de récuperer l'objet dans le Storage et de le + * reindexer completement + * + */ +package org.nuiton.wikitty.storage.solr; Modified: trunk/wikitty-solr-impl/src/main/resources/schema.xml =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/schema.xml 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/main/resources/schema.xml 2010-12-17 16:33:52 UTC (rev 619) @@ -32,128 +32,34 @@ --> <schema name="wikitty" version="1.1"> -  - <types> -  +  + <fieldtype name="binary" stored="false" indexed="false" class="solr.StrField" /> -  - <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/> +  + <fieldType name="boolean" class="solr.BoolField" + sortMissingLast="true" omitNorms="true"/> -  - <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/> +  + <fieldType name="numeric" class="solr.SortableDoubleField" + sortMissingLast="true" omitNorms="true"/> -  - - -  - <fieldType name="integer" class="solr.IntField" omitNorms="true"/> - <fieldType name="long" class="solr.LongField" omitNorms="true"/> - <fieldType name="float" class="solr.FloatField" omitNorms="true"/> - <fieldType name="double" class="solr.DoubleField" omitNorms="true"/> - - -  - <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/> - <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/> - <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/> - <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/> - - -  +  <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/> +  + <fieldType name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/> -  - <fieldType name="random" class="solr.RandomSortField" indexed="true" /> - -  - -  - -  - <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100"> - <analyzer> - <tokenizer class="solr.WhitespaceTokenizerFactory"/> +  + <fieldType name="string_lc" class="solr.StrField" sortMissingLast="true" omitNorms="true"> + <analyzer>  + <tokenizer class="solr.StandardTokenizerFactory"/>  + <filter class="solr.LowerCaseFilterFactory"/> </analyzer> </fieldType> -  -  <filter class="solr.StopFilterFactory" ignoreCase="true" - words="stopwords.txt" + words="stopwords_fr.txt" enablePositionIncrements="true" /> - <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/> + <filter class="solr.WordDelimiterFilterFactory" + generateWordParts="1" generateNumberParts="1" catenateWords="1" + catenateNumbers="1" catenateAll="0" splitOnCaseChange="1"/> <filter class="solr.LowerCaseFilterFactory"/> - <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/> + <filter class="solr.EnglishPorterFilterFactory" + protected="protwords.txt"/> <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> </analyzer> <analyzer type="query"> <tokenizer class="solr.WhitespaceTokenizerFactory"/> - <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/> - <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/> - <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/> + <filter class="solr.SynonymFilterFactory" + synonyms="synonyms.txt" ignoreCase="true" expand="true"/> + <filter class="solr.StopFilterFactory" + ignoreCase="true" words="stopwords_fr.txt"/> + <filter class="solr.WordDelimiterFilterFactory" + generateWordParts="1" generateNumberParts="1" catenateWords="0" + catenateNumbers="0" catenateAll="0" splitOnCaseChange="1"/> <filter class="solr.LowerCaseFilterFactory"/> - <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/> + <filter class="solr.EnglishPorterFilterFactory" + protected="protwords.txt"/> <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> </analyzer> </fieldType> - - <fieldType name="text_core" class="solr.TextField" positionIncrementGap="100"> - <analyzer> - <tokenizer class="solr.WhitespaceTokenizerFactory"/> - <filter class="solr.LowerCaseFilterFactory" /> -  - </analyzer> - </fieldType> +  + <fieldType name="wikitty" class="solr.StrField" sortMissingLast="true" omitNorms="true"/> -  - <fieldType name="textTight" class="solr.TextField" positionIncrementGap="100" > - <analyzer> - <tokenizer class="solr.WhitespaceTokenizerFactory"/> - <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="false"/> - <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/> - <filter class="solr.WordDelimiterFilterFactory" generateWordParts="0" generateNumberParts="0" catenateWords="1" catenateNumbers="1" catenateAll="0"/> - <filter class="solr.LowerCaseFilterFactory"/> - <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/> - <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> - </analyzer> - </fieldType> - -  - <fieldType name="textSpell" class="solr.TextField" positionIncrementGap="100" > - <analyzer> - <tokenizer class="solr.StandardTokenizerFactory"/> - <filter class="solr.LowerCaseFilterFactory"/> - <filter class="solr.RemoveDuplicatesTokenFilterFactory"/> - </analyzer> - </fieldType> - -  - <fieldType name="alphaOnlySort" class="solr.TextField" sortMissingLast="true" omitNorms="true"> - <analyzer> -  - <tokenizer class="solr.KeywordTokenizerFactory"/> -  - <filter class="solr.LowerCaseFilterFactory" /> -  - <filter class="solr.TrimFilterFactory" /> -  - <filter class="solr.PatternReplaceFilterFactory" - pattern="([^a-z])" replacement="" replace="all" - /> - </analyzer> - </fieldType> - -  - <fieldtype name="ignored" stored="false" indexed="false" class="solr.StrField" /> - </types> <fields> -  +  - <field name="id" type="string" indexed="true" stored="true" required="true" /> - <field name="extensions" type="string" indexed="true" stored="true" multiValued="true"/> - <field name="not_null_fields" type="string" indexed="true" stored="true" multiValued="true"/> + <field name="#id" type="string" indexed="true" stored="true" required="true" /> + <field name="#extensions" type="string" indexed="true" stored="true" multiValued="true"/> + <field name="#not_null_fields" type="string" indexed="true" stored="true" multiValued="true"/> + <field name="#tree.root" type="string" indexed="true" stored="true" multiValued="true"/> + <field name="#tree.parents" type="string" indexed="true" stored="true" multiValued="true"/> -  - <field name="text" type="text" indexed="true" stored="false" multiValued="true"/> - <copyField source="*_i" dest="text"/> - <copyField source="*_t" dest="text"/> -  - <copyField source="*_l" dest="text"/> - <copyField source="*_b" dest="text"/> - <copyField source="*_f" dest="text"/> - <copyField source="*_d" dest="text"/> - <copyField source="*_dt" dest="text"/> +  + <dynamicfield name="#tree*" type="string" indexed="true" stored="false" multiValued="true"/> +  + <field name="#fulltext" type="text" indexed="true" stored="false" multiValued="true"/> + <copyField source="*_b" dest="#fulltext"/> + <copyField source="*_d" dest="#fulltext"/> + <copyField source="*_dt" dest="#fulltext"/> + <copyField source="*_s" dest="#fulltext"/> + <copyField source="*_w" dest="#fulltext"/> + +  + <copyField source="*_s" dest="*_s_c"/> +  + <copyField source="*_s" dest="*_s_t"/> + +  + <dynamicField name="*_s_c" type="string_lc" indexed="true" stored="false" multiValued="true"/> + <dynamicField name="*_s_t" type="text" indexed="true" stored="false" multiValued="true"/> +  - <dynamicField name="*_bi" type="string" indexed="false" stored="false" multiValued="true"/> - <dynamicField name="*_i" type="sint" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_t" type="text" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_c" type="string" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_l" type="slong" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_bi" type="binary" indexed="false" stored="false" multiValued="true"/> <dynamicField name="*_b" type="boolean" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_f" type="sfloat" indexed="true" stored="true" multiValued="true"/> - <dynamicField name="*_d" type="sdouble" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_d" type="numeric" indexed="true" stored="true" multiValued="true"/> <dynamicField name="*_dt" type="date" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_s" type="string" indexed="true" stored="true" multiValued="true"/> + <dynamicField name="*_w" type="wikitty" indexed="true" stored="true" multiValued="true"/> -  - <dynamicField name="*" type="string" indexed="true" stored="true" multiValued="true"/> +  + <dynamicField name="*" type="string" indexed="true" stored="false" multiValued="true"/> -  - <dynamicField name="_*" type="string" indexed="true" stored="true" multiValued="true"/> - </fields>  - <uniqueKey>id</uniqueKey> + <uniqueKey>#id</uniqueKey>  - <defaultSearchField>text</defaultSearchField> + <defaultSearchField>#fulltext</defaultSearchField>  <solrQueryParser defaultOperator="AND"/> Copied: trunk/wikitty-solr-impl/src/main/resources/stopwords_en.txt (from rev 593, trunk/wikitty-solr-impl/src/main/resources/stopwords.txt) =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/stopwords_en.txt (rev 0) +++ trunk/wikitty-solr-impl/src/main/resources/stopwords_en.txt 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,57 @@ +# Licensed to the Apache Software Foundation (ASF) under one or more +# contributor license agreements. See the NOTICE file distributed with +# this work for additional information regarding copyright ownership. +# The ASF licenses this file to You under the Apache License, Version 2.0 +# (the "License"); you may not use this file except in compliance with +# the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#----------------------------------------------------------------------- +# a couple of test stopwords to test that the words are really being +# configured from this file: +stopworda +stopwordb + +#Standard english stop words taken from Lucene's StopAnalyzer +an +and +are +as +at +be +but +by +for +if +in +into +is +it +no +not +of +on +or +s +such +t +that +the +their +then +there +these +they +this +to +was +will +with + Added: trunk/wikitty-solr-impl/src/main/resources/stopwords_fr.txt =================================================================== --- trunk/wikitty-solr-impl/src/main/resources/stopwords_fr.txt (rev 0) +++ trunk/wikitty-solr-impl/src/main/resources/stopwords_fr.txt 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,183 @@ +# From svn.tartarus.org/snowball/trunk/website/algorithms/french/stop.txt +# This file is distributed under the BSD License. +# See http://snowball.tartarus.org/license.php +# Also see http://www.opensource.org/licenses/bsd-license.html +# - Encoding was converted to UTF-8. +# - This notice was added. + +# A French stop word list. Comments begin with vertical bar. Each stop +# word is at the start of a line. + +au +aux +avec +ce +ces +dans +de +des +du +elle +en +et +eux +il +je +la +le +leur +lui +ma +mais +me +même +mes +moi +mon +ne +nos +notre +nous +on +ou +par +pas +pour +qu +que +qui +sa +se +ses +son +sur +ta +te +tes +toi +ton +tu +un +une +vos +votre +vous + + + +c +d +j +l +à +m +n +s +t +y + + +été +étée +étées +étés +étant +suis +es +est +sommes +êtes +sont +serai +seras +sera +serons +serez +seront +serais +serait +serions +seriez +seraient +étais +était +étions +étiez +étaient +fus +fut +fûmes +fûtes +furent +sois +soit +soyons +soyez +soient +fusse +fusses +fût +fussions +fussiez +fussent + + +ayant +eu +eue +eues +eus +ai +as +avons +avez +ont +aurai +auras +aura +aurons +aurez +auront +aurais +aurait +aurions +auriez +auraient +avais +avait +avions +aviez +avaient +eut +eûmes +eûtes +eurent +aie +aies +ait +ayons +ayez +aient +eusse +eusses +eût +eussions +eussiez +eussent + + +ceci +celà +cet +cette +ici +ils +les +leurs +quel +quels +quelle +quelles +sans +soi + Deleted: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,41 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty.solr.test; - -import org.junit.Before; -import org.nuiton.wikitty.WikittyConfig; -import org.nuiton.wikitty.services.WikittyServiceEnhanced; - -public abstract class AbstractTestSolr { - - protected WikittyServiceEnhanced ws = - new WikittyServiceEnhanced(new WikittyServiceSolr(new WikittyConfig())); - - @Before - public void deleteAll() throws Exception { - ws.clear(null); - } - -} Deleted: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,498 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ -package org.nuiton.wikitty.solr.test; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertTrue; - -import java.util.ArrayList; -import java.util.Calendar; -import java.util.List; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.search.FacetTopic; -import org.nuiton.wikitty.search.PagedResult; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.WikittyUtil; -import org.nuiton.wikitty.conform.AbstractTestConformance; -import org.nuiton.wikitty.conform.StorageTest; -import org.nuiton.wikitty.search.operators.Element; -import org.nuiton.wikitty.search.operators.Like; -import org.nuiton.wikitty.search.operators.Like.SearchAs; -import org.nuiton.wikitty.search.RestrictionHelper; -import org.nuiton.wikitty.search.Search; - -public class SolrSearchTest extends AbstractTestSolr { - - private static final Log log = LogFactory.getLog(SolrSearchTest.class); - - protected WikittyExtension extCategory; - protected WikittyExtension extProduct; - protected WikittyExtension extTest; - - @Before - public void createTestData() throws Exception { - extCategory = new WikittyExtension("Category", "1", null, - WikittyUtil.buildFieldMapExtension( - "String name") - ); - - Wikitty[] wikitties = createWikitties(extCategory, new String[] { - "name = Library", - "name = Stuff", - "name = Hardware", - "name = Staff", - "name = FooBar" - }); - - String hardwareCategoryId = wikitties[2].getId(); - String staffCategoryId = wikitties[3].getId(); - - extProduct = new WikittyExtension("Product", "1", null, - WikittyUtil.buildFieldMapExtension( - "String name", - "Numeric price", - "String value", - "String optional", - "Wikitty category") - ); - - createWikitties(extProduct, new String[] { - "name = Paint blue," + - "price = 20," + - "value = 1," + - "category = " + hardwareCategoryId, - - "name = Other Paint blue," + - "price = 20," + - "value = 1," + - "optional = test," + - "category = " + hardwareCategoryId, - - "name = Paint red," + - "price = 35," + - "value = 1," + - "optional = test," + - "category = " + hardwareCategoryId, - - "name = Paint Staff blue," + - "price = 20," + - "value = 2," + - "category = " + staffCategoryId, - - "name = Paint green," + - "price = 18," + - "value = 1," + - "category = " + hardwareCategoryId, - }); - - extTest = new WikittyExtension("Test", "1", null, - WikittyUtil.buildFieldMapExtension( - "String name", - "String description", - "Numeric amount", - "Date buildDate", - "Boolean enabled") - ); - - createWikitties(extTest, new String[] { - "name = table," + - "amount = 003300," + - "buildDate = " + AbstractTestConformance.format("23/01/1982") + "," + - "enabled = false", - - "name = chaise," + - "amount = 113311," + - "buildDate = " + AbstractTestConformance.format("26/09/2009") + "," + - "enabled = false", - - - "name = bureau," + - "description=One use for WordDelimiterFilter is to helped match words with different delimiters.," + - "amount = 223322," + - "buildDate = " + AbstractTestConformance.format("25/12/2029") + "," + - "enabled = true" - }); - } - - private Wikitty[] createWikitties(WikittyExtension lonelyExtension, String[] wValues) { - ArrayList<Wikitty> result = new ArrayList<Wikitty>(); - for ( String wValue : wValues ) { - Wikitty w = StorageTest.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension ); - result.add( w ); - } - ws.store(null, result); - return result.toArray( new Wikitty[]{} ); - } - - @Test - public void testBasicSearch() throws Exception { - Criteria criteria = Search.query() - .eq("Test.name_s", "chaise") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<String> list = result.getAll(); - assertEquals(1, list.size()); - - Wikitty w = ws.restore(null, list.get(0)); - assertEquals("chaise", w.getFieldAsString("Test", "name")); - assertEquals(113311, w.getFieldAsInt("Test", "amount")); - assertEquals(AbstractTestConformance.parse("26/09/2009"), - w.getFieldAsDate("Test", "buildDate")); - } - - @Test - public void testAdvancedSearch() throws Exception { - Criteria criteria = Search.query() - .eq("Product.value", "1") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<String> list = result.getAll(); - assertEquals(4, list.size()); - - criteria = Search.query() - .eq("Product.value", "1") - .bw("Product.price", "15", "25") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - result = ws.findAllByCriteria(null, criteria); - list = result.getAll(); - assertEquals(3, list.size()); - } - - @Test - public void testAssociativeSearch() throws Exception { - Criteria criteria = Search.query() - .bw("Product.price", "15", "25") - .sw("Product.name", "Paint") - .associated( "Product.category") - .eq("Category.name", "Hardware") - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<String> list = result.getAll(); - assertEquals( 2, list.size() ); - } - - @Test - public void testKeywordSearch() throws Exception { - Criteria criteria = Search.query().keyword("bureau").criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); - List<String> result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().keyword("nothing").criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - result = pagedResult.getAll(); - assertEquals(0, result.size()); - - criteria = Search.query().keyword("*33*").criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - result = pagedResult.getAll(); - assertEquals(3, result.size()); - - criteria = Search.query() - .keyword("*33*") - .eq("Test.name", "bureau") - .criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - result = pagedResult.getAll(); - assertEquals(1, result.size()); - } - - @Test - public void testFacetOnExtension() throws Exception { - Criteria criteria = Search.query().keyword("*").criteria(); - criteria.addFacetField(Element.ELT_EXTENSION); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - assertEquals(13, result.getAll().size()); - - List<FacetTopic> topics = result.getTopic(Element.ELT_EXTENSION); - for (FacetTopic topic : topics) { - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - - if(topicName.equals("Category")) { - assertEquals(5, topicCount); - } else if(topicName.equals("Product")) { - assertEquals(5, topicCount); - } else if(topicName.equals("Test")) { - assertEquals(3, topicCount); - } - } - } - - @Test - public void testSearchOnBoolean() throws Exception { - Criteria criteria = Search.query() - .eq("Test.enabled", "true") - .criteria(); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - assertEquals(1, result.getNumFound()); - - criteria = Search.query() - .eq("Test.enabled", "false") - .criteria(); - - result = ws.findAllByCriteria(null, criteria); - assertEquals(2, result.getNumFound()); - } - - @Test - public void testSearchWithNot() throws Exception { - Search query = Search.query(); - query.not().eq("Test.name", "bureau"); - Criteria criteria = query.criteria(); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - assertEquals(12, result.getNumFound()); - - query = Search.query().eq("Test.amount", "003300"); - query.not().eq("Test.name", "bureau"); - criteria = query.criteria(); - - result = ws.findAllByCriteria(null, criteria); - assertEquals(1, result.getNumFound()); - } - - @Test - public void testSearchNonSensitive() throws Exception { - - Criteria criteria = Search.query() - .like("Test.name_s", "cHaIsE", SearchAs.ToLowerCase) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<String> list = result.getAll(); - assertEquals(1, list.size()); - - Wikitty w = ws.restore(null, list.get(0)); - assertEquals("chaise", w.getFieldAsString("Test", "name")); - assertEquals(113311, w.getFieldAsInt("Test", "amount")); - assertEquals(AbstractTestConformance.parse("26/09/2009"), w.getFieldAsDate("Test", "buildDate")); - - criteria = Search.query() - .unlike("Test.name_s", "cHaIsE", SearchAs.ToLowerCase) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - result = ws.findAllByCriteria(null, criteria); - list = result.getAll(); - assertEquals(12, list.size()); - } - - @Test - public void testFindAllByExample() throws Exception { - Wikitty example = new WikittyImpl(); - example.addExtension(extProduct); - example.setField("Product", "price", 20); - - Criteria criteria = Search.query(example).criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - - assertEquals(3, result.getNumFound()); - } - - @Test - public void testFacet() throws Exception { - Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); - criteria.addFacetField("Product.value"); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<FacetTopic> topics = result.getTopic("Product.value"); - for (FacetTopic topic : topics) { - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - if("1".equals(topicName)) { - assertEquals(4, topicCount); - } else { - assertEquals(1, topicCount); - } - } - - criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); - Criteria facet1 = Search.query().eq("Product.value", "1").criteria("1"); - criteria.addFacetCriteria(facet1); - Criteria facet2 = Search.query().eq("Product.value", "2").criteria("2"); - criteria.addFacetCriteria(facet2); - - result = ws.findAllByCriteria(null, criteria); - - topics = result.getTopic("1"); - FacetTopic topic = topics.get(0); - String topicName = topic.getTopicName(); - int topicCount = topic.getCount(); - assertEquals("1", topicName); - assertEquals(4, topicCount); - - topics = result.getTopic("2"); - topic = topics.get(0); - topicName = topic.getTopicName(); - topicCount = topic.getCount(); - assertEquals("2", topicName); - assertEquals(1, topicCount); - } - - /** - * WARNING: as the only solr index is clear, all data in all test is reindexed. - */ - @Test - public void testSyncSearchEngine() { - Criteria criteria = new Criteria(); - criteria.setRestriction(RestrictionHelper.rTrue()); - criteria.setFirstIndex(0); - criteria.setEndIndex(0); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - assertEquals(13, result.getNumFound()); - - ws.syncSearchEngine(null); - - result = ws.findAllByCriteria(null, criteria); - assertTrue(13 <= result.getNumFound()); - } - - @Test - public void testNullSearch() { - Criteria criteria = Search.query().isNotNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); - List<String> result = pagedResult.getAll(); - assertEquals(2, result.size()); - - criteria = Search.query().isNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - result = pagedResult.getAll(); - assertEquals(3, result.size()); - } - - @Test - public void testLikeSearch() throws Exception { - Criteria criteria = Search.query().like("Category.name", "hArDwArE", Like.SearchAs.ToLowerCase).criteria(); - PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); - List<String> result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().like("Category.name", "*wAre", Like.SearchAs.ToLowerCase).criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().like("Category.name", "Har*", Like.SearchAs.ToLowerCase).criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - result = pagedResult.getAll(); - assertEquals(1, result.size()); - - criteria = Search.query().like("Test.description", "help", Like.SearchAs.AsText).criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - assertEquals(1, pagedResult.getNumFound()); - - criteria = Search.query().like("Test.description", "helped", Like.SearchAs.AsText).criteria(); - pagedResult = ws.findAllByCriteria(null, criteria); - assertEquals(1, pagedResult.getNumFound()); - } - - @Test - public void testLikeStrict() throws Exception { - - Criteria criteria = Search.query() - .like("Product.name_s", "paint red", SearchAs.ToLowerCase) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<String> list = result.getAll(); - assertEquals(1, list.size()); - - Wikitty w = ws.restore(null, list.get(0)); - assertEquals("Paint red", w.getFieldAsString("Product", "name")); - - criteria = Search.query() - .like("Product.name_s", "paint", SearchAs.ToLowerCase) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - result = ws.findAllByCriteria(null, criteria); - list = result.getAll(); - assertEquals(0, list.size()); - } - - /** test that doing a search with a date criteria is possible */ - @Test - public void testSearchByDate() throws Exception { - Calendar cal = Calendar.getInstance(); - cal.set(Calendar.DAY_OF_MONTH, 20); - cal.set(Calendar.MONTH, 9); - cal.set(Calendar.YEAR, 2009); - - // this must return a date in a format understandable for solr - // pattern in WikittyUtil has to be compatible - String dateString = WikittyUtil.formatDate(cal.getTime()); - - Criteria criteria = Search.query() - .gt("Test.buildDate", dateString) - .criteria() - .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); - - // If an exception is thrown, check that the pattern in WikittyUtil - // is compatible with solr, in particular that the trailing Z - // is present and respect http://wiki.apache.org/solr/IndexingDates - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - - - List<String> list = result.getAll(); - assertEquals(1, list.size()); - } - - @Test - public void testDateSearch() throws Exception { - Criteria criteria = Search.query() - .bw("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009"), Criteria.ALL_VALUES) - .criteria(); - PagedResult<String> result = ws.findAllByCriteria(null, criteria); - List<String> list = result.getAll(); - assertEquals(2, list.size()); - - criteria = Search.query() - .ge("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009")) - .criteria(); - result = ws.findAllByCriteria(null, criteria); - list = result.getAll(); - assertEquals(2, list.size()); - } -} Deleted: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,235 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.solr.test; - -import static junit.framework.Assert.assertNotNull; -import static junit.framework.Assert.assertNull; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.apache.solr.client.solrj.SolrQuery; -import org.apache.solr.client.solrj.SolrServer; -import org.apache.solr.client.solrj.SolrServerException; -import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; -import org.apache.solr.client.solrj.response.QueryResponse; -import org.apache.solr.common.SolrDocument; -import org.apache.solr.common.SolrDocumentList; -import org.apache.solr.common.SolrInputDocument; -import org.apache.solr.core.CoreContainer; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - -/** - * Test behaviour SolrServer embedded. - * - * @author ruchaud - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class SolrServerTest { - - /** to use log facility, just put in your code: log.info(\"...\"); */ - private static final Log log = LogFactory.getLog(SolrServerTest.class); - - public SolrServer newSolrServer() throws Exception { - CoreContainer.Initializer initializer = new CoreContainer.Initializer(); - CoreContainer coreContainer = initializer.initialize(); - SolrServer solrServer = new EmbeddedSolrServer(coreContainer, ""); - return solrServer; - } - - public void addDocument(SolrServer solrServer, String id, String value) throws Exception { - SolrInputDocument document = new SolrInputDocument(); - document.setField("id", id); - document.setField("value", value); - solrServer.add(document); - } - - /** - * Find solr document by id - */ - protected SolrDocument findById(SolrServer solrServer, String id) throws Exception { - SolrQuery query = new SolrQuery("id:" + id); - QueryResponse response = solrServer.query(query); - - SolrDocumentList results = response.getResults(); - long numFound = results.getNumFound(); - if(numFound == 1) { - return results.get(0); - } - return null; - } - - public static class ThreadAddDocument extends Thread { - protected SolrServer solrServer; - protected String identifier; - protected boolean commit; - - public ThreadAddDocument(SolrServer solrServer, String identifier, boolean commit) { - this.solrServer = solrServer; - this.identifier = identifier; - this.commit = commit; - } - - @Override - public void run() { - try { - for (Integer index = 0; index < 10; index++) { - SolrInputDocument document = new SolrInputDocument(); - document.setField("id", identifier); - document.setField("value", index.toString()); - solrServer.add(document); - if(commit) { - solrServer.commit(); - } else { - solrServer.rollback(); - } - } - } catch (Exception eee) { - throw new RuntimeException(eee); - } - } - } - - @Before - public void clearIndex() throws Exception { - SolrServer solrServer = newSolrServer(); - solrServer.deleteByQuery("*:*"); - solrServer.commit(); - } - - @Test(expected=SolrServerException.class) - public void testLockObtainFailed() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - addDocument(solrServer1, "1", "1"); - addDocument(solrServer2, "2", "2"); - } - - /* - * FIXME le 21/02/2010 par sch - * Le test est mauvais par nature (je crois), car: - * - thread1 et thread2 ajoutent simultanement des documents - * - thread1 et thread2 commit ou rollback simultanement - * Il est impossible de savoir s'il y aura zero, un, ou deux documents à la fin. - * De plus ce test est la seule cause des erreurs de build de ces derniers temps. - * Et il y a un commentaire laissant planer le doute un peu plus bas. - */ - @Ignore - @Test - public void test2Threads1SolrServer() throws Exception { - SolrServer solrServer = newSolrServer(); - - ThreadAddDocument thread1 = new ThreadAddDocument(solrServer, "1", true); - ThreadAddDocument thread2 = new ThreadAddDocument(solrServer, "2", false); - - thread1.start(); - thread2.start(); - - Thread.sleep(3000); - - SolrDocument result = findById(solrServer, "1"); - assertNotNull(result); - - // Normaly the value is null, if SolrServer is thread safe - result = findById(solrServer, "2"); - assertNotNull(result); - } - - @Test - public void test2Threads1Writer2SolrServers() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); - ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", false); - - thread1.start(); - thread2.start(); - - Thread.sleep(3000); - - SolrDocument result = findById(solrServer1, "1"); - assertNotNull(result); - - result = findById(solrServer2, "2"); - assertNull(result); - - SolrServer solrServer3 = newSolrServer(); - result = findById(solrServer3, "1"); - assertNotNull(result); - result = findById(solrServer3, "2"); - assertNull(result); - } - - //FIXME poussin 2010 07 21 : regarder pourquoi meêm si on attend les threads, ils sont mal synchronises - @Ignore - @Test - public void test2Threads2Writers2SolrServers() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); - ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", true); - - thread1.start(); - thread2.start(); - -// Thread.sleep(3000); - thread1.join(); - thread2.join(); - - SolrDocument result = findById(solrServer1, "1"); - assertNotNull(result); - - result = findById(solrServer2, "2"); - assertNotNull(result); - - SolrServer solrServer3 = newSolrServer(); - result = findById(solrServer3, "1"); - assertNotNull(result); - result = findById(solrServer3, "2"); - assertNotNull(result); - } - - @Ignore // FIXME 20100806 bleny randomly fail - @Test - public void testReader() throws Exception { - SolrServer solrServer1 = newSolrServer(); - SolrServer solrServer2 = newSolrServer(); - - addDocument(solrServer1, "1", "1"); - solrServer1.commit(); - - SolrDocument result = findById(solrServer2, "1"); - assertNull(result); - } - -} Deleted: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,493 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.solr.test; - -import static junit.framework.Assert.assertEquals; -import static junit.framework.Assert.assertNotNull; - -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.Map.Entry; -import java.util.Set; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.junit.Before; -import org.junit.Test; -import org.nuiton.wikitty.search.Criteria; -import org.nuiton.wikitty.entities.ExtensionFactory; -import org.nuiton.wikitty.entities.FieldType.TYPE; -import org.nuiton.wikitty.WikittyTree; -import org.nuiton.wikitty.entities.WikittyTreeNode; -import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; -import org.nuiton.wikitty.entities.Wikitty; -import org.nuiton.wikitty.entities.WikittyExtension; -import org.nuiton.wikitty.entities.WikittyImpl; -import org.nuiton.wikitty.services.WikittyEvent; -import org.nuiton.wikitty.conform.StorageTest; -import org.nuiton.wikitty.search.Search; - -/** - * - * @author ruchaud, martel - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class TreeTest extends AbstractTestSolr { - - static private Log log = LogFactory.getLog(TreeTest.class); - - protected WikittyExtension extension; - - @Before - public void onSetUp() throws Exception { - createBasicWikitty(); - createTestData(); - } - - /** - * Create a extension, use to store element in tree - */ - private void createBasicWikitty() { - extension = ExtensionFactory.create("test", "1") - .addField("name", TYPE.STRING) - .extension(); - ws.storeExtension(null, Arrays.asList(extension)); - } - - /** - * Init data with a basic tree - */ - private void createTestData() { - // Create tree as following : - // root - // |_ node 1 - // | |_ node 11 (2) - // | | |_ node 111 (1) - // | |_ node 12 - // | | |_ node 121 (2) - // | |_ node 13 - // |_ node 2 (1) - - createBranch("root/node1/node11/node111"); - createBranch("root/node1/node12/node121"); - createBranch("root/node1/node13"); - createBranch("root/node2"); - - addNode("node11", "value 1"); - addNode("node11", "value 2"); - - addNode("node111", "value 3"); - - addNode("node121", "value 4"); - addNode("node121", "value 5"); - - addNode("node2", "value 6"); - } - - /** - * Create all node contains in path - */ - protected void createBranch(String path) { - String parent = null; - String[] names = path.split("/"); - for (String name : names) { - - Wikitty found = findNode(name); - if(found == null) { - found = createNode(name, parent); - log.debug("[Storing] " + name + " with id " + found.getId()); - ws.store(null, found); - assertNotNull(findNode(name)); - } - parent = found.getId(); - } - } - - /** - * Attach value in node - */ - protected void addNode(String nodeName, String value) { - Wikitty leaf = new WikittyImpl(); - leaf.addExtension(extension); - leaf.setField("test", "name", value); - - log.debug("[Storing] " + value + " with id " + leaf.getId()); - ws.store(null, leaf); - - Wikitty node = findNode(nodeName); - assertNotNull(node); - node.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leaf.getId()); - ws.store(null, node); - } - - /** - * Find node by name - */ - protected Wikitty findNode(String nodeName) { - Criteria criteria = Search.query().eq(WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, nodeName).criteria(); - Wikitty wikitty = ws.findByCriteria(null, criteria); - return wikitty; - } - - /** - * Find value by name - */ - protected Wikitty findValue(String value) { - Criteria criteria = Search.query().eq("test.name", value).criteria(); - Wikitty wikitty = ws.findByCriteria(null, criteria); - return wikitty; - } - - /** - * Count all element in sub tree, with element in node - */ - protected int sum(Wikitty node) { - int sum = 0; - - // Sum value in node - Set<String> values = node.getFieldAsSet(WikittyTreeNode.EXT_WIKITTYTREENODE, - WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); - if(values != null) { - sum = values.size(); - } - - // Sum children node in node - String nodeId = node.getId(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); - - /* - for (Integer count : children.values()) { - sum += count; - } - */ - - for (Map.Entry<WikittyTreeNode, Integer> e : children.entrySet()) { - log.debug("*treeNode = " + e.getKey().getName() + " " + e.getValue() + - " -> " + e.getKey().getAttachment()); - } - - for (WikittyTreeNode treeNode : children.keySet()) { - Set<String> treeNodeChildren = treeNode.getAttachment(); - log.debug("+treeNode = " + treeNode.getName() + " " + (treeNodeChildren==null?0:treeNodeChildren.size()) + - " -> " + treeNodeChildren); -// if (treeNodeChildren == null) { -// sum += 0; -// } else { -// sum += treeNodeChildren.size(); -// } - sum += sum(((WikittyTreeNodeImpl)treeNode).getWikitty()); - } - - return sum; - } - - /** - * Create a Wikitty WikittyTreeNode - * - * @param name - * name of the node - * @param parentId - * id of the parent - * @return - * the wikitty object corresponding to the WikittyTreeNode - */ - protected Wikitty createNode(String name, String parentId) { - WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(); - node.setName(name); - node.setParent(parentId); - Wikitty nodeWikitty = node.getWikitty(); - return nodeWikitty; - } - - @Test - public void testRestoreTree() throws Exception { - Wikitty root = findNode("root"); - String rootId = root.getId(); - - WikittyTree tree = ws.restoreTree(null, rootId); - assertNotNull(tree); - } - - @Test - public void testHiearchicalFacet() throws Exception { - Wikitty root = findNode("root"); - int sum = sum(root); - assertEquals(6, sum); - - Wikitty node1 = findNode("node1"); - sum = sum(node1); - assertEquals(5, sum); - - Wikitty node11 = findNode("node11"); - sum = sum(node11); - assertEquals(3, sum); - } - - @Test - public void testRestoreChildren() throws Exception { - Wikitty node1 = findNode("node1"); - String node1Id = node1.getId(); - - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); - assertEquals(3, children.size()); - } - - @Test - public void testFilterRestoreChildren() { - Wikitty node1 = findNode("node1"); - String node1Id = node1.getId(); - - Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); - assertEquals(3, children.size()); - } - - @Test - public void testRestoreNode() throws Exception { - Wikitty node11 = findNode("node11"); - String node11Id = node11.getId(); - - Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, null); - assertEquals(3, count.getValue().intValue()); - } - - @Test - public void testFilterRestoreNode() throws Exception { - Wikitty node11 = findNode("node11"); - String node11Id = node11.getId(); - - Criteria filter = Search.query().eq("test.name", "value 3").criteria(); - Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); - assertEquals(1, count.getValue().intValue()); - } - - @Test - public void testNewNode() throws Exception { - // Check that node 2 it has any child - Wikitty node2 = findNode("node2"); - String node2Id = node2.getId(); - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); - assertEquals(0, children.size()); - - // Create a new node, child of node 2 - Wikitty nodeWikitty = createNode("node21", node2Id); - ws.store(null, nodeWikitty); - - // Retrieve it to check - Wikitty found = findNode("node21"); - assertNotNull(found); - - // Check that it was great added as node2 child - children = ws.restoreChildren(null, node2Id, null); - assertEquals(1, children.size()); - } - - @Test - public void testAddValueInNode() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int childInit = sum(root); - - // Create a leaf - Wikitty leaf = StorageTest.createWikitty("name=totoTheLeaf", "test", extension); - ws.store(null, leaf); - - // Add it in the node2 (now: two values in it) - Wikitty node = findNode("node2"); - assertNotNull(node); - node.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leaf.getId()); - ws.store(null, node); - - // now, there is one more value for the root node - int newSum = sum(root); - assertEquals(childInit + 1, newSum); - } - - @Test - public void testDeleteNode() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int rootChildInit = sum(root); - - // Remove the node 121 - Wikitty node121 = findNode("node121"); - int node121Init = sum(node121); - String node121Id = node121.getId(); - ws.delete(null, node121Id); - - // node12 must have any child - Wikitty node12 = findNode("node12"); - int sum = sum(node12); - assertEquals(0, sum); - - // check that root node has weel one less children value - int newRootChidlren = sum(root); - assertEquals(rootChildInit - node121Init, newRootChidlren); - - // Remove the node 1 and node 11 simultaneously - Wikitty node1 = findNode("node1"); - int node1Init = sum(node1); - String node1Id = node1.getId(); - - Wikitty node11 = findNode("node11"); - String node11Id = node11.getId(); - ws.delete(null, Arrays.asList(node1Id, node11Id)); - - // check that root node has weel one less children value - newRootChidlren = sum(root); - assertEquals(rootChildInit - node121Init - node1Init, newRootChidlren); - } - - @Test - public void testDeleteChild() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int childInit = sum(root); - - // Remove a value on node11 - Wikitty node = findNode("node11"); - - List<String> leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); - node.removeFromField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leafs.get(0)); - - leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); - log.info("leafs after remove = " + leafs); - - ws.store(null, node); - - node = ws.restore(null, node.getId()); - leafs = node.getFieldAsList(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, String.class); - log.info("leafs after restore = " + leafs); - - // now, there is one more value for the root node - int newSum = sum(root); - assertEquals(childInit - 1, newSum); - } - - /** regression test, for unknown reason the child may not be removed in the index */ - @Test - public void testSimpleDeleteChild() throws Exception { - - WikittyTreeNodeImpl parent = new WikittyTreeNodeImpl(); - ws.store(null, parent.getWikitty()); - - WikittyTreeNodeImpl child = new WikittyTreeNodeImpl(); - child.setParent(parent.getWikittyId()); - WikittyEvent event = ws.store(null, child.getWikitty()); - event.update(child.getWikitty()); - - Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, parent.getWikittyId(), null); - - assertEquals(1, children.size()); - assertEquals(0, children.get(child).intValue()); - - child.setParent(null); - - ws.store(null, child.getWikitty()); - - children = ws.restoreChildren(null, parent.getWikittyId(), null); - - assertEquals(0, children.size()); - } - - @Test - public void testDeleteValue() throws Exception { - // Get the initial number of values for Root node - Wikitty root = findNode("root"); - int childInit = sum(root); - - // Remove a value - Wikitty value4 = findValue("value 4"); - String value4Id = value4.getId(); - ws.delete(null, value4Id); - - // now, there is one more value for the root node - int newSum = sum(root); - assertEquals(childInit - 1, newSum); - } - - @Test - public void testMoveNode() throws Exception { - // Get the initial number of values for node 1 - Wikitty node1 = findNode("node1"); - int childSum1 = sum(node1); - - // Get the initial number of values for node 121 - Wikitty node121 = findNode("node121"); - int childSum121 = sum(node121); - - // Get the initial number of values for node 2 - Wikitty node2 = findNode("node2"); - int childSum2 = sum(node2); - - // Move node 1 in mode 2 - node121.setField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_PARENT, node2); - ws.store(null, node121); - - // now, there is less value node 121 for the node 1 - int newSum1 = sum(node1); - assertEquals(childSum1 - childSum121, newSum1); - - // now, there is more value node 121 for the node 2 - int newSum2 = sum(node2); - assertEquals(childSum2 + childSum121, newSum2); - } - - @Test - public void testValueInMultipleNode() throws Exception { - createBranch("node3/node31"); - createBranch("node3/node32"); - - Wikitty value = StorageTest.createWikitty("name=value", "test", extension); - ws.store(null, value); - String valueId = value.getId(); - - Wikitty node31 = findNode("node31"); - node31.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, valueId); - ws.store(null, node31); - - Wikitty node32 = findNode("node32"); - node32.addToField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, valueId); - ws.store(null, node32); - - Wikitty node3 = findNode("node3"); - int sum = sum(node3); - assertEquals(2, sum); - - Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); - assertEquals(1, count.getValue().intValue()); - - sum = sum(node31); - assertEquals(1, sum); - - sum = sum(node32); - assertEquals(1, sum); - } -} Deleted: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java 2010-12-17 15:14:14 UTC (rev 618) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -1,49 +0,0 @@ -/* - * #%L - * Wikitty :: wikitty-solr-impl - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. - * #L% - */ - -package org.nuiton.wikitty.solr.test; - -import org.nuiton.util.ApplicationConfig; -import org.nuiton.wikitty.services.WikittyServiceStorage; -import org.nuiton.wikitty.solr.WikittySearchEngineSolr; -import org.nuiton.wikitty.storage.WikittyExtensionStorageInMemory; -import org.nuiton.wikitty.storage.WikittyStorageInMemory; - -/** - * - * @author ruchaud, martel - * @version $Revision$ - * - * Last update: $Date$ - * by : $Author$ - */ -public class WikittyServiceSolr extends WikittyServiceStorage { - - public WikittyServiceSolr(ApplicationConfig config) { - extensionStorage = new WikittyExtensionStorageInMemory(); - wikittyStorage = new WikittyStorageInMemory(); - searchEngine = new WikittySearchEngineSolr(config, extensionStorage); - } -} Copied: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java (from rev 593, trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/AbstractTestSolr.java) =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java (rev 0) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/AbstractTestSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,41 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty.storage.solr; + +import org.junit.Before; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.services.WikittyServiceEnhanced; + +public abstract class AbstractTestSolr { + + protected WikittyServiceEnhanced ws = + new WikittyServiceEnhanced(new WikittyServiceSolr(new WikittyConfig())); + + @Before + public void deleteAll() throws Exception { + ws.clear(null); + } + +} Copied: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java (from rev 593, trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrSearchTest.java) =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java (rev 0) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrSearchTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,507 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ +package org.nuiton.wikitty.storage.solr; + +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertTrue; + +import java.util.ArrayList; +import java.util.Calendar; +import java.util.List; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.FacetTopic; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; +import org.nuiton.wikitty.WikittyUtil; +import org.nuiton.wikitty.conform.AbstractTestConformance; +import org.nuiton.wikitty.conform.StorageTest; +import org.nuiton.wikitty.search.operators.Element; +import org.nuiton.wikitty.search.operators.Like; +import org.nuiton.wikitty.search.operators.Like.SearchAs; +import org.nuiton.wikitty.search.RestrictionHelper; +import org.nuiton.wikitty.search.Search; + +public class SolrSearchTest extends AbstractTestSolr { + + private static final Log log = LogFactory.getLog(SolrSearchTest.class); + + protected WikittyExtension extCategory; + protected WikittyExtension extProduct; + protected WikittyExtension extTest; + + @Before + public void createTestData() throws Exception { + extCategory = new WikittyExtension("Category", "1", null, + WikittyUtil.buildFieldMapExtension( + "String name") + ); + + Wikitty[] wikitties = createWikitties(extCategory, new String[] { + "name = Library", + "name = Stuff", + "name = Hardware", + "name = Staff", + "name = FooBar" + }); + + String hardwareCategoryId = wikitties[2].getId(); + String staffCategoryId = wikitties[3].getId(); + + extProduct = new WikittyExtension("Product", "1", null, + WikittyUtil.buildFieldMapExtension( + "String name", + "Numeric price", + "String value", + "String optional", + "Wikitty category") + ); + + createWikitties(extProduct, new String[] { + "name = Paint blue," + + "price = 20," + + "value = 1," + + "category = " + hardwareCategoryId, + + "name = Other Paint blue," + + "price = 20," + + "value = 1," + + "optional = test," + + "category = " + hardwareCategoryId, + + "name = Paint red," + + "price = 35," + + "value = 1," + + "optional = test," + + "category = " + hardwareCategoryId, + + "name = Paint Staff blue," + + "price = 20," + + "value = 2," + + "category = " + staffCategoryId, + + "name = Paint green," + + "price = 18," + + "value = 1," + + "category = " + hardwareCategoryId, + }); + + extTest = new WikittyExtension("Test", "1", null, + WikittyUtil.buildFieldMapExtension( + "String name", + "String description", + "Numeric amount", + "Date buildDate", + "Boolean enabled") + ); + + createWikitties(extTest, new String[] { + "name = table," + + "amount = 003300," + + "buildDate = " + AbstractTestConformance.format("23/01/1982") + "," + + "enabled = false", + + "name = chaise," + + "amount = 113311," + + "buildDate = " + AbstractTestConformance.format("26/09/2009") + "," + + "enabled = false", + + + "name = bureau," + + "description=One use for WordDelimiterFilter is to helped match words with different delimiters.," + + "amount = 223322," + + "buildDate = " + AbstractTestConformance.format("25/12/2029") + "," + + "enabled = true" + }); + } + + private Wikitty[] createWikitties(WikittyExtension lonelyExtension, String[] wValues) { + ArrayList<Wikitty> result = new ArrayList<Wikitty>(); + for ( String wValue : wValues ) { + Wikitty w = StorageTest.createWikitty( wValue, lonelyExtension.getName(), lonelyExtension ); + result.add( w ); + } + ws.store(null, result); + return result.toArray( new Wikitty[]{} ); + } + + @Test + public void testBasicSearch() throws Exception { + Criteria criteria = Search.query() + .eq("Test.name_s", "chaise") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(1, list.size()); + + Wikitty w = ws.restore(null, list.get(0)); + assertEquals("chaise", w.getFieldAsString("Test", "name")); + assertEquals(113311, w.getFieldAsInt("Test", "amount")); + assertEquals(AbstractTestConformance.parse("26/09/2009"), + w.getFieldAsDate("Test", "buildDate")); + } + + @Test + public void testAdvancedSearch() throws Exception { + Criteria criteria = Search.query() + .eq("Product.value", "1") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(4, list.size()); + + criteria = Search.query() + .eq("Product.value", "1") + .bw("Product.price", "15", "25") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + result = ws.findAllByCriteria(null, criteria); + list = result.getAll(); + assertEquals(3, list.size()); + } + + @Test + public void testAssociativeSearch() throws Exception { + Criteria criteria = Search.query() + .bw("Product.price", "15", "25") + .sw("Product.name", "Paint") + .associated( "Product.category") + .eq("Category.name", "Hardware") + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals( 2, list.size() ); + } + + @Test + public void testKeywordSearch() throws Exception { + Criteria criteria = Search.query().keyword("bureau").criteria(); + PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); + List<String> result = pagedResult.getAll(); + assertEquals(1, result.size()); + + criteria = Search.query().keyword("nothing").criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(0, result.size()); + + // il faut etre un peu restrictif sur la chaine recherchee + // sinon on peut trouve la chaine dans un id et donc fausser le test :( + // donc remplacement de la chaine *33* par *ai* + // *ai* matches 'paint' et 'chaise' + criteria = Search.query().keyword("*ai*").criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(6, result.size()); + + criteria = Search.query() + .keyword("*33*") + .eq("Test.name", "bureau") + .criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(1, result.size()); + } + + @Test + public void testFacetOnExtension() throws Exception { + Criteria criteria = Search.query().keyword("*").criteria(); + criteria.addFacetField(Element.ELT_EXTENSION); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + assertEquals(13, result.getAll().size()); + + List<FacetTopic> topics = result.getTopic(Element.ELT_EXTENSION); + for (FacetTopic topic : topics) { + String topicName = topic.getTopicName(); + int topicCount = topic.getCount(); + + if(topicName.equals("Category")) { + assertEquals(5, topicCount); + } else if(topicName.equals("Product")) { + assertEquals(5, topicCount); + } else if(topicName.equals("Test")) { + assertEquals(3, topicCount); + } + } + } + + @Test + public void testSearchOnBoolean() throws Exception { + Criteria criteria = Search.query() + .eq("Test.enabled", "true") + .criteria(); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + assertEquals(1, result.getNumFound()); + + criteria = Search.query() + .eq("Test.enabled", "false") + .criteria(); + + result = ws.findAllByCriteria(null, criteria); + assertEquals(2, result.getNumFound()); + } + + @Test + public void testSearchWithNot() throws Exception { + Search query = Search.query(); + query.not().eq("Test.name", "bureau"); + Criteria criteria = query.criteria(); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + assertEquals(12, result.getNumFound()); + + query = Search.query().eq("Test.amount", "003300"); + query.not().eq("Test.name", "bureau"); + criteria = query.criteria(); + + result = ws.findAllByCriteria(null, criteria); + assertEquals(1, result.getNumFound()); + } + + @Test + public void testSearchNonSensitive() throws Exception { + + Criteria criteria = Search.query() + .like("Test.name_s", "cHaIsE", SearchAs.ToLowerCase) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(1, list.size()); + + Wikitty w = ws.restore(null, list.get(0)); + assertEquals("chaise", w.getFieldAsString("Test", "name")); + assertEquals(113311, w.getFieldAsInt("Test", "amount")); + assertEquals(AbstractTestConformance.parse("26/09/2009"), w.getFieldAsDate("Test", "buildDate")); + + criteria = Search.query() + .unlike("Test.name_s", "cHaIsE", SearchAs.ToLowerCase) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + result = ws.findAllByCriteria(null, criteria); + list = result.getAll(); + assertEquals(12, list.size()); + } + + @Test + public void testFindAllByExample() throws Exception { + Wikitty example = new WikittyImpl(); + example.addExtension(extProduct); + example.setField("Product", "price", 20); + + Criteria criteria = Search.query(example).criteria(); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + + assertEquals(3, result.getNumFound()); + } + + @Test + public void testFacet() throws Exception { + Criteria criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); + criteria.addFacetField("Product.value"); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<FacetTopic> topics = result.getTopic("Product.value"); + for (FacetTopic topic : topics) { + String topicName = topic.getTopicName(); + int topicCount = topic.getCount(); + if("1".equals(topicName)) { + assertEquals(4, topicCount); + } else { + assertEquals(1, topicCount); + } + } + + criteria = Search.query().eq(Element.ELT_EXTENSION, "Product").criteria(); + Criteria facet1 = Search.query().eq("Product.value", "1").criteria("1"); + criteria.addFacetCriteria(facet1); + Criteria facet2 = Search.query().eq("Product.value", "2").criteria("2"); + criteria.addFacetCriteria(facet2); + + result = ws.findAllByCriteria(null, criteria); + + topics = result.getTopic("1"); + FacetTopic topic = topics.get(0); + String topicName = topic.getTopicName(); + int topicCount = topic.getCount(); + assertEquals("1", topicName); + assertEquals(4, topicCount); + + topics = result.getTopic("2"); + topic = topics.get(0); + topicName = topic.getTopicName(); + topicCount = topic.getCount(); + assertEquals("2", topicName); + assertEquals(1, topicCount); + } + + /** + * WARNING: as the only solr index is clear, all data in all test is reindexed. + */ + @Test + public void testSyncSearchEngine() { + Criteria criteria = new Criteria(); + criteria.setRestriction(RestrictionHelper.rTrue()); + criteria.setFirstIndex(0); + criteria.setEndIndex(0); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + assertEquals(13, result.getNumFound()); + + ws.syncSearchEngine(null); + + result = ws.findAllByCriteria(null, criteria); + assertTrue(13 <= result.getNumFound()); + } + + @Test + public void testNullSearch() { + Criteria criteria = Search.query().isNotNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); + PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); + List<String> result = pagedResult.getAll(); + assertEquals(2, result.size()); + + criteria = Search.query().isNull("Product.optional").eq(Element.ELT_EXTENSION, "Product").criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(3, result.size()); + } + + // on ignore ce test car le like toLowercase devrait disparaitre et pour l'instant il ne marche pas :( + @Ignore + @Test + public void testLikeSearch() throws Exception { + Criteria criteria = Search.query().like("Category.name", "hArDwArE", Like.SearchAs.ToLowerCase).criteria(); + PagedResult<String> pagedResult = ws.findAllByCriteria(null, criteria); + List<String> result = pagedResult.getAll(); + assertEquals(1, result.size()); + + criteria = Search.query().like("Category.name", "*wAre", Like.SearchAs.ToLowerCase).criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(1, result.size()); + + criteria = Search.query().like("Category.name", "Har*", Like.SearchAs.ToLowerCase).criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + result = pagedResult.getAll(); + assertEquals(1, result.size()); + + criteria = Search.query().like("Test.description", "help", Like.SearchAs.AsText).criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + assertEquals(1, pagedResult.getNumFound()); + + criteria = Search.query().like("Test.description", "helped", Like.SearchAs.AsText).criteria(); + pagedResult = ws.findAllByCriteria(null, criteria); + assertEquals(1, pagedResult.getNumFound()); + } + + // on ignore ce test car le like toLowercase devrait disparaitre et pour l'instant il ne marche pas :( + @Ignore + @Test + public void testLikeStrict() throws Exception { + + Criteria criteria = Search.query() + .like("Product.name_s", "paint red", SearchAs.ToLowerCase) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(1, list.size()); + + Wikitty w = ws.restore(null, list.get(0)); + assertEquals("Paint red", w.getFieldAsString("Product", "name")); + + criteria = Search.query() + .like("Product.name_s", "paint", SearchAs.ToLowerCase) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + result = ws.findAllByCriteria(null, criteria); + list = result.getAll(); + assertEquals(0, list.size()); + } + + /** test that doing a search with a date criteria is possible */ + @Test + public void testSearchByDate() throws Exception { + Calendar cal = Calendar.getInstance(); + cal.set(Calendar.DAY_OF_MONTH, 20); + cal.set(Calendar.MONTH, 9); + cal.set(Calendar.YEAR, 2009); + + // this must return a date in a format understandable for solr + // pattern in WikittyUtil has to be compatible + String dateString = WikittyUtil.formatDate(cal.getTime()); + + Criteria criteria = Search.query() + .gt("Test.buildDate", dateString) + .criteria() + .setFirstIndex(0).setEndIndex(Criteria.ALL_ELEMENTS); + + // If an exception is thrown, check that the pattern in WikittyUtil + // is compatible with solr, in particular that the trailing Z + // is present and respect http://wiki.apache.org/solr/IndexingDates + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + + + List<String> list = result.getAll(); + assertEquals(1, list.size()); + } + + @Test + public void testDateSearch() throws Exception { + Criteria criteria = Search.query() + .bw("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009"), Criteria.ALL_VALUES) + .criteria(); + PagedResult<String> result = ws.findAllByCriteria(null, criteria); + List<String> list = result.getAll(); + assertEquals(2, list.size()); + + criteria = Search.query() + .ge("Test.buildDate_dt", AbstractTestConformance.format("26/09/2009")) + .criteria(); + result = ws.findAllByCriteria(null, criteria); + list = result.getAll(); + assertEquals(2, list.size()); + } +} Copied: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java (from rev 593, trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/SolrServerTest.java) =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java (rev 0) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/SolrServerTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,223 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.solr; + +import static junit.framework.Assert.assertNotNull; +import static junit.framework.Assert.assertNull; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.apache.solr.client.solrj.SolrQuery; +import org.apache.solr.client.solrj.SolrServer; +import org.apache.solr.client.solrj.SolrServerException; +import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer; +import org.apache.solr.client.solrj.response.QueryResponse; +import org.apache.solr.common.SolrDocument; +import org.apache.solr.common.SolrDocumentList; +import org.apache.solr.common.SolrInputDocument; +import org.apache.solr.core.CoreContainer; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.nuiton.wikitty.storage.solr.SolrUtil; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; +import org.nuiton.wikitty.storage.solr.WikittySolrConstant; + +/** + * Test behaviour SolrServer embedded. + * + * @author ruchaud + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class SolrServerTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + private static final Log log = LogFactory.getLog(SolrServerTest.class); + + public SolrServer newSolrServer() throws Exception { + CoreContainer.Initializer initializer = new CoreContainer.Initializer(); + CoreContainer coreContainer = initializer.initialize(); + SolrServer solrServer = new EmbeddedSolrServer(coreContainer, ""); + return solrServer; + } + + public void addDocument(SolrServer solrServer, String id, String value) throws Exception { + SolrInputDocument document = new SolrInputDocument(); + document.setField(WikittySolrConstant.SOLR_ID, id); + document.setField(WikittySolrConstant.SOLR_EXTENSIONS, value); + solrServer.add(document); + } + + public static class ThreadAddDocument extends Thread { + protected SolrServer solrServer; + protected String identifier; + protected boolean commit; + + public ThreadAddDocument(SolrServer solrServer, String identifier, boolean commit) { + this.solrServer = solrServer; + this.identifier = identifier; + this.commit = commit; + } + + @Override + public void run() { + try { + for (Integer index = 0; index < 10; index++) { + SolrInputDocument document = new SolrInputDocument(); + document.setField(WikittySolrConstant.SOLR_ID, identifier); + document.setField(WikittySolrConstant.SOLR_EXTENSIONS, index.toString()); + solrServer.add(document); + if(commit) { + solrServer.commit(); + } else { + solrServer.rollback(); + } + } + } catch (Exception eee) { + throw new RuntimeException(eee); + } + } + } + + @Before + public void clearIndex() throws Exception { + SolrServer solrServer = newSolrServer(); + solrServer.deleteByQuery("*:*"); + solrServer.commit(); + } + + @Test(expected=SolrServerException.class) + public void testLockObtainFailed() throws Exception { + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); + + addDocument(solrServer1, "1", "1"); + addDocument(solrServer2, "2", "2"); + } + + /* + * FIXME le 21/02/2010 par sch + * Le test est mauvais par nature (je crois), car: + * - thread1 et thread2 ajoutent simultanement des documents + * - thread1 et thread2 commit ou rollback simultanement + * Il est impossible de savoir s'il y aura zero, un, ou deux documents à la fin. + * De plus ce test est la seule cause des erreurs de build de ces derniers temps. + * Et il y a un commentaire laissant planer le doute un peu plus bas. + */ + @Ignore + @Test + public void test2Threads1SolrServer() throws Exception { + SolrServer solrServer = newSolrServer(); + + ThreadAddDocument thread1 = new ThreadAddDocument(solrServer, "1", true); + ThreadAddDocument thread2 = new ThreadAddDocument(solrServer, "2", false); + + thread1.start(); + thread2.start(); + + Thread.sleep(3000); + + SolrDocument result = SolrUtil.findById(solrServer, "1"); + assertNotNull(result); + + // Normaly the value is null, if SolrServer is thread safe + result = SolrUtil.findById(solrServer, "2"); + assertNotNull(result); + } + + @Test + public void test2Threads1Writer2SolrServers() throws Exception { + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); + + ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); + ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", false); + + thread1.start(); + thread2.start(); + + Thread.sleep(3000); + + SolrDocument result = SolrUtil.findById(solrServer1, "1"); + assertNotNull(result); + + result = SolrUtil.findById(solrServer2, "2"); + assertNull(result); + + SolrServer solrServer3 = newSolrServer(); + result = SolrUtil.findById(solrServer3, "1"); + assertNotNull(result); + result = SolrUtil.findById(solrServer3, "2"); + assertNull(result); + } + + //FIXME poussin 2010 07 21 : regarder pourquoi meêm si on attend les threads, ils sont mal synchronises + @Ignore + @Test + public void test2Threads2Writers2SolrServers() throws Exception { + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); + + ThreadAddDocument thread1 = new ThreadAddDocument(solrServer1, "1", true); + ThreadAddDocument thread2 = new ThreadAddDocument(solrServer2, "2", true); + + thread1.start(); + thread2.start(); + +// Thread.sleep(3000); + thread1.join(); + thread2.join(); + + SolrDocument result = SolrUtil.findById(solrServer1, "1"); + assertNotNull(result); + + result = SolrUtil.findById(solrServer2, "2"); + assertNotNull(result); + + SolrServer solrServer3 = newSolrServer(); + result = SolrUtil.findById(solrServer3, "1"); + assertNotNull(result); + result = SolrUtil.findById(solrServer3, "2"); + assertNotNull(result); + } + + @Ignore // FIXME 20100806 bleny randomly fail + @Test + public void testReader() throws Exception { + SolrServer solrServer1 = newSolrServer(); + SolrServer solrServer2 = newSolrServer(); + + addDocument(solrServer1, "1", "1"); + solrServer1.commit(); + + SolrDocument result = SolrUtil.findById(solrServer2, "1"); + assertNull(result); + } + +} Copied: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java (from rev 593, trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/TreeTest.java) =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java (rev 0) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/TreeTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,498 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.solr; + +import java.util.ArrayList; +import static junit.framework.Assert.assertEquals; +import static junit.framework.Assert.assertNotNull; + +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.entities.ExtensionFactory; +import org.nuiton.wikitty.entities.FieldType.TYPE; +import org.nuiton.wikitty.WikittyTree; +import org.nuiton.wikitty.entities.WikittyTreeNode; +import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyExtension; +import org.nuiton.wikitty.entities.WikittyImpl; +import org.nuiton.wikitty.services.WikittyEvent; +import org.nuiton.wikitty.conform.StorageTest; +import org.nuiton.wikitty.entities.WikittyTreeNodeHelper; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author ruchaud, martel + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class TreeTest extends AbstractTestSolr { + + static private Log log = LogFactory.getLog(TreeTest.class); + + protected WikittyExtension extension; + + @Before + public void onSetUp() throws Exception { + createBasicWikitty(); + createTestData(); + } + + /** + * Create a extension, use to store element in tree + */ + private void createBasicWikitty() { + extension = ExtensionFactory.create("test", "1") + .addField("name", TYPE.STRING) + .extension(); + ws.storeExtension(null, Arrays.asList(extension)); + } + + /** + * Init data with a basic tree + */ + private void createTestData() { + // Create tree as following : + // root + // |_ node 1 + // | |_ node 11 (2) + // | | |_ node 111 (1) + // | |_ node 12 + // | | |_ node 121 (2) + // | |_ node 13 + // |_ node 2 (1) + + createBranch("root/node1/node11/node111"); + createBranch("root/node1/node12/node121"); + createBranch("root/node1/node13"); + createBranch("root/node2"); + + addNode("node11", "value 1"); + addNode("node11", "value 2"); + + addNode("node111", "value 3"); + + addNode("node121", "value 4"); + addNode("node121", "value 5"); + + addNode("node2", "value 6"); + } + + /** + * Create all node contains in path + */ + protected void createBranch(String path) { + String parent = null; + String[] names = path.split("/"); + for (String name : names) { + + Wikitty found = findNode(name); + if(found == null) { + found = createNode(name, parent); + log.debug("[Storing] " + name + " with id " + found.getId()); + ws.store(null, found); + assertNotNull(findNode(name)); + } + parent = found.getId(); + } + } + + /** + * Attach value in node + */ + protected void addNode(String nodeName, String value) { + Wikitty leaf = new WikittyImpl(); + leaf.addExtension(extension); + leaf.setField("test", "name", value); + + log.debug("[Storing] " + value + " with id " + leaf.getId()); + ws.store(null, leaf); + + Wikitty node = findNode(nodeName); + assertNotNull(node); + WikittyTreeNodeHelper.addAttachment(node, leaf.getId()); + ws.store(null, node); + } + + /** + * Find node by name + */ + protected Wikitty findNode(String nodeName) { + Criteria criteria = Search.query().eq( + WikittyTreeNode.FQ_FIELD_WIKITTYTREENODE_NAME, nodeName).criteria(); + Wikitty wikitty = ws.findByCriteria(null, criteria); + return wikitty; + } + + /** + * Find value by name + */ + protected Wikitty findValue(String value) { + Criteria criteria = Search.query().eq("test.name", value).criteria(); + Wikitty wikitty = ws.findByCriteria(null, criteria); + return wikitty; + } + + /** + * Count all element in sub tree, with element in node + */ + protected int sum(Wikitty node) { + int sum = 0; + + // Sum value in node + Set<String> values = WikittyTreeNodeHelper.getAttachment(node); + if(values != null) { + sum = values.size(); + } + + // Sum children node in node + String nodeId = node.getId(); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, nodeId, null); + + /* + for (Integer count : children.values()) { + sum += count; + } + */ + + for (Map.Entry<WikittyTreeNode, Integer> e : children.entrySet()) { + log.debug("*treeNode = " + e.getKey().getName() + " " + e.getValue() + + " -> " + e.getKey().getAttachment()); + } + + for (WikittyTreeNode treeNode : children.keySet()) { + Set<String> treeNodeChildren = treeNode.getAttachment(); + log.debug("+treeNode = " + treeNode.getName() + " " + (treeNodeChildren==null?0:treeNodeChildren.size()) + + " -> " + treeNodeChildren); +// if (treeNodeChildren == null) { +// sum += 0; +// } else { +// sum += treeNodeChildren.size(); +// } + sum += sum(((WikittyTreeNodeImpl)treeNode).getWikitty()); + } + + return sum; + } + + /** + * Create a Wikitty WikittyTreeNode + * + * @param name + * name of the node + * @param parentId + * id of the parent + * @return + * the wikitty object corresponding to the WikittyTreeNode + */ + protected Wikitty createNode(String name, String parentId) { + // on force l'id pour simplifier le debuggage + WikittyImpl w = new WikittyImpl("id" + name); + WikittyTreeNodeImpl node = new WikittyTreeNodeImpl(w); + node.setName(name); + node.setParent(parentId); + Wikitty nodeWikitty = node.getWikitty(); + return nodeWikitty; + } + + @Test + public void testRestoreTree() throws Exception { + Wikitty root = findNode("root"); + String rootId = root.getId(); + + WikittyTree tree = ws.restoreTree(null, rootId); + assertNotNull(tree); + } + + @Test + public void testHiearchicalFacet() throws Exception { + Wikitty root = findNode("root"); + int sum = sum(root); + assertEquals(6, sum); + + Wikitty node1 = findNode("node1"); + sum = sum(node1); + assertEquals(5, sum); + + Wikitty node11 = findNode("node11"); + sum = sum(node11); + assertEquals(3, sum); + } + + @Test + public void testRestoreChildren() throws Exception { + Wikitty node1 = findNode("node1"); + String node1Id = node1.getId(); + + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, null); + assertEquals(3, children.size()); + } + + @Test + public void testFilterRestoreChildren() { + Wikitty node1 = findNode("node1"); + String node1Id = node1.getId(); + + Criteria filter = Search.query().eq("test.name", "value 3").criteria(); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node1Id, filter); + assertEquals(3, children.size()); + } + + @Test + public void testRestoreNode() throws Exception { + Wikitty node11 = findNode("node11"); + String node11Id = node11.getId(); + + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, null); + assertEquals(3, count.getValue().intValue()); + } + + @Test + public void testFilterRestoreNode() throws Exception { + Wikitty node11 = findNode("node11"); + String node11Id = node11.getId(); + + Criteria filter = Search.query().eq("test.name", "value 3").criteria(); + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node11Id, filter); + assertEquals(1, count.getValue().intValue()); + } + + @Test + public void testNewNode() throws Exception { + // Check that node 2 it has any child + Wikitty node2 = findNode("node2"); + String node2Id = node2.getId(); + Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, node2Id, null); + assertEquals(0, children.size()); + + // Create a new node, child of node 2 + Wikitty nodeWikitty = createNode("node21", node2Id); + ws.store(null, nodeWikitty); + + // Retrieve it to check + Wikitty found = findNode("node21"); + assertNotNull(found); + + // Check that it was great added as node2 child + children = ws.restoreChildren(null, node2Id, null); + assertEquals(1, children.size()); + } + + @Test + public void testAddValueInNode() throws Exception { + // Get the initial number of values for Root node + Wikitty root = findNode("root"); + int childInit = sum(root); + + // Create a leaf + Wikitty leaf = StorageTest.createWikitty("name=totoTheLeaf", "test", extension); + ws.store(null, leaf); + + // Add it in the node2 (now: two values in it) + Wikitty node = findNode("node2"); + assertNotNull(node); + WikittyTreeNodeHelper.addAttachment(node, leaf.getId()); + ws.store(null, node); + + // now, there is one more value for the root node + int newSum = sum(root); + assertEquals(childInit + 1, newSum); + } + + @Test + public void testDeleteNode() throws Exception { + // Get the initial number of values for Root node + Wikitty root = findNode("root"); + int rootChildInit = sum(root); + + // Remove the node 121 + Wikitty node121 = findNode("node121"); + int node121Init = sum(node121); + String node121Id = node121.getId(); + ws.delete(null, node121Id); + + // node12 must have any child + Wikitty node12 = findNode("node12"); + int sum = sum(node12); + assertEquals(0, sum); + + // check that root node has weel one less children value + int newRootChidlren = sum(root); + assertEquals(rootChildInit - node121Init, newRootChidlren); + + // Remove the node 1 and node 11 simultaneously + Wikitty node1 = findNode("node1"); + int node1Init = sum(node1); + String node1Id = node1.getId(); + + Wikitty node11 = findNode("node11"); + String node11Id = node11.getId(); + ws.delete(null, Arrays.asList(node1Id, node11Id)); + + // check that root node has weel one less children value + newRootChidlren = sum(root); + assertEquals(rootChildInit - node121Init - node1Init, newRootChidlren); + } + + @Test + public void testDeleteChild() throws Exception { + // Get the initial number of values for Root node + Wikitty root = findNode("root"); + int childInit = sum(root); + + // Remove a value on node11 + Wikitty node = findNode("node11"); + + List<String> leafs = new ArrayList<String>(WikittyTreeNodeHelper.getAttachment(node)); + node.removeFromField(WikittyTreeNode.EXT_WIKITTYTREENODE, WikittyTreeNode.FIELD_WIKITTYTREENODE_ATTACHMENT, leafs.get(0)); + + leafs = new ArrayList<String>(WikittyTreeNodeHelper.getAttachment(node)); + log.info("leafs after remove = " + leafs); + + ws.store(null, node); + + node = ws.restore(null, node.getId()); + leafs = new ArrayList<String>(WikittyTreeNodeHelper.getAttachment(node)); + log.info("leafs after restore = " + leafs); + + // now, there is one more value for the root node + int newSum = sum(root); + assertEquals(childInit - 1, newSum); + } + + /** regression test, for unknown reason the child may not be removed in the index */ + @Test + public void testSimpleDeleteChild() throws Exception { + + WikittyTreeNodeImpl parent = new WikittyTreeNodeImpl(); + ws.store(null, parent.getWikitty()); + + WikittyTreeNodeImpl child = new WikittyTreeNodeImpl(); + child.setParent(parent.getWikittyId()); + WikittyEvent event = ws.store(null, child.getWikitty()); + event.update(child.getWikitty()); + + Map<WikittyTreeNode, Integer> children = + ws.restoreChildren(null, parent.getWikittyId(), null); + + assertEquals(1, children.size()); + assertEquals(0, children.get(child).intValue()); + + child.setParent(null); + + ws.store(null, child.getWikitty()); + + children = ws.restoreChildren(null, parent.getWikittyId(), null); + + assertEquals(0, children.size()); + } + + @Test + public void testDeleteValue() throws Exception { + // Get the initial number of values for Root node + Wikitty root = findNode("root"); + int childInit = sum(root); + + // Remove a value + Wikitty value4 = findValue("value 4"); + String value4Id = value4.getId(); + ws.delete(null, value4Id); + + // now, there is one more value for the root node + int newSum = sum(root); + assertEquals(childInit - 1, newSum); + } + + @Test + public void testMoveNode() throws Exception { + // Get the initial number of values for node 1 + Wikitty node1 = findNode("node1"); + int childSum1 = sum(node1); + + // Get the initial number of values for node 121 + Wikitty node121 = findNode("node121"); + int childSum121 = sum(node121); + + // Get the initial number of values for node 2 + Wikitty node2 = findNode("node2"); + int childSum2 = sum(node2); + + // Move node 1 in mode 2 + WikittyTreeNodeHelper.setParent(node121, node2.getId()); + ws.store(null, node121); + + // now, there is less value node 121 for the node 1 + int newSum1 = sum(node1); + assertEquals(childSum1 - childSum121, newSum1); + + // now, there is more value node 121 for the node 2 + int newSum2 = sum(node2); + assertEquals(childSum2 + childSum121, newSum2); + } + + @Test + public void testValueInMultipleNode() throws Exception { + createBranch("node3/node31"); + createBranch("node3/node32"); + + Wikitty value = StorageTest.createWikitty("name=value", "test", extension); + ws.store(null, value); + String valueId = value.getId(); + + Wikitty node31 = findNode("node31"); + WikittyTreeNodeHelper.addAttachment(node31, valueId); + ws.store(null, node31); + + Wikitty node32 = findNode("node32"); + WikittyTreeNodeHelper.addAttachment(node32, valueId); + ws.store(null, node32); + + Wikitty node3 = findNode("node3"); + int sum = sum(node3); + assertEquals(2, sum); + + Entry<WikittyTreeNode, Integer> count = ws.restoreNode(null, node3.getId(), null); + assertEquals(1, count.getValue().intValue()); + + sum = sum(node31); + assertEquals(1, sum); + + sum = sum(node32); + assertEquals(1, sum); + } +} Added: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java (rev 0) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittySearchEngineSolrTest.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,167 @@ +package org.nuiton.wikitty.storage.solr; + + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.nuiton.wikitty.WikittyConfig; +import org.nuiton.wikitty.entities.Wikitty; +import org.nuiton.wikitty.entities.WikittyImpl; +import org.nuiton.wikitty.entities.WikittyLabelImpl; +import org.nuiton.wikitty.entities.WikittyTreeNodeImpl; +import org.nuiton.wikitty.entities.WikittyUserImpl; +import org.nuiton.wikitty.search.Criteria; +import org.nuiton.wikitty.search.PagedResult; +import org.nuiton.wikitty.search.Search; + +/** + * + * @author poussin + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittySearchEngineSolrTest { + + /** to use log facility, just put in your code: log.info(\"...\"); */ + static private Log log = LogFactory.getLog(WikittySearchEngineSolrTest.class); + + protected WikittyServiceSolr ws =new WikittyServiceSolr(new WikittyConfig()); + + @Before + public void deleteAll() throws Exception { + ws.clear(null); + } + + @Test + public void testFullTextSearch() throws Exception { + // for id for easy debugging + WikittyImpl w = new WikittyImpl("label"); + WikittyLabelImpl l = new WikittyLabelImpl(w); + l.addLabels("label"); + w = new WikittyImpl("LABEL"); + WikittyLabelImpl l2 = new WikittyLabelImpl(w); + l2.addLabels("OTHER LABEL"); + w = new WikittyImpl("TATA"); + WikittyUserImpl u = new WikittyUserImpl(w); + u.setLogin("tata"); + + List<Wikitty> toStore = new ArrayList<Wikitty>(); + toStore.add(l.getWikitty()); + toStore.add(l2.getWikitty()); + toStore.add(u.getWikitty()); + + ws.store(null, toStore, false); + + { + Criteria c = Search.query().keyword("lab*").criteria(); + PagedResult<String> result = ws.findAllByCriteria(null, c); + System.out.println(result.getAll()); + Assert.assertEquals(2, result.getNumFound()); + } + { + Criteria c = Search.query().keyword("*a*").criteria(); + PagedResult<String> result = ws.findAllByCriteria(null, c); + System.out.println(result.getAll()); + Assert.assertEquals(3, result.getNumFound()); + } + + } + + @Test + public void testCountAttachment() throws Exception { + List<Wikitty> toStore = new ArrayList<Wikitty>(); + + WikittyImpl w1 = new WikittyImpl("at1"); + WikittyImpl w2 = new WikittyImpl("at2"); + WikittyImpl w3 = new WikittyImpl("at3"); + + WikittyImpl root = new WikittyImpl("the-root"); + WikittyTreeNodeImpl n = new WikittyTreeNodeImpl(root); + n.addAttachment(w1.getId()); + n.addAttachment(w2.getId()); + n.addAttachment(w3.getId()); + + toStore.add(w1); + toStore.add(w2); + toStore.add(w3); + toStore.add(root); + + ws.store(null, toStore, false); + toStore.clear(); + + WikittyImpl w11 = new WikittyImpl("at11"); + WikittyImpl w12 = new WikittyImpl("at12"); + WikittyImpl w13 = new WikittyImpl("at13"); + + WikittyImpl node1 = new WikittyImpl("node1"); + n = new WikittyTreeNodeImpl(node1); + n.setParent(root.getId()); + n.addAttachment(w11.getId()); + n.addAttachment(w12.getId()); + n.addAttachment(w13.getId()); + + toStore.add(w11); + toStore.add(w12); + toStore.add(w13); + toStore.add(node1); + + ws.store(null, toStore, false); + toStore.clear(); + + WikittyImpl w21 = new WikittyImpl("at21"); + WikittyImpl w22 = new WikittyImpl("at22"); + WikittyImpl w23 = new WikittyImpl("at23"); + WikittyImpl w24 = new WikittyImpl("at24"); + + WikittyImpl node2 = new WikittyImpl("node2"); + n = new WikittyTreeNodeImpl(node2); + n.setParent(root.getId()); + n.addAttachment(w21.getId()); + n.addAttachment(w22.getId()); + n.addAttachment(w23.getId()); + n.addAttachment(w24.getId()); + + toStore.add(w21); + toStore.add(w22); + toStore.add(w23); + toStore.add(w24); + toStore.add(node2); + + ws.store(null, toStore, false); + toStore.clear(); + + WikittyImpl w111 = new WikittyImpl("at111"); + WikittyImpl w112 = new WikittyImpl("at112"); + + WikittyImpl node11 = new WikittyImpl("node11"); + n = new WikittyTreeNodeImpl(node11); + n.setParent(node1.getId()); + n.addAttachment(w111.getId()); + n.addAttachment(w112.getId()); + + toStore.add(w111); + toStore.add(w112); + toStore.add(node11); + + ws.store(null, toStore, false); + toStore.clear(); + + Integer val = ws.getSearchEngine().findNodeCount(null, root, null); + Assert.assertEquals(Integer.valueOf(12), val); + +// Map<WikittyTreeNode, Integer> children = ws.restoreChildren(null, root.getId(), null); + Map<String, Integer> children = ws.getSearchEngine().findAllChildrenCount(null, root, null); + System.out.println(children); + Assert.assertEquals(2, children.size()); + Assert.assertEquals(Integer.valueOf(5), children.get(node1.getId())); + Assert.assertEquals(Integer.valueOf(4), children.get(node2.getId())); + } + +} Copied: trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java (from rev 593, trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/solr/test/WikittyServiceSolr.java) =================================================================== --- trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java (rev 0) +++ trunk/wikitty-solr-impl/src/test/java/org/nuiton/wikitty/storage/solr/WikittyServiceSolr.java 2010-12-17 16:33:52 UTC (rev 619) @@ -0,0 +1,50 @@ +/* + * #%L + * Wikitty :: wikitty-solr-impl + * + * $Id$ + * $HeadURL$ + * %% + * Copyright (C) 2009 - 2010 CodeLutin, Benjamin Poussin + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. + * #L% + */ + +package org.nuiton.wikitty.storage.solr; + +import org.nuiton.util.ApplicationConfig; +import org.nuiton.wikitty.services.WikittyServiceStorage; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolr; +import org.nuiton.wikitty.storage.solr.WikittySearchEngineSolrIndexInTreeNode; +import org.nuiton.wikitty.storage.WikittyExtensionStorageInMemory; +import org.nuiton.wikitty.storage.WikittyStorageInMemory; + +/** + * + * @author ruchaud, martel + * @version $Revision$ + * + * Last update: $Date$ + * by : $Author$ + */ +public class WikittyServiceSolr extends WikittyServiceStorage { + + public WikittyServiceSolr(ApplicationConfig config) { + extensionStorage = new WikittyExtensionStorageInMemory(); + wikittyStorage = new WikittyStorageInMemory(); + searchEngine = new WikittySearchEngineSolr(config, extensionStorage); + } +}

1 0

r618 - in trunk: wikitty-api/src/main/java/org/nuiton/wikitty/storage wikitty-api/src/test/java/org/nuiton/wikitty/conform wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 16:14:14 +0100 (Fri, 17 Dec 2010) New Revision: 618 Url: http://nuiton.org/repositories/revision/wikitty/618 Log: - fix bug in incremation version for force store call - add javadoc to explain it - fix test for that Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2010-12-17 15:12:52 UTC (rev 617) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/storage/WikittyStorage.java 2010-12-17 15:14:14 UTC (rev 618) @@ -44,6 +44,17 @@ /** * Store wikitty in storage. + * + * if force is true, wikitty in argument is all time stored. + * if wikitty already stored and deleted, wikitty is born again + * + * new version is computed as follow: + * <pre> + * if version in wikitty > version in database + * newversion = version in wikitty + * else + * newversion = version in database + 1 + * </pre> * * @param transaction transaction * @param wikitties wikitty collection Modified: trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java =================================================================== --- trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-12-17 15:12:52 UTC (rev 617) +++ trunk/wikitty-api/src/test/java/org/nuiton/wikitty/conform/StorageTest.java 2010-12-17 15:14:14 UTC (rev 618) @@ -614,12 +614,16 @@ } // store 4 : same but with force (increased by force) - getWikittyService().store(null, Collections.singletonList(myNewWikitty), true); - Assert.assertEquals("3.0", myNewWikitty.getVersion()); + WikittyEvent event = getWikittyService().store( + null, Collections.singletonList(myWikitty), true); + event.update(myWikitty); + Assert.assertEquals("3.0", myWikitty.getVersion()); // store 5 : fix version (not increased by force) myNewWikitty.setVersion("11.0"); - getWikittyService().store(null, Collections.singletonList(myNewWikitty), true); + event = getWikittyService().store( + null, Collections.singletonList(myNewWikitty), true); + event.update(myNewWikitty); Assert.assertEquals("11.0", myNewWikitty.getVersion()); } Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-12-17 15:12:52 UTC (rev 617) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-12-17 15:14:14 UTC (rev 618) @@ -241,27 +241,15 @@ // compute new version, but not change wikitty String newVersion = null; if (force) { - if (actualVersion == null) { //no version in place - if (requestedVersion == null) { //no version requested - newVersion = WikittyUtil.DEFAULT_VERSION; - } else { //version requested - newVersion = requestedVersion; - } - } else { //version in place is not null - if (requestedVersion == null || //no version requested - requestedVersion.startsWith(WikittyUtil.DEFAULT_MAJOR_VERSION_PREFIX)) { // or 0.x version forced (creation) - newVersion = WikittyUtil.incrementMajorRevision(actualVersion); - } else if (WikittyUtil.versionEquals(actualVersion, requestedVersion) && deletionDate == null) { //same version - // wikitty is not modified, do nothing - continue; - } else if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { //requested version is newer - newVersion = requestedVersion; - } else { //requested version is obsolete -// FIXME poussin 20101118 pourquoi lorsqu'on demande un force il peut y avoir un "Wikitty is obsolete" -// ce qui ne permet pas de rejouer plusieurs fois les events pour les besoins du slave :( - throw new WikittyObsoleteException(String.format( - "Your wikitty '%s' is obsolete (saving: '%s'; existing: '%s')", wikitty.getId(), requestedVersion, actualVersion)); - } + // requestedVersion is never null + // versionGreaterThan support null for actualVersion + // and in this case return true + // see javadoc for more explanation + if (WikittyUtil.versionGreaterThan(requestedVersion, actualVersion)) { + newVersion = requestedVersion; + } else { + // else take actualVersion as base version + newVersion = WikittyUtil.incrementMajorRevision(actualVersion); } } else { if (WikittyUtil.versionEquals(actualVersion, requestedVersion) && deletionDate == null) { @@ -339,6 +327,7 @@ } // update extensions in wikitty object + // force all time deletion date to null String q = jdbcQuery.getProperty(QUERY_UPDATE_WIKITTY_ADMIN); WikittyJDBCUtil.doQuery(connection, q, newVersion, extensionList, null, wikitty.getId()); @@ -351,6 +340,8 @@ } return result; + } catch (WikittyException eee) { + throw eee; } catch (Exception eee) { throw new WikittyException("Can't store wikitty", eee); } finally {

1 0

r617 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services
by bpoussin＠users.nuiton.org 17 Dec '10

17 Dec '10

Author: bpoussin Date: 2010-12-17 16:12:52 +0100 (Fri, 17 Dec 2010) New Revision: 617 Url: http://nuiton.org/repositories/revision/wikitty/617 Log: - add getter on storage components (extension/data storage and search engine) - add test to prevent bad implementation of storage Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-16 22:47:20 UTC (rev 616) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/services/WikittyServiceStorage.java 2010-12-17 15:12:52 UTC (rev 617) @@ -99,15 +99,15 @@ this.searchEngine = searchEngine; } - protected WikittySearchEngine getSearchEngine() { + public WikittySearchEngine getSearchEngine() { return searchEngine; } - protected WikittyExtensionStorage getExtensionStorage() { + public WikittyExtensionStorage getExtensionStorage() { return extensionStorage; } - protected WikittyStorage getWikittyStorage() { + public WikittyStorage getWikittyStorage() { return wikittyStorage; } @@ -1014,6 +1014,13 @@ String id = child.getKey(); Wikitty wikitty = restore(securityToken, id); + if (!wikitty.hasExtension(WikittyTreeNode.EXT_WIKITTYTREENODE)) { + // si cette exception est leve, c'est qu'il y a une mauvaise + // implantation de l'api et une erreur d'interpretation + // entre children et attachment voir l'implantation de la + // methode getSearchEngine().findAllChildrenCount + throw new WikittyException("API error, api restore tree node, but wikitty is not a tree node"); + } WikittyTreeNode node = new WikittyTreeNodeImpl(wikitty); result.put(node, count);

1 0

r616 - trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc
by bpoussin＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: bpoussin Date: 2010-12-16 23:47:20 +0100 (Thu, 16 Dec 2010) New Revision: 616 Url: http://nuiton.org/repositories/revision/wikitty/616 Log: make copy of wikitty before modification to put in event Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-12-16 00:02:14 UTC (rev 615) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyExtensionStorageJDBC.java 2010-12-16 22:47:20 UTC (rev 616) @@ -142,6 +142,7 @@ //if the data is not already recorded if (!versionResultSet.next()) { + // FIXME poussin 20101216 make copy before add to result to prevent side effect result.addExtension(ext); WikittyJDBCUtil.doQuery(connection, jdbcQuery.getProperty(QUERY_INSERT_EXTENSION_ADMIN), Modified: trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java =================================================================== --- trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-12-16 00:02:14 UTC (rev 615) +++ trunk/wikitty-jdbc-impl/src/main/java/org/nuiton/wikitty/jdbc/WikittyStorageJDBC.java 2010-12-16 22:47:20 UTC (rev 616) @@ -343,13 +343,15 @@ WikittyJDBCUtil.doQuery(connection, q, newVersion, extensionList, null, wikitty.getId()); - wikitty.setVersion(newVersion); - wikitty.clearDirty(); - result.addWikitty(wikitty); + // make a clone to prevent side effect + Wikitty newWikitty = wikitty.clone(); + newWikitty.setVersion(newVersion); + newWikitty.clearDirty(); + result.addWikitty(newWikitty); } return result; - } catch (SQLException eee) { + } catch (Exception eee) { throw new WikittyException("Can't store wikitty", eee); } finally { WikittyJDBCUtil.closeQuietly(connection);

1 0

r615 - trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search
by bpoussin＠users.nuiton.org 16 Dec '10

16 Dec '10

Author: bpoussin Date: 2010-12-16 01:02:14 +0100 (Thu, 16 Dec 2010) New Revision: 615 Url: http://nuiton.org/repositories/revision/wikitty/615 Log: add toString representation Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java Modified: trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java =================================================================== --- trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java 2010-12-15 14:49:44 UTC (rev 614) +++ trunk/wikitty-api/src/main/java/org/nuiton/wikitty/search/FacetTopic.java 2010-12-16 00:02:14 UTC (rev 615) @@ -62,5 +62,14 @@ public int getCount() { return count; } + + @Override + public String toString() { + String result = String.format( + "FacetTopic(facet: '%s' topic: '%s' count: '%s')", + getFacetName(), getTopicName(), getCount()); + return result; + } + }

1 0