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 2018/09/06 14:36:02 UTC
[5/7] lucene-solr:jira/solr-12709: Merge branch 'master' into
jira/solr-12723
Merge branch 'master' into jira/solr-12723
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8db16c1a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8db16c1a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8db16c1a
Branch: refs/heads/jira/solr-12709
Commit: 8db16c1ab90626c441569c5cf89e518543a28eb5
Parents: 4a1ee8e e0eb7ba
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Tue Sep 4 18:21:23 2018 +0200
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Tue Sep 4 18:21:23 2018 +0200
----------------------------------------------------------------------
dev-tools/scripts/buildAndPushRelease.py | 54 ++-
lucene/CHANGES.txt | 28 ++
lucene/MIGRATE.txt | 13 +-
.../codecs/blocktree/BlockTreeTermsReader.java | 10 -
.../lucene/codecs/blocktree/FieldReader.java | 3 +-
.../codecs/blocktree/IntersectTermsEnum.java | 220 +---------
.../blocktree/IntersectTermsEnumFrame.java | 15 -
.../codecs/blocktree/SegmentTermsEnum.java | 5 +-
.../apache/lucene/codecs/blocktree/Stats.java | 2 -
.../java/org/apache/lucene/document/Field.java | 30 +-
.../document/LatLonPointDistanceComparator.java | 7 +-
.../document/LongDistanceFeatureQuery.java | 438 +++++++++++++++++++
.../org/apache/lucene/document/LongPoint.java | 26 ++
.../org/apache/lucene/document/StoredField.java | 23 +-
.../org/apache/lucene/index/CheckIndex.java | 75 ----
.../index/SoftDeletesRetentionMergePolicy.java | 2 +-
.../src/java/org/apache/lucene/index/Terms.java | 8 +-
.../org/apache/lucene/index/package-info.java | 278 ++++++++----
.../search/BlockMaxConjunctionScorer.java | 8 +-
.../org/apache/lucene/search/BooleanScorer.java | 4 +-
.../org/apache/lucene/search/BooleanWeight.java | 4 +-
.../apache/lucene/search/CachingCollector.java | 4 +-
.../apache/lucene/search/ConjunctionScorer.java | 8 +-
.../lucene/search/ConstantScoreQuery.java | 14 +-
.../lucene/search/DisjunctionMaxQuery.java | 2 +-
.../apache/lucene/search/DisjunctionScorer.java | 6 +-
.../lucene/search/DocValuesRewriteMethod.java | 2 +-
.../lucene/search/DoubleValuesSource.java | 6 +-
.../org/apache/lucene/search/FakeScorer.java | 2 +-
.../apache/lucene/search/FieldComparator.java | 10 +-
.../lucene/search/FilterLeafCollector.java | 2 +-
.../lucene/search/FilterMatchesIterator.java | 74 ++++
.../apache/lucene/search/FilterScorable.java | 58 +++
.../org/apache/lucene/search/LRUQueryCache.java | 4 +-
.../org/apache/lucene/search/LeafCollector.java | 2 +-
.../lucene/search/LeafFieldComparator.java | 2 +-
.../apache/lucene/search/LongValuesSource.java | 2 +-
.../java/org/apache/lucene/search/Matches.java | 96 ----
.../org/apache/lucene/search/MatchesUtils.java | 132 ++++++
.../lucene/search/MaxScoreSumPropagator.java | 2 +-
.../lucene/search/MinShouldMatchSumScorer.java | 6 +-
.../apache/lucene/search/MultiCollector.java | 9 +-
.../lucene/search/MultiCollectorManager.java | 6 +-
.../lucene/search/MultiLeafFieldComparator.java | 2 +-
.../MultiTermQueryConstantScoreWrapper.java | 2 +-
.../org/apache/lucene/search/PhraseWeight.java | 2 +-
.../search/PositiveScoresOnlyCollector.java | 4 +-
.../org/apache/lucene/search/ReqExclScorer.java | 6 +-
.../apache/lucene/search/ReqOptSumScorer.java | 10 +-
.../java/org/apache/lucene/search/Scorable.java | 86 ++++
.../search/ScoreCachingWrappingScorer.java | 24 +-
.../java/org/apache/lucene/search/Scorer.java | 70 +--
.../apache/lucene/search/SimpleCollector.java | 2 +-
.../lucene/search/SimpleFieldComparator.java | 2 +-
.../org/apache/lucene/search/SynonymQuery.java | 2 +-
.../apache/lucene/search/TermInSetQuery.java | 2 +-
.../org/apache/lucene/search/TermQuery.java | 2 +-
.../apache/lucene/search/TermRangeQuery.java | 4 +
.../apache/lucene/search/TopFieldCollector.java | 45 +-
.../lucene/search/TopScoreDocCollector.java | 8 +-
.../org/apache/lucene/search/WANDScorer.java | 8 +-
.../java/org/apache/lucene/search/Weight.java | 4 +-
.../org/apache/lucene/search/package-info.java | 127 +++---
.../search/similarities/package-info.java | 52 +--
.../apache/lucene/search/spans/SpanWeight.java | 3 +-
.../apache/lucene/util/RamUsageEstimator.java | 51 +--
.../org/apache/lucene/util/packed/Direct16.java | 2 +-
.../org/apache/lucene/util/packed/Direct32.java | 2 +-
.../org/apache/lucene/util/packed/Direct64.java | 2 +-
.../org/apache/lucene/util/packed/Direct8.java | 2 +-
.../lucene/util/packed/Packed16ThreeBlocks.java | 2 +-
.../lucene/util/packed/Packed64SingleBlock.java | 2 +-
.../lucene/util/packed/Packed8ThreeBlocks.java | 2 +-
lucene/core/src/java/overview.html | 4 +-
.../document/TestLongDistanceFeatureQuery.java | 350 +++++++++++++++
.../org/apache/lucene/index/TestOmitTf.java | 18 +-
.../TestSoftDeletesRetentionMergePolicy.java | 27 ++
.../apache/lucene/search/JustCompileSearch.java | 2 +-
.../lucene/search/MultiCollectorTest.java | 8 +-
.../org/apache/lucene/search/TestBooleanOr.java | 2 +-
.../apache/lucene/search/TestBooleanQuery.java | 4 +-
.../search/TestBooleanQueryVisitSubscorers.java | 19 +-
.../apache/lucene/search/TestConjunctions.java | 8 +-
.../lucene/search/TestConstantScoreQuery.java | 26 +-
.../lucene/search/TestDoubleValuesSource.java | 6 +-
.../lucene/search/TestElevationComparator.java | 2 +-
.../lucene/search/TestMultiCollector.java | 6 +-
.../lucene/search/TestReqExclBulkScorer.java | 4 +-
.../search/TestScoreCachingWrappingScorer.java | 4 +-
.../apache/lucene/search/TestSimilarity.java | 16 +-
.../lucene/search/TestSloppyPhraseQuery.java | 14 +-
.../lucene/search/TestSubScorerFreqs.java | 22 +-
.../apache/lucene/search/TestTermScorer.java | 4 +-
.../search/TestTimeLimitingCollector.java | 2 +-
.../lucene/search/TestTopDocsCollector.java | 2 +-
.../lucene/search/TestTopFieldCollector.java | 19 +-
.../lucene/facet/DrillSidewaysScorer.java | 4 +-
.../apache/lucene/facet/FacetsCollector.java | 6 +-
.../directory/DirectoryTaxonomyReader.java | 2 +-
.../taxonomy/directory/TaxonomyIndexArrays.java | 2 +-
.../facet/AssertingSubDocsAtOnceCollector.java | 11 +-
.../search/grouping/AllGroupHeadsCollector.java | 24 +-
.../search/grouping/AllGroupsCollector.java | 4 +-
.../search/grouping/BlockGroupingCollector.java | 5 +-
.../grouping/FirstPassGroupingCollector.java | 4 +-
.../search/grouping/GroupFacetCollector.java | 4 +-
.../lucene/search/grouping/GroupReducer.java | 4 +-
.../grouping/SecondPassGroupingCollector.java | 4 +-
.../search/grouping/TopGroupsCollector.java | 6 +-
.../search/highlight/HighlighterPhraseTest.java | 5 +-
.../search/join/GlobalOrdinalsCollector.java | 6 +-
.../join/GlobalOrdinalsWithScoreCollector.java | 14 +-
.../org/apache/lucene/search/join/JoinUtil.java | 10 +-
.../search/join/TermsWithScoreCollector.java | 6 +-
.../search/join/ToChildBlockJoinQuery.java | 4 +-
.../search/join/ToParentBlockJoinQuery.java | 7 +-
.../apache/lucene/search/join/TestJoinUtil.java | 10 +-
.../apache/lucene/index/memory/MemoryIndex.java | 6 +-
.../search/DiversifiedTopDocsCollector.java | 4 +-
.../lucene/search/DocValuesStatsCollector.java | 4 +-
.../surround/query/BooleanQueryTst.java | 10 +-
.../org/apache/lucene/search/CoveringQuery.java | 2 +-
.../apache/lucene/search/CoveringScorer.java | 6 +-
.../intervals/ConjunctionIntervalsSource.java | 113 ++++-
.../intervals/DifferenceIntervalsSource.java | 23 +-
.../intervals/DisjunctionIntervalsSource.java | 14 +
.../lucene/search/intervals/IntervalFilter.java | 2 +-
.../search/intervals/IntervalFunction.java | 4 +-
.../search/intervals/IntervalIterator.java | 5 +
.../search/intervals/IntervalMatches.java | 156 +++++++
.../lucene/search/intervals/IntervalQuery.java | 20 +
.../lucene/search/intervals/Intervals.java | 4 +-
.../search/intervals/IntervalsSource.java | 13 +
.../intervals/LowpassIntervalsSource.java | 16 +
.../MinimizingConjunctionIntervalsSource.java | 236 ++++++++++
.../search/intervals/TermIntervalsSource.java | 66 +++
.../lucene/search/intervals/TestIntervals.java | 232 +++++++++-
.../spatial3d/Geo3DPointDistanceComparator.java | 4 +-
.../Geo3DPointOutsideDistanceComparator.java | 4 +-
.../document/TopSuggestDocsCollector.java | 2 +-
.../lucene/search/AssertingBulkScorer.java | 4 +-
.../lucene/search/AssertingCollector.java | 11 +-
.../lucene/search/AssertingIndexSearcher.java | 2 +-
.../lucene/search/AssertingLeafCollector.java | 13 +-
.../apache/lucene/search/AssertingScorable.java | 64 +++
.../apache/lucene/search/AssertingScorer.java | 6 +-
.../lucene/search/BulkScorerWrapperScorer.java | 4 +-
.../org/apache/lucene/search/CheckHits.java | 6 +-
.../org/apache/lucene/search/QueryUtils.java | 14 +-
solr/CHANGES.txt | 26 +-
.../org/apache/solr/ltr/LTRScoringQuery.java | 14 +-
.../solr/ltr/TestLTRReRankingPipeline.java | 6 +-
.../solr/cloud/api/collections/Assign.java | 30 +-
.../api/collections/CreateCollectionCmd.java | 14 +-
.../autoscaling/AutoAddReplicasPlanAction.java | 2 +-
.../cloud/autoscaling/ComputePlanAction.java | 44 +-
.../cloud/autoscaling/NodeAddedTrigger.java | 30 +-
.../org/apache/solr/core/SolrXmlConfig.java | 9 +-
.../solr/handler/component/ExpandComponent.java | 6 +-
.../component/HttpShardHandlerFactory.java | 8 +-
.../solr/handler/component/QueryComponent.java | 2 +-
.../solr/search/CollapsingQParserPlugin.java | 11 +-
.../apache/solr/search/DelegatingCollector.java | 8 +-
.../org/apache/solr/search/DocSetCollector.java | 4 +-
.../apache/solr/search/ExportQParserPlugin.java | 4 +-
.../apache/solr/search/HashQParserPlugin.java | 7 +-
.../apache/solr/search/MaxScoreCollector.java | 6 +-
.../apache/solr/search/SolrIndexSearcher.java | 8 +-
.../apache/solr/update/UpdateShardHandler.java | 4 +-
.../solr/update/UpdateShardHandlerConfig.java | 10 +-
.../AddSchemaFieldsUpdateProcessorFactory.java | 36 +-
.../ParseDateFieldUpdateProcessorFactory.java | 16 +-
solr/core/src/test-files/log4j2.xml | 12 +-
...lrconfig-parsing-update-processor-chains.xml | 3 -
.../apache/solr/cloud/TestWithCollection.java | 5 +-
.../autoscaling/ComputePlanActionTest.java | 124 +++++-
.../MetricTriggerIntegrationTest.java | 8 +-
.../solr/cloud/autoscaling/TestPolicyCloud.java | 20 +-
.../apache/solr/handler/RequestLoggingTest.java | 23 +-
.../org/apache/solr/logging/TestLogWatcher.java | 79 ++--
.../apache/solr/search/TestRankQueryPlugin.java | 9 +-
...dSchemaFieldsUpdateProcessorFactoryTest.java | 15 +
.../ParsingFieldUpdateProcessorsTest.java | 9 +-
solr/server/resources/log4j2-console.xml | 8 +-
solr/server/resources/log4j2.xml | 30 +-
.../src/solrcloud-autoscaling-overview.adoc | 2 +-
...olrcloud-autoscaling-policy-preferences.adoc | 33 ++
.../src/solrcloud-autoscaling-triggers.adoc | 36 +-
...store-data-with-the-data-import-handler.adoc | 28 +-
.../solr/client/solrj/impl/HttpClientUtil.java | 2 +
.../solrj/request/CollectionAdminRequest.java | 4 +
.../java/org/apache/solr/util/TestHarness.java | 5 +-
192 files changed, 3435 insertions(+), 1340 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8db16c1a/solr/core/src/java/org/apache/solr/cloud/autoscaling/ComputePlanAction.java
----------------------------------------------------------------------