You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by dw...@apache.org on 2021/03/10 10:10:04 UTC
[lucene] 32/33: Merge branch 'master' into jira/solr-15016
This is an automated email from the ASF dual-hosted git repository.
dweiss pushed a commit to branch jira/solr-15016
in repository https://gitbox.apache.org/repos/asf/lucene.git
commit 345db0e4a44a7d8d230bc5b7efedb62d0d2ca0d5
Merge: b5e5dda 21b8890
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Sat Dec 5 16:35:00 2020 +0100
Merge branch 'master' into jira/solr-15016
dev-tools/scripts/LUCENE-3753.patch.hack.pl | 111 ------------
dev-tools/scripts/crawl.maven.release.dist.sh | 68 --------
dev-tools/scripts/gitignore-gen.sh | 21 ---
dev-tools/scripts/write.stage.maven.build.xml.pl | 180 --------------------
lucene/CHANGES.txt | 4 +
.../org/apache/lucene/search/FieldComparator.java | 11 ++
.../apache/lucene/search/LeafFieldComparator.java | 2 +-
.../apache/lucene/search/TopFieldCollector.java | 56 +++---
.../search/comparators/NumericComparator.java | 17 +-
.../search/matchhighlight/MatchHighlighter.java | 5 +
.../lucene/search/matchhighlight/Passage.java | 9 +
.../intervals/ConjunctionIntervalIterator.java | 8 +-
.../lucene/queries/intervals/IntervalIterator.java | 6 +
.../queries/intervals/OneTimeIntervalSource.java | 189 +++++++++++++++++++++
.../queries/intervals/TestIntervalQuery.java | 6 +
solr/CHANGES.txt | 48 +++++-
.../apache/solr/ltr/TestLTRReRankingPipeline.java | 3 +-
.../org/apache/solr/ltr/TestLTRScoringQuery.java | 3 +-
.../test/org/apache/solr/ltr/TestRerankBase.java | 3 +-
.../apache/solr/ltr/norm/TestMinMaxNormalizer.java | 5 +-
.../solr/ltr/norm/TestStandardNormalizer.java | 5 +-
solr/contrib/prometheus-exporter/CHANGES.md | 20 ---
.../conf/solr-exporter-config.xml | 34 ++++
.../src/java/org/apache/solr/cloud/Overseer.java | 16 +-
.../OverseerCollectionConfigSetProcessor.java | 11 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 21 ++-
.../src/java/org/apache/solr/core/NodeConfig.java | 2 +
.../src/java/org/apache/solr/core/SolrPaths.java | 59 -------
.../org/apache/solr/core/SolrResourceLoader.java | 20 +--
.../java/org/apache/solr/core/XmlConfigFile.java | 5 +-
.../org/apache/solr/search/SolrCoreParser.java | 13 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 64 ++++++-
.../OverseerCollectionConfigSetProcessorTest.java | 18 +-
.../test/org/apache/solr/cloud/OverseerTest.java | 5 +-
.../solr/cloud/TestPullReplicaErrorHandling.java | 4 +-
.../org/apache/solr/cloud/ZkControllerTest.java | 11 +-
.../org/apache/solr/core/ResourceLoaderTest.java | 7 +-
.../org/apache/solr/core/TestCoreContainer.java | 22 +++
.../org/apache/solr/core/TestCoreDiscovery.java | 3 +-
.../solr/index/WrapperMergePolicyFactoryTest.java | 2 +-
.../apache/solr/metrics/SolrMetricManagerTest.java | 94 +++++-----
.../org/apache/solr/search/TestSolrCoreParser.java | 14 +-
.../org/apache/solr/search/TestXmlQParser.java | 18 +-
.../security/MultiDestinationAuditLoggerTest.java | 5 +-
solr/docker/CHANGES.md | 28 ---
solr/solr-ref-guide/src/metrics-reporting.adoc | 6 +
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 22 ++-
.../client/solrj/response/QueryResponseTest.java | 11 +-
.../solrj/response/TestClusteringResponse.java | 3 +-
.../apache/solr/common/util/ContentStreamTest.java | 19 ++-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +
.../src/java/org/apache/solr/util/TestHarness.java | 17 +-
.../solr/cloud/MiniSolrCloudClusterTest.java | 37 ++++
53 files changed, 706 insertions(+), 667 deletions(-)
diff --cc solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
index ee5caeb,5b18ab0..6127e59
--- a/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionConfigSetProcessorTest.java
@@@ -122,9 -122,8 +123,10 @@@ public class OverseerCollectionConfigSe
private static CoreContainer coreContainerMock;
private static UpdateShardHandler updateShardHandlerMock;
private static HttpClient httpClientMock;
+ @SuppressWarnings("rawtypes")
+ private static PlacementPluginFactory placementPluginFactoryMock;
-
+ private static SolrMetricsContext solrMetricsContextMock;
-
++
private static ObjectCache objectCache;
private Map<String, byte[]> zkClientData = new HashMap<>();
private final Map<String, ClusterState.CollectionRef> collectionsSet = new HashMap<>();
@@@ -183,7 -183,7 +186,8 @@@
coreContainerMock = mock(CoreContainer.class);
updateShardHandlerMock = mock(UpdateShardHandler.class);
httpClientMock = mock(HttpClient.class);
+ placementPluginFactoryMock = mock(PlacementPluginFactory.class);
+ solrMetricsContextMock = mock(SolrMetricsContext.class);
}
@AfterClass
@@@ -208,7 -208,7 +212,8 @@@
coreContainerMock = null;
updateShardHandlerMock = null;
httpClientMock = null;
+ placementPluginFactoryMock = null;
+ solrMetricsContextMock = null;
}
@Before
@@@ -238,7 -238,7 +243,8 @@@
reset(coreContainerMock);
reset(updateShardHandlerMock);
reset(httpClientMock);
+ reset(placementPluginFactoryMock);
+ reset(solrMetricsContextMock);
zkClientData.clear();
collectionsSet.clear();