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 2023/12/14 11:02:22 UTC
(lucene) branch main updated: Attempting to clean up some remaining Solr references (#12939)
This is an automated email from the ASF dual-hosted git repository.
mikemccand pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/lucene.git
The following commit(s) were added to refs/heads/main by this push:
new 3965319441e Attempting to clean up some remaining Solr references (#12939)
3965319441e is described below
commit 3965319441ee67080a2b8e31c66a6bd8a73f8906
Author: Jakub Slowinski <32...@users.noreply.github.com>
AuthorDate: Thu Dec 14 11:02:16 2023 +0000
Attempting to clean up some remaining Solr references (#12939)
* Attempting to clean up some remaining Solr references
* Update gradle/help.gradle
Co-authored-by: Dawid Weiss <da...@gmail.com>
---------
Co-authored-by: Dawid Weiss <da...@gmail.com>
---
dev-tools/README.txt | 8 ++++----
gradle/help.gradle | 2 +-
gradle/testing/randomization.gradle | 1 -
gradle/testing/randomization/policies/tests.policy | 5 -----
lucene/CHANGES.txt | 2 ++
.../org/apache/lucene/tests/geo/BaseGeoPointTestCase.java | 4 ++--
.../apache/lucene/tests/index/BaseCompoundFormatTestCase.java | 6 +++---
.../lucene/tests/index/BaseDocValuesFormatTestCase.java | 6 +++---
.../lucene/tests/index/BaseFieldInfoFormatTestCase.java | 4 ++--
.../apache/lucene/tests/index/BaseNormsFormatTestCase.java | 4 ++--
.../apache/lucene/tests/index/BasePointsFormatTestCase.java | 4 ++--
.../apache/lucene/tests/index/BasePostingsFormatTestCase.java | 6 +++---
.../lucene/tests/index/BaseSegmentInfoFormatTestCase.java | 4 ++--
.../tests/search/similarities/BaseSimilarityTestCase.java | 4 ++--
.../src/java/org/apache/lucene/tests/util/LuceneTestCase.java | 11 ++---------
.../apache/lucene/tests/util/TestRuleAssertionsRequired.java | 2 +-
.../lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java | 7 -------
.../lucene/tests/util/TestRuleTemporaryFilesCleanup.java | 1 -
18 files changed, 31 insertions(+), 50 deletions(-)
diff --git a/dev-tools/README.txt b/dev-tools/README.txt
index 9d64fcf5b16..eee6b8a9a14 100644
--- a/dev-tools/README.txt
+++ b/dev-tools/README.txt
@@ -5,8 +5,8 @@ as to the usefulness of the tools.
Description of dev-tools/ contents:
-./size-estimator-lucene-solr.xls -- Spreadsheet for estimating memory and disk usage in Lucene/Solr
+./aws-jmh/ -- Scripts for running microbenchmarks across different ec2 instance types.
+./doap/ -- Lucene project descriptors in DOAP RDF format.
./missing-doclet -- JavaDoc validation doclet subproject
-./doap/ -- Lucene and Solr project descriptors in DOAP RDF format.
-./scripts/ -- Odds and ends for building releases, etc.
-./test-patch/ -- Scripts for automatically validating patches
+./scripts/ -- Odds and ends for building releases, etc.
+./test-patch/ -- Scripts for automatically validating patches
diff --git a/gradle/help.gradle b/gradle/help.gradle
index 5c01a68fd38..620a09ff37c 100644
--- a/gradle/help.gradle
+++ b/gradle/help.gradle
@@ -46,7 +46,7 @@ configure(rootProject) {
help {
doLast {
println ""
- println "This is an experimental Lucene/Solr gradle build. See some"
+ println "This is Lucene's gradle build. See some"
println "guidelines, ant-equivalent commands etc. under help/*; or type:"
println ""
helpFiles.each { section, path, sectionInfo ->
diff --git a/gradle/testing/randomization.gradle b/gradle/testing/randomization.gradle
index 1b56044e071..4f24d7f412f 100644
--- a/gradle/testing/randomization.gradle
+++ b/gradle/testing/randomization.gradle
@@ -144,7 +144,6 @@ allprojects {
"tests.leaveTemporary",
"tests.leavetemporary",
"tests.leavetmpdir",
- "solr.test.leavetmpdir",
].find { prop ->
def v = Boolean.parseBoolean(propertyOrDefault(prop, "false"))
if (v) {
diff --git a/gradle/testing/randomization/policies/tests.policy b/gradle/testing/randomization/policies/tests.policy
index ce23b31bb27..d833ea166cf 100644
--- a/gradle/testing/randomization/policies/tests.policy
+++ b/gradle/testing/randomization/policies/tests.policy
@@ -80,11 +80,6 @@ grant {
// used by nested tests? (e.g. TestLeaveFilesIfTestFails). TODO: look into this
permission java.util.PropertyPermission "tests.runnested", "write";
- // solr properties. TODO: move these out to SolrTestCase
- permission java.util.PropertyPermission "solr.data.dir", "write";
- permission java.util.PropertyPermission "solr.solr.home", "write";
- permission java.util.PropertyPermission "solr.directoryFactory", "write";
-
// allows LuceneTestCase#runWithRestrictedPermissions to execute with lower (or no) permission
permission java.security.SecurityPermission "createAccessControlContext";
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index a3dc9d595f1..50892071a91 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -213,6 +213,8 @@ Other
* GITHUB#11023: Removing @lucene.experimental tags in testXXX methods in CheckIndex. (Jakub Slowinski)
+* GITHUB#12934: Cleaning up old references to Lucene/Solr. (Jakub Slowinski)
+
======================== Lucene 9.9.1 =======================
Bug Fixes
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java
index d1112dcf4f4..d371292324d 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/geo/BaseGeoPointTestCase.java
@@ -78,8 +78,8 @@ import org.apache.lucene.util.bkd.BKDWriter;
* test focuses on geospatial (distance queries, polygon queries, etc) indexing and search, not any
* underlying storage format or encoding: it merely supplies two hooks for the encoding so that
* tests can be exact. The [stretch] goal is for this test to be so thorough in testing a new geo
- * impl that if this test passes, then all Lucene/Solr tests should also pass. Ie, if there is some
- * bug in a given geo impl that this test fails to catch then this test needs to be improved!
+ * impl that if this test passes, then all Lucene tests should also pass. Ie, if there is some bug
+ * in a given geo impl that this test fails to catch then this test needs to be improved!
*/
public abstract class BaseGeoPointTestCase extends LuceneTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java
index 8d22046f296..6ad7b625a7c 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseCompoundFormatTestCase.java
@@ -51,9 +51,9 @@ import org.apache.lucene.util.Version;
/**
* Abstract class to do basic tests for a compound format. NOTE: This test focuses on the compound
* impl, nothing else. The [stretch] goal is for this test to be so thorough in testing a new
- * CompoundFormat that if this test passes, then all Lucene/Solr tests should also pass. Ie, if
- * there is some bug in a given CompoundFormat that this test fails to catch then this test needs to
- * be improved!
+ * CompoundFormat that if this test passes, then all Lucene tests should also pass. Ie, if there is
+ * some bug in a given CompoundFormat that this test fails to catch then this test needs to be
+ * improved!
*/
public abstract class BaseCompoundFormatTestCase extends BaseIndexFileFormatTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java
index e5f1559b90f..3488c6aba41 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseDocValuesFormatTestCase.java
@@ -94,9 +94,9 @@ import org.apache.lucene.util.automaton.RegExp;
/**
* Abstract class to do basic tests for a docvalues format. NOTE: This test focuses on the docvalues
* impl, nothing else. The [stretch] goal is for this test to be so thorough in testing a new
- * DocValuesFormat that if this test passes, then all Lucene/Solr tests should also pass. Ie, if
- * there is some bug in a given DocValuesFormat that this test fails to catch then this test needs
- * to be improved!
+ * DocValuesFormat that if this test passes, then all Lucene tests should also pass. Ie, if there is
+ * some bug in a given DocValuesFormat that this test fails to catch then this test needs to be
+ * improved!
*/
public abstract class BaseDocValuesFormatTestCase extends BaseIndexFileFormatTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java
index 886fef08604..83f8b293113 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseFieldInfoFormatTestCase.java
@@ -52,8 +52,8 @@ import org.apache.lucene.util.Version;
/**
* Abstract class to do basic tests for fis format. NOTE: This test focuses on the fis impl, nothing
* else. The [stretch] goal is for this test to be so thorough in testing a new fis format that if
- * this test passes, then all Lucene/Solr tests should also pass. Ie, if there is some bug in a
- * given fis Format that this test fails to catch then this test needs to be improved!
+ * this test passes, then all Lucene tests should also pass. Ie, if there is some bug in a given fis
+ * Format that this test fails to catch then this test needs to be improved!
*/
public abstract class BaseFieldInfoFormatTestCase extends BaseIndexFileFormatTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java
index 96face910c5..2c25b1315cb 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseNormsFormatTestCase.java
@@ -54,8 +54,8 @@ import org.apache.lucene.util.IOUtils;
/**
* Abstract class to do basic tests for a norms format. NOTE: This test focuses on the norms impl,
* nothing else. The [stretch] goal is for this test to be so thorough in testing a new NormsFormat
- * that if this test passes, then all Lucene/Solr tests should also pass. Ie, if there is some bug
- * in a given NormsFormat that this test fails to catch then this test needs to be improved!
+ * that if this test passes, then all Lucene tests should also pass. Ie, if there is some bug in a
+ * given NormsFormat that this test fails to catch then this test needs to be improved!
*/
public abstract class BaseNormsFormatTestCase extends BaseIndexFileFormatTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java
index 9fedcc5eace..265e3f073be 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePointsFormatTestCase.java
@@ -63,8 +63,8 @@ import org.apache.lucene.util.NumericUtils;
/**
* Abstract class to do basic tests for a points format. NOTE: This test focuses on the points impl,
* nothing else. The [stretch] goal is for this test to be so thorough in testing a new PointsFormat
- * that if this test passes, then all Lucene/Solr tests should also pass. Ie, if there is some bug
- * in a given PointsFormat that this test fails to catch then this test needs to be improved!
+ * that if this test passes, then all Lucene tests should also pass. Ie, if there is some bug in a
+ * given PointsFormat that this test fails to catch then this test needs to be improved!
*/
public abstract class BasePointsFormatTestCase extends BaseIndexFileFormatTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java
index 181be045fd1..45e8bd8e858 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BasePostingsFormatTestCase.java
@@ -77,9 +77,9 @@ import org.junit.BeforeClass;
/**
* Abstract class to do basic tests for a postings format. NOTE: This test focuses on the postings
* (docs/freqs/positions/payloads/offsets) impl, not the terms dict. The [stretch] goal is for this
- * test to be so thorough in testing a new PostingsFormat that if this test passes, then all
- * Lucene/Solr tests should also pass. Ie, if there is some bug in a given PostingsFormat that this
- * test fails to catch then this test needs to be improved!
+ * test to be so thorough in testing a new PostingsFormat that if this test passes, then all Lucene
+ * tests should also pass. Ie, if there is some bug in a given PostingsFormat that this test fails
+ * to catch then this test needs to be improved!
*/
// TODO can we make it easy for testing to pair up a "random terms dict impl" with your postings
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java
index 674edb89db8..0ebb3fcffdc 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/index/BaseSegmentInfoFormatTestCase.java
@@ -44,8 +44,8 @@ import org.apache.lucene.util.Version;
/**
* Abstract class to do basic tests for si format. NOTE: This test focuses on the si impl, nothing
* else. The [stretch] goal is for this test to be so thorough in testing a new si format that if
- * this test passes, then all Lucene/Solr tests should also pass. Ie, if there is some bug in a
- * given si Format that this test fails to catch then this test needs to be improved!
+ * this test passes, then all Lucene tests should also pass. Ie, if there is some bug in a given si
+ * Format that this test fails to catch then this test needs to be improved!
*/
public abstract class BaseSegmentInfoFormatTestCase extends BaseIndexFileFormatTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java
index 84c340d516e..763bf16e691 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/search/similarities/BaseSimilarityTestCase.java
@@ -42,8 +42,8 @@ import org.junit.BeforeClass;
/**
* Abstract class to do basic tests for a similarity. NOTE: This test focuses on the similarity
* impl, nothing else. The [stretch] goal is for this test to be so thorough in testing a new
- * Similarity that if this test passes, then all Lucene/Solr tests should also pass. Ie, if there is
- * some bug in a given Similarity that this test fails to catch then this test needs to be improved!
+ * Similarity that if this test passes, then all Lucene tests should also pass. Ie, if there is some
+ * bug in a given Similarity that this test fails to catch then this test needs to be improved!
*/
public abstract class BaseSimilarityTestCase extends LuceneTestCase {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java
index 7b6dd064660..b9165be1bc7 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/LuceneTestCase.java
@@ -494,8 +494,7 @@ public abstract class LuceneTestCase extends Assert {
Arrays.asList(
"tests.leaveTemporary" /* ANT tasks's (junit4) flag. */,
"tests.leavetemporary" /* lowercase */,
- "tests.leavetmpdir" /* default */,
- "solr.test.leavetmpdir" /* Solr's legacy */)) {
+ "tests.leavetmpdir" /* default */)) {
defaultValue |= systemPropertyAsBoolean(property, false);
}
LEAVE_TEMPORARY = defaultValue;
@@ -659,13 +658,7 @@ public abstract class LuceneTestCase extends Assert {
// We reset the default locale and timezone; these properties change as a
// side-effect
- "user.language",
- "user.timezone",
-
- // TODO: these should, ideally, be moved to Solr's base class.
- "solr.directoryFactory",
- "solr.solr.home",
- "solr.data.dir"))
+ "user.language", "user.timezone"))
.around(classEnvRule = new TestRuleSetupAndRestoreClassEnv());
}
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java
index 6bc2020a8f6..ae270402878 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleAssertionsRequired.java
@@ -20,7 +20,7 @@ import org.junit.rules.TestRule;
import org.junit.runner.Description;
import org.junit.runners.model.Statement;
-/** Require assertions for Lucene/Solr packages. */
+/** Require assertions for Lucene packages. */
public class TestRuleAssertionsRequired implements TestRule {
@Override
public Statement apply(final Statement base, final Description description) {
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java
index 4b0719d72e3..c386a7ef85e 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleSetupAndRestoreClassEnv.java
@@ -105,13 +105,6 @@ final class TestRuleSetupAndRestoreClassEnv extends AbstractBeforeAfterRule {
@Override
protected void before() throws Exception {
- // enable this by default, for IDE consistency with ant tests (as it's the default from ant)
- // TODO: really should be in solr base classes, but some extend LTC directly.
- // we do this in beforeClass, because some tests currently disable it
- if (System.getProperty("solr.directoryFactory") == null) {
- System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockDirectoryFactory");
- }
-
// if verbose: print some debugging stuff about which codecs are loaded.
if (VERBOSE) {
System.out.println("Loaded codecs: " + Codec.availableCodecs());
diff --git a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java
index e3ff2f798d6..6d1b6ad1f3a 100644
--- a/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java
+++ b/lucene/test-framework/src/java/org/apache/lucene/tests/util/TestRuleTemporaryFilesCleanup.java
@@ -235,7 +235,6 @@ final class TestRuleTemporaryFilesCleanup extends TestRuleAdapter {
Class<?> clazz = ctx.getTargetClass();
String prefix = clazz.getName();
prefix = prefix.replaceFirst("^org.apache.lucene.", "lucene.");
- prefix = prefix.replaceFirst("^org.apache.solr.", "solr.");
int attempt = 0;
Path f;