From 243cb60ed27d5aa9505f11ec74781ca51dcbf3fa Mon Sep 17 00:00:00 2001 From: Stefan Matheis Date: Tue, 29 Jan 2013 17:34:10 +0000 Subject: [PATCH 01/17] SOLR-4364: Admin UI - Locale based number formatting git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440014 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 ++ solr/webapp/web/js/scripts/app.js | 42 ++++++++++++++++++++++++++++++- 2 files changed, 43 insertions(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 45e099a3a4a..8cf4dc715c1 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -115,6 +115,8 @@ Optimizations * SOLR-4284: Admin UI - make core list scrollable separate from the rest of the UI (steffkes) +* SOLR-4364: Admin UI - Locale based number formatting (steffkes) + Other Changes ---------------------- diff --git a/solr/webapp/web/js/scripts/app.js b/solr/webapp/web/js/scripts/app.js index 7c2ad094527..7ee15453d57 100644 --- a/solr/webapp/web/js/scripts/app.js +++ b/solr/webapp/web/js/scripts/app.js @@ -175,6 +175,12 @@ var solr_admin = function( app_config ) this.core_regex_base = '^#\\/([\\w\\d-\\.]+)'; + browser = { + locale : null, + language : null, + country : null + }; + show_global_error = function( error ) { var main = $( '#main' ); @@ -294,6 +300,24 @@ var solr_admin = function( app_config ) this.run = function() { + var navigator_language = navigator.userLanguage || navigator.language; + var language_match = navigator_language.match( /^(\w{2})([-_](\w{2}))?$/ ); + if( language_match ) + { + if( language_match[1] ) + { + browser.language = language_match[1].toLowerCase(); + } + if( language_match[3] ) + { + browser.country = language_match[3].toUpperCase(); + } + if( language_match[1] && language_match[3] ) + { + browser.locale = browser.language + '_' + browser.country + } + } + $.ajax ( { @@ -536,7 +560,23 @@ var solr_admin = function( app_config ) this.format_number = function format_number( number ) { - return ( number || 0 ).toString().replace( /\B(?=(\d{3})+(?!\d))/g, ' ' ); + var sep = { + 'de_CH' : '\'', + 'de' : '.', + 'en' : ',', + 'es' : '.', + 'it' : '.', + 'ja' : ',', + 'sv' : ' ', + 'tr' : '.', + '_' : '' // fallback + }; + + return ( number || 0 ).toString().replace + ( + /\B(?=(\d{3})+(?!\d))/g, + sep[ browser.locale ] || sep[ browser.language ] || sep['_'] + ); }; }; From 99dae78095d477497bc059af598ca03569efb8f3 Mon Sep 17 00:00:00 2001 From: Stefan Matheis Date: Tue, 29 Jan 2013 18:20:47 +0000 Subject: [PATCH 02/17] SOLR-4284: Admin UI - Fix Schema-Browser-Link on Analysis-Screen git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440044 13f79535-47bb-0310-9956-ffa450edef68 --- solr/webapp/web/js/scripts/analysis.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/webapp/web/js/scripts/analysis.js b/solr/webapp/web/js/scripts/analysis.js index 07a1106bdaa..2dc6d46b84c 100644 --- a/solr/webapp/web/js/scripts/analysis.js +++ b/solr/webapp/web/js/scripts/analysis.js @@ -42,7 +42,7 @@ sammy.get var type_or_name = $( '#type_or_name', analysis_form ); var schema_browser_element = $( '#tor_schema' ); - var schema_browser_path = $( 'p > a', active_core ).attr( 'href' ) + '/schema-browser' + var schema_browser_path = app.core_menu.find( '.schema-browser a' ).attr( 'href' ); var schema_browser_map = { 'fieldname' : 'field', 'fieldtype' : 'type' }; type_or_name From 529af9a0bbc18755ee7588a68a9fa0503f9f2790 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Tue, 29 Jan 2013 19:23:45 +0000 Subject: [PATCH 03/17] tests: remove these annoying svn sub properties from config files git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440069 13f79535-47bb-0310-9956-ffa450edef68 --- .../test-files/extraction/solr/collection1/conf/schema.xml | 3 --- .../extraction/solr/collection1/conf/solrconfig.xml | 5 ----- .../src/test-files/langid/solr/collection1/conf/schema.xml | 3 --- .../test-files/solr/collection1/conf/bad_solrconfig.xml | 4 ---- .../solr/collection1/conf/schema-binaryfield.xml | 3 --- .../solr/collection1/conf/schema-copyfield-test.xml | 3 --- .../collection1/conf/schema-not-required-unique-key.xml | 2 -- .../test-files/solr/collection1/conf/schema-numeric.xml | 3 --- .../solr/collection1/conf/schema-replication1.xml | 3 --- .../solr/collection1/conf/schema-replication2.xml | 3 --- .../solr/collection1/conf/schema-required-fields.xml | 3 --- .../test-files/solr/collection1/conf/schema-stop-keep.xml | 3 --- solr/core/src/test-files/solr/collection1/conf/schema.xml | 3 --- .../core/src/test-files/solr/collection1/conf/schema12.xml | 3 --- .../test-files/solr/collection1/conf/schemasurround.xml | 3 --- .../solr/collection1/conf/solrconfig-SOLR-749.xml | 5 ----- .../solr/collection1/conf/solrconfig-delpolicy1.xml | 4 ---- .../solr/collection1/conf/solrconfig-elevate.xml | 5 ----- .../solr/collection1/conf/solrconfig-enableplugin.xml | 5 ----- .../test-files/solr/collection1/conf/solrconfig-master.xml | 5 ----- .../solr/collection1/conf/solrconfig-master1.xml | 5 ----- .../solr/collection1/conf/solrconfig-master2.xml | 5 ----- .../solr/collection1/conf/solrconfig-master3.xml | 5 ----- .../solr/collection1/conf/solrconfig-mergepolicy.xml | 5 ----- .../solr/collection1/conf/solrconfig-nocache.xml | 5 ----- .../conf/solrconfig-propinject-indexdefault.xml | 6 +----- .../solr/collection1/conf/solrconfig-propinject.xml | 5 +---- .../collection1/conf/solrconfig-querysender-noquery.xml | 5 ----- .../solr/collection1/conf/solrconfig-querysender.xml | 5 ----- .../solr/collection1/conf/solrconfig-repeater.xml | 5 ----- .../collection1/conf/solrconfig-response-log-component.xml | 7 ------- .../test-files/solr/collection1/conf/solrconfig-slave.xml | 5 ----- .../test-files/solr/collection1/conf/solrconfig-slave1.xml | 5 ----- .../solr/collection1/conf/solrconfig-solcoreproperties.xml | 5 ----- .../collection1/conf/solrconfig-spellcheckcomponent.xml | 7 ------- .../solr/collection1/conf/solrconfig-termindex.xml | 5 ----- solr/core/src/test-files/solr/crazy-path-to-config.xml | 2 -- solr/core/src/test-files/solr/crazy-path-to-schema.xml | 2 -- .../solrj/solr/collection1/conf/schema-replication1.xml | 3 --- .../src/test-files/solrj/solr/collection1/conf/schema.xml | 3 --- .../solrj/solr/collection1/conf/solrconfig-slave1.xml | 5 ----- .../src/test-files/solrj/solr/crazy-path-to-schema.xml | 2 -- 42 files changed, 2 insertions(+), 171 deletions(-) diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml index 82a3d0f8449..6bf238bcf90 100644 --- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml +++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/schema.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml index a63987d2b7f..8510e4e9792 100644 --- a/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml +++ b/solr/contrib/extraction/src/test-files/extraction/solr/collection1/conf/solrconfig.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml index 4c3d2e80e48..3454995599f 100644 --- a/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml +++ b/solr/contrib/langid/src/test-files/langid/solr/collection1/conf/schema.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml b/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml index 8c8e9601559..ed07d9afdea 100644 --- a/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml +++ b/solr/core/src/test-files/solr/collection1/conf/bad_solrconfig.xml @@ -17,10 +17,6 @@ limitations under the License. --> - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml index bf0e3e91268..1f9312e61d0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-binaryfield.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema-copyfield-test.xml 721758 2008-11-30 04:46:20Z koji $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml index d3e09d9da57..78cbd77759b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id$ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml index f3e5a1a3c49..b3869812375 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-not-required-unique-key.xml @@ -20,8 +20,6 @@ Striped down schema used to make sure an explicit required=false is observed for the uniqueKey field - $Id$ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml b/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml index 0a12736702d..d00545ed102 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-numeric.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml index 48ecd9fd2b7..fe123dfa6d0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication1.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id$ - $Source$ - $Name$ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml index 65ad6f3ac1b..a2409459aa7 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-replication2.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id$ - $Source$ - $Name$ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml index 0945629690a..019643f6b09 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id$ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml b/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml index e3d78390504..831539ee8be 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-stop-keep.xml @@ -20,9 +20,6 @@ For testing stopword configuration and keep word configuration - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema.xml b/solr/core/src/test-files/solr/collection1/conf/schema.xml index c57cba9bc1f..417d7dbf5ca 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schema12.xml b/solr/core/src/test-files/solr/collection1/conf/schema12.xml index 1ae814f2488..c1aa3e618ec 100755 --- a/solr/core/src/test-files/solr/collection1/conf/schema12.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema12.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id$ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml index 6020cf1073f..823e313c1eb 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schemasurround.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema12.xml 1149050 2011-07-21 07:09:27Z koji $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml index 3a0a0ccccae..7785b50e0d2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-SOLR-749.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml index 751663c61c1..09e9c6533e2 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-delpolicy1.xml @@ -17,10 +17,6 @@ limitations under the License. --> - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml index b32572a1ecc..9c30235acc0 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-elevate.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml index 5d97ab11c42..d385f910800 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-enableplugin.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml index 4752e50ac3c..7de4b30d3a6 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml index 019f47ebbd8..3ceaa73b816 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml index b088fb9beb1..02480160968 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml index cf3ee592ba0..3e486db34f1 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-master3.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml index 8fa12a7abe9..48490eda349 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-mergepolicy.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml index cb6c92d9739..e89f7f9df97 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-nocache.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml index efa1e6cddd8..7e862ea0ff3 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-propinject-indexdefault.xml @@ -17,11 +17,7 @@ limitations under the License. --> - - - - ${tests.luceneMatchVersion:LUCENE_CURRENT} - - ${tests.luceneMatchVersion:LUCENE_CURRENT} - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml index d4c623aa060..cac524d7386 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-response-log-component.xml @@ -17,13 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml index afcd2efe388..4eecf11789b 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml index 39398ba796d..db9968c2e94 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-solcoreproperties.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml index 87bd0d42bb4..8a01c177933 100644 --- a/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml +++ b/solr/core/src/test-files/solr/collection1/conf/solrconfig-spellcheckcomponent.xml @@ -17,13 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} - - ${tests.luceneMatchVersion:LUCENE_CURRENT} diff --git a/solr/core/src/test-files/solr/crazy-path-to-config.xml b/solr/core/src/test-files/solr/crazy-path-to-config.xml index 32b550a49d8..f0d724595f7 100644 --- a/solr/core/src/test-files/solr/crazy-path-to-config.xml +++ b/solr/core/src/test-files/solr/crazy-path-to-config.xml @@ -19,8 +19,6 @@ Striped down solrconfig used by SampleTest to demonstrate picking any config filename you want. - $Id: solrconfig.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source$ --> diff --git a/solr/core/src/test-files/solr/crazy-path-to-schema.xml b/solr/core/src/test-files/solr/crazy-path-to-schema.xml index b71c9f4eb94..a2216ddfa99 100644 --- a/solr/core/src/test-files/solr/crazy-path-to-schema.xml +++ b/solr/core/src/test-files/solr/crazy-path-to-schema.xml @@ -19,8 +19,6 @@ Striped down schema used by SampleTest to demonstrate picking any schema filename you want. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ --> diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml index 48ecd9fd2b7..fe123dfa6d0 100644 --- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml +++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema-replication1.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id$ - $Source$ - $Name$ --> diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml index 8d690056b7b..a2cc6c821b3 100644 --- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/schema.xml @@ -23,9 +23,6 @@ kitchen sink thrown in. See example/solr/conf/schema.xml for a more concise example. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ - $Name: $ --> diff --git a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml index 2fb1db51b58..76db378e42c 100644 --- a/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml +++ b/solr/solrj/src/test-files/solrj/solr/collection1/conf/solrconfig-slave1.xml @@ -17,11 +17,6 @@ limitations under the License. --> - - ${tests.luceneMatchVersion:LUCENE_CURRENT} ${solr.data.dir:} diff --git a/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml b/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml index b71c9f4eb94..a2216ddfa99 100644 --- a/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml +++ b/solr/solrj/src/test-files/solrj/solr/crazy-path-to-schema.xml @@ -19,8 +19,6 @@ Striped down schema used by SampleTest to demonstrate picking any schema filename you want. - $Id: schema.xml 382610 2006-03-03 01:43:03Z yonik $ - $Source: /cvs/main/searching/solr-configs/test/WEB-INF/classes/schema.xml,v $ --> From 606eec0b99b213a32026cdfb497f2ccb1d47b72f Mon Sep 17 00:00:00 2001 From: Michael McCandless Date: Tue, 29 Jan 2013 21:15:50 +0000 Subject: [PATCH 04/17] LUCENE-4735: workaround IBM J9 JVM bug git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440137 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/java/org/apache/lucene/analysis/MockCharFilter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java index 9182babda19..fc620281b5c 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java +++ b/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java @@ -19,6 +19,7 @@ package org.apache.lucene.analysis; import java.io.IOException; import java.io.Reader; +import java.util.Map; import java.util.SortedMap; import java.util.TreeMap; @@ -89,8 +90,8 @@ public class MockCharFilter extends CharFilter { @Override public int correct(int currentOff) { - SortedMap subMap = corrections.subMap(0, currentOff+1); - int ret = subMap.isEmpty() ? currentOff : currentOff + subMap.get(subMap.lastKey()); + Map.Entry lastEntry = corrections.lowerEntry(currentOff+1); + int ret = lastEntry == null ? currentOff : currentOff + lastEntry.getValue(); assert ret >= 0 : "currentOff=" + currentOff + ",diff=" + (ret-currentOff); return ret; } From d6317b5e68450d1aeb0e7371dc846b0175b51132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Wed, 30 Jan 2013 00:26:39 +0000 Subject: [PATCH 05/17] SOLR-3967: langid.enforceSchema option checks source field instead of target field git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440226 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 ++ .../LanguageIdentifierUpdateProcessor.java | 18 ++++++++++-------- ...entifierUpdateProcessorFactoryTestCase.java | 16 ++++++++++------ 3 files changed, 22 insertions(+), 14 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 8cf4dc715c1..9cca4217344 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -95,6 +95,8 @@ Bug Fixes * SOLR-4342: Fix DataImportHandler stats to be a prper Map (hossman) +* SOLR-3967: langid.enforceSchema option checks source field instead of target field (janhoy) + Optimizations ---------------------- diff --git a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java index 6b4179b7c38..96d6d62fbd5 100644 --- a/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java +++ b/solr/contrib/langid/src/java/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessor.java @@ -222,10 +222,6 @@ public abstract class LanguageIdentifierUpdateProcessor extends UpdateRequestPro log.debug("Mapping field "+fieldName+" using document global language "+fieldLang); } String mappedOutputField = getMappedField(fieldName, fieldLang); - if(enforceSchema && schema.getFieldOrNull(fieldName) == null) { - log.warn("Unsuccessful field name mapping to {}, field does not exist, skipping mapping.", mappedOutputField, fieldName); - mappedOutputField = fieldName; - } if (mappedOutputField != null) { log.debug("Mapping field {} to {}", doc.getFieldValue(docIdField), fieldLang); @@ -350,17 +346,23 @@ public abstract class LanguageIdentifierUpdateProcessor extends UpdateRequestPro /** * Returns the name of the field to map the current contents into, so that they are properly analyzed. For instance - * if the currentField is "text" and the code is "en", the new field would be "text_en". If such a field doesn't exist, - * then null is returned. + * if the currentField is "text" and the code is "en", the new field would by default be "text_en". + * This method also performs custom regex pattern replace if configured. If enforceSchema=true + * and the resulting field name doesn't exist, then null is returned. * * @param currentField The current field name * @param language the language code - * @return The new schema field name, based on pattern and replace + * @return The new schema field name, based on pattern and replace, or null if illegal */ protected String getMappedField(String currentField, String language) { String lc = lcMap.containsKey(language) ? lcMap.get(language) : language; String newFieldName = langPattern.matcher(mapPattern.matcher(currentField).replaceFirst(mapReplaceStr)).replaceFirst(lc); - log.debug("Doing mapping from "+currentField+" with language "+language+" to field "+newFieldName); + if(enforceSchema && schema.getFieldOrNull(newFieldName) == null) { + log.warn("Unsuccessful field name mapping from {} to {}, field does not exist and enforceSchema=true; skipping mapping.", currentField, newFieldName); + return null; + } else { + log.debug("Doing mapping from "+currentField+" with language "+language+" to field "+newFieldName); + } return newFieldName; } diff --git a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java index cde227e608f..b718384baa3 100644 --- a/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java +++ b/solr/contrib/langid/src/test/org/apache/solr/update/processor/LanguageIdentifierUpdateProcessorFactoryTestCase.java @@ -93,7 +93,7 @@ public abstract class LanguageIdentifierUpdateProcessorFactoryTestCase extends S parameters = new ModifiableSolrParams(); parameters.add("langid.fl", "name"); parameters.add("langid.map.lcmap", "jp:s zh:cjk ko:cjk"); - parameters.add("langid.enforceSchema", "true"); + parameters.set("langid.enforceSchema", "false"); liProcessor = createLangIdProcessor(parameters); assertEquals("test_no", liProcessor.getMappedField("test", "no")); @@ -102,13 +102,17 @@ public abstract class LanguageIdentifierUpdateProcessorFactoryTestCase extends S assertEquals("test_cjk", liProcessor.getMappedField("test", "zh")); assertEquals("test_cjk", liProcessor.getMappedField("test", "ko")); - // Prove support for other mapping regex - parameters.add("langid.map.pattern", "text_(.*?)_field"); - parameters.add("langid.map.replace", "$1_{lang}Text"); + // Test that enforceSchema correctly catches illegal field and returns null + parameters.set("langid.enforceSchema", "true"); liProcessor = createLangIdProcessor(parameters); + assertEquals(null, liProcessor.getMappedField("inputfield", "sv")); - assertEquals("title_noText", liProcessor.getMappedField("text_title_field", "no")); - assertEquals("body_svText", liProcessor.getMappedField("text_body_field", "sv")); + // Prove support for other mapping regex, still with enforceSchema=true + parameters.add("langid.map.pattern", "text_(.*?)_field"); + parameters.add("langid.map.replace", "$1_{lang}_s"); + liProcessor = createLangIdProcessor(parameters); + assertEquals("title_no_s", liProcessor.getMappedField("text_title_field", "no")); + assertEquals("body_sv_s", liProcessor.getMappedField("text_body_field", "sv")); } @Test From 4ec7239ce80ba801b9055d7c6694dd356d9b3168 Mon Sep 17 00:00:00 2001 From: "Chris M. Hostetter" Date: Wed, 30 Jan 2013 03:42:59 +0000 Subject: [PATCH 06/17] SOLR-3904: package.html for all packages in solr-core git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440263 13f79535-47bb-0310-9956-ffa450edef68 --- solr/build.xml | 13 ++------ .../org/apache/solr/analysis/package.html | 30 ++++++++++++++++++ .../solr/client/solrj/embedded/package.html | 30 ++++++++++++++++++ .../java/org/apache/solr/cloud/package.html | 27 ++++++++++++++++ .../java/org/apache/solr/common/package.html | 29 +++++++++++++++++ .../java/org/apache/solr/core/package.html | 27 ++++++++++++++++ .../apache/solr/handler/admin/package.html | 27 ++++++++++++++++ .../solr/handler/component/package.html | 28 +++++++++++++++++ .../apache/solr/handler/loader/package.html | 28 +++++++++++++++++ .../java/org/apache/solr/handler/package.html | 27 ++++++++++++++++ .../org/apache/solr/highlight/package.html | 30 ++++++++++++++++++ .../org/apache/solr/internal/csv/package.html | 29 +++++++++++++++++ .../solr/internal/csv/writer/package.html | 29 +++++++++++++++++ .../org/apache/solr/logging/jul/package.html | 27 ++++++++++++++++ .../java/org/apache/solr/logging/package.html | 29 +++++++++++++++++ .../src/java/org/apache/solr/package.html | 29 +++++++++++++++++ .../java/org/apache/solr/parser/package.html | 29 +++++++++++++++++ .../java/org/apache/solr/request/package.html | 29 +++++++++++++++++ .../org/apache/solr/response/package.html | 29 +++++++++++++++++ .../solr/response/transform/package.html | 29 +++++++++++++++++ .../java/org/apache/solr/schema/package.html | 29 +++++++++++++++++ .../search/function/distance/package.html | 27 ++++++++++++++++ .../apache/solr/search/function/package.html | 27 ++++++++++++++++ .../search/grouping/collector/package.html | 29 +++++++++++++++++ .../grouping/distributed/command/package.html | 29 +++++++++++++++++ .../search/grouping/distributed/package.html | 29 +++++++++++++++++ .../distributed/requestfactory/package.html | 29 +++++++++++++++++ .../responseprocessor/package.html | 29 +++++++++++++++++ .../shardresultserializer/package.html | 29 +++++++++++++++++ .../endresulttransformer/package.html | 29 +++++++++++++++++ .../apache/solr/search/grouping/package.html | 31 +++++++++++++++++++ .../java/org/apache/solr/search/package.html | 27 ++++++++++++++++ .../apache/solr/servlet/cache/package.html | 27 ++++++++++++++++ .../java/org/apache/solr/servlet/package.html | 27 ++++++++++++++++ .../org/apache/solr/spelling/package.html | 30 ++++++++++++++++++ .../solr/spelling/suggest/fst/package.html | 29 +++++++++++++++++ .../spelling/suggest/jaspell/package.html | 29 +++++++++++++++++ .../apache/solr/spelling/suggest/package.html | 30 ++++++++++++++++++ .../solr/spelling/suggest/tst/package.html | 29 +++++++++++++++++ .../java/org/apache/solr/update/package.html | 29 +++++++++++++++++ .../apache/solr/update/processor/package.html | 29 +++++++++++++++++ .../java/org/apache/solr/util/package.html | 29 +++++++++++++++++ .../org/apache/solr/util/plugin/package.html | 30 ++++++++++++++++++ .../org/apache/solr/util/stats/package.html | 29 +++++++++++++++++ .../org/apache/solr/util/xslt/package.html | 27 ++++++++++++++++ 45 files changed, 1262 insertions(+), 11 deletions(-) create mode 100644 solr/core/src/java/org/apache/solr/analysis/package.html create mode 100644 solr/core/src/java/org/apache/solr/client/solrj/embedded/package.html create mode 100644 solr/core/src/java/org/apache/solr/cloud/package.html create mode 100644 solr/core/src/java/org/apache/solr/common/package.html create mode 100644 solr/core/src/java/org/apache/solr/core/package.html create mode 100644 solr/core/src/java/org/apache/solr/handler/admin/package.html create mode 100644 solr/core/src/java/org/apache/solr/handler/component/package.html create mode 100644 solr/core/src/java/org/apache/solr/handler/loader/package.html create mode 100644 solr/core/src/java/org/apache/solr/handler/package.html create mode 100644 solr/core/src/java/org/apache/solr/highlight/package.html create mode 100644 solr/core/src/java/org/apache/solr/internal/csv/package.html create mode 100644 solr/core/src/java/org/apache/solr/internal/csv/writer/package.html create mode 100644 solr/core/src/java/org/apache/solr/logging/jul/package.html create mode 100644 solr/core/src/java/org/apache/solr/logging/package.html create mode 100644 solr/core/src/java/org/apache/solr/package.html create mode 100644 solr/core/src/java/org/apache/solr/parser/package.html create mode 100644 solr/core/src/java/org/apache/solr/request/package.html create mode 100644 solr/core/src/java/org/apache/solr/response/package.html create mode 100644 solr/core/src/java/org/apache/solr/response/transform/package.html create mode 100644 solr/core/src/java/org/apache/solr/schema/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/function/distance/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/function/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/collector/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/distributed/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/grouping/package.html create mode 100644 solr/core/src/java/org/apache/solr/search/package.html create mode 100644 solr/core/src/java/org/apache/solr/servlet/cache/package.html create mode 100644 solr/core/src/java/org/apache/solr/servlet/package.html create mode 100644 solr/core/src/java/org/apache/solr/spelling/package.html create mode 100644 solr/core/src/java/org/apache/solr/spelling/suggest/fst/package.html create mode 100644 solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package.html create mode 100644 solr/core/src/java/org/apache/solr/spelling/suggest/package.html create mode 100644 solr/core/src/java/org/apache/solr/spelling/suggest/tst/package.html create mode 100644 solr/core/src/java/org/apache/solr/update/package.html create mode 100644 solr/core/src/java/org/apache/solr/update/processor/package.html create mode 100644 solr/core/src/java/org/apache/solr/util/package.html create mode 100644 solr/core/src/java/org/apache/solr/util/plugin/package.html create mode 100644 solr/core/src/java/org/apache/solr/util/stats/package.html create mode 100644 solr/core/src/java/org/apache/solr/util/xslt/package.html diff --git a/solr/build.xml b/solr/build.xml index 7110d6ad89a..9c0cfdf6fb1 100644 --- a/solr/build.xml +++ b/solr/build.xml @@ -560,17 +560,8 @@ - - - - - - - - - - - + + diff --git a/solr/core/src/java/org/apache/solr/analysis/package.html b/solr/core/src/java/org/apache/solr/analysis/package.html new file mode 100644 index 00000000000..3d54ac23909 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/analysis/package.html @@ -0,0 +1,30 @@ + + + + + + + +

+Factories and classes specific to text analysis and the creation of {@link org.apache.lucene.analysis.TokenStream}s +

+

+See {@link org.apache.lucene.analysis} for additional details. +

+ + diff --git a/solr/core/src/java/org/apache/solr/client/solrj/embedded/package.html b/solr/core/src/java/org/apache/solr/client/solrj/embedded/package.html new file mode 100644 index 00000000000..f4ad434d57c --- /dev/null +++ b/solr/core/src/java/org/apache/solr/client/solrj/embedded/package.html @@ -0,0 +1,30 @@ + + + + + + + +

+SolrJ client implementations for embedded solr access. +

+

+See {@link org.apache.solr.client.solrj} for additional details. +

+ + diff --git a/solr/core/src/java/org/apache/solr/cloud/package.html b/solr/core/src/java/org/apache/solr/cloud/package.html new file mode 100644 index 00000000000..07a62bf3668 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/cloud/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Classes for dealing with ZooKeeper when operating in SolrCloud mode. +

+ + diff --git a/solr/core/src/java/org/apache/solr/common/package.html b/solr/core/src/java/org/apache/solr/common/package.html new file mode 100644 index 00000000000..6c251545b29 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/common/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Commonly reused classes and interfaces (deprecated package, do not add new classes) + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/core/package.html b/solr/core/src/java/org/apache/solr/core/package.html new file mode 100644 index 00000000000..08ef6ff016e --- /dev/null +++ b/solr/core/src/java/org/apache/solr/core/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Core classes implementin Solr internals and the management of {@link org.apache.solr.core.SolrCore}s +

+ + diff --git a/solr/core/src/java/org/apache/solr/handler/admin/package.html b/solr/core/src/java/org/apache/solr/handler/admin/package.html new file mode 100644 index 00000000000..53685c840b9 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/handler/admin/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+{@link org.apache.solr.request.SolrRequestHandler} implementations for powering he Solr Admin UI +

+ + diff --git a/solr/core/src/java/org/apache/solr/handler/component/package.html b/solr/core/src/java/org/apache/solr/handler/component/package.html new file mode 100644 index 00000000000..6edf1440a51 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/handler/component/package.html @@ -0,0 +1,28 @@ + + + + + + + +

+{@link org.apache.solr.handler.component.SearchComponent} implementations for +use in {@link org.apache.solr.handler.component.SearchHandler} +

+ + diff --git a/solr/core/src/java/org/apache/solr/handler/loader/package.html b/solr/core/src/java/org/apache/solr/handler/loader/package.html new file mode 100644 index 00000000000..d82dac537f6 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/handler/loader/package.html @@ -0,0 +1,28 @@ + + + + + + + +

+{@link org.apache.solr.handler.loader.ContentStreamLoader} implementations for +use in {@link org.apache.solr.handler.ContentStreamHandlerBase} implementations +

+ + diff --git a/solr/core/src/java/org/apache/solr/handler/package.html b/solr/core/src/java/org/apache/solr/handler/package.html new file mode 100644 index 00000000000..3ea6a98d650 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/handler/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Concrete implementations of {@link org.apache.solr.request.SolrRequestHandler} +

+ + diff --git a/solr/core/src/java/org/apache/solr/highlight/package.html b/solr/core/src/java/org/apache/solr/highlight/package.html new file mode 100644 index 00000000000..f8f61204db6 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/highlight/package.html @@ -0,0 +1,30 @@ + + + + + + + +

+{@link org.apache.solr.highlight.SolrHighlighter} API and related implementaions and utilities +

+

+See {@link org.apache.lucene.search.highlight} for addition information. +

+ + diff --git a/solr/core/src/java/org/apache/solr/internal/csv/package.html b/solr/core/src/java/org/apache/solr/internal/csv/package.html new file mode 100644 index 00000000000..45bed2d476b --- /dev/null +++ b/solr/core/src/java/org/apache/solr/internal/csv/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal classes used for reading/writing CSV + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/internal/csv/writer/package.html b/solr/core/src/java/org/apache/solr/internal/csv/writer/package.html new file mode 100644 index 00000000000..45bed2d476b --- /dev/null +++ b/solr/core/src/java/org/apache/solr/internal/csv/writer/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal classes used for reading/writing CSV + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/logging/jul/package.html b/solr/core/src/java/org/apache/solr/logging/jul/package.html new file mode 100644 index 00000000000..2500b6fd0ea --- /dev/null +++ b/solr/core/src/java/org/apache/solr/logging/jul/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+JUL based implementation of {@link org.apache.solr.logging.LogWatcher} +

+ + diff --git a/solr/core/src/java/org/apache/solr/logging/package.html b/solr/core/src/java/org/apache/solr/logging/package.html new file mode 100644 index 00000000000..2e0f79d93c5 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/logging/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+APIs related to capturing log event info in the {@link org.apache.solr.handler.admin.LoggingHandler} + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/package.html b/solr/core/src/java/org/apache/solr/package.html new file mode 100644 index 00000000000..6c251545b29 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Commonly reused classes and interfaces (deprecated package, do not add new classes) + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/parser/package.html b/solr/core/src/java/org/apache/solr/parser/package.html new file mode 100644 index 00000000000..9f63c6dc781 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/parser/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Solr native variant of the {@linkplain org.apache.lucene.queryparser.classic.QueryParser Lucene Classic QueryParser} + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/request/package.html b/solr/core/src/java/org/apache/solr/request/package.html new file mode 100644 index 00000000000..d55367d7e80 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/request/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+APIs and classes for dealing with Solr requests + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/response/package.html b/solr/core/src/java/org/apache/solr/response/package.html new file mode 100644 index 00000000000..acd721e6af1 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/response/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+API and implementations of {@link org.apache.solr.response.QueryResponseWriter} for formating Solr request responses + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/response/transform/package.html b/solr/core/src/java/org/apache/solr/response/transform/package.html new file mode 100644 index 00000000000..8e80ce36afe --- /dev/null +++ b/solr/core/src/java/org/apache/solr/response/transform/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+APIs and implementations of {@link org.apache.solr.response.transform.DocTransformer} for modifying documents in Solr request responses + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/schema/package.html b/solr/core/src/java/org/apache/solr/schema/package.html new file mode 100644 index 00000000000..6e119b496a4 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/schema/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+{@link org.apache.solr.schema.IndexSchema} and {@link org.apache.solr.schema.FieldType} implementations for powering schema.xml + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/function/distance/package.html b/solr/core/src/java/org/apache/solr/search/function/distance/package.html new file mode 100644 index 00000000000..0dd1bcda713 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/function/distance/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Solr implementations of {@link org.apache.lucene.queries.function.ValueSource} for distance based function queries. +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/function/package.html b/solr/core/src/java/org/apache/solr/search/function/package.html new file mode 100644 index 00000000000..ac18d1cb438 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/function/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Solr implementations of {@link org.apache.lucene.queries.function.ValueSource} for function queries. +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/collector/package.html b/solr/core/src/java/org/apache/solr/search/grouping/collector/package.html new file mode 100644 index 00000000000..dad63efc36b --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/collector/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Grouping related {@link org.apache.lucene.search.Collector}s + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package.html b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package.html new file mode 100644 index 00000000000..fab4e35fbae --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/command/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal classes used to implement distributed result grouping + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/package.html b/solr/core/src/java/org/apache/solr/search/grouping/distributed/package.html new file mode 100644 index 00000000000..aa6e9c3747e --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal APIs for distribute result grouping + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package.html b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package.html new file mode 100644 index 00000000000..fab4e35fbae --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/requestfactory/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal classes used to implement distributed result grouping + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package.html b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package.html new file mode 100644 index 00000000000..fab4e35fbae --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal classes used to implement distributed result grouping + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package.html b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package.html new file mode 100644 index 00000000000..fab4e35fbae --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Internal classes used to implement distributed result grouping + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package.html b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package.html new file mode 100644 index 00000000000..f2972665365 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/endresulttransformer/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+APIs and classes for transforming result grouping results into the appropriate response format + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/grouping/package.html b/solr/core/src/java/org/apache/solr/search/grouping/package.html new file mode 100644 index 00000000000..3b4d319a5b1 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/grouping/package.html @@ -0,0 +1,31 @@ + + + + + + + +

+APIs and classes for implementing result grouping +

+

+See the solr wiki for more information + +

+ + diff --git a/solr/core/src/java/org/apache/solr/search/package.html b/solr/core/src/java/org/apache/solr/search/package.html new file mode 100644 index 00000000000..9d5e7c7d421 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/search/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+APIs and classes for {@linkplain org.apache.solr.search.QParserPlugin parsing} and {@linkplain org.apache.solr.search.SolrIndexSearcher processing} search requests +

+ + diff --git a/solr/core/src/java/org/apache/solr/servlet/cache/package.html b/solr/core/src/java/org/apache/solr/servlet/cache/package.html new file mode 100644 index 00000000000..849fc7ecd36 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/servlet/cache/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Caching related classes used in the Solr HTTP API +

+ + diff --git a/solr/core/src/java/org/apache/solr/servlet/package.html b/solr/core/src/java/org/apache/solr/servlet/package.html new file mode 100644 index 00000000000..b32c43c09f3 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/servlet/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+Servlet related classes for powering the Solr HTTP API +

+ + diff --git a/solr/core/src/java/org/apache/solr/spelling/package.html b/solr/core/src/java/org/apache/solr/spelling/package.html new file mode 100644 index 00000000000..1cf9b4d0077 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/spelling/package.html @@ -0,0 +1,30 @@ + + + + + + + +

+APIs and classes used by the {@link org.apache.solr.handler.component.SpellCheckComponent} +

+

+See {@link org.apache.lucene.search.spell} and {@link org.apache.lucene.search.suggest} for additional information. +

+ + diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package.html b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package.html new file mode 100644 index 00000000000..46d575401e3 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/fst/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Factories for {@linkplain org.apache.lucene.search.suggest.fst FST} and {@linkplain org.apache.lucene.search.suggest.analyzing Analyzing} based {@link org.apache.solr.spelling.suggest.Suggester}s + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package.html b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package.html new file mode 100644 index 00000000000..acdb3a8b874 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/jaspell/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Factories for {@linkplain org.apache.lucene.search.suggest.jaspell JaSpell} based {@link org.apache.solr.spelling.suggest.Suggester}s + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/package.html b/solr/core/src/java/org/apache/solr/spelling/suggest/package.html new file mode 100644 index 00000000000..1cf9b4d0077 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/package.html @@ -0,0 +1,30 @@ + + + + + + + +

+APIs and classes used by the {@link org.apache.solr.handler.component.SpellCheckComponent} +

+

+See {@link org.apache.lucene.search.spell} and {@link org.apache.lucene.search.suggest} for additional information. +

+ + diff --git a/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package.html b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package.html new file mode 100644 index 00000000000..b1cbc48345b --- /dev/null +++ b/solr/core/src/java/org/apache/solr/spelling/suggest/tst/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Factories for {@linkplain org.apache.lucene.search.suggest.tst TST} based {@link org.apache.solr.spelling.suggest.Suggester}s + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/update/package.html b/solr/core/src/java/org/apache/solr/update/package.html new file mode 100644 index 00000000000..2d9f8a96344 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/update/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+APIs and classes for managing index updates + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/update/processor/package.html b/solr/core/src/java/org/apache/solr/update/processor/package.html new file mode 100644 index 00000000000..118eec0523c --- /dev/null +++ b/solr/core/src/java/org/apache/solr/update/processor/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+{@link org.apache.solr.update.processor.UpdateRequestProcessorFactory} APIs and implementations for use in {@link org.apache.solr.update.processor.UpdateRequestProcessorChain}s + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/util/package.html b/solr/core/src/java/org/apache/solr/util/package.html new file mode 100644 index 00000000000..af584ddc528 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/util/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Common utility classes used throughout Solr + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/util/plugin/package.html b/solr/core/src/java/org/apache/solr/util/plugin/package.html new file mode 100644 index 00000000000..132026004ea --- /dev/null +++ b/solr/core/src/java/org/apache/solr/util/plugin/package.html @@ -0,0 +1,30 @@ + + + + + + + +

+Common APIs related to implementing Solr plugins +

+

+See also: {@link org.apache.solr.util.SolrPluginUtils}. +

+ + diff --git a/solr/core/src/java/org/apache/solr/util/stats/package.html b/solr/core/src/java/org/apache/solr/util/stats/package.html new file mode 100644 index 00000000000..30a402e7222 --- /dev/null +++ b/solr/core/src/java/org/apache/solr/util/stats/package.html @@ -0,0 +1,29 @@ + + + + + + + +

+Utilities for collecting statistics + + +

+ + diff --git a/solr/core/src/java/org/apache/solr/util/xslt/package.html b/solr/core/src/java/org/apache/solr/util/xslt/package.html new file mode 100644 index 00000000000..3a764eb80db --- /dev/null +++ b/solr/core/src/java/org/apache/solr/util/xslt/package.html @@ -0,0 +1,27 @@ + + + + + + + +

+XSLT related utilities (deprecated package, do not add new classes) +

+ + From a81ac90986383afc1e2679afbb718dc2c5ed8ab6 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Wed, 30 Jan 2013 09:08:06 +0000 Subject: [PATCH 07/17] LUCENE-4732: Fixed TermsEnum.seekCeil/seekExact on term vectors. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440308 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/CHANGES.txt | 3 + .../CompressingTermVectorsReader.java | 16 +++-- .../lucene40/Lucene40TermVectorsReader.java | 2 +- .../lucene/index/TestDuelingCodecs.java | 64 +++++++++++-------- 4 files changed, 55 insertions(+), 30 deletions(-) diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 0bbf862d887..7069db7c1d9 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -115,6 +115,9 @@ Bug Fixes you have a taxonomy index created with such strings, you should rebuild it. (Michael McCandless, Shai Erera) +* LUCENE-4732: Fixed TermsEnum.seekCeil/seekExact on term vectors. + (Adrien Grand, Robert Muir) + ======================= Lucene 4.1.0 ======================= Changes in backwards compatibility policy diff --git a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java index 3ecf42e55a9..d77b9840c54 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingTermVectorsReader.java @@ -832,10 +832,18 @@ public final class CompressingTermVectorsReader extends TermVectorsReader implem } } // linear scan - do { - next(); - } while (ord < numTerms - 1 && term().compareTo(text) < 0); - return term().equals(text) ? SeekStatus.FOUND : SeekStatus.END; + while (true) { + final BytesRef term = next(); + if (term == null) { + return SeekStatus.END; + } + final int cmp = term.compareTo(text); + if (cmp > 0) { + return SeekStatus.NOT_FOUND; + } else if (cmp == 0) { + return SeekStatus.FOUND; + } + } } @Override diff --git a/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java b/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java index 714ec84219f..628090ab763 100644 --- a/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java +++ b/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java @@ -422,7 +422,7 @@ public class Lucene40TermVectorsReader extends TermVectorsReader implements Clos this.storePayloads = storePayloads; nextTerm = 0; tvf.seek(tvfFPStart); - tvfFP = 1+tvfFPStart; + tvfFP = tvfFPStart; positions = null; startOffsets = null; endOffsets = null; diff --git a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java index 1659aeab40c..ffd488b0bb6 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java @@ -30,7 +30,6 @@ import java.util.TreeSet; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.codecs.Codec; -import org.apache.lucene.document.Document; import org.apache.lucene.index.TermsEnum.SeekStatus; import org.apache.lucene.search.DocIdSetIterator; import org.apache.lucene.store.Directory; @@ -39,6 +38,7 @@ import org.apache.lucene.util.BytesRef; import org.apache.lucene.util.FixedBitSet; import org.apache.lucene.util.LineFileDocs; import org.apache.lucene.util.LuceneTestCase; +import org.apache.lucene.util._TestUtil; import org.apache.lucene.util.automaton.AutomatonTestUtil; import org.apache.lucene.util.automaton.CompiledAutomaton; import org.apache.lucene.util.automaton.RegExp; @@ -231,11 +231,11 @@ public class TestDuelingCodecs extends LuceneTestCase { private void assertTermsSeeking(Terms leftTerms, Terms rightTerms) throws Exception { TermsEnum leftEnum = null; TermsEnum rightEnum = null; - + // just an upper bound int numTests = atLeast(20); Random random = random(); - + // collect this number of terms from the left side HashSet tests = new HashSet(); int numPasses = 0; @@ -259,36 +259,50 @@ public class TestDuelingCodecs extends LuceneTestCase { byte newbytes[] = new byte[term.length+5]; System.arraycopy(term.bytes, term.offset, newbytes, 5, term.length); tests.add(new BytesRef(newbytes, 5, term.length)); + } else if (code == 3) { + switch (random().nextInt(3)) { + case 0: + tests.add(new BytesRef()); // before the first term + break; + case 1: + tests.add(new BytesRef(new byte[] {(byte) 0xFF, (byte) 0xFF})); // past the last term + break; + case 2: + tests.add(new BytesRef(_TestUtil.randomSimpleString(random()))); // random term + break; + default: + throw new AssertionError(); + } } } numPasses++; } - + + rightEnum = rightTerms.iterator(rightEnum); + ArrayList shuffledTests = new ArrayList(tests); Collections.shuffle(shuffledTests, random); - + for (BytesRef b : shuffledTests) { - leftEnum = leftTerms.iterator(leftEnum); - rightEnum = rightTerms.iterator(rightEnum); - - assertEquals(info, leftEnum.seekExact(b, false), rightEnum.seekExact(b, false)); - assertEquals(info, leftEnum.seekExact(b, true), rightEnum.seekExact(b, true)); - - SeekStatus leftStatus; - SeekStatus rightStatus; - - leftStatus = leftEnum.seekCeil(b, false); - rightStatus = rightEnum.seekCeil(b, false); - assertEquals(info, leftStatus, rightStatus); - if (leftStatus != SeekStatus.END) { - assertEquals(info, leftEnum.term(), rightEnum.term()); + if (rarely()) { + // reuse the enums + leftEnum = leftTerms.iterator(leftEnum); + rightEnum = rightTerms.iterator(rightEnum); } - - leftStatus = leftEnum.seekCeil(b, true); - rightStatus = rightEnum.seekCeil(b, true); - assertEquals(info, leftStatus, rightStatus); - if (leftStatus != SeekStatus.END) { - assertEquals(info, leftEnum.term(), rightEnum.term()); + + final boolean useCache = random().nextBoolean(); + final boolean seekExact = random().nextBoolean(); + + if (seekExact) { + assertEquals(info, leftEnum.seekExact(b, useCache), rightEnum.seekExact(b, useCache)); + } else { + SeekStatus leftStatus = leftEnum.seekCeil(b, useCache); + SeekStatus rightStatus = rightEnum.seekCeil(b, useCache); + assertEquals(info, leftStatus, rightStatus); + if (leftStatus != SeekStatus.END) { + assertEquals(info, leftEnum.term(), rightEnum.term()); + assertTermStats(leftEnum, rightEnum); + } } } } From 913b168255d5b0e9fc68cd1d467a530b9fb63be6 Mon Sep 17 00:00:00 2001 From: Adrien Grand Date: Wed, 30 Jan 2013 09:14:08 +0000 Subject: [PATCH 08/17] Fix test bug. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440311 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/test/org/apache/lucene/index/TestPayloadsOnVectors.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java index 7f9832fd43c..d497c117814 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestPayloadsOnVectors.java @@ -251,7 +251,7 @@ public class TestPayloadsOnVectors extends LuceneTestCase { for (int i = 0; i < len; ++i) { terms[i] = RandomPicks.randomFrom(random(), sampleTerms); if (weird) { - positionsIncrements[i] = random().nextInt(1 << 18); + positionsIncrements[i] = _TestUtil.nextInt(random(), 1, 1 << 18); startOffsets[i] = random().nextInt(); endOffsets[i] = random().nextInt(); } else if (i == 0) { From 42256baec586dbfeeb397dcdcd4f9a010deab398 Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Wed, 30 Jan 2013 13:51:38 +0000 Subject: [PATCH 09/17] LUCENE-4715: Add OrdinalPolicy.ALL_BUT_DIMENSION git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440416 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/CHANGES.txt | 5 ++ .../facet/index/CountingListBuilder.java | 22 ++++-- .../index/params/CategoryListParams.java | 75 ++++++++++++++----- .../params/PerDimensionOrdinalPolicy.java | 55 ++++++++++++++ .../facet/search/CountingFacetsCollector.java | 44 +++++------ .../lucene/facet/search/FacetsCollector.java | 10 ++- .../facet/search/StandardFacetsCollector.java | 12 +++ .../lucene/facet/util/ScoredDocIdsUtils.java | 1 + .../apache/lucene/facet/FacetTestBase.java | 75 +++++++++++++------ .../facet/example/TestMultiCLExample.java | 1 - .../TestFacetsPayloadMigrationReader.java | 22 +++++- .../lucene/facet/search/BaseTestTopK.java | 13 +--- .../search/CountingFacetsCollectorTest.java | 27 +++---- .../lucene/facet/search/TestDemoFacets.java | 6 +- .../TestFacetsAccumulatorWithComplement.java | 8 +- .../search/TestMultipleCategoryLists.java | 4 - .../search/TestSameRequestAccumulation.java | 10 ++- .../search/TestScoredDocIdCollector.java | 16 ++-- .../search/TestStandardFacetsAccumulator.java | 1 - .../TestTopKInEachNodeResultHandler.java | 3 - .../facet/search/TestTopKResultsHandler.java | 47 +++++++----- .../search/TestTopKResultsHandlerRandom.java | 16 ++-- .../facet/search/TestTotalFacetCounts.java | 12 +++ .../search/TestTotalFacetCountsCache.java | 2 +- .../search/sampling/BaseSampleTestTopK.java | 14 ++-- 25 files changed, 346 insertions(+), 155 deletions(-) create mode 100644 lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionOrdinalPolicy.java diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 7069db7c1d9..3abd8b9bb5c 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -61,6 +61,11 @@ Optimizations * LUCENE-4690: Performance improvements and non-hashing versions of NumericUtils.*ToPrefixCoded() (yonik) +* LUCENE-4715: CategoryListParams.getOrdinalPolicy now allows to return a + different OrdinalPolicy per dimension, to better tune how you index + facets. Also added OrdinalPolicy.ALL_BUT_DIMENSION. + (Shai Erera, Michael McCandless) + New Features * LUCENE-4686: New specialized DGapVInt8IntEncoder for facets (now the diff --git a/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java b/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java index d96d85af59a..e41ca4bb958 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/index/CountingListBuilder.java @@ -3,6 +3,7 @@ package org.apache.lucene.facet.index; import java.io.IOException; import java.util.Collections; import java.util.HashMap; +import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; @@ -115,12 +116,12 @@ public class CountingListBuilder implements CategoryListBuilder { private final OrdinalsEncoder ordinalsEncoder; private final TaxonomyWriter taxoWriter; - private final OrdinalPolicy ordinalPolicy; + private final CategoryListParams clp; public CountingListBuilder(CategoryListParams categoryListParams, FacetIndexingParams indexingParams, TaxonomyWriter taxoWriter) { this.taxoWriter = taxoWriter; - this.ordinalPolicy = categoryListParams.getOrdinalPolicy(); + this.clp = categoryListParams; if (indexingParams.getPartitionSize() == Integer.MAX_VALUE) { ordinalsEncoder = new NoPartitionsOrdinalsEncoder(categoryListParams); } else { @@ -141,16 +142,23 @@ public class CountingListBuilder implements CategoryListBuilder { */ @Override public Map build(IntsRef ordinals, Iterable categories) throws IOException { - int upto = ordinals.length; // since we add ordinals to IntsRef, iterate upto original length - - if (ordinalPolicy == OrdinalPolicy.ALL_PARENTS) { // add all parents too - for (int i = 0; i < upto; i++) { - int ordinal = ordinals.ints[i]; + int upto = ordinals.length; // since we may add ordinals to IntsRef, iterate upto original length + + Iterator iter = categories.iterator(); + for (int i = 0; i < upto; i++) { + int ordinal = ordinals.ints[i]; + CategoryPath cp = iter.next(); + OrdinalPolicy op = clp.getOrdinalPolicy(cp.components[0]); + if (op != OrdinalPolicy.NO_PARENTS) { + // need to add parents too int parent = taxoWriter.getParent(ordinal); while (parent > 0) { ordinals.ints[ordinals.length++] = parent; parent = taxoWriter.getParent(parent); } + if (op == OrdinalPolicy.ALL_BUT_DIMENSION) { // discard the last added parent, which is the dimension + ordinals.length--; + } } } return ordinalsEncoder.encode(ordinals); diff --git a/lucene/facet/src/java/org/apache/lucene/facet/index/params/CategoryListParams.java b/lucene/facet/src/java/org/apache/lucene/facet/index/params/CategoryListParams.java index 08c1747ed7b..dcf8ed191a2 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/index/params/CategoryListParams.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/index/params/CategoryListParams.java @@ -4,6 +4,7 @@ import java.io.IOException; import org.apache.lucene.facet.search.CategoryListIterator; import org.apache.lucene.facet.search.DocValuesCategoryListIterator; +import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.util.PartitionsUtils; import org.apache.lucene.util.encoding.DGapVInt8IntEncoder; import org.apache.lucene.util.encoding.IntDecoder; @@ -35,25 +36,61 @@ import org.apache.lucene.util.encoding.UniqueValuesIntEncoder; */ public class CategoryListParams { - /** OrdinalPolicy defines which ordinals are encoded for every document. */ + /** + * Defines which category ordinals are encoded for every document. This also + * affects how category ordinals are aggregated, check the different policies + * for more details. + */ public static enum OrdinalPolicy { /** - * Encodes only the ordinal of leaf nodes. That is, the category A/B/C will - * not encode the ordinals of A and A/B. + * Encodes only the ordinals of leaf nodes. That is, for the category A/B/C, + * the ordinals of A and A/B will not be encoded. This policy is efficient + * for hierarchical dimensions, as it reduces the number of ordinals that + * are visited per document. During faceted search, this policy behaves + * exactly like {@link #ALL_PARENTS}, and the counts of all path components + * will be computed as well. * *

* NOTE: this {@link OrdinalPolicy} requires a special collector or - * accumulator, which will fix the parents' counts, unless you are not - * interested in the parents counts. + * accumulator, which will fix the parents' counts. + * + *

+ * NOTE: since only leaf nodes are encoded for the document, you + * should use this policy when the same document doesn't share two + * categories that have a mutual parent, or otherwise the counts will be + * wrong (the mutual parent will be over-counted). For example, if a + * document has the categories A/B/C and A/B/D, then with this policy the + * counts of "A" and "B" will be 2, which is wrong. If you intend to index + * hierarchical dimensions, with more than one category per document, you + * should use either {@link #ALL_PARENTS} or {@link #ALL_BUT_DIMENSION}. */ NO_PARENTS, /** * Encodes the ordinals of all path components. That is, the category A/B/C - * will encode the ordinals of A and A/B as well. This is the default - * {@link OrdinalPolicy}. + * will encode the ordinals of A and A/B as well. If you don't require the + * dimension's count during search, consider using + * {@link #ALL_BUT_DIMENSION}. */ - ALL_PARENTS + ALL_PARENTS, + + /** + * Encodes the ordinals of all path components except the dimension. The + * dimension of a category is defined to be the first components in + * {@link CategoryPath#components}. For the category A/B/C, the ordinal of + * A/B will be encoded as well, however not the ordinal of A. + * + *

+ * NOTE: when facets are aggregated, this policy behaves exactly like + * {@link #ALL_PARENTS}, except that the dimension is never counted. I.e. if + * you ask to count the facet "A", then while in {@link #ALL_PARENTS} you + * will get counts for "A" and its children, with this policy you + * will get counts for only its children. This policy is the default + * one, and makes sense for using with flat dimensions, whenever your + * application does not require the dimension's count. Otherwise, use + * {@link #ALL_PARENTS}. + */ + ALL_BUT_DIMENSION } /** The default field used to store the facets information. */ @@ -63,7 +100,7 @@ public class CategoryListParams { * The default {@link OrdinalPolicy} that's used when encoding a document's * category ordinals. */ - public static final OrdinalPolicy DEFAULT_ORDINAL_POLICY = OrdinalPolicy.ALL_PARENTS; + public static final OrdinalPolicy DEFAULT_ORDINAL_POLICY = OrdinalPolicy.ALL_BUT_DIMENSION; public final String field; @@ -115,19 +152,15 @@ public class CategoryListParams { return false; } CategoryListParams other = (CategoryListParams) o; - if (this.hashCode != other.hashCode) { + if (hashCode != other.hashCode) { return false; } - - // The above hashcodes might equal each other in the case of a collision, - // so at this point only directly term equality testing will settle - // the equality test. return field.equals(other.field); } @Override public int hashCode() { - return this.hashCode; + return hashCode; } /** Create the {@link CategoryListIterator} for the specified partition. */ @@ -137,14 +170,18 @@ public class CategoryListParams { return new DocValuesCategoryListIterator(docValuesField, createEncoder().createMatchingDecoder()); } - /** Returns the {@link OrdinalPolicy} to use for this {@link CategoryListParams}. */ - public OrdinalPolicy getOrdinalPolicy() { + /** + * Returns the {@link OrdinalPolicy} to use for the given dimension. This + * {@link CategoryListParams} always returns {@link #DEFAULT_ORDINAL_POLICY} + * for all dimensions. + */ + public OrdinalPolicy getOrdinalPolicy(String dimension) { return DEFAULT_ORDINAL_POLICY; } @Override public String toString() { - return "field=" + field + " encoder=" + createEncoder() + " ordinalPolicy=" + getOrdinalPolicy(); + return "field=" + field + " encoder=" + createEncoder() + " ordinalPolicy=" + getOrdinalPolicy(null); } -} \ No newline at end of file +} diff --git a/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionOrdinalPolicy.java b/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionOrdinalPolicy.java new file mode 100644 index 00000000000..c91b1a69ccf --- /dev/null +++ b/lucene/facet/src/java/org/apache/lucene/facet/index/params/PerDimensionOrdinalPolicy.java @@ -0,0 +1,55 @@ +package org.apache.lucene.facet.index.params; + +import java.util.Map; + +import org.apache.lucene.facet.taxonomy.CategoryPath; + +/* + * 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 {@link CategoryListParams} which allow controlling the + * {@link CategoryListParams.OrdinalPolicy} used for each dimension. The + * dimension is specified as the first component in + * {@link CategoryPath#components}. + */ +public class PerDimensionOrdinalPolicy extends CategoryListParams { + + private final Map policies; + private final OrdinalPolicy defaultOP; + + public PerDimensionOrdinalPolicy(Map policies) { + this(policies, DEFAULT_ORDINAL_POLICY); + } + + public PerDimensionOrdinalPolicy(Map policies, OrdinalPolicy defaultOP) { + this.defaultOP = defaultOP; + this.policies = policies; + } + + @Override + public OrdinalPolicy getOrdinalPolicy(String dimension) { + OrdinalPolicy op = policies.get(dimension); + return op == null ? defaultOP : op; + } + + @Override + public String toString() { + return super.toString() + " policies=" + policies; + } + +} diff --git a/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsCollector.java b/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsCollector.java index 97eff9930de..461b1aeadf7 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsCollector.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/search/CountingFacetsCollector.java @@ -85,7 +85,7 @@ import org.apache.lucene.util.encoding.DGapVInt8IntDecoder; public class CountingFacetsCollector extends FacetsCollector { private final FacetSearchParams fsp; - private final OrdinalPolicy ordinalPolicy; + private final CategoryListParams clp; private final TaxonomyReader taxoReader; private final BytesRef buf = new BytesRef(32); private final FacetArrays facetArrays; @@ -107,8 +107,7 @@ public class CountingFacetsCollector extends FacetsCollector { assert assertParams(fsp) == null : assertParams(fsp); this.fsp = fsp; - CategoryListParams clp = fsp.indexingParams.getCategoryListParams(fsp.facetRequests.get(0).categoryPath); - this.ordinalPolicy = clp.getOrdinalPolicy(); + this.clp = fsp.indexingParams.getCategoryListParams(fsp.facetRequests.get(0).categoryPath); this.facetsField = clp.field; this.taxoReader = taxoReader; this.facetArrays = facetArrays; @@ -217,21 +216,21 @@ public class CountingFacetsCollector extends FacetsCollector { } } - private void countParents(int[] parents) { - // counts[0] is the count of ROOT, which we don't care about and counts[1] - // can only update counts[0], so we don't bother to visit it too. also, - // since parents always have lower ordinals than their children, we traverse - // the array backwards. this also allows us to update just the immediate - // parent's count (actually, otherwise it would be a mistake). - for (int i = counts.length - 1; i > 1; i--) { - int count = counts[i]; - if (count > 0) { - int parent = parents[i]; - if (parent != 0) { - counts[parent] += count; - } - } + /** + * Computes the counts of ordinals under the given ordinal's tree, by + * recursively going down to leaf nodes and rollin up their counts (called + * only with categories are indexing with OrdinalPolicy.NO_PARENTS). + */ + private int rollupCounts(int ordinal, int[] children, int[] siblings) { + int count = 0; + while (ordinal != TaxonomyReader.INVALID_ORDINAL) { + int childCount = counts[ordinal]; + childCount += rollupCounts(children[ordinal], children, siblings); + counts[ordinal] = childCount; + count += childCount; + ordinal = siblings[ordinal]; } + return count; } @Override @@ -242,11 +241,6 @@ public class CountingFacetsCollector extends FacetsCollector { ParallelTaxonomyArrays arrays = taxoReader.getParallelTaxonomyArrays(); - if (ordinalPolicy == OrdinalPolicy.NO_PARENTS) { - // need to count parents - countParents(arrays.parents()); - } - // compute top-K final int[] children = arrays.children(); final int[] siblings = arrays.siblings(); @@ -256,6 +250,12 @@ public class CountingFacetsCollector extends FacetsCollector { if (rootOrd == TaxonomyReader.INVALID_ORDINAL) { // category does not exist continue; } + OrdinalPolicy ordinalPolicy = clp.getOrdinalPolicy(fr.categoryPath.components[0]); + if (ordinalPolicy == OrdinalPolicy.NO_PARENTS) { + // need to count parents + counts[rootOrd] += rollupCounts(children[rootOrd], children, siblings); + } + FacetResultNode root = new FacetResultNode(); root.ordinal = rootOrd; root.label = fr.categoryPath; diff --git a/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java b/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java index ad8a44d454e..1809d0c4cf5 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/search/FacetsCollector.java @@ -43,13 +43,21 @@ public abstract class FacetsCollector extends Collector { * Returns the most optimized {@link FacetsCollector} for the given search * parameters. The returned {@link FacetsCollector} is guaranteed to satisfy * the requested parameters. + * + * @throws IllegalArgumentException + * if there is no built-in collector that can satisfy the search + * parameters. */ public static FacetsCollector create(FacetSearchParams fsp, IndexReader indexReader, TaxonomyReader taxoReader) { if (CountingFacetsCollector.assertParams(fsp) == null) { return new CountingFacetsCollector(fsp, taxoReader); } - return new StandardFacetsCollector(fsp, indexReader, taxoReader); + if (StandardFacetsCollector.assertParams(fsp) == null) { + return new StandardFacetsCollector(fsp, indexReader, taxoReader); + } + + throw new IllegalArgumentException("None of the built-in FacetsCollectors can handle the given search params"); } /** diff --git a/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsCollector.java b/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsCollector.java index b93320d055b..5147b35bf2f 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsCollector.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/search/StandardFacetsCollector.java @@ -49,6 +49,17 @@ public class StandardFacetsCollector extends FacetsCollector { private List results; private Object resultsGuard; + static String assertParams(FacetSearchParams fsp) { + // make sure none of the categories in the given FacetRequests was indexed with NO_PARENTS + for (FacetRequest fr : fsp.facetRequests) { + CategoryListParams clp = fsp.indexingParams.getCategoryListParams(fr.categoryPath); + if (clp.getOrdinalPolicy(fr.categoryPath.components[0]) == OrdinalPolicy.NO_PARENTS) { + return "this collector does not support aggregating categories that were indexed with OrdinalPolicy.NO_PARENTS"; + } + } + return null; + } + /** * Create a collector for accumulating facets while collecting documents * during search. @@ -62,6 +73,7 @@ public class StandardFacetsCollector extends FacetsCollector { * taxonomy containing the facets. */ public StandardFacetsCollector(FacetSearchParams facetSearchParams, IndexReader indexReader, TaxonomyReader taxonomyReader) { + assert assertParams(facetSearchParams) == null : assertParams(facetSearchParams); facetsAccumulator = initFacetsAccumulator(facetSearchParams, indexReader, taxonomyReader); scoreDocIdCollector = initScoredDocCollector(facetSearchParams, indexReader, taxonomyReader); resultsGuard = new Object(); diff --git a/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java b/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java index 923045ff2d9..917c4ab1ddb 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/util/ScoredDocIdsUtils.java @@ -74,6 +74,7 @@ public class ScoredDocIdsUtils { /** Clear all deleted documents from a given open-bit-set according to a given reader */ private static void clearDeleted(final IndexReader reader, final FixedBitSet set) throws IOException { + // TODO use BitsFilteredDocIdSet? // If there are no deleted docs if (!reader.hasDeletions()) { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java index 91df84c6a0f..2ad38f01e78 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestBase.java @@ -6,6 +6,7 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; @@ -17,6 +18,7 @@ import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.facet.index.FacetFields; import org.apache.lucene.facet.index.params.CategoryListParams; +import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.params.FacetRequest; import org.apache.lucene.facet.search.params.FacetSearchParams; @@ -44,6 +46,7 @@ import org.apache.lucene.util.Bits; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util.LuceneTestCase.SuppressCodecs; import org.apache.lucene.util._TestUtil; +import org.apache.lucene.util.collections.IntToObjectMap; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -73,7 +76,8 @@ public abstract class FacetTestBase extends FacetTestCase { SearchTaxoDirPair() {} } - private static HashMap dirsPerPartitionSize; + private static IntToObjectMap dirsPerPartitionSize; + private static IntToObjectMap fipPerPartitionSize; private static File TEST_DIR; /** Documents text field. */ @@ -91,12 +95,15 @@ public abstract class FacetTestBase extends FacetTestCase { @BeforeClass public static void beforeClassFacetTestBase() { TEST_DIR = _TestUtil.getTempDir("facets"); - dirsPerPartitionSize = new HashMap(); + dirsPerPartitionSize = new IntToObjectMap(); + fipPerPartitionSize = new IntToObjectMap(); } @AfterClass public static void afterClassFacetTestBase() throws Exception { - for (SearchTaxoDirPair pair : dirsPerPartitionSize.values()) { + Iterator iter = dirsPerPartitionSize.iterator(); + while (iter.hasNext()) { + SearchTaxoDirPair pair = iter.next(); IOUtils.close(pair.searchDir, pair.taxoDir); } } @@ -128,20 +135,16 @@ public abstract class FacetTestBase extends FacetTestCase { return DEFAULT_CONTENT[doc]; } - /** Prepare index (in RAM) with single partition */ - protected final void initIndex() throws Exception { - initIndex(Integer.MAX_VALUE); - } - - /** Prepare index (in RAM) with some documents and some facets */ - protected final void initIndex(int partitionSize) throws Exception { - initIndex(partitionSize, false); + /** Prepare index (in RAM) with some documents and some facets. */ + protected final void initIndex(FacetIndexingParams fip) throws Exception { + initIndex(false, fip); } - /** Prepare index (in RAM/Disk) with some documents and some facets */ - protected final void initIndex(int partitionSize, boolean forceDisk) throws Exception { + /** Prepare index (in RAM/Disk) with some documents and some facets. */ + protected final void initIndex(boolean forceDisk, FacetIndexingParams fip) throws Exception { + int partitionSize = fip.getPartitionSize(); if (VERBOSE) { - System.out.println("Partition Size: " + partitionSize+" forceDisk: "+forceDisk); + System.out.println("Partition Size: " + partitionSize + " forceDisk: "+forceDisk); } SearchTaxoDirPair pair = dirsPerPartitionSize.get(Integer.valueOf(partitionSize)); @@ -158,7 +161,7 @@ public abstract class FacetTestBase extends FacetTestCase { RandomIndexWriter iw = new RandomIndexWriter(random(), pair.searchDir, getIndexWriterConfig(getAnalyzer())); TaxonomyWriter taxo = new DirectoryTaxonomyWriter(pair.taxoDir, OpenMode.CREATE); - populateIndex(iw, taxo, getFacetIndexingParams(partitionSize)); + populateIndex(iw, taxo, fip); // commit changes (taxonomy prior to search index for consistency) taxo.commit(); @@ -182,14 +185,40 @@ public abstract class FacetTestBase extends FacetTestCase { /** Returns a {@link FacetIndexingParams} per the given partition size. */ protected FacetIndexingParams getFacetIndexingParams(final int partSize) { - // several of our encoders don't support the value 0, - // which is one of the values encoded when dealing w/ partitions. - return new FacetIndexingParams() { - @Override - public int getPartitionSize() { - return partSize; - } - }; + return getFacetIndexingParams(partSize, false); + } + + /** + * Returns a {@link FacetIndexingParams} per the given partition size. If + * requested, then {@link OrdinalPolicy} will be set to + * {@link OrdinalPolicy#ALL_PARENTS}, otherwise it will randomize. + */ + protected FacetIndexingParams getFacetIndexingParams(final int partSize, final boolean forceAllParents) { + FacetIndexingParams fip = fipPerPartitionSize.get(partSize); + if (fip == null) { + // randomize OrdinalPolicy. Since not all Collectors / Accumulators + // support NO_PARENTS, don't include it. + // TODO: once all code paths support NO_PARENTS, randomize it too. + CategoryListParams randomOP = new CategoryListParams() { + final OrdinalPolicy op = random().nextBoolean() ? OrdinalPolicy.ALL_BUT_DIMENSION : OrdinalPolicy.ALL_PARENTS; + @Override + public OrdinalPolicy getOrdinalPolicy(String dimension) { + return forceAllParents ? OrdinalPolicy.ALL_PARENTS : op; + } + }; + + // several of our encoders don't support the value 0, + // which is one of the values encoded when dealing w/ partitions, + // therefore don't randomize the encoder. + fip = new FacetIndexingParams(randomOP) { + @Override + public int getPartitionSize() { + return partSize; + } + }; + fipPerPartitionSize.put(partSize, fip); + } + return fip; } /** diff --git a/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java b/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java index 357ffb12dbd..55038df7f9f 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java @@ -45,7 +45,6 @@ public class TestMultiCLExample extends LuceneTestCase { assertNotNull("Result should not be null", result); FacetResultNode node = result.getFacetResultNode(); assertEquals("Invalid label", "5", node.label.toString()); - assertEquals("Invalid value", 2.0, node.value, 0.0); assertEquals("Invalid # of subresults", 3, node.subResults.size()); Iterator subResults = node.subResults.iterator(); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/index/TestFacetsPayloadMigrationReader.java b/lucene/facet/src/test/org/apache/lucene/facet/index/TestFacetsPayloadMigrationReader.java index f45aba5c4f3..9c5c477bbf3 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/index/TestFacetsPayloadMigrationReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/index/TestFacetsPayloadMigrationReader.java @@ -25,6 +25,8 @@ import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.index.params.CategoryListParams; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.index.params.PerDimensionIndexingParams; +import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy; +import org.apache.lucene.facet.index.params.PerDimensionOrdinalPolicy; import org.apache.lucene.facet.search.CategoryListIterator; import org.apache.lucene.facet.search.DrillDown; import org.apache.lucene.facet.search.FacetsCollector; @@ -368,9 +370,23 @@ public class TestFacetsPayloadMigrationReader extends FacetTestCase { // set custom CLP fields for two dimensions and use the default ($facets) for the other two HashMap params = new HashMap(); - params.put(new CategoryPath(DIMENSIONS[0]), new CategoryListParams(DIMENSIONS[0])); - params.put(new CategoryPath(DIMENSIONS[1]), new CategoryListParams(DIMENSIONS[1])); - FacetIndexingParams fip = new PerDimensionIndexingParams(params) { + params.put(new CategoryPath(DIMENSIONS[0]), new CategoryListParams(DIMENSIONS[0]) { + @Override + public OrdinalPolicy getOrdinalPolicy(String dimension) { + return OrdinalPolicy.ALL_PARENTS; + } + }); + params.put(new CategoryPath(DIMENSIONS[1]), new CategoryListParams(DIMENSIONS[1]) { + @Override + public OrdinalPolicy getOrdinalPolicy(String dimension) { + return OrdinalPolicy.ALL_PARENTS; + } + }); + + HashMap policies = new HashMap(); + policies.put(DIMENSIONS[2], OrdinalPolicy.ALL_PARENTS); + policies.put(DIMENSIONS[3], OrdinalPolicy.ALL_PARENTS); + FacetIndexingParams fip = new PerDimensionIndexingParams(params, new PerDimensionOrdinalPolicy(policies)) { @Override public int getPartitionSize() { return partitionSize; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java b/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java index 45e2322bbd5..f9f58d9b879 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/BaseTestTopK.java @@ -51,10 +51,9 @@ public abstract class BaseTestTopK extends FacetTestBase { private int nextInt; @Override - protected void populateIndex(RandomIndexWriter iw, TaxonomyWriter taxo, - FacetIndexingParams iParams) throws IOException { + protected void populateIndex(RandomIndexWriter iw, TaxonomyWriter taxo, FacetIndexingParams fip) throws IOException { currDoc = -1; - super.populateIndex(iw, taxo, iParams); + super.populateIndex(iw, taxo, fip); } /** prepare the next random int */ @@ -94,17 +93,13 @@ public abstract class BaseTestTopK extends FacetTestBase { return Arrays.asList(cp); } - protected FacetSearchParams searchParamsWithRequests(int numResults) { - return searchParamsWithRequests(numResults, Integer.MAX_VALUE); - } - - protected FacetSearchParams searchParamsWithRequests(int numResults, int partitionSize) { + protected FacetSearchParams searchParamsWithRequests(int numResults, FacetIndexingParams fip) { List facetRequests = new ArrayList(); facetRequests.add(new CountFacetRequest(new CategoryPath("a"), numResults)); facetRequests.add(new CountFacetRequest(new CategoryPath("a", "1"), numResults)); facetRequests.add(new CountFacetRequest(new CategoryPath("a", "1", "10"), numResults)); facetRequests.add(new CountFacetRequest(new CategoryPath("a", "2", "26", "267"), numResults)); - return getFacetSearchParams(facetRequests, getFacetIndexingParams(partitionSize)); + return getFacetSearchParams(facetRequests, fip); } @Override diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/CountingFacetsCollectorTest.java b/lucene/facet/src/test/org/apache/lucene/facet/search/CountingFacetsCollectorTest.java index 93dc41fcaf0..f235a5aef04 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/CountingFacetsCollectorTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/CountingFacetsCollectorTest.java @@ -16,8 +16,9 @@ import org.apache.lucene.document.StringField; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.index.FacetFields; import org.apache.lucene.facet.index.params.CategoryListParams; +import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy; import org.apache.lucene.facet.index.params.FacetIndexingParams; -import org.apache.lucene.facet.index.params.PerDimensionIndexingParams; +import org.apache.lucene.facet.index.params.PerDimensionOrdinalPolicy; import org.apache.lucene.facet.search.params.CountFacetRequest; import org.apache.lucene.facet.search.params.FacetRequest; import org.apache.lucene.facet.search.params.FacetRequest.SortBy; @@ -146,13 +147,11 @@ public class CountingFacetsCollectorTest extends FacetTestCase { termExpectedCounts.put(cp, termExpectedCounts.get(cp) + 1); } } - // add 1 to each dimension - allExpectedCounts.put(CP_A, allExpectedCounts.get(CP_A) + 1); + // add 1 to each NO_PARENTS dimension allExpectedCounts.put(CP_B, allExpectedCounts.get(CP_B) + 1); allExpectedCounts.put(CP_C, allExpectedCounts.get(CP_C) + 1); allExpectedCounts.put(CP_D, allExpectedCounts.get(CP_D) + 1); if (updateTermExpectedCounts) { - termExpectedCounts.put(CP_A, termExpectedCounts.get(CP_A) + 1); termExpectedCounts.put(CP_B, termExpectedCounts.get(CP_B) + 1); termExpectedCounts.put(CP_C, termExpectedCounts.get(CP_C) + 1); termExpectedCounts.put(CP_D, termExpectedCounts.get(CP_D) + 1); @@ -252,19 +251,13 @@ public class CountingFacetsCollectorTest extends FacetTestCase { conf.setMergePolicy(NoMergePolicy.COMPOUND_FILES); // prevent merges, so we can control the index segments IndexWriter indexWriter = new IndexWriter(indexDir, conf); TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir); - CategoryListParams allParents = new CategoryListParams(); - CategoryListParams noParents = new CategoryListParams("no_parents") { - @Override - public OrdinalPolicy getOrdinalPolicy() { - return OrdinalPolicy.NO_PARENTS; - } - }; - Map params = new HashMap(); - params.put(CP_A, allParents); - params.put(CP_B, allParents); - params.put(CP_C, noParents); - params.put(CP_D, noParents); - fip = new PerDimensionIndexingParams(params); + + Map policies = new HashMap(); + policies.put(CP_B.components[0], OrdinalPolicy.ALL_PARENTS); + policies.put(CP_C.components[0], OrdinalPolicy.NO_PARENTS); + policies.put(CP_D.components[0], OrdinalPolicy.NO_PARENTS); + CategoryListParams clp = new PerDimensionOrdinalPolicy(policies); + fip = new FacetIndexingParams(clp); allExpectedCounts = newCounts(); termExpectedCounts = newCounts(); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestDemoFacets.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestDemoFacets.java index a4f53e7da0a..1e402cc096c 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestDemoFacets.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestDemoFacets.java @@ -104,9 +104,9 @@ public class TestDemoFacets extends FacetTestCase { // Retrieve & verify results: List results = c.getFacetResults(); assertEquals(2, results.size()); - assertEquals("Publish Date (5)\n 2012 (2)\n 2010 (2)\n 1999 (1)\n", + assertEquals("Publish Date (0)\n 2012 (2)\n 2010 (2)\n 1999 (1)\n", FacetTestUtils.toSimpleString(results.get(0))); - assertEquals("Author (5)\n Lisa (2)\n Frank (1)\n Susan (1)\n Bob (1)\n", + assertEquals("Author (0)\n Lisa (2)\n Frank (1)\n Susan (1)\n Bob (1)\n", FacetTestUtils.toSimpleString(results.get(1))); @@ -117,7 +117,7 @@ public class TestDemoFacets extends FacetTestCase { searcher.search(q2, c); results = c.getFacetResults(); assertEquals(1, results.size()); - assertEquals("Author (2)\n Lisa (1)\n Bob (1)\n", + assertEquals("Author (0)\n Lisa (1)\n Bob (1)\n", FacetTestUtils.toSimpleString(results.get(0))); // Smoke test PrintTaxonomyStats: diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java index 13fc3d18dcf..a93d2611148 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestFacetsAccumulatorWithComplement.java @@ -14,6 +14,7 @@ import org.junit.Before; import org.junit.Test; import org.apache.lucene.facet.FacetTestBase; +import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.FacetsAccumulator; import org.apache.lucene.facet.search.ScoredDocIDs; import org.apache.lucene.facet.search.ScoredDocIdCollector; @@ -48,11 +49,14 @@ import org.apache.lucene.facet.taxonomy.CategoryPath; */ public class TestFacetsAccumulatorWithComplement extends FacetTestBase { + private FacetIndexingParams fip; + @Override @Before public void setUp() throws Exception { super.setUp(); - initIndex(); + fip = getFacetIndexingParams(Integer.MAX_VALUE); + initIndex(fip); } @Override @@ -125,7 +129,7 @@ public class TestFacetsAccumulatorWithComplement extends FacetTestBase { /** compute facets with certain facet requests and docs */ private List findFacets(ScoredDocIDs sDocids, boolean withComplement) throws IOException { - FacetSearchParams fsp = new FacetSearchParams(getFacetIndexingParams(Integer.MAX_VALUE), new CountFacetRequest(new CategoryPath("root","a"), 10)); + FacetSearchParams fsp = new FacetSearchParams(fip, new CountFacetRequest(new CategoryPath("root","a"), 10)); FacetsAccumulator fAccumulator = new StandardFacetsAccumulator(fsp, indexReader, taxoReader); fAccumulator.setComplementThreshold( diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java index d5b5bd29b24..26f8bd75310 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java @@ -274,7 +274,6 @@ public class TestMultipleCategoryLists extends FacetTestCase { Iterable subResults = resNode.subResults; Iterator subIter = subResults.iterator(); - checkResult(resNode, "Band", 5.0); checkResult(subIter.next(), "Band/Rock & Pop", 4.0); checkResult(subIter.next(), "Band/Punk", 1.0); @@ -283,7 +282,6 @@ public class TestMultipleCategoryLists extends FacetTestCase { subResults = resNode.subResults; subIter = subResults.iterator(); - checkResult(resNode, "Band", 5.0); checkResult(subIter.next(), "Band/Rock & Pop", 4.0); checkResult(subIter.next(), "Band/Rock & Pop/Dave Matthews Band", 1.0); checkResult(subIter.next(), "Band/Rock & Pop/REM", 1.0); @@ -297,7 +295,6 @@ public class TestMultipleCategoryLists extends FacetTestCase { subResults = resNode.subResults; subIter = subResults.iterator(); - checkResult(resNode, "Author", 3.0); checkResult(subIter.next(), "Author/Kurt Vonnegut", 1.0); checkResult(subIter.next(), "Author/Stephen King", 1.0); checkResult(subIter.next(), "Author/Mark Twain", 1.0); @@ -307,7 +304,6 @@ public class TestMultipleCategoryLists extends FacetTestCase { subResults = resNode.subResults; subIter = subResults.iterator(); - checkResult(resNode, "Band/Rock & Pop", 4.0); checkResult(subIter.next(), "Band/Rock & Pop/Dave Matthews Band", 1.0); checkResult(subIter.next(), "Band/Rock & Pop/REM", 1.0); checkResult(subIter.next(), "Band/Rock & Pop/U2", 1.0); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestSameRequestAccumulation.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestSameRequestAccumulation.java index a63e6108e00..8575d32ca08 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestSameRequestAccumulation.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestSameRequestAccumulation.java @@ -3,6 +3,7 @@ package org.apache.lucene.facet.search; import java.util.List; import org.apache.lucene.facet.FacetTestBase; +import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.FacetsCollector; import org.apache.lucene.facet.search.params.CountFacetRequest; import org.apache.lucene.facet.search.params.FacetSearchParams; @@ -31,18 +32,21 @@ import org.junit.Before; public class TestSameRequestAccumulation extends FacetTestBase { + private FacetIndexingParams fip; + @Override @Before public void setUp() throws Exception { super.setUp(); - initIndex(); + fip = getFacetIndexingParams(Integer.MAX_VALUE); + initIndex(fip); } // Following LUCENE-4461 - ensure requesting the (exact) same request more // than once does not alter the results public void testTwoSameRequests() throws Exception { final CountFacetRequest facetRequest = new CountFacetRequest(new CategoryPath("root"), 10); - FacetSearchParams fsp = new FacetSearchParams(facetRequest); + FacetSearchParams fsp = new FacetSearchParams(fip, facetRequest); FacetsCollector fc = FacetsCollector.create(fsp, indexReader, taxoReader); searcher.search(new MatchAllDocsQuery(), fc); @@ -50,7 +54,7 @@ public class TestSameRequestAccumulation extends FacetTestBase { final String expected = fc.getFacetResults().get(0).toString(); // now add the same facet request with duplicates (same instance and same one) - fsp = new FacetSearchParams(facetRequest, facetRequest, new CountFacetRequest(new CategoryPath("root"), 10)); + fsp = new FacetSearchParams(fip, facetRequest, facetRequest, new CountFacetRequest(new CategoryPath("root"), 10)); // make sure the search params holds 3 requests now assertEquals(3, fsp.facetRequests.size()); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestScoredDocIdCollector.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestScoredDocIdCollector.java index bac10b19659..03d099e5210 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestScoredDocIdCollector.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestScoredDocIdCollector.java @@ -5,6 +5,7 @@ import java.util.Arrays; import java.util.List; import org.apache.lucene.facet.FacetTestBase; +import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.params.CountFacetRequest; import org.apache.lucene.facet.search.params.FacetSearchParams; import org.apache.lucene.facet.search.params.ScoreFacetRequest; @@ -37,11 +38,14 @@ import org.junit.Test; /** Test ScoredDocIdCollector. */ public class TestScoredDocIdCollector extends FacetTestBase { + private FacetIndexingParams fip; + @Override @Before public void setUp() throws Exception { super.setUp(); - initIndex(); + fip = getFacetIndexingParams(Integer.MAX_VALUE); + initIndex(fip); } @Override @@ -73,8 +77,8 @@ public class TestScoredDocIdCollector extends FacetTestBase { // verify by facet values CategoryPath cp = new CategoryPath("root","a"); - FacetSearchParams countFSP = new FacetSearchParams(getFacetIndexingParams(Integer.MAX_VALUE), new CountFacetRequest(cp, 10)); - FacetSearchParams scoreFSP = new FacetSearchParams(getFacetIndexingParams(Integer.MAX_VALUE), new ScoreFacetRequest(cp, 10)); + FacetSearchParams countFSP = new FacetSearchParams(fip, new CountFacetRequest(cp, 10)); + FacetSearchParams scoreFSP = new FacetSearchParams(fip, new ScoreFacetRequest(cp, 10)); List countRes = findFacets(scoredDocIDs, countFSP); List scoreRes = findFacets(scoredDocIDs, scoreFSP); @@ -101,10 +105,8 @@ public class TestScoredDocIdCollector extends FacetTestBase { } // compute facets with certain facet requests and docs - private List findFacets(ScoredDocIDs sDocids, - FacetSearchParams facetSearchParams) throws IOException { - FacetsAccumulator fAccumulator = new StandardFacetsAccumulator( - facetSearchParams, indexReader, taxoReader); + private List findFacets(ScoredDocIDs sDocids, FacetSearchParams facetSearchParams) throws IOException { + FacetsAccumulator fAccumulator = new StandardFacetsAccumulator(facetSearchParams, indexReader, taxoReader); List res = fAccumulator.accumulate(sDocids); // Results are ready, printing them... diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestStandardFacetsAccumulator.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestStandardFacetsAccumulator.java index 06e09480458..9bc3dc1cc0e 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestStandardFacetsAccumulator.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestStandardFacetsAccumulator.java @@ -113,7 +113,6 @@ public class TestStandardFacetsAccumulator extends FacetTestCase { List results = fc.getFacetResults(); assertEquals("received too many facet results", 1, results.size()); FacetResultNode frn = results.get(0).getFacetResultNode(); - assertEquals("wrong weight for \"A\"", 4, (int) frn.value); assertEquals("wrong number of children", 2, frn.subResults.size()); for (FacetResultNode node : frn.subResults) { assertEquals("wrong weight for child " + node.label, 2, (int) node.value); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java index 856e36f94a4..c5621cb9f64 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java @@ -181,7 +181,6 @@ public class TestTopKInEachNodeResultHandler extends FacetTestCase { boolean hasDoctor = "Doctor".equals(fr.getFacetRequest().categoryPath.components[0]); assertEquals(9, fr.getNumValidDescendants()); FacetResultNode parentRes = fr.getFacetResultNode(); - assertEquals(16.0, parentRes.value, Double.MIN_VALUE); assertEquals(2, parentRes.subResults.size()); // two nodes sorted by descending values: a/b with 8 and a/c with 6 // a/b has two children a/b/2 with value 3, and a/b/1 with value 2. @@ -217,7 +216,6 @@ public class TestTopKInEachNodeResultHandler extends FacetTestCase { hasDoctor |= "Doctor".equals(fr.getFacetRequest().categoryPath.components[0]); assertEquals(9, fr.getNumValidDescendants()); parentRes = fr.getFacetResultNode(); - assertEquals(16.0, parentRes.value, Double.MIN_VALUE); assertEquals(2, parentRes.subResults.size()); // two nodes sorted by descending values: a/b with 8 and a/c with 6 // a/b has two children a/b/2 with value 3, and a/b/1 with value 2. @@ -234,7 +232,6 @@ public class TestTopKInEachNodeResultHandler extends FacetTestCase { hasDoctor |= "Doctor".equals(fr.getFacetRequest().categoryPath.components[0]); assertEquals(4, fr.getNumValidDescendants(), 4); parentRes = fr.getFacetResultNode(); - assertEquals(16.0, parentRes.value, Double.MIN_VALUE); assertEquals(2, parentRes.subResults.size()); // two nodes sorted by descending values: // a/b with value 8 and a/c with value 6 diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandler.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandler.java index a619529e7e5..a82a19c6559 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandler.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandler.java @@ -4,6 +4,8 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import org.apache.lucene.facet.index.params.CategoryListParams.OrdinalPolicy; +import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.params.CountFacetRequest; import org.apache.lucene.facet.search.params.FacetRequest; import org.apache.lucene.facet.search.params.FacetRequest.ResultMode; @@ -73,7 +75,9 @@ public class TestTopKResultsHandler extends BaseTestTopK { @Test public void testSimple() throws Exception { for (int partitionSize : partitionSizes) { - initIndex(partitionSize); + FacetIndexingParams fip = getFacetIndexingParams(partitionSize); + OrdinalPolicy op = fip.getCategoryListParams(null).getOrdinalPolicy(null); + initIndex(fip); List facetRequests = new ArrayList(); facetRequests.add(new CountFacetRequest(new CategoryPath("a"), 100)); @@ -87,8 +91,8 @@ public class TestTopKResultsHandler extends BaseTestTopK { facetRequests.add(new CountFacetRequest(new CategoryPath("a", "c"), 100)); // do different facet counts and compare to control - FacetSearchParams sParams = getFacetSearchParams(facetRequests, getFacetIndexingParams(partitionSize)); - + FacetSearchParams sParams = getFacetSearchParams(facetRequests, fip); + FacetsCollector fc = new StandardFacetsCollector(sParams, indexReader, taxoReader) { @Override protected FacetsAccumulator initFacetsAccumulator(FacetSearchParams facetSearchParams, IndexReader indexReader, TaxonomyReader taxonomyReader) { @@ -100,17 +104,21 @@ public class TestTopKResultsHandler extends BaseTestTopK { searcher.search(new MatchAllDocsQuery(), fc); List facetResults = fc.getFacetResults(); - + FacetResult fr = facetResults.get(0); FacetResultNode parentRes = fr.getFacetResultNode(); - assertEquals(13.0, parentRes.value, Double.MIN_VALUE); + if (op == OrdinalPolicy.ALL_PARENTS) { + assertEquals(13.0, parentRes.value, Double.MIN_VALUE); + } FacetResultNode[] frn = resultNodesAsArray(parentRes); assertEquals(7.0, frn[0].value, Double.MIN_VALUE); assertEquals(6.0, frn[1].value, Double.MIN_VALUE); fr = facetResults.get(1); parentRes = fr.getFacetResultNode(); - assertEquals(13.0, parentRes.value, Double.MIN_VALUE); + if (op == OrdinalPolicy.ALL_PARENTS) { + assertEquals(13.0, parentRes.value, Double.MIN_VALUE); + } frn = resultNodesAsArray(parentRes); assertEquals(7.0, frn[0].value, Double.MIN_VALUE); assertEquals(6.0, frn[1].value, Double.MIN_VALUE); @@ -121,7 +129,9 @@ public class TestTopKResultsHandler extends BaseTestTopK { fr = facetResults.get(2); parentRes = fr.getFacetResultNode(); - assertEquals(7.0, parentRes.value, Double.MIN_VALUE); + if (op == OrdinalPolicy.ALL_PARENTS) { + assertEquals(7.0, parentRes.value, Double.MIN_VALUE); + } frn = resultNodesAsArray(parentRes); assertEquals(2.0, frn[0].value, Double.MIN_VALUE); assertEquals(2.0, frn[1].value, Double.MIN_VALUE); @@ -130,13 +140,17 @@ public class TestTopKResultsHandler extends BaseTestTopK { fr = facetResults.get(3); parentRes = fr.getFacetResultNode(); - assertEquals(2.0, parentRes.value, Double.MIN_VALUE); + if (op == OrdinalPolicy.ALL_PARENTS) { + assertEquals(2.0, parentRes.value, Double.MIN_VALUE); + } frn = resultNodesAsArray(parentRes); assertEquals(0, frn.length); fr = facetResults.get(4); parentRes = fr.getFacetResultNode(); - assertEquals(6.0, parentRes.value, Double.MIN_VALUE); + if (op == OrdinalPolicy.ALL_PARENTS) { + assertEquals(6.0, parentRes.value, Double.MIN_VALUE); + } frn = resultNodesAsArray(parentRes); assertEquals(1.0, frn[0].value, Double.MIN_VALUE); closeAll(); @@ -149,12 +163,12 @@ public class TestTopKResultsHandler extends BaseTestTopK { @Test public void testGetMaxIntFacets() throws Exception { for (int partitionSize : partitionSizes) { - initIndex(partitionSize); + FacetIndexingParams fip = getFacetIndexingParams(partitionSize); + initIndex(fip); // do different facet counts and compare to control CategoryPath path = new CategoryPath("a", "b"); - FacetSearchParams sParams = getFacetSearchParams(getFacetIndexingParams(partitionSize), - new CountFacetRequest(path, Integer.MAX_VALUE)); + FacetSearchParams sParams = getFacetSearchParams(fip, new CountFacetRequest(path, Integer.MAX_VALUE)); FacetsCollector fc = new StandardFacetsCollector(sParams, indexReader, taxoReader) { @Override @@ -174,7 +188,7 @@ public class TestTopKResultsHandler extends BaseTestTopK { // As a control base results, ask for top-1000 results FacetSearchParams sParams2 = getFacetSearchParams( - getFacetIndexingParams(partitionSize), new CountFacetRequest(path, Integer.MAX_VALUE)); + fip, new CountFacetRequest(path, Integer.MAX_VALUE)); FacetsCollector fc2 = new StandardFacetsCollector(sParams2, indexReader, taxoReader) { @Override @@ -207,12 +221,11 @@ public class TestTopKResultsHandler extends BaseTestTopK { @Test public void testSimpleSearchForNonexistentFacet() throws Exception { for (int partitionSize : partitionSizes) { - initIndex(partitionSize); + FacetIndexingParams fip = getFacetIndexingParams(partitionSize); + initIndex(fip); CategoryPath path = new CategoryPath("Miau Hattulla"); - FacetSearchParams sParams = getFacetSearchParams( - getFacetIndexingParams(partitionSize), - new CountFacetRequest(path, 10)); + FacetSearchParams sParams = getFacetSearchParams(fip, new CountFacetRequest(path, 10)); FacetsCollector fc = FacetsCollector.create(sParams, indexReader, taxoReader); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java index 25094f0af5e..083f52306f1 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTopKResultsHandlerRandom.java @@ -4,6 +4,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.List; +import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.params.FacetSearchParams; import org.apache.lucene.facet.search.results.FacetResult; import org.apache.lucene.facet.search.results.FacetResultNode; @@ -32,10 +33,10 @@ import org.junit.Test; public class TestTopKResultsHandlerRandom extends BaseTestTopK { - private List countFacets(int partitionSize, int numResults, final boolean doComplement) + private List countFacets(FacetIndexingParams fip, int numResults, final boolean doComplement) throws IOException { Query q = new MatchAllDocsQuery(); - FacetSearchParams facetSearchParams = searchParamsWithRequests(numResults, partitionSize); + FacetSearchParams facetSearchParams = searchParamsWithRequests(numResults, fip); FacetsCollector fc = new StandardFacetsCollector(facetSearchParams, indexReader, taxoReader) { @Override protected FacetsAccumulator initFacetsAccumulator( @@ -59,7 +60,8 @@ public class TestTopKResultsHandlerRandom extends BaseTestTopK { @Test public void testTopCountsOrder() throws Exception { for (int partitionSize : partitionSizes) { - initIndex(partitionSize); + FacetIndexingParams fip = getFacetIndexingParams(partitionSize); + initIndex(fip); /* * Try out faceted search in it's most basic form (no sampling nor complement @@ -67,7 +69,7 @@ public class TestTopKResultsHandlerRandom extends BaseTestTopK { * being indexed, and later on an "over-all" faceted search is performed. The * results are checked against the DF of each facet by itself */ - List facetResults = countFacets(partitionSize, 100000, false); + List facetResults = countFacets(fip, 100000, false); assertCountsAndCardinality(facetCountsTruth(), facetResults); /* @@ -77,10 +79,10 @@ public class TestTopKResultsHandlerRandom extends BaseTestTopK { * place in here. The results are checked against the a regular (a.k.a * no-complement, no-sampling) faceted search with the same parameters. */ - facetResults = countFacets(partitionSize, 100000, true); + facetResults = countFacets(fip, 100000, true); assertCountsAndCardinality(facetCountsTruth(), facetResults); - List allFacetResults = countFacets(partitionSize, 100000, false); + List allFacetResults = countFacets(fip, 100000, false); HashMap all = new HashMap(); int maxNumNodes = 0; @@ -108,7 +110,7 @@ public class TestTopKResultsHandlerRandom extends BaseTestTopK { if (VERBOSE) { System.out.println("------- verify for "+n+" top results"); } - List someResults = countFacets(partitionSize, n, false); + List someResults = countFacets(fip, n, false); k = 0; for (FacetResult fr : someResults) { FacetResultNode topResNode = fr.getFacetResultNode(); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java index 82388b7fabb..9c5ad268c9d 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java @@ -8,7 +8,9 @@ import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.FacetTestUtils; import org.apache.lucene.facet.FacetTestUtils.IndexTaxonomyReaderPair; import org.apache.lucene.facet.FacetTestUtils.IndexTaxonomyWriterPair; +import org.apache.lucene.facet.index.params.CategoryListParams; import org.apache.lucene.facet.index.params.FacetIndexingParams; +import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.store.Directory; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util._TestUtil; @@ -59,6 +61,16 @@ public class TestTotalFacetCounts extends FacetTestCase { public int getPartitionSize() { return partitionSize; } + + @Override + public CategoryListParams getCategoryListParams(CategoryPath category) { + return new CategoryListParams() { + @Override + public OrdinalPolicy getOrdinalPolicy(String dimension) { + return OrdinalPolicy.ALL_PARENTS; + } + }; + } }; // The counts that the TotalFacetCountsArray should have after adding // the below facets to the index. diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java index a767a8d06dd..55198032f0c 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCountsCache.java @@ -87,7 +87,7 @@ public class TestTotalFacetCountsCache extends FacetTestCase { /** Utility method to add a document and facets to an index/taxonomy. */ static void addFacets(FacetIndexingParams iParams, IndexWriter iw, - TaxonomyWriter tw, String... strings) throws IOException { + TaxonomyWriter tw, String... strings) throws IOException { Document doc = new Document(); FacetFields facetFields = new FacetFields(tw, iParams); facetFields.addFields(doc, Collections.singletonList(new CategoryPath(strings))); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java b/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java index d7de185c0b6..aca59444346 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/BaseSampleTestTopK.java @@ -3,6 +3,7 @@ package org.apache.lucene.facet.search.sampling; import java.util.List; import java.util.Random; +import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.BaseTestTopK; import org.apache.lucene.facet.search.FacetsAccumulator; import org.apache.lucene.facet.search.FacetsCollector; @@ -46,8 +47,8 @@ public abstract class BaseSampleTestTopK extends BaseTestTopK { protected static final int RETRIES = 10; @Override - protected FacetSearchParams searchParamsWithRequests(int numResults, int partitionSize) { - FacetSearchParams res = super.searchParamsWithRequests(numResults, partitionSize); + protected FacetSearchParams searchParamsWithRequests(int numResults, FacetIndexingParams fip) { + FacetSearchParams res = super.searchParamsWithRequests(numResults, fip); for (FacetRequest req : res.facetRequests) { // randomize the way we aggregate results if (random().nextBoolean()) { @@ -71,20 +72,23 @@ public abstract class BaseSampleTestTopK extends BaseTestTopK { boolean useRandomSampler = random().nextBoolean(); for (int partitionSize : partitionSizes) { try { - initIndex(partitionSize); + // complements return counts for all ordinals, so force ALL_PARENTS indexing + // so that it's easier to compare + FacetIndexingParams fip = getFacetIndexingParams(partitionSize, true); + initIndex(fip); // Get all of the documents and run the query, then do different // facet counts and compare to control Query q = new TermQuery(new Term(CONTENT_FIELD, BETA)); // 90% of the docs ScoredDocIdCollector docCollector = ScoredDocIdCollector.create(indexReader.maxDoc(), false); - FacetSearchParams expectedSearchParams = searchParamsWithRequests(K, partitionSize); + FacetSearchParams expectedSearchParams = searchParamsWithRequests(K, fip); FacetsCollector fc = FacetsCollector.create(expectedSearchParams, indexReader, taxoReader); searcher.search(q, MultiCollector.wrap(docCollector, fc)); List expectedResults = fc.getFacetResults(); - FacetSearchParams samplingSearchParams = searchParamsWithRequests(K, partitionSize); + FacetSearchParams samplingSearchParams = searchParamsWithRequests(K, fip); // try several times in case of failure, because the test has a chance to fail // if the top K facets are not sufficiently common with the sample set From dd9ffb9bc5e08ac0904d202505f03c43777de117 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Wed, 30 Jan 2013 16:29:05 +0000 Subject: [PATCH 10/17] SOLR-3911: Replicate after startup option would not replicate until the IndexWriter was lazily opened. git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440508 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 3 + .../solr/handler/ReplicationHandler.java | 7 +- .../solr/handler/TestReplicationHandler.java | 76 +++++++++++++++++++ .../java/org/apache/solr/SolrTestCaseJ4.java | 2 +- 4 files changed, 84 insertions(+), 4 deletions(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 9cca4217344..eb90cb2f84e 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -97,6 +97,9 @@ Bug Fixes * SOLR-3967: langid.enforceSchema option checks source field instead of target field (janhoy) +* SOLR-3911: Replicate after startup option would not replicate until the + IndexWriter was lazily opened. (Mark Miller, Gregg Donovan) + Optimizations ---------------------- diff --git a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java index ff33337abba..5a28e3bceca 100644 --- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java +++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java @@ -42,6 +42,7 @@ import org.apache.commons.io.IOUtils; import org.apache.lucene.index.IndexCommit; import org.apache.lucene.index.IndexDeletionPolicy; import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.store.IOContext; import org.apache.lucene.store.IndexInput; @@ -877,9 +878,9 @@ public class ReplicationHandler extends RequestHandlerBase implements SolrCoreAw } } - // reboot the writer on the new index - // TODO: perhaps this is no longer necessary then? - // core.getUpdateHandler().newIndexWriter(true); + // ensure the writer is init'd so that we have a list of commit points + RefCounted iw = core.getUpdateHandler().getSolrCoreState().getIndexWriter(core); + iw.decref(); } catch (IOException e) { LOG.warn("Unable to get IndexCommit on startup", e); diff --git a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java index 91015c513d8..8e71a3f85da 100644 --- a/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java +++ b/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java @@ -258,6 +258,7 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { doTestStopPoll(); doTestSnapPullWithMasterUrl(); doTestReplicateAfterStartup(); + doTestReplicateAfterStartupWithNoActivity(); doTestIndexAndConfigAliasReplication(); doTestBackup(); } @@ -657,6 +658,81 @@ public class TestReplicationHandler extends SolrTestCaseJ4 { slaveJetty = createJetty(slave); slaveClient = createNewSolrServer(slaveJetty.getLocalPort()); } + + private void doTestReplicateAfterStartupWithNoActivity() throws Exception { + String factory = System.getProperty("solr.directoryFactory"); + System.out.println("factory:" + factory); + useFactory(null); + try { + + //stop slave + slaveJetty.stop(); + + nDocs--; + masterClient.deleteByQuery("*:*"); + + masterClient.commit(); + + //change solrconfig having 'replicateAfter startup' option on master + master.copyConfigFile(CONF_DIR + "solrconfig-master2.xml", + "solrconfig.xml"); + + masterJetty.stop(); + + masterJetty = createJetty(master); + masterClient = createNewSolrServer(masterJetty.getLocalPort()); + + for (int i = 0; i < nDocs; i++) + index(masterClient, "id", i, "name", "name = " + i); + + masterClient.commit(); + + // now we restart to test what happens with no activity before the slave tries to + // replicate + masterJetty.stop(); + masterJetty.start(true); + + //masterClient = createNewSolrServer(masterJetty.getLocalPort()); + + NamedList masterQueryRsp = rQuery(nDocs, "*:*", masterClient); + SolrDocumentList masterQueryResult = (SolrDocumentList) masterQueryRsp.get("response"); + assertEquals(nDocs, masterQueryResult.getNumFound()); + + + slave.setTestPort(masterJetty.getLocalPort()); + slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml"); + + //start slave + slaveJetty = createJetty(slave); + slaveClient = createNewSolrServer(slaveJetty.getLocalPort()); + + //get docs from slave and check if number is equal to master + NamedList slaveQueryRsp = rQuery(nDocs, "*:*", slaveClient); + SolrDocumentList slaveQueryResult = (SolrDocumentList) slaveQueryRsp.get("response"); + assertEquals(nDocs, slaveQueryResult.getNumFound()); + + //compare results + String cmp = BaseDistributedSearchTestCase.compare(masterQueryResult, slaveQueryResult, 0, null); + assertEquals(null, cmp); + + // NOTE: the master only replicates after startup now! + // revert that change. + master.copyConfigFile(CONF_DIR + "solrconfig-master.xml", "solrconfig.xml"); + masterJetty.stop(); + masterJetty = createJetty(master); + masterClient = createNewSolrServer(masterJetty.getLocalPort()); + + slave.setTestPort(masterJetty.getLocalPort()); + slave.copyConfigFile(slave.getSolrConfigFile(), "solrconfig.xml"); + + //start slave + slaveJetty.stop(); + slaveJetty = createJetty(slave); + slaveClient = createNewSolrServer(slaveJetty.getLocalPort()); + } finally { + resetFactory(); + } + } private void doTestReplicateAfterCoreReload() throws Exception { int docs = TEST_NIGHTLY ? 200000 : 0; diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index adcbe0e7d9b..d436e6b7f04 100755 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -116,7 +116,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { changedFactory = true; } - private static void resetFactory() throws Exception { + public static void resetFactory() throws Exception { if (!changedFactory) return; changedFactory = false; if (savedFactory != null) { From 9bfa9dc76769f8699724e06f0e6cef1e21b79235 Mon Sep 17 00:00:00 2001 From: Mark Robert Miller Date: Wed, 30 Jan 2013 16:57:13 +0000 Subject: [PATCH 11/17] SOLR-4380: fix JIRA issue number git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440518 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index eb90cb2f84e..0fb7902cd6c 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -97,7 +97,7 @@ Bug Fixes * SOLR-3967: langid.enforceSchema option checks source field instead of target field (janhoy) -* SOLR-3911: Replicate after startup option would not replicate until the +* SOLR-4380: Replicate after startup option would not replicate until the IndexWriter was lazily opened. (Mark Miller, Gregg Donovan) Optimizations From 1e63ff0b6e80b7f24e4d8e53aabfc8cb9a90fde2 Mon Sep 17 00:00:00 2001 From: Shai Erera Date: Wed, 30 Jan 2013 18:31:07 +0000 Subject: [PATCH 12/17] LUCENE-3998: consolidate facet module examples under demo git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440578 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/build.xml | 3 +- lucene/demo/build.xml | 7 +- .../lucene/demo/facet}/ExampleResult.java | 2 +- .../lucene/demo/facet}/ExampleUtils.java | 2 +- .../demo/facet}/adaptive/AdaptiveMain.java | 10 +- .../facet}/adaptive/AdaptiveSearcher.java | 6 +- .../lucene/demo/facet/adaptive/package.html | 22 ++ .../CategoryAssociationsIndexer.java | 6 +- .../association/CategoryAssociationsMain.java | 6 +- .../CategoryAssociationsSearcher.java | 4 +- .../CategoryAssociationsUtils.java | 2 +- .../demo/facet/association/package.html | 22 ++ .../demo/facet}/multiCL/MultiCLIndexer.java | 20 +- .../demo/facet}/multiCL/MultiCLMain.java | 6 +- .../demo/facet}/multiCL/MultiCLSearcher.java | 6 +- .../lucene/demo/facet/multiCL/package.html | 22 ++ .../org/apache/lucene/demo/facet/package.html | 22 ++ .../demo/facet}/simple/SimpleIndexer.java | 4 +- .../lucene/demo/facet}/simple/SimpleMain.java | 6 +- .../demo/facet}/simple/SimpleSearcher.java | 4 +- .../demo/facet}/simple/SimpleUtils.java | 4 +- .../lucene/demo/facet/simple/package.html | 22 ++ .../demo/facet}/TestAdaptiveExample.java | 6 +- .../demo/facet}/TestAssociationExample.java | 6 +- .../demo/facet}/TestMultiCLExample.java | 5 +- .../lucene/demo/facet}/TestSimpleExample.java | 6 +- lucene/facet/build.xml | 46 --- .../lucene/facet/example/simple/package.html | 17 - .../facet/util}/TaxonomyMergeUtils.java | 7 +- .../apache/lucene/facet/FacetTestUtils.java | 74 ----- .../facet/index/OrdinalMappingReaderTest.java | 2 +- .../search/TestMultipleCategoryLists.java | 65 ++-- .../facet/search/TestTotalFacetCounts.java | 63 ++-- .../search/TestTotalFacetCountsCache.java | 302 +++++++++--------- .../sampling/OversampleWithDepthTest.java | 3 +- .../TestDirectoryTaxonomyReader.java | 6 +- 36 files changed, 395 insertions(+), 421 deletions(-) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/ExampleResult.java (97%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/ExampleUtils.java (96%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/adaptive/AdaptiveMain.java (88%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/adaptive/AdaptiveSearcher.java (96%) create mode 100644 lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/package.html rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/association/CategoryAssociationsIndexer.java (96%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/association/CategoryAssociationsMain.java (94%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/association/CategoryAssociationsSearcher.java (96%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/association/CategoryAssociationsUtils.java (97%) create mode 100644 lucene/demo/src/java/org/apache/lucene/demo/facet/association/package.html rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/multiCL/MultiCLIndexer.java (94%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/multiCL/MultiCLMain.java (92%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/multiCL/MultiCLSearcher.java (96%) create mode 100644 lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/package.html create mode 100644 lucene/demo/src/java/org/apache/lucene/demo/facet/package.html rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/simple/SimpleIndexer.java (97%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/simple/SimpleMain.java (95%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/simple/SimpleSearcher.java (98%) rename lucene/{facet/src/examples/org/apache/lucene/facet/example => demo/src/java/org/apache/lucene/demo/facet}/simple/SimpleUtils.java (95%) create mode 100644 lucene/demo/src/java/org/apache/lucene/demo/facet/simple/package.html rename lucene/{facet/src/test/org/apache/lucene/facet/example => demo/src/test/org/apache/lucene/demo/facet}/TestAdaptiveExample.java (90%) rename lucene/{facet/src/test/org/apache/lucene/facet/example => demo/src/test/org/apache/lucene/demo/facet}/TestAssociationExample.java (92%) rename lucene/{facet/src/test/org/apache/lucene/facet/example => demo/src/test/org/apache/lucene/demo/facet}/TestMultiCLExample.java (95%) rename lucene/{facet/src/test/org/apache/lucene/facet/example => demo/src/test/org/apache/lucene/demo/facet}/TestSimpleExample.java (94%) delete mode 100644 lucene/facet/src/examples/org/apache/lucene/facet/example/simple/package.html rename lucene/facet/src/{examples/org/apache/lucene/facet/example/merge => java/org/apache/lucene/facet/util}/TaxonomyMergeUtils.java (95%) diff --git a/lucene/build.xml b/lucene/build.xml index 7b666c6695c..6751ce0f43e 100644 --- a/lucene/build.xml +++ b/lucene/build.xml @@ -191,8 +191,7 @@ - - + diff --git a/lucene/demo/build.xml b/lucene/demo/build.xml index 3137643850b..b1cd4b48410 100644 --- a/lucene/demo/build.xml +++ b/lucene/demo/build.xml @@ -33,20 +33,22 @@ + - + + - + @@ -63,6 +65,7 @@ + diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleResult.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java similarity index 97% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleResult.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java index fe0f053d9e3..0f08353db0e 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleResult.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example; +package org.apache.lucene.demo.facet; import java.util.List; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleUtils.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java similarity index 96% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleUtils.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java index a58f80c4357..4f788956b05 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/ExampleUtils.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example; +package org.apache.lucene.demo.facet; import org.apache.lucene.util.Version; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java similarity index 88% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveMain.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java index c0abd6f1c29..75704ea1a76 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java @@ -1,14 +1,14 @@ -package org.apache.lucene.facet.example.adaptive; +package org.apache.lucene.demo.facet.adaptive; import java.util.List; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.ExampleUtils; -import org.apache.lucene.facet.example.simple.SimpleIndexer; -import org.apache.lucene.facet.example.simple.SimpleSearcher; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.ExampleUtils; +import org.apache.lucene.demo.facet.simple.SimpleIndexer; +import org.apache.lucene.demo.facet.simple.SimpleSearcher; import org.apache.lucene.facet.search.AdaptiveFacetsAccumulator; import org.apache.lucene.facet.search.results.FacetResult; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java similarity index 96% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveSearcher.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java index c88ab5299eb..7f79192e091 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/adaptive/AdaptiveSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java @@ -1,9 +1,9 @@ -package org.apache.lucene.facet.example.adaptive; +package org.apache.lucene.demo.facet.adaptive; import java.util.List; -import org.apache.lucene.facet.example.ExampleUtils; -import org.apache.lucene.facet.example.simple.SimpleUtils; +import org.apache.lucene.demo.facet.ExampleUtils; +import org.apache.lucene.demo.facet.simple.SimpleUtils; import org.apache.lucene.facet.search.AdaptiveFacetsAccumulator; import org.apache.lucene.facet.search.ScoredDocIdCollector; import org.apache.lucene.facet.search.params.CountFacetRequest; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/package.html b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/package.html new file mode 100644 index 00000000000..a580d7e3e3f --- /dev/null +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/package.html @@ -0,0 +1,22 @@ + + + + +Facets example code for using AdaptiveFacetsAccumulator. + + diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsIndexer.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java similarity index 96% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsIndexer.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java index 85c34783cde..c0b2127b06e 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsIndexer.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java @@ -1,13 +1,13 @@ -package org.apache.lucene.facet.example.association; +package org.apache.lucene.demo.facet.association; +import org.apache.lucene.demo.facet.ExampleUtils; +import org.apache.lucene.demo.facet.simple.SimpleUtils; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.facet.associations.AssociationsFacetFields; import org.apache.lucene.facet.associations.CategoryAssociation; import org.apache.lucene.facet.associations.CategoryAssociationsContainer; -import org.apache.lucene.facet.example.ExampleUtils; -import org.apache.lucene.facet.example.simple.SimpleUtils; import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.TaxonomyWriter; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java similarity index 94% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsMain.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java index bdd99be72dd..ca34e46c87c 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java @@ -1,12 +1,12 @@ -package org.apache.lucene.facet.example.association; +package org.apache.lucene.demo.facet.association; import java.util.List; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.ExampleUtils; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.ExampleUtils; import org.apache.lucene.facet.search.results.FacetResult; /* diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java similarity index 96% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsSearcher.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java index 57c9524266b..e6d66d5da37 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example.association; +package org.apache.lucene.demo.facet.association; import java.util.List; @@ -6,7 +6,7 @@ import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexReader; import org.apache.lucene.store.Directory; -import org.apache.lucene.facet.example.simple.SimpleSearcher; +import org.apache.lucene.demo.facet.simple.SimpleSearcher; import org.apache.lucene.facet.search.params.associations.AssociationFloatSumFacetRequest; import org.apache.lucene.facet.search.params.associations.AssociationIntSumFacetRequest; import org.apache.lucene.facet.search.results.FacetResult; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsUtils.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java similarity index 97% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsUtils.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java index f2cc8520599..a9968f351b9 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/association/CategoryAssociationsUtils.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example.association; +package org.apache.lucene.demo.facet.association; import org.apache.lucene.facet.associations.CategoryAssociation; import org.apache.lucene.facet.associations.CategoryFloatAssociation; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/package.html b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/package.html new file mode 100644 index 00000000000..5c0cd3898cf --- /dev/null +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/package.html @@ -0,0 +1,22 @@ + + + + +Facets example code for using associations. + + diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java similarity index 94% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java index 5925e2327a0..27d3d39f4b2 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example.multiCL; +package org.apache.lucene.demo.facet.multiCL; import java.util.Arrays; import java.util.HashMap; @@ -6,11 +6,11 @@ import java.util.List; import java.util.Map; import java.util.Random; +import org.apache.lucene.demo.facet.ExampleUtils; +import org.apache.lucene.demo.facet.simple.SimpleUtils; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; -import org.apache.lucene.facet.example.ExampleUtils; -import org.apache.lucene.facet.example.simple.SimpleUtils; import org.apache.lucene.facet.index.FacetFields; import org.apache.lucene.facet.index.params.CategoryListParams; import org.apache.lucene.facet.index.params.FacetIndexingParams; @@ -90,12 +90,16 @@ public class MultiCLIndexer { /** * Create an index, and adds to it sample documents and facets. - * @param indexDir Directory in which the index should be created. - * @param taxoDir Directory in which the taxonomy index should be created. - * @throws Exception on error (no detailed exception handling here for sample simplicity + * + * @param indexDir + * Directory in which the index should be created. + * @param taxoDir + * Directory in which the taxonomy index should be created. + * @throws Exception + * on error (no detailed exception handling here for sample + * simplicity */ - public static void index(Directory indexDir, Directory taxoDir) - throws Exception { + public static void index(Directory indexDir, Directory taxoDir) throws Exception { Random random = new Random(2003); diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java similarity index 92% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLMain.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java index 2be21135586..73ca28b7746 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java @@ -1,12 +1,12 @@ -package org.apache.lucene.facet.example.multiCL; +package org.apache.lucene.demo.facet.multiCL; import java.util.List; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.ExampleUtils; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.ExampleUtils; import org.apache.lucene.facet.search.results.FacetResult; /* diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java similarity index 96% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLSearcher.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java index 1a807b25c3d..b6b63e1c383 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example.multiCL; +package org.apache.lucene.demo.facet.multiCL; import java.util.ArrayList; import java.util.List; @@ -13,8 +13,8 @@ import org.apache.lucene.search.TopScoreDocCollector; import org.apache.lucene.store.Directory; import org.apache.lucene.search.MultiCollector; -import org.apache.lucene.facet.example.ExampleUtils; -import org.apache.lucene.facet.example.simple.SimpleUtils; +import org.apache.lucene.demo.facet.ExampleUtils; +import org.apache.lucene.demo.facet.simple.SimpleUtils; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.FacetsCollector; import org.apache.lucene.facet.search.params.CountFacetRequest; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/package.html b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/package.html new file mode 100644 index 00000000000..2980e67d702 --- /dev/null +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/package.html @@ -0,0 +1,22 @@ + + + + +Facets example code for using multiple category lists. + + diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/package.html b/lucene/demo/src/java/org/apache/lucene/demo/facet/package.html new file mode 100644 index 00000000000..cc637090e99 --- /dev/null +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/package.html @@ -0,0 +1,22 @@ + + + + +Facets example code. + + diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java similarity index 97% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java index 97ef97a5348..1473ba4588d 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java @@ -1,12 +1,12 @@ -package org.apache.lucene.facet.example.simple; +package org.apache.lucene.demo.facet.simple; import java.util.Arrays; import java.util.List; +import org.apache.lucene.demo.facet.ExampleUtils; import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; -import org.apache.lucene.facet.example.ExampleUtils; import org.apache.lucene.facet.index.FacetFields; import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.TaxonomyWriter; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java similarity index 95% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java index 78c74d1b842..76a6171ba42 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example.simple; +package org.apache.lucene.demo.facet.simple; import java.util.List; @@ -7,8 +7,8 @@ import org.apache.lucene.index.IndexReader; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.ExampleUtils; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.ExampleUtils; import org.apache.lucene.facet.search.results.FacetResult; import org.apache.lucene.facet.taxonomy.TaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java similarity index 98% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleSearcher.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java index f4fb8e2162e..9cc554068f3 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java @@ -1,9 +1,9 @@ -package org.apache.lucene.facet.example.simple; +package org.apache.lucene.demo.facet.simple; import java.util.Iterator; import java.util.List; -import org.apache.lucene.facet.example.ExampleUtils; +import org.apache.lucene.demo.facet.ExampleUtils; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.DrillDown; import org.apache.lucene.facet.search.FacetsCollector; diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleUtils.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java similarity index 95% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleUtils.java rename to lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java index 08ae45027ea..6dd52fbe62d 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleUtils.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java @@ -1,8 +1,8 @@ -package org.apache.lucene.facet.example.simple; +package org.apache.lucene.demo.facet.simple; import org.apache.lucene.analysis.Analyzer; import org.apache.lucene.analysis.core.WhitespaceAnalyzer; -import org.apache.lucene.facet.example.ExampleUtils; +import org.apache.lucene.demo.facet.ExampleUtils; import org.apache.lucene.facet.taxonomy.CategoryPath; /* diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/package.html b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/package.html new file mode 100644 index 00000000000..4a454a4794c --- /dev/null +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/package.html @@ -0,0 +1,22 @@ + + + + +Facets simple example code. + + diff --git a/lucene/facet/src/test/org/apache/lucene/facet/example/TestAdaptiveExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAdaptiveExample.java similarity index 90% rename from lucene/facet/src/test/org/apache/lucene/facet/example/TestAdaptiveExample.java rename to lucene/demo/src/test/org/apache/lucene/demo/facet/TestAdaptiveExample.java index f6e2c037290..4fa336463bd 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/example/TestAdaptiveExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAdaptiveExample.java @@ -1,10 +1,10 @@ -package org.apache.lucene.facet.example; +package org.apache.lucene.demo.facet; import org.junit.Test; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.adaptive.AdaptiveMain; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.adaptive.AdaptiveMain; /* * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/lucene/facet/src/test/org/apache/lucene/facet/example/TestAssociationExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java similarity index 92% rename from lucene/facet/src/test/org/apache/lucene/facet/example/TestAssociationExample.java rename to lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java index f26113246c4..a6010783675 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/example/TestAssociationExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestAssociationExample.java @@ -1,10 +1,10 @@ -package org.apache.lucene.facet.example; +package org.apache.lucene.demo.facet; import org.junit.Test; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.association.CategoryAssociationsMain; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.association.CategoryAssociationsMain; import org.apache.lucene.facet.search.results.FacetResultNode; /* diff --git a/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java similarity index 95% rename from lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java rename to lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java index 55038df7f9f..a422261884a 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/example/TestMultiCLExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestMultiCLExample.java @@ -1,4 +1,4 @@ -package org.apache.lucene.facet.example; +package org.apache.lucene.demo.facet; import java.util.Iterator; import java.util.List; @@ -6,7 +6,8 @@ import java.util.List; import org.junit.Test; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.facet.example.multiCL.MultiCLMain; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.multiCL.MultiCLMain; import org.apache.lucene.facet.search.results.FacetResult; import org.apache.lucene.facet.search.results.FacetResultNode; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/example/TestSimpleExample.java b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java similarity index 94% rename from lucene/facet/src/test/org/apache/lucene/facet/example/TestSimpleExample.java rename to lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java index c059f818c5f..7fb9e707b9c 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/example/TestSimpleExample.java +++ b/lucene/demo/src/test/org/apache/lucene/demo/facet/TestSimpleExample.java @@ -1,12 +1,12 @@ -package org.apache.lucene.facet.example; +package org.apache.lucene.demo.facet; import java.util.Iterator; import org.junit.Test; import org.apache.lucene.util.LuceneTestCase; -import org.apache.lucene.facet.example.ExampleResult; -import org.apache.lucene.facet.example.simple.SimpleMain; +import org.apache.lucene.demo.facet.ExampleResult; +import org.apache.lucene.demo.facet.simple.SimpleMain; import org.apache.lucene.facet.search.results.FacetResult; import org.apache.lucene.facet.search.results.FacetResultNode; diff --git a/lucene/facet/build.xml b/lucene/facet/build.xml index 81a4c804752..8e8bcb442d0 100644 --- a/lucene/facet/build.xml +++ b/lucene/facet/build.xml @@ -28,52 +28,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/package.html b/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/package.html deleted file mode 100644 index 11d26676a45..00000000000 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/simple/package.html +++ /dev/null @@ -1,17 +0,0 @@ - - - Simple faceted indexing and search sample - - -

Simple faceted indexing and search sample

- - A simple faceted example, showing how to: -
    -
  1. Create an index.
    2. -
  2. Add documents with facets to the index.
    3. -
  3. Search the index.
    4. -
- - For more complex examples see the other sample code packages. - - \ No newline at end of file diff --git a/lucene/facet/src/examples/org/apache/lucene/facet/example/merge/TaxonomyMergeUtils.java b/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java similarity index 95% rename from lucene/facet/src/examples/org/apache/lucene/facet/example/merge/TaxonomyMergeUtils.java rename to lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java index d48ea1109bd..2e4a74e4c64 100644 --- a/lucene/facet/src/examples/org/apache/lucene/facet/example/merge/TaxonomyMergeUtils.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java @@ -1,9 +1,8 @@ -package org.apache.lucene.facet.example.merge; +package org.apache.lucene.facet.util; import java.io.IOException; import java.util.List; -import org.apache.lucene.facet.example.ExampleUtils; import org.apache.lucene.facet.index.OrdinalMappingAtomicReader; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; @@ -17,6 +16,7 @@ import org.apache.lucene.index.IndexWriter; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.MultiReader; import org.apache.lucene.store.Directory; +import org.apache.lucene.util.Version; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -52,8 +52,7 @@ public class TaxonomyMergeUtils { */ public static void merge(Directory srcIndexDir, Directory srcTaxDir, Directory destIndexDir, Directory destTaxDir, FacetIndexingParams params) throws IOException { - IndexWriter destIndexWriter = new IndexWriter(destIndexDir, - new IndexWriterConfig(ExampleUtils.EXAMPLE_VER, null)); + IndexWriter destIndexWriter = new IndexWriter(destIndexDir, new IndexWriterConfig(Version.LUCENE_42, null)); DirectoryTaxonomyWriter destTaxWriter = new DirectoryTaxonomyWriter(destTaxDir); merge(srcIndexDir, srcTaxDir, new MemoryOrdinalMap(), destIndexWriter, destTaxWriter, params); destTaxWriter.close(); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java index 7846f154e25..aef675e7da5 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java @@ -1,19 +1,7 @@ package org.apache.lucene.facet; -import java.io.IOException; - -import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.facet.search.results.FacetResult; import org.apache.lucene.facet.search.results.FacetResultNode; -import org.apache.lucene.facet.taxonomy.TaxonomyWriter; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; -import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; -import org.apache.lucene.index.DirectoryReader; -import org.apache.lucene.index.IndexWriter; -import org.apache.lucene.index.IndexWriterConfig; -import org.apache.lucene.search.IndexSearcher; -import org.apache.lucene.store.Directory; -import org.apache.lucene.util.LuceneTestCase; /* * Licensed to the Apache Software Foundation (ASF) under one or more @@ -34,68 +22,6 @@ import org.apache.lucene.util.LuceneTestCase; public class FacetTestUtils { - public static class IndexTaxonomyReaderPair { - public DirectoryReader indexReader; - public DirectoryTaxonomyReader taxReader; - public IndexSearcher indexSearcher; - - public void close() throws IOException { - indexReader.close(); - taxReader.close(); - } - - } - - public static class IndexTaxonomyWriterPair { - public IndexWriter indexWriter; - public TaxonomyWriter taxWriter; - - public void close() throws IOException { - indexWriter.close(); - taxWriter.close(); - } - - public void commit() throws IOException { - indexWriter.commit(); - taxWriter.commit(); - } - } - - public static Directory[][] createIndexTaxonomyDirs(int number) { - Directory[][] dirs = new Directory[number][2]; - for (int i = 0; i < number; i++) { - dirs[i][0] = LuceneTestCase.newDirectory(); - dirs[i][1] = LuceneTestCase.newDirectory(); - } - return dirs; - } - - public static IndexTaxonomyReaderPair[] createIndexTaxonomyReaderPair(Directory[][] dirs) throws IOException { - IndexTaxonomyReaderPair[] pairs = new IndexTaxonomyReaderPair[dirs.length]; - for (int i = 0; i < dirs.length; i++) { - IndexTaxonomyReaderPair pair = new IndexTaxonomyReaderPair(); - pair.indexReader = DirectoryReader.open(dirs[i][0]); - pair.indexSearcher = new IndexSearcher(pair.indexReader); - pair.taxReader = new DirectoryTaxonomyReader(dirs[i][1]); - pairs[i] = pair; - } - return pairs; - } - - public static IndexTaxonomyWriterPair[] createIndexTaxonomyWriterPair(Directory[][] dirs) throws IOException { - IndexTaxonomyWriterPair[] pairs = new IndexTaxonomyWriterPair[dirs.length]; - for (int i = 0; i < dirs.length; i++) { - IndexTaxonomyWriterPair pair = new IndexTaxonomyWriterPair(); - pair.indexWriter = new IndexWriter(dirs[i][0], new IndexWriterConfig( - LuceneTestCase.TEST_VERSION_CURRENT, new MockAnalyzer(LuceneTestCase.random()))); - pair.taxWriter = new DirectoryTaxonomyWriter(dirs[i][1]); - pair.indexWriter.commit(); - pair.taxWriter.commit(); - pairs[i] = pair; - } - return pairs; - } - public static String toSimpleString(FacetResult fr) { StringBuilder sb = new StringBuilder(); toSimpleString(0, sb, fr.getFacetResultNode(), ""); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/index/OrdinalMappingReaderTest.java b/lucene/facet/src/test/org/apache/lucene/facet/index/OrdinalMappingReaderTest.java index 8f311f0991f..698d41a06bf 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/index/OrdinalMappingReaderTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/index/OrdinalMappingReaderTest.java @@ -8,7 +8,6 @@ import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.document.Document; import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.example.merge.TaxonomyMergeUtils; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.search.FacetsCollector; import org.apache.lucene.facet.search.params.CountFacetRequest; @@ -18,6 +17,7 @@ import org.apache.lucene.facet.search.results.FacetResultNode; import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.facet.util.TaxonomyMergeUtils; import org.apache.lucene.index.DirectoryReader; import org.apache.lucene.index.IndexWriterConfig; import org.apache.lucene.index.RandomIndexWriter; diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java index 26f8bd75310..6aee1452de8 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestMultipleCategoryLists.java @@ -14,7 +14,6 @@ import org.apache.lucene.document.Document; import org.apache.lucene.document.Field; import org.apache.lucene.document.TextField; import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.FacetTestUtils; import org.apache.lucene.facet.index.FacetFields; import org.apache.lucene.facet.index.params.CategoryListParams; import org.apache.lucene.facet.index.params.FacetIndexingParams; @@ -77,12 +76,14 @@ public class TestMultipleCategoryLists extends FacetTestCase { @Test public void testDefault() throws Exception { - Directory[][] dirs = getDirs(); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + // create and open an index writer - RandomIndexWriter iw = new RandomIndexWriter(random(), dirs[0][0], newIndexWriterConfig( + RandomIndexWriter iw = new RandomIndexWriter(random(), indexDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); // create and open a taxonomy writer - TaxonomyWriter tw = new DirectoryTaxonomyWriter(dirs[0][1], OpenMode.CREATE); + TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE); PerDimensionIndexingParams iParams = new PerDimensionIndexingParams(Collections.emptyMap()); @@ -92,7 +93,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { tw.commit(); // prepare index reader and taxonomy. - TaxonomyReader tr = new DirectoryTaxonomyReader(dirs[0][1]); + TaxonomyReader tr = new DirectoryTaxonomyReader(taxoDir); // prepare searcher to search against IndexSearcher searcher = newSearcher(ir); @@ -105,17 +106,19 @@ public class TestMultipleCategoryLists extends FacetTestCase { assertOrdinalsExist("$facets", ir); IOUtils.close(tr, ir, iw, tw); - IOUtils.close(dirs[0]); + IOUtils.close(indexDir, taxoDir); } @Test public void testCustom() throws Exception { - Directory[][] dirs = getDirs(); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + // create and open an index writer - RandomIndexWriter iw = new RandomIndexWriter(random(), dirs[0][0], newIndexWriterConfig( + RandomIndexWriter iw = new RandomIndexWriter(random(), indexDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); // create and open a taxonomy writer - TaxonomyWriter tw = new DirectoryTaxonomyWriter(dirs[0][1], OpenMode.CREATE); + TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE); PerDimensionIndexingParams iParams = new PerDimensionIndexingParams( Collections.singletonMap(new CategoryPath("Author"), new CategoryListParams("$author"))); @@ -125,7 +128,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { tw.commit(); // prepare index reader and taxonomy. - TaxonomyReader tr = new DirectoryTaxonomyReader(dirs[0][1]); + TaxonomyReader tr = new DirectoryTaxonomyReader(taxoDir); // prepare searcher to search against IndexSearcher searcher = newSearcher(ir); @@ -139,17 +142,19 @@ public class TestMultipleCategoryLists extends FacetTestCase { assertOrdinalsExist("$author", ir); IOUtils.close(tr, ir, iw, tw); - IOUtils.close(dirs[0]); + IOUtils.close(indexDir, taxoDir); } @Test public void testTwoCustomsSameField() throws Exception { - Directory[][] dirs = getDirs(); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + // create and open an index writer - RandomIndexWriter iw = new RandomIndexWriter(random(), dirs[0][0], newIndexWriterConfig( + RandomIndexWriter iw = new RandomIndexWriter(random(), indexDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); // create and open a taxonomy writer - TaxonomyWriter tw = new DirectoryTaxonomyWriter(dirs[0][1], OpenMode.CREATE); + TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE); Map paramsMap = new HashMap(); paramsMap.put(new CategoryPath("Band"), new CategoryListParams("$music")); @@ -161,7 +166,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { tw.commit(); // prepare index reader and taxonomy. - TaxonomyReader tr = new DirectoryTaxonomyReader(dirs[0][1]); + TaxonomyReader tr = new DirectoryTaxonomyReader(taxoDir); // prepare searcher to search against IndexSearcher searcher = newSearcher(ir); @@ -176,7 +181,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { assertOrdinalsExist("$music", ir); IOUtils.close(tr, ir, iw, tw); - IOUtils.close(dirs[0]); + IOUtils.close(indexDir, taxoDir); } private void assertOrdinalsExist(String field, IndexReader ir) throws IOException { @@ -191,12 +196,14 @@ public class TestMultipleCategoryLists extends FacetTestCase { @Test public void testDifferentFieldsAndText() throws Exception { - Directory[][] dirs = getDirs(); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + // create and open an index writer - RandomIndexWriter iw = new RandomIndexWriter(random(), dirs[0][0], newIndexWriterConfig( + RandomIndexWriter iw = new RandomIndexWriter(random(), indexDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); // create and open a taxonomy writer - TaxonomyWriter tw = new DirectoryTaxonomyWriter(dirs[0][1], OpenMode.CREATE); + TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE); Map paramsMap = new HashMap(); paramsMap.put(new CategoryPath("Band"), new CategoryListParams("$bands")); @@ -208,7 +215,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { tw.commit(); // prepare index reader and taxonomy. - TaxonomyReader tr = new DirectoryTaxonomyReader(dirs[0][1]); + TaxonomyReader tr = new DirectoryTaxonomyReader(taxoDir); // prepare searcher to search against IndexSearcher searcher = newSearcher(ir); @@ -222,17 +229,19 @@ public class TestMultipleCategoryLists extends FacetTestCase { assertOrdinalsExist("$composers", ir); IOUtils.close(tr, ir, iw, tw); - IOUtils.close(dirs[0]); + IOUtils.close(indexDir, taxoDir); } @Test public void testSomeSameSomeDifferent() throws Exception { - Directory[][] dirs = getDirs(); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + // create and open an index writer - RandomIndexWriter iw = new RandomIndexWriter(random(), dirs[0][0], newIndexWriterConfig( + RandomIndexWriter iw = new RandomIndexWriter(random(), indexDir, newIndexWriterConfig( TEST_VERSION_CURRENT, new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false))); // create and open a taxonomy writer - TaxonomyWriter tw = new DirectoryTaxonomyWriter(dirs[0][1], OpenMode.CREATE); + TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir, OpenMode.CREATE); Map paramsMap = new HashMap(); paramsMap.put(new CategoryPath("Band"), new CategoryListParams("$music")); @@ -246,7 +255,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { tw.commit(); // prepare index reader and taxonomy. - TaxonomyReader tr = new DirectoryTaxonomyReader(dirs[0][1]); + TaxonomyReader tr = new DirectoryTaxonomyReader(taxoDir); // prepare searcher to search against IndexSearcher searcher = newSearcher(ir); @@ -259,11 +268,7 @@ public class TestMultipleCategoryLists extends FacetTestCase { assertOrdinalsExist("$literature", ir); IOUtils.close(tr, ir, iw, tw); - IOUtils.close(dirs[0]); - } - - private Directory[][] getDirs() { - return FacetTestUtils.createIndexTaxonomyDirs(1); + IOUtils.close(indexDir, taxoDir); } private void assertCorrectResults(FacetsCollector facetsCollector) throws IOException { diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java index 9c5ad268c9d..f84678bb46b 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/TestTotalFacetCounts.java @@ -3,14 +3,20 @@ package org.apache.lucene.facet.search; import java.io.File; import java.io.IOException; import java.util.Arrays; +import java.util.Collections; +import org.apache.lucene.document.Document; import org.apache.lucene.facet.FacetTestCase; -import org.apache.lucene.facet.FacetTestUtils; -import org.apache.lucene.facet.FacetTestUtils.IndexTaxonomyReaderPair; -import org.apache.lucene.facet.FacetTestUtils.IndexTaxonomyWriterPair; +import org.apache.lucene.facet.index.FacetFields; import org.apache.lucene.facet.index.params.CategoryListParams; import org.apache.lucene.facet.index.params.FacetIndexingParams; import org.apache.lucene.facet.taxonomy.CategoryPath; +import org.apache.lucene.facet.taxonomy.TaxonomyReader; +import org.apache.lucene.facet.taxonomy.TaxonomyWriter; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; +import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyWriter; +import org.apache.lucene.index.DirectoryReader; +import org.apache.lucene.index.IndexWriter; import org.apache.lucene.store.Directory; import org.apache.lucene.util.IOUtils; import org.apache.lucene.util._TestUtil; @@ -35,9 +41,9 @@ import org.junit.Test; public class TestTotalFacetCounts extends FacetTestCase { - private static void initCache(int numEntries) { + private static void initCache() { TotalFacetCountsCache.getSingleton().clear(); - TotalFacetCountsCache.getSingleton().setCacheSize(numEntries); // Set to keep one in mem + TotalFacetCountsCache.getSingleton().setCacheSize(1); // Set to keep one in mem } @Test @@ -50,12 +56,13 @@ public class TestTotalFacetCounts extends FacetTestCase { } private void doTestWriteRead(final int partitionSize) throws IOException { - initCache(1); + initCache(); - // Create temporary RAMDirectories - Directory[][] dirs = FacetTestUtils.createIndexTaxonomyDirs(1); - // Create our index/taxonomy writers - IndexTaxonomyWriterPair[] writers = FacetTestUtils.createIndexTaxonomyWriterPair(dirs); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + IndexWriter indexWriter = new IndexWriter(indexDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null)); + TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir); + FacetIndexingParams iParams = new FacetIndexingParams() { @Override public int getPartitionSize() { @@ -75,36 +82,34 @@ public class TestTotalFacetCounts extends FacetTestCase { // The counts that the TotalFacetCountsArray should have after adding // the below facets to the index. int[] expectedCounts = new int[] { 0, 3, 1, 3, 1, 1, 1, 1, 1, 2, 1, 1, 1, 1 }; - - // Add a facet to the index - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "a", "b"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "c", "d"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "a", "e"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "a", "d"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "c", "g"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "c", "z"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "b", "a"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "1", "2"); - TestTotalFacetCountsCache.addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "b", "c"); + String[] categories = new String[] { "a/b", "c/d", "a/e", "a/d", "c/g", "c/z", "b/a", "1/2", "b/c" }; + + FacetFields facetFields = new FacetFields(taxoWriter, iParams); + for (String cat : categories) { + Document doc = new Document(); + facetFields.addFields(doc, Collections.singletonList(new CategoryPath(cat, '/'))); + indexWriter.addDocument(doc); + } // Commit Changes - writers[0].close(); + IOUtils.close(indexWriter, taxoWriter); - IndexTaxonomyReaderPair[] readers = FacetTestUtils.createIndexTaxonomyReaderPair(dirs); + DirectoryReader indexReader = DirectoryReader.open(indexDir); + TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir); int[] intArray = new int[iParams.getPartitionSize()]; TotalFacetCountsCache tfcc = TotalFacetCountsCache.getSingleton(); File tmpFile = _TestUtil.createTempFile("test", "tmp", TEMP_DIR); - tfcc.store(tmpFile, readers[0].indexReader, readers[0].taxReader, iParams); + tfcc.store(tmpFile, indexReader, taxoReader, iParams); tfcc.clear(); // not really required because TFCC overrides on load(), but in the test we need not rely on this. - tfcc.load(tmpFile, readers[0].indexReader, readers[0].taxReader, iParams); + tfcc.load(tmpFile, indexReader, taxoReader, iParams); // now retrieve the one just loaded - TotalFacetCounts totalCounts = tfcc.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + TotalFacetCounts totalCounts = tfcc.getTotalCounts(indexReader, taxoReader, iParams); int partition = 0; - for (int i=0; i getResults() { + return results; } @Override public void run() { try { - results = MultiCLSearcher.searchWithFacets(indexReader, taxoReader, iParams); + FacetSearchParams fsp = new FacetSearchParams(iParams, new CountFacetRequest(new CategoryPath("a"), 10), + new CountFacetRequest(new CategoryPath("b"), 10)); + IndexSearcher searcher = new IndexSearcher(indexReader); + FacetsCollector fc = FacetsCollector.create(fsp, indexReader, taxoReader); + searcher.search(new MatchAllDocsQuery(), fc); + results = fc.getFacetResults(); } catch (Exception e) { throw new RuntimeException(e); } } } - // Instantiate threads, but do not start them Multi[] multis = new Multi[numThreads]; - for (int i = 0; i < numThreads - 1; i++) { - multis[i] = new Multi(slowIndexReader, slowTaxoReader, MultiCLIndexer.MULTI_IPARAMS); + for (int i = 0; i < numThreads; i++) { + multis[i] = new Multi(slowIndexReader, slowTaxoReader, FacetIndexingParams.ALL_PARENTS); } - // The last thread uses ONLY the DefaultFacetIndexingParams so that - // it references a different TFC cache. This will still result - // in valid results, but will only search one of the category lists - // instead of all of them. - multis[numThreads - 1] = new Multi(slowIndexReader, slowTaxoReader, FacetIndexingParams.ALL_PARENTS); - // Gentleman, start your engines for (Multi m : multis) { m.start(); } // Wait for threads and get results - ExampleResult[] multiResults = new ExampleResult[numThreads]; - for (int i = 0; i < numThreads; i++) { - multis[i].join(); - multiResults[i] = multis[i].getResults(); + String[] expLabelsA = new String[] { "a/d", "a/e", "a/b" }; + String[] expLabelsB = new String[] { "b/c", "b/a" }; + for (Multi m : multis) { + m.join(); + List facetResults = m.getResults(); + assertEquals("expected two results", 2, facetResults.size()); + + FacetResultNode nodeA = facetResults.get(0).getFacetResultNode(); + int i = 0; + for (FacetResultNode node : nodeA.subResults) { + assertEquals("wrong count", 1, (int) node.value); + assertEquals(expLabelsA[i++], node.label.toString('/')); + } + + FacetResultNode nodeB = facetResults.get(1).getFacetResultNode(); + i = 0; + for (FacetResultNode node : nodeB.subResults) { + assertEquals("wrong count", 1, (int) node.value); + assertEquals(expLabelsB[i++], node.label.toString('/')); + } } - - // Each of the (numThreads-1) should have the same predictable - // results, which we test for here. - for (int i = 0; i < numThreads - 1; i++) { - ExampleResult eResults = multiResults[i]; - TestMultiCLExample.assertCorrectMultiResults(eResults); - } - - // The last thread, which only searched over the - // DefaultFacetIndexingParams, - // has its own results - ExampleResult eResults = multiResults[numThreads - 1]; - List results = eResults.getFacetResults(); - assertEquals(3, results.size()); - String[] expLabels = new String[] { "5", "5/5", "6/2" }; - double[] expValues = new double[] { 0.0, 0.0, 1.0 }; - for (int i = 0; i < 3; i++) { - FacetResult result = results.get(i); - assertNotNull("Result should not be null", result); - FacetResultNode resNode = result.getFacetResultNode(); - assertEquals("Invalid label", expLabels[i], resNode.label.toString()); - assertEquals("Invalid value", expValues[i], resNode.value, 0.0); - assertEquals("Invalid number of subresults", 0, resNode.subResults.size()); - } - // we're done, close the index reader and the taxonomy. - slowIndexReader.close(); - slowTaxoReader.close(); - indexDir.close(); - taxoDir.close(); + + IOUtils.close(slowIndexReader, slowTaxoReader, indexDir, taxoDir); } /** @@ -245,77 +225,78 @@ public class TestTotalFacetCountsCache extends FacetTestCase { @Test public void testGenerationalConsistency() throws Exception { // Create temporary RAMDirectories - Directory[][] dirs = FacetTestUtils.createIndexTaxonomyDirs(1); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); // Create our index/taxonomy writers - IndexTaxonomyWriterPair[] writers = FacetTestUtils.createIndexTaxonomyWriterPair(dirs); + IndexWriter indexWriter = new IndexWriter(indexDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null)); + TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir); FacetIndexingParams iParams = FacetIndexingParams.ALL_PARENTS; // Add a facet to the index - addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "a", "b"); + addFacets(iParams, indexWriter, taxoWriter, "a", "b"); // Commit Changes - writers[0].indexWriter.commit(); - writers[0].taxWriter.commit(); + indexWriter.commit(); + taxoWriter.commit(); // Open readers - IndexTaxonomyReaderPair[] readers = FacetTestUtils.createIndexTaxonomyReaderPair(dirs); + DirectoryReader indexReader = DirectoryReader.open(indexDir); + TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir); // As this is the first time we have invoked the TotalFacetCountsManager, // we should expect to compute and not read from disk. - TotalFacetCounts totalCounts = - TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + TotalFacetCounts totalCounts = TFC.getTotalCounts(indexReader, taxoReader, iParams); int prevGen = assertRecomputed(totalCounts, 0, "after first attempt to get it!"); // Repeating same operation should pull from the cache - not recomputed. assertTrue("Should be obtained from cache at 2nd attempt",totalCounts == - TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams)); + TFC.getTotalCounts(indexReader, taxoReader, iParams)); // Repeat the same operation as above. but clear first - now should recompute again initCache(); - totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + totalCounts = TFC.getTotalCounts(indexReader, taxoReader, iParams); prevGen = assertRecomputed(totalCounts, prevGen, "after cache clear, 3rd attempt to get it!"); //store to file File outputFile = _TestUtil.createTempFile("test", "tmp", TEMP_DIR); initCache(); - TFC.store(outputFile, readers[0].indexReader, readers[0].taxReader, iParams); - totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + TFC.store(outputFile, indexReader, taxoReader, iParams); + totalCounts = TFC.getTotalCounts(indexReader, taxoReader, iParams); prevGen = assertRecomputed(totalCounts, prevGen, "after cache clear, 4th attempt to get it!"); //clear and load initCache(); - TFC.load(outputFile, readers[0].indexReader, readers[0].taxReader, iParams); - totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + TFC.load(outputFile, indexReader, taxoReader, iParams); + totalCounts = TFC.getTotalCounts(indexReader, taxoReader, iParams); prevGen = assertReadFromDisc(totalCounts, prevGen, "after 5th attempt to get it!"); // Add a new facet to the index, commit and refresh readers - addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "c", "d"); - writers[0].indexWriter.close(); - writers[0].taxWriter.close(); + addFacets(iParams, indexWriter, taxoWriter, "c", "d"); + IOUtils.close(indexWriter, taxoWriter); - DirectoryTaxonomyReader newTaxoReader = TaxonomyReader.openIfChanged(readers[0].taxReader); + TaxonomyReader newTaxoReader = TaxonomyReader.openIfChanged(taxoReader); assertNotNull(newTaxoReader); - assertTrue("should have received more cagtegories in updated taxonomy", newTaxoReader.getSize() > readers[0].taxReader.getSize()); - readers[0].taxReader.close(); - readers[0].taxReader = newTaxoReader; + assertTrue("should have received more cagtegories in updated taxonomy", newTaxoReader.getSize() > taxoReader.getSize()); + taxoReader.close(); + taxoReader = newTaxoReader; - DirectoryReader r2 = DirectoryReader.openIfChanged(readers[0].indexReader); + DirectoryReader r2 = DirectoryReader.openIfChanged(indexReader); assertNotNull(r2); - readers[0].indexReader.close(); - readers[0].indexReader = r2; + indexReader.close(); + indexReader = r2; // now use the new reader - should recompute - totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + totalCounts = TFC.getTotalCounts(indexReader, taxoReader, iParams); prevGen = assertRecomputed(totalCounts, prevGen, "after updating the index - 7th attempt!"); // try again - should not recompute assertTrue("Should be obtained from cache at 8th attempt",totalCounts == - TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams)); + TFC.getTotalCounts(indexReader, taxoReader, iParams)); - readers[0].close(); + IOUtils.close(indexReader, taxoReader); outputFile.delete(); - IOUtils.close(dirs[0]); + IOUtils.close(indexDir, taxoDir); } private int assertReadFromDisc(TotalFacetCounts totalCounts, int prevGen, String errMsg) { @@ -341,10 +322,12 @@ public class TestTotalFacetCountsCache extends FacetTestCase { */ @Test public void testGrowingTaxonomy() throws Exception { - // Create temporary RAMDirectories - Directory[][] dirs = FacetTestUtils.createIndexTaxonomyDirs(1); + Directory indexDir = newDirectory(); + Directory taxoDir = newDirectory(); + // Create our index/taxonomy writers - IndexTaxonomyWriterPair[] writers = FacetTestUtils.createIndexTaxonomyWriterPair(dirs); + IndexWriter indexWriter = new IndexWriter(indexDir, newIndexWriterConfig(TEST_VERSION_CURRENT, null)); + TaxonomyWriter taxoWriter = new DirectoryTaxonomyWriter(taxoDir); FacetIndexingParams iParams = new FacetIndexingParams() { @Override public int getPartitionSize() { @@ -352,37 +335,38 @@ public class TestTotalFacetCountsCache extends FacetTestCase { } }; // Add a facet to the index - addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "a", "b"); + addFacets(iParams, indexWriter, taxoWriter, "a", "b"); // Commit Changes - writers[0].indexWriter.commit(); - writers[0].taxWriter.commit(); + indexWriter.commit(); + taxoWriter.commit(); - IndexTaxonomyReaderPair[] readers = FacetTestUtils.createIndexTaxonomyReaderPair(dirs); + DirectoryReader indexReader = DirectoryReader.open(indexDir); + TaxonomyReader taxoReader = new DirectoryTaxonomyReader(taxoDir); // Create TFC and write cache to disk File outputFile = _TestUtil.createTempFile("test", "tmp", TEMP_DIR); - TFC.store(outputFile, readers[0].indexReader, readers[0].taxReader, iParams); + TFC.store(outputFile, indexReader, taxoReader, iParams); // Make the taxonomy grow without touching the index for (int i = 0; i < 10; i++) { - writers[0].taxWriter.addCategory(new CategoryPath("foo", Integer.toString(i))); + taxoWriter.addCategory(new CategoryPath("foo", Integer.toString(i))); } - writers[0].taxWriter.commit(); - DirectoryTaxonomyReader newTaxoReader = TaxonomyReader.openIfChanged(readers[0].taxReader); + taxoWriter.commit(); + TaxonomyReader newTaxoReader = TaxonomyReader.openIfChanged(taxoReader); assertNotNull(newTaxoReader); - readers[0].taxReader.close(); - readers[0].taxReader = newTaxoReader; + taxoReader.close(); + taxoReader = newTaxoReader; initCache(); // With the bug, this next call should result in an exception - TFC.load(outputFile, readers[0].indexReader, readers[0].taxReader, iParams); - TotalFacetCounts totalCounts = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + TFC.load(outputFile, indexReader, taxoReader, iParams); + TotalFacetCounts totalCounts = TFC.getTotalCounts(indexReader, taxoReader, iParams); assertReadFromDisc(totalCounts, 0, "after reading from disk."); + outputFile.delete(); - writers[0].close(); - readers[0].close(); - IOUtils.close(dirs[0]); + IOUtils.close(indexWriter, taxoWriter, indexReader, taxoReader); + IOUtils.close(indexDir, taxoDir); } /** @@ -445,46 +429,52 @@ public class TestTotalFacetCountsCache extends FacetTestCase { */ @Test public void testMultipleIndices() throws IOException { - // Create temporary RAMDirectories - Directory[][] dirs = FacetTestUtils.createIndexTaxonomyDirs(2); + Directory indexDir1 = newDirectory(), indexDir2 = newDirectory(); + Directory taxoDir1 = newDirectory(), taxoDir2 = newDirectory(); + // Create our index/taxonomy writers - IndexTaxonomyWriterPair[] writers = FacetTestUtils.createIndexTaxonomyWriterPair(dirs); + IndexWriter indexWriter1 = new IndexWriter(indexDir1, newIndexWriterConfig(TEST_VERSION_CURRENT, null)); + IndexWriter indexWriter2 = new IndexWriter(indexDir2, newIndexWriterConfig(TEST_VERSION_CURRENT, null)); + TaxonomyWriter taxoWriter1 = new DirectoryTaxonomyWriter(taxoDir1); + TaxonomyWriter taxoWriter2 = new DirectoryTaxonomyWriter(taxoDir2); FacetIndexingParams iParams = FacetIndexingParams.ALL_PARENTS; // Add a facet to the index - addFacets(iParams, writers[0].indexWriter, writers[0].taxWriter, "a", "b"); - addFacets(iParams, writers[1].indexWriter, writers[1].taxWriter, "d", "e"); + addFacets(iParams, indexWriter1, taxoWriter1, "a", "b"); + addFacets(iParams, indexWriter1, taxoWriter1, "d", "e"); // Commit Changes - writers[0].indexWriter.commit(); - writers[0].taxWriter.commit(); - writers[1].indexWriter.commit(); - writers[1].taxWriter.commit(); + indexWriter1.commit(); + indexWriter2.commit(); + taxoWriter1.commit(); + taxoWriter2.commit(); // Open two readers - IndexTaxonomyReaderPair[] readers = FacetTestUtils.createIndexTaxonomyReaderPair(dirs); + DirectoryReader indexReader1 = DirectoryReader.open(indexDir1); + DirectoryReader indexReader2 = DirectoryReader.open(indexDir2); + TaxonomyReader taxoReader1 = new DirectoryTaxonomyReader(taxoDir1); + TaxonomyReader taxoReader2 = new DirectoryTaxonomyReader(taxoDir2); // As this is the first time we have invoked the TotalFacetCountsManager, we // should expect to compute. - TotalFacetCounts totalCounts0 = - TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + TotalFacetCounts totalCounts0 = TFC.getTotalCounts(indexReader1, taxoReader1, iParams); int prevGen = -1; prevGen = assertRecomputed(totalCounts0, prevGen, "after attempt 1"); assertTrue("attempt 1b for same input [0] shout find it in cache", - totalCounts0 == TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams)); + totalCounts0 == TFC.getTotalCounts(indexReader1, taxoReader1, iParams)); // 2nd Reader - As this is the first time we have invoked the // TotalFacetCountsManager, we should expect a state of NEW to be returned. - TotalFacetCounts totalCounts1 = TFC.getTotalCounts(readers[1].indexReader, readers[1].taxReader, iParams); + TotalFacetCounts totalCounts1 = TFC.getTotalCounts(indexReader2, taxoReader2, iParams); prevGen = assertRecomputed(totalCounts1, prevGen, "after attempt 2"); assertTrue("attempt 2b for same input [1] shout find it in cache", - totalCounts1 == TFC.getTotalCounts(readers[1].indexReader, readers[1].taxReader, iParams)); + totalCounts1 == TFC.getTotalCounts(indexReader2, taxoReader2, iParams)); // Right now cache size is one, so first TFC is gone and should be recomputed - totalCounts0 = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + totalCounts0 = TFC.getTotalCounts(indexReader1, taxoReader1, iParams); prevGen = assertRecomputed(totalCounts0, prevGen, "after attempt 3"); // Similarly will recompute the second result - totalCounts1 = TFC.getTotalCounts(readers[1].indexReader, readers[1].taxReader, iParams); + totalCounts1 = TFC.getTotalCounts(indexReader2, taxoReader2, iParams); prevGen = assertRecomputed(totalCounts1, prevGen, "after attempt 4"); // Now we set the cache size to two, meaning both should exist in the @@ -492,23 +482,19 @@ public class TestTotalFacetCountsCache extends FacetTestCase { TFC.setCacheSize(2); // Re-compute totalCounts0 (was evicted from the cache when the cache was smaller) - totalCounts0 = TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams); + totalCounts0 = TFC.getTotalCounts(indexReader1, taxoReader1, iParams); prevGen = assertRecomputed(totalCounts0, prevGen, "after attempt 5"); // now both are in the larger cache and should not be recomputed - totalCounts1 = TFC.getTotalCounts(readers[1].indexReader, readers[1].taxReader, iParams); + totalCounts1 = TFC.getTotalCounts(indexReader2, taxoReader2, iParams); assertTrue("with cache of size 2 res no. 0 should come from cache", - totalCounts0 == TFC.getTotalCounts(readers[0].indexReader, readers[0].taxReader, iParams)); + totalCounts0 == TFC.getTotalCounts(indexReader1, taxoReader1, iParams)); assertTrue("with cache of size 2 res no. 1 should come from cache", - totalCounts1 == TFC.getTotalCounts(readers[1].indexReader, readers[1].taxReader, iParams)); + totalCounts1 == TFC.getTotalCounts(indexReader2, taxoReader2, iParams)); - writers[0].close(); - writers[1].close(); - readers[0].close(); - readers[1].close(); - for (Directory[] dirset : dirs) { - IOUtils.close(dirset); - } + IOUtils.close(indexWriter1, indexWriter2, taxoWriter1, taxoWriter2); + IOUtils.close(indexReader1, indexReader2, taxoReader1, taxoReader2); + IOUtils.close(indexDir1, indexDir2, taxoDir1, taxoDir2); } } diff --git a/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java b/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java index 1117fcf1d73..71b7058035d 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/search/sampling/OversampleWithDepthTest.java @@ -3,7 +3,6 @@ package org.apache.lucene.facet.search.sampling; import java.io.IOException; import java.util.Collections; -import org.apache.lucene.analysis.core.KeywordAnalyzer; import org.apache.lucene.document.Document; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.index.FacetFields; @@ -95,7 +94,7 @@ public class OversampleWithDepthTest extends FacetTestCase { } private void index100Docs(Directory indexDir, Directory taxoDir, FacetIndexingParams fip) throws IOException { - IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer()); + IndexWriterConfig iwc = newIndexWriterConfig(TEST_VERSION_CURRENT, null); IndexWriter w = new IndexWriter(indexDir, iwc); TaxonomyWriter tw = new DirectoryTaxonomyWriter(taxoDir); diff --git a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java index 2ae22a13c1c..3533e64118d 100644 --- a/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java +++ b/lucene/facet/src/test/org/apache/lucene/facet/taxonomy/directory/TestDirectoryTaxonomyReader.java @@ -3,7 +3,7 @@ package org.apache.lucene.facet.taxonomy.directory; import java.io.IOException; import java.util.Random; -import org.apache.lucene.analysis.core.KeywordAnalyzer; +import org.apache.lucene.analysis.MockAnalyzer; import org.apache.lucene.facet.FacetTestCase; import org.apache.lucene.facet.taxonomy.CategoryPath; import org.apache.lucene.facet.taxonomy.TaxonomyReader; @@ -256,7 +256,7 @@ public class TestDirectoryTaxonomyReader extends FacetTestCase { // hold onto IW to forceMerge // note how we don't close it, since DTW will close it. final IndexWriter iw = new IndexWriter(dir, - new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer()) + new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())) .setMergePolicy(new LogByteSizeMergePolicy())); DirectoryTaxonomyWriter writer = new DirectoryTaxonomyWriter(dir) { @Override @@ -299,7 +299,7 @@ public class TestDirectoryTaxonomyReader extends FacetTestCase { // hold onto IW to forceMerge // note how we don't close it, since DTW will close it. final IndexWriter iw = new IndexWriter(dir, - new IndexWriterConfig(TEST_VERSION_CURRENT, new KeywordAnalyzer()) + new IndexWriterConfig(TEST_VERSION_CURRENT, new MockAnalyzer(random())) .setMergePolicy(new LogByteSizeMergePolicy())); DirectoryTaxonomyWriter writer = new DirectoryTaxonomyWriter(dir) { @Override From c9189116b9d465a218decdde80fd450e54a2ff61 Mon Sep 17 00:00:00 2001 From: Steven Rowe Date: Wed, 30 Jan 2013 20:28:47 +0000 Subject: [PATCH 13/17] Add link to the TokenStream consumer workflow git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440651 13f79535-47bb-0310-9956-ffa450edef68 --- lucene/site/xsl/index.xsl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lucene/site/xsl/index.xsl b/lucene/site/xsl/index.xsl index bf77408d671..76e5e75b6c1 100644 --- a/lucene/site/xsl/index.xsl +++ b/lucene/site/xsl/index.xsl @@ -58,7 +58,8 @@
  • Introduction to Lucene's APIs: High-level summary of the different Lucene packages.
  • Analysis overview: - Introduction to Lucene's analysis API.
    • + Introduction to Lucene's analysis API. See also the + TokenStream consumer workflow.

    Reference Documents

      From 4bd78bb389b25b5b04c6f7961023beb146652b00 Mon Sep 17 00:00:00 2001 From: Steven Rowe Date: Wed, 30 Jan 2013 21:32:28 +0000 Subject: [PATCH 14/17] LUCENE-3998: Maven and IntelliJ configurations: add facet module dependency to the demo module git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440681 13f79535-47bb-0310-9956-ffa450edef68 --- dev-tools/idea/lucene/demo/demo.iml | 1 + dev-tools/maven/lucene/demo/pom.xml.template | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/dev-tools/idea/lucene/demo/demo.iml b/dev-tools/idea/lucene/demo/demo.iml index 99ca3425709..50b0bcad843 100644 --- a/dev-tools/idea/lucene/demo/demo.iml +++ b/dev-tools/idea/lucene/demo/demo.iml @@ -24,6 +24,7 @@ + diff --git a/dev-tools/maven/lucene/demo/pom.xml.template b/dev-tools/maven/lucene/demo/pom.xml.template index 5e24dd85875..3a7eb33f722 100644 --- a/dev-tools/maven/lucene/demo/pom.xml.template +++ b/dev-tools/maven/lucene/demo/pom.xml.template @@ -59,6 +59,11 @@ lucene-analyzers-common ${project.version} + + ${project.groupId} + lucene-facet + ${project.version} + ${project.groupId} lucene-queryparser From c1024f192e4700ef6280f4eae9ecac678914fb58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20H=C3=B8ydahl?= Date: Thu, 31 Jan 2013 00:26:11 +0000 Subject: [PATCH 15/17] SOLR-4384: Make post.jar report timing information git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440746 13f79535-47bb-0310-9956-ffa450edef68 --- solr/CHANGES.txt | 2 ++ .../org/apache/solr/util/SimplePostTool.java | 21 +++++++++++++++++++ 2 files changed, 23 insertions(+) diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt index 0fb7902cd6c..c88e3a238dd 100644 --- a/solr/CHANGES.txt +++ b/solr/CHANGES.txt @@ -130,6 +130,8 @@ Other Changes * SOLR-4353: Renamed example jetty context file to reduce confusion (hossman) +* SOLR-4384: Make post.jar report timing information (Upayavira via janhoy) + ================== 4.1.0 ================== Versions of Major Components diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java index ab6547d9ced..5683368d1de 100644 --- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java +++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java @@ -165,6 +165,7 @@ public class SimplePostTool { * This method delegates to the correct mode method. */ public void execute() { + final long startTime = System.currentTimeMillis(); if (DATA_MODE_FILES.equals(mode) && args.length > 0) { doFilesMode(); } else if(DATA_MODE_ARGS.equals(mode) && args.length > 0) { @@ -180,8 +181,28 @@ public class SimplePostTool { if (commit) commit(); if (optimize) optimize(); + final long endTime = System.currentTimeMillis(); + displayTiming(endTime - startTime); } + /** + * Pretty prints the number of milliseconds taken to post the content to Solr + * @param millis the time in milliseconds + */ + private void displayTiming(long millis) { + long hours = millis / 3600000; + long minutes = (millis / 60000) % 60; + long seconds = (millis / 1000) % 60; + long milliseconds = millis % 1000; + if (hours>0) { + System.out.println(String.format("Time taken: %02d:%02d:%02d.%03d", hours, minutes, seconds, milliseconds)); + } else if (minutes>0) { + System.out.println(String.format("Time taken: %02d:%02d.%03d", minutes, seconds, milliseconds)); + } else { + System.out.println(String.format("Time taken: %d.%03ds", seconds, milliseconds)); + } + } + /** * Parses incoming arguments and system params and initializes the tool * @param args the incoming cmd line args From f21ce95241a35770a86d37162064a71d64e5ad3f Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 31 Jan 2013 03:06:47 +0000 Subject: [PATCH 16/17] add missing javadocs git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440829 13f79535-47bb-0310-9956-ffa450edef68 --- .../apache/lucene/demo/facet/ExampleResult.java | 7 +++++-- .../apache/lucene/demo/facet/ExampleUtils.java | 13 +++++++++++++ .../lucene/demo/facet/adaptive/AdaptiveMain.java | 4 ++++ .../demo/facet/adaptive/AdaptiveSearcher.java | 3 +++ .../association/CategoryAssociationsIndexer.java | 3 +++ .../association/CategoryAssociationsMain.java | 9 +++++++++ .../association/CategoryAssociationsSearcher.java | 3 +++ .../association/CategoryAssociationsUtils.java | 7 +++++++ .../lucene/demo/facet/multiCL/MultiCLIndexer.java | 14 +++++++++----- .../lucene/demo/facet/multiCL/MultiCLMain.java | 8 +++++++- .../demo/facet/multiCL/MultiCLSearcher.java | 15 +++++++++++++++ .../lucene/demo/facet/simple/SimpleIndexer.java | 3 +++ .../lucene/demo/facet/simple/SimpleMain.java | 5 +++++ .../lucene/demo/facet/simple/SimpleSearcher.java | 3 +++ .../lucene/demo/facet/simple/SimpleUtils.java | 3 +++ .../lucene/facet/util/TaxonomyMergeUtils.java | 1 + 16 files changed, 93 insertions(+), 8 deletions(-) diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java index 0f08353db0e..e0d3abd54e4 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleResult.java @@ -29,18 +29,21 @@ import org.apache.lucene.facet.search.results.FacetResult; * @lucene.experimental */ public class ExampleResult { + + /** Sole constructor. */ + public ExampleResult() {} private List facetResults; /** - * @return the facet results + * Returns the facet results */ public List getFacetResults() { return facetResults; } /** - * @param facetResults the facet results to set + * Sets the facet results */ public void setFacetResults(List facetResults) { this.facetResults = facetResults; diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java index 4f788956b05..7a5fa7057f6 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/ExampleUtils.java @@ -20,15 +20,28 @@ import org.apache.lucene.util.Version; */ /** + * Simple utility functions for the faceting examples * @lucene.experimental */ public class ExampleUtils { + + /** No instance */ + private ExampleUtils() {} + /** + * True if the system property tests.verbose has been set. + * If true, it causes {@link #log(Object)} to print messages to the console. + */ public static final boolean VERBOSE = Boolean.getBoolean("tests.verbose"); /** The Lucene {@link Version} used by the example code. */ public static final Version EXAMPLE_VER = Version.LUCENE_40; + /** + * Logs the String representation of msg to the console, + * if {@link #VERBOSE} is true. Otherwise, does nothing. + * @see #VERBOSE + */ public static void log(Object msg) { if (VERBOSE) { System.out.println(msg.toString()); diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java index 75704ea1a76..994d03f867e 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveMain.java @@ -36,6 +36,9 @@ import org.apache.lucene.facet.search.results.FacetResult; * @lucene.experimental */ public class AdaptiveMain { + + /** Sole constructor */ + public AdaptiveMain() {} /** * Driver for the adaptive sample. @@ -46,6 +49,7 @@ public class AdaptiveMain { ExampleUtils.log("DONE"); } + /** Runs the adaptive sample and returns the facet results */ public ExampleResult runSample() throws Exception { // create Directories for the search index and for the taxonomy index diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java index 7f79192e091..4859035263f 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/adaptive/AdaptiveSearcher.java @@ -46,6 +46,9 @@ import org.apache.lucene.store.Directory; */ public class AdaptiveSearcher { + /** No instance */ + private AdaptiveSearcher() {} + /** * Search with facets through the {@link AdaptiveFacetsAccumulator} * @param indexDir Directory of the search index. diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java index c0b2127b06e..1ae9ff95579 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsIndexer.java @@ -40,6 +40,9 @@ import org.apache.lucene.store.Directory; * @lucene.experimental */ public class CategoryAssociationsIndexer { + + /** No instance. */ + private CategoryAssociationsIndexer() {} /** * Create an index, and adds to it sample documents and categories. diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java index ca34e46c87c..2a80951be83 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsMain.java @@ -33,6 +33,9 @@ import org.apache.lucene.facet.search.results.FacetResult; */ public class CategoryAssociationsMain { + /** Sole constructor. */ + public CategoryAssociationsMain() {} + /** * Driver for the simple sample. * @throws Exception on error (no detailed exception handling here for sample simplicity @@ -43,6 +46,9 @@ public class CategoryAssociationsMain { ExampleUtils.log("DONE"); } + /** + * Runs the example demonstrating sum of int-association. + */ public ExampleResult runSumIntAssociationSample() throws Exception { // create Directories for the search index and for the taxonomy index @@ -61,6 +67,9 @@ public class CategoryAssociationsMain { return res; } + /** + * Runs the example demonstrating sum of float-association. + */ public ExampleResult runSumFloatAssociationSample() throws Exception { // create Directories for the search index and for the taxonomy index diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java index e6d66d5da37..5e6d7ecd925 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsSearcher.java @@ -38,6 +38,9 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; * @lucene.experimental */ public class CategoryAssociationsSearcher { + + /** No instantiation */ + private CategoryAssociationsSearcher() {} /** Search an index with a sum of int-association. */ public static List searchSumIntAssociation(Directory indexDir, Directory taxoDir) throws Exception { diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java index a9968f351b9..5db61a6f763 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/association/CategoryAssociationsUtils.java @@ -23,9 +23,13 @@ import org.apache.lucene.facet.taxonomy.CategoryPath; */ /** + * Categories for the facet examples * @lucene.experimental */ public class CategoryAssociationsUtils { + + /** No instance */ + private CategoryAssociationsUtils() {} /** * Categories: categories[D][N] == category-path with association no. N for @@ -45,6 +49,9 @@ public class CategoryAssociationsUtils { } }; + /** + * Associations (occurrences/confidence levels) for {@link #categories} + */ public static CategoryAssociation[][] associations = { // Doc #1 associations { diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java index 27d3d39f4b2..d98d28eddef 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLIndexer.java @@ -48,14 +48,17 @@ import org.apache.lucene.store.RAMDirectory; * @lucene.experimental */ public class MultiCLIndexer { + + /** No instance */ + private MultiCLIndexer() {} - // Number of documents to index + /** Number of documents to index */ public static int NUM_DOCS = 100; - // Number of facets to add per document + /** Number of facets to add per document */ public static int NUM_FACETS_PER_DOC = 10; - // Number of tokens in title + /** Number of tokens in title */ public static int TITLE_LENGTH = 5; - // Number of tokens in text + /** Number of tokens in text */ public static int TEXT_LENGTH = 100; // Lorum ipsum to use as content - this will be tokenized and used for document @@ -73,7 +76,7 @@ public class MultiCLIndexer { + "nisi ut aliquid ex ea commodi consequatur? Quis autem vel eum iure" + "reprehenderit qui in ea voluptate velit esse quam nihil molestiae " + "consequatur vel illum qui dolorem eum fugiat quo voluptas nulla pariatur"; - // PerDimensionIndexingParams for multiple category lists + /** PerDimensionIndexingParams for multiple category lists */ public static final PerDimensionIndexingParams MULTI_IPARAMS; // Initialize PerDimensionIndexingParams @@ -199,6 +202,7 @@ public class MultiCLIndexer { + nFacetsAdded + " facets."); } + /** Driver for the example */ public static void main(String[] args) throws Exception { index(new RAMDirectory(), new RAMDirectory()); } diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java index 73ca28b7746..c82ca1f3185 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLMain.java @@ -27,12 +27,17 @@ import org.apache.lucene.facet.search.results.FacetResult; */ /** + * Driver for the multi sample. + * * @lucene.experimental */ public class MultiCLMain { + + /** Sole constructor. */ + public MultiCLMain() {} /** - * Driver for the multi sample. + * Executes the multi sample. * * @throws Exception * on error (no detailed exception handling here for sample @@ -43,6 +48,7 @@ public class MultiCLMain { ExampleUtils.log("DONE"); } + /** Runs the multi sample and returns the facet results */ public ExampleResult runSample() throws Exception { // create Directories for the search index and for the taxonomy index diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java index b6b63e1c383..e54fb82a3ee 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/multiCL/MultiCLSearcher.java @@ -49,6 +49,9 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; * @lucene.experimental */ public class MultiCLSearcher { + + /** No instance */ + private MultiCLSearcher() {} /** * Search an index with facets. @@ -78,6 +81,18 @@ public class MultiCLSearcher { return results; } + /** + * Search an index with facets. + * + * @param indexReader + * Reader over the search index. + * @param taxo + * taxonomy reader. + * @throws Exception + * on error (no detailed exception handling here for sample + * simplicity + * @return facet results + */ public static List searchWithFacets(IndexReader indexReader, TaxonomyReader taxo, FacetIndexingParams iParams) throws Exception { // prepare searcher to search against diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java index 1473ba4588d..d095aba0298 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleIndexer.java @@ -39,6 +39,9 @@ import org.apache.lucene.store.Directory; * @lucene.experimental */ public class SimpleIndexer { + + /** No instance */ + private SimpleIndexer() {} /** * Create an index, and adds to it sample documents and facets. diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java index 76a6171ba42..22448f8302e 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleMain.java @@ -36,6 +36,9 @@ import org.apache.lucene.facet.taxonomy.directory.DirectoryTaxonomyReader; * @lucene.experimental */ public class SimpleMain { + + /** Sole constructor */ + public SimpleMain() {} /** * Driver for the simple sample. @@ -47,6 +50,7 @@ public class SimpleMain { ExampleUtils.log("DONE"); } + /** Runs the simple sample and returns the facet results */ public ExampleResult runSimple() throws Exception { // create Directories for the search index and for the taxonomy index Directory indexDir = new RAMDirectory(); @@ -72,6 +76,7 @@ public class SimpleMain { return res; } + /** Runs the simple sample and returns drilldown results */ public ExampleResult runDrillDown() throws Exception { // create Directories for the search index and for the taxonomy index Directory indexDir = new RAMDirectory(); diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java index 9cc554068f3..10b14ca66fb 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleSearcher.java @@ -47,6 +47,9 @@ import org.apache.lucene.search.TopScoreDocCollector; */ public class SimpleSearcher { + /** No instance */ + private SimpleSearcher() {} + /** * Search an index with facets. * @param indexReader index reader. diff --git a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java index 6dd52fbe62d..9170e2df338 100644 --- a/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java +++ b/lucene/demo/src/java/org/apache/lucene/demo/facet/simple/SimpleUtils.java @@ -28,6 +28,9 @@ import org.apache.lucene.facet.taxonomy.CategoryPath; * @lucene.experimental */ public class SimpleUtils { + + /** No instance */ + private SimpleUtils() {} /** * Documents text field. diff --git a/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java b/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java index 2e4a74e4c64..0e157bbbe66 100644 --- a/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java +++ b/lucene/facet/src/java/org/apache/lucene/facet/util/TaxonomyMergeUtils.java @@ -36,6 +36,7 @@ import org.apache.lucene.util.Version; */ /** + * Utility methods for merging index and taxonomy directories. * @lucene.experimental */ public class TaxonomyMergeUtils { From 7af430e0716aebbd625ab8e85a7c115890d50b4c Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Thu, 31 Jan 2013 03:18:58 +0000 Subject: [PATCH 17/17] fix this to be explicit about which locale it is (or isnt) using... git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1440836 13f79535-47bb-0310-9956-ffa450edef68 --- .../src/java/org/apache/solr/util/SimplePostTool.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java index 5683368d1de..6f2308eccda 100644 --- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java +++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java @@ -190,16 +190,18 @@ public class SimplePostTool { * @param millis the time in milliseconds */ private void displayTiming(long millis) { + // TODO: if the intent is user-display: this should use SimpleDateFormat + // or similar instead of homemade formatting. long hours = millis / 3600000; long minutes = (millis / 60000) % 60; long seconds = (millis / 1000) % 60; long milliseconds = millis % 1000; if (hours>0) { - System.out.println(String.format("Time taken: %02d:%02d:%02d.%03d", hours, minutes, seconds, milliseconds)); + System.out.println(String.format(Locale.getDefault(), "Time taken: %02d:%02d:%02d.%03d", hours, minutes, seconds, milliseconds)); } else if (minutes>0) { - System.out.println(String.format("Time taken: %02d:%02d.%03d", minutes, seconds, milliseconds)); + System.out.println(String.format(Locale.getDefault(), "Time taken: %02d:%02d.%03d", minutes, seconds, milliseconds)); } else { - System.out.println(String.format("Time taken: %d.%03ds", seconds, milliseconds)); + System.out.println(String.format(Locale.getDefault(), "Time taken: %d.%03ds", seconds, milliseconds)); } }