You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2020/11/15 03:33:27 UTC
[lucene-solr] 03/03: @1208 Add tlog def.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl_dev
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 30b339b924709c2a2d193e01315a8385533e40aa
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Nov 14 21:32:57 2020 -0600
@1208 Add tlog def.
---
.../org/apache/solr/cloud/SolrCloudBridgeTestCase.java | 16 +++++++---------
.../solrj/solr/configsets/spatial/conf/solrconfig.xml | 2 +-
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
index de430cf..c4826f2 100644
--- a/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
+++ b/solr/core/src/test/org/apache/solr/cloud/SolrCloudBridgeTestCase.java
@@ -84,7 +84,7 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
protected static String COLLECTION = "collection1";
protected static String DEFAULT_COLLECTION = COLLECTION;
- protected static CloudHttp2SolrClient cloudClient;
+ protected volatile static CloudHttp2SolrClient cloudClient;
protected static final String SHARD1 = "s1";
@@ -113,13 +113,13 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
protected static String[] fieldNames = new String[]{"n_ti1", "n_f1", "n_tf1", "n_d1", "n_td1", "n_l1", "n_tl1", "n_dt1", "n_tdt1"};
- protected static int numJettys = 3;
+ protected volatile static int numJettys = 3;
- protected static int sliceCount = 2;
+ protected volatile static int sliceCount = 2;
- protected static int replicationFactor = 1;
+ protected volatile static int replicationFactor = 1;
- protected static boolean enableProxy = false;
+ protected volatile static boolean enableProxy = false;
protected final List<SolrClient> clients = Collections.synchronizedList(new ArrayList<>());
protected volatile static boolean createCollection1 = true;
@@ -134,15 +134,13 @@ public abstract class SolrCloudBridgeTestCase extends SolrCloudTestCase {
protected volatile static SortedMap<ServletHolder, String> extraServlets = Collections.emptySortedMap();
- Pattern filenameExclusions = Pattern.compile(".*solrconfig(?:-|_).*?\\.xml|.*schema(?:-|_).*?\\.xml");
+ final Pattern filenameExclusions = Pattern.compile(".*solrconfig(?:-|_).*?\\.xml|.*schema(?:-|_).*?\\.xml");
public static Path TEST_PATH() { return SolrTestCaseJ4.getFile("solr/collection1").getParentFile().toPath(); }
@Before
public void beforeSolrCloudBridgeTestCase() throws Exception {
-
-
-
+
System.setProperty("solr.test.sys.prop1", "propone");
System.setProperty("solr.test.sys.prop2", "proptwo");
diff --git a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml
index 4d6da78..78aa397 100644
--- a/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml
+++ b/solr/solrj/src/test-files/solrj/solr/configsets/spatial/conf/solrconfig.xml
@@ -48,7 +48,7 @@
<commitWithin>
<softCommit>${solr.commitwithin.softcommit:true}</softCommit>
</commitWithin>
-
+ <updateLog class="${solr.ulog:solr.UpdateLog}"></updateLog>
</updateHandler>
<requestHandler name="/select" class="solr.SearchHandler">
<lst name="defaults">