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/08/17 23:12:07 UTC
[lucene-solr] 37/49: @551 Oh baby,
been a while since I've seen this matter.
This is an automated email from the ASF dual-hosted git repository.
markrmiller pushed a commit to branch reference_impl
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 339fb8fb79ceadafe41c2d4fdb211e19b6b3a260
Author: markrmiller@gmail.com <ma...@gmail.com>
AuthorDate: Sat Aug 15 17:56:17 2020 -0500
@551 Oh baby, been a while since I've seen this matter.
---
gradle/testing/defaults-tests.gradle | 4 +++-
lucene/common-build.xml | 2 ++
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 6 ++++++
solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java | 1 -
solr/core/src/java/org/apache/solr/core/XmlConfigFile.java | 10 ----------
.../src/java/org/apache/solr/schema/AbstractEnumField.java | 1 -
.../src/java/org/apache/solr/servlet/SolrDispatchFilter.java | 7 +++++++
solr/core/src/java/org/apache/solr/util/SimplePostTool.java | 1 -
solr/test-framework/src/java/org/apache/solr/SolrTestCase.java | 4 ++++
9 files changed, 22 insertions(+), 14 deletions(-)
diff --git a/gradle/testing/defaults-tests.gradle b/gradle/testing/defaults-tests.gradle
index 6f62865..34c583a 100644
--- a/gradle/testing/defaults-tests.gradle
+++ b/gradle/testing/defaults-tests.gradle
@@ -62,13 +62,15 @@ allprojects {
maxParallelForks = propertyOrDefault("tests.jvms", (int) Math.max(1, Math.min(Runtime.runtime.availableProcessors() / 2.0, 4.0))) as Integer
}
+ forkEvery = 0
+
workingDir testsCwd
useJUnit()
minHeapSize = propertyOrDefault("tests.minheapsize", "256m")
maxHeapSize = propertyOrDefault("tests.heapsize", "512m")
- jvmArgs Commandline.translateCommandline(propertyOrDefault("tests.jvmargs", "-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:-UseBiasedLocking"));
+ jvmArgs Commandline.translateCommandline(propertyOrDefault("tests.jvmargs", "-XX:TieredStopAtLevel=1 -XX:+UseParallelGC -XX:-UseBiasedLocking -Dorg.apache.xml.dtm.DTMManager=org.apache.xml.dtm.ref.DTMManagerDefault"));
systemProperty 'java.util.logging.config.file', file("${commonDir}/tools/junit4/logging.properties")
systemProperty 'java.awt.headless', 'true'
diff --git a/lucene/common-build.xml b/lucene/common-build.xml
index 7853866..4dd88ba 100644
--- a/lucene/common-build.xml
+++ b/lucene/common-build.xml
@@ -1094,6 +1094,8 @@
<sysproperty key="tests.monster" value="@{tests.monster}"/>
<!-- set whether or not slow tests should run -->
<sysproperty key="tests.slow" value="@{tests.slow}"/>
+
+ <sysproperty key="org.apache.xml.dtm.DTMManager" value="org.apache.xml.dtm.ref.DTMManagerDefault"/>
<!-- set whether tests framework should not require java assertions enabled -->
<sysproperty key="tests.asserts" value="${tests.asserts}"/>
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 1e7396b..7e3f009 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -123,6 +123,7 @@ import org.apache.solr.metrics.SolrMetricsContext;
import org.apache.solr.pkg.PackageLoader;
import org.apache.solr.request.SolrRequestHandler;
import org.apache.solr.request.SolrRequestInfo;
+import org.apache.solr.rest.schema.FieldTypeXmlAdapter;
import org.apache.solr.search.SolrFieldCacheBean;
import org.apache.solr.security.AuditLoggerPlugin;
import org.apache.solr.security.AuthenticationPlugin;
@@ -162,6 +163,11 @@ public class CoreContainer implements Closeable {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ static {
+ log.warn("expected pre init of xml factories {} {} {} {} {}", XmlConfigFile.xpathFactory, XmlConfigFile.tfactory, XmlConfigFile.tx,
+ FieldTypeXmlAdapter.dbf);
+ }
+
final SolrCores solrCores = new SolrCores(this);
private final boolean isZkAware;
private volatile boolean startedLoadingCores;
diff --git a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
index 38e6317..c7bd84c 100644
--- a/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
+++ b/solr/core/src/java/org/apache/solr/core/SolrXmlConfig.java
@@ -42,7 +42,6 @@ import javax.xml.xpath.XPathExpressionException;
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
-import java.nio.ByteBuffer;
import java.nio.charset.StandardCharsets;
import java.nio.file.Files;
import java.nio.file.Path;
diff --git a/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java b/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java
index 67ff538..2a87041 100644
--- a/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java
+++ b/solr/core/src/java/org/apache/solr/core/XmlConfigFile.java
@@ -16,9 +16,6 @@
*/
package org.apache.solr.core;
-import com.fasterxml.aalto.AsyncByteBufferFeeder;
-import com.fasterxml.aalto.AsyncXMLStreamReader;
-import com.fasterxml.aalto.stax.InputFactoryImpl;
import net.sf.saxon.BasicTransformerFactory;
import net.sf.saxon.dom.DocumentBuilderImpl;
import net.sf.saxon.jaxp.SaxonTransformerFactory;
@@ -30,7 +27,6 @@ import org.apache.solr.common.util.XMLErrorLogger;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.util.DOMUtil;
import org.apache.solr.util.SystemIdResolver;
-import org.codehaus.staxmate.dom.DOMConverter;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.w3c.dom.Document;
@@ -41,17 +37,13 @@ import org.w3c.dom.NodeList;
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import static javax.xml.stream.XMLStreamConstants.END_DOCUMENT;
import javax.xml.namespace.QName;
import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.stream.XMLInputFactory;
import javax.xml.stream.XMLStreamException;
-import javax.xml.transform.Source;
import javax.xml.transform.Transformer;
import javax.xml.transform.TransformerException;
import javax.xml.transform.dom.DOMResult;
import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stax.StAXSource;
import javax.xml.xpath.XPath;
import javax.xml.xpath.XPathConstants;
import javax.xml.xpath.XPathExpressionException;
@@ -59,7 +51,6 @@ import javax.xml.xpath.XPathFactory;
import java.io.IOException;
import java.io.InputStream;
import java.lang.invoke.MethodHandles;
-import java.nio.ByteBuffer;
import java.util.Arrays;
import java.util.HashSet;
import java.util.Map;
@@ -77,7 +68,6 @@ public class XmlConfigFile { // formerly simply "Config"
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
public static final XMLErrorLogger xmllog = new XMLErrorLogger(log);
- public static final DOMConverter convertor = new DOMConverter();
public static final XPathFactory xpathFactory = new XPathFactoryImpl();
public static final SaxonTransformerFactory tfactory = new BasicTransformerFactory();
static {
diff --git a/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java b/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java
index bd1c80c..fbbe168 100644
--- a/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java
+++ b/solr/core/src/java/org/apache/solr/schema/AbstractEnumField.java
@@ -112,7 +112,6 @@ public abstract class AbstractEnumField extends PrimitiveFieldType {
try {
log.debug("Reloading enums config file from {}", enumsConfigFile);
Document doc = SafeXMLParsing.parseConfigXML(log, loader, enumsConfigFile);
- final XPathFactory xpathFactory = XmlConfigFile.xpathFactory;
final XPath xpath = IndexSchema.getXpath();
final String xpathStr = String.format(Locale.ROOT, "/enumsConfig/enum[@name='%s']", enumName);
final NodeList nodes = (NodeList) xpath.evaluate(xpathStr, doc, XPathConstants.NODESET);
diff --git a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index 079e02f..7f93287 100644
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@ -42,11 +42,13 @@ import org.apache.solr.core.SolrCore;
import org.apache.solr.core.SolrInfoBean;
import org.apache.solr.core.SolrPaths;
import org.apache.solr.core.SolrXmlConfig;
+import org.apache.solr.core.XmlConfigFile;
import org.apache.solr.metrics.AltBufferPoolMetricSet;
import org.apache.solr.metrics.MetricsMap;
import org.apache.solr.metrics.OperatingSystemMetricSet;
import org.apache.solr.metrics.SolrMetricManager;
import org.apache.solr.metrics.SolrMetricProducer;
+import org.apache.solr.rest.schema.FieldTypeXmlAdapter;
import org.apache.solr.security.AuditEvent;
import org.apache.solr.security.AuthenticationPlugin;
import org.apache.solr.security.PKIAuthenticationPlugin;
@@ -102,6 +104,11 @@ import java.util.regex.Pattern;
public class SolrDispatchFilter extends BaseSolrFilter {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ static {
+ log.warn("expected pre init of xml factories {} {} {} {}", XmlConfigFile.xpathFactory, XmlConfigFile.tfactory, XmlConfigFile.tx,
+ FieldTypeXmlAdapter.dbf);
+ }
+
protected volatile CoreContainer cores;
protected final CountDownLatch init = new CountDownLatch(1);
diff --git a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
index ce4254e..025e478 100644
--- a/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
+++ b/solr/core/src/java/org/apache/solr/util/SimplePostTool.java
@@ -1058,7 +1058,6 @@ public class SimplePostTool {
* Gets all nodes matching an XPath
*/
public static NodeList getNodesFromXP(Node n, String xpath) throws XPathExpressionException {
- XPathFactory factory = XmlConfigFile.xpathFactory;
XPath xp = IndexSchema.getXpath();
XPathExpression expr = xp.compile(xpath);
return (NodeList) expr.evaluate(n, XPathConstants.NODESET);
diff --git a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
index 608effd..b4cd681 100644
--- a/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
+++ b/solr/test-framework/src/java/org/apache/solr/SolrTestCase.java
@@ -59,6 +59,9 @@ import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.common.util.SolrQueuedThreadPool;
import org.apache.solr.common.util.SysStats;
import org.apache.solr.core.CoreContainer;
+import org.apache.solr.core.SolrXmlConfig;
+import org.apache.solr.core.XmlConfigFile;
+import org.apache.solr.rest.schema.FieldTypeXmlAdapter;
import org.apache.solr.servlet.SolrDispatchFilter;
import org.apache.solr.util.ExternalPaths;
import org.apache.solr.util.RandomizeSSL;
@@ -121,6 +124,7 @@ public class SolrTestCase extends LuceneTestCase {
public static TestRule solrClassRules =
RuleChain.outerRule(new SystemPropertiesRestoreRule())
.around(new RevertDefaultThreadHandlerRule());
+
private static volatile Random random;
private static volatile boolean failed = false;