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/07/01 15:29:48 UTC
[lucene-solr] 04/11: Merge branch 'master' into jira/solr-12847-2
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-12847-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 17678f6cf16d728becdbce68860e3bad450bfcf9
Merge: 4b691ec 13bbe60
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Apr 27 12:10:28 2020 +0200
Merge branch 'master' into jira/solr-12847-2
.asf.yaml | 8 +-
build.gradle | 1 +
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/create_line_file_docs.py | 247 +++++++++++
gradle/help.gradle | 3 +-
gradle/validation/rat-sources.gradle | 1 +
gradle/validation/validate-log-calls.gradle | 308 +++++++++++++
help/validateLogCalls.txt | 57 +++
lucene/{BUILD.txt => BUILD.md} | 40 +-
lucene/CHANGES.txt | 59 ++-
...SION_MIGRATION.txt => JRE_VERSION_MIGRATION.md} | 6 +-
lucene/{MIGRATE.txt => MIGRATE.md} | 80 ++--
lucene/{README.txt => README.md} | 4 +-
...TEM_REQUIREMENTS.txt => SYSTEM_REQUIREMENTS.md} | 2 +-
.../lucene/index/TestBackwardsCompatibility.java | 33 +-
.../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
lucene/build.xml | 10 +-
.../simpletext/SimpleTextCompoundFormat.java | 31 +-
.../simpletext/TestSimpleTextCompoundFormat.java | 5 +
.../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 +--
.../document/LatLonShapeBoundingBoxQuery.java | 477 +++++++++++----------
.../apache/lucene/document/LatLonShapeQuery.java | 99 ++++-
.../org/apache/lucene/document/ShapeField.java | 34 ++
.../org/apache/lucene/document/ShapeQuery.java | 15 +-
.../org/apache/lucene/document/XYShapeQuery.java | 109 +++--
.../src/java/org/apache/lucene/geo/Circle2D.java | 169 ++++----
.../java/org/apache/lucene/geo/Component2D.java | 89 +++-
.../java/org/apache/lucene/geo/ComponentTree.java | 101 ++++-
.../src/java/org/apache/lucene/geo/Line2D.java | 84 ++--
.../src/java/org/apache/lucene/geo/Point2D.java | 45 +-
.../src/java/org/apache/lucene/geo/Polygon2D.java | 180 +++-----
.../java/org/apache/lucene/geo/Rectangle2D.java | 127 +++---
.../org/apache/lucene/index/BufferedUpdates.java | 26 +-
.../apache/lucene/index/BufferedUpdatesStream.java | 5 +-
.../lucene/index/ConcurrentMergeScheduler.java | 103 +++--
.../lucene/index/DocumentsWriterPerThread.java | 31 +-
.../apache/lucene/index/FrozenBufferedUpdates.java | 297 +------------
.../java/org/apache/lucene/index/IndexWriter.java | 391 +++++++++++++++--
.../java/org/apache/lucene/index/MergePolicy.java | 14 +-
.../org/apache/lucene/index/MergeScheduler.java | 42 +-
.../org/apache/lucene/index/NoMergeScheduler.java | 2 +-
.../org/apache/lucene/index/SegmentCommitInfo.java | 40 +-
.../apache/lucene/index/SegmentCoreReaders.java | 3 +-
.../java/org/apache/lucene/index/SegmentInfos.java | 38 +-
.../org/apache/lucene/index/SegmentReader.java | 8 +
.../apache/lucene/index/SerialMergeScheduler.java | 6 +-
.../org/apache/lucene/search/IndexSearcher.java | 8 +-
.../apache/lucene/search/TopFieldCollector.java | 4 +-
.../apache/lucene/search/TopScoreDocCollector.java | 4 +-
.../apache/lucene/store/BufferedIndexInput.java | 23 -
.../src/java/org/apache/lucene/util/Version.java | 14 +
.../apache/lucene/TestMergeSchedulerExternal.java | 20 +-
.../lucene/document/BaseShapeEncodingTestCase.java | 119 ++---
.../apache/lucene/document/BaseShapeTestCase.java | 95 ++++
.../lucene/document/BaseXYShapeTestCase.java | 4 +-
.../document/TestLatLonLineShapeQueries.java | 32 +-
.../document/TestLatLonPointShapeQueries.java | 14 +-
.../document/TestLatLonPolygonShapeQueries.java | 43 +-
.../apache/lucene/document/TestLatLonShape.java | 87 ++--
.../lucene/document/TestXYLineShapeQueries.java | 30 +-
.../lucene/document/TestXYPointShapeQueries.java | 16 +-
.../lucene/document/TestXYPolygonShapeQueries.java | 42 +-
.../test/org/apache/lucene/geo/TestCircle2D.java | 35 +-
.../src/test/org/apache/lucene/geo/TestLine2D.java | 22 +-
.../test/org/apache/lucene/geo/TestPoint2D.java | 23 +-
.../test/org/apache/lucene/geo/TestPolygon2D.java | 38 +-
.../org/apache/lucene/geo/TestRectangle2D.java | 64 ++-
.../apache/lucene/index/TestBufferedUpdates.java | 10 -
.../lucene/index/TestConcurrentMergeScheduler.java | 112 ++++-
.../src/test/org/apache/lucene/index/TestDoc.java | 2 +-
.../apache/lucene/index/TestForceMergeForever.java | 2 +-
.../apache/lucene/index/TestIndexFileDeleter.java | 4 +-
.../org/apache/lucene/index/TestIndexWriter.java | 86 +++-
.../lucene/index/TestIndexWriterMerging.java | 6 +-
.../index/TestIndexWriterThreadsToSegments.java | 2 +-
.../apache/lucene/index/TestNoMergeScheduler.java | 2 +-
.../index/TestOneMergeWrappingMergePolicy.java | 2 +-
.../apache/lucene/index/TestPendingDeletes.java | 6 +-
.../lucene/index/TestPendingSoftDeletes.java | 2 +-
.../org/apache/lucene/index/TestSegmentInfos.java | 39 +-
.../org/apache/lucene/index/TestSegmentMerger.java | 2 +-
.../index/TestTragicIndexWriterDeadlock.java | 6 +-
.../apache/lucene/search/TestSearcherManager.java | 4 +-
.../apache/lucene/search/TestTopDocsCollector.java | 59 ++-
.../lucene/search/TestTopFieldCollector.java | 58 ++-
.../lucene/store/TestBufferedIndexInput.java | 98 -----
.../lucene/demo/facet/DistanceFacetsExample.java | 5 +-
.../facet/ExpressionAggregationFacetsExample.java | 6 +-
.../lucene/expressions/ExpressionValueSource.java | 3 +-
.../apache/lucene/expressions/SimpleBindings.java | 97 ++---
.../lucene/expressions/TestDemoExpressions.java | 37 +-
.../lucene/expressions/TestExpressionRescorer.java | 6 +-
.../expressions/TestExpressionSortField.java | 21 +-
.../lucene/expressions/TestExpressionSorts.java | 20 +-
.../expressions/TestExpressionValidation.java | 14 +-
.../expressions/TestExpressionValueSource.java | 17 +-
.../apache/lucene/luke/models/util/IndexUtils.java | 6 +-
.../luke/models/overview/OverviewImplTest.java | 2 +-
.../org/apache/lucene/index/IndexSplitter.java | 2 +-
.../org/apache/lucene/monitor/MatchingQueries.java | 2 +-
.../lucene/monitor/MultiMatchingQueries.java | 2 +-
.../apache/lucene/replicator/nrt/PrimaryNode.java | 2 +-
.../idversion/TestIDVersionPostingsFormat.java | 2 +-
.../lucene/codecs/cranky/CrankyCompoundFormat.java | 3 +-
.../lucene/index/BaseCompoundFormatTestCase.java | 42 ++
.../lucene/index/BaseIndexFileFormatTestCase.java | 18 +-
.../lucene/index/BaseLiveDocsFormatTestCase.java | 4 +-
.../lucene/index/BaseMergePolicyTestCase.java | 12 +-
.../index/SuppressingConcurrentMergeScheduler.java | 6 +-
.../ThreadedIndexingAndSearchingTestCase.java | 41 +-
.../java/org/apache/lucene/util/LineFileDocs.java | 103 +++--
.../org/apache/lucene/util/LuceneTestCase.java | 2 +-
.../org/apache/lucene/util/europarl.lines.txt.gz | Bin 5730708 -> 9695474 bytes
.../org/apache/lucene/util/europarl.lines.txt.seek | 19 +
.../tools/src/groovy/check-source-patterns.groovy | 4 +-
solr/CHANGES.txt | 36 +-
solr/{README.txt => README.md} | 88 ++--
solr/bin/solr.in.cmd | 10 +-
solr/build.xml | 10 +-
solr/contrib/analysis-extras/README.md | 26 ++
solr/contrib/analysis-extras/README.txt | 23 -
.../apache/solr/analytics/facet/QueryFacet.java | 8 +-
.../apache/solr/analytics/facet/RangeFacet.java | 8 +-
.../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 +++
solr/contrib/clustering/{README.txt => README.md} | 0
.../dataimporthandler/{README.txt => README.md} | 3 +-
solr/contrib/extraction/{README.txt => README.md} | 1 +
.../{README.txt => README.md} | 1 +
solr/contrib/langid/{README.txt => README.md} | 2 +-
solr/contrib/ltr/README.md | 2 +-
solr/contrib/ltr/README.txt | 1 -
.../prometheus-exporter/{README.txt => README.md} | 2 +-
.../src/java/org/apache/solr/api/AnnotatedApi.java | 2 +-
solr/core/src/java/org/apache/solr/api/ApiBag.java | 2 +-
.../src/java/org/apache/solr/api/V2HttpCall.java | 2 +-
.../client/solrj/embedded/JettySolrRunner.java | 11 +-
.../solr/cloud/api/collections/AddReplicaCmd.java | 4 +-
.../apache/solr/cloud/api/collections/Assign.java | 15 +-
.../solr/cloud/api/collections/BackupCmd.java | 4 +-
.../cloud/api/collections/CategoryRoutedAlias.java | 4 +-
.../cloud/api/collections/CreateCollectionCmd.java | 59 +--
.../solr/cloud/api/collections/CreateShardCmd.java | 2 +-
.../cloud/api/collections/CreateSnapshotCmd.java | 20 +-
.../cloud/api/collections/DeleteReplicaCmd.java | 4 +-
.../solr/cloud/api/collections/DeleteShardCmd.java | 10 +-
.../cloud/api/collections/DeleteSnapshotCmd.java | 6 +-
.../api/collections/MaintainRoutedAliasCmd.java | 6 +-
.../solr/cloud/api/collections/MigrateCmd.java | 43 +-
.../solr/cloud/api/collections/MoveReplicaCmd.java | 16 +-
.../OverseerCollectionMessageHandler.java | 14 +-
.../api/collections/ReindexCollectionCmd.java | 44 +-
.../solr/cloud/api/collections/ReplaceNodeCmd.java | 20 +-
.../solr/cloud/api/collections/RestoreCmd.java | 18 +-
.../solr/cloud/api/collections/RoutedAlias.java | 2 +-
.../solr/cloud/api/collections/SplitShardCmd.java | 48 ++-
.../cloud/api/collections/TimeRoutedAlias.java | 12 +-
.../solr/cloud/api/collections/UtilizeNodeCmd.java | 10 +-
.../solr/cloud/autoscaling/ComputePlanAction.java | 12 +-
.../solr/cloud/autoscaling/ExecutePlanAction.java | 14 +-
.../cloud/autoscaling/HttpTriggerListener.java | 2 +-
.../autoscaling/InactiveMarkersPlanAction.java | 6 +-
.../cloud/autoscaling/InactiveShardPlanAction.java | 22 +-
.../solr/cloud/autoscaling/IndexSizeTrigger.java | 8 +-
.../solr/cloud/autoscaling/NodeAddedTrigger.java | 12 +-
.../solr/cloud/autoscaling/NodeLostTrigger.java | 6 +-
.../cloud/autoscaling/OverseerTriggerThread.java | 25 +-
.../solr/cloud/autoscaling/ScheduledTriggers.java | 48 ++-
.../solr/cloud/autoscaling/SearchRateTrigger.java | 16 +-
.../apache/solr/cloud/autoscaling/TriggerBase.java | 6 +-
.../solr/cloud/autoscaling/TriggerEventQueue.java | 10 +-
.../autoscaling/sim/GenericDistributedQueue.java | 6 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 20 +-
.../autoscaling/sim/SimClusterStateProvider.java | 78 ++--
.../autoscaling/sim/SimDistribStateManager.java | 4 +-
.../sim/SimDistributedQueueFactory.java | 4 +-
.../autoscaling/sim/SimNodeStateProvider.java | 21 +-
.../solr/cloud/autoscaling/sim/SimScenario.java | 42 +-
.../solr/cloud/autoscaling/sim/SimUtils.java | 4 +-
.../autoscaling/sim/SnapshotCloudManager.java | 2 +-
.../sim/SnapshotDistribStateManager.java | 8 +-
.../solr/cloud/overseer/ClusterStateMutator.java | 2 +-
.../solr/cloud/overseer/CollectionMutator.java | 6 +-
.../apache/solr/cloud/overseer/NodeMutator.java | 4 +-
.../apache/solr/cloud/overseer/ReplicaMutator.java | 38 +-
.../apache/solr/cloud/overseer/SliceMutator.java | 14 +-
.../apache/solr/cloud/overseer/ZkStateWriter.java | 4 +-
.../apache/solr/cloud/rule/ReplicaAssigner.java | 2 +-
.../java/org/apache/solr/core/BlobRepository.java | 4 +-
.../apache/solr/core/CachingDirectoryFactory.java | 32 +-
.../org/apache/solr/core/ConfigSetProperties.java | 4 +-
.../org/apache/solr/core/ConfigSetService.java | 2 +-
.../java/org/apache/solr/core/CoreContainer.java | 61 +--
.../apache/solr/core/CorePropertiesLocator.java | 14 +-
.../src/java/org/apache/solr/core/Diagnostics.java | 2 +-
.../org/apache/solr/core/DirectoryFactory.java | 2 +-
.../org/apache/solr/core/HdfsDirectoryFactory.java | 21 +-
.../src/java/org/apache/solr/core/PluginBag.java | 30 +-
.../org/apache/solr/core/QuerySenderListener.java | 2 +-
.../java/org/apache/solr/core/RequestHandlers.java | 6 +-
.../java/org/apache/solr/core/RequestParams.java | 8 +-
.../org/apache/solr/core/SchemaCodecFactory.java | 4 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 27 +-
.../src/java/org/apache/solr/core/SolrCore.java | 55 ++-
.../src/java/org/apache/solr/core/SolrCores.java | 4 +-
.../org/apache/solr/core/SolrDeletionPolicy.java | 12 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 5 +-
.../org/apache/solr/core/SolrResourceLoader.java | 31 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 4 +-
.../apache/solr/core/StandardDirectoryFactory.java | 2 +-
.../solr/core/TransientSolrCoreCacheDefault.java | 4 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 12 +-
.../src/java/org/apache/solr/core/ZkContainer.java | 27 +-
.../solr/core/snapshots/SolrSnapshotManager.java | 8 +-
.../snapshots/SolrSnapshotMetaDataManager.java | 10 +-
.../solr/core/snapshots/SolrSnapshotsTool.java | 15 +-
.../apache/solr/filestore/DistribPackageStore.java | 13 +-
.../org/apache/solr/filestore/PackageStoreAPI.java | 2 +-
.../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 | 72 +++-
.../solr/handler/component/ExpandComponent.java | 5 +-
.../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 | 4 +-
.../java/org/apache/solr/logging/LogWatcher.java | 8 +-
.../org/apache/solr/metrics/MetricSuppliers.java | 10 +-
.../java/org/apache/solr/metrics/MetricsMap.java | 2 +-
.../org/apache/solr/metrics/SolrMetricManager.java | 30 +-
.../apache/solr/metrics/SolrMetricReporter.java | 4 +-
.../metrics/reporters/ReporterClientCache.java | 4 +-
.../solr/metrics/reporters/SolrJmxReporter.java | 6 +-
.../metrics/reporters/jmx/JmxMetricsReporter.java | 18 +-
.../reporters/solr/SolrClusterReporter.java | 6 +-
.../solr/metrics/reporters/solr/SolrReporter.java | 10 +-
.../metrics/reporters/solr/SolrShardReporter.java | 14 +-
.../apache/solr/metrics/rrd/SolrRrdBackend.java | 2 +-
.../solr/metrics/rrd/SolrRrdBackendFactory.java | 20 +-
.../packagemanager/DefaultPackageRepository.java | 4 +-
.../apache/solr/packagemanager/PackageManager.java | 2 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 10 +-
.../org/apache/solr/pkg/PackagePluginHolder.java | 10 +-
.../java/org/apache/solr/request/SimpleFacets.java | 11 +-
.../org/apache/solr/request/SolrRequestInfo.java | 2 +-
.../apache/solr/response/BinaryResponseWriter.java | 2 +-
.../org/apache/solr/response/SchemaXmlWriter.java | 2 +-
.../java/org/apache/solr/response/XMLWriter.java | 4 +-
.../apache/solr/response/XSLTResponseWriter.java | 2 +-
.../java/org/apache/solr/rest/ManagedResource.java | 12 +-
.../apache/solr/rest/ManagedResourceStorage.java | 31 +-
.../src/java/org/apache/solr/rest/RestManager.java | 21 +-
.../analysis/ManagedSynonymFilterFactory.java | 4 +-
.../analysis/ManagedSynonymGraphFilterFactory.java | 4 +-
.../schema/analysis/ManagedWordSetResource.java | 7 +-
.../org/apache/solr/schema/AbstractEnumField.java | 5 +-
.../solr/schema/AbstractSpatialFieldType.java | 2 +-
.../schema/AbstractSpatialPrefixTreeFieldType.java | 4 +-
.../java/org/apache/solr/schema/BinaryField.java | 2 +-
.../src/java/org/apache/solr/schema/EnumField.java | 2 +-
.../solr/schema/ExternalFileFieldReloader.java | 4 +-
.../src/java/org/apache/solr/schema/FieldType.java | 2 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 24 +-
.../java/org/apache/solr/schema/IndexSchema.java | 45 +-
.../apache/solr/schema/JsonPreAnalyzedParser.java | 10 +-
.../org/apache/solr/schema/ManagedIndexSchema.java | 67 +--
.../solr/schema/ManagedIndexSchemaFactory.java | 49 +--
.../solr/schema/OpenExchangeRatesOrgProvider.java | 12 +-
.../java/org/apache/solr/schema/PointField.java | 4 +-
.../org/apache/solr/schema/PreAnalyzedField.java | 9 +-
.../java/org/apache/solr/schema/SchemaManager.java | 6 +-
.../src/java/org/apache/solr/schema/TrieField.java | 2 +-
.../apache/solr/schema/ZkIndexSchemaReader.java | 16 +-
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../java/org/apache/solr/search/DocSetUtil.java | 8 +-
.../src/java/org/apache/solr/search/Grouping.java | 5 +-
.../java/org/apache/solr/search/QueryUtils.java | 5 +-
.../java/org/apache/solr/search/ScoreFilter.java | 21 -
.../org/apache/solr/search/SolrIndexSearcher.java | 84 +---
.../apache/solr/search/SurroundQParserPlugin.java | 2 +-
.../org/apache/solr/search/facet/FacetHeatmap.java | 4 +-
.../apache/solr/search/facet/UnInvertedField.java | 4 +-
.../solr/search/function/FileFloatSource.java | 26 +-
.../solr/search/grouping/CommandHandler.java | 2 +-
.../search/join/ChildFieldValueSourceParser.java | 2 +-
.../solr/search/stats/ExactSharedStatsCache.java | 4 +-
.../apache/solr/search/stats/ExactStatsCache.java | 12 +-
.../apache/solr/search/stats/LRUStatsCache.java | 6 +-
.../org/apache/solr/search/stats/StatsUtil.java | 17 +-
.../apache/solr/security/AuditLoggerPlugin.java | 10 +-
.../apache/solr/security/AuthenticationPlugin.java | 20 +-
.../org/apache/solr/security/BasicAuthPlugin.java | 19 +-
.../org/apache/solr/security/HadoopAuthPlugin.java | 48 ++-
.../org/apache/solr/security/JWTAuthPlugin.java | 21 +-
.../solr/security/JWTVerificationkeyResolver.java | 6 +-
.../org/apache/solr/security/KerberosFilter.java | 4 +-
.../org/apache/solr/security/KerberosPlugin.java | 22 +-
.../solr/security/MultiDestinationAuditLogger.java | 6 +-
.../solr/security/PKIAuthenticationPlugin.java | 41 +-
.../security/RuleBasedAuthorizationPlugin.java | 34 +-
.../security/Sha256AuthenticationProvider.java | 2 +-
.../solr/security/SolrLogAuditLoggerPlugin.java | 4 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 12 +-
.../org/apache/solr/servlet/ResponseUtils.java | 2 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 29 +-
.../solr/spelling/DirectSolrSpellChecker.java | 4 +-
.../apache/solr/spelling/SpellCheckCollator.java | 2 +-
.../DocumentExpressionDictionaryFactory.java | 20 +-
.../solr/spelling/suggest/SolrSuggester.java | 26 +-
.../apache/solr/spelling/suggest/Suggester.java | 12 +-
.../suggest/jaspell/JaspellLookupFactory.java | 2 +-
.../org/apache/solr/store/hdfs/HdfsDirectory.java | 4 +-
.../solr/store/hdfs/HdfsLocalityReporter.java | 6 +-
.../org/apache/solr/update/CdcrTransactionLog.java | 6 +-
.../java/org/apache/solr/update/CdcrUpdateLog.java | 2 +-
.../java/org/apache/solr/update/CommitTracker.java | 4 +-
.../apache/solr/update/DefaultSolrCoreState.java | 4 +-
.../apache/solr/update/DirectUpdateHandler2.java | 25 +-
.../org/apache/solr/update/HdfsTransactionLog.java | 6 +-
.../java/org/apache/solr/update/HdfsUpdateLog.java | 18 +-
.../org/apache/solr/update/LoggingInfoStream.java | 4 +-
.../src/java/org/apache/solr/update/PeerSync.java | 60 ++-
.../org/apache/solr/update/PeerSyncWithLeader.java | 24 +-
.../org/apache/solr/update/SolrCmdDistributor.java | 11 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 28 +-
.../org/apache/solr/update/SolrIndexWriter.java | 12 +-
.../apache/solr/update/StreamingSolrClients.java | 2 +-
.../org/apache/solr/update/TransactionLog.java | 11 +-
.../java/org/apache/solr/update/UpdateHandler.java | 8 +-
.../src/java/org/apache/solr/update/UpdateLog.java | 79 ++--
.../org/apache/solr/update/UpdateShardHandler.java | 4 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 2 +-
...llValuesOrNoneFieldMutatingUpdateProcessor.java | 6 +-
.../processor/AtomicUpdateProcessorFactory.java | 4 +-
.../CloneFieldUpdateProcessorFactory.java | 6 +-
.../processor/DistributedUpdateProcessor.java | 83 ++--
.../processor/DistributedZkUpdateProcessor.java | 52 +--
.../DocBasedVersionConstraintsProcessor.java | 4 +-
...DocBasedVersionConstraintsProcessorFactory.java | 5 +-
.../DocExpirationUpdateProcessorFactory.java | 10 +-
.../FieldValueMutatingUpdateProcessor.java | 12 +-
.../processor/LogUpdateProcessorFactory.java | 26 +-
.../ParseDateFieldUpdateProcessorFactory.java | 6 +-
.../ParseDoubleFieldUpdateProcessorFactory.java | 6 +-
.../ParseFloatFieldUpdateProcessorFactory.java | 6 +-
.../ParseIntFieldUpdateProcessorFactory.java | 6 +-
.../ParseLongFieldUpdateProcessorFactory.java | 6 +-
.../update/processor/RegexpBoostProcessor.java | 12 +-
.../update/processor/TolerantUpdateProcessor.java | 2 +-
.../update/processor/URLClassifyProcessor.java | 4 +-
.../processor/UpdateRequestProcessorChain.java | 8 +-
.../src/java/org/apache/solr/util/FSHDFSUtils.java | 14 +-
.../src/java/org/apache/solr/util/PackageTool.java | 6 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 46 +-
.../org/apache/solr/util/StartupLoggingUtils.java | 3 +-
.../java/org/apache/solr/util/TestInjection.java | 2 +-
.../SSLCredentialProviderFactory.java | 4 +-
.../providers/HadoopSSLCredentialProvider.java | 2 +-
.../solr/util/plugin/AbstractPluginLoader.java | 8 +-
.../org/apache/solr/util/stats/MetricUtils.java | 4 +-
.../apache/solr/util/xslt/TransformerProvider.java | 13 +-
.../test/org/apache/solr/cloud/SyncSliceTest.java | 1 +
.../solr/cloud/TestAuthenticationFramework.java | 4 +-
.../org/apache/solr/cloud/TestUtilizeNode.java | 8 +-
.../solr/cloud/autoscaling/TestPolicyCloud.java | 8 +
.../cloud/autoscaling/sim/TestSimLargeCluster.java | 4 +
.../cloud/autoscaling/sim/TestSimPolicyCloud.java | 3 +
.../cloud/autoscaling/sim/TestSimScenario.java | 3 +
.../apache/solr/cloud/hdfs/HdfsSyncSliceTest.java | 2 -
.../solr/common/cloud/ZkDynamicConfigTest.java | 62 +++
.../handler/admin/ZookeeperStatusHandlerTest.java | 20 +-
.../apache/solr/schema/WrappedIntPointField.java | 20 +-
.../solr/security/MockAuthenticationPlugin.java | 25 +-
solr/example/{README.txt => README.md} | 63 ++-
solr/example/build.gradle | 2 +-
solr/example/example-DIH/{README.txt => README.md} | 32 +-
solr/example/files/{README.txt => README.md} | 85 ++--
solr/example/films/{README.txt => README.md} | 75 ++--
solr/packaging/build.gradle | 2 +-
solr/server/{README.txt => README.md} | 41 +-
solr/server/build.gradle | 2 +-
solr/server/solr/{README.txt => README.md} | 42 +-
.../clustering/carrot2/{README.txt => README.md} | 0
.../conf/velocity/{README.txt => README.md} | 21 +-
..._REQUIREMENTS.mdtext => SYSTEM_REQUIREMENTS.md} | 0
.../authentication-and-authorization-plugins.adoc | 2 +-
.../solr-ref-guide/src/command-line-utilities.adoc | 2 +-
solr/solr-ref-guide/src/filter-descriptions.adoc | 6 +-
.../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 +-
solr/solr-ref-guide/src/language-analysis.adoc | 18 +-
solr/solr-ref-guide/src/securing-solr.adoc | 4 +-
.../setting-up-an-external-zookeeper-ensemble.adoc | 2 +
solr/solr-ref-guide/src/solr-tutorial.adoc | 2 +-
.../src/solrcloud-autoscaling-overview.adoc | 21 +
solr/solr-ref-guide/src/tokenizers.adoc | 2 +-
.../org/apache/solr/client/solrj/SolrClient.java | 4 +-
.../client/solrj/cloud/autoscaling/Clause.java | 5 +-
.../client/solrj/cloud/autoscaling/Policy.java | 46 +-
.../client/solrj/cloud/autoscaling/Suggestion.java | 1 -
.../solrj/impl/SolrClientNodeStateProvider.java | 104 ++---
.../org/apache/solr/common/cloud/SolrZkClient.java | 25 ++
.../apache/solr/common/cloud/ZkDynamicConfig.java | 144 +++++++
.../autoscaling/testSuggestionsRebalance2.json | 3 +-
.../org/apache/solr/client/solrj/GetByIdTest.java | 27 +-
.../client/solrj/cloud/autoscaling/TestPolicy.java | 29 +-
.../apache/solr/common/cloud/SolrZkClientTest.java | 8 +-
solr/test-framework/{README.txt => README.md} | 0
solr/test-framework/build.xml | 2 +-
.../solr/core/MockConcurrentMergeScheduler.java | 3 +-
solr/webapp/web/js/angular/controllers/cloud.js | 5 +-
solr/webapp/web/partials/cloud.html | 3 +-
450 files changed, 6374 insertions(+), 3767 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
index 3915f80,8a3df78..997558b
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/Assign.java
@@@ -326,8 -326,9 +326,8 @@@ public class Assign
public static List<ReplicaPosition> getNodesForNewReplicas(ClusterState clusterState, String collectionName,
String shard, int nrtReplicas, int tlogReplicas, int pullReplicas,
Object createNodeSet, SolrCloudManager cloudManager) throws IOException, InterruptedException, AssignmentException {
- log.debug("getNodesForNewReplicas() shard: {} , nrtReplicas : {} , tlogReplicas: {} , pullReplicas: {} , createNodeSet {}", shard, nrtReplicas, tlogReplicas, pullReplicas, createNodeSet );
+ log.debug("getNodesForNewReplicas() shard: {} , nrtReplicas : {} , tlogReplicas: {} , pullReplicas: {} , createNodeSet {}", shard, nrtReplicas, tlogReplicas, pullReplicas, createNodeSet);
DocCollection coll = clusterState.getCollection(collectionName);
- Integer maxShardsPerNode = coll.getMaxShardsPerNode() == -1 ? Integer.MAX_VALUE : coll.getMaxShardsPerNode();
List<String> createNodeList = null;
if (createNodeSet instanceof List) {
diff --cc solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
index 8cc9734,182b66e..e28f264
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/CreateCollectionCmd.java
@@@ -371,15 -377,30 +374,14 @@@ public class CreateCollectionCmd implem
} else {
int totalNumReplicas = numNrtReplicas + numTlogReplicas + numPullReplicas;
if (totalNumReplicas > nodeList.size()) {
- log.warn("Specified number of replicas of "
- + totalNumReplicas
- + " on collection "
- + collectionName
- + " is higher than the number of Solr instances currently live or live and part of your " + OverseerCollectionMessageHandler.CREATE_NODE_SET + "("
- + nodeList.size()
- + "). It's unusual to run two replica of the same slice on the same Solr-instance.");
+ log.warn("Specified number of replicas of {} on collection {} is higher than the number of Solr instances currently live or live and part of your {}({}). {}"
+ , totalNumReplicas
+ , collectionName
+ , OverseerCollectionMessageHandler.CREATE_NODE_SET
+ , nodeList.size()
+ , "It's unusual to run two replica of the same slice on the same Solr-instance.");
}
- int maxShardsAllowedToCreate = maxShardsPerNode == Integer.MAX_VALUE ?
- Integer.MAX_VALUE :
- maxShardsPerNode * nodeList.size();
- int requestedShardsToCreate = numSlices * totalNumReplicas;
- if (maxShardsAllowedToCreate < requestedShardsToCreate) {
- throw new Assign.AssignmentException("Cannot create collection " + collectionName + ". Value of "
- + MAX_SHARDS_PER_NODE + " is " + maxShardsPerNode
- + ", and the number of nodes currently live or live and part of your "+OverseerCollectionMessageHandler.CREATE_NODE_SET+" is " + nodeList.size()
- + ". This allows a maximum of " + maxShardsAllowedToCreate
- + " to be created. Value of " + OverseerCollectionMessageHandler.NUM_SLICES + " is " + numSlices
- + ", value of " + NRT_REPLICAS + " is " + numNrtReplicas
- + ", value of " + TLOG_REPLICAS + " is " + numTlogReplicas
- + " and value of " + PULL_REPLICAS + " is " + numPullReplicas
- + ". This requires " + requestedShardsToCreate
- + " shards to be created (higher than the allowed number)");
- }
Assign.AssignRequest assignRequest = new Assign.AssignRequestBuilder()
.forCollection(collectionName)
.forShard(shardNames)
diff --cc solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
index 7d7d049,96d7704..5e0188c
--- a/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
+++ b/solr/core/src/test/org/apache/solr/cloud/TestUtilizeNode.java
@@@ -77,7 -77,8 +77,7 @@@ public class TestUtilizeNode extends So
CloudSolrClient cloudClient = cluster.getSolrClient();
log.info("Creating Collection...");
- CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(coll, "conf1", 2, REPLICATION);
- CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(coll, "conf1", 2, 2)
- .setMaxShardsPerNode(2);
++ CollectionAdminRequest.Create create = CollectionAdminRequest.createCollection(coll, "conf1", 2, 2);
cloudClient.request(create);
log.info("Spinning up additional jettyX...");