diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml index d3a1862d025..3ab7837284f 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-copyfield-test.xml @@ -394,6 +394,7 @@ termVectors="true" termPositions="true" termOffsets="true"/> + + @@ -50,6 +51,7 @@ + id diff --git a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml index 9363398be69..8dea7914549 100644 --- a/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml +++ b/solr/core/src/test-files/solr/collection1/conf/schema-required-fields.xml @@ -376,7 +376,7 @@ - + + + - + ${solr.ulog.dir:} diff --git a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java index afac95666ef..6df9c6a260c 100755 --- a/solr/core/src/test/org/apache/solr/TestDistributedSearch.java +++ b/solr/core/src/test/org/apache/solr/TestDistributedSearch.java @@ -123,6 +123,7 @@ public class TestDistributedSearch extends BaseDistributedSearchTestCase { handle.clear(); handle.put("QTime", SKIPVAL); handle.put("timestamp", SKIPVAL); + handle.put("_version_", SKIPVAL); // not a cloud test, but may use updateLog // random value sort for (String f : fieldNames) { diff --git a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java index dab377a2c92..2df2c146e2c 100644 --- a/solr/core/src/test/org/apache/solr/TestGroupingSearch.java +++ b/solr/core/src/test/org/apache/solr/TestGroupingSearch.java @@ -54,6 +54,7 @@ public class TestGroupingSearch extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/TestJoin.java b/solr/core/src/test/org/apache/solr/TestJoin.java index aeb1b1463e7..03be32c11fa 100644 --- a/solr/core/src/test/org/apache/solr/TestJoin.java +++ b/solr/core/src/test/org/apache/solr/TestJoin.java @@ -37,6 +37,7 @@ public class TestJoin extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java index 4e2e03680bd..8009d7b8384 100644 --- a/solr/core/src/test/org/apache/solr/TestRandomFaceting.java +++ b/solr/core/src/test/org/apache/solr/TestRandomFaceting.java @@ -37,6 +37,7 @@ public class TestRandomFaceting extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java b/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java index 5820597ba83..2f21333803c 100644 --- a/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java +++ b/solr/core/src/test/org/apache/solr/core/TestArbitraryIndexDir.java @@ -50,6 +50,7 @@ public class TestArbitraryIndexDir extends AbstractSolrTestCase{ static String savedFactory; @BeforeClass public static void beforeClass() { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ savedFactory = System.getProperty("solr.DirectoryFactory"); System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); } diff --git a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java index a2deb3be833..ed23a08395f 100755 --- a/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java +++ b/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java @@ -35,6 +35,7 @@ public class TestCSVLoader extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java index 34e9d77e731..5979e8418af 100644 --- a/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/handler/admin/LukeRequestHandlerTest.java @@ -35,6 +35,7 @@ public class LukeRequestHandlerTest extends AbstractSolrTestCase { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java index 5f655e0b2e5..2f610fdb169 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermVectorComponentDistributedTest.java @@ -31,6 +31,7 @@ public class TermVectorComponentDistributedTest extends BaseDistributedSearchTes handle.put("maxScore", SKIPVAL); handle.put("score", SKIPVAL); handle.put("[docid]", SKIPVAL); + handle.put("_version_", SKIPVAL); // not a cloud test, but may use updateLog // SOLR-3720: TODO: TVC doesn't "merge" df and idf .. should it? handle.put("df", SKIPVAL); diff --git a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java index dc0364d53e2..34d88e9d0d6 100644 --- a/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java +++ b/solr/core/src/test/org/apache/solr/handler/component/TermsComponentTest.java @@ -32,6 +32,7 @@ public class TermsComponentTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeTest() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); assertNull(h.validateUpdate(adoc("id", "0", "lowerfilt", "a", "standardfilt", "a", "foo_i","1"))); diff --git a/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java b/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java index 559e166a990..1b60aeb20d8 100644 --- a/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/request/TestBinaryResponseWriter.java @@ -45,6 +45,7 @@ public class TestBinaryResponseWriter extends AbstractSolrTestCase { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java index ebd765d5dc8..8a6b85a77e9 100644 --- a/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java +++ b/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java @@ -32,6 +32,7 @@ import java.util.Arrays; public class TestCSVResponseWriter extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); createIndex(); } diff --git a/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java index 24f962d7919..f895f0dc4e2 100644 --- a/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java +++ b/solr/core/src/test/org/apache/solr/schema/NotRequiredUniqueKeyTest.java @@ -32,6 +32,7 @@ public class NotRequiredUniqueKeyTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { + System.setProperty("enable.update.log", "false"); // usecase doesn't work with updateLog initCore("solrconfig.xml","schema-not-required-unique-key.xml"); } diff --git a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java index 84152366e96..34d2e45ec37 100644 --- a/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java +++ b/solr/core/src/test/org/apache/solr/schema/PrimitiveFieldTypeTest.java @@ -40,6 +40,7 @@ public class PrimitiveFieldTypeTest extends SolrTestCaseJ4 { public void setUp() throws Exception { super.setUp(); // set some system properties for use by tests + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ System.setProperty("solr.test.sys.prop1", "propone"); System.setProperty("solr.test.sys.prop2", "proptwo"); diff --git a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java index 0d739904f36..87280b4d258 100644 --- a/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java +++ b/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java @@ -47,6 +47,7 @@ public class ReturnFieldsTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); String v = "how now brown cow"; assertU(adoc("id","1", "text",v, "text_np", v, "#foo_s", v)); diff --git a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java index bcfdb28dd15..37f2247d14f 100755 --- a/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestExtendedDismaxParser.java @@ -41,6 +41,7 @@ public class TestExtendedDismaxParser extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); index(); } diff --git a/solr/core/src/test/org/apache/solr/search/TestFiltering.java b/solr/core/src/test/org/apache/solr/search/TestFiltering.java index cc71f82f268..b0a4bd8b9a0 100644 --- a/solr/core/src/test/org/apache/solr/search/TestFiltering.java +++ b/solr/core/src/test/org/apache/solr/search/TestFiltering.java @@ -31,6 +31,7 @@ public class TestFiltering extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java b/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java index be5da9ae98c..f1da7c29c3d 100644 --- a/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java +++ b/solr/core/src/test/org/apache/solr/search/TestPseudoReturnFields.java @@ -49,6 +49,7 @@ public class TestPseudoReturnFields extends SolrTestCaseJ4 { @BeforeClass public static void beforeTests() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml","schema12.xml"); diff --git a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java index 114b1c83b80..44e09bf8447 100644 --- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java +++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java @@ -25,6 +25,7 @@ import org.junit.Test; public class TestSolrQueryParser extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); createIndex(); } diff --git a/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java index bc2764bb997..65808bd5f64 100644 --- a/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java +++ b/solr/core/src/test/org/apache/solr/search/function/distance/DistanceFunctionTest.java @@ -30,6 +30,7 @@ import org.junit.Test; public class DistanceFunctionTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java index 7faa14a7be7..066eb351422 100644 --- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java +++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java @@ -35,6 +35,7 @@ public class DirectUpdateHandlerOptimizeTest extends AbstractSolrTestCase { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java index ddd7f787160..c660912ae63 100644 --- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java +++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java @@ -45,6 +45,7 @@ public class DirectUpdateHandlerTest extends SolrTestCaseJ4 { public static void beforeClass() throws Exception { savedFactory = System.getProperty("solr.DirectoryFactory"); System.setProperty("solr.directoryFactory", "org.apache.solr.core.MockFSDirectoryFactory"); + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java index f017ebe06f4..45fd36bac18 100644 --- a/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java +++ b/solr/core/src/test/org/apache/solr/update/SolrIndexSplitterTest.java @@ -45,6 +45,7 @@ public class SolrIndexSplitterTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java b/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java index 5dcf8d21b82..bacc85dfa23 100644 --- a/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java +++ b/solr/core/src/test/org/apache/solr/update/TestAtomicUpdateErrorCases.java @@ -24,6 +24,7 @@ public class TestAtomicUpdateErrorCases extends SolrTestCaseJ4 { public void testUpdateNoTLog() throws Exception { try { + System.setProperty("enable.update.log", "false"); initCore("solrconfig.xml","schema15.xml"); UpdateHandler uh = h.getCore().getUpdateHandler(); @@ -56,6 +57,7 @@ public class TestAtomicUpdateErrorCases extends SolrTestCaseJ4 { } } finally { + System.clearProperty("enable.update.log"); deleteCore(); } } diff --git a/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java b/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java index d757bd20ae4..dac0ad0b9cd 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/RegexBoostProcessorTest.java @@ -38,6 +38,7 @@ public class RegexBoostProcessorTest extends SolrTestCaseJ4 { @BeforeClass public static void setUpBeforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); SolrCore core = h.getCore(); _parser = new SolrRequestParsers( null ); diff --git a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java index 7003ce098d2..ef7a8f335c8 100755 --- a/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java @@ -52,6 +52,7 @@ public class SignatureUpdateProcessorFactoryTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java index 30ecbdecd1f..78ac58af31a 100644 --- a/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java +++ b/solr/core/src/test/org/apache/solr/update/processor/UniqFieldsUpdateProcessorFactoryTest.java @@ -43,6 +43,7 @@ public class UniqFieldsUpdateProcessorFactoryTest extends SolrTestCaseJ4 { @BeforeClass public static void beforeClass() throws Exception { + System.setProperty("enable.update.log", "false"); // schema12 doesn't support _version_ initCore("solrconfig.xml", "schema12.xml"); } diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java index 972e6013f17..21609d8e298 100755 --- a/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java +++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java @@ -86,6 +86,8 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { @SuppressWarnings("unused") private static void beforeClass() { System.setProperty("jetty.testMode", "true"); + System.setProperty("enable.update.log", usually() ? "true" : "false"); + System.setProperty("enable.update.log", "true"); // :nocommit: System.setProperty("tests.shardhandler.randomSeed", Long.toString(random().nextLong())); setupLogging(); startTrackingSearchers(); @@ -104,6 +106,7 @@ public abstract class SolrTestCaseJ4 extends LuceneTestCase { coreName = CoreContainer.DEFAULT_DEFAULT_CORE_NAME; System.clearProperty("jetty.testMode"); System.clearProperty("tests.shardhandler.randomSeed"); + System.clearProperty("enable.update.log"); } private static boolean changedFactory = false;