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/09/14 15:46:52 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-14749
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit aa78f69a9f8242cff99f3cfc11d6b8c502de0cce
Merge: 8dfff7a f92e265
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Sep 14 14:25:24 2020 +0200
Merge branch 'master' into jira/solr-14749
README.md | 22 +-
build.gradle | 4 +
gradle/defaults-java.gradle | 5 +-
gradle/defaults.gradle | 12 +
gradle/hacks/findbugs.gradle | 5 +-
.../hacks/gradle-archives.gradle | 20 +-
gradle/help.gradle | 3 +
gradle/testing/randomization/policies/tests.policy | 3 +
gradle/validation/ecj-lint.gradle | 7 +-
gradle/validation/error-prone.gradle | 149 +++
gradle/validation/forbidden-apis.gradle | 3 -
gradle/validation/forbidden-apis/defaults.all.txt | 4 +
gradle/validation/gradlew-scripts-tweaked.gradle | 6 +-
gradle/validation/jar-checks.gradle | 11 +-
gradle/validation/precommit.gradle | 5 +-
gradle/validation/validate-log-calls.gradle | 15 +-
gradle/validation/validate-source-patterns.gradle | 159 ++-
help/ant.txt | 2 +-
help/workflow.txt | 3 +-
lucene/BUILD.md | 47 +-
lucene/CHANGES.txt | 40 +-
.../codecs/lucene60/Lucene60PointsWriter.java | 23 +-
.../codecs/lucene60/TestLucene60PointsFormat.java | 4 +-
.../blocktreeords/OrdsBlockTreeTermsWriter.java | 4 +-
.../codecs/bloom/BloomFilteringPostingsFormat.java | 2 +-
.../codecs/simpletext/SimpleTextBKDWriter.java | 344 +++---
.../codecs/simpletext/SimpleTextPointsWriter.java | 12 +-
.../simpletext/SimpleTextStoredFieldsWriter.java | 9 +-
.../simpletext/SimpleTextTermVectorsReader.java | 4 +-
.../simpletext/SimpleTextTermVectorsWriter.java | 9 +-
.../TestSimpleTextTermVectorsFormat.java | 4 +
.../java/org/apache/lucene/analysis/Analyzer.java | 10 +-
.../org/apache/lucene/analysis/CharArrayMap.java | 1 +
.../org/apache/lucene/codecs/CompoundFormat.java | 8 +-
.../apache/lucene/codecs/StoredFieldsWriter.java | 3 +-
.../apache/lucene/codecs/TermVectorsWriter.java | 3 +-
.../codecs/blocktree/BlockTreeTermsWriter.java | 4 +-
.../codecs/blocktree/CompressionAlgorithm.java | 2 +-
.../compressing/CompressingStoredFieldsWriter.java | 7 +-
.../compressing/CompressingTermVectorsWriter.java | 16 +-
.../lucene/codecs/compressing/CompressionMode.java | 2 +-
.../apache/lucene/codecs/lucene80/IndexedDISI.java | 4 +-
.../codecs/lucene80/Lucene80DocValuesProducer.java | 4 +-
.../codecs/lucene86/Lucene86PointsWriter.java | 23 +-
.../codecs/lucene87/BugfixDeflater_JDK8252739.java | 110 ++
.../DeflateWithPresetDictCompressionMode.java | 226 ++++
.../lucene87/LZ4WithPresetDictCompressionMode.java | 199 +++
.../lucene87/Lucene87StoredFieldsFormat.java | 221 +---
.../codecs/perfield/PerFieldDocValuesFormat.java | 2 +-
.../lucene/codecs/perfield/PerFieldMergeState.java | 2 +-
.../codecs/perfield/PerFieldPostingsFormat.java | 2 +-
.../apache/lucene/index/BinaryDocValuesWriter.java | 68 +-
.../org/apache/lucene/index/ByteSliceWriter.java | 7 +-
.../apache/lucene/index/DefaultIndexingChain.java | 117 +-
.../java/org/apache/lucene/index/DocConsumer.java | 3 +-
.../java/org/apache/lucene/index/DocIDMerger.java | 2 +-
.../org/apache/lucene/index/DocValuesUpdate.java | 30 +-
.../lucene/index/DocumentsWriterDeleteQueue.java | 19 +-
.../lucene/index/DocumentsWriterFlushControl.java | 7 +-
.../lucene/index/DocumentsWriterPerThread.java | 131 +-
.../lucene/index/DocumentsWriterPerThreadPool.java | 11 +-
.../org/apache/lucene/index/FilterLeafReader.java | 10 +-
.../org/apache/lucene/index/FilteredTermsEnum.java | 4 +-
.../apache/lucene/index/FreqProxTermsWriter.java | 528 +++++++-
.../org/apache/lucene/index/IndexFileDeleter.java | 3 +-
.../java/org/apache/lucene/index/IndexWriter.java | 5 +-
.../java/org/apache/lucene/index/MergePolicy.java | 2 +-
.../java/org/apache/lucene/index/MergeState.java | 6 +-
.../org/apache/lucene/index/NormValuesWriter.java | 4 +-
.../lucene/index/NumericDocValuesWriter.java | 72 +-
.../java/org/apache/lucene/index/PointValues.java | 6 +-
.../org/apache/lucene/index/PointValuesWriter.java | 6 +-
.../org/apache/lucene/index/ReadersAndUpdates.java | 2 +-
.../apache/lucene/index/SegmentCoreReaders.java | 1 -
.../java/org/apache/lucene/index/SegmentInfos.java | 6 +-
.../apache/lucene/index/SortedDocValuesWriter.java | 70 +-
.../lucene/index/SortedNumericDocValuesWriter.java | 70 +-
.../lucene/index/SortedSetDocValuesWriter.java | 77 +-
.../apache/lucene/index/SortingCodecReader.java | 513 ++++++++
.../org/apache/lucene/index/SortingLeafReader.java | 1267 --------------------
.../lucene/index/SortingStoredFieldsConsumer.java | 15 +-
.../lucene/index/SortingTermVectorsConsumer.java | 20 +-
.../apache/lucene/index/StoredFieldsConsumer.java | 31 +-
.../apache/lucene/index/TermVectorsConsumer.java | 35 +-
.../java/org/apache/lucene/index/TermsHash.java | 10 +-
.../apache/lucene/search/DoubleValuesSource.java | 44 +-
.../org/apache/lucene/search/FieldComparator.java | 330 +----
.../apache/lucene/search/FieldValueHitQueue.java | 35 +-
.../lucene/search/FilteringFieldComparator.java | 93 --
.../search/FilteringLeafFieldComparator.java | 39 -
.../lucene/search/FilteringNumericComparator.java | 52 -
.../search/FilteringNumericLeafComparator.java | 336 ------
.../org/apache/lucene/search/IndexSearcher.java | 2 +-
.../apache/lucene/search/LeafFieldComparator.java | 16 +
.../org/apache/lucene/search/LongValuesSource.java | 39 +-
.../lucene/search/MultiLeafFieldComparator.java | 11 +
.../src/java/org/apache/lucene/search/Sort.java | 2 +-
.../java/org/apache/lucene/search/SortField.java | 15 +-
.../lucene/search/SortedNumericSortField.java | 54 +-
.../apache/lucene/search/TopFieldCollector.java | 34 +-
.../lucene/search/comparators/DocComparator.java | 185 +++
.../search/comparators/DoubleComparator.java | 117 ++
.../lucene/search/comparators/FloatComparator.java | 117 ++
.../lucene/search/comparators/IntComparator.java | 119 ++
.../lucene/search/comparators/LongComparator.java | 119 ++
.../lucene/search/comparators/MinDocIterator.java | 66 +
.../search/comparators/NumericComparator.java | 253 ++++
.../lucene/search/comparators/package-info.java} | 19 +-
.../lucene/search/similarities/Similarity.java | 21 +-
.../org/apache/lucene/store/LockStressTest.java | 43 +-
.../org/apache/lucene/store/LockVerifyServer.java | 44 +-
.../apache/lucene/store/VerifyingLockFactory.java | 6 +-
.../java/org/apache/lucene/util/Accountable.java | 4 +
.../org/apache/lucene/util/AttributeFactory.java | 2 +-
.../java/org/apache/lucene/util/ByteBlockPool.java | 2 +-
.../src/java/org/apache/lucene/util/IOUtils.java | 2 +-
.../java/org/apache/lucene/util/IntBlockPool.java | 2 +-
.../src/java/org/apache/lucene/util/LongsRef.java | 4 +-
.../org/apache/lucene/util/RamUsageEstimator.java | 2 +-
.../java/org/apache/lucene/util/bkd/BKDConfig.java | 90 ++
.../apache/lucene/util/bkd/BKDRadixSelector.java | 205 ++--
.../java/org/apache/lucene/util/bkd/BKDReader.java | 184 ++-
.../java/org/apache/lucene/util/bkd/BKDWriter.java | 557 ++++-----
.../apache/lucene/util/bkd/HeapPointReader.java | 18 +-
.../apache/lucene/util/bkd/HeapPointWriter.java | 53 +-
.../lucene/util/bkd/MutablePointsReaderUtils.java | 41 +-
.../apache/lucene/util/bkd/OfflinePointReader.java | 36 +-
.../apache/lucene/util/bkd/OfflinePointWriter.java | 14 +-
.../java/org/apache/lucene/util/compress/LZ4.java | 82 +-
.../util/packed/AbstractBlockPackedWriter.java | 2 +-
.../org/apache/lucene/util/packed/PackedInts.java | 2 +-
.../lucene/codecs/TestCodecLoadingDeadlock.java | 4 -
.../codecs/lucene86/TestLucene86PointsFormat.java | 4 +-
...tLucene87StoredFieldsFormatHighCompression.java | 4 +
.../document/TestXYMultiPolygonShapeQueries.java | 21 +-
.../index/TestDocumentsWriterPerThreadPool.java | 2 -
.../lucene/index/TestFieldUpdatesBuffer.java | 24 +-
.../lucene/index/TestFlushByRamOrCountsPolicy.java | 2 +-
.../org/apache/lucene/index/TestIndexWriter.java | 4 +-
.../apache/lucene/index/TestIndexWriterConfig.java | 8 +-
.../lucene/index/TestIndexWriterOnJRECrash.java | 3 -
.../lucene/index/TestSortingCodecReader.java | 224 ++++
.../apache/lucene/index/TestTieredMergePolicy.java | 6 +-
.../lucene/search/TestDoubleValuesSource.java | 5 +
.../search/TestFieldSortOptimizationSkipping.java | 146 +++
.../lucene/search/TestLatLonPointQueries.java | 4 +-
.../apache/lucene/search/TestLongValuesSource.java | 6 +
.../org/apache/lucene/search/TestNeedsScores.java | 2 +-
.../org/apache/lucene/search/TestPointQueries.java | 8 +-
.../test/org/apache/lucene/search/TestSort.java | 24 +-
.../lucene/store/TestStressLockFactories.java | 104 ++
.../apache/lucene/util/bkd/Test2BBKDPoints.java | 8 +-
.../test/org/apache/lucene/util/bkd/TestBKD.java | 31 +-
.../lucene/util/bkd/TestBKDRadixSelector.java | 225 ++--
.../apache/lucene/util/bkd/TestBKDRadixSort.java | 112 +-
.../util/bkd/TestMutablePointsReaderUtils.java | 93 +-
.../apache/lucene/util/compress/LZ4TestCase.java | 81 +-
.../lucene/demo/facet/RangeFacetsExample.java | 2 +-
.../matchhighlight/FieldValueHighlighters.java | 139 +++
.../search/matchhighlight/MatchHighlighter.java | 308 +++++
.../matchhighlight/MatchRegionRetriever.java | 11 +-
.../lucene/search/matchhighlight/OffsetRange.java | 11 +
.../search/matchhighlight/PassageFormatter.java | 17 +-
.../search/matchhighlight/PassageSelector.java | 69 +-
.../search/matchhighlight/AnalyzerWithGaps.java} | 54 +-
.../lucene/search/matchhighlight/IndexBuilder.java | 105 ++
.../matchhighlight/TestMatchHighlighter.java | 466 +++++++
.../matchhighlight/TestMatchRegionRetriever.java | 326 +++--
.../search/matchhighlight/TestPassageSelector.java | 80 +-
.../search/join/ToParentBlockJoinSortField.java | 151 ++-
.../luke/models/commits/CommitsImplTest.java | 7 +-
.../idversion/VersionBlockTreeTermsWriter.java | 4 +-
.../IndexSortSortedNumericDocValuesRangeQuery.java | 4 +-
...tIndexSortSortedNumericDocValuesRangeQuery.java | 2 +-
.../lucene/spatial3d/geom/GeoExactCircle.java | 3 +-
.../asserting/AssertingStoredFieldsFormat.java | 10 +
.../asserting/AssertingTermVectorsFormat.java | 10 +
.../codecs/compressing/CompressingCodec.java | 4 +-
.../DeflateWithPresetCompressingCodec.java | 6 +-
...dec.java => LZ4WithPresetCompressingCodec.java} | 14 +-
.../codecs/cranky/CrankyStoredFieldsFormat.java | 12 +
.../codecs/cranky/CrankyTermVectorsFormat.java | 13 +
.../index/BaseTermVectorsFormatTestCase.java | 87 +-
.../java/org/apache/lucene/index/RandomCodec.java | 19 +-
.../lucene/search/BaseRangeFieldQueryTestCase.java | 6 +-
.../lucene/util/RunListenerPrintReproduceInfo.java | 14 +-
.../services/org.apache.lucene.codecs.Codec | 1 +
.../asserting/TestAssertingTermVectorsFormat.java | 7 +-
.../apache/lucene/util/TestReproduceMessage.java | 70 +-
.../util/TestReproduceMessageWithRepeated.java | 9 +-
settings.gradle | 4 +
solr/CHANGES.txt | 15 +
solr/README.md | 25 +-
solr/cloud-dev/cloud.sh | 23 +-
.../apache/solr/cloud/ZkSolrResourceLoader.java | 6 +
.../solr/cloud/api/collections/BackupCmd.java | 2 +-
.../solr/cloud/api/collections/RestoreCmd.java | 3 +-
.../src/java/org/apache/solr/core/ConfigSet.java | 13 +-
.../org/apache/solr/core/ConfigSetService.java | 3 +-
.../java/org/apache/solr/core/CoreContainer.java | 27 +-
.../src/java/org/apache/solr/core/SolrCore.java | 21 +-
.../src/java/org/apache/solr/core/SolrCores.java | 7 +-
.../org/apache/solr/core/SolrResourceLoader.java | 48 +-
.../core/backup/repository/BackupRepository.java | 4 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 2 +-
.../apache/solr/handler/ReplicationHandler.java | 5 +-
.../org/apache/solr/handler/SchemaHandler.java | 6 +-
.../org/apache/solr/handler/SolrConfigHandler.java | 2 +-
.../apache/solr/handler/admin/BackupCoreOp.java | 3 +-
.../solr/handler/admin/CollectionsHandler.java | 10 +-
.../solr/handler/admin/ContainerPluginsApi.java | 4 +-
.../apache/solr/handler/admin/RestoreCoreOp.java | 3 +-
.../org/apache/solr/metrics/SolrMetricManager.java | 46 +-
.../apache/solr/metrics/SolrMetricsContext.java | 4 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 14 +-
.../solr/response/GeoJSONResponseWriter.java | 7 -
.../apache/solr/response/JSONResponseWriter.java | 7 -
.../java/org/apache/solr/response/JSONWriter.java | 30 -
.../solr/response/PHPSerializedResponseWriter.java | 10 +-
.../org/apache/solr/response/SchemaXmlWriter.java | 5 -
.../solr/response/TabularResponseWriter.java | 7 -
.../apache/solr/response/TextResponseWriter.java | 11 +-
.../java/org/apache/solr/response/XMLWriter.java | 20 -
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../java/org/apache/solr/schema/SchemaManager.java | 4 +-
.../org/apache/solr/search/TermsQParserPlugin.java | 4 +-
.../apache/solr/search/facet/RelatednessAgg.java | 7 +-
.../apache/solr/search/stats/ExactStatsCache.java | 9 +-
.../ConfigurableInternodeAuthHadoopPlugin.java | 3 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 2 +-
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 37 +
.../org/apache/solr/cloud/hdfs/HdfsTestUtil.java | 19 +-
...oryFactory.java => DirectoryFactoriesTest.java} | 2 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 2 -
.../solr/search/TestReRankQParserPlugin.java | 20 +-
.../apache/solr/search/TestTermsQParserPlugin.java | 18 +-
solr/docker/Docker-FAQ.md | 320 +++++
solr/docker/Dockerfile | 75 ++
solr/docker/README.md | 275 +++++
solr/docker/build.gradle | 92 ++
solr/docker/docs/docker-compose.yml | 13 +
solr/docker/docs/docker-networking.md | 249 ++++
solr/docker/docs/precreate-collection.sh | 20 +
solr/docker/docs/set-heap.sh | 16 +
solr/docker/include/scripts/docker-entrypoint.sh | 31 +
solr/docker/include/scripts/init-var-solr | 61 +
solr/docker/include/scripts/oom_solr.sh | 38 +
solr/docker/include/scripts/precreate-core | 40 +
solr/docker/include/scripts/run-initdb | 28 +
solr/docker/include/scripts/solr-create | 66 +
solr/docker/include/scripts/solr-demo | 42 +
solr/docker/include/scripts/solr-fg | 56 +
solr/docker/include/scripts/solr-foreground | 15 +
solr/docker/include/scripts/solr-precreate | 27 +
solr/docker/include/scripts/start-local-solr | 21 +
solr/docker/include/scripts/stop-local-solr | 11 +
solr/docker/include/scripts/wait-for-solr.sh | 98 ++
solr/docker/include/scripts/wait-for-zookeeper.sh | 165 +++
solr/docker/package/Dockerfile.local-package | 3 +
solr/docker/package/Dockerfile.release-package | 74 ++
.../docker/package/build.gradle | 29 +-
solr/docker/tests/README.md | 6 +
solr/docker/tests/cases/create_bad_core/test.sh | 16 +
solr/docker/tests/cases/create_core/test.sh | 24 +
solr/docker/tests/cases/create_core_exec/test.sh | 26 +
.../cases/create_core_randomuser_rootgroup/test.sh | 30 +
solr/docker/tests/cases/demo-tini/test.sh | 25 +
solr/docker/tests/cases/demo/test.sh | 21 +
.../empty-varsolr-dir-ramdomuser-rootgroup/test.sh | 44 +
.../tests/cases/empty-varsolr-dir-solr/test.sh | 45 +
.../tests/cases/empty-varsolr-dir-user/test.sh | 42 +
.../empty-varsolr-vol-ramdomuser-rootgroup/test.sh | 42 +
.../cases/empty-varsolr-vol-solr-nocopy/test.sh | 47 +
.../tests/cases/empty-varsolr-vol-solr/test.sh | 41 +
.../tests/cases/empty-varsolr-vol-user/test.sh | 48 +
solr/docker/tests/cases/gosu/test.sh | 68 ++
solr/docker/tests/cases/initdb/test.sh | 50 +
solr/docker/tests/cases/precreate_core/test.sh | 24 +
.../precreate_core_randomuser_rootgroup/test.sh | 29 +
.../docker/tests/cases/test_log4j/bogus-log4j2.xml | 1 +
solr/docker/tests/cases/test_log4j/log4j2.xml | 76 ++
solr/docker/tests/cases/test_log4j/test.sh | 34 +
solr/docker/tests/cases/user_volume/test.sh | 68 ++
solr/docker/tests/cases/version/test.sh | 45 +
solr/docker/tests/shared.sh | 133 ++
solr/example/files/README.md | 72 +-
.../android-json-0.0.20131108.vaadin1.jar.sha1 | 1 -
solr/licenses/android-json-LICENSE-ASL.txt | 202 ----
solr/licenses/android-json-NOTICE.txt | 0
solr/licenses/jsoup-1.12.1.jar.sha1 | 1 -
solr/licenses/jsoup-LICENSE-MIT.txt | 21 -
solr/licenses/slf4j-simple-1.7.24.jar.sha1 | 1 -
solr/licenses/start.jar.sha1 | 1 -
solr/packaging/build.gradle | 104 +-
.../conf/velocity/README.md | 8 +-
.../src/json-faceting-domain-changes.adoc | 2 +-
.../src/major-changes-in-solr-9.adoc | 5 +-
solr/solr-ref-guide/src/meta-docs/publish.adoc | 25 +-
.../solrj/impl/HttpClientBuilderFactory.java | 3 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 3 +-
.../client/solrj/impl/Krb5HttpClientBuilder.java | 5 +-
.../PreemptiveBasicAuthClientBuilderFactory.java | 8 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 4 +-
.../solrj/request/CollectionAdminRequest.java | 22 +-
.../RequestReplicaListTransformerGenerator.java | 16 +-
.../org/apache/solr/common/params/FacetParams.java | 22 -
.../solr/common/util/JsonSchemaValidator.java | 26 +-
.../java/org/apache/solr/common/util/Utils.java | 13 -
.../solr/common/util/TestFastJavabinDecoder.java | 13 +-
versions.lock | 2 +-
versions.props | 1 +
311 files changed, 10447 insertions(+), 5166 deletions(-)