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 2016/06/24 23:35:03 UTC
[1/2] lucene-solr:branch_5x: Add script to host release management
tools. Currently performs a single task: makes regexes for all JIRAs included
in a release by parsing the CHANGES.txt files
Repository: lucene-solr
Updated Branches:
refs/heads/branch_5x 75975019b -> 2489de287
Add script to host release management tools. Currently performs a single task: makes regexes for all JIRAs included in a release by parsing the CHANGES.txt files
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c6affbdd
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c6affbdd
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c6affbdd
Branch: refs/heads/branch_5x
Commit: c6affbdd1cb7b3d37f7a2c693a36e4961e263b36
Parents: 7597501
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jun 24 19:13:16 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 24 19:30:43 2016 -0400
----------------------------------------------------------------------
dev-tools/scripts/manageRelease.py | 90 +++++++++++++++++++++++++++++++++
1 file changed, 90 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c6affbdd/dev-tools/scripts/manageRelease.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/manageRelease.py b/dev-tools/scripts/manageRelease.py
new file mode 100644
index 0000000..212edd0
--- /dev/null
+++ b/dev-tools/scripts/manageRelease.py
@@ -0,0 +1,90 @@
+# 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.
+
+import sys
+import os
+sys.path.append(os.path.dirname(__file__))
+from scriptutil import *
+import argparse
+import re
+
+# Pulls out all JIRAs mentioned in the given CHANGES.txt filename under the given version
+# and outputs a regular expression that will match all of them
+def print_changes_jira_regex(filename, version):
+ release_section_re = re.compile(r'\s*====*\s+(.*)\s+===')
+ version_re = re.compile(r'%s(?:$|[^-])' % version)
+ bullet_re = re.compile(r'\s*[-*]\s*(.*)')
+ issue_list_re = re.compile(r'[:,/()\s]*((?:LUCENE|SOLR)-\d+)')
+ more_issues_on_next_line_re = re.compile(r'(?:[:,/()\s]*(?:LUCENE|SOLR)-\d+)+\s*,\s*$') # JIRA list with trailing comma
+ under_requested_version = False
+ requested_version_found = False
+ more_issues_on_next_line = False
+ lucene_issues = []
+ solr_issues = []
+ with open(filename, 'r') as changes:
+ for line in changes:
+ version_boundary = release_section_re.match(line)
+ if version_boundary is not None:
+ if under_requested_version:
+ break # No longer under the requested version - stop looking for JIRAs
+ else:
+ if version_re.search(version_boundary.group(1)):
+ under_requested_version = True # Start looking for JIRAs
+ requested_version_found = True
+ else:
+ if under_requested_version:
+ bullet_match = bullet_re.match(line)
+ if more_issues_on_next_line or bullet_match is not None:
+ content = bullet_match.group(1) if bullet_match is not None else line
+ for issue in issue_list_re.findall(content):
+ (lucene_issues if issue.startswith('LUCENE-') else solr_issues).append(issue.rsplit('-', 1)[-1])
+ more_issues_on_next_line = more_issues_on_next_line_re.match(content)
+ if not requested_version_found:
+ raise Exception('Could not find %s in %s' % (version, filename))
+ print('\nRegex to match JIRAs in the %s release section in %s:' % (version, filename))
+ if len(lucene_issues) > 0:
+ print(r'LUCENE-(?:%s)\b' % '|'.join(lucene_issues), end='')
+ if len(solr_issues) > 0:
+ print('|', end='')
+ if len(solr_issues) > 0:
+ print(r'SOLR-(?:%s)\b' % '|'.join(solr_issues), end='')
+ print()
+
+def read_config():
+ parser = argparse.ArgumentParser(description='Tools to help manage a Lucene/Solr release')
+ parser.add_argument('version', type=Version.parse, help='Version of the form X.Y.Z')
+ c = parser.parse_args()
+
+ c.branch_type = find_branch_type()
+ c.matching_branch = c.version.is_bugfix_release() and c.branch_type == BranchType.release or \
+ c.version.is_minor_release() and c.branch_type == BranchType.stable or \
+ c.version.is_major_release() and c.branch_type == BranchType.unstable
+
+ print ("branch_type is %s " % c.branch_type)
+
+ return c
+
+def main():
+ c = read_config()
+ # TODO: add other commands to perform, specifiable via cmdline param
+ # Right now, only one operation is performed: generate regex matching JIRAs for the given version from CHANGES.txt
+ print_changes_jira_regex('lucene/CHANGES.txt', c.version)
+ print_changes_jira_regex('solr/CHANGES.txt', c.version)
+
+if __name__ == '__main__':
+ try:
+ main()
+ except KeyboardInterrupt:
+ print('\nReceived Ctrl-C, exiting early')
[2/2] lucene-solr:branch_5x: CHANGES.txt-s: Synchronize 5.5.1 and
5.5.2 sections
Posted by sa...@apache.org.
CHANGES.txt-s: Synchronize 5.5.1 and 5.5.2 sections
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2489de28
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2489de28
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2489de28
Branch: refs/heads/branch_5x
Commit: 2489de2878b6b124f5fcb949cf6d801a01d31b1b
Parents: c6affbd
Author: Steve Rowe <sa...@apache.org>
Authored: Fri Jun 24 19:34:53 2016 -0400
Committer: Steve Rowe <sa...@apache.org>
Committed: Fri Jun 24 19:34:53 2016 -0400
----------------------------------------------------------------------
lucene/CHANGES.txt | 57 +++++++++++++++++++--
solr/CHANGES.txt | 128 ++++++++++++++++++++++++++++++++++++++++++++----
2 files changed, 172 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2489de28/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 29cac74..8216a72 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -6,13 +6,62 @@ http://s.apache.org/luceneversions
======================= Lucene 5.6.0 =======================
(No Changes)
-======================= Lucene 5.5.1 =======================
+======================= Lucene 5.5.2 =======================
Bug Fixes
-* SOLR-8867: FunctionValues.getRangeScorer now takes a LeafReaderContext instead
- of an IndexReader, and avoids matching documents without a value in the field
- for numeric fields. (yonik)
+* LUCENE-7065: Fix the explain for the global ordinals join query. Before the
+ explain would also indicate that non matching documents would match.
+ On top of that with score mode average, the explain would fail with a NPE.
+ (Martijn van Groningen)
+
+* LUCENE-7111: DocValuesRangeQuery.newLongRange behaves incorrectly for
+ Long.MAX_VALUE and Long.MIN_VALUE (Ishan Chattopadhyaya via Steve Rowe)
+
+* LUCENE-7139: Fix bugs in geo3d's Vincenty surface distance
+ implementation (Karl Wright via Mike McCandless)
+
+* LUCENE-7187: Block join queries' Weight#extractTerms(...) implementations
+ should delegate to the wrapped weight. (Martijn van Groningen)
+
+* LUCENE-7279: JapaneseTokenizer throws ArrayIndexOutOfBoundsException
+ on some valid inputs (Mike McCandless)
+
+* LUCENE-7219: Make queryparser/xml (Point|LegacyNumeric)RangeQuery builders
+ match the underlying queries' (lower|upper)Term optionality logic.
+ (Kaneshanathan Srivisagan, Christine Poerschke)
+
+* LUCENE-7284: GapSpans needs to implement positionsCost(). (Daniel Bigham, Alan
+ Woodward)
+
+* LUCENE-7231: WeightedSpanTermExtractor didn't deal correctly with single-term
+ phrase queries. (Eva Popenda, Alan Woodward)
+
+* LUCENE-7301: Multiple doc values updates to the same document within
+ one update batch could be applied in the wrong order resulting in
+ the wrong updated value (Ishan Chattopadhyaya, hossman, Mike McCandless)
+
+* LUCENE-7132: BooleanQuery sometimes assigned too-low scores in cases
+ where ranges of documents had only a single clause matching while
+ other ranges had more than one clause matching (Ahmet Arslan,
+ hossman, Mike McCandless)
+
+* LUCENE-7291: Spatial heatmap faceting could mis-count when the heatmap crosses the
+ dateline and indexed non-point shapes are much bigger than the heatmap region.
+ (David Smiley)
+
+======================= Lucene 5.5.1 =======================
+
+Bug fixes
+
+* LUCENE-7112: WeightedSpanTermExtractor.extractUnknownQuery is only called
+ on queries that could not be extracted. (Adrien Grand)
+
+* LUCENE-7188: remove incorrect sanity check in NRTCachingDirectory.listAll()
+ that led to IllegalStateException being thrown when nothing was wrong.
+ (David Smiley, yonik)
+
+* LUCENE-7209: Fixed explanations of FunctionScoreQuery. (Adrien Grand)
======================= Lucene 5.5.0 =======================
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2489de28/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index faec8ce..4e3a17f 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -22,23 +22,131 @@ New Features
Bug Fixes
----------------------
+Other Changes
+----------------------
+
+* SOLR-8677: Prevent shards containing invalid characters from being created. Checks added server-side
+ and in SolrJ. (Shai Erera, Jason Gerlowski, Anshum Gupta)
+
+======================= 5.5.2 =======================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Versions of Major Components
+---------------------
+Apache Tika 1.7
+Carrot2 3.10.4
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.6
+Jetty 9.2.13.v20150730
+
+Bug Fixes
+---------------------
+
+* SOLR-8695: Ensure ZK watchers are not triggering our watch logic on connection events and
+ make this handling more consistent. (Scott Blum via Mark Miller)
+
+* SOLR-9198: config APIs unable to add multiple values with same name (noble)
+
* SOLR-9191: OverseerTaskQueue.peekTopN() fatally flawed (Scott Blum, Noble Paul)
* SOLR-8812: edismax: turn off mm processing if no explicit mm spec is provided
and there are explicit operators (except for AND) - addresses problems caused by SOLR-2649.
(Greg Pendlebury, Jan H�ydahl, Erick Erickson, Steve Rowe)
+* SOLR-9034: Atomic updates failed to work when there were copyField targets that had docValues
+ enabled. (Karthik Ramachandran, Ishan Chattopadhyaya, yonik)
+
+* SOLR-8940: Fix group.sort option (hossman)
+
+* SOLR-8857: HdfsUpdateLog does not use configured or new default number of version buckets and is
+ hard coded to 256. (Mark Miller, yonik, Gregory Chanan)
+
+* SOLR-8875: SolrCloud Overseer clusterState could unexpectedly be null resulting in NPE.
+ (Scott Blum via David Smiley)
+
+* SOLR-8946: bin/post failed to detect stdin usage on Ubuntu; maybe other unixes. (David Smiley)
+
+* SOLR-9004: Fix "name" field type definition in films example. (Alexandre Rafalovitch via Varun Thacker)
+
+* SOLR-8990: Fix top term links from schema browser page to use {!term} parser (hossman)
+
+* SOLR-8971: Preserve root cause when wrapping exceptions (hossman)
+
+* SOLR-8792: ZooKeeper ACL support fixed. (Esther Quansah, Ishan Chattopadhyaya, Steve Rowe)
+
+* SOLR-9030: The 'downnode' overseer command can trip asserts in ZkStateWriter.
+ (Scott Blum, Mark Miller, shalin)
+
+* SOLR-9036: Solr slave is doing full replication (entire index) of index after master restart.
+ (Lior Sapir, Mark Miller, shalin)
+
+* SOLR-9093: Fix NullPointerException in TopGroupsShardResponseProcessor. (Christine Poerschke)
+
+* SOLR-9118: HashQParserPlugin should trim partition keys (Joel Bernstein)
+
+* SOLR-9117: The first SolrCore is leaked after reload. (Jessica Cheng Mallet via shalin)
+
+* SOLR-9116: Race condition causing occasional SolrIndexSearcher leak when SolrCore is reloaded.
+ (Jessica Cheng Mallet via shalin)
+
+* SOLR-8801: /bin/solr create script always returns exit code 0 when a collection/core already exists.
+ (Khalid Alharbi, Marius Grama via Steve Rowe)
+
+* SOLR-9134: Fix RestManager.addManagedResource return value. (Christine Poerschke)
+
+* SOLR-9151: Fix SolrCLI so that bin/solr -e cloud example can be run from any CWD (janhoy)
+
+* SOLR-9165: Spellcheck does not return collations if "maxCollationTries" is used with "cursorMark".
+ (James Dyer)
+
+* SOLR-8612: closing JDBC Statement on failures in DataImportHandler (DIH) (Kristine Jetzke via Mikhail Khludnev)
+
+* SOLR-8676: keep LOG4J_CONFIG in solr.cmd (Kristine Jetzke via Mikhail Khludnev)
+
+* SOLR-9176: facet method ENUM was sometimes unnecessarily being rewritten to
+ FCS, causing slowdowns (Alessandro Benedetti, Jesse McLaughlin, Alan Woodward)
+
+* SOLR-9234: srcField works only when all fields are captured in the /update/json/docs
+ endpoint (noble)
+
Other Changes
----------------------
-* SOLR-8677: Prevent shards containing invalid characters from being created. Checks added server-side
- and in SolrJ. (Shai Erera, Jason Gerlowski, Anshum Gupta)
+* SOLR-7516: Improve javadocs for JavaBinCodec, ObjectResolver and enforce the single-usage policy.
+ (Jason Gerlowski, Benoit Vanalderweireldt, shalin)
+
+* SOLR-8967: In SolrCloud mode, under the 'Core Selector' dropdown in the UI the Replication tab won't be displayed
+ anymore. The Replication tab is only beneficial to users running Solr in master-slave mode. (Varun Thacker)
+
+* SOLR-9131: Fix "start solr" text in cluster.vm Velocity template (janhoy)
+
+* SOLR-9053: Upgrade commons-fileupload to 1.3.1, fixing a potential vulnerability (Jeff Field, Mike Drob via janhoy)
+
+* SOLR-8866: UpdateLog will now throw an exception if it doesn't know how to serialize a value.
+ (David Smiley)
+
+* SOLR-8933: Solr should not close container streams. (Mike Drob, Uwe Schindler, Mark Miller)
+
+* SOLR-9037: Replace multiple "/replication" strings with one static constant. (Christine Poerschke)
+
+* SOLR-9047: zkcli should allow alternative locations for log4j configuration (Gregory Chanan)
+
+* SOLR-9105: Fix a bunch of typos across 103 files (Bartosz Krasi\u0144ski via janhoy)
+
+* SOLR-8445: fix line separator in log4j.properties files (Ahmet Arslan via Mikhail Khludnev)
+
+* SOLR-8674: Stop ignoring sysprop solr.tests.mergePolicy, and make tests randomly choose between
+ setting <mergePolicy> and <mergePolicyFactory>, which was added in SOLR-8621. (Christine Poerschke)
======================= 5.5.1 =======================
Bug Fixes
----------------------
+* SOLR-8737: Managed synonym lists do not include the original term in the expand (janhoy)
+
* SOLR-8734: fix (maxMergeDocs|mergeFactor) deprecation warnings: in solrconfig.xml
<maxMergeDocs|mergeFactor> may not be combined with <mergePolicyFactory> and
<maxMergeDocs|mergeFactor> on their own or combined with <mergePolicy> is a warning.
@@ -52,9 +160,18 @@ Bug Fixes
hasn't refreshed yet). In this case the reported size of the file is -1.
(Shai Erera, Alexey Serba, Richard Coggins)
+* SOLR-8728: ReplicaAssigner throws NPE when a partial list of nodes are only participating in replica
+ placement. splitshard should preassign nodes using rules, if rules are present (noble, Shai Erera)
+
+* SOLR-8838: Returning non-stored docValues is incorrect for negative floats and doubles.
+ (Ishan Chattopadhyaya, Steve Rowe)
+
* SOLR-8870: AngularJS Query tab no longer URL-encodes the /select part of the request, fixing possible 404 issue
when Solr is behind a proxy. Also, now supports old-style &qt param when handler not prefixed with "/" (janhoy)
+* SOLR-8725: Allow hyphen in collection, core, shard, and alias name as the non-first character
+ (Anshum Gupta) (from 6.0)
+
* SOLR-8155: JSON Facet API - field faceting on a multi-valued string field without
docValues (i.e. UnInvertedField implementation), but with a prefix or with a sort
other than count, resulted in incorrect results. This has been fixed, and facet.prefix
@@ -140,13 +257,6 @@ Bug Fixes
* SOLR-8804: Fix a race condition in the ClusterStatus API call whereby the call would fail when a concurrent delete
collection api command was executed (Alexey Serba, Varun Thacker)
-* SOLR-8838: Returning non-stored docValues is incorrect for negative floats and doubles.
- (Ishan Chattopadhyaya, Steve Rowe)
-
-* SOLR-8867: {!frange} queries will now avoid matching documents without a value in the
- numeric field. For more complex functions, FunctionValues.exists() must also return true
- for the document to match. (yonik)
-
* SOLR-9016: Fix SolrIdentifierValidator to not allow empty identifiers. (Shai Erera)
* SOLR-8886: Fix TrieField.toObject(IndexableField) to work for field with docValues