You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/04/27 07:58:07 UTC
[lucene-solr] 02/03: Merge branch 'master' into jira/solr-12847
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-12847
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 1253bffdfb0fbf8a1c819f64ad37d5d599bc5065
Merge: fbdaffd 4eb755d
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Apr 23 14:39:58 2020 +0200
Merge branch 'master' into jira/solr-12847
gradle/validation/validate-log-calls.gradle | 65 ++++++++++++++--------
help/validateLogCalls.txt | 9 ++-
lucene/CHANGES.txt | 3 +
.../lucene/index/ConcurrentMergeScheduler.java | 4 +-
.../java/org/apache/lucene/index/IndexWriter.java | 13 +++--
.../org/apache/lucene/index/MergeScheduler.java | 6 +-
.../org/apache/lucene/index/NoMergeScheduler.java | 2 +-
.../apache/lucene/index/SerialMergeScheduler.java | 2 +-
.../apache/lucene/TestMergeSchedulerExternal.java | 2 +-
.../lucene/index/TestConcurrentMergeScheduler.java | 6 +-
.../lucene/index/TestIndexWriterMerging.java | 2 +-
.../apache/lucene/index/TestNoMergeScheduler.java | 2 +-
.../lucene/index/BaseMergePolicyTestCase.java | 4 +-
solr/CHANGES.txt | 2 +
.../java/org/apache/solr/core/CoreContainer.java | 22 +++-----
.../apache/solr/core/CorePropertiesLocator.java | 6 +-
.../src/java/org/apache/solr/core/Diagnostics.java | 2 +-
.../org/apache/solr/core/DirectoryFactory.java | 2 +-
.../src/java/org/apache/solr/core/PluginBag.java | 10 +---
.../src/java/org/apache/solr/core/SolrConfig.java | 31 ++++-------
.../src/java/org/apache/solr/core/SolrCores.java | 6 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 4 +-
.../org/apache/solr/core/SolrResourceLoader.java | 10 +---
.../java/org/apache/solr/core/SolrXmlConfig.java | 4 +-
.../src/java/org/apache/solr/core/ZkContainer.java | 2 +-
.../snapshots/SolrSnapshotMetaDataManager.java | 4 +-
.../solr/handler/admin/AdminHandlersProxy.java | 8 ++-
.../org/apache/solr/handler/admin/ColStatus.java | 2 +-
.../solr/handler/admin/CollectionHandlerApi.java | 2 +-
.../solr/handler/admin/CollectionsHandler.java | 23 +++++---
.../solr/handler/admin/ConfigSetsHandler.java | 10 +++-
.../solr/handler/admin/HealthCheckHandler.java | 4 +-
.../solr/handler/admin/IndexSizeEstimator.java | 4 +-
.../apache/solr/handler/admin/LoggingHandler.java | 7 ++-
.../solr/handler/admin/LukeRequestHandler.java | 8 +--
.../handler/admin/MetricsCollectorHandler.java | 8 +--
.../solr/handler/admin/MetricsHistoryHandler.java | 18 +++---
.../apache/solr/handler/admin/PrepRecoveryOp.java | 22 ++++----
.../solr/handler/admin/RebalanceLeaders.java | 16 ++++--
.../solr/handler/admin/RequestSyncShardOp.java | 8 +--
.../handler/admin/SegmentsInfoRequestHandler.java | 4 +-
.../solr/handler/admin/ShowFileRequestHandler.java | 14 ++---
.../org/apache/solr/handler/admin/SplitOp.java | 12 +++-
.../solr/handler/admin/SystemInfoHandler.java | 13 ++---
.../solr/handler/admin/ZookeeperInfoHandler.java | 6 +-
.../solr/handler/admin/ZookeeperStatusHandler.java | 2 +-
.../solr/handler/component/FacetComponent.java | 16 +++---
.../handler/component/HttpShardHandlerFactory.java | 3 +-
.../handler/component/MoreLikeThisComponent.java | 36 +++++++-----
.../solr/handler/component/QueryComponent.java | 4 +-
.../handler/component/QueryElevationComponent.java | 6 +-
.../solr/handler/component/RangeFacetRequest.java | 13 +++--
.../handler/component/RealTimeGetComponent.java | 13 +++--
.../solr/handler/component/SearchHandler.java | 2 +-
.../handler/component/SpellCheckComponent.java | 31 +++++++----
.../solr/handler/component/SuggestComponent.java | 32 +++++++----
.../org/apache/solr/handler/loader/JsonLoader.java | 8 ++-
.../org/apache/solr/handler/loader/XMLLoader.java | 20 ++++---
.../org/apache/solr/handler/tagger/Tagger.java | 9 +--
.../solr/highlight/DefaultSolrHighlighter.java | 6 +-
.../metrics/reporters/jmx/JmxMetricsReporter.java | 4 +-
.../solr/metrics/reporters/solr/SolrReporter.java | 2 +-
.../metrics/reporters/solr/SolrShardReporter.java | 10 +---
.../src/java/org/apache/solr/pkg/PackageAPI.java | 4 +-
.../org/apache/solr/request/SolrRequestInfo.java | 2 +-
.../apache/solr/rest/ManagedResourceStorage.java | 4 +-
.../org/apache/solr/schema/AbstractEnumField.java | 5 +-
.../src/java/org/apache/solr/schema/EnumField.java | 2 +-
.../src/java/org/apache/solr/schema/FieldType.java | 2 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 17 +++---
.../java/org/apache/solr/schema/IndexSchema.java | 6 +-
.../apache/solr/schema/JsonPreAnalyzedParser.java | 8 +--
.../org/apache/solr/schema/ManagedIndexSchema.java | 6 +-
.../solr/schema/ManagedIndexSchemaFactory.java | 11 ++--
.../solr/schema/OpenExchangeRatesOrgProvider.java | 4 +-
.../java/org/apache/solr/schema/PointField.java | 4 +-
.../org/apache/solr/schema/PreAnalyzedField.java | 7 +--
.../src/java/org/apache/solr/schema/TrieField.java | 2 +-
.../src/java/org/apache/solr/search/Grouping.java | 8 +--
.../apache/solr/search/SolrDocumentFetcher.java | 6 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 4 +-
.../apache/solr/search/facet/UnInvertedField.java | 4 +-
.../solr/search/function/FileFloatSource.java | 12 ++--
.../solr/search/grouping/CommandHandler.java | 4 +-
.../search/join/ChildFieldValueSourceParser.java | 4 +-
.../apache/solr/search/stats/LRUStatsCache.java | 4 +-
.../apache/solr/security/AuthenticationPlugin.java | 20 +++++--
.../org/apache/solr/security/BasicAuthPlugin.java | 19 ++-----
.../org/apache/solr/security/HadoopAuthPlugin.java | 32 +++++------
.../org/apache/solr/security/JWTAuthPlugin.java | 25 ++-------
.../org/apache/solr/security/KerberosPlugin.java | 12 ++--
.../solr/security/PKIAuthenticationPlugin.java | 21 ++-----
.../security/Sha256AuthenticationProvider.java | 4 +-
.../solr/security/SolrLogAuditLoggerPlugin.java | 4 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 2 +-
.../apache/solr/spelling/SpellCheckCollator.java | 2 +-
.../solr/spelling/suggest/SolrSuggester.java | 2 +-
.../apache/solr/spelling/suggest/Suggester.java | 4 +-
.../solr/store/hdfs/HdfsLocalityReporter.java | 10 ++--
.../src/java/org/apache/solr/update/PeerSync.java | 22 ++------
.../org/apache/solr/update/PeerSyncWithLeader.java | 8 +--
.../org/apache/solr/update/SolrCmdDistributor.java | 5 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 2 +-
.../apache/solr/update/StreamingSolrClients.java | 2 +-
.../org/apache/solr/update/TransactionLog.java | 4 +-
.../processor/AtomicUpdateProcessorFactory.java | 6 +-
.../CloneFieldUpdateProcessorFactory.java | 4 +-
.../processor/DistributedUpdateProcessor.java | 14 ++---
.../processor/DistributedZkUpdateProcessor.java | 23 +++-----
...DocBasedVersionConstraintsProcessorFactory.java | 13 ++---
.../processor/LogUpdateProcessorFactory.java | 6 +-
.../PreAnalyzedUpdateProcessorFactory.java | 4 +-
.../update/processor/RegexpBoostProcessor.java | 6 +-
.../update/processor/TolerantUpdateProcessor.java | 4 +-
.../update/processor/URLClassifyProcessor.java | 4 +-
.../src/java/org/apache/solr/util/FSHDFSUtils.java | 13 ++---
.../src/java/org/apache/solr/util/SolrCLI.java | 14 ++---
.../org/apache/solr/util/stats/MetricUtils.java | 4 +-
.../apache/solr/util/xslt/TransformerProvider.java | 14 ++---
.../solr/cloud/TestAuthenticationFramework.java | 4 +-
.../solr/cloud/autoscaling/TestPolicyCloud.java | 11 +++-
.../solr/security/MockAuthenticationPlugin.java | 25 +++------
.../src/indexing-nested-documents.adoc | 2 +-
solr/solr-ref-guide/src/json-facet-api.adoc | 2 +-
solr/solr-ref-guide/src/json-query-dsl.adoc | 2 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 4 +-
127 files changed, 531 insertions(+), 613 deletions(-)
diff --cc solr/core/src/test/org/apache/solr/cloud/autoscaling/TestPolicyCloud.java
index e043730,935943d..b3c1d93
--- a/solr/core/src/test/org/apache/solr/cloud/autoscaling/TestPolicyCloud.java
+++ b/solr/core/src/test/org/apache/solr/cloud/autoscaling/TestPolicyCloud.java
@@@ -60,11 -57,10 +60,12 @@@ import org.apache.solr.common.cloud.ZkS
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.TimeSource;
import org.apache.solr.common.util.Utils;
+import org.apache.solr.util.TestInjection;
import org.apache.solr.util.TimeOut;
import org.junit.After;
+ import org.junit.Before;
import org.junit.BeforeClass;
+import org.junit.Test;
import org.junit.rules.ExpectedException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@@ -85,9 -81,15 +86,16 @@@ public class TestPolicyCloud extends So
.configure();
}
+ @Before
+ public void before() throws Exception {
+ // remove default policy
+ String commands = "{set-cluster-policy : []}";
+ cluster.getSolrClient().request(AutoScalingRequest.create(SolrRequest.METHOD.POST, commands));
+ }
+
@After
public void after() throws Exception {
+ TestInjection.reset();
cluster.deleteAllCollections();
cluster.getSolrClient().getZkStateReader().getZkClient().setData(ZkStateReader.SOLR_AUTOSCALING_CONF_PATH,
"{}".getBytes(StandardCharsets.UTF_8), true);