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/16 17:29:53 UTC
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-14275
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14275
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 81986e85be8b3c3e04476c77f7a6f1fcf3890702
Merge: d86e010 b24b028
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Apr 16 15:28:08 2020 +0200
Merge branch 'master' into jira/solr-14275
.gitattributes | 3 +
.github/workflows/gradle-precommit.yml | 2 +
.github/workflows/gradle-wrapper-validation.yml | 11 -
build.gradle | 23 +-
.../apache/lucene/gradle/WrapperDownloader.java | 129 ++++++
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
gradle/defaults-javadoc.gradle | 77 ----
.../intellij-idea.gradle} | 24 ++
gradle/jar-manifest.gradle | 82 ++++
gradle/render-javadoc.gradle | 287 ++++++++-----
gradle/testing/randomization.gradle | 9 -
gradle/validation/forbidden-apis/defaults.all.txt | 2 +-
gradle/validation/git-status.gradle | 39 +-
gradle/validation/jar-checks.gradle | 2 +-
gradle/validation/missing-docs-check.gradle | 4 +-
gradle/validation/precommit.gradle | 4 +
gradle/wrapper/gradle-wrapper.jar | Bin 55616 -> 58702 bytes
gradle/wrapper/gradle-wrapper.jar.sha256 | 1 +
gradle/wrapper/gradle-wrapper.jar.version | 1 +
gradlew | 10 +-
gradlew.bat | 9 +-
help/ant.txt | 2 +-
lucene/CHANGES.txt | 38 ++
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.5.1-cfs.zip | Bin 0 -> 15880 bytes
.../org/apache/lucene/index/index.8.5.1-nocfs.zip | Bin 0 -> 15872 bytes
.../test/org/apache/lucene/index/sorted.8.5.1.zip | Bin 0 -> 394412 bytes
.../simpletext/SimpleTextCompoundFormat.java | 31 +-
.../simpletext/TestSimpleTextCompoundFormat.java | 5 +
lucene/common-build.xml | 9 +-
.../apache/lucene/codecs/CompoundDirectory.java | 83 ++++
.../org/apache/lucene/codecs/CompoundFormat.java | 4 +-
.../lucene/codecs/MultiLevelSkipListReader.java | 8 +-
.../codecs/lucene50/Lucene50CompoundFormat.java | 3 +-
.../codecs/lucene50/Lucene50CompoundReader.java | 49 +--
.../codecs/perfield/PerFieldDocValuesFormat.java | 3 +
.../org/apache/lucene/index/BufferedUpdates.java | 35 +-
.../org/apache/lucene/index/DocumentsWriter.java | 191 ++++-----
.../lucene/index/DocumentsWriterDeleteQueue.java | 87 +++-
.../lucene/index/DocumentsWriterFlushControl.java | 438 ++++++++-----------
.../lucene/index/DocumentsWriterPerThread.java | 115 ++++-
.../lucene/index/DocumentsWriterPerThreadPool.java | 290 +++++--------
.../lucene/index/DocumentsWriterStallControl.java | 5 +-
.../lucene/index/FlushByRamOrCountsPolicy.java | 26 +-
.../java/org/apache/lucene/index/FlushPolicy.java | 38 +-
.../apache/lucene/index/FrozenBufferedUpdates.java | 4 +-
.../java/org/apache/lucene/index/IndexWriter.java | 59 +--
.../org/apache/lucene/index/IndexWriterConfig.java | 22 -
.../apache/lucene/index/LiveIndexWriterConfig.java | 16 -
.../org/apache/lucene/index/ReadersAndUpdates.java | 44 +-
.../apache/lucene/index/SegmentCoreReaders.java | 3 +-
.../org/apache/lucene/index/SegmentMerger.java | 2 +-
.../org/apache/lucene/index/SegmentReader.java | 8 +
.../search/ControlledRealTimeReopenThread.java | 18 +-
.../org/apache/lucene/search/IndexSearcher.java | 58 +--
.../lucene/search/QueueSizeBasedExecutor.java | 60 +++
.../org/apache/lucene/search/SliceExecutor.java | 80 ++++
.../apache/lucene/store/BufferedIndexInput.java | 226 ++++------
.../org/apache/lucene/store/NIOFSDirectory.java | 34 +-
.../src/java/org/apache/lucene/util/BitUtil.java | 128 +-----
.../src/java/org/apache/lucene/util/Version.java | 7 +
.../org/apache/lucene/util/fst/BitTableUtil.java | 172 ++++++++
.../src/java/org/apache/lucene/util/fst/FST.java | 353 ++++++---------
.../java/org/apache/lucene/util/fst/FSTEnum.java | 17 +-
.../java/org/apache/lucene/util/fst/NodeHash.java | 2 +-
.../src/java/org/apache/lucene/util/fst/Util.java | 19 +-
.../codecs/lucene60/TestLucene60PointsFormat.java | 11 +-
.../perfield/TestPerFieldDocValuesFormat.java | 40 +-
.../apache/lucene/index/TestBufferedUpdates.java | 57 +++
.../org/apache/lucene/index/TestFieldsReader.java | 6 +-
.../lucene/index/TestFlushByRamOrCountsPolicy.java | 82 ++--
.../org/apache/lucene/index/TestIndexWriter.java | 212 +++++++--
.../apache/lucene/index/TestIndexWriterConfig.java | 1 -
.../apache/lucene/index/TestIndexWriterDelete.java | 4 +-
.../lucene/index/TestIndexWriterOnDiskFull.java | 4 +-
.../index/TestIndexWriterThreadsToSegments.java | 2 +-
.../lucene/index/TestIndexWriterWithThreads.java | 2 +-
.../lucene/index/TestNumericDocValuesUpdates.java | 155 +++++++
.../search/TestControlledRealTimeReopenThread.java | 8 +-
.../apache/lucene/search/TestIndexSearcher.java | 94 +++-
.../lucene/store/TestBufferedIndexInput.java | 114 +----
.../test/org/apache/lucene/util/TestBitUtil.java | 87 ----
.../apache/lucene/util/fst/TestBitTableUtil.java | 138 ++++++
.../lucene/util/fst/TestFSTDirectAddressing.java | 85 +++-
lucene/ivy-versions.properties | 4 +-
.../jetty-continuation-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-continuation-9.4.27.v20200227.jar.sha1 | 1 +
.../licenses/jetty-http-9.4.24.v20191120.jar.sha1 | 1 -
.../licenses/jetty-http-9.4.27.v20200227.jar.sha1 | 1 +
lucene/licenses/jetty-io-9.4.24.v20191120.jar.sha1 | 1 -
lucene/licenses/jetty-io-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-server-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-server-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-servlet-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-servlet-9.4.27.v20200227.jar.sha1 | 1 +
.../licenses/jetty-util-9.4.24.v20191120.jar.sha1 | 1 -
.../licenses/jetty-util-9.4.27.v20200227.jar.sha1 | 1 +
.../java/org/apache/lucene/store/RAFDirectory.java | 18 +-
.../org/apache/lucene/store/WindowsDirectory.java | 5 +-
.../lucene/codecs/cranky/CrankyCompoundFormat.java | 3 +-
.../lucene/index/BaseCompoundFormatTestCase.java | 42 ++
.../lucene/index/BaseIndexFileFormatTestCase.java | 18 +-
.../org/apache/lucene/index/RandomIndexWriter.java | 4 +-
.../apache/lucene/store/MockDirectoryWrapper.java | 18 +-
lucene/tools/forbiddenApis/base.txt | 2 +-
solr/CHANGES.txt | 45 +-
solr/build.xml | 2 +-
.../apache/solr/analytics/facet/QueryFacet.java | 8 +-
.../apache/solr/analytics/facet/RangeFacet.java | 8 +-
.../stream/AnalyticsShardRequestManager.java | 4 +-
.../solr/analytics/util/OldAnalyticsParams.java | 34 +-
.../util/OldAnalyticsRequestConverter.java | 4 +-
.../analytics/legacy/facetWithDottedFields.txt | 16 +
.../solr/collection1/conf/schema-analytics.xml | 2 +
.../util/OldAnalyticsRequestConverterUnitTest.java | 64 +++
.../java/org/apache/solr/ltr/feature/Feature.java | 41 ++
.../solr/ltr/feature/OriginalScoreFeature.java | 23 +-
.../org/apache/solr/ltr/feature/SolrFeature.java | 201 +++------
...stOriginalScoreScorer.java => TestFeature.java} | 21 +-
.../collector/SchedulerMetricsCollector.java | 4 +-
.../solr/prometheus/exporter/SolrExporter.java | 6 +-
.../prometheus/scraper/SolrCloudScraperTest.java | 4 +-
.../scraper/SolrStandaloneScraperTest.java | 4 +-
.../src/java/org/apache/solr/api/V2HttpCall.java | 20 +-
.../client/solrj/embedded/JettySolrRunner.java | 4 +-
.../src/java/org/apache/solr/cloud/Overseer.java | 2 +-
.../apache/solr/cloud/OverseerTaskProcessor.java | 4 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 4 -
.../java/org/apache/solr/cloud/SyncStrategy.java | 34 +-
.../java/org/apache/solr/cloud/ZkController.java | 59 ++-
.../OverseerCollectionMessageHandler.java | 4 +-
.../cloud/autoscaling/OverseerTriggerThread.java | 9 +-
.../solr/cloud/autoscaling/ScheduledTriggers.java | 6 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 13 +-
.../autoscaling/sim/SimDistribStateManager.java | 4 +-
.../src/java/org/apache/solr/core/CloudConfig.java | 25 +-
.../java/org/apache/solr/core/CoreContainer.java | 11 +-
.../src/java/org/apache/solr/core/SolrCore.java | 7 +-
.../src/java/org/apache/solr/core/SolrCores.java | 4 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 3 -
.../src/java/org/apache/solr/core/ZkContainer.java | 20 +-
.../apache/solr/handler/CdcrReplicatorManager.java | 4 +-
.../solr/handler/CdcrReplicatorScheduler.java | 6 +-
.../apache/solr/handler/CdcrRequestHandler.java | 4 +-
.../solr/handler/CdcrUpdateLogSynchronizer.java | 4 +-
.../java/org/apache/solr/handler/IndexFetcher.java | 4 +-
.../apache/solr/handler/ReplicationHandler.java | 6 +-
.../org/apache/solr/handler/SolrConfigHandler.java | 4 +-
.../org/apache/solr/handler/StreamHandler.java | 14 +-
.../solr/handler/admin/CoreAdminHandler.java | 4 +-
.../solr/handler/admin/HealthCheckHandler.java | 76 +++-
.../solr/handler/admin/MetricsHistoryHandler.java | 4 +-
.../solr/handler/component/ExpandComponent.java | 13 +-
.../handler/component/HttpShardHandlerFactory.java | 20 +-
.../handler/component/IterativeMergeStrategy.java | 4 +-
.../solr/handler/tagger/TaggerRequestHandler.java | 111 +++--
.../org/apache/solr/logging/MDCLoggingContext.java | 78 ++--
.../org/apache/solr/metrics/SolrMetricManager.java | 5 +-
.../solr/metrics/rrd/SolrRrdBackendFactory.java | 4 +-
.../java/org/apache/solr/pkg/PackageListeners.java | 5 +-
.../java/org/apache/solr/request/SimpleFacets.java | 15 +-
.../apache/solr/request/SolrRequestHandler.java | 2 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 4 +-
.../java/org/apache/solr/search/CacheConfig.java | 8 +-
.../solr/search/CollapsingQParserPlugin.java | 477 +++++++++------------
.../java/org/apache/solr/search/DocSetUtil.java | 8 +-
.../src/java/org/apache/solr/search/Grouping.java | 11 +-
.../java/org/apache/solr/search/QueryUtils.java | 32 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 115 ++---
.../apache/solr/search/facet/AggValueSource.java | 2 +-
.../java/org/apache/solr/search/facet/AvgAgg.java | 2 +-
.../org/apache/solr/search/facet/CountAgg.java | 2 +-
.../org/apache/solr/search/facet/CountValsAgg.java | 2 +-
.../solr/search/facet/FacetFieldProcessor.java | 16 +-
.../search/facet/FacetFieldProcessorByHashDV.java | 24 +-
.../apache/solr/search/facet/FacetProcessor.java | 14 +-
.../org/apache/solr/search/facet/FacetRange.java | 2 +-
.../java/org/apache/solr/search/facet/HLLAgg.java | 2 +-
.../org/apache/solr/search/facet/MinMaxAgg.java | 2 +-
.../org/apache/solr/search/facet/MissingAgg.java | 2 +-
.../apache/solr/search/facet/PercentileAgg.java | 2 +-
.../apache/solr/search/facet/RelatednessAgg.java | 2 +-
.../java/org/apache/solr/search/facet/SlotAcc.java | 19 +-
.../org/apache/solr/search/facet/StddevAgg.java | 2 +-
.../java/org/apache/solr/search/facet/SumAgg.java | 2 +-
.../org/apache/solr/search/facet/SumsqAgg.java | 2 +-
.../apache/solr/search/facet/UnInvertedField.java | 2 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 2 +-
.../apache/solr/search/facet/UniqueBlockAgg.java | 2 +-
.../solr/search/facet/UniqueBlockFieldAgg.java | 2 +-
.../solr/search/facet/UniqueBlockQueryAgg.java | 2 +-
.../org/apache/solr/search/facet/VarianceAgg.java | 2 +-
.../solr/search/grouping/CommandHandler.java | 10 +-
.../apache/solr/security/AuditLoggerPlugin.java | 4 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 3 -
.../java/org/apache/solr/update/CommitTracker.java | 4 +-
.../src/java/org/apache/solr/update/PeerSync.java | 7 +-
.../org/apache/solr/update/PeerSyncWithLeader.java | 3 -
.../src/java/org/apache/solr/update/UpdateLog.java | 4 +-
.../org/apache/solr/update/UpdateShardHandler.java | 6 +-
.../DocExpirationUpdateProcessorFactory.java | 4 +-
.../src/java/org/apache/solr/util/DynamicMap.java | 55 +++
.../src/java/org/apache/solr/util/ExportTool.java | 5 +-
.../CountAgg.java => util/FloatConsumer.java} | 32 +-
.../org/apache/solr/util/IntFloatDynamicMap.java | 118 +++++
.../org/apache/solr/util/IntIntDynamicMap.java | 120 ++++++
.../org/apache/solr/util/IntLongDynamicMap.java | 120 ++++++
.../java/org/apache/solr/util/SolrLogPostTool.java | 19 +-
.../conf/solrconfig-cache-enable-disable.xml | 10 +
solr/core/src/test-files/solr/solr-jmxreporter.xml | 1 -
.../core/src/test-files/solr/solr-solrreporter.xml | 1 -
.../test-files/solr/solr-trackingshardhandler.xml | 1 -
solr/core/src/test-files/solr/solr.xml | 1 -
.../apache/solr/cloud/BasicDistributedZkTest.java | 4 +-
.../apache/solr/cloud/ConnectionManagerTest.java | 4 +-
.../apache/solr/cloud/DistributedQueueTest.java | 4 +-
.../org/apache/solr/cloud/LeaderElectionTest.java | 4 +-
.../test/org/apache/solr/cloud/OverseerTest.java | 9 +-
.../cloud/SharedFSAutoReplicaFailoverTest.java | 4 +-
.../cloud/TestStressCloudBlindAtomicUpdates.java | 4 +-
.../org/apache/solr/cloud/TestStressLiveNodes.java | 4 +-
.../cloud/TestWaitForStateWithJettyShutdowns.java | 4 +-
.../apache/solr/cloud/UnloadDistributedZkTest.java | 6 +-
.../org/apache/solr/cloud/ZkControllerTest.java | 9 +-
.../CollectionsAPIAsyncDistributedZkTest.java | 4 +-
.../AutoAddReplicasIntegrationTest.java | 6 +
.../autoscaling/sim/TestSimDistributedQueue.java | 4 +-
.../cloud/cdcr/CdcrReplicationHandlerTest.java | 4 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 6 +-
.../src/test/org/apache/solr/core/TestConfig.java | 26 +-
.../admin}/HealthCheckHandlerTest.java | 58 ++-
.../org/apache/solr/handler/tagger/TaggerTest.java | 18 +
.../apache/solr/schema/CurrencyFieldTypeTest.java | 94 ++--
.../apache/solr/schema/TestSortableTextField.java | 6 +-
.../solr/search/CurrencyRangeFacetCloudTest.java | 64 ++-
.../org/apache/solr/search/facet/DebugAgg.java | 10 +-
...stributedFacetSimpleRefinementLongTailTest.java | 14 +-
.../solr/search/facet/RangeFacetCloudTest.java | 14 +-
.../apache/solr/search/facet/TestJsonFacets.java | 58 +++
.../solr/search/facet/TestJsonRangeFacets.java | 38 ++
.../solr/security/AuditLoggerIntegrationTest.java | 6 +-
.../org/apache/solr/update/AddBlockUpdateTest.java | 6 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 18 +-
.../processor/RoutedAliasUpdateProcessorTest.java | 4 +-
.../processor/TestDocBasedVersionConstraints.java | 4 +-
.../test/org/apache/solr/util/DynamicMapsTest.java | 90 ++++
.../org/apache/solr/util/SolrLogPostToolTest.java | 20 +
.../http2-client-9.4.24.v20191120.jar.sha1 | 1 -
.../http2-client-9.4.27.v20200227.jar.sha1 | 1 +
.../http2-common-9.4.24.v20191120.jar.sha1 | 1 -
.../http2-common-9.4.27.v20200227.jar.sha1 | 1 +
.../licenses/http2-hpack-9.4.24.v20191120.jar.sha1 | 1 -
.../licenses/http2-hpack-9.4.27.v20200227.jar.sha1 | 1 +
...http-client-transport-9.4.24.v20191120.jar.sha1 | 1 -
...http-client-transport-9.4.27.v20200227.jar.sha1 | 1 +
.../http2-server-9.4.24.v20191120.jar.sha1 | 1 -
.../http2-server-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-alpn-client-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-alpn-client-9.4.27.v20200227.jar.sha1 | 1 +
...etty-alpn-java-client-9.4.24.v20191120.jar.sha1 | 1 -
...etty-alpn-java-client-9.4.27.v20200227.jar.sha1 | 1 +
...etty-alpn-java-server-9.4.24.v20191120.jar.sha1 | 1 -
...etty-alpn-java-server-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-alpn-server-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-alpn-server-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-client-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-client-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-continuation-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-continuation-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-deploy-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-deploy-9.4.27.v20200227.jar.sha1 | 1 +
solr/licenses/jetty-http-9.4.24.v20191120.jar.sha1 | 1 -
solr/licenses/jetty-http-9.4.27.v20200227.jar.sha1 | 1 +
solr/licenses/jetty-io-9.4.24.v20191120.jar.sha1 | 1 -
solr/licenses/jetty-io-9.4.27.v20200227.jar.sha1 | 1 +
solr/licenses/jetty-jmx-9.4.24.v20191120.jar.sha1 | 1 -
solr/licenses/jetty-jmx-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-rewrite-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-rewrite-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-security-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-security-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-server-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-server-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-servlet-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-servlet-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-servlets-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-servlets-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-start-9.4.24.v20191120-shaded.jar.sha1 | 1 -
.../jetty-start-9.4.27.v20200227-shaded.jar.sha1 | 1 +
solr/licenses/jetty-util-9.4.24.v20191120.jar.sha1 | 1 -
solr/licenses/jetty-util-9.4.27.v20200227.jar.sha1 | 1 +
.../jetty-webapp-9.4.24.v20191120.jar.sha1 | 1 -
.../jetty-webapp-9.4.27.v20200227.jar.sha1 | 1 +
solr/licenses/jetty-xml-9.4.24.v20191120.jar.sha1 | 1 -
solr/licenses/jetty-xml-9.4.27.v20200227.jar.sha1 | 1 +
solr/licenses/metrics-core-4.1.2.jar.sha1 | 1 -
solr/licenses/metrics-core-4.1.5.jar.sha1 | 1 +
solr/licenses/metrics-graphite-4.1.2.jar.sha1 | 1 -
solr/licenses/metrics-graphite-4.1.5.jar.sha1 | 1 +
solr/licenses/metrics-jetty9-4.1.2.jar.sha1 | 1 -
solr/licenses/metrics-jetty9-4.1.5.jar.sha1 | 1 +
solr/licenses/metrics-jmx-4.1.2.jar.sha1 | 1 -
solr/licenses/metrics-jmx-4.1.5.jar.sha1 | 1 +
solr/licenses/metrics-jvm-4.1.2.jar.sha1 | 1 -
solr/licenses/metrics-jvm-4.1.5.jar.sha1 | 1 +
solr/licenses/start.jar.sha1 | 2 +-
solr/packaging/build.gradle | 9 +
.../src/implicit-requesthandlers.adoc | 2 +
.../src/major-changes-in-solr-9.adoc | 5 +
.../src/solrcloud-autoscaling-triggers.adoc | 25 +-
.../client/solrj/impl/BaseCloudSolrClient.java | 4 +-
.../impl/ConcurrentUpdateHttp2SolrClient.java | 4 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 4 +-
.../solr/client/solrj/impl/Http2SolrClient.java | 4 +-
.../solr/client/solrj/impl/HttpSolrClient.java | 4 +-
.../solr/client/solrj/impl/LBSolrClient.java | 4 +-
.../client/solrj/io/graph/GatherNodesStream.java | 4 +-
.../client/solrj/io/graph/ShortestPathStream.java | 4 +-
.../client/solrj/io/stream/CloudSolrStream.java | 4 +-
.../solr/client/solrj/io/stream/DaemonStream.java | 4 +-
.../client/solrj/io/stream/DeepRandomStream.java | 4 +-
.../client/solrj/io/stream/ExecutorStream.java | 4 +-
.../solrj/io/stream/FeaturesSelectionStream.java | 4 +-
.../client/solrj/io/stream/ParallelListStream.java | 4 +-
.../solrj/io/stream/SignificantTermsStream.java | 4 +-
.../client/solrj/io/stream/TextLogitStream.java | 4 +-
.../solr/client/solrj/io/stream/TopicStream.java | 4 +-
.../org/apache/solr/common/cloud/SolrZkClient.java | 6 +-
.../apache/solr/common/cloud/ZkStateReader.java | 4 +-
.../org/apache/solr/common/util/ExecutorUtil.java | 2 +-
.../solr/common/util/SolrNamedThreadFactory.java} | 23 +-
.../solr/common/util/SolrjNamedThreadFactory.java | 49 ---
.../impl/ConcurrentUpdateHttp2SolrClientTest.java | 6 +-
.../solrj/impl/ConcurrentUpdateSolrClientTest.java | 6 +-
.../solrj/impl/HttpSolrClientConPoolTest.java | 4 +-
.../apache/solr/BaseDistributedSearchTestCase.java | 7 +-
.../src/java/org/apache/solr/SolrTestCaseHS.java | 45 ++
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 4 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 10 +-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 6 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 6 +-
solr/webapp/web/index.html | 4 +-
solr/webapp/web/libs/angular-chosen.min.js | 4 +-
versions.lock | 58 +--
versions.props | 6 +-
346 files changed, 4928 insertions(+), 3284 deletions(-)