You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/07/31 02:32:52 UTC
[36/36] lucene-solr:jira/http2: Merge branch 'master' into jira/http2
Merge branch 'master' into jira/http2
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8b208776
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8b208776
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8b208776
Branch: refs/heads/jira/http2
Commit: 8b208776e88745e2fe0fc6bba41c502f17e20bf5
Parents: 7a045d1 8d28bbc
Author: Cao Manh Dat <da...@apache.org>
Authored: Tue Jul 31 09:31:37 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Tue Jul 31 09:31:37 2018 +0700
----------------------------------------------------------------------
lucene/CHANGES.txt | 9 +
lucene/MIGRATE.txt | 8 +
.../lucene/benchmark/byTask/tasks/ReadTask.java | 4 +-
.../byTask/tasks/SearchWithCollectorTask.java | 2 +-
.../benchmark/byTask/feeds/DocMakerTest.java | 2 +-
.../byTask/feeds/LineDocSourceTest.java | 2 +-
.../lucene/classification/BM25NBClassifier.java | 4 +-
.../classification/KNearestFuzzyClassifier.java | 2 +-
.../KNearestNeighborClassifier.java | 2 +-
.../classification/utils/DatasetSplitter.java | 4 +-
.../document/LatLonDocValuesBoxQuery.java | 153 +++++
.../document/LatLonDocValuesDistanceQuery.java | 140 ++++
.../lucene/document/LatLonDocValuesField.java | 181 +++++
.../org/apache/lucene/document/LatLonPoint.java | 255 +++++++
.../document/LatLonPointDistanceComparator.java | 229 +++++++
.../document/LatLonPointDistanceQuery.java | 390 +++++++++++
.../document/LatLonPointInPolygonQuery.java | 214 ++++++
.../lucene/document/LatLonPointSortField.java | 100 +++
.../src/java/org/apache/lucene/geo/Polygon.java | 2 +-
.../org/apache/lucene/index/IndexWriter.java | 18 +-
.../org/apache/lucene/index/PointValues.java | 3 +-
.../SoftDeletesDirectoryReaderWrapper.java | 2 +-
.../index/SoftDeletesRetentionMergePolicy.java | 19 +-
.../search/BlockMaxConjunctionScorer.java | 14 +
.../lucene/search/FieldValueHitQueue.java | 4 +-
.../java/org/apache/lucene/search/HitQueue.java | 20 +-
.../org/apache/lucene/search/IndexSearcher.java | 4 +-
.../org/apache/lucene/search/SortRescorer.java | 7 +-
.../java/org/apache/lucene/search/TopDocs.java | 17 +-
.../apache/lucene/search/TopDocsCollector.java | 9 +-
.../apache/lucene/search/TopFieldCollector.java | 107 ++-
.../org/apache/lucene/search/TopFieldDocs.java | 2 +-
.../lucene/search/TopScoreDocCollector.java | 94 +--
.../org/apache/lucene/search/TotalHits.java | 71 ++
.../lucene/search/spans/SpanPositionQueue.java | 2 +-
.../org/apache/lucene/util/PriorityQueue.java | 108 ++-
.../automaton/DaciukMihovAutomatonBuilder.java | 12 +-
.../src/test/org/apache/lucene/TestDemo.java | 2 +-
.../perfield/TestPerFieldDocValuesFormat.java | 2 +-
.../perfield/TestPerFieldPostingsFormat2.java | 2 +-
.../org/apache/lucene/document/TestField.java | 2 +-
.../document/TestLatLonDocValuesField.java | 30 +
.../apache/lucene/document/TestLatLonPoint.java | 37 ++
.../document/TestLatLonPointDistanceSort.java | 264 ++++++++
.../apache/lucene/index/TestBinaryTerms.java | 2 +-
.../index/TestCrashCausesCorruptIndex.java | 2 +-
.../lucene/index/TestForTooMuchCloning.java | 2 +-
.../apache/lucene/index/TestIndexSorting.java | 26 +-
.../apache/lucene/index/TestIndexWriter.java | 14 +-
.../lucene/index/TestIndexWriterDelete.java | 2 +-
.../lucene/index/TestIndexWriterMaxDocs.java | 4 +-
.../lucene/index/TestIndexWriterReader.java | 12 +-
.../apache/lucene/index/TestIndexableField.java | 6 +-
.../index/TestIndexingSequenceNumbers.java | 12 +-
.../lucene/index/TestMixedDocValuesUpdates.java | 10 +-
.../index/TestNumericDocValuesUpdates.java | 2 +-
.../apache/lucene/index/TestReadOnlyIndex.java | 2 +-
.../apache/lucene/index/TestRollingUpdates.java | 2 +-
.../TestSoftDeletesRetentionMergePolicy.java | 14 +-
.../apache/lucene/index/TestStressDeletes.java | 4 +-
.../org/apache/lucene/index/TestStressNRT.java | 10 +-
.../org/apache/lucene/index/TestTryDelete.java | 14 +-
.../lucene/search/TermInSetQueryTest.java | 2 +-
.../lucene/search/TestAutomatonQuery.java | 2 +-
.../search/TestAutomatonQueryUnicode.java | 2 +-
.../lucene/search/TestBlendedTermQuery.java | 2 +-
.../org/apache/lucene/search/TestBoolean2.java | 22 +-
.../search/TestBooleanMinShouldMatch.java | 8 +-
.../org/apache/lucene/search/TestBooleanOr.java | 2 +-
.../apache/lucene/search/TestBooleanQuery.java | 14 +-
.../search/TestBooleanQueryVisitSubscorers.java | 2 +-
.../lucene/search/TestBooleanRewrites.java | 2 +-
.../apache/lucene/search/TestBooleanScorer.java | 2 +-
.../apache/lucene/search/TestConjunctions.java | 2 +-
.../TestControlledRealTimeReopenThread.java | 12 +-
.../lucene/search/TestDisjunctionMaxQuery.java | 2 +-
.../lucene/search/TestDocValuesQueries.java | 2 +-
.../lucene/search/TestDoubleValuesSource.java | 2 +-
.../lucene/search/TestElevationComparator.java | 2 +-
.../lucene/search/TestFieldValueQuery.java | 2 +-
.../apache/lucene/search/TestFuzzyQuery.java | 2 +-
.../apache/lucene/search/TestIndexSearcher.java | 2 +-
.../apache/lucene/search/TestLRUQueryCache.java | 2 +-
.../search/TestLatLonDocValuesQueries.java | 62 ++
.../lucene/search/TestLatLonPointQueries.java | 91 +++
.../lucene/search/TestLiveFieldValues.java | 4 +-
.../lucene/search/TestLongValuesSource.java | 2 +-
.../lucene/search/TestMultiPhraseQuery.java | 8 +-
.../apache/lucene/search/TestNeedsScores.java | 8 +-
.../search/TestNormsFieldExistsQuery.java | 2 +-
.../apache/lucene/search/TestPhraseQuery.java | 4 +-
.../search/TestPositiveScoresOnlyCollector.java | 4 +-
.../lucene/search/TestPrefixInBooleanQuery.java | 8 +-
.../apache/lucene/search/TestPrefixQuery.java | 2 +-
.../apache/lucene/search/TestQueryRescorer.java | 24 +-
.../apache/lucene/search/TestRegexpQuery.java | 4 +-
.../apache/lucene/search/TestRegexpRandom.java | 2 +-
.../lucene/search/TestReqOptSumScorer.java | 8 +-
.../search/TestSameScoresWithThreads.java | 2 +-
.../apache/lucene/search/TestSearchAfter.java | 6 +-
.../lucene/search/TestShardSearching.java | 8 +-
.../lucene/search/TestSimilarityProvider.java | 4 +-
.../lucene/search/TestSloppyPhraseQuery.java | 6 +-
.../test/org/apache/lucene/search/TestSort.java | 50 +-
.../apache/lucene/search/TestSortRescorer.java | 8 +-
.../search/TestSortedNumericSortField.java | 18 +-
.../lucene/search/TestSortedSetSelector.java | 30 +-
.../lucene/search/TestSortedSetSortField.java | 14 +-
.../lucene/search/TestSubScorerFreqs.java | 6 +-
.../apache/lucene/search/TestSynonymQuery.java | 23 +-
.../lucene/search/TestTermRangeQuery.java | 12 +-
.../apache/lucene/search/TestTermScorer.java | 8 +-
.../lucene/search/TestTopDocsCollector.java | 104 +--
.../apache/lucene/search/TestTopDocsMerge.java | 41 +-
.../lucene/search/TestTopFieldCollector.java | 86 ++-
.../TestTopFieldCollectorEarlyTermination.java | 10 +-
.../lucene/search/TestWildcardRandom.java | 2 +-
.../similarities/TestBooleanSimilarity.java | 10 +-
.../similarities/TestClassicSimilarity.java | 18 +-
.../search/similarities/TestSimilarity2.java | 14 +-
.../search/similarities/TestSimilarityBase.java | 2 +-
.../lucene/search/spans/TestSpanFirstQuery.java | 4 +-
.../apache/lucene/search/spans/TestSpans.java | 2 +-
.../TestDaciukMihovAutomatonBuilder.java | 39 ++
.../org/apache/lucene/demo/SearchFiles.java | 2 +-
.../demo/facet/TestDistanceFacetsExample.java | 2 +-
.../demo/facet/TestRangeFacetsExample.java | 2 +-
.../expressions/TestExpressionRescorer.java | 4 +-
.../lucene/expressions/TestExpressionSorts.java | 2 +-
.../org/apache/lucene/facet/DrillSideways.java | 8 +-
.../apache/lucene/facet/FacetsCollector.java | 7 +-
.../lucene/facet/TopOrdAndFloatQueue.java | 2 +-
.../apache/lucene/facet/TopOrdAndIntQueue.java | 2 +-
.../apache/lucene/facet/TestDrillDownQuery.java | 14 +-
.../apache/lucene/facet/TestDrillSideways.java | 32 +-
.../org/apache/lucene/facet/TestFacetQuery.java | 4 +-
.../facet/range/TestRangeFacetCounts.java | 14 +-
.../sortedset/TestSortedSetDocValuesFacets.java | 2 +-
.../TestTaxonomyFacetSumValueSource.java | 2 +-
.../directory/TestDirectoryTaxonomyWriter.java | 2 +-
.../search/grouping/BlockGroupingCollector.java | 7 +-
.../lucene/search/grouping/GroupDocs.java | 5 +-
.../lucene/search/grouping/TopGroups.java | 7 +-
.../search/grouping/TopGroupsCollector.java | 4 +-
.../lucene/search/grouping/TestGrouping.java | 13 +-
.../search/highlight/HighlighterPhraseTest.java | 12 +-
.../search/highlight/HighlighterTest.java | 68 +-
.../search/highlight/TokenSourcesTest.java | 8 +-
.../uhighlight/TestUnifiedHighlighter.java | 56 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 60 +-
.../TestUnifiedHighlighterRanking.java | 4 +-
.../TestUnifiedHighlighterStrictPhrases.java | 7 +-
.../TestUnifiedHighlighterTermVec.java | 2 +-
.../FastVectorHighlighterTest.java | 2 +-
.../lucene/search/join/TestBlockJoin.java | 44 +-
.../search/join/TestBlockJoinSorting.java | 8 +-
.../apache/lucene/search/join/TestJoinUtil.java | 36 +-
.../join/TestParentChildrenBlockJoinQuery.java | 2 +-
.../memory/TestMemoryIndexAgainstRAMDir.java | 4 +-
.../search/DiversifiedTopDocsCollector.java | 2 +-
.../lucene/queries/CommonTermsQueryTest.java | 28 +-
.../queries/function/TestFieldScoreQuery.java | 2 +-
.../function/TestFunctionMatchQuery.java | 2 +-
.../function/TestFunctionScoreQuery.java | 8 +-
.../queries/payloads/TestPayloadTermQuery.java | 8 +-
.../queryparser/classic/TestQueryParser.java | 2 +-
.../flexible/standard/TestQPHelper.java | 2 +-
.../queryparser/util/QueryParserTestBase.java | 2 +-
.../lucene/queryparser/xml/TestCoreParser.java | 6 +-
.../IndexAndTaxonomyReplicationClientTest.java | 2 +-
.../document/FloatPointNearestNeighbor.java | 3 +-
.../document/LatLonDocValuesBoxQuery.java | 153 -----
.../document/LatLonDocValuesDistanceQuery.java | 140 ----
.../lucene/document/LatLonDocValuesField.java | 181 -----
.../org/apache/lucene/document/LatLonPoint.java | 335 ----------
.../document/LatLonPointDistanceComparator.java | 229 -------
.../document/LatLonPointDistanceQuery.java | 390 -----------
.../document/LatLonPointInPolygonQuery.java | 214 ------
.../lucene/document/LatLonPointSortField.java | 100 ---
.../apache/lucene/document/NearestNeighbor.java | 328 ---------
.../java/org/apache/lucene/geo/Tessellator.java | 36 +-
.../search/LatLonPointPrototypeQueries.java | 111 ++++
.../apache/lucene/search/NearestNeighbor.java | 329 +++++++++
.../lucene/search/TermAutomatonScorer.java | 4 +-
.../document/TestFloatPointNearestNeighbor.java | 3 +-
.../document/TestLatLonDocValuesField.java | 30 -
.../apache/lucene/document/TestLatLonPoint.java | 37 --
.../document/TestLatLonPointDistanceSort.java | 264 --------
.../apache/lucene/document/TestLatLonShape.java | 1 -
.../org/apache/lucene/document/TestNearest.java | 253 -------
.../search/TestDocValuesNumbersQuery.java | 2 +-
.../lucene/search/TestDocValuesTermsQuery.java | 2 +-
.../search/TestLatLonDocValuesQueries.java | 62 --
.../lucene/search/TestLatLonPointQueries.java | 91 ---
.../org/apache/lucene/search/TestNearest.java | 253 +++++++
.../lucene/search/TestTermAutomatonQuery.java | 28 +-
.../apache/lucene/spatial/SpatialExample.java | 4 +-
.../apache/lucene/spatial/SpatialTestCase.java | 2 +-
.../lucene/spatial/prefix/JtsPolygonTest.java | 2 +-
.../prefix/tree/SpatialPrefixTreeTest.java | 2 +-
.../apache/lucene/spatial3d/TestGeo3DPoint.java | 2 +-
.../analyzing/AnalyzingInfixSuggester.java | 2 +-
.../search/suggest/document/TopSuggestDocs.java | 7 +-
.../document/TopSuggestDocsCollector.java | 3 +-
.../document/TestPrefixCompletionQuery.java | 4 +-
.../suggest/document/TestSuggestField.java | 12 +-
.../apache/lucene/geo/BaseGeoPointTestCase.java | 22 +-
.../index/BaseDocValuesFormatTestCase.java | 20 +-
.../index/BaseStoredFieldsFormatTestCase.java | 8 +-
.../ThreadedIndexingAndSearchingTestCase.java | 26 +-
.../org/apache/lucene/search/CheckHits.java | 4 +-
.../search/SearchEquivalenceTestBase.java | 4 +-
.../lucene/store/BaseDirectoryTestCase.java | 4 +-
.../lucene/store/MockDirectoryWrapper.java | 11 +-
.../java/org/apache/lucene/util/TestUtil.java | 3 +-
solr/CHANGES.txt | 26 +-
.../dataimport/TestHierarchicalDocBuilder.java | 2 +-
.../extraction/TestExtractionDateUtil.java | 1 +
.../java/org/apache/solr/ltr/LTRRescorer.java | 6 +-
.../solr/ltr/TestLTRReRankingPipeline.java | 4 +-
.../apache/solr/ltr/TestLTRScoringQuery.java | 2 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 2 +-
.../client/solrj/embedded/JettySolrRunner.java | 10 +-
.../org/apache/solr/cloud/ElectionContext.java | 2 +-
.../cloud/api/collections/AddReplicaCmd.java | 53 +-
.../api/collections/CreateCollectionCmd.java | 145 ++--
.../api/collections/DeleteCollectionCmd.java | 21 +
.../solr/cloud/api/collections/MigrateCmd.java | 5 +
.../cloud/api/collections/MoveReplicaCmd.java | 40 +-
.../OverseerCollectionMessageHandler.java | 6 +-
.../cloud/autoscaling/ComputePlanAction.java | 11 +-
.../org/apache/solr/core/CoreContainer.java | 10 +-
.../org/apache/solr/handler/BlobHandler.java | 8 +-
.../apache/solr/handler/RequestHandlerBase.java | 11 +-
.../solr/handler/admin/CollectionsHandler.java | 10 +-
.../solr/handler/admin/RequestSyncShardOp.java | 2 +-
.../solr/handler/component/ExpandComponent.java | 8 +-
.../handler/component/RealTimeGetComponent.java | 2 +-
.../solr/handler/export/ExportWriter.java | 8 +-
.../apache/solr/search/ExportQParserPlugin.java | 3 +-
.../java/org/apache/solr/search/Grouping.java | 10 +-
.../org/apache/solr/search/ReRankCollector.java | 6 +-
.../search/SignificantTermsQParserPlugin.java | 16 +-
.../apache/solr/search/SolrIndexSearcher.java | 7 +-
.../apache/solr/search/ValueSourceParser.java | 4 +-
.../solr/search/facet/RelatednessAgg.java | 109 ++-
.../distributed/command/QueryCommand.java | 4 +-
.../TopGroupsResultTransformer.java | 14 +-
.../GroupedEndResultTransformer.java | 9 +-
.../solr/search/mlt/SimpleMLTQParser.java | 4 +-
.../solr/update/DirectUpdateHandler2.java | 4 +
.../solr/cloud/LeaderTragicEventTest.java | 20 +-
.../apache/solr/cloud/MigrateRouteKeyTest.java | 18 +
.../apache/solr/cloud/TestWithCollection.java | 611 +++++++++++++++++
.../sim/SimClusterStateProvider.java | 71 +-
.../handler/TestReplicationHandlerBackup.java | 2 +-
.../TestMultiValuedNumericRangeQuery.java | 2 +-
.../solr/legacy/TestNumericRangeQuery32.java | 10 +-
.../solr/legacy/TestNumericRangeQuery64.java | 10 +-
.../solr/search/TestFilteredDocIdSet.java | 8 +-
.../apache/solr/search/TestRankQueryPlugin.java | 5 +-
.../test/org/apache/solr/search/TestSort.java | 2 +-
.../search/facet/TestJsonFacetRefinement.java | 36 +-
.../solr/search/facet/TestJsonFacets.java | 54 ++
.../solr/search/function/TestOrdValues.java | 2 +-
.../apache/solr/search/join/BJQParserTest.java | 6 +-
.../solr/uninverting/TestFieldCacheSort.java | 118 ++--
.../uninverting/TestFieldCacheSortRandom.java | 2 +-
.../solr/uninverting/TestNumericTerms32.java | 2 +-
.../solr/uninverting/TestNumericTerms64.java | 2 +-
.../apache/solr/update/AddBlockUpdateTest.java | 4 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 2 +
solr/solr-ref-guide/src/_layouts/home.html | 31 +
solr/solr-ref-guide/src/collections-api.adoc | 6 +
.../src/colocating-collections.adoc | 76 +++
solr/solr-ref-guide/src/css/customstyles.css | 29 +
solr/solr-ref-guide/src/css/ref-guide.css | 1 +
solr/solr-ref-guide/src/index.adoc | 91 ++-
solr/solr-ref-guide/src/json-facet-api.adoc | 20 +-
...olrcloud-autoscaling-policy-preferences.adoc | 34 +-
...rcloud-query-routing-and-read-tolerance.adoc | 57 ++
solr/solr-ref-guide/src/solrcloud.adoc | 3 +-
.../cloud/autoscaling/AddReplicaSuggester.java | 4 +-
.../client/solrj/cloud/autoscaling/Clause.java | 141 +++-
.../cloud/autoscaling/MoveReplicaSuggester.java | 30 +-
.../client/solrj/cloud/autoscaling/Operand.java | 8 +
.../client/solrj/cloud/autoscaling/Policy.java | 40 +-
.../solrj/cloud/autoscaling/PolicyHelper.java | 28 +-
.../client/solrj/cloud/autoscaling/Row.java | 71 +-
.../solrj/cloud/autoscaling/Suggester.java | 130 +++-
.../solrj/cloud/autoscaling/Suggestion.java | 171 +++--
.../client/solrj/cloud/autoscaling/VarType.java | 43 ++
.../solrj/cloud/autoscaling/Violation.java | 2 +-
.../autoscaling/WithCollectionVarType.java | 160 +++++
.../solrj/impl/SolrClientNodeStateProvider.java | 38 +-
.../solrj/request/CollectionAdminRequest.java | 24 +-
.../apache/solr/common/cloud/DocCollection.java | 21 +-
.../common/params/CollectionAdminParams.java | 11 +
.../solrj/cloud/autoscaling/TestPolicy.java | 659 ++++++++++++++++++-
.../solrj/cloud/autoscaling/TestPolicy2.java | 223 +++++++
300 files changed, 7267 insertions(+), 4237 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8b208776/solr/core/src/java/org/apache/solr/client/solrj/embedded/JettySolrRunner.java
----------------------------------------------------------------------