From 5cd72ec45a77dfbcd1f3be278b4675e5082043ce Mon Sep 17 00:00:00 2001 From: Mike Klaas Date: Thu, 9 Nov 2006 00:43:54 +0000 Subject: [PATCH] checked patch for SOLR-65 git-svn-id: https://svn.apache.org/repos/asf/incubator/solr/trunk@472720 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 4 + example/solr/conf/solrconfig.xml | 6 + src/java/org/apache/solr/core/SolrCore.java | 67 ++-- .../solr/update/DirectUpdateHandler2.java | 321 +++++++++++++----- .../apache/solr/BasicFunctionalityTest.java | 7 +- src/test/test-files/solr/conf/solrconfig.xml | 13 +- 6 files changed, 272 insertions(+), 146 deletions(-) diff --git a/CHANGES.txt b/CHANGES.txt index 7622e30f9eb..784fbb288b0 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -62,6 +62,7 @@ New Features 28. json.wrf parameter adds a wrapper-function around the JSON response, useful in AJAX with dynamic script tags for specifying a JavaScript callback function. (Bertrand Delacretaz via yonik, SOLR-56) +29. autoCommit can be specified every so many documents added (klaas, SOLR-65) Changes in runtime behavior 1. classes reorganized into different packages, package names changed to Apache @@ -80,6 +81,8 @@ Changes in runtime behavior 7. FunctionQuery.explain now uses ComplexExplanation to provide more accurate score explanations when composed in a BooleanQuery. (hossman, SOLR-25) + 8. Document update handling locking is much sparser, allowing performance gains + through multiple threads. Large commits also might be faster (klaas, SOLR-65) Optimizations 1. getDocListAndSet can now generate both a DocList and a DocSet from a @@ -113,6 +116,7 @@ Bug Fixes generate and catenate off. (Mike Klaas via yonik, SOLR-34) 8. Escape '>' in XML output (because ]]> is illegal in CharData) 9. field boosts weren't being applied and doc boosts were being applied to fields (klaas) +10. Multiple-doc update generates well-formed xml (klaas, SOLR-65) Other Changes 1. Upgrade to Lucene 2.0 nightly build 2006-06-22, lucene SVN revision 416224, diff --git a/example/solr/conf/solrconfig.xml b/example/solr/conf/solrconfig.xml index 466026810aa..acdba3c085a 100755 --- a/example/solr/conf/solrconfig.xml +++ b/example/solr/conf/solrconfig.xml @@ -38,6 +38,12 @@ + + - + + 0 + -->