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 2017/10/26 21:13:15 UTC
[1/5] lucene-solr:branch_6_6: addBackcompatIndexes.py: Create
'sorted' indexes;
on major releases, produce moreterms, dvupdates, and empty indexes. Add sorted
indexes for missing 6.x.y releases.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_6 bc358c0f5 -> 471d8319a
refs/heads/branch_7x ca084ed40 -> 49dc26c1d
addBackcompatIndexes.py: Create 'sorted' indexes; on major releases, produce moreterms, dvupdates, and empty indexes. Add sorted indexes for missing 6.x.y releases.
Conflicts:
lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a2bf8573
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a2bf8573
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a2bf8573
Branch: refs/heads/branch_6_6
Commit: a2bf857321aec3b94e2ef55f12471a0b43427f13
Parents: bc358c0
Author: Steve Rowe <sa...@gmail.com>
Authored: Sat Sep 30 22:43:21 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Oct 26 16:33:06 2017 -0400
----------------------------------------------------------------------
dev-tools/scripts/addBackcompatIndexes.py | 67 ++++++++++++++-----
.../index/TestBackwardsCompatibility.java | 50 +++++++++++---
.../org/apache/lucene/index/sorted.6.4.0.zip | Bin 0 -> 117658 bytes
.../org/apache/lucene/index/sorted.6.4.1.zip | Bin 0 -> 467079 bytes
.../org/apache/lucene/index/sorted.6.4.2.zip | Bin 0 -> 82297 bytes
.../org/apache/lucene/index/sorted.6.5.0.zip | Bin 0 -> 70671 bytes
.../org/apache/lucene/index/sorted.6.5.1.zip | Bin 0 -> 128362 bytes
.../org/apache/lucene/index/sorted.6.6.0.zip | Bin 0 -> 126226 bytes
.../org/apache/lucene/index/sorted.6.6.1.zip | Bin 0 -> 122358 bytes
.../org/apache/lucene/index/sorted.7.0.0.zip | Bin 0 -> 72848 bytes
10 files changed, 92 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/dev-tools/scripts/addBackcompatIndexes.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addBackcompatIndexes.py b/dev-tools/scripts/addBackcompatIndexes.py
index 543fad6..08257ea 100644
--- a/dev-tools/scripts/addBackcompatIndexes.py
+++ b/dev-tools/scripts/addBackcompatIndexes.py
@@ -31,12 +31,24 @@ import re
import shutil
def create_and_add_index(source, indextype, index_version, current_version, temp_dir):
+ if not current_version.is_back_compat_with(index_version):
+ prefix = 'unsupported'
+ else:
+ prefix = {
+ 'cfs': 'index',
+ 'nocfs': 'index',
+ 'sorted': 'sorted',
+ 'moreterms': 'moreterms',
+ 'dvupdates': 'dvupdates',
+ 'emptyIndex': 'empty'
+ }[indextype]
if indextype in ('cfs', 'nocfs'):
dirname = 'index.%s' % indextype
+ filename = '%s.%s-%s.zip' % (prefix, index_version, indextype)
else:
dirname = indextype
- prefix = 'index' if current_version.is_back_compat_with(index_version) else 'unsupported'
- filename = '%s.%s-%s.zip' % (prefix, index_version, indextype)
+ filename = '%s.%s.zip' % (prefix, index_version)
+
print(' creating %s...' % filename, end='', flush=True)
module = 'backward-codecs'
index_dir = os.path.join('lucene', module, 'src/test/org/apache/lucene/index')
@@ -47,7 +59,11 @@ def create_and_add_index(source, indextype, index_version, current_version, temp
test = {
'cfs': 'testCreateCFS',
- 'nocfs': 'testCreateNoCFS'
+ 'nocfs': 'testCreateNoCFS',
+ 'sorted': 'testCreateSortedIndex',
+ 'moreterms': 'testCreateMoreTermsIndex',
+ 'dvupdates': 'testCreateIndexWithDocValuesUpdates',
+ 'emptyIndex': 'testCreateEmptyIndex'
}[indextype]
ant_args = ' '.join([
'-Dtests.bwcdir=%s' % temp_dir,
@@ -83,16 +99,22 @@ def create_and_add_index(source, indextype, index_version, current_version, temp
print('done')
def update_backcompat_tests(types, index_version, current_version):
- print(' adding new indexes to backcompat tests...', end='', flush=True)
+ print(' adding new indexes %s to backcompat tests...' % types, end='', flush=True)
module = 'lucene/backward-codecs'
filename = '%s/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java' % module
- matcher = re.compile(r'final static String\[\] oldNames = {|};' if current_version.is_back_compat_with(index_version)
- else r'final String\[\] unsupportedNames = {|};')
+ if not current_version.is_back_compat_with(index_version):
+ matcher = re.compile(r'final String\[\] unsupportedNames = {|};'),
+ elif 'sorted' in types:
+ matcher = re.compile(r'final static String\[\] oldSortedNames = {|};')
+ else:
+ matcher = re.compile(r'final static String\[\] oldNames = {|};')
+
+ strip_dash_suffix_re = re.compile(r'-.*')
def find_version(x):
x = x.strip()
- end = x.index("-")
- return scriptutil.Version.parse(x[1:end])
+ x = re.sub(strip_dash_suffix_re, '', x) # remove the -suffix if any
+ return scriptutil.Version.parse(x)
class Edit(object):
start = None
@@ -100,10 +122,12 @@ def update_backcompat_tests(types, index_version, current_version):
if self.start:
# find where this version should exist
i = len(buffer) - 1
- v = find_version(buffer[i])
- while i >= self.start and v.on_or_after(index_version):
- i -= 1
+ previous_version_exists = not ('};' in line and buffer[-1].strip().endswith("{"))
+ if previous_version_exists: # Only look if there is a version here
v = find_version(buffer[i])
+ while i >= self.start and v.on_or_after(index_version):
+ i -= 1
+ v = find_version(buffer[i])
i += 1 # readjust since we skipped past by 1
# unfortunately python doesn't have a range remove from list...
@@ -111,14 +135,20 @@ def update_backcompat_tests(types, index_version, current_version):
while i < len(buffer) and index_version.on_or_after(find_version(buffer[i])):
buffer.pop(i)
- if i == len(buffer) and not buffer[-1].strip().endswith(","):
+ if i == len(buffer) and previous_version_exists and not buffer[-1].strip().endswith(","):
# add comma
buffer[-1] = buffer[-1].rstrip() + ",\n"
- last = buffer[-1]
- spaces = ' ' * (len(last) - len(last.lstrip()))
+ if previous_version_exists:
+ last = buffer[-1]
+ spaces = ' ' * (len(last) - len(last.lstrip()))
+ else:
+ spaces = ' '
for (j, t) in enumerate(types):
- newline = spaces + ('"%s-%s"' % (index_version, t))
+ if t == 'sorted':
+ newline = spaces + ('"sorted.%s"') % index_version
+ else:
+ newline = spaces + ('"%s-%s"' % (index_version, t))
if j < len(types) - 1 or i < len(buffer):
newline += ','
buffer.insert(i, newline + '\n')
@@ -215,9 +245,16 @@ def main():
current_version = scriptutil.Version.parse(scriptutil.find_current_version())
create_and_add_index(source, 'cfs', c.version, current_version, c.temp_dir)
create_and_add_index(source, 'nocfs', c.version, current_version, c.temp_dir)
+ create_and_add_index(source, 'sorted', c.version, current_version, c.temp_dir)
+ if c.version.minor == 0 and c.version.bugfix == 0 and c.version.major < current_version.major:
+ create_and_add_index(source, 'moreterms', c.version, current_version, c.temp_dir)
+ create_and_add_index(source, 'dvupdates', c.version, current_version, c.temp_dir)
+ create_and_add_index(source, 'emptyIndex', c.version, current_version, c.temp_dir)
+ print ('\nMANUAL UPDATE REQUIRED: edit TestBackwardsCompatibility to enable moreterms, dvupdates, and empty index testing')
print('\nAdding backwards compatibility tests')
update_backcompat_tests(['cfs', 'nocfs'], c.version, current_version)
+ update_backcompat_tests(['sorted'], c.version, current_version)
print('\nTesting changes')
check_backcompat_tests()
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index 74562c5..3fc9ee1 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -95,7 +95,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
// Backcompat index generation, described below, is mostly automated in:
//
- // dev-tools/scripts/addBackCompatIndexes.py
+ // dev-tools/scripts/addBackcompatIndexes.py
//
// For usage information, see:
//
@@ -335,7 +335,28 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"6.6.1-cfs",
"6.6.1-nocfs"
};
-
+
+ public static String[] getOldNames() {
+ return oldNames;
+ }
+
+ final static String[] oldSortedNames = {
+ "sorted.6.2.0",
+ "sorted.6.2.1",
+ "sorted.6.3.0",
+ "sorted.6.4.0",
+ "sorted.6.4.1",
+ "sorted.6.4.2",
+ "sorted.6.5.0",
+ "sorted.6.5.1",
+ "sorted.6.6.0",
+ "sorted.6.6.1"
+ };
+
+ public static String[] getOldSortedNames() {
+ return oldSortedNames;
+ }
+
final String[] unsupportedNames = {
"1.9.0-cfs",
"1.9.0-nocfs",
@@ -443,7 +464,11 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"5.0.0.singlesegment-cfs",
"5.0.0.singlesegment-nocfs"
};
-
+
+ public static String[] getOldSingleSegmentNames() {
+ return oldSingleSegmentNames;
+ }
+
static Map<String,Directory> oldIndexDirs;
/**
@@ -505,10 +530,14 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
for (java.lang.reflect.Field field : Version.class.getDeclaredFields()) {
if (Modifier.isStatic(field.getModifiers()) && field.getType() == Version.class) {
Version v = (Version)field.get(Version.class);
- if (v.equals(Version.LATEST)) continue;
+ if (v.equals(Version.LATEST)) {
+ continue;
+ }
Matcher constant = constantPattern.matcher(field.getName());
- if (constant.matches() == false) continue;
+ if (constant.matches() == false) {
+ continue;
+ }
expectedVersions.add(v.toString() + "-cfs");
}
@@ -519,7 +548,9 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
// find what versions we are testing
List<String> testedVersions = new ArrayList<>();
for (String testedVersion : oldNames) {
- if (testedVersion.endsWith("-cfs") == false) continue;
+ if (testedVersion.endsWith("-cfs") == false) {
+ continue;
+ }
testedVersions.add(testedVersion);
}
Collections.sort(testedVersions);
@@ -1518,11 +1549,10 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
public void testSortedIndex() throws Exception {
- String[] versions = new String[] {"6.2.0", "6.2.1", "6.3.0"};
- for(String version : versions) {
+ for (String name : oldSortedNames) {
Path path = createTempDir("sorted");
- InputStream resource = TestBackwardsCompatibility.class.getResourceAsStream("sorted." + version + ".zip");
- assertNotNull("Sorted index index " + version + " not found", resource);
+ InputStream resource = TestBackwardsCompatibility.class.getResourceAsStream(name + ".zip");
+ assertNotNull("Sorted index index " + name + " not found", resource);
TestUtil.unzip(resource, path);
// TODO: more tests
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.0.zip
new file mode 100644
index 0000000..7d0b73d
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.1.zip
new file mode 100644
index 0000000..463c54c
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.1.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.2.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.2.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.2.zip
new file mode 100644
index 0000000..8fbc485
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.4.2.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.0.zip
new file mode 100644
index 0000000..c3a8cd8
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.1.zip
new file mode 100644
index 0000000..114292a
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.5.1.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.0.zip
new file mode 100644
index 0000000..4514dbd
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.0.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.1.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.1.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.1.zip
new file mode 100644
index 0000000..4f959ce
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.1.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a2bf8573/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip
new file mode 100644
index 0000000..48b4937
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.7.0.0.zip differ
[2/5] lucene-solr:branch_6_6: addBackCompatIndexes.py: Don't
generated sorted indexes for versions < 6.2
Posted by sa...@apache.org.
addBackCompatIndexes.py: Don't generated sorted indexes for versions < 6.2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b24acfe5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b24acfe5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b24acfe5
Branch: refs/heads/branch_6_6
Commit: b24acfe5aab23c182bff135ba400eb66e134cd65
Parents: a2bf857
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Oct 24 12:27:55 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Oct 26 16:34:49 2017 -0400
----------------------------------------------------------------------
dev-tools/scripts/addBackcompatIndexes.py | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b24acfe5/dev-tools/scripts/addBackcompatIndexes.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addBackcompatIndexes.py b/dev-tools/scripts/addBackcompatIndexes.py
index 08257ea..7a36002 100644
--- a/dev-tools/scripts/addBackcompatIndexes.py
+++ b/dev-tools/scripts/addBackcompatIndexes.py
@@ -103,7 +103,7 @@ def update_backcompat_tests(types, index_version, current_version):
module = 'lucene/backward-codecs'
filename = '%s/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java' % module
if not current_version.is_back_compat_with(index_version):
- matcher = re.compile(r'final String\[\] unsupportedNames = {|};'),
+ matcher = re.compile(r'final String\[\] unsupportedNames = {|};')
elif 'sorted' in types:
matcher = re.compile(r'final static String\[\] oldSortedNames = {|};')
else:
@@ -245,7 +245,8 @@ def main():
current_version = scriptutil.Version.parse(scriptutil.find_current_version())
create_and_add_index(source, 'cfs', c.version, current_version, c.temp_dir)
create_and_add_index(source, 'nocfs', c.version, current_version, c.temp_dir)
- create_and_add_index(source, 'sorted', c.version, current_version, c.temp_dir)
+ if c.version.major > 6 or (c.version.major == 6 and c.version.minor >= 2):
+ create_and_add_index(source, 'sorted', c.version, current_version, c.temp_dir)
if c.version.minor == 0 and c.version.bugfix == 0 and c.version.major < current_version.major:
create_and_add_index(source, 'moreterms', c.version, current_version, c.temp_dir)
create_and_add_index(source, 'dvupdates', c.version, current_version, c.temp_dir)
@@ -254,7 +255,8 @@ def main():
print('\nAdding backwards compatibility tests')
update_backcompat_tests(['cfs', 'nocfs'], c.version, current_version)
- update_backcompat_tests(['sorted'], c.version, current_version)
+ if c.version.major > 6 or (c.version.major == 6 and c.version.minor >= 2):
+ update_backcompat_tests(['sorted'], c.version, current_version)
print('\nTesting changes')
check_backcompat_tests()
[4/5] lucene-solr:branch_7x: Add version 6.6.2. Sync 6.6.2 CHANGES
entries. Add 6.6.2 back compat test indexes.
Posted by sa...@apache.org.
Add version 6.6.2. Sync 6.6.2 CHANGES entries. Add 6.6.2 back compat test indexes.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2e1a35c5
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2e1a35c5
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2e1a35c5
Branch: refs/heads/branch_7x
Commit: 2e1a35c5762d9180f201e1d633b6255b21305a80
Parents: ca084ed
Author: Steve Rowe <sa...@gmail.com>
Authored: Thu Oct 26 16:56:27 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Oct 26 16:56:27 2017 -0400
----------------------------------------------------------------------
.../__pycache__/scriptutil.cpython-35.pyc | Bin 0 -> 5048 bytes
lucene/CHANGES.txt | 12 ++++++
.../index/TestBackwardsCompatibility.java | 21 ++--------
.../org/apache/lucene/index/index.6.6.2-cfs.zip | Bin 0 -> 15820 bytes
.../apache/lucene/index/index.6.6.2-nocfs.zip | Bin 0 -> 15807 bytes
.../org/apache/lucene/index/sorted.6.6.2.zip | Bin 0 -> 75142 bytes
.../java/org/apache/lucene/util/Version.java | 7 ++++
solr/CHANGES.txt | 40 +++++++++++++++++++
8 files changed, 62 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc b/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc
new file mode 100644
index 0000000..e04157d
Binary files /dev/null and b/dev-tools/scripts/__pycache__/scriptutil.cpython-35.pyc differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index c766a43..8781ed2 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -385,6 +385,18 @@ Other
that are trivially replaced by LeafReader.terms() and MultiFields.getTerms()
(David Smiley)
+======================= Lucene 6.6.2 =======================
+
+Changes in Runtime Behavior
+
+* Resolving of external entities in queryparser/xml/CoreParser is disallowed
+ by default. See SOLR-11477 for details.
+
+Bug Fixes
+
+* SOLR-11477: Disallow resolving of external entities in queryparser/xml/CoreParser
+ by default. (Michael Stepankin, Olga Barinova, Uwe Schindler, Christine Poerschke)
+
======================= Lucene 6.6.1 =======================
Bug Fixes
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index 7c67ac2..09e83a8 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -312,6 +312,8 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"6.6.0-nocfs",
"6.6.1-cfs",
"6.6.1-nocfs",
+ "6.6.2-cfs",
+ "6.6.2-nocfs",
"7.0.0-cfs",
"7.0.0-nocfs",
"7.0.1-cfs",
@@ -335,6 +337,7 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"sorted.6.5.1",
"sorted.6.6.0",
"sorted.6.6.1",
+ "sorted.6.6.2",
"sorted.7.0.0",
"sorted.7.0.1",
"sorted.7.1.0"
@@ -561,24 +564,6 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
}
}
- // BEGIN TRUNK ONLY BLOCK
- // on trunk, the last release of the prev major release is also untested
- Version lastPrevMajorVersion = null;
- for (java.lang.reflect.Field field : Version.class.getDeclaredFields()) {
- if (Modifier.isStatic(field.getModifiers()) && field.getType() == Version.class) {
- Version v = (Version)field.get(Version.class);
- Matcher constant = constantPattern.matcher(field.getName());
- if (constant.matches() == false) continue;
- if (v.major == Version.LATEST.major - 1 &&
- (lastPrevMajorVersion == null || v.onOrAfter(lastPrevMajorVersion))) {
- lastPrevMajorVersion = v;
- }
- }
- }
- assertNotNull(lastPrevMajorVersion);
- expectedVersions.remove(lastPrevMajorVersion.toString() + "-cfs");
- // END TRUNK ONLY BLOCK
-
Collections.sort(expectedVersions);
// find what versions we are testing
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip
new file mode 100644
index 0000000..e80ee98
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip
new file mode 100644
index 0000000..f39c2aa
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip
new file mode 100644
index 0000000..efbf665
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/lucene/core/src/java/org/apache/lucene/util/Version.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/util/Version.java b/lucene/core/src/java/org/apache/lucene/util/Version.java
index 4a477d4..1d54e55 100644
--- a/lucene/core/src/java/org/apache/lucene/util/Version.java
+++ b/lucene/core/src/java/org/apache/lucene/util/Version.java
@@ -123,6 +123,13 @@ public final class Version {
public static final Version LUCENE_6_6_1 = new Version(6, 6, 1);
/**
+ * Match settings and bugs in Lucene's 6.6.2 release.
+ * @deprecated Use latest
+ */
+ @Deprecated
+ public static final Version LUCENE_6_6_2 = new Version(6, 6, 2);
+
+ /**
* Match settings and bugs in Lucene's 6.7.0 release.
* @deprecated Use latest
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e1a35c5/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 1c3e28c..dbfb10d 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -1131,6 +1131,46 @@ Other Changes
* SOLR-11324: Clean up mention of trie fields in documentation and source comments. (Steve Rowe)
+================== 6.6.2 ==================
+
+Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.
+
+Versions of Major Components
+---------------------
+Apache Tika 1.16
+Carrot2 3.15.0
+Velocity 1.7 and Velocity Tools 2.0
+Apache UIMA 2.3.1
+Apache ZooKeeper 3.4.10
+Jetty 9.3.14.v20161028
+
+Upgrade Notes
+----------------------
+
+* SOLR-11477: in the XML query parser (defType=xmlparser or {!xmlparser ... })
+ the resolving of external entities is now disallowed by default.
+
+* SOLR-11482: RunExecutableListener was deprecated and is disabled by default for
+ security reasons. Legacy applications still using it must explicitely pass
+ '-Dsolr.enableRunExecutableListener=true' to the Solr command line.
+ Be aware that you should really disable API-based config editing at the same
+ time, using '-Ddisable.configEdit=true'! (Uwe Schindler)
+
+Bug Fixes
+----------------------
+
+* SOLR-11477: Disallow resolving of external entities in the XML query parser (defType=xmlparser).
+ (Michael Stepankin, Olga Barinova, Uwe Schindler, Christine Poerschke)
+
+
+* SOLR-11297: Message "Lock held by this virtual machine" during startup. Solr is trying to start some cores twice.
+ (Luiz Armesto, Shawn Heisey, Erick Erickson)
+
+Other Changes
+----------------------
+
+* SOLR-10335: Upgrade to Tika 1.16. (Tim Allison, Tomás Fernández Löbbe via shalin)
+
================== 6.6.1 ==================
Bug Fixes
[5/5] lucene-solr:branch_7x: Don't add sorted indexes for
non-back-compat versions
Posted by sa...@apache.org.
Don't add sorted indexes for non-back-compat versions
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/49dc26c1
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/49dc26c1
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/49dc26c1
Branch: refs/heads/branch_7x
Commit: 49dc26c1dc1e50900d7d02bfe009e4e8ab0d9ca3
Parents: 2e1a35c
Author: Steve Rowe <sa...@gmail.com>
Authored: Thu Oct 26 17:11:54 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Oct 26 17:13:01 2017 -0400
----------------------------------------------------------------------
dev-tools/scripts/addBackcompatIndexes.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/49dc26c1/dev-tools/scripts/addBackcompatIndexes.py
----------------------------------------------------------------------
diff --git a/dev-tools/scripts/addBackcompatIndexes.py b/dev-tools/scripts/addBackcompatIndexes.py
index 7a36002..c9d8049 100644
--- a/dev-tools/scripts/addBackcompatIndexes.py
+++ b/dev-tools/scripts/addBackcompatIndexes.py
@@ -245,7 +245,9 @@ def main():
current_version = scriptutil.Version.parse(scriptutil.find_current_version())
create_and_add_index(source, 'cfs', c.version, current_version, c.temp_dir)
create_and_add_index(source, 'nocfs', c.version, current_version, c.temp_dir)
- if c.version.major > 6 or (c.version.major == 6 and c.version.minor >= 2):
+ should_make_sorted = current_version.is_back_compat_with(c.version) \
+ and (c.version.major > 6 or (c.version.major == 6 and c.version.minor >= 2))
+ if should_make_sorted:
create_and_add_index(source, 'sorted', c.version, current_version, c.temp_dir)
if c.version.minor == 0 and c.version.bugfix == 0 and c.version.major < current_version.major:
create_and_add_index(source, 'moreterms', c.version, current_version, c.temp_dir)
@@ -255,7 +257,7 @@ def main():
print('\nAdding backwards compatibility tests')
update_backcompat_tests(['cfs', 'nocfs'], c.version, current_version)
- if c.version.major > 6 or (c.version.major == 6 and c.version.minor >= 2):
+ if should_make_sorted:
update_backcompat_tests(['sorted'], c.version, current_version)
print('\nTesting changes')
[3/5] lucene-solr:branch_6_6: Add 6.6.2 and 5.5.5 back compat test
indexes
Posted by sa...@apache.org.
Add 6.6.2 and 5.5.5 back compat test indexes
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/471d8319
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/471d8319
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/471d8319
Branch: refs/heads/branch_6_6
Commit: 471d8319adaccab237e94a865e51ac74ce62442b
Parents: b24acfe
Author: Steve Rowe <sa...@gmail.com>
Authored: Thu Oct 26 16:42:46 2017 -0400
Committer: Steve Rowe <sa...@gmail.com>
Committed: Thu Oct 26 16:42:46 2017 -0400
----------------------------------------------------------------------
.../lucene/index/TestBackwardsCompatibility.java | 9 +++++++--
.../org/apache/lucene/index/index.5.5.5-cfs.zip | Bin 0 -> 13685 bytes
.../org/apache/lucene/index/index.5.5.5-nocfs.zip | Bin 0 -> 13674 bytes
.../org/apache/lucene/index/index.6.6.2-cfs.zip | Bin 0 -> 15809 bytes
.../org/apache/lucene/index/index.6.6.2-nocfs.zip | Bin 0 -> 15805 bytes
.../test/org/apache/lucene/index/sorted.6.6.2.zip | Bin 0 -> 91725 bytes
6 files changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471d8319/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
index 3fc9ee1..cbf0fcc 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
@@ -308,6 +308,8 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"5.5.3-nocfs",
"5.5.4-cfs",
"5.5.4-nocfs",
+ "5.5.5-cfs",
+ "5.5.5-nocfs",
"6.0.0-cfs",
"6.0.0-nocfs",
"6.0.1-cfs",
@@ -333,7 +335,9 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"6.6.0-cfs",
"6.6.0-nocfs",
"6.6.1-cfs",
- "6.6.1-nocfs"
+ "6.6.1-nocfs",
+ "6.6.2-cfs",
+ "6.6.2-nocfs"
};
public static String[] getOldNames() {
@@ -350,7 +354,8 @@ public class TestBackwardsCompatibility extends LuceneTestCase {
"sorted.6.5.0",
"sorted.6.5.1",
"sorted.6.6.0",
- "sorted.6.6.1"
+ "sorted.6.6.1",
+ "sorted.6.6.2"
};
public static String[] getOldSortedNames() {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471d8319/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-cfs.zip
new file mode 100644
index 0000000..f86f6f2
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471d8319/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-nocfs.zip
new file mode 100644
index 0000000..2d9533c
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.5.5.5-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471d8319/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip
new file mode 100644
index 0000000..2ac8410
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-cfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471d8319/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip
new file mode 100644
index 0000000..1b66e0d
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/index.6.6.2-nocfs.zip differ
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/471d8319/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip
----------------------------------------------------------------------
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip
new file mode 100644
index 0000000..fe84a90
Binary files /dev/null and b/lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.6.6.2.zip differ