You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/09/14 10:17:04 UTC
svn commit: r1624804 - in /lucene/dev/branches/lucene_solr_4_10: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/codecs/lucene46/
lucene/core/src/java/org/apache/lucene/util/
lucene/core/src/test/org/apache/lucene/index/
Author: mikemccand
Date: Sun Sep 14 08:17:04 2014
New Revision: 1624804
URL: http://svn.apache.org/r1624804
Log:
LUCENE-5936: Add backcompat checks to verify what is tested matches known versions
Modified:
lucene/dev/branches/lucene_solr_4_10/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (contents, props changed)
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt?rev=1624804&r1=1624803&r2=1624804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/CHANGES.txt Sun Sep 14 08:17:04 2014
@@ -14,6 +14,11 @@ Bug fixes
the exact release
(Ryan Ernst, Uwe Schindler)
+Tests
+
+* LUCENE-5936: Add backcompat checks to verify what is tested matches known versions
+ (Ryan Ernst)
+
======================= Lucene 4.10.0 ======================
New Features
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java?rev=1624804&r1=1624803&r2=1624804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java Sun Sep 14 08:17:04 2014
@@ -28,6 +28,7 @@ import org.apache.lucene.store.Directory
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
/**
* Lucene 4.0 implementation of {@link SegmentInfoWriter}.
@@ -52,8 +53,14 @@ public class Lucene46SegmentInfoWriter e
boolean success = false;
try {
CodecUtil.writeHeader(output, Lucene46SegmentInfoFormat.CODEC_NAME, Lucene46SegmentInfoFormat.VERSION_CURRENT);
+ Version version = si.getVersion();
+ String versionString = version.toString();
+ if (versionString.startsWith("3.") == false &&
+ versionString.startsWith("4.") == false) {
+ throw new IllegalArgumentException("invalid major version: should be 3 or 4 but got: " + version + " segment=" + si);
+ }
// Write the Lucene version that created this segment, since 3.1
- output.writeString(si.getVersion().toString());
+ output.writeString(version.toString());
output.writeInt(si.getDocCount());
output.writeByte((byte) (si.getUseCompoundFile() ? SegmentInfo.YES : SegmentInfo.NO));
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java?rev=1624804&r1=1624803&r2=1624804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/java/org/apache/lucene/util/Version.java Sun Sep 14 08:17:04 2014
@@ -453,6 +453,15 @@ public final class Version {
}
}
+ /** Major version, the difference between stable and trunk */
+ public final int major;
+ /** Minor version, incremented within the stable branch */
+ public final int minor;
+ /** Bugfix number, incremented on release branches */
+ public final int bugfix;
+ /** Prerelease version, currently 0 (alpha), 1 (beta), or 2 (final) */
+ public final int prerelease;
+
// stores the version pieces, with most significant pieces in high bits
// ie: | 1 byte | 1 byte | 1 byte | 2 bits |
// major minor bugfix prerelease
@@ -463,6 +472,10 @@ public final class Version {
}
private Version(int major, int minor, int bugfix, int prerelease) {
+ this.major = major;
+ this.minor = minor;
+ this.bugfix = bugfix;
+ this.prerelease = prerelease;
if (major > 4 || major < 3) {
throw new IllegalArgumentException("Lucene 4.x only supports 4.x and 3.x versions");
}
Modified: lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java?rev=1624804&r1=1624803&r2=1624804&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java (original)
+++ lucene/dev/branches/lucene_solr_4_10/lucene/core/src/test/org/apache/lucene/index/TestBackwardsCompatibility.java Sun Sep 14 08:17:04 2014
@@ -21,12 +21,16 @@ import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.IOException;
import java.io.PrintStream;
+import java.lang.reflect.Modifier;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Random;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.BinaryDocValuesField;
@@ -322,6 +326,126 @@ public class TestBackwardsCompatibility
}
oldIndexDirs = null;
}
+
+ public void testAllVersionHaveCfsAndNocfs() {
+ // ensure all tested versions with cfs also have nocfs
+ String[] files = new String[oldNames.length];
+ System.arraycopy(oldNames, 0, files, 0, oldNames.length);
+ Arrays.sort(files);
+ String prevFile = "";
+ for (String file : files) {
+ if (prevFile.endsWith(".cfs")) {
+ String prefix = prevFile.replace(".cfs", "");
+ assertEquals("Missing .nocfs for backcompat index " + prefix, prefix + ".nocfs", file);
+ }
+ }
+ }
+
+ public void testAllVersionsTested() throws Exception {
+ Pattern constantPattern = Pattern.compile("LUCENE_(\\d+)_(\\d+)_(\\d+)(_ALPHA|_BETA)?");
+ // find the unique versions according to Version.java
+ List<String> expectedVersions = new ArrayList<>();
+ int lastPrevMinorIndex = -1;
+ 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);
+ if (v.equals(Version.LATEST)) continue;
+ if (v.major == 3) continue; // 3x codecs are tested in TestBackwardsCompatilibility3x
+
+ 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;
+ lastPrevMinorIndex = expectedVersions.size();
+ }
+
+ String major = constant.group(1);
+ String minor = constant.group(2);
+ String bugfix = constant.group(3);
+ if (bugfix.equals("0")) {
+ bugfix = "";
+ }
+ String prerelease = constant.group(4);
+ if (prerelease != null) {
+ if (prerelease.equals("_ALPHA")) {
+ prerelease = "a";
+ } else { // _BETA
+ prerelease = "b";
+ }
+ } else {
+ prerelease = "";
+ }
+ expectedVersions.add(major + minor + bugfix + prerelease + ".cfs");
+ }
+ }
+ if (Version.LATEST.minor == 0 && Version.LATEST.bugfix == 0 && Version.LATEST.prerelease == 0) {
+ // we are on trunk (latest is a first major release) so the last minor index
+ // for the previous major version is also not yet tested
+ assertNotNull(lastPrevMajorVersion);
+ expectedVersions.remove(lastPrevMinorIndex);
+ }
+ Collections.sort(expectedVersions);
+
+ // find what versions we are testing
+ List<String> testedVersions = new ArrayList<>();
+ for (String testedVersion : oldNames) {
+ if (testedVersion.endsWith(".cfs") == false) continue;
+ testedVersions.add(testedVersion);
+ }
+ Collections.sort(testedVersions);
+
+
+ int i = 0;
+ int j = 0;
+ List<String> missingFiles = new ArrayList<>();
+ List<String> extraFiles = new ArrayList<>();
+ while (i < expectedVersions.size() && j < testedVersions.size()) {
+ String expectedVersion = expectedVersions.get(i);
+ String testedVersion = testedVersions.get(j);
+ int compare = expectedVersion.compareTo(testedVersion);
+ if (compare == 0) { // equal, we can move on
+ ++i;
+ ++j;
+ } else if (compare < 0) { // didn't find test for version constant
+ missingFiles.add(expectedVersion);
+ ++i;
+ } else { // extra test file
+ extraFiles.add(testedVersion);
+ ++j;
+ }
+ }
+ while (i < expectedVersions.size()) {
+ missingFiles.add(expectedVersions.get(i));
+ ++i;
+ }
+ while (j < testedVersions.size()) {
+ missingFiles.add(testedVersions.get(j));
+ ++j;
+ }
+
+ if (missingFiles.isEmpty() && extraFiles.isEmpty()) {
+ // success
+ return;
+ }
+
+ StringBuffer msg = new StringBuffer();
+ if (missingFiles.isEmpty() == false) {
+ msg.append("Missing backcompat test files:\n");
+ for (String missingFile : missingFiles) {
+ msg.append(" " + missingFile + "\n");
+ }
+ }
+ if (extraFiles.isEmpty() == false) {
+ msg.append("Extra backcompat test files:\n");
+ for (String extraFile : extraFiles) {
+ msg.append(" " + extraFile + "\n");
+ }
+ }
+ fail(msg.toString());
+ }
/** This test checks that *only* IndexFormatTooOldExceptions are thrown when you open and operate on too old indexes! */
public void testUnsupportedOldIndexes() throws Exception {