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 2017/12/04 17:49:34 UTC
[50/50] lucene-solr:jira/solr-11458-2: Merge branch 'master' into
jira/solr-11458-2
Merge branch 'master' into jira/solr-11458-2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/47bd30f8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/47bd30f8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/47bd30f8
Branch: refs/heads/jira/solr-11458-2
Commit: 47bd30f8013357575c2b801b4c38fe0d706e532c
Parents: 91c9c6b bdaf1ba
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Dec 4 18:48:27 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Dec 4 18:48:27 2017 +0100
----------------------------------------------------------------------
lucene/CHANGES.txt | 96 ++-
lucene/MIGRATE.txt | 146 +---
.../lucene/benchmark/byTask/tasks/ReadTask.java | 9 +-
.../CompressingStoredFieldsIndexWriter.java | 2 +-
.../apache/lucene/document/RangeFieldQuery.java | 6 +-
.../SortedNumericDocValuesRangeQuery.java | 10 +-
.../document/SortedSetDocValuesRangeQuery.java | 5 +-
.../java/org/apache/lucene/index/DocValues.java | 12 +
.../apache/lucene/index/DocumentsWriter.java | 15 +
.../index/DocumentsWriterFlushControl.java | 88 ++-
.../org/apache/lucene/index/FieldInfos.java | 12 +-
.../org/apache/lucene/index/FlushPolicy.java | 27 +-
.../org/apache/lucene/index/IndexWriter.java | 31 +-
.../apache/lucene/index/IndexWriterConfig.java | 2 +-
.../lucene/index/LiveIndexWriterConfig.java | 3 +-
.../org/apache/lucene/index/LogMergePolicy.java | 4 +-
.../apache/lucene/index/ParallelLeafReader.java | 2 +-
.../java/org/apache/lucene/index/Sorter.java | 6 -
.../apache/lucene/index/TieredMergePolicy.java | 9 +-
.../lucene/search/Boolean2ScorerSupplier.java | 4 -
.../org/apache/lucene/search/BooleanScorer.java | 1 -
.../org/apache/lucene/search/BooleanWeight.java | 28 +-
.../apache/lucene/search/CachingCollector.java | 3 -
.../apache/lucene/search/ConjunctionScorer.java | 5 -
.../lucene/search/ConstantScoreQuery.java | 12 +-
.../lucene/search/ConstantScoreScorer.java | 5 -
.../lucene/search/DisjunctionMaxQuery.java | 19 +-
.../lucene/search/DisjunctionMaxScorer.java | 4 +-
.../apache/lucene/search/DisjunctionScorer.java | 10 -
.../search/DocValuesFieldExistsQuery.java | 7 +-
.../lucene/search/DocValuesRewriteMethod.java | 5 +-
.../org/apache/lucene/search/DoubleValues.java | 15 +
.../lucene/search/DoubleValuesSource.java | 231 ++++++-
.../EarlyTerminatingSortingCollector.java | 129 ----
.../apache/lucene/search/ExactPhraseScorer.java | 3 +-
.../org/apache/lucene/search/FakeScorer.java | 6 -
.../org/apache/lucene/search/FilterScorer.java | 5 -
.../org/apache/lucene/search/FilterWeight.java | 5 +-
.../lucene/search/IndexOrDocValuesQuery.java | 5 +-
.../org/apache/lucene/search/IndexSearcher.java | 51 +-
.../org/apache/lucene/search/LRUQueryCache.java | 96 ++-
.../apache/lucene/search/LongValuesSource.java | 102 ++-
.../apache/lucene/search/MatchAllDocsQuery.java | 5 +-
.../apache/lucene/search/MatchNoDocsQuery.java | 6 +-
.../lucene/search/MinShouldMatchSumScorer.java | 7 -
.../apache/lucene/search/MultiPhraseQuery.java | 6 +-
.../MultiTermQueryConstantScoreWrapper.java | 6 +-
.../lucene/search/NormsFieldExistsQuery.java | 5 +-
.../org/apache/lucene/search/PhraseQuery.java | 6 +-
.../apache/lucene/search/PointInSetQuery.java | 11 +-
.../apache/lucene/search/PointRangeQuery.java | 12 +-
.../java/org/apache/lucene/search/Query.java | 3 +-
.../org/apache/lucene/search/ReqExclScorer.java | 5 -
.../apache/lucene/search/ReqOptSumScorer.java | 7 -
.../java/org/apache/lucene/search/Scorer.java | 3 -
.../apache/lucene/search/SegmentCacheable.java | 44 ++
.../lucene/search/SloppyPhraseScorer.java | 7 +-
.../org/apache/lucene/search/SortRescorer.java | 2 +-
.../org/apache/lucene/search/SynonymQuery.java | 9 +-
.../apache/lucene/search/TermInSetQuery.java | 7 +-
.../org/apache/lucene/search/TermQuery.java | 7 +-
.../org/apache/lucene/search/TermScorer.java | 3 +-
.../apache/lucene/search/TopFieldCollector.java | 86 ++-
.../search/UsageTrackingQueryCachingPolicy.java | 2 +-
.../java/org/apache/lucene/search/Weight.java | 54 +-
.../org/apache/lucene/search/package-info.java | 6 -
.../search/similarities/BM25Similarity.java | 14 -
.../search/similarities/BooleanSimilarity.java | 10 -
.../search/similarities/ClassicSimilarity.java | 13 -
.../search/similarities/MultiSimilarity.java | 10 -
.../lucene/search/similarities/Similarity.java | 17 +-
.../search/similarities/SimilarityBase.java | 10 -
.../search/similarities/TFIDFSimilarity.java | 40 --
.../search/spans/SpanContainingQuery.java | 7 +-
.../lucene/search/spans/SpanNearQuery.java | 15 +-
.../lucene/search/spans/SpanNotQuery.java | 8 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 9 +-
.../search/spans/SpanPositionCheckQuery.java | 4 +-
.../apache/lucene/search/spans/SpanScorer.java | 8 +-
.../lucene/search/spans/SpanTermQuery.java | 5 +-
.../lucene/search/spans/SpanWithinQuery.java | 7 +-
.../org/apache/lucene/search/spans/Spans.java | 4 +-
.../apache/lucene/index/TestIndexSorting.java | 10 +-
.../apache/lucene/index/TestIndexWriter.java | 129 ++++
.../lucene/index/TestMaxTermFrequency.java | 11 +-
.../org/apache/lucene/index/TestOmitTf.java | 2 -
.../lucene/index/TestParallelLeafReader.java | 26 +
.../apache/lucene/search/JustCompileSearch.java | 10 +-
.../org/apache/lucene/search/TestBoolean2.java | 8 +-
.../search/TestBoolean2ScorerSupplier.java | 5 -
.../search/TestBooleanMinShouldMatch.java | 10 +-
.../search/TestBooleanQueryVisitSubscorers.java | 33 +-
.../apache/lucene/search/TestBooleanScorer.java | 4 +-
.../lucene/search/TestCachingCollector.java | 3 -
.../lucene/search/TestConjunctionDISI.java | 5 -
.../apache/lucene/search/TestConjunctions.java | 13 +-
.../lucene/search/TestDocValuesScoring.java | 11 -
.../lucene/search/TestDoubleValuesSource.java | 43 +-
.../TestEarlyTerminatingSortingCollector.java | 246 -------
.../lucene/search/TestElevationComparator.java | 2 +-
.../apache/lucene/search/TestLRUQueryCache.java | 122 ++--
.../lucene/search/TestMinShouldMatch2.java | 11 +-
.../search/TestPositiveScoresOnlyCollector.java | 4 -
.../apache/lucene/search/TestQueryRescorer.java | 9 +-
.../search/TestScoreCachingWrappingScorer.java | 4 -
.../apache/lucene/search/TestScorerPerf.java | 4 +-
.../lucene/search/TestSegmentCacheables.java | 103 +++
.../apache/lucene/search/TestSimilarity.java | 7 +-
.../lucene/search/TestSimilarityProvider.java | 21 +-
.../lucene/search/TestSloppyPhraseQuery.java | 13 +-
.../apache/lucene/search/TestSortRandom.java | 4 +-
.../apache/lucene/search/TestSortRescorer.java | 37 +
.../lucene/search/TestSubScorerFreqs.java | 51 +-
.../apache/lucene/search/TestTopDocsMerge.java | 4 +-
.../lucene/search/TestTopFieldCollector.java | 19 +-
.../TestTopFieldCollectorEarlyTermination.java | 213 ++++++
.../TestUsageTrackingFilterCachingPolicy.java | 6 +-
.../apache/lucene/search/spans/TestBasics.java | 10 +-
.../apache/lucene/search/spans/TestSpans.java | 42 --
.../expressions/ExpressionValueSource.java | 32 +-
.../apache/lucene/expressions/FakeScorer.java | 6 -
.../lucene/expressions/TestDemoExpressions.java | 11 +-
.../org/apache/lucene/facet/DrillSideways.java | 4 +-
.../apache/lucene/facet/DrillSidewaysQuery.java | 15 +-
.../lucene/facet/DrillSidewaysScorer.java | 5 -
.../apache/lucene/facet/FacetsCollector.java | 3 +-
.../apache/lucene/facet/range/DoubleRange.java | 5 +-
.../apache/lucene/facet/range/LongRange.java | 5 +-
.../apache/lucene/facet/TestDrillSideways.java | 4 +-
.../facet/range/TestRangeFacetCounts.java | 10 +
.../search/grouping/BlockGroupingCollector.java | 2 +-
.../lucene/search/grouping/FakeScorer.java | 6 -
.../search/grouping/TopGroupsCollector.java | 2 +-
.../search/join/BaseGlobalOrdinalScorer.java | 5 -
.../apache/lucene/search/join/FakeScorer.java | 6 -
.../lucene/search/join/GlobalOrdinalsQuery.java | 8 +-
.../join/ParentChildrenBlockJoinQuery.java | 10 +-
.../join/PointInSetIncludingScoreQuery.java | 11 +-
.../search/join/TermsIncludingScoreQuery.java | 10 +-
.../search/join/ToChildBlockJoinQuery.java | 8 -
.../search/join/ToParentBlockJoinQuery.java | 9 -
.../apache/lucene/search/join/TestJoinUtil.java | 25 +-
.../apache/lucene/index/memory/MemoryIndex.java | 2 +-
.../lucene/index/memory/TestMemoryIndex.java | 6 +
.../search/TestDiversifiedTopDocsCollector.java | 13 +-
.../apache/lucene/queries/BoostingQuery.java | 15 +-
.../apache/lucene/queries/CustomScoreQuery.java | 15 +-
.../lucene/queries/function/BoostedQuery.java | 4 +-
.../queries/function/FunctionMatchQuery.java | 9 +-
.../lucene/queries/function/FunctionQuery.java | 9 +-
.../queries/function/FunctionRangeQuery.java | 5 +-
.../queries/function/FunctionScoreQuery.java | 9 +-
.../queries/function/IndexReaderFunctions.java | 415 +++++++++++
.../lucene/queries/function/ValueSource.java | 39 +-
.../queries/function/ValueSourceScorer.java | 5 -
.../lucene/queries/payloads/PayloadDecoder.java | 37 +
.../queries/payloads/PayloadScoreQuery.java | 47 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 5 +-
.../lucene/queries/TestCustomScoreQuery.java | 24 +-
.../function/TestFunctionScoreExplanations.java | 9 +-
.../function/TestFunctionScoreQuery.java | 20 +
.../function/TestIndexReaderFunctions.java | 201 ++++++
.../payloads/TestPayloadExplanations.java | 17 +-
.../queries/payloads/TestPayloadScoreQuery.java | 40 +-
.../queries/payloads/TestPayloadTermQuery.java | 33 +-
.../xml/builders/BoostingTermBuilder.java | 8 +-
.../document/LatLonDocValuesBoxQuery.java | 7 +-
.../document/LatLonDocValuesDistanceQuery.java | 7 +-
.../document/LatLonPointDistanceQuery.java | 5 +-
.../document/LatLonPointInPolygonQuery.java | 19 +-
.../org/apache/lucene/search/CoveringQuery.java | 7 +-
.../apache/lucene/search/CoveringScorer.java | 6 -
.../lucene/search/DocValuesNumbersQuery.java | 6 +-
.../lucene/search/DocValuesTermsQuery.java | 5 +-
.../lucene/search/TermAutomatonQuery.java | 4 +-
.../lucene/search/TermAutomatonScorer.java | 10 +-
.../lucene/search/TestTermAutomatonQuery.java | 57 +-
.../lucene/spatial/ShapeValuesSource.java | 3 +-
.../spatial/bbox/BBoxSimilarityValueSource.java | 11 +
.../lucene/spatial/bbox/BBoxValueSource.java | 6 +
.../spatial/composite/CompositeVerifyQuery.java | 5 +-
.../composite/IntersectsRPTVerifyQuery.java | 6 +-
.../spatial/prefix/AbstractPrefixTreeQuery.java | 5 +-
.../serialized/SerializedDVStrategy.java | 11 +-
.../spatial/util/CachingDoubleValueSource.java | 11 +
.../util/DistanceToShapeValueSource.java | 11 +
.../util/ReciprocalDoubleValuesSource.java | 11 +
.../spatial/util/ShapeAreaValueSource.java | 11 +
.../ShapeFieldCacheDistanceValueSource.java | 11 +
.../spatial/util/ShapeValuesPredicate.java | 8 +-
.../spatial/vector/DistanceValueSource.java | 11 +
.../spatial/vector/PointVectorStrategy.java | 5 +-
.../spatial3d/PointInGeo3DShapeQuery.java | 16 +-
.../lucene/spatial3d/geom/GeoBBoxFactory.java | 15 +
.../lucene/spatial3d/geom/GeoBaseAreaShape.java | 2 +-
.../spatial3d/geom/GeoBaseDistanceShape.java | 20 +-
.../spatial3d/geom/GeoDegeneratePath.java | 6 +
.../lucene/spatial3d/geom/GeoDistance.java | 37 +-
.../lucene/spatial3d/geom/GeoExactCircle.java | 208 ++----
.../lucene/spatial3d/geom/GeoStandardPath.java | 117 +++-
.../lucene/spatial3d/geom/PlanetModel.java | 20 +-
.../lucene/spatial3d/geom/XYZSolidFactory.java | 12 +
.../lucene/spatial3d/geom/GeoCircleTest.java | 84 ---
.../spatial3d/geom/GeoExactCircleTest.java | 235 +++++++
.../lucene/spatial3d/geom/GeoPathTest.java | 4 +-
.../geom/RandomGeo3dShapeGenerator.java | 60 +-
.../analyzing/AnalyzingInfixSuggester.java | 10 +-
.../suggest/document/CompletionWeight.java | 10 +-
.../DocumentValueSourceDictionaryTest.java | 11 +
.../lucene/index/MockRandomMergePolicy.java | 4 +-
.../apache/lucene/index/RandomIndexWriter.java | 11 +
.../apache/lucene/search/AssertingScorer.java | 7 -
.../lucene/search/BulkScorerWrapperScorer.java | 8 -
.../org/apache/lucene/search/CheckHits.java | 45 +-
.../lucene/search/RandomApproximationQuery.java | 5 -
.../similarities/AssertingSimilarity.java | 32 -
.../search/spans/AssertingSpanWeight.java | 5 +-
.../org/apache/lucene/util/LuceneTestCase.java | 2 +-
solr/CHANGES.txt | 79 +++
.../TikaLanguageIdentifierUpdateProcessor.java | 18 +-
...dentifierUpdateProcessorFactoryTestCase.java | 13 +
solr/contrib/ltr/build.xml | 5 +
solr/contrib/ltr/ivy.xml | 5 +-
.../org/apache/solr/ltr/LTRScoringQuery.java | 25 +-
.../org/apache/solr/ltr/feature/Feature.java | 10 +-
.../solr/ltr/feature/OriginalScoreFeature.java | 5 -
.../solr/ltr/model/DefaultWrapperModel.java | 105 +++
.../org/apache/solr/ltr/model/WrapperModel.java | 169 +++++
.../solr/ltr/store/rest/ManagedModelStore.java | 35 +-
.../solr/collection1/conf/solrconfig-ltr.xml | 3 +
.../solr/ltr/model/TestDefaultWrapperModel.java | 145 ++++
.../apache/solr/ltr/model/TestWrapperModel.java | 290 ++++++++
.../store/rest/TestModelManagerPersistence.java | 76 ++
.../java/org/apache/solr/api/V2HttpCall.java | 11 +-
.../org/apache/solr/cloud/ActionThrottle.java | 11 +
.../org/apache/solr/cloud/AddReplicaCmd.java | 4 +-
.../src/java/org/apache/solr/cloud/Assign.java | 18 +-
.../org/apache/solr/cloud/CreateAliasCmd.java | 49 +-
.../apache/solr/cloud/CreateCollectionCmd.java | 2 +-
.../org/apache/solr/cloud/CreateShardCmd.java | 4 +-
.../org/apache/solr/cloud/DeleteAliasCmd.java | 40 +-
.../cloud/OverseerCollectionMessageHandler.java | 5 +-
.../java/org/apache/solr/cloud/RestoreCmd.java | 2 +-
.../org/apache/solr/cloud/SplitShardCmd.java | 4 +-
.../org/apache/solr/cloud/UtilizeNodeCmd.java | 116 ++++
.../cloud/autoscaling/AutoScalingHandler.java | 14 +
.../cloud/autoscaling/ScheduledTriggers.java | 144 ++--
.../apache/solr/cloud/rule/ReplicaAssigner.java | 47 +-
.../java/org/apache/solr/cloud/rule/Rule.java | 5 +-
.../solr/cloud/rule/ServerSnitchContext.java | 67 +-
.../java/org/apache/solr/core/SolrCores.java | 30 +-
.../apache/solr/handler/ReplicationHandler.java | 42 +-
.../org/apache/solr/handler/SnapShooter.java | 75 +-
.../apache/solr/handler/SolrConfigHandler.java | 2 +-
.../org/apache/solr/handler/StreamHandler.java | 12 +-
.../apache/solr/handler/admin/BackupCoreOp.java | 6 -
.../solr/handler/admin/CollectionsHandler.java | 7 +-
.../solr/handler/admin/LukeRequestHandler.java | 32 +-
.../solr/handler/component/ExpandComponent.java | 4 +-
.../solr/handler/component/QueryComponent.java | 5 -
.../org/apache/solr/legacy/BBoxValueSource.java | 7 +
.../apache/solr/legacy/DistanceValueSource.java | 12 +
.../solr/metrics/SolrCoreContainerReporter.java | 47 ++
.../apache/solr/metrics/SolrCoreReporter.java | 47 ++
.../apache/solr/metrics/SolrMetricManager.java | 10 +-
.../reporters/solr/SolrClusterReporter.java | 12 +-
.../reporters/solr/SolrShardReporter.java | 12 +-
.../apache/solr/parser/SolrQueryParserBase.java | 29 +-
.../org/apache/solr/query/SolrRangeQuery.java | 5 +-
.../org/apache/solr/schema/IndexSchema.java | 16 +-
.../solr/schema/LatLonPointSpatialField.java | 12 +
.../java/org/apache/solr/schema/LatLonType.java | 9 +-
.../schema/RptWithGeometrySpatialField.java | 5 +
.../EarlyTerminatingSortingCollector.java | 132 ++++
.../solr/search/ExtendedDismaxQParser.java | 90 +--
.../src/java/org/apache/solr/search/Filter.java | 6 +-
.../solr/search/FloatPayloadValueSource.java | 4 +-
.../apache/solr/search/FunctionRangeQuery.java | 1 +
.../solr/search/GraphTermsQParserPlugin.java | 9 +-
.../java/org/apache/solr/search/Grouping.java | 4 +-
.../apache/solr/search/JoinQParserPlugin.java | 5 +-
.../org/apache/solr/search/LuceneQParser.java | 1 +
.../apache/solr/search/NestedQParserPlugin.java | 5 +
.../solr/search/PayloadScoreQParserPlugin.java | 4 +-
.../java/org/apache/solr/search/QParser.java | 56 +-
.../org/apache/solr/search/ReRankCollector.java | 2 +-
.../solr/search/SolrConstantScoreQuery.java | 5 +-
.../apache/solr/search/SolrIndexSearcher.java | 12 +-
.../apache/solr/search/ValueSourceParser.java | 7 +-
.../apache/solr/search/facet/FacetField.java | 5 +
.../solr/search/facet/UnInvertedField.java | 12 +
.../distributed/command/QueryCommand.java | 2 +-
.../join/ChildFieldValueSourceParser.java | 4 +-
.../org/apache/solr/search/join/GraphQuery.java | 11 +-
.../PayloadScoringSimilarityWrapper.java | 80 ---
.../similarities/SchemaSimilarityFactory.java | 22 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 52 +-
.../solr/update/DeleteByQueryWrapper.java | 4 +-
.../solr/update/DirectUpdateHandler2.java | 2 +-
.../DistributedUpdateProcessorFactory.java | 26 +-
.../TimeRoutedAliasUpdateProcessor.java | 294 ++++++++
.../org/apache/solr/util/PayloadDecoder.java | 27 -
.../java/org/apache/solr/util/PayloadUtils.java | 6 +-
.../solrconfig.snippet.randomindexconfig.xml | 3 +
.../apache/solr/DisMaxRequestHandlerTest.java | 20 +
.../client/solrj/impl/ConnectionReuseTest.java | 1 -
.../apache/solr/cloud/ActionThrottleTest.java | 37 +-
.../org/apache/solr/cloud/AddReplicaTest.java | 2 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 217 +++++-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 1 -
...MonkeyNothingIsSafeWithPullReplicasTest.java | 1 -
.../apache/solr/cloud/HttpPartitionTest.java | 1 -
.../org/apache/solr/cloud/MoveReplicaTest.java | 10 +-
.../org/apache/solr/cloud/TestUtilizeNode.java | 116 ++++
.../autoscaling/AutoScalingHandlerTest.java | 112 ++-
.../autoscaling/TriggerIntegrationTest.java | 186 ++++-
.../cloud/cdcr/BaseCdcrDistributedZkTest.java | 1 -
.../solr/cloud/cdcr/CdcrBidirectionalTest.java | 2 +-
.../solr/cloud/rule/ImplicitSnitchTest.java | 6 +-
.../apache/solr/cloud/rule/RuleEngineTest.java | 33 +-
.../test/org/apache/solr/core/SOLR749Test.java | 19 +
.../org/apache/solr/core/TestLazyCores.java | 8 +
.../org/apache/solr/handler/TestCoreBackup.java | 61 ++
.../solr/handler/admin/TestCoreAdminApis.java | 2 +-
.../apache/solr/highlight/HighlighterTest.java | 2 +-
.../reporters/solr/SolrCloudReportersTest.java | 8 +
.../apache/solr/search/QueryEqualityTest.java | 4 +-
.../search/TestComplexPhraseQParserPlugin.java | 10 +
.../solr/search/TestExtendedDismaxParser.java | 36 +-
.../org/apache/solr/search/TestFiltering.java | 38 +-
.../org/apache/solr/search/TestQueryTypes.java | 2 +-
.../apache/solr/search/TestRankQueryPlugin.java | 5 -
.../test/org/apache/solr/search/TestSort.java | 2 +-
.../solr/security/BasicAuthIntegrationTest.java | 5 +-
.../solr/security/BasicAuthStandaloneTest.java | 6 +-
.../uninverting/TestFieldCacheSortRandom.java | 4 +-
.../apache/solr/update/CdcrUpdateLogTest.java | 4 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 275 ++++++++
.../UpdateRequestProcessorFactoryTest.java | 6 +-
.../conf/solrconfig.xml | 5 +-
solr/solr-ref-guide/build.xml | 5 +-
solr/solr-ref-guide/src/_config.yml.template | 2 +
solr/solr-ref-guide/src/about-this-guide.adoc | 33 +-
...adding-custom-plugins-in-solrcloud-mode.adoc | 72 +-
.../src/basic-authentication-plugin.adoc | 70 +-
solr/solr-ref-guide/src/blob-store-api.adoc | 20 +-
.../src/common-query-parameters.adoc | 20 +-
solr/solr-ref-guide/src/config-api.adoc | 2 +-
solr/solr-ref-guide/src/config-sets.adoc | 21 +-
solr/solr-ref-guide/src/content-streams.adoc | 34 +-
.../src/cross-data-center-replication-cdcr.adoc | 59 +-
solr/solr-ref-guide/src/css/customstyles.css | 9 +-
.../solr-ref-guide/src/css/lavish-bootstrap.css | 5 +-
solr/solr-ref-guide/src/css/ref-guide.css | 16 +-
solr/solr-ref-guide/src/css/theme-solr.css | 25 +-
.../solr-ref-guide/src/filter-descriptions.adoc | 4 +-
.../src/getting-started-with-solrcloud.adoc | 23 +-
solr/solr-ref-guide/src/installing-solr.adoc | 3 +-
solr/solr-ref-guide/src/js/customscripts.js | 121 +++-
solr/solr-ref-guide/src/json-facet-api.adoc | 461 +++++++++++++
solr/solr-ref-guide/src/json-request-api.adoc | 20 +-
solr/solr-ref-guide/src/learning-to-rank.adoc | 49 ++
.../src/major-changes-in-solr-7.adoc | 18 +
.../src/meta-docs/asciidoc-syntax.adoc | 46 +-
solr/solr-ref-guide/src/meta-docs/jekyll.adoc | 167 ++++-
solr/solr-ref-guide/src/ping.adoc | 8 +-
.../src/query-settings-in-solrconfig.adoc | 15 +-
solr/solr-ref-guide/src/realtime-get.adoc | 143 +++-
.../src/requestdispatcher-in-solrconfig.adoc | 30 +-
.../src/running-solr-on-hdfs.adoc | 40 +-
solr/solr-ref-guide/src/schema-api.adoc | 248 ++++++-
solr/solr-ref-guide/src/searching.adoc | 3 +-
.../src/solrcloud-autoscaling-api.adoc | 39 ++
.../transforming-and-indexing-custom-json.adoc | 688 +++++++++++++++++--
solr/solr-ref-guide/src/using-solrj.adoc | 22 +-
.../tools/CheckLinksAndAnchors.java | 167 ++++-
.../cloud/autoscaling/AutoScalingConfig.java | 39 +-
.../autoscaling/DelegatingCloudManager.java | 6 +
.../cloud/autoscaling/MoveReplicaSuggester.java | 6 +-
.../client/solrj/cloud/autoscaling/Policy.java | 5 +
.../solrj/cloud/autoscaling/PolicyHelper.java | 12 +-
.../cloud/autoscaling/SolrCloudManager.java | 3 +
.../solrj/cloud/autoscaling/Suggester.java | 16 +
.../solrj/cloud/autoscaling/Suggestion.java | 32 +-
.../solrj/cloud/autoscaling/Violation.java | 55 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 51 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 4 +-
.../solrj/impl/SolrClientCloudManager.java | 10 +
.../solrj/impl/SolrClientNodeStateProvider.java | 9 +-
.../io/eval/CanberraDistanceEvaluator.java | 56 --
.../solrj/io/eval/CorrelationEvaluator.java | 123 +++-
.../eval/CorrelationSignificanceEvaluator.java | 57 ++
.../client/solrj/io/eval/DistanceEvaluator.java | 154 +++++
.../io/eval/EarthMoversDistanceEvaluator.java | 56 --
.../io/eval/GeometricDistributionEvaluator.java | 44 ++
.../io/eval/KendallsCorrelationEvaluator.java | 57 --
.../io/eval/ManhattanDistanceEvaluator.java | 56 --
.../solr/client/solrj/io/eval/Matrix.java | 15 +
.../solrj/io/eval/NormalizeSumEvaluator.java | 84 +++
.../io/eval/PoissonDistributionEvaluator.java | 2 +-
.../solrj/io/eval/ProbabilityEvaluator.java | 68 +-
.../io/eval/SpearmansCorrelationEvaluator.java | 57 --
.../io/eval/TimeDifferencingEvaluator.java | 70 ++
.../solrj/request/CollectionAdminRequest.java | 13 +
.../solrj/request/CollectionApiMapping.java | 4 +
.../client/solrj/request/CoreApiMapping.java | 2 +-
.../solrj/request/GenericSolrRequest.java | 15 +-
.../org/apache/solr/common/cloud/Aliases.java | 216 ++++--
.../apache/solr/common/cloud/ZkStateReader.java | 209 ++++--
.../solr/common/cloud/rule/ImplicitSnitch.java | 19 +-
.../solr/common/cloud/rule/SnitchContext.java | 8 +-
.../solr/common/params/AutoScalingParams.java | 7 +
.../solr/common/params/CollectionParams.java | 1 +
.../apache/solr/common/util/MapBackedCache.java | 2 +-
.../apache/solr/common/util/ObjectCache.java | 91 +++
.../java/org/apache/solr/common/util/Utils.java | 33 +-
.../resources/apispec/autoscaling.Commands.json | 5 +
.../src/resources/apispec/cluster.Commands.json | 22 +
.../solrj/cloud/autoscaling/TestPolicy.java | 113 ++-
.../client/solrj/impl/CloudSolrClientTest.java | 12 +-
.../ConcurrentUpdateSolrClientBuilderTest.java | 8 +
.../solrj/io/stream/StreamExpressionTest.java | 462 +++++++++++--
.../java/org/apache/solr/SolrTestCaseJ4.java | 48 +-
.../cloud/AbstractFullDistribZkTestBase.java | 9 +-
solr/webapp/web/partials/index.html | 2 +-
425 files changed, 10876 insertions(+), 3800 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47bd30f8/solr/core/src/java/org/apache/solr/cloud/Assign.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47bd30f8/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
index 5be9a4d,8db306f..26f1709
--- a/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
+++ b/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionMessageHandler.java
@@@ -698,10 -698,10 +698,10 @@@ public class OverseerCollectionMessageH
if (result.size() == coreNames.size()) {
return result;
} else {
- log.debug("Expecting {} cores but found {}", coreNames.size(), result.size());
+ log.debug("Expecting {} cores but found {}", coreNames, result);
}
if (timeout.hasTimedOut()) {
- throw new SolrException(ErrorCode.SERVER_ERROR, "Timed out waiting to see all replicas: " + coreNames + " in cluster state.");
+ throw new SolrException(ErrorCode.SERVER_ERROR, "Timed out waiting to see all replicas: " + coreNames + " in cluster state. Last state: " + coll);
}
Thread.sleep(100);
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47bd30f8/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47bd30f8/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
index 9e16e90,3e116fc..631d949
--- a/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MoveReplicaTest.java
@@@ -48,7 -48,7 +48,8 @@@ import org.apache.solr.common.params.Co
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
+import org.apache.solr.util.IdUtils;
+ import org.apache.solr.util.LogLevel;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@@ -103,7 -95,8 +105,7 @@@ public class MoveReplicaTest extends So
@Test
public void test() throws Exception {
- String coll = getTestClass().getSimpleName() + "_coll";
- cluster.waitForAllNodes(5000);
- String coll = "movereplicatest_coll";
++ String coll = getTestClass().getSimpleName() + "_coll_" + inPlaceMove;
log.info("total_jettys: " + cluster.getJettySolrRunners().size());
int REPLICATION = 2;
@@@ -243,13 -232,12 +245,14 @@@
assertTrue("replica never fully recovered", recovered);
newWatchers = new HashSet<>(accessor.getStateWatchers(coll));
assertEquals(watchers, newWatchers);
+
+ assertEquals(100, cluster.getSolrClient().query(coll, new SolrQuery("*:*")).getResults().getNumFound());
}
- @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11458")
++ // @AwaitsFix(bugUrl = "https://issues.apache.org/jira/browse/SOLR-11458")
@Test
public void testFailedMove() throws Exception {
- String coll = getTestClass().getSimpleName() + "_failed_coll";
- String coll = "movereplicatest_failed_coll";
++ String coll = getTestClass().getSimpleName() + "_failed_coll_" + inPlaceMove;
int REPLICATION = 2;
CloudSolrClient cloudClient = cluster.getSolrClient();
@@@ -301,7 -286,7 +304,8 @@@
Set<CollectionStateWatcher> newWatchers = new HashSet<>(accessor.getStateWatchers(coll));
assertEquals(watchers, newWatchers);
+
+ log.info("--- current collection state: " + cloudClient.getZkStateReader().getClusterState().getCollection(coll));
assertEquals(100, cluster.getSolrClient().query(coll, new SolrQuery("*:*")).getResults().getNumFound());
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47bd30f8/solr/solrj/src/java/org/apache/solr/client/solrj/request/CollectionAdminRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/47bd30f8/solr/solrj/src/java/org/apache/solr/common/cloud/ZkStateReader.java
----------------------------------------------------------------------