You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2020/05/22 05:04:04 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-13325
This is an automated email from the ASF dual-hosted git repository.
shalin pushed a commit to branch jira/solr-13325
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 8c399d5a2734e8d6c5d25d01239280ac07fabe05
Merge: d6f64bd 3fba3daa
Author: Shalin Shekhar Mangar <sh...@apache.org>
AuthorDate: Fri May 22 10:29:07 2020 +0530
Merge branch 'master' into jira/solr-13325
build.gradle | 16 +-
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/poll-mirrors.py | 20 +-
dev-tools/scripts/releaseWizard.py | 146 +--
dev-tools/scripts/releaseWizard.yaml | 368 +++---
gradle/documentation/changes-to-html.gradle | 15 +-
gradle/documentation/documentation.gradle | 57 +-
gradle/documentation/markdown.gradle | 204 ++++
gradle/render-javadoc.gradle | 558 ++++-----
gradle/validation/check-broken-links.gradle | 71 ++
gradlew | 5 +-
lucene/CHANGES.txt | 17 +
lucene/MIGRATE.md | 9 +
lucene/analysis/common/build.gradle | 2 +
lucene/analysis/icu/build.gradle | 2 +
lucene/analysis/kuromoji/build.gradle | 2 +
lucene/analysis/morfologik/build.gradle | 2 +
lucene/analysis/nori/build.gradle | 2 +
lucene/analysis/opennlp/build.gradle | 2 +
lucene/analysis/phonetic/build.gradle | 2 +
lucene/analysis/smartcn/build.gradle | 2 +
lucene/analysis/stempel/build.gradle | 2 +
lucene/backward-codecs/build.gradle | 2 +
lucene/benchmark/build.gradle | 2 +
lucene/build.gradle | 2 +
lucene/classification/build.gradle | 2 +
lucene/codecs/build.gradle | 2 +
lucene/core/build.gradle | 3 +-
.../org/apache/lucene/util/automaton/RegExp.java | 329 +++--
.../org/apache/lucene/search/TestFuzzyQuery.java | 5 +-
.../apache/lucene/search/TestLRUQueryCache.java | 17 +-
.../org/apache/lucene/search/TestRegexpQuery.java | 37 +-
.../lucene/search/TestSameScoresWithThreads.java | 1 +
.../apache/lucene/search/TestSearcherManager.java | 1 +
.../org/apache/lucene/search/TestTermQuery.java | 7 +-
.../apache/lucene/util/automaton/TestRegExp.java | 148 +++
lucene/demo/build.gradle | 2 +
lucene/expressions/build.gradle | 2 +
lucene/facet/build.gradle | 1 +
lucene/grouping/build.gradle | 2 +
lucene/highlighter/build.gradle | 2 +
.../search/uhighlight/UnifiedHighlighter.java | 2 +
.../lucene/search/highlight/HighlighterTest.java | 27 +-
.../lucene/search/highlight/TokenSourcesTest.java | 2 +
.../highlight/custom/HighlightCustomQueryTest.java | 23 +-
lucene/ivy-versions.properties | 1 -
lucene/join/build.gradle | 2 +
lucene/luke/build.gradle | 2 +
lucene/memory/build.gradle | 2 +
lucene/misc/build.gradle | 2 +
lucene/monitor/build.gradle | 2 +
lucene/queries/build.gradle | 2 +
lucene/queryparser/build.gradle | 2 +
lucene/replicator/build.gradle | 2 +
.../lucene/replicator/ReplicatorTestCase.java | 2 +
.../lucene/replicator/nrt/TestNRTReplication.java | 17 +-
.../replicator/nrt/TestStressNRTReplication.java | 6 +-
lucene/sandbox/build.gradle | 2 +
.../lucene/search/TestTermAutomatonQuery.java | 3 +-
lucene/site/xsl/index.template.md | 50 +
lucene/site/xsl/index.xsl | 6 +-
lucene/spatial-extras/build.gradle | 2 +
lucene/spatial3d/build.gradle | 2 +
lucene/suggest/build.gradle | 2 +
.../suggest/analyzing/TestFreeTextSuggester.java | 1 +
.../suggest/analyzing/TestSuggestStopFilter.java | 9 -
.../search/suggest/document/TestSuggestField.java | 2 +-
lucene/test-framework/build.gradle | 2 +
.../lucene/search/ShardSearchingTestBase.java | 3 +-
solr/CHANGES.txt | 44 +-
solr/build.gradle | 2 +
solr/build.xml | 2 +-
solr/contrib/analysis-extras/build.gradle | 2 +
solr/contrib/analytics/build.gradle | 2 +
.../org/apache/solr/handler/AnalyticsHandler.java | 6 -
solr/contrib/clustering/build.gradle | 2 +
solr/contrib/dataimporthandler-extras/build.gradle | 2 +
solr/contrib/dataimporthandler/build.gradle | 2 +
solr/contrib/extraction/build.gradle | 2 +
.../contrib/jaegertracer-configurator/build.gradle | 2 +
solr/contrib/langid/build.gradle | 2 +
solr/contrib/ltr/build.gradle | 2 +
solr/contrib/prometheus-exporter/build.gradle | 2 +
solr/contrib/velocity/build.gradle | 2 +
solr/core/build.gradle | 3 +-
solr/core/ivy.xml | 1 -
.../apache/solr/cloud/ExclusiveSliceProperty.java | 2 +-
.../src/java/org/apache/solr/cloud/Overseer.java | 64 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 8 +-
.../java/org/apache/solr/cloud/SyncStrategy.java | 7 +-
.../java/org/apache/solr/cloud/ZkController.java | 7 +-
.../org/apache/solr/cloud/ZkDistributedQueue.java | 11 +-
.../api/collections/ReindexCollectionCmd.java | 6 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 3 +-
.../autoscaling/sim/SimClusterStateProvider.java | 279 +++--
.../solr/cloud/autoscaling/sim/SimScenario.java | 11 +-
.../sim/SnapshotClusterStateProvider.java | 32 +-
.../java/org/apache/solr/core/CoreContainer.java | 26 +
.../src/java/org/apache/solr/core/SolrCore.java | 4 +-
.../java/org/apache/solr/handler/GraphHandler.java | 5 +-
.../org/apache/solr/handler/StreamHandler.java | 36 +-
.../org/apache/solr/handler/admin/ColStatus.java | 5 +-
.../solr/handler/admin/CollectionsHandler.java | 2 +-
.../solr/handler/admin/LukeRequestHandler.java | 29 +-
.../handler/admin/SegmentsInfoRequestHandler.java | 5 +-
.../solr/handler/admin/SystemInfoHandler.java | 6 +-
.../solr/handler/admin/ZookeeperStatusHandler.java | 5 +-
.../solr/handler/component/QueryComponent.java | 12 +-
.../apache/solr/handler/sql/CalciteSolrDriver.java | 16 +-
.../org/apache/solr/handler/sql/SolrSchema.java | 62 +-
.../org/apache/solr/handler/sql/SolrTable.java | 5 +-
.../apache/solr/metrics/SolrMetricProducer.java | 9 +-
.../solr/metrics/reporters/solr/SolrReporter.java | 70 +-
.../metrics/reporters/solr/SolrShardReporter.java | 2 +-
.../apache/solr/response/JSONResponseWriter.java | 8 +-
.../apache/solr/response/PythonResponseWriter.java | 2 +-
.../apache/solr/response/RubyResponseWriter.java | 2 +-
.../java/org/apache/solr/search/CaffeineCache.java | 3 +-
.../java/org/apache/solr/search/QueryCommand.java | 10 +-
.../java/org/apache/solr/search/QueryContext.java | 1 +
.../org/apache/solr/search/QueryResultKey.java | 10 +-
.../src/java/org/apache/solr/search/SolrCache.java | 3 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 20 +-
.../apache/solr/search/facet/AggValueSource.java | 3 +-
.../java/org/apache/solr/search/facet/AvgAgg.java | 28 +-
.../org/apache/solr/search/facet/CountAgg.java | 6 +-
.../org/apache/solr/search/facet/CountValsAgg.java | 20 +-
.../org/apache/solr/search/facet/DocValuesAcc.java | 577 ++++-----
.../org/apache/solr/search/facet/FacetBucket.java | 10 +-
.../org/apache/solr/search/facet/FacetContext.java | 74 ++
.../apache/solr/search/facet/FacetDebugInfo.java | 2 +-
.../org/apache/solr/search/facet/FacetField.java | 45 +-
.../apache/solr/search/facet/FacetFieldMerger.java | 7 +-
.../solr/search/facet/FacetFieldProcessor.java | 23 +-
.../search/facet/FacetFieldProcessorByArray.java | 6 +-
.../search/facet/FacetFieldProcessorByArrayDV.java | 2 +-
.../facet/FacetFieldProcessorByArrayUIF.java | 2 +-
.../FacetFieldProcessorByEnumTermsStream.java | 3 +-
.../search/facet/FacetFieldProcessorByHashDV.java | 9 +-
.../org/apache/solr/search/facet/FacetHeatmap.java | 8 +-
.../org/apache/solr/search/facet/FacetModule.java | 315 ++---
.../org/apache/solr/search/facet/FacetParser.java | 414 +++++++
.../apache/solr/search/facet/FacetProcessor.java | 21 +-
.../org/apache/solr/search/facet/FacetQuery.java | 7 +-
.../org/apache/solr/search/facet/FacetRange.java | 1038 +---------------
.../apache/solr/search/facet/FacetRangeMerger.java | 4 +-
.../apache/solr/search/facet/FacetRangeParser.java | 76 ++
.../{FacetRange.java => FacetRangeProcessor.java} | 278 ++---
.../org/apache/solr/search/facet/FacetRequest.java | 493 +-------
.../solr/search/facet/FacetRequestSorted.java | 58 +
.../search/facet/FacetRequestSortedMerger.java | 10 +-
.../java/org/apache/solr/search/facet/HLLAgg.java | 16 +-
.../org/apache/solr/search/facet/LegacyFacet.java | 1 +
.../org/apache/solr/search/facet/MinMaxAgg.java | 35 +-
.../org/apache/solr/search/facet/MissingAgg.java | 8 +-
.../apache/solr/search/facet/PercentileAgg.java | 18 +-
.../apache/solr/search/facet/RelatednessAgg.java | 16 +-
.../solr/search/facet/SimpleAggValueSource.java | 1 +
.../java/org/apache/solr/search/facet/SlotAcc.java | 695 +++++------
.../org/apache/solr/search/facet/StddevAgg.java | 18 +-
.../java/org/apache/solr/search/facet/SumAgg.java | 18 +-
.../org/apache/solr/search/facet/SumsqAgg.java | 16 +-
.../apache/solr/search/facet/UnInvertedField.java | 4 +-
.../solr/search/facet/UnInvertedFieldAcc.java | 176 +--
.../org/apache/solr/search/facet/UniqueAgg.java | 14 +-
.../apache/solr/search/facet/UniqueBlockAgg.java | 6 +-
.../solr/search/facet/UniqueBlockFieldAgg.java | 2 +-
.../solr/search/facet/UniqueBlockQueryAgg.java | 4 +-
.../solr/search/facet/UniqueMultiDvSlotAcc.java | 2 +-
.../search/facet/UniqueMultivaluedSlotAcc.java | 2 +-
.../search/facet/UniqueSinglevaluedSlotAcc.java | 2 +-
.../apache/solr/search/facet/UniqueSlotAcc.java | 4 +-
.../org/apache/solr/search/facet/VarianceAgg.java | 18 +-
.../org/apache/solr/search/join/XCJFQuery.java | 3 +-
.../ExternalRoleRuleBasedAuthorizationPlugin.java | 57 +
.../org/apache/solr/security/JWTAuthPlugin.java | 31 +-
.../org/apache/solr/security/JWTPrincipal.java | 4 +-
.../org/apache/solr/security/KerberosFilter.java | 2 +-
.../security/RuleBasedAuthorizationPlugin.java | 312 +----
....java => RuleBasedAuthorizationPluginBase.java} | 31 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 18 +-
.../apache/solr/servlet/SolrRequestParsers.java | 149 ++-
.../java/org/apache/solr/update/CommitTracker.java | 16 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 1277 ++++++++++----------
.../apache/solr/util/SolrFileCleaningTracker.java | 147 ---
.../java/org/apache/solr/util/SolrLogPostTool.java | 71 +-
.../org/apache/solr/TestDistributedSearch.java | 16 +-
.../test/org/apache/solr/TestGroupingSearch.java | 4 +-
.../solr/cloud/ChaosMonkeyShardSplitTest.java | 17 +-
.../org/apache/solr/cloud/ZkNodePropsTest.java | 4 +-
.../autoscaling/sim/TestSnapshotCloudManager.java | 17 +-
.../org/apache/solr/core/QueryResultKeyTest.java | 2 +-
.../org/apache/solr/handler/TestSQLHandler.java | 3 +-
.../solr/handler/admin/LukeRequestHandlerTest.java | 15 +
.../handler/admin/ZookeeperStatusHandlerTest.java | 35 +
.../test/org/apache/solr/request/TestFaceting.java | 6 +-
.../org/apache/solr/response/JSONWriterTest.java | 4 +-
.../apache/solr/search/SolrIndexSearcherTest.java | 296 +++--
.../solr/search/TestCollapseQParserPlugin.java | 29 +
.../org/apache/solr/search/facet/DebugAgg.java | 10 +-
.../solr/search/facet/TestCloudJSONFacetSKG.java | 278 +++--
.../search/facet/TestCloudJSONFacetSKGEquiv.java | 989 +++++++++++++++
.../solr/search/facet/TestJsonFacetRefinement.java | 2 +-
.../apache/solr/search/facet/TestJsonFacets.java | 105 +-
...a => BaseTestRuleBasedAuthorizationPlugin.java} | 251 ++--
.../apache/solr/security/JWTAuthPluginTest.java | 22 +-
.../solr/security/PrincipalWithUserRoles.java} | 69 +-
...stExternalRoleRuleBasedAuthorizationPlugin.java | 78 ++
.../org/apache/solr/util/SolrLogPostToolTest.java | 6 +-
solr/example/build.gradle | 2 +
solr/licenses/commons-fileupload-1.3.3.jar.sha1 | 1 -
solr/licenses/commons-fileupload-LICENSE-ASL.txt | 202 ----
solr/licenses/commons-fileupload-NOTICE.txt | 5 -
solr/packaging/build.gradle | 3 +-
solr/server/build.gradle | 2 +
solr/site/index.template.md | 37 +
solr/site/online-link.template.md | 19 +
solr/solr-ref-guide/build.gradle | 2 +
.../src/common-query-parameters.adoc | 40 +
.../src/jwt-authentication-plugin.adoc | 3 +-
.../src/rule-based-authorization-plugin.adoc | 63 +-
solr/solr-ref-guide/src/securing-solr.adoc | 1 +
solr/solrj/build.gradle | 2 +
.../impl/ConcurrentUpdateHttp2SolrClient.java | 2 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 67 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 46 +-
.../client/solrj/impl/SolrClientCloudManager.java | 18 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 23 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 4 +
.../solrj/io/eval/TimeDifferencingEvaluator.java | 96 +-
.../client/solrj/io/stream/ExecutorStream.java | 1 +
.../solr/client/solrj/io/stream/FacetStream.java | 73 +-
.../solr/client/solrj/io/stream/FetchStream.java | 1 +
.../solr/client/solrj/io/stream/StatsStream.java | 284 +++--
.../client/solrj/io/stream/TimeSeriesStream.java | 8 +-
.../solr/client/solrj/io/stream/TopicStream.java | 1 +
.../solrj/io/stream/metrics/PercentileMetric.java | 84 ++
.../client/solrj/io/stream/metrics/StdMetric.java | 93 ++
.../RequestReplicaListTransformerGenerator.java | 3 +-
.../solr/common/params/CollectionParams.java | 9 +
.../apache/solr/common/params/CommonParams.java | 4 +-
.../apache/solr/common/util/MapBackedCache.java | 4 +
.../client/solrj/impl/BasicHttpSolrClientTest.java | 45 +-
.../impl/Http2SolrClientCompatibilityTest.java | 7 +-
.../client/solrj/impl/Http2SolrClientTest.java | 41 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/stream/MathExpressionTest.java | 60 +-
.../solrj/io/stream/StreamDecoratorTest.java | 17 +-
.../solrj/io/stream/StreamExpressionTest.java | 289 ++++-
...RequestReplicaListTransformerGeneratorTest.java | 17 +-
.../solr/common/params/CommonParamsTest.java | 2 +-
solr/test-framework/build.gradle | 3 +-
solr/webapp/build.gradle | 2 +
versions.lock | 3 +-
versions.props | 1 -
257 files changed, 7841 insertions(+), 5977 deletions(-)