You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/09/04 21:58:53 UTC
svn commit: r1622546 - in /lucene/dev/trunk: dev-tools/scripts/ lucene/
lucene/backward-codecs/src/test/org/apache/lucene/index/
Author: rjernst
Date: Thu Sep 4 19:58:53 2014
New Revision: 1622546
URL: http://svn.apache.org/r1622546
Log:
LUCENE-5902: Add bumpVersion.py script
Added:
lucene/dev/trunk/dev-tools/scripts/bumpVersion.py (with props)
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java (with props)
Modified:
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
lucene/dev/trunk/lucene/common-build.xml
Added: lucene/dev/trunk/dev-tools/scripts/bumpVersion.py
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/scripts/bumpVersion.py?rev=1622546&view=auto
==============================================================================
--- lucene/dev/trunk/dev-tools/scripts/bumpVersion.py (added)
+++ lucene/dev/trunk/dev-tools/scripts/bumpVersion.py Thu Sep 4 19:58:53 2014
@@ -0,0 +1,415 @@
+# 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 argparse
+import io
+import os
+import re
+import subprocess
+import sys
+
+class Version(object):
+ def __init__(self, major, minor, bugfix):
+ self.major = major
+ self.minor = minor
+ self.bugfix = bugfix
+ self.previous_dot_matcher = self.make_previous_matcher()
+ self.dot = '%d.%d.%d' % (self.major, self.minor, self.bugfix)
+ self.constant = 'LUCENE_%d_%d_%d' % (self.major, self.minor, self.bugfix)
+
+ @classmethod
+ def parse(cls, value):
+ match = re.search(r'(\d+)\.(\d+).(\d+)', value)
+ if match is None:
+ raise argparse.ArgumentTypeError('Version argument must be of format x.y.z')
+ return Version(*[int(v) for v in match.groups()])
+
+ def __str__(self):
+ return self.dot
+
+ def make_previous_matcher(self, prefix='', suffix='', sep='\\.'):
+ if self.is_bugfix_release():
+ pattern = '%s%s%s%s%d' % (self.major, sep, self.minor, sep, self.bugfix - 1)
+ elif self.is_minor_release():
+ pattern = '%s%s%d%s\\d+' % (self.major, sep, self.minor - 1, sep)
+ else:
+ pattern = '%d%s\\d+%s\\d+' % (self.major - 1, sep, sep)
+
+ return re.compile(prefix + '(' + pattern + ')' + suffix)
+
+ def is_bugfix_release(self):
+ return self.bugfix != 0
+
+ def is_minor_release(self):
+ return self.bugfix == 0 and self.minor != 0
+
+ def is_major_release(self):
+ return self.bugfix == 0 and self.minor == 0
+
+def run(cmd):
+ try:
+ subprocess.check_output(cmd, shell=True, stderr=subprocess.STDOUT)
+ except subprocess.CalledProcessError as e:
+ print(e.output.decode('utf-8'))
+ raise e
+
+def update_file(filename, line_re, edit):
+ infile = open(filename, 'r')
+ buffer = []
+
+ changed = False
+ for line in infile:
+ if not changed:
+ match = line_re.search(line)
+ if match:
+ changed = edit(buffer, match, line)
+ if changed is None:
+ return False
+ continue
+ buffer.append(line)
+ if not changed:
+ raise Exception('Could not find %s in %s' % (line_re, filename))
+ with open(filename, 'w') as f:
+ f.write(''.join(buffer))
+ return True
+
+def update_changes(filename, new_version):
+ print(' adding new section to %s...' % filename, end='')
+ matcher = re.compile(r'\d+\.\d+\.\d+\s+===')
+ def edit(buffer, match, line):
+ if new_version.dot in line:
+ return None
+ match = new_version.previous_dot_matcher.search(line)
+ if match is not None:
+ buffer.append(line.replace(match.group(0), new_version.dot))
+ buffer.append('(No Changes)\n\n')
+ buffer.append(line)
+ return match is not None
+
+ changed = update_file(filename, matcher, edit)
+ print('done' if changed else 'uptodate')
+
+def add_constant(new_version, deprecate):
+ filename = 'lucene/core/src/java/org/apache/lucene/util/Version.java'
+ print(' adding constant %s...' % new_version.constant, end='')
+ constant_prefix = 'public static final Version LUCENE_'
+ matcher = re.compile(constant_prefix)
+ prev_matcher = new_version.make_previous_matcher(prefix=constant_prefix, sep='_')
+
+ def ensure_deprecated(buffer):
+ last = buffer[-1]
+ if last.strip() != '@Deprecated':
+ spaces = ' ' * (len(last) - len(last.lstrip()) - 1)
+ buffer[-1] = spaces + (' * @deprecated (%s) Use latest\n' % new_version)
+ buffer.append(spaces + ' */\n')
+ buffer.append(spaces + '@Deprecated\n')
+
+ def buffer_constant(buffer, line):
+ spaces = ' ' * (len(line) - len(line.lstrip()))
+ buffer.append('\n' + spaces + '/**\n')
+ buffer.append(spaces + ' * Match settings and bugs in Lucene\'s %s release.\n' % new_version)
+ if deprecate:
+ buffer.append(spaces + ' * @deprecated Use latest\n')
+ buffer.append(spaces + ' */\n')
+ if deprecate:
+ buffer.append(spaces + '@Deprecated\n')
+ buffer.append(spaces + 'public static final Version %s = new Version(%d, %d, %d);\n' %
+ (new_version.constant, new_version.major, new_version.minor, new_version.bugfix))
+
+ class Edit(object):
+ found = -1
+ def __call__(self, buffer, match, line):
+ if new_version.constant in line:
+ return None # constant already exists
+ # outter match is just to find lines declaring version constants
+ match = prev_matcher.search(line)
+ if match is not None:
+ ensure_deprecated(buffer) # old version should be deprecated
+ self.found = len(buffer) + 1 # extra 1 for buffering current line below
+ elif self.found != -1:
+ # we didn't match, but we previously had a match, so insert new version here
+ # first find where to insert (first empty line before current constant)
+ c = []
+ buffer_constant(c, line)
+ tmp = buffer[self.found:]
+ buffer[self.found:] = c
+ buffer.extend(tmp)
+ buffer.append(line)
+ return True
+
+ buffer.append(line)
+ return False
+
+ changed = update_file(filename, matcher, Edit())
+ print('done' if changed else 'uptodate')
+
+version_prop_re = re.compile('version\.base=(.*)')
+def update_build_version(new_version):
+ print(' changing version.base...', end='')
+ filename = 'lucene/version.properties'
+ def edit(buffer, match, line):
+ if new_version.dot in line:
+ return None
+ buffer.append('version.base=' + new_version.dot + '\n')
+ return True
+
+ changed = update_file(filename, version_prop_re, edit)
+ print('done' if changed else 'uptodate')
+
+def update_latest_constant(new_version):
+ print(' changing Version.LATEST to %s...' % new_version.constant, end='')
+ filename = 'lucene/core/src/java/org/apache/lucene/util/Version.java'
+ matcher = re.compile('public static final Version LATEST')
+ def edit(buffer, match, line):
+ if new_version.constant in line:
+ return None
+ buffer.append(line.rpartition('=')[0] + ('= %s;\n' % new_version.constant))
+ return True
+
+ changed = update_file(filename, matcher, edit)
+ print('done' if changed else 'uptodate')
+
+def update_example_solrconfigs(new_version):
+ print(' updating example solrconfig.xml files')
+ matcher = re.compile('<luceneMatchVersion>')
+
+ for root,dirs,files in os.walk('solr/example'):
+ for f in files:
+ if f == 'solrconfig.xml':
+ update_solrconfig(os.path.join(root, f), matcher, new_version)
+
+def update_solrconfig(filename, matcher, new_version):
+ print(' %s...' % filename, end='')
+ def edit(buffer, match, line):
+ if new_version.dot in line:
+ return None
+ match = new_version.previous_dot_matcher.search(line)
+ if match is None:
+ return False
+ buffer.append(line.replace(match.group(1), new_version.dot))
+ return True
+
+ changed = update_file(filename, matcher, edit)
+ print('done' if changed else 'uptodate')
+
+def codec_exists(version):
+ codecs_dir = 'lucene/core/src/java/org/apache/lucene/codecs'
+ codec_file = '%(dir)s/lucene%(x)s%(y)s/Lucene%(x)s%(y)sCodec.java'
+ return os.path.exists(codec_file % {'x': version.major, 'y': version.minor, 'dir': codecs_dir})
+
+def create_backcompat_indexes(version):
+ majorminor = '%d%d' % (version.major, version.minor)
+ codec = 'Lucene%s' % majorminor
+
+ create_index(codec, 'cfs', majorminor)
+ create_index(codec, 'nocfs', majorminor)
+
+def create_index(codec, type, majorminor):
+ filename = 'index.%s.%s.zip' % (majorminor, type)
+ print(' creating %s...' % filename, end='')
+ codecs_dir = 'lucene/backwards-codecs'
+ index_dir = 'src/test/org/apache/lucene/index'
+ if os.path.exists(os.path.join(codecs_dir, index_dir, filename)):
+ print('uptodate')
+ return
+
+ test = {'cfs': 'testCreateCFS', 'nocfs': 'testCreateNonCFS'}[type]
+ ant_args = ' '.join([
+ '-Dtests.codec=%s' % codec,
+ '-Dtests.useSecurityManager=false',
+ '-Dtestcase=CreateBackwardsCompatibilityIndex',
+ '-Dtestmethod=%s' % test
+ ])
+ base_dir = os.getcwd()
+ bc_index_dir = '/tmp/idx/index.%s' % type
+ bc_index_file = os.path.join(bc_index_dir, filename)
+
+ success = False
+ if not os.path.exists(bc_index_file):
+ os.chdir(codecs_dir)
+ run('ant test %s' % ant_args)
+ os.chdir('/tmp/idx/index.%s' % type)
+ run('zip %s *' % filename)
+ run('cp %s %s' % (bc_index_file, os.path.join(base_dir, codecs_dir, index_dir)))
+ os.chdir(base_dir)
+ run('svn add %s' % os.path.join(codecs_dir, index_dir, filename))
+ success = True
+
+ os.chdir(base_dir)
+ run('rm -rf %s' % bc_index_dir)
+ if success:
+ print('done')
+
+def update_backcompat_tests(version):
+ majorminor = '%d%d' % (version.major, version.minor)
+ print(' adding new indexes to backcompat tests...', end='')
+ filename = 'lucene/backwards-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java'
+ matcher = re.compile(r'final static String\[\] oldNames = {|};')
+ cfs_name = '%s.cfs' % majorminor
+ nocfs_name = '%s.nocfs' % majorminor
+
+ class Edit(object):
+ start = None
+ def __call__(self, buffer, match, line):
+ if self.start:
+ # first check if the indexes we are adding already exist
+ last_ndx = len(buffer) - 1
+ i = last_ndx
+ while i >= self.start:
+ if cfs_name in buffer[i]:
+ return None
+ i -= 1
+
+ last = buffer[last_ndx]
+ spaces = ' ' * (len(last) - len(last.lstrip()))
+ quote_ndx = last.find('"')
+ quote_ndx = last.find('"', quote_ndx + 1)
+ buffer[last_ndx] = last[:quote_ndx + 1] + "," + last[quote_ndx + 1:]
+ buffer.append(spaces + ('"%s",\n' % cfs_name))
+ buffer.append(spaces + ('"%s"\n' % nocfs_name))
+ buffer.append(line)
+ return True
+
+ if 'oldNames' in line:
+ self.start = len(buffer) # location of first index name
+ buffer.append(line)
+ return False
+
+ changed = update_file(filename, matcher, Edit())
+ print('done' if changed else 'uptodate')
+
+def check_lucene_version_tests():
+ print(' checking lucene version tests...', end='')
+ base_dir = os.getcwd()
+ os.chdir('lucene/core')
+ run('ant test -Dtestcase=TestVersion')
+ os.chdir(base_dir)
+ print('ok')
+
+def check_solr_version_tests():
+ print(' checking solr version tests...', end='')
+ base_dir = os.getcwd()
+ os.chdir('solr/core')
+ run('ant test -Dtestcase=TestLuceneMatchVersion')
+ os.chdir(base_dir)
+ print('ok')
+
+def check_backcompat_tests():
+ print(' checking backcompat tests...', end='')
+ base_dir = os.getcwd()
+ os.chdir('lucene/backwards-codecs')
+ run('ant test -Dtestcase=TestBackwardsCompatibility')
+ os.chdir(base_dir)
+ print('ok')
+
+# branch types are "release", "stable" and "trunk"
+def find_branch_type():
+ output = subprocess.check_output('svn info', shell=True)
+ for line in output.split(b'\n'):
+ if line.startswith(b'URL:'):
+ url = line.split(b'/')[-1]
+ break
+ else:
+ raise Exception('svn info missing repo URL')
+
+ if url == b'trunk':
+ return 'trunk'
+ if url.startswith(b'branch_'):
+ return 'stable'
+ if url.startswith(b'lucene_solr_'):
+ return 'release'
+ raise Exception('Cannot run bumpVersion.py on feature branch')
+
+def find_previous_version():
+ return version_prop_re.search(open('lucene/version.properties').read()).group(1)
+
+def merge_change(changeid, repo):
+ print('\nMerging downstream change %d...' % changid, end='')
+ run('svn merge -c %d --record-only %s' % (changeid, repo))
+ print('done')
+
+def read_config():
+ parser = argparse.ArgumentParser(description='Add a new version')
+ parser.add_argument('version', type=Version.parse)
+ parser.add_argument('-c', '--changeid', type=int, help='SVN ChangeId for downstream version change to merge')
+ parser.add_argument('-r', '--downstream-repo', help='Path to downstream checkout for given changeid')
+ c = parser.parse_args()
+
+ branch_type = find_branch_type()
+ c.matching_branch = c.version.is_bugfix_release() and branch_type == 'release' or \
+ c.version.is_minor_release() and branch_type == 'stable' or \
+ branch_type == 'major'
+
+ if c.matching_branch:
+ c.previous_version = Version.parse(find_previous_version())
+ elif c.version.is_minor_release():
+ c.previous_version = Version(c.version.major, c.version.minor - 1, 0)
+ elif c.version.is_bugfix_release():
+ c.previous_version = Version(c.version.major, c.version.minor, c.version.bugfix - 1)
+
+ if bool(c.changeid) != bool(c.downstream_repo):
+ parser.error('--changeid and --upstream-repo must be used together')
+ if not c.changeid and not c.matching_branch:
+ parser.error('Must use --changeid for forward porting bugfix release version to other branches')
+ if c.changeid and c.matching_branch:
+ parser.error('Cannot use --changeid on branch that new version will originate on')
+ if c.changeid and c.version.is_major_release():
+ parser.error('Cannot use --changeid for major release')
+
+ return c
+
+def main():
+ c = read_config()
+
+ if c.changeid:
+ merge_change(c.changeid, c.downstream_repo)
+
+ print('\nAdding new version %s' % c.version)
+ update_changes('lucene/CHANGES.txt', c.version)
+ update_changes('solr/CHANGES.txt', c.version)
+ add_constant(c.version, not c.matching_branch)
+
+ if not c.changeid:
+ print('\nUpdating latest version')
+ update_build_version(c.version)
+ update_latest_constant(c.version)
+ update_example_solrconfigs(c.version)
+
+ run_backcompat_tests = False
+ if not c.version.is_bugfix_release() and codec_exists(c.previous_version):
+ print('\nCreating backwards compatibility tests')
+ create_backcompat_indexes(c.previous_version)
+ update_backcompat_tests(c.previous_version)
+ run_backcompat_tests = True
+
+ if c.version.is_major_release():
+ print('\nTODO: ')
+ print(' - Update major version bounds in Version.java')
+ print(' - Move backcompat oldIndexes to unsupportedIndexes in TestBackwardsCompatibility')
+ print(' - Update IndexFormatTooOldException throw cases')
+ else:
+ print('\nTesting changes')
+ check_lucene_version_tests()
+ check_solr_version_tests()
+ if run_backcompat_tests:
+ check_backcompat_tests()
+
+ print()
+
+if __name__ == '__main__':
+ try:
+ main()
+ except KeyboardInterrupt:
+ print('\nRecieved Ctrl-C, exiting early')
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1622546&r1=1622545&r2=1622546&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Thu Sep 4 19:58:53 2014
@@ -150,6 +150,8 @@ Build
* LUCENE-5909: Smoke tester now has better command line parsing and
optionally also runs on Java 8. (Ryan Ernst, Uwe Schindler)
+* LUCENE-5902: Add bumpVersion.py script to manage version increase after release branch is cut.
+
======================= Lucene 4.10.0 ======================
New Features
Added: lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java?rev=1622546&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java (added)
+++ lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/CreateBackwardsCompatibilityIndex.java Thu Sep 4 19:58:53 2014
@@ -0,0 +1,59 @@
+package org.apache.lucene.index;
+
+/*
+ * 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 java.io.IOException;
+
+// This class exists only so it has a name that the junit runner will not pickup,
+// so these index creation "tests" can only be run explicitly
+public class CreateBackwardsCompatibilityIndex extends TestBackwardsCompatibility {
+
+ // These indexes will be created under directory /tmp/idx/.
+ //
+ // Be sure to create the indexes with the actual format:
+ // ant test -Dtestcase=TestBackwardsCompatibility -Dversion=x.y.z -Dtests.codec=LuceneXY -Dtests.useSecurityManager=false
+ //
+ // Zip up the generated indexes:
+ //
+ // cd /tmp/idx/index.cfs ; zip index.<VERSION>.cfs.zip *
+ // cd /tmp/idx/index.nocfs ; zip index.<VERSION>.nocfs.zip *
+ //
+ // Then move those 2 zip files to your trunk checkout and add them
+ // to the oldNames array.
+
+ public void testCreateCFS() throws IOException {
+ createIndex("index.cfs", true, false);
+ }
+
+ public void testCreateNonCFS() throws IOException {
+ createIndex("index.nocfs", false, false);
+ }
+
+ // These are only needed for the special upgrade test to verify
+ // that also single-segment indexes are correctly upgraded by IndexUpgrader.
+ // You don't need them to be build for non-4.0 (the test is happy with just one
+ // "old" segment format, version is unimportant:
+
+ public void testCreateSingleSegmentCFS() throws IOException {
+ createIndex("index.singlesegment.cfs", true, true);
+ }
+
+ public void testCreateSingleSegmentNoCFS() throws IOException {
+ createIndex("index.singlesegment.nocfs", false, true);
+ }
+}
Modified: lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1622546&r1=1622545&r2=1622546&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Thu Sep 4 19:58:53 2014
@@ -29,6 +29,7 @@ import java.util.Map;
import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
+import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.BinaryDocValuesField;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.DoubleDocValuesField;
@@ -75,53 +76,6 @@ import org.junit.BeforeClass;
*/
public class TestBackwardsCompatibility extends LuceneTestCase {
- // Uncomment these cases & run them on an older Lucene version,
- // to generate indexes to test backwards compatibility. These
- // indexes will be created under directory /tmp/idx/.
- //
- // However, you must first disable the Lucene TestSecurityManager,
- // which will otherwise disallow writing outside of the build/
- // directory - to do this, comment out the "java.security.manager"
- // <sysproperty> under the "test-macro" <macrodef>.
- //
- // Be sure to create the indexes with the actual format:
- // ant test -Dtestcase=TestBackwardsCompatibility -Dversion=x.y.z
- // -Dtests.codec=LuceneXY -Dtests.postingsformat=LuceneXY -Dtests.docvaluesformat=LuceneXY
- //
- // Zip up the generated indexes:
- //
- // cd /tmp/idx/index.cfs ; zip index.<VERSION>.cfs.zip *
- // cd /tmp/idx/index.nocfs ; zip index.<VERSION>.nocfs.zip *
- //
- // Then move those 2 zip files to your trunk checkout and add them
- // to the oldNames array.
-
- /*
- public void testCreateCFS() throws IOException {
- createIndex("index.cfs", true, false);
- }
-
- public void testCreateNoCFS() throws IOException {
- createIndex("index.nocfs", false, false);
- }
- */
-
-/*
- // These are only needed for the special upgrade test to verify
- // that also single-segment indexes are correctly upgraded by IndexUpgrader.
- // You don't need them to be build for non-4.0 (the test is happy with just one
- // "old" segment format, version is unimportant:
-
- public void testCreateSingleSegmentCFS() throws IOException {
- createIndex("index.singlesegment.cfs", true, true);
- }
-
- public void testCreateSingleSegmentNoCFS() throws IOException {
- createIndex("index.singlesegment.nocfs", false, true);
- }
-
-*/
-
/*
public void testCreateMoreTermsIndex() throws Exception {
// we use a real directory name that is not cleaned up,
@@ -214,43 +168,45 @@ public class TestBackwardsCompatibility
dir.close();
}*/
- final static String[] oldNames = {"40.cfs",
- "40.nocfs",
- "41.cfs",
- "41.nocfs",
- "42.cfs",
- "42.nocfs",
- // TODO: these are on 4x, but something is wrong (they seem to be a too old DV format):
- "45.cfs",
- "45.nocfs",
- "461.cfs",
- "461.nocfs",
- "49.cfs",
- "49.nocfs"
+ final static String[] oldNames = {
+ "40.cfs",
+ "40.nocfs",
+ "41.cfs",
+ "41.nocfs",
+ "42.cfs",
+ "42.nocfs",
+ // TODO: these are on 4x, but something is wrong (they seem to be a too old DV format):
+ "45.cfs",
+ "45.nocfs",
+ "461.cfs",
+ "461.nocfs",
+ "49.cfs",
+ "49.nocfs"
};
- final String[] unsupportedNames = {"19.cfs",
- "19.nocfs",
- "20.cfs",
- "20.nocfs",
- "21.cfs",
- "21.nocfs",
- "22.cfs",
- "22.nocfs",
- "23.cfs",
- "23.nocfs",
- "24.cfs",
- "24.nocfs",
- "29.cfs",
- "29.nocfs",
- "30.cfs",
- "30.nocfs",
- "31.cfs",
- "31.nocfs",
- "32.cfs",
- "32.nocfs",
- "34.cfs",
- "34.nocfs"
+ final String[] unsupportedNames = {
+ "19.cfs",
+ "19.nocfs",
+ "20.cfs",
+ "20.nocfs",
+ "21.cfs",
+ "21.nocfs",
+ "22.cfs",
+ "22.nocfs",
+ "23.cfs",
+ "23.nocfs",
+ "24.cfs",
+ "24.nocfs",
+ "29.cfs",
+ "29.nocfs",
+ "30.cfs",
+ "30.nocfs",
+ "31.cfs",
+ "31.nocfs",
+ "32.cfs",
+ "32.nocfs",
+ "34.cfs",
+ "34.nocfs"
};
final static String[] oldSingleSegmentNames = {"40.optimized.cfs",
@@ -672,8 +628,13 @@ public class TestBackwardsCompatibility
mp.setNoCFSRatio(doCFS ? 1.0 : 0.0);
mp.setMaxCFSSegmentSizeMB(Double.POSITIVE_INFINITY);
// TODO: remove randomness
+ String codecName = System.getProperty("tests.codec");
+ if (codecName == null || codecName.trim().isEmpty() || codecName.equals("random")) {
+ fail("Must provide 'tests.codec' property to create BWC index");
+ }
+ Codec codec = Codec.forName(codecName);
IndexWriterConfig conf = new IndexWriterConfig(new MockAnalyzer(random()))
- .setMaxBufferedDocs(10).setMergePolicy(mp);
+ .setMaxBufferedDocs(10).setMergePolicy(mp).setCodec(codec);
IndexWriter writer = new IndexWriter(dir, conf);
for(int i=0;i<35;i++) {
@@ -691,12 +652,14 @@ public class TestBackwardsCompatibility
mp.setNoCFSRatio(doCFS ? 1.0 : 0.0);
// TODO: remove randomness
conf = new IndexWriterConfig(new MockAnalyzer(random()))
- .setMaxBufferedDocs(10).setMergePolicy(mp);
+ .setMaxBufferedDocs(10).setMergePolicy(mp).setCodec(codec);
writer = new IndexWriter(dir, conf);
addNoProxDoc(writer);
writer.close();
- writer = new IndexWriter(dir, conf.setMergePolicy(NoMergePolicy.INSTANCE));
+ conf = new IndexWriterConfig(new MockAnalyzer(random()))
+ .setMaxBufferedDocs(10).setMergePolicy(NoMergePolicy.INSTANCE).setCodec(codec);
+ writer = new IndexWriter(dir, conf);
Term searchTerm = new Term("id", "7");
writer.deleteDocuments(searchTerm);
writer.close();
Modified: lucene/dev/trunk/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/common-build.xml?rev=1622546&r1=1622545&r2=1622546&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/common-build.xml (original)
+++ lucene/dev/trunk/lucene/common-build.xml Thu Sep 4 19:58:53 2014
@@ -887,6 +887,25 @@
<property name="tests.iters" value="" />
<property name="tests.dups" value="1" />
+ <!-- turn on security manager? -->
+ <condition property="java.security.manager" value="org.apache.lucene.util.TestSecurityManager">
+ <or>
+ <not>
+ <isset property="tests.useSecurityManager"/>
+ </not>
+ <istrue value="${tests.useSecurityManager}"/>
+ </or>
+ </condition>
+
+ <loadresource property="tests.explicitclass">
+ <string value="${tests.class}" />
+ <filterchain>
+ <replaceregex pattern="\." replace="/" flags="g" />
+ <replaceregex pattern="\*" replace="**" flags="g" />
+ <replaceregex pattern="$" replace=".class" />
+ </filterchain>
+ </loadresource>
+
<!-- Pick the random seed now (unless already set). -->
<junit4:pickseed property="tests.seed" />
@@ -1006,7 +1025,9 @@
<!-- Restrict access to certain Java features and install security manager: -->
<sysproperty key="junit4.tempDir" file="@{workDir}/temp" />
<sysproperty key="clover.db.dir" file="${clover.db.dir}" />
- <sysproperty key="java.security.manager" value="org.apache.lucene.util.TestSecurityManager" />
+ <syspropertyset>
+ <propertyref prefix="java.security.manager"/>
+ </syspropertyset>
<sysproperty key="java.security.policy" file="${common.dir}/tools/junit4/tests.policy" />
<sysproperty key="tests.LUCENE_VERSION" value="${version.base}"/>
@@ -1138,6 +1159,7 @@
<fileset dir="@{testsDir}">
<include name="**/Test*.class" />
<include name="**/*Test.class" />
+ <include name="${tests.explicitclass}" />
<exclude name="**/*$*" />
</fileset>
</junit4:duplicate>