You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2015/02/23 21:39:02 UTC
svn commit: r1661772 - in /lucene/dev/trunk: lucene/CHANGES.txt
lucene/site/changes/changes2html.pl solr/CHANGES.txt
Author: sarowe
Date: Mon Feb 23 20:39:02 2015
New Revision: 1661772
URL: http://svn.apache.org/r1661772
Log:
Fix problems with changes2html.pl, mostly to do with marking things as attributions when they shouldn't be, or not when they should; and fixup formatting issues in lucene/CHANGES.txt and solr/CHANGES.txt
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/site/changes/changes2html.pl
lucene/dev/trunk/solr/CHANGES.txt
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1661772&r1=1661771&r2=1661772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Feb 23 20:39:02 2015
@@ -3247,7 +3247,7 @@ Changes in backwards compatibility polic
not necessary to specify for example that all of your binary values have
the same length. Instead it's easy for the Codec API to optimize encoding
based on any properties of the content.
- (Simon Willnauer, Adrien Grand, Mike McCandless, Robert Muir)
+ (Simon Willnauer, Adrien Grand, Mike McCandless, Robert Muir)
* LUCENE-4757: Cleanup and refactoring of FacetsAccumulator, FacetRequest,
FacetsAggregator and FacetResultsHandler API. If your application did
@@ -3528,7 +3528,7 @@ Changes in backwards compatibility polic
methods such as close() and reference counting management pulled from
DirectoryTaxonomyReader, and made final. The rest of the methods, remained
abstract.
- (Shai Erera, Gilad Barkai)
+ (Shai Erera, Gilad Barkai)
* LUCENE-4576: Remove CachingWrapperFilter(Filter, boolean). This recacheDeletes
option gave less than 1% speedup at the expense of cache churn (filters were
@@ -6222,8 +6222,8 @@ Optimizations
Test Cases
-* LUCENE-3327: Fix AIOOBE when TestFSTs is run with
- -Dtests.verbose=true (James Dyer via Mike McCandless)
+* LUCENE-3327: Fix AIOOBE when TestFSTs is run with -Dtests.verbose=true
+ (James Dyer via Mike McCandless)
Build
@@ -7730,7 +7730,7 @@ API Changes
- MapOfSets
- o.a.l.util.cache package
- lot's of internal APIs of IndexWriter
- (Uwe Schindler, Michael Busch, Kay Kay, Robert Muir, Adriano Crestani)
+ (Uwe Schindler, Michael Busch, Kay Kay, Robert Muir, Adriano Crestani)
* LUCENE-1944, LUCENE-1856, LUCENE-1957, LUCENE-1960, LUCENE-1961,
LUCENE-1968, LUCENE-1970, LUCENE-1946, LUCENE-1971, LUCENE-1975,
Modified: lucene/dev/trunk/lucene/site/changes/changes2html.pl
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/site/changes/changes2html.pl?rev=1661772&r1=1661771&r2=1661772&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/site/changes/changes2html.pl (original)
+++ lucene/dev/trunk/lucene/site/changes/changes2html.pl Mon Feb 23 20:39:02 2015
@@ -545,6 +545,7 @@ for my $rel (@releases) {
}se;
$bulleted_list;
}ge;
+ $uncode = markup_trailing_attribution($uncode);
$uncode;
}
}sge;
@@ -626,13 +627,18 @@ print "</body>\n</html>\n";
sub markup_trailing_attribution {
my $item = shift;
- # Put attributions on their own lines.
+ # Put attributions on their own lines - this already happens if there is a preceding </ul>
+ my $extra_newline = ($item =~ m:</ul>:) ? '' : '<br />';
# Check for trailing parenthesized attribution with no following period.
# Exclude things like "(see #3 above)" and "(use the bug number instead of xxxx)"
- unless ($item =~ s{\s*(\((?![Ss]ee )
+ unless ($item =~ s{\s+(\((?![Ss]ee )
(?!spans\b)
(?!mainly\ )
(?!LUCENE-\d+\))
+ (?!SOLR-\d+\))
+ (?!user's)
+ (?!like\ )
+ (?!r\d{6}) # subversion revision
(?!and\ )
(?!backported\ )
(?!in\ )
@@ -640,7 +646,7 @@ sub markup_trailing_attribution {
(?![Tt]he\ )
(?!use\ the\ bug\ number)
[^()"]+?\))\s*$}
- {\n<br /><span class="attrib">$1</span>}x) {
+ {\n${extra_newline}<span class="attrib">$1</span>}x) {
# If attribution is not found, then look for attribution with a
# trailing period, but try not to include trailing parenthesized things
# that are not attributions.
@@ -650,10 +656,14 @@ sub markup_trailing_attribution {
# fewer words or it includes the word "via" or the phrase "updates from",
# then it is considered to be an attribution.
- $item =~ s{(\s*(\((?![Ss]ee\ )
+ $item =~ s{(\s+(\((?![Ss]ee\ )
(?!spans\b)
(?!mainly\ )
(?!LUCENE-\d+\))
+ (?!SOLR-\d+\))
+ (?!user's)
+ (?!like\ )
+ (?!r\d{6}) # subversion revision
(?!and\ )
(?!backported\ )
(?!in\ )
@@ -669,8 +679,10 @@ sub markup_trailing_attribution {
if ($parenthetical !~ /LUCENE-\d+/) {
my ($no_parens) = $parenthetical =~ /^\((.*)\)$/s;
my @words = grep {/\S/} split /\s+/, $no_parens;
- if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <= 4) {
- $subst = "\n<br /><span class=\"attrib\">$parenthetical</span>";
+ my $commas = $no_parens =~ s/,/,/g; # count commas
+ my $max_words = 4 + $commas;
+ if ($no_parens =~ /\b(?:via|updates\s+from)\b/i || scalar(@words) <= $max_words) {
+ $subst = "\n${extra_newline}<span class=\"attrib\">$parenthetical</span>";
}
}
$subst . $trailing_period_and_or_issue;
Modified: lucene/dev/trunk/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/CHANGES.txt?rev=1661772&r1=1661771&r2=1661772&view=diff
==============================================================================
--- lucene/dev/trunk/solr/CHANGES.txt (original)
+++ lucene/dev/trunk/solr/CHANGES.txt Mon Feb 23 20:39:02 2015
@@ -188,6 +188,11 @@ Other Changes
Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+NOTE: Solr 5.0 only supports creating and removing SolrCloud collections through
+ the collections API, unlike previous versions. While not using the
+ collections API may still work in 5.0, it is unsupported, not recommended,
+ and the behavior will change in a 5.x release.
+
Versions of Major Components
---------------------
Apache Tika 1.7
@@ -197,11 +202,6 @@ Apache UIMA 2.3.1
Apache ZooKeeper 3.4.6
Jetty 9.2.6.v20141205
-NOTE: Solr 5.0 only supports creating and removing SolrCloud collections through
- the collections API, unlike previous versions. While not using the
- collections API may still work in 5.0, it is unsupported, not recommended,
- and the behavior will change in a 5.x release.
-
Upgrading from Solr 4.x
----------------------
@@ -670,10 +670,10 @@ Bug Fixes
of all "keys" found in the request parameters, resulting in some key=value param pairs
being duplicated. This was noticeably affecting some areas of the code where iteration
was done over the set of all params:
- * literal.* in ExtractingRequestHandler
- * facet.* in FacetComponent
- * spellcheck.[dictionary name].* and spellcheck.collateParam.* in SpellCheckComponent
- * olap.* in AnalyticsComponent
+ - literal.* in ExtractingRequestHandler
+ - facet.* in FacetComponent
+ - spellcheck.[dictionary name].* and spellcheck.collateParam.* in SpellCheckComponent
+ - olap.* in AnalyticsComponent
(Alexandre Rafalovitch & hossman)
* SOLR-6920: A replicated index can end up corrupted when small files end up with the same
@@ -821,7 +821,7 @@ Other Changes
* SOLR-6751: Exceptions thrown in the analysis chain in DirectUpdateHandler2
should return a BAD_REQUEST status (Alan Woodward)
-* SOLR-6792 : deprecate AdminHandlers, Clean up solrconfig.xml of
+* SOLR-6792: deprecate AdminHandlers, Clean up solrconfig.xml of
unnecessary plugin definitions, implicit registration of /replication,
/get and /admin/* handlers (Noble Paul)
@@ -3207,18 +3207,18 @@ Bug Fixes
* SOLR-4910: persisting solr.xml is broken. More stringent testing of persistence fixed
up a number of issues and several bugs with persistence. Among them are
- > don't persisting implicit properties
- > should persist zkHost in the <solr> tag (user's list)
- > reloading a core that has transient="true" returned an error. reload should load
+ - don't persisting implicit properties
+ - should persist zkHost in the <solr> tag (user's list)
+ - reloading a core that has transient="true" returned an error. reload should load
a transient core if it's not yet loaded.
- > No longer persisting loadOnStartup or transient core properties if they were not
+ - No longer persisting loadOnStartup or transient core properties if they were not
specified in the original solr.xml
- > Testing flushed out the fact that you couldn't swap a core marked transient=true
+ - Testing flushed out the fact that you couldn't swap a core marked transient=true
loadOnStartup=false because it hadn't been loaded yet.
- > SOLR-4862, CREATE fails to persist schema, config, and dataDir
- > SOLR-4363, not persisting coreLoadThreads in <solr> tag
- > SOLR-3900, logWatcher properties not persisted
- > SOLR-4850, cores defined as loadOnStartup=true, transient=false can't be searched
+ - SOLR-4862, CREATE fails to persist schema, config, and dataDir
+ - SOLR-4363, not persisting coreLoadThreads in <solr> tag
+ - SOLR-3900, logWatcher properties not persisted
+ - SOLR-4850, cores defined as loadOnStartup=true, transient=false can't be searched
(Erick Erickson)
* SOLR-4923: Commits to non leaders as part of a request that also contain updates
@@ -3541,11 +3541,11 @@ New Features
support for the old style. (Erick Erickson, Mark Miller)
Additional Work:
- SOLR-4347: Ensure that newly-created cores via Admin handler are persisted in solr.xml
- (Erick Erickson)
+ (Erick Erickson)
- SOLR-1905: Cores created by the admin request handler should be persisted to solr.xml.
- Also fixed a problem whereby properties like solr.solr.datadir would be persisted
- to solr.xml. Also, cores that didn't happen to be loaded were not persisted.
- (Erick Erickson)
+ Also fixed a problem whereby properties like solr.solr.datadir would be persisted
+ to solr.xml. Also, cores that didn't happen to be loaded were not persisted.
+ (Erick Erickson)
* SOLR-4717/SOLR-1351: SimpleFacets now work with localParams allowing faceting on the
same field multiple ways (ryan, Uri Boness)