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/01/08 09:44:18 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-13579
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-13579
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 69313a9f8cf74780d6edfdcbad58d42cfd3bdd2c
Merge: 27ef7cc 9edb143
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Jan 7 14:30:23 2020 +0100
Merge branch 'master' into jira/solr-13579
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/releaseWizard.py | 31 +-
dev-tools/scripts/releaseWizard.yaml | 20 +-
lucene/CHANGES.txt | 50 ++-
.../lucene/analysis/ja/dict/UserDictionary.java | 2 +-
.../analysis/ja/dict/UserDictionaryTest.java | 12 +
.../org/apache/lucene/analysis/ja/userdict.txt | 4 +
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.4.0-cfs.zip | Bin 0 -> 15452 bytes
.../org/apache/lucene/index/index.8.4.0-nocfs.zip | Bin 0 -> 15471 bytes
.../test/org/apache/lucene/index/sorted.8.4.0.zip | Bin 0 -> 93321 bytes
.../lucene/codecs/uniformsplit/BlockHeader.java | 69 +--
.../lucene/codecs/uniformsplit/BlockLine.java | 14 +-
.../lucene/codecs/uniformsplit/BlockReader.java | 56 ++-
.../lucene/codecs/uniformsplit/BlockWriter.java | 28 +-
.../uniformsplit/DictionaryBrowserSupplier.java | 81 ----
.../lucene/codecs/uniformsplit/FSTDictionary.java | 141 +++---
.../lucene/codecs/uniformsplit/FieldMetadata.java | 148 +++---
.../codecs/uniformsplit/IndexDictionary.java | 30 +-
.../codecs/uniformsplit/IntersectBlockReader.java | 2 +-
.../codecs/uniformsplit/UniformSplitTerms.java | 6 +-
.../uniformsplit/UniformSplitTermsReader.java | 26 +-
.../uniformsplit/UniformSplitTermsWriter.java | 8 +-
.../uniformsplit/sharedterms/STBlockLine.java | 8 +-
.../uniformsplit/sharedterms/STBlockReader.java | 10 +-
.../uniformsplit/sharedterms/STBlockWriter.java | 9 +-
.../sharedterms/STIntersectBlockReader.java | 13 +-
.../sharedterms/STMergingBlockReader.java | 5 +-
.../sharedterms/STUniformSplitTerms.java | 4 +-
.../sharedterms/STUniformSplitTermsReader.java | 17 +-
.../sharedterms/STUniformSplitTermsWriter.java | 9 +-
.../codecs/uniformsplit/TestFSTDictionary.java | 10 +-
.../sharedterms/STBlockReaderTest.java | 16 +-
.../apache/lucene/codecs/DocValuesConsumer.java | 118 +++++
.../codecs/blocktree/BlockTreeTermsWriter.java | 14 +-
.../compressing/CompressingTermVectorsWriter.java | 14 +-
.../lucene/codecs/lucene84/package-info.java | 2 +-
.../java/org/apache/lucene/search/FuzzyQuery.java | 9 +-
.../org/apache/lucene/search/FuzzyTermsEnum.java | 18 +-
.../java/org/apache/lucene/search/WANDScorer.java | 44 +-
.../apache/lucene/TestMergeSchedulerExternal.java | 19 +-
.../lucene/index/TestConcurrentMergeScheduler.java | 16 +-
.../lucene/index/TestDirectoryReaderReopen.java | 15 +-
.../apache/lucene/index/TestIndexFileDeleter.java | 16 +-
.../org/apache/lucene/index/TestIndexWriter.java | 24 +-
.../apache/lucene/index/TestIndexWriterDelete.java | 24 +-
.../lucene/index/TestIndexWriterExceptions.java | 104 +----
.../lucene/index/TestIndexWriterOnDiskFull.java | 18 +-
.../lucene/index/TestIndexWriterOnVMError.java | 29 +-
.../apache/lucene/index/TestIndexWriterReader.java | 15 +-
.../lucene/index/TestIndexWriterWithThreads.java | 36 +-
.../TestPersistentSnapshotDeletionPolicy.java | 7 +-
.../org/apache/lucene/search/TestFuzzyQuery.java | 64 ++-
.../apache/lucene/util/packed/TestPackedInts.java | 2 +-
.../search/uhighlight/DefaultPassageFormatter.java | 10 +-
.../lucene/search/uhighlight/FieldHighlighter.java | 8 +-
.../search/uhighlight/LengthGoalBreakIterator.java | 149 +++---
.../uhighlight/LengthGoalBreakIteratorTest.java | 154 +++++--
.../uhighlight/TestDefaultPassageFormatter.java | 51 +++
.../search/uhighlight/TestUnifiedHighlighter.java | 2 +-
.../TestUnifiedHighlighterTermIntervals.java | 2 +-
.../uhighlight/TestUnifiedHighlighterTermVec.java | 12 +-
lucene/ivy-versions.properties | 2 +-
.../randomizedtesting-runner-2.7.5.jar.sha1 | 1 -
.../randomizedtesting-runner-2.7.6.jar.sha1 | 1 +
.../apache/lucene/document/TestLazyDocument.java | 3 +-
.../lucene/replicator/ReplicatorTestCase.java | 2 +-
.../lucene/search/spell/DirectSpellChecker.java | 24 +-
.../search/spell/TestDirectSpellChecker.java | 8 +
.../lucene/index/BaseFieldInfoFormatTestCase.java | 24 +-
.../index/BaseSegmentInfoFormatTestCase.java | 24 +-
.../org/apache/lucene/util/LuceneTestCase.java | 43 +-
.../apache/lucene/util/TestSecurityManager.java | 75 ++--
solr/CHANGES.txt | 100 ++++-
solr/bin/postlogs | 33 ++
solr/bin/solr | 37 +-
solr/bin/solr.cmd | 35 +-
solr/bin/solr.in.cmd | 33 +-
solr/bin/solr.in.sh | 31 +-
solr/common-build.xml | 7 +-
.../org/apache/solr/schema/ICUCollationField.java | 2 +-
.../client/solrj/embedded/JettySolrRunner.java | 4 +-
.../cloud/OverseerConfigSetMessageHandler.java | 25 +-
.../apache/solr/cloud/OverseerMessageHandler.java | 3 +-
.../apache/solr/cloud/OverseerSolrResponse.java | 53 ++-
.../apache/solr/cloud/OverseerTaskProcessor.java | 9 +-
.../OverseerCollectionMessageHandler.java | 4 +-
.../solr/cloud/autoscaling/sim/SimUtils.java | 51 ++-
.../java/org/apache/solr/handler/GraphHandler.java | 25 +-
.../org/apache/solr/handler/SolrConfigHandler.java | 11 +-
.../org/apache/solr/handler/StreamHandler.java | 82 +++-
.../solr/handler/admin/CollectionsHandler.java | 46 +-
.../solr/handler/admin/ConfigSetsHandler.java | 2 +-
.../solr/handler/component/QueryComponent.java | 7 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 7 +-
.../apache/solr/packagemanager/PackageManager.java | 42 +-
.../apache/solr/packagemanager/PackageUtils.java | 6 +-
.../apache/solr/parser/SolrQueryParserBase.java | 6 +-
.../org/apache/solr/pkg/PackagePluginHolder.java | 7 +-
.../org/apache/solr/request/json/RequestUtil.java | 74 +--
.../solr/schema/AbstractSpatialFieldType.java | 2 +-
.../org/apache/solr/schema/CollationField.java | 2 +-
.../org/apache/solr/schema/CurrencyFieldType.java | 8 +-
.../org/apache/solr/schema/DateRangeField.java | 2 +-
.../src/java/org/apache/solr/schema/EnumField.java | 4 +-
.../java/org/apache/solr/schema/EnumFieldType.java | 2 +-
.../src/java/org/apache/solr/schema/FieldType.java | 56 ++-
.../java/org/apache/solr/schema/LatLonType.java | 2 +-
.../java/org/apache/solr/schema/PointField.java | 7 +-
.../src/java/org/apache/solr/schema/PointType.java | 2 +-
.../src/java/org/apache/solr/schema/TextField.java | 2 +-
.../src/java/org/apache/solr/schema/TrieField.java | 4 +-
.../org/apache/solr/search/BoolQParserPlugin.java | 14 +-
.../apache/solr/security/AuditLoggerPlugin.java | 7 +-
.../solr/spelling/DirectSolrSpellChecker.java | 10 +
.../java/org/apache/solr/util/SolrLogPostTool.java | 500 +++++++++++++++++++++
.../src/test-files/runtimecode/expressible.jar.bin | Bin 0 -> 1977 bytes
solr/core/src/test-files/runtimecode/sig.txt | 9 +
.../test-files/solr/collection1/conf/schema12.xml | 16 +-
.../conf/solrconfig-analytics-query.xml | 5 +-
.../conf/solrconfig-cache-enable-disable.xml | 3 -
.../solr/collection1/conf/solrconfig-caching.xml | 6 +-
.../conf/solrconfig-collapseqparser.xml | 5 +-
.../collection1/conf/solrconfig-deeppaging.xml | 4 +-
.../conf/solrconfig-delaying-component.xml | 3 -
.../solr/collection1/conf/solrconfig-elevate.xml | 3 -
.../collection1/conf/solrconfig-managed-schema.xml | 3 -
.../solr/collection1/conf/solrconfig-minhash.xml | 5 +-
.../collection1/conf/solrconfig-plugcollector.xml | 5 +-
.../conf/solrconfig-sortingresponse.xml | 3 +-
.../solr/collection1/conf/solrconfig-spatial.xml | 2 +-
.../solr/collection1/conf/solrconfig-tlog.xml | 8 +-
.../solr/collection1/conf/solrconfig.xml | 6 +-
.../solr/collection1/conf/solrconfig_perf.xml | 3 -
.../solr/configsets/_default/conf/solrconfig.xml | 14 +-
.../exitable-directory/conf/solrconfig.xml | 8 +-
.../solr/configsets/xcjf/conf/solrconfig.xml | 6 +-
.../test/org/apache/hadoop/http/HttpServer2.java | 2 +-
.../solr/cloud/LegacyCloudClusterPropTest.java | 2 -
.../OverseerCollectionConfigSetProcessorTest.java | 2 +-
.../solr/cloud/OverseerSolrResponseTest.java | 79 ++++
...verseerSolrResponseUnsafeSerializationTest.java | 61 +++
.../apache/solr/cloud/OverseerTaskQueueTest.java | 5 +-
.../solr/cloud/SystemCollectionCompatTest.java | 16 +-
.../apache/solr/cloud/TestCloudConsistency.java | 4 +-
.../solr/cloud/TestTlogReplayVsRecovery.java | 251 +++++++++++
.../solr/cloud/autoscaling/sim/TestSimUtils.java | 95 ++++
.../highlight/TestPostingsSolrHighlighter.java | 2 +-
.../solr/highlight/TestUnifiedSolrHighlighter.java | 25 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 45 +-
.../org/apache/solr/search/FuzzySearchTest.java | 67 +++
.../org/apache/solr/search/QueryEqualityTest.java | 18 +
.../apache/solr/search/TestSolrQueryParser.java | 97 +++-
.../apache/solr/search/facet/TestJsonFacets.java | 28 +-
.../apache/solr/search/json/TestJsonRequest.java | 80 +++-
.../solr/spelling/DirectSolrSpellCheckerTest.java | 57 ++-
.../org/apache/solr/util/SolrLogPostToolTest.java | 258 +++++++++++
solr/licenses/junit4-ant-2.7.5.jar.sha1 | 1 -
solr/licenses/junit4-ant-2.7.6.jar.sha1 | 1 +
.../randomizedtesting-runner-2.7.5.jar.sha1 | 1 -
.../randomizedtesting-runner-2.7.6.jar.sha1 | 1 +
solr/server/etc/jetty-http.xml | 5 +-
solr/server/etc/jetty-https.xml | 9 +-
solr/server/etc/jetty-https8.xml | 5 +-
solr/server/etc/jetty-requestlog.xml | 43 ++
solr/server/etc/jetty-ssl.xml | 6 +-
solr/server/etc/jetty.xml | 52 +--
.../server/etc/security.policy | 55 ++-
solr/server/etc/security.properties | 24 +
solr/server/modules/requestlog.mod | 9 +
solr/server/scripts/cloud-scripts/zkcli.bat | 6 +-
solr/server/scripts/cloud-scripts/zkcli.sh | 6 +-
.../solr/configsets/_default/conf/solrconfig.xml | 14 +-
.../conf/solrconfig.xml | 16 +-
solr/solr-ref-guide/build.xml | 2 +-
solr/solr-ref-guide/src/_config.yml.template | 2 +-
solr/solr-ref-guide/src/collection-management.adoc | 6 +
.../src/common-query-parameters.adoc | 2 +-
solr/solr-ref-guide/src/enabling-ssl.adoc | 37 +-
.../src/field-type-definitions-and-properties.adoc | 4 +-
.../src/getting-started-with-solrcloud.adoc | 5 +
solr/solr-ref-guide/src/highlighting.adoc | 8 +
.../collections-core-admin/collection-admin.png | Bin 60968 -> 153727 bytes
solr/solr-ref-guide/src/json-facet-api.adoc | 6 +-
.../src/major-changes-in-solr-8.adoc | 2 +-
.../src/major-changes-in-solr-9.adoc | 2 +-
.../src/making-and-restoring-backups.adoc | 3 +-
...onitoring-solr-with-prometheus-and-grafana.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 8 +-
solr/solr-ref-guide/src/package-manager.adoc | 89 ++--
.../src/requestdispatcher-in-solrconfig.adoc | 8 +-
solr/solr-ref-guide/src/securing-solr.adoc | 36 ++
.../src/solr-control-script-reference.adoc | 45 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 2 +-
solr/solr-ref-guide/src/spell-checking.adoc | 3 +-
.../src/taking-solr-to-production.adoc | 4 +
.../src/the-dismax-query-parser.adoc | 5 +-
.../src/the-extended-dismax-query-parser.adoc | 3 +-
.../src/the-standard-query-parser.adoc | 6 +-
.../org/apache/solr/client/solrj/SolrResponse.java | 14 +-
.../solr/client/solrj/embedded/SSLConfig.java | 21 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 9 +-
.../solrj/impl/SolrHttpRequestRetryHandler.java | 34 +-
.../solr/client/solrj/io/eval/ConcatEvaluator.java | 2 +-
.../solr/client/solrj/io/eval/DateEvaluator.java | 2 +-
.../solr/client/solrj/io/eval/DbscanEvaluator.java | 2 +-
.../io/eval/EmpiricalDistributionEvaluator.java | 2 +-
.../client/solrj/io/eval/MatchesEvaluator.java | 2 +-
.../solr/client/solrj/io/eval/PivotEvaluator.java | 2 +-
.../solr/client/solrj/io/sql/ConnectionImpl.java | 22 +-
.../client/solrj/io/stream/expr/StreamFactory.java | 121 ++---
.../apache/solr/common/params/HighlightParams.java | 2 +
.../java/org/apache/solr/common/util/Utils.java | 63 +--
.../apache/solr/client/solrj/StartSolrJetty.java | 11 +-
.../client/solrj/embedded/JettyWebappTest.java | 17 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 3 +-
.../apache/solr/client/solrj/io/sql/JdbcTest.java | 15 +-
.../java/org/apache/solr/util/SSLTestConfig.java | 4 +-
.../org/apache/solr/util/SolrSecurityManager.java | 95 ----
.../org/apache/solr/TestLogLevelAnnotations.java | 22 +-
solr/webapp/web/js/angular/app.js | 30 ++
solr/webapp/web/js/angular/controllers/index.js | 6 +-
223 files changed, 4198 insertions(+), 1577 deletions(-)