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/01/11 08:01:26 UTC
[50/50] [abbrv] lucene-solr:jira/solr-11702: Merge with master
Merge with master
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ca364c72
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ca364c72
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ca364c72
Branch: refs/heads/jira/solr-11702
Commit: ca364c72946190aab1e0b0defabd9b715fb666d0
Parents: 116fe4a 352ec01
Author: Cao Manh Dat <da...@apache.org>
Authored: Thu Jan 11 15:00:19 2018 +0700
Committer: Cao Manh Dat <da...@apache.org>
Committed: Thu Jan 11 15:00:19 2018 +0700
----------------------------------------------------------------------
build.xml | 1 +
dev-tools/scripts/reproduceJenkinsFailures.py | 215 +++++++
lucene/CHANGES.txt | 33 ++
lucene/MIGRATE.txt | 12 +-
.../analysis/commongrams/CommonGramsFilter.java | 3 -
.../commongrams/CommonGramsQueryFilter.java | 3 -
.../miscellaneous/FingerprintFilter.java | 3 -
.../miscellaneous/HyphenatedWordsFilter.java | 6 -
.../RemoveDuplicatesTokenFilter.java | 6 -
lucene/analysis/icu/src/data/uax29/Default.rbbi | 96 ++-
.../icu/src/data/utr30/DiacriticFolding.txt | 11 +-
.../icu/src/data/utr30/NativeDigitFolding.txt | 10 +
lucene/analysis/icu/src/data/utr30/nfc.txt | 13 +-
lucene/analysis/icu/src/data/utr30/nfkc.txt | 4 +-
lucene/analysis/icu/src/data/utr30/nfkc_cf.txt | 10 +-
.../analysis/icu/segmentation/ICUTokenizer.java | 8 +-
lucene/analysis/icu/src/java/overview.html | 2 +-
.../analysis/icu/segmentation/Default.brk | Bin 36768 -> 54488 bytes
.../icu/segmentation/MyanmarSyllable.brk | Bin 20744 -> 21976 bytes
.../org/apache/lucene/analysis/icu/utr30.nrm | Bin 55184 -> 59056 bytes
.../analysis/icu/GenerateUTR30DataFiles.java | 6 +-
.../ja/JapaneseIterationMarkCharFilter.java | 6 -
.../lucene/classification/BM25NBClassifier.java | 9 -
.../BooleanPerceptronClassifier.java | 9 -
.../classification/KNearestFuzzyClassifier.java | 11 +-
.../KNearestNeighborClassifier.java | 11 +-
.../SimpleNaiveBayesClassifier.java | 9 -
.../KNearestNeighborDocumentClassifier.java | 9 -
.../SimpleNaiveBayesDocumentClassifier.java | 9 -
.../classification/utils/NearestFuzzyQuery.java | 12 +-
.../codecs/blocktree/IntersectTermsEnum.java | 7 +-
.../org/apache/lucene/index/TermContext.java | 197 -------
.../org/apache/lucene/index/TermStates.java | 234 ++++++++
.../apache/lucene/search/BlendedTermQuery.java | 28 +-
.../org/apache/lucene/search/BooleanWeight.java | 2 +-
.../lucene/search/DisjunctionMaxQuery.java | 4 +-
.../lucene/search/DoubleValuesSource.java | 8 +-
.../apache/lucene/search/ExactPhraseScorer.java | 7 +-
.../org/apache/lucene/search/Explanation.java | 14 +-
.../org/apache/lucene/search/IndexSearcher.java | 49 +-
.../org/apache/lucene/search/LeafSimScorer.java | 73 +++
.../apache/lucene/search/MultiPhraseQuery.java | 51 +-
.../apache/lucene/search/MultiTermQuery.java | 8 +-
.../MultiTermQueryConstantScoreWrapper.java | 8 +-
.../org/apache/lucene/search/PhraseQuery.java | 31 +-
.../org/apache/lucene/search/QueryRescorer.java | 6 +-
.../apache/lucene/search/ScoringRewrite.java | 14 +-
.../lucene/search/SloppyPhraseScorer.java | 7 +-
.../org/apache/lucene/search/SortRescorer.java | 2 +-
.../org/apache/lucene/search/SynonymQuery.java | 49 +-
.../lucene/search/TermCollectingRewrite.java | 4 +-
.../apache/lucene/search/TermInSetQuery.java | 8 +-
.../org/apache/lucene/search/TermQuery.java | 71 +--
.../org/apache/lucene/search/TermScorer.java | 11 +-
.../apache/lucene/search/TopTermsRewrite.java | 10 +-
.../org/apache/lucene/search/package-info.java | 4 +-
.../lucene/search/similarities/Axiomatic.java | 27 +-
.../search/similarities/BM25Similarity.java | 140 ++---
.../lucene/search/similarities/BasicStats.java | 2 +-
.../search/similarities/BooleanSimilarity.java | 48 +-
.../search/similarities/DFISimilarity.java | 18 +-
.../search/similarities/DFRSimilarity.java | 16 +-
.../search/similarities/IBSimilarity.java | 18 +-
.../similarities/LMDirichletSimilarity.java | 18 +-
.../similarities/LMJelinekMercerSimilarity.java | 18 +-
.../search/similarities/LMSimilarity.java | 2 +-
.../search/similarities/MultiSimilarity.java | 46 +-
.../similarities/PerFieldSimilarityWrapper.java | 22 +-
.../lucene/search/similarities/Similarity.java | 139 ++---
.../search/similarities/SimilarityBase.java | 93 +--
.../search/similarities/TFIDFSimilarity.java | 127 ++--
.../lucene/search/spans/SpanContainQuery.java | 10 +-
.../search/spans/SpanContainingQuery.java | 10 +-
.../search/spans/SpanMultiTermQueryWrapper.java | 6 +-
.../lucene/search/spans/SpanNearQuery.java | 14 +-
.../lucene/search/spans/SpanNotQuery.java | 12 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 12 +-
.../search/spans/SpanPositionCheckQuery.java | 12 +-
.../apache/lucene/search/spans/SpanQuery.java | 18 +-
.../apache/lucene/search/spans/SpanScorer.java | 6 +-
.../lucene/search/spans/SpanTermQuery.java | 36 +-
.../apache/lucene/search/spans/SpanWeight.java | 42 +-
.../lucene/search/spans/SpanWithinQuery.java | 10 +-
.../apache/lucene/search/spans/TermSpans.java | 4 +-
.../apache/lucene/index/TestCustomNorms.java | 7 +-
.../apache/lucene/index/TestCustomTermFreq.java | 9 +-
.../lucene/index/TestFieldInvertState.java | 8 +-
.../apache/lucene/index/TestIndexSorting.java | 9 +-
.../lucene/index/TestMaxTermFrequency.java | 16 +-
.../test/org/apache/lucene/index/TestNorms.java | 7 +-
.../lucene/index/TestUniqueTermCount.java | 8 +-
.../apache/lucene/search/JustCompileSearch.java | 7 +-
.../org/apache/lucene/search/TestBoolean2.java | 4 +-
.../apache/lucene/search/TestBooleanQuery.java | 2 +-
.../search/TestBooleanQueryVisitSubscorers.java | 16 +-
.../lucene/search/TestBooleanRewrites.java | 2 +-
.../apache/lucene/search/TestConjunctions.java | 17 +-
.../lucene/search/TestDocValuesScoring.java | 192 ------
.../lucene/search/TestMinShouldMatch2.java | 13 +-
.../apache/lucene/search/TestQueryRescorer.java | 4 +-
.../lucene/search/TestSimilarityProvider.java | 34 +-
.../lucene/search/TestSubScorerFreqs.java | 17 +-
.../org/apache/lucene/search/TestTermQuery.java | 6 +-
.../similarities/TestClassicSimilarity.java | 3 +-
.../search/similarities/TestSimilarity2.java | 2 +-
.../search/similarities/TestSimilarityBase.java | 11 +-
.../apache/lucene/search/spans/TestBasics.java | 54 +-
.../search/spans/TestFieldMaskingSpanQuery.java | 4 +-
.../search/spans/TestNearSpansOrdered.java | 2 +-
.../expressions/ExpressionValueSource.java | 4 +-
.../search/grouping/GroupingSearchTest.java | 2 +
.../highlight/WeightedSpanTermExtractor.java | 2 +-
.../search/uhighlight/FieldHighlighter.java | 14 +-
.../search/uhighlight/FieldOffsetStrategy.java | 80 +--
.../lucene/search/uhighlight/OffsetsEnum.java | 132 +++--
.../lucene/search/uhighlight/Passage.java | 18 +
.../lucene/search/uhighlight/PhraseHelper.java | 584 +++++--------------
.../uhighlight/TokenStreamOffsetStrategy.java | 56 +-
.../uhighlight/TestUnifiedHighlighter.java | 87 ++-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 55 +-
.../TestUnifiedHighlighterStrictPhrases.java | 88 +++
.../TestUnifiedHighlighterExtensibility.java | 4 +-
lucene/ivy-versions.properties | 2 +-
.../search/join/ToParentBlockJoinQuery.java | 2 +-
.../lucene/search/join/TestBlockJoin.java | 9 +-
.../apache/lucene/search/join/TestJoinUtil.java | 2 +-
lucene/licenses/icu4j-59.1.jar.sha1 | 1 -
lucene/licenses/icu4j-60.2.jar.sha1 | 1 +
.../lucene/index/memory/TestMemoryIndex.java | 8 +-
.../lucene/misc/SweetSpotSimilarityTest.java | 2 +-
.../search/TestDiversifiedTopDocsCollector.java | 132 +++--
.../apache/lucene/queries/CommonTermsQuery.java | 40 +-
.../lucene/queries/function/FunctionQuery.java | 6 +-
.../queries/function/FunctionScoreQuery.java | 151 +++++
.../lucene/queries/function/ValueSource.java | 2 +-
.../function/docvalues/FloatDocValues.java | 5 +
.../function/valuesource/IDFValueSource.java | 2 +-
.../function/valuesource/NormValueSource.java | 10 +-
.../function/valuesource/TFValueSource.java | 2 +-
.../queries/payloads/PayloadScoreQuery.java | 17 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 18 +-
.../lucene/queries/CommonTermsQueryTest.java | 6 +-
.../function/TestFunctionScoreExplanations.java | 10 +-
.../function/TestFunctionScoreQuery.java | 62 +-
.../function/TestLongNormValueSource.java | 2 +-
.../queries/function/TestValueSources.java | 8 +-
.../docvalues/TestBoolValOfNumericDVs.java | 76 +++
.../queries/payloads/TestPayloadCheckQuery.java | 2 +-
.../sandbox/queries/FuzzyLikeThisQuery.java | 8 +-
.../org/apache/lucene/search/CoveringQuery.java | 2 +-
.../lucene/search/TermAutomatonQuery.java | 26 +-
.../lucene/search/TermAutomatonScorer.java | 7 +-
.../spatial/bbox/BBoxSimilarityValueSource.java | 2 +-
.../util/ReciprocalDoubleValuesSource.java | 2 +-
.../spatial3d/geom/GeoExactCircleTest.java | 2 +-
.../lucene/index/BaseNormsFormatTestCase.java | 7 +-
.../org/apache/lucene/search/CheckHits.java | 4 +-
.../org/apache/lucene/search/QueryUtils.java | 10 +-
.../lucene/search/ShardSearchingTestBase.java | 8 +-
.../similarities/AssertingSimilarity.java | 94 ++-
.../similarities/BaseSimilarityTestCase.java | 154 +----
.../search/spans/AssertingSpanWeight.java | 10 +-
.../search/TestBaseExplanationTestCase.java | 2 +-
solr/CHANGES.txt | 53 ++
.../org/apache/solr/ltr/model/LinearModel.java | 2 +-
.../ltr/model/MultipleAdditiveTreesModel.java | 2 +-
.../org/apache/solr/ltr/norm/Normalizer.java | 2 +-
.../apache/solr/cloud/DeleteCollectionCmd.java | 13 +-
.../java/org/apache/solr/cloud/Overseer.java | 6 +-
.../cloud/OverseerCollectionMessageHandler.java | 3 +-
.../solr/cloud/OverseerTaskProcessor.java | 7 +-
.../cloud/RoutedAliasCreateCollectionCmd.java | 182 ++++++
.../cloud/autoscaling/ScheduledTriggers.java | 34 +-
.../handler/DocumentAnalysisRequestHandler.java | 3 -
.../handler/FieldAnalysisRequestHandler.java | 3 -
.../org/apache/solr/handler/SchemaHandler.java | 12 +-
.../org/apache/solr/handler/StreamHandler.java | 10 +-
.../solr/handler/admin/CollectionsHandler.java | 16 +-
.../handler/component/HighlightComponent.java | 52 +-
.../solr/handler/component/QueryComponent.java | 2 +-
.../handler/component/StatsValuesFactory.java | 60 --
.../solr/handler/component/TermsComponent.java | 26 +-
.../org/apache/solr/query/SolrRangeQuery.java | 8 +-
.../apache/solr/request/SolrRequestInfo.java | 12 +-
.../java/org/apache/solr/schema/LatLonType.java | 2 +-
.../apache/solr/search/BoostQParserPlugin.java | 21 +-
.../solr/search/ExtendedDismaxQParser.java | 5 +-
.../solr/search/GraphTermsQParserPlugin.java | 38 +-
.../java/org/apache/solr/search/Grouping.java | 51 --
.../apache/solr/search/SolrIndexSearcher.java | 6 +-
.../apache/solr/search/ValueSourceParser.java | 3 +-
.../apache/solr/search/facet/FacetRange.java | 10 +-
.../solr/search/facet/FacetRangeMerger.java | 2 +-
.../SearchGroupsRequestFactory.java | 3 -
.../TopGroupsShardRequestFactory.java | 3 -
.../SearchGroupShardResponseProcessor.java | 3 -
.../StoredFieldsShardResponseProcessor.java | 3 -
.../TopGroupsShardResponseProcessor.java | 3 -
.../SearchGroupsResultTransformer.java | 6 -
.../TopGroupsResultTransformer.java | 6 -
.../GroupedEndResultTransformer.java | 3 -
.../MainEndResultTransformer.java | 3 -
.../SimpleEndResultTransformer.java | 3 -
.../solr/search/stats/ExactStatsCache.java | 8 +-
.../apache/solr/search/stats/LRUStatsCache.java | 4 +-
.../solr/search/stats/LocalStatsSource.java | 4 +-
.../apache/solr/search/stats/StatsSource.java | 4 +-
.../solr/security/AuthenticationPlugin.java | 1 +
.../apache/solr/servlet/SolrDispatchFilter.java | 48 +-
.../TimeRoutedAliasUpdateProcessor.java | 228 +++++++-
.../org/apache/solr/util/TimeZoneUtils.java | 18 +
.../configuration/providers/package-info.java | 23 -
.../TestEmbeddedSolrServerSchemaAPI.java | 16 +-
.../apache/solr/cloud/AliasIntegrationTest.java | 160 ++++-
.../apache/solr/cloud/TestConfigSetsAPI.java | 3 +-
.../solr/cloud/autoscaling/TestPolicyCloud.java | 8 +-
.../autoscaling/TriggerIntegrationTest.java | 18 -
.../cloud/autoscaling/sim/SimCloudManager.java | 17 +
.../autoscaling/sim/SimSolrCloudTestCase.java | 11 +-
.../cloud/autoscaling/sim/TestLargeCluster.java | 116 +++-
.../cloud/autoscaling/sim/package-info.java | 79 ++-
.../solr/core/TestConfigSetImmutable.java | 6 +-
.../component/CustomHighlightComponentTest.java | 310 ++++++++++
.../solr/rest/schema/TestBulkSchemaAPI.java | 91 +--
.../solr/schema/SchemaApiFailureTest.java | 66 +++
.../org/apache/solr/schema/TestPointFields.java | 66 +--
.../solr/search/TestReRankQParserPlugin.java | 41 ++
.../solr/search/facet/TestJsonFacets.java | 42 ++
.../solr/search/function/TestFunctionQuery.java | 16 +-
.../similarities/BaseSimilarityTestCase.java | 2 +-
.../TestSweetSpotSimilarityFactory.java | 2 +-
.../solr/security/MockAuthorizationPlugin.java | 19 +-
.../PKIAuthenticationIntegrationTest.java | 15 +-
.../security/TestAuthorizationFramework.java | 35 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 140 +++--
solr/licenses/icu4j-59.1.jar.sha1 | 1 -
solr/licenses/icu4j-60.2.jar.sha1 | 1 +
solr/solr-ref-guide/src/documents-screen.adoc | 52 +-
solr/solr-ref-guide/src/schema-api.adoc | 20 +-
.../src/solrcloud-autoscaling-api.adoc | 3 -
.../apache/solr/client/solrj/SolrRequest.java | 6 +-
.../apache/solr/client/solrj/SolrResponse.java | 2 +
.../cloud/autoscaling/AddReplicaSuggester.java | 9 +
.../cloud/autoscaling/MoveReplicaSuggester.java | 8 +
.../client/solrj/cloud/autoscaling/Policy.java | 16 +-
.../client/solrj/cloud/autoscaling/Row.java | 9 +-
.../solrj/cloud/autoscaling/Suggester.java | 12 +-
.../solrj/cloud/autoscaling/Suggestion.java | 11 +-
.../solrj/impl/SolrClientNodeStateProvider.java | 27 +-
.../client/solrj/io/eval/AkimaEvaluator.java | 71 +++
.../solr/client/solrj/io/eval/Attributes.java | 26 +
.../io/eval/ChiSquareDataSetEvaluator.java | 65 +++
.../solrj/io/eval/CorrelationEvaluator.java | 6 +-
.../eval/CorrelationSignificanceEvaluator.java | 2 +-
.../solrj/io/eval/GTestDataSetEvaluator.java | 64 ++
.../solrj/io/eval/GetAttributeEvaluator.java | 43 ++
.../solrj/io/eval/GetColumnLabelsEvaluator.java | 42 ++
.../solrj/io/eval/GetRowLabelsEvaluator.java | 42 ++
.../client/solrj/io/eval/LerpEvaluator.java | 71 +++
.../solr/client/solrj/io/eval/Matrix.java | 35 +-
.../client/solrj/io/eval/MeanEvaluator.java | 1 -
.../client/solrj/io/eval/SequenceEvaluator.java | 2 +-
.../solrj/io/eval/TermVectorsEvaluator.java | 177 ++++++
.../solrj/io/eval/TransposeEvaluator.java | 6 +-
.../solrj/request/DocumentAnalysisRequest.java | 3 -
.../solrj/request/FieldAnalysisRequest.java | 3 -
.../response/DocumentAnalysisResponse.java | 3 -
.../solrj/response/FieldAnalysisResponse.java | 3 -
.../solrj/response/schema/SchemaResponse.java | 39 --
.../java/org/apache/solr/common/MapWriter.java | 13 +
.../solr/common/cloud/rule/ImplicitSnitch.java | 1 +
.../solr/common/params/AutoScalingParams.java | 2 +
.../solr/common/params/CollectionParams.java | 1 +
.../java/org/apache/solr/common/util/Pair.java | 11 +-
.../client/solrj/impl/CloudSolrClientTest.java | 23 -
.../solrj/io/stream/StreamExpressionTest.java | 362 +++++++++++-
.../solr/client/solrj/request/SchemaTest.java | 75 ++-
.../java/org/apache/solr/cloud/ChaosMonkey.java | 6 +-
278 files changed, 5248 insertions(+), 3282 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ca364c72/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------