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 2019/03/18 08:40:11 UTC
[lucene-solr] branch jira/solr-11127-2 updated (49b448e -> 2fd0b3f)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-11127-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 49b448e SOLR-11127: Immplement .system collection back-compat check.
new 4ff4785 Fix some logic issues in /admin/segments reporting.
add 6d0386c SOLR-13234: Fix for turkish locales
add a18aa21 SOLR-12121: Remove a System.out.println in JWTAuthPlugin
add d19dcb4 LUCENE-8726: ValueSource.asDoubleValuesSource() could leak a reference to IndexSearcher
add 84785e8 LUCENE-8726: Changes entry
add 9096b84 LUCENE-8719: Traverse all paths at the end of a TokenStream in FixedShingleFilter
add 132a188 update doap files with the new release 8.0.0
add 2afa6cb Add 8.0.0 back compat test indexes and reenable backward compatibility tests for 9
add c2a6772 SOLR-13129: nested docs: add more/better documentation in Solr ref-guide
add ffb1fc8 Concurrently flush next buffer during commit in RandomIndexWriter (#607)
add fbd0516 LUCENE-3041: QueryVisitor (#581)
add 76babf8 SOLR-12923: Fix some issues w/concurrency and exception swallowing in SimClusterStateProvider/SimCloudManager
add 425f207 LUCENE-8688: Forced merges merge more than necessary.
add ad457d1 Improve RIW exception handling and opt out of concurrent flushing if exception is expected
add 571b307 SOLR-13292: Fix a logic bug when point types are present, add more details to the unit test.
new 2fd0b3f Merge branch 'master' into jira/solr-11127-2
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
dev-tools/doap/lucene.rdf | 5 +
dev-tools/doap/solr.rdf | 5 +
lucene/CHANGES.txt | 23 ++
.../analysis/shingle/FixedShingleFilter.java | 94 ++---
.../analysis/shingle/FixedShingleFilterTest.java | 17 +
.../lucene/index/TestBackwardsCompatibility.java | 43 +-
.../org/apache/lucene/index/dvupdates.8.0.0.zip | Bin 0 -> 13396 bytes
.../test/org/apache/lucene/index/empty.8.0.0.zip | Bin 0 -> 376 bytes
.../org/apache/lucene/index/index.8.0.0-cfs.zip | Bin 0 -> 15594 bytes
.../org/apache/lucene/index/index.8.0.0-nocfs.zip | Bin 0 -> 15593 bytes
.../org/apache/lucene/index/moreterms.8.0.0.zip | Bin 0 -> 82427 bytes
.../test/org/apache/lucene/index/sorted.8.0.0.zip | Bin 0 -> 133026 bytes
.../classification/utils/NearestFuzzyQuery.java | 6 +
.../org/apache/lucene/document/FeatureQuery.java | 22 +-
.../lucene/document/LatLonDocValuesBoxQuery.java | 8 +
.../document/LatLonDocValuesDistanceQuery.java | 8 +
.../document/LatLonPointDistanceFeatureQuery.java | 13 +-
.../lucene/document/LatLonPointDistanceQuery.java | 8 +
.../lucene/document/LatLonPointInPolygonQuery.java | 8 +
.../lucene/document/LongDistanceFeatureQuery.java | 13 +-
.../apache/lucene/document/RangeFieldQuery.java | 10 +-
.../document/SortedNumericDocValuesRangeQuery.java | 8 +
.../document/SortedSetDocValuesRangeQuery.java | 8 +
.../org/apache/lucene/index/TieredMergePolicy.java | 57 ++-
.../org/apache/lucene/search/AutomatonQuery.java | 9 +-
.../org/apache/lucene/search/BlendedTermQuery.java | 11 +-
.../org/apache/lucene/search/BooleanQuery.java | 12 +
.../org/apache/lucene/search/BooleanWeight.java | 13 -
.../java/org/apache/lucene/search/BoostQuery.java | 5 +
.../apache/lucene/search/ConstantScoreQuery.java | 5 +
.../apache/lucene/search/ConstantScoreWeight.java | 9 -
.../apache/lucene/search/DisjunctionMaxQuery.java | 19 +-
.../lucene/search/DocValuesFieldExistsQuery.java | 7 +
.../lucene/search/DocValuesRewriteMethod.java | 7 +
.../apache/lucene/search/DoubleValuesSource.java | 5 +-
.../org/apache/lucene/search/FilterWeight.java | 7 -
.../java/org/apache/lucene/search/FuzzyQuery.java | 20 +-
.../org/apache/lucene/search/FuzzyTermsEnum.java | 62 ++-
.../lucene/search/IndexOrDocValuesQuery.java | 14 +-
.../org/apache/lucene/search/LRUQueryCache.java | 6 -
.../apache/lucene/search/MatchAllDocsQuery.java | 5 +
.../org/apache/lucene/search/MatchNoDocsQuery.java | 11 +-
.../org/apache/lucene/search/MultiPhraseQuery.java | 21 +-
.../search/MultiTermQueryConstantScoreWrapper.java | 7 +
.../org/apache/lucene/search/NGramPhraseQuery.java | 5 +
.../lucene/search/NormsFieldExistsQuery.java | 7 +
.../java/org/apache/lucene/search/PhraseQuery.java | 19 +-
.../org/apache/lucene/search/PointInSetQuery.java | 7 +
.../org/apache/lucene/search/PointRangeQuery.java | 7 +
.../src/java/org/apache/lucene/search/Query.java | 6 +
.../org/apache/lucene/search/QueryVisitor.java | 94 +++++
.../org/apache/lucene/search/SynonymQuery.java | 25 +-
.../org/apache/lucene/search/TermInSetQuery.java | 25 +-
.../java/org/apache/lucene/search/TermQuery.java | 13 +-
.../src/java/org/apache/lucene/search/Weight.java | 10 -
.../org/apache/lucene/search/package-info.java | 6 -
.../lucene/search/spans/FieldMaskingSpanQuery.java | 15 +-
.../apache/lucene/search/spans/SpanBoostQuery.java | 9 +
.../lucene/search/spans/SpanContainQuery.java | 31 +-
.../search/spans/SpanMultiTermQueryWrapper.java | 10 +-
.../apache/lucene/search/spans/SpanNearQuery.java | 31 +-
.../apache/lucene/search/spans/SpanNotQuery.java | 19 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 21 +-
.../search/spans/SpanPositionCheckQuery.java | 15 +-
.../apache/lucene/search/spans/SpanTermQuery.java | 16 +-
.../apache/lucene/document/TestFeatureField.java | 26 --
.../apache/lucene/index/TestTieredMergePolicy.java | 98 +++++
.../apache/lucene/search/JustCompileSearch.java | 12 +-
.../lucene/search/TestBoolean2ScorerSupplier.java | 10 +-
.../org/apache/lucene/search/TestBooleanQuery.java | 45 ++-
.../apache/lucene/search/TestBooleanScorer.java | 11 +-
.../apache/lucene/search/TestConjunctionDISI.java | 7 -
.../lucene/search/TestConstantScoreQuery.java | 22 +-
.../apache/lucene/search/TestLRUQueryCache.java | 31 +-
.../lucene/search/TestMaxScoreSumPropagator.java | 7 -
.../lucene/search/TestMultiTermQueryRewrites.java | 5 +
.../org/apache/lucene/search/TestNeedsScores.java | 5 +
.../org/apache/lucene/search/TestPrefixRandom.java | 5 +
.../apache/lucene/search/TestQueryRescorer.java | 10 +-
.../org/apache/lucene/search/TestQueryVisitor.java | 333 ++++++++++++++++
.../apache/lucene/search/TestRegexpRandom2.java | 7 +-
.../org/apache/lucene/search/TestScorerPerf.java | 7 +-
.../org/apache/lucene/search/TestSortRandom.java | 5 +
.../TestUsageTrackingFilterCachingPolicy.java | 5 +
.../org/apache/lucene/search/TestWANDScorer.java | 5 +
.../search/spans/JustCompileSearchSpans.java | 6 +
.../search/spans/TestFieldMaskingSpanQuery.java | 13 +-
.../org/apache/lucene/facet/DrillDownQuery.java | 6 +
.../apache/lucene/facet/DrillSidewaysQuery.java | 11 +-
.../org/apache/lucene/facet/range/DoubleRange.java | 6 +
.../org/apache/lucene/facet/range/LongRange.java | 6 +
.../org/apache/lucene/facet/TestDrillSideways.java | 6 +
.../lucene/facet/range/TestRangeFacetCounts.java | 6 +
.../search/highlight/QueryTermExtractor.java | 90 ++---
.../highlight/WeightedSpanTermExtractor.java | 7 +-
.../uhighlight/MemoryIndexOffsetStrategy.java | 13 +-
.../search/uhighlight/MultiTermHighlighting.java | 236 +++++------
.../lucene/search/uhighlight/OffsetsEnum.java | 27 +-
.../lucene/search/uhighlight/PhraseHelper.java | 33 +-
.../search/uhighlight/UnifiedHighlighter.java | 23 +-
.../lucene/search/highlight/HighlighterTest.java | 6 +
.../highlight/custom/HighlightCustomQueryTest.java | 16 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 17 +-
.../TestUnifiedHighlighterStrictPhrases.java | 6 +
.../search/vectorhighlight/FieldQueryTest.java | 8 +
.../lucene/search/join/GlobalOrdinalsQuery.java | 10 +-
.../search/join/GlobalOrdinalsWithScoreQuery.java | 10 +-
.../search/join/ParentChildrenBlockJoinQuery.java | 13 +-
.../search/join/PointInSetIncludingScoreQuery.java | 14 +-
.../search/join/TermsIncludingScoreQuery.java | 13 +-
.../org/apache/lucene/search/join/TermsQuery.java | 6 +
.../lucene/search/join/ToChildBlockJoinQuery.java | 9 +-
.../lucene/search/join/ToParentBlockJoinQuery.java | 6 +
.../apache/lucene/search/join/TestBlockJoin.java | 33 +-
.../apache/lucene/search/join/TestJoinUtil.java | 16 +-
.../search/TestDiversifiedTopDocsCollector.java | 13 +-
.../apache/lucene/queries/CommonTermsQuery.java | 12 +-
.../queries/function/FunctionMatchQuery.java | 6 +
.../lucene/queries/function/FunctionQuery.java | 12 +-
.../queries/function/FunctionRangeQuery.java | 13 +-
.../queries/function/FunctionScoreQuery.java | 18 +-
.../lucene/queries/function/ValueSource.java | 14 +-
.../lucene/queries/mlt/MoreLikeThisQuery.java | 18 +-
.../lucene/queries/payloads/PayloadScoreQuery.java | 13 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 16 +-
.../lucene/queries/function/TestValueSources.java | 52 +--
.../complexPhrase/ComplexPhraseQueryParser.java | 6 +
.../surround/query/DistanceRewriteQuery.java | 8 +
.../surround/query/SimpleTermRewriteQuery.java | 14 +-
.../queryparser/classic/TestMultiAnalyzer.java | 17 +-
.../apache/lucene/document/LatLonShapeQuery.java | 8 +
.../lucene/sandbox/queries/FuzzyLikeThisQuery.java | 8 +-
.../java/org/apache/lucene/search/BM25FQuery.java | 14 +-
.../org/apache/lucene/search/CoveringQuery.java | 17 +-
.../lucene/search/DocValuesNumbersQuery.java | 8 +
.../apache/lucene/search/DocValuesTermsQuery.java | 9 +-
.../apache/lucene/search/TermAutomatonQuery.java | 23 +-
.../intervals/ConjunctionIntervalsSource.java | 10 +-
.../intervals/DifferenceIntervalsSource.java | 10 +-
.../intervals/DisjunctionIntervalsSource.java | 11 +-
.../search/intervals/ExtendedIntervalsSource.java | 7 +-
.../search/intervals/FilteredIntervalsSource.java | 7 +-
.../intervals/FixedFieldIntervalsSource.java | 7 +-
.../lucene/search/intervals/IntervalQuery.java | 15 +-
.../lucene/search/intervals/IntervalsSource.java | 9 +-
.../MinimumShouldMatchIntervalsSource.java | 10 +-
.../search/intervals/MultiTermIntervalsSource.java | 5 +-
.../search/intervals/OffsetIntervalsSource.java | 7 +-
.../search/intervals/TermIntervalsSource.java | 6 +-
.../idversion/TestIDVersionPostingsFormat.java | 2 +-
.../sandbox/queries/FuzzyLikeThisQueryTest.java | 16 +-
.../lucene/search/TestTermAutomatonQuery.java | 5 +
.../spatial/composite/CompositeVerifyQuery.java | 6 +
.../composite/IntersectsRPTVerifyQuery.java | 6 +
.../spatial/prefix/AbstractPrefixTreeQuery.java | 8 +
.../spatial/serialized/SerializedDVStrategy.java | 6 +
.../lucene/spatial/vector/PointVectorStrategy.java | 6 +
.../lucene/spatial3d/PointInGeo3DShapeQuery.java | 8 +
.../search/suggest/document/CompletionWeight.java | 7 -
.../search/suggest/document/ContextQuery.java | 6 +
.../suggest/document/PrefixCompletionQuery.java | 5 +
.../suggest/document/RegexCompletionQuery.java | 6 +
.../suggest/document/TestContextSuggestField.java | 4 +-
.../lucene/index/BaseMergePolicyTestCase.java | 8 +-
.../org/apache/lucene/index/RandomIndexWriter.java | 80 +++-
.../org/apache/lucene/search/AssertingQuery.java | 5 +
.../lucene/search/BlockScoreQueryWrapper.java | 12 +-
.../java/org/apache/lucene/search/QueryUtils.java | 3 +
.../lucene/search/RandomApproximationQuery.java | 7 +-
.../lucene/search/ShardSearchingTestBase.java | 5 +-
.../lucene/search/spans/AssertingSpanQuery.java | 12 +-
.../lucene/search/spans/AssertingSpanWeight.java | 7 -
solr/CHANGES.txt | 2 +-
.../java/org/apache/solr/ltr/LTRScoringQuery.java | 15 +-
.../java/org/apache/solr/ltr/feature/Feature.java | 13 +-
.../solr/ltr/feature/OriginalScoreFeature.java | 7 -
.../org/apache/solr/ltr/feature/SolrFeature.java | 9 -
.../exporter/SolrExporterIntegrationTest.java | 12 +-
.../solr/legacy/LegacyNumericRangeQuery.java | 8 +-
.../apache/solr/parser/SolrQueryParserBase.java | 8 +-
.../java/org/apache/solr/query/FilterQuery.java | 5 +
.../java/org/apache/solr/query/SolrRangeQuery.java | 8 +-
.../java/org/apache/solr/schema/LatLonType.java | 7 +
.../apache/solr/search/AbstractReRankQuery.java | 6 +
.../org/apache/solr/search/AnalyticsQuery.java | 8 +-
.../solr/search/CollapsingQParserPlugin.java | 6 +
.../apache/solr/search/ExportQParserPlugin.java | 6 +
.../src/java/org/apache/solr/search/Filter.java | 11 +-
.../solr/search/GraphTermsQParserPlugin.java | 20 +-
.../org/apache/solr/search/HashQParserPlugin.java | 6 +
.../org/apache/solr/search/JoinQParserPlugin.java | 6 +
.../apache/solr/search/SolrConstantScoreQuery.java | 6 +
.../org/apache/solr/search/SolrIndexSearcher.java | 5 +
.../java/org/apache/solr/search/WrappedQuery.java | 10 +-
.../solr/search/join/BlockJoinFacetFilter.java | 6 +
.../org/apache/solr/search/join/GraphQuery.java | 14 +-
.../solr/search/join/ScoreJoinQParserPlugin.java | 6 +
.../apache/solr/search/stats/ExactStatsCache.java | 34 +-
.../org/apache/solr/security/JWTAuthPlugin.java | 1 -
.../apache/solr/update/DeleteByQueryWrapper.java | 13 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 6 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 25 +-
.../cloud/autoscaling/sim/SimCloudManager.java | 75 +++-
.../autoscaling/sim/SimClusterStateProvider.java | 438 +++++++++++----------
.../autoscaling/sim/SimSolrCloudTestCase.java | 22 +-
.../autoscaling/sim/TestSimExtremeIndexing.java | 4 +-
.../cloud/autoscaling/sim/TestSimLargeCluster.java | 36 ++
.../apache/solr/search/RankQueryTestPlugin.java | 6 +
.../solr/uninverting/TestFieldCacheSortRandom.java | 8 +-
solr/solr-ref-guide/src/blockjoin-faceting.adoc | 2 +-
.../src/indexing-and-basic-data-operations.adoc | 15 +-
.../src/indexing-nested-documents.adoc | 151 +++++++
solr/solr-ref-guide/src/json-facet-api.adoc | 2 +-
.../src/json-faceting-domain-changes.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 2 +-
.../src/searching-nested-documents.adoc | 202 ++++++++++
solr/solr-ref-guide/src/searching.adoc | 2 +
.../src/transforming-and-indexing-custom-json.adoc | 100 -----
.../src/transforming-result-documents.adoc | 6 +-
.../src/uploading-data-with-index-handlers.adoc | 102 -----
.../java/org/apache/solr/common/util/Utils.java | 1 +
221 files changed, 2952 insertions(+), 1496 deletions(-)
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/dvupdates.8.0.0.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/empty.8.0.0.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.0.0-cfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.0.0-nocfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/moreterms.8.0.0.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.8.0.0.zip
create mode 100644 lucene/core/src/java/org/apache/lucene/search/QueryVisitor.java
create mode 100644 lucene/core/src/test/org/apache/lucene/search/TestQueryVisitor.java
create mode 100644 solr/solr-ref-guide/src/indexing-nested-documents.adoc
create mode 100644 solr/solr-ref-guide/src/searching-nested-documents.adoc
[lucene-solr] 02/02: Merge branch 'master' into jira/solr-11127-2
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-11127-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 2fd0b3f0d2bb83f7484ef0763e9cd0fff6a98a54
Merge: 4ff4785 571b307
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Fri Mar 15 12:05:08 2019 +0100
Merge branch 'master' into jira/solr-11127-2
dev-tools/doap/lucene.rdf | 5 +
dev-tools/doap/solr.rdf | 5 +
lucene/CHANGES.txt | 23 ++
.../analysis/shingle/FixedShingleFilter.java | 94 ++---
.../analysis/shingle/FixedShingleFilterTest.java | 17 +
.../lucene/index/TestBackwardsCompatibility.java | 43 +-
.../org/apache/lucene/index/dvupdates.8.0.0.zip | Bin 0 -> 13396 bytes
.../test/org/apache/lucene/index/empty.8.0.0.zip | Bin 0 -> 376 bytes
.../org/apache/lucene/index/index.8.0.0-cfs.zip | Bin 0 -> 15594 bytes
.../org/apache/lucene/index/index.8.0.0-nocfs.zip | Bin 0 -> 15593 bytes
.../org/apache/lucene/index/moreterms.8.0.0.zip | Bin 0 -> 82427 bytes
.../test/org/apache/lucene/index/sorted.8.0.0.zip | Bin 0 -> 133026 bytes
.../classification/utils/NearestFuzzyQuery.java | 6 +
.../org/apache/lucene/document/FeatureQuery.java | 22 +-
.../lucene/document/LatLonDocValuesBoxQuery.java | 8 +
.../document/LatLonDocValuesDistanceQuery.java | 8 +
.../document/LatLonPointDistanceFeatureQuery.java | 13 +-
.../lucene/document/LatLonPointDistanceQuery.java | 8 +
.../lucene/document/LatLonPointInPolygonQuery.java | 8 +
.../lucene/document/LongDistanceFeatureQuery.java | 13 +-
.../apache/lucene/document/RangeFieldQuery.java | 10 +-
.../document/SortedNumericDocValuesRangeQuery.java | 8 +
.../document/SortedSetDocValuesRangeQuery.java | 8 +
.../org/apache/lucene/index/TieredMergePolicy.java | 57 ++-
.../org/apache/lucene/search/AutomatonQuery.java | 9 +-
.../org/apache/lucene/search/BlendedTermQuery.java | 11 +-
.../org/apache/lucene/search/BooleanQuery.java | 12 +
.../org/apache/lucene/search/BooleanWeight.java | 13 -
.../java/org/apache/lucene/search/BoostQuery.java | 5 +
.../apache/lucene/search/ConstantScoreQuery.java | 5 +
.../apache/lucene/search/ConstantScoreWeight.java | 9 -
.../apache/lucene/search/DisjunctionMaxQuery.java | 19 +-
.../lucene/search/DocValuesFieldExistsQuery.java | 7 +
.../lucene/search/DocValuesRewriteMethod.java | 7 +
.../apache/lucene/search/DoubleValuesSource.java | 5 +-
.../org/apache/lucene/search/FilterWeight.java | 7 -
.../java/org/apache/lucene/search/FuzzyQuery.java | 20 +-
.../org/apache/lucene/search/FuzzyTermsEnum.java | 62 ++-
.../lucene/search/IndexOrDocValuesQuery.java | 14 +-
.../org/apache/lucene/search/LRUQueryCache.java | 6 -
.../apache/lucene/search/MatchAllDocsQuery.java | 5 +
.../org/apache/lucene/search/MatchNoDocsQuery.java | 11 +-
.../org/apache/lucene/search/MultiPhraseQuery.java | 21 +-
.../search/MultiTermQueryConstantScoreWrapper.java | 7 +
.../org/apache/lucene/search/NGramPhraseQuery.java | 5 +
.../lucene/search/NormsFieldExistsQuery.java | 7 +
.../java/org/apache/lucene/search/PhraseQuery.java | 19 +-
.../org/apache/lucene/search/PointInSetQuery.java | 7 +
.../org/apache/lucene/search/PointRangeQuery.java | 7 +
.../src/java/org/apache/lucene/search/Query.java | 6 +
.../org/apache/lucene/search/QueryVisitor.java | 94 +++++
.../org/apache/lucene/search/SynonymQuery.java | 25 +-
.../org/apache/lucene/search/TermInSetQuery.java | 25 +-
.../java/org/apache/lucene/search/TermQuery.java | 13 +-
.../src/java/org/apache/lucene/search/Weight.java | 10 -
.../org/apache/lucene/search/package-info.java | 6 -
.../lucene/search/spans/FieldMaskingSpanQuery.java | 15 +-
.../apache/lucene/search/spans/SpanBoostQuery.java | 9 +
.../lucene/search/spans/SpanContainQuery.java | 31 +-
.../search/spans/SpanMultiTermQueryWrapper.java | 10 +-
.../apache/lucene/search/spans/SpanNearQuery.java | 31 +-
.../apache/lucene/search/spans/SpanNotQuery.java | 19 +-
.../apache/lucene/search/spans/SpanOrQuery.java | 21 +-
.../search/spans/SpanPositionCheckQuery.java | 15 +-
.../apache/lucene/search/spans/SpanTermQuery.java | 16 +-
.../apache/lucene/document/TestFeatureField.java | 26 --
.../apache/lucene/index/TestTieredMergePolicy.java | 98 +++++
.../apache/lucene/search/JustCompileSearch.java | 12 +-
.../lucene/search/TestBoolean2ScorerSupplier.java | 10 +-
.../org/apache/lucene/search/TestBooleanQuery.java | 45 ++-
.../apache/lucene/search/TestBooleanScorer.java | 11 +-
.../apache/lucene/search/TestConjunctionDISI.java | 7 -
.../lucene/search/TestConstantScoreQuery.java | 22 +-
.../apache/lucene/search/TestLRUQueryCache.java | 31 +-
.../lucene/search/TestMaxScoreSumPropagator.java | 7 -
.../lucene/search/TestMultiTermQueryRewrites.java | 5 +
.../org/apache/lucene/search/TestNeedsScores.java | 5 +
.../org/apache/lucene/search/TestPrefixRandom.java | 5 +
.../apache/lucene/search/TestQueryRescorer.java | 10 +-
.../org/apache/lucene/search/TestQueryVisitor.java | 333 ++++++++++++++++
.../apache/lucene/search/TestRegexpRandom2.java | 7 +-
.../org/apache/lucene/search/TestScorerPerf.java | 7 +-
.../org/apache/lucene/search/TestSortRandom.java | 5 +
.../TestUsageTrackingFilterCachingPolicy.java | 5 +
.../org/apache/lucene/search/TestWANDScorer.java | 5 +
.../search/spans/JustCompileSearchSpans.java | 6 +
.../search/spans/TestFieldMaskingSpanQuery.java | 13 +-
.../org/apache/lucene/facet/DrillDownQuery.java | 6 +
.../apache/lucene/facet/DrillSidewaysQuery.java | 11 +-
.../org/apache/lucene/facet/range/DoubleRange.java | 6 +
.../org/apache/lucene/facet/range/LongRange.java | 6 +
.../org/apache/lucene/facet/TestDrillSideways.java | 6 +
.../lucene/facet/range/TestRangeFacetCounts.java | 6 +
.../search/highlight/QueryTermExtractor.java | 90 ++---
.../highlight/WeightedSpanTermExtractor.java | 7 +-
.../uhighlight/MemoryIndexOffsetStrategy.java | 13 +-
.../search/uhighlight/MultiTermHighlighting.java | 236 +++++------
.../lucene/search/uhighlight/OffsetsEnum.java | 27 +-
.../lucene/search/uhighlight/PhraseHelper.java | 33 +-
.../search/uhighlight/UnifiedHighlighter.java | 23 +-
.../lucene/search/highlight/HighlighterTest.java | 6 +
.../highlight/custom/HighlightCustomQueryTest.java | 16 +-
.../uhighlight/TestUnifiedHighlighterMTQ.java | 17 +-
.../TestUnifiedHighlighterStrictPhrases.java | 6 +
.../search/vectorhighlight/FieldQueryTest.java | 8 +
.../lucene/search/join/GlobalOrdinalsQuery.java | 10 +-
.../search/join/GlobalOrdinalsWithScoreQuery.java | 10 +-
.../search/join/ParentChildrenBlockJoinQuery.java | 13 +-
.../search/join/PointInSetIncludingScoreQuery.java | 14 +-
.../search/join/TermsIncludingScoreQuery.java | 13 +-
.../org/apache/lucene/search/join/TermsQuery.java | 6 +
.../lucene/search/join/ToChildBlockJoinQuery.java | 9 +-
.../lucene/search/join/ToParentBlockJoinQuery.java | 6 +
.../apache/lucene/search/join/TestBlockJoin.java | 33 +-
.../apache/lucene/search/join/TestJoinUtil.java | 16 +-
.../search/TestDiversifiedTopDocsCollector.java | 13 +-
.../apache/lucene/queries/CommonTermsQuery.java | 12 +-
.../queries/function/FunctionMatchQuery.java | 6 +
.../lucene/queries/function/FunctionQuery.java | 12 +-
.../queries/function/FunctionRangeQuery.java | 13 +-
.../queries/function/FunctionScoreQuery.java | 18 +-
.../lucene/queries/function/ValueSource.java | 14 +-
.../lucene/queries/mlt/MoreLikeThisQuery.java | 18 +-
.../lucene/queries/payloads/PayloadScoreQuery.java | 13 +-
.../queries/payloads/SpanPayloadCheckQuery.java | 16 +-
.../lucene/queries/function/TestValueSources.java | 52 +--
.../complexPhrase/ComplexPhraseQueryParser.java | 6 +
.../surround/query/DistanceRewriteQuery.java | 8 +
.../surround/query/SimpleTermRewriteQuery.java | 14 +-
.../queryparser/classic/TestMultiAnalyzer.java | 17 +-
.../apache/lucene/document/LatLonShapeQuery.java | 8 +
.../lucene/sandbox/queries/FuzzyLikeThisQuery.java | 8 +-
.../java/org/apache/lucene/search/BM25FQuery.java | 14 +-
.../org/apache/lucene/search/CoveringQuery.java | 17 +-
.../lucene/search/DocValuesNumbersQuery.java | 8 +
.../apache/lucene/search/DocValuesTermsQuery.java | 9 +-
.../apache/lucene/search/TermAutomatonQuery.java | 23 +-
.../intervals/ConjunctionIntervalsSource.java | 10 +-
.../intervals/DifferenceIntervalsSource.java | 10 +-
.../intervals/DisjunctionIntervalsSource.java | 11 +-
.../search/intervals/ExtendedIntervalsSource.java | 7 +-
.../search/intervals/FilteredIntervalsSource.java | 7 +-
.../intervals/FixedFieldIntervalsSource.java | 7 +-
.../lucene/search/intervals/IntervalQuery.java | 15 +-
.../lucene/search/intervals/IntervalsSource.java | 9 +-
.../MinimumShouldMatchIntervalsSource.java | 10 +-
.../search/intervals/MultiTermIntervalsSource.java | 5 +-
.../search/intervals/OffsetIntervalsSource.java | 7 +-
.../search/intervals/TermIntervalsSource.java | 6 +-
.../idversion/TestIDVersionPostingsFormat.java | 2 +-
.../sandbox/queries/FuzzyLikeThisQueryTest.java | 16 +-
.../lucene/search/TestTermAutomatonQuery.java | 5 +
.../spatial/composite/CompositeVerifyQuery.java | 6 +
.../composite/IntersectsRPTVerifyQuery.java | 6 +
.../spatial/prefix/AbstractPrefixTreeQuery.java | 8 +
.../spatial/serialized/SerializedDVStrategy.java | 6 +
.../lucene/spatial/vector/PointVectorStrategy.java | 6 +
.../lucene/spatial3d/PointInGeo3DShapeQuery.java | 8 +
.../search/suggest/document/CompletionWeight.java | 7 -
.../search/suggest/document/ContextQuery.java | 6 +
.../suggest/document/PrefixCompletionQuery.java | 5 +
.../suggest/document/RegexCompletionQuery.java | 6 +
.../suggest/document/TestContextSuggestField.java | 4 +-
.../lucene/index/BaseMergePolicyTestCase.java | 8 +-
.../org/apache/lucene/index/RandomIndexWriter.java | 80 +++-
.../org/apache/lucene/search/AssertingQuery.java | 5 +
.../lucene/search/BlockScoreQueryWrapper.java | 12 +-
.../java/org/apache/lucene/search/QueryUtils.java | 3 +
.../lucene/search/RandomApproximationQuery.java | 7 +-
.../lucene/search/ShardSearchingTestBase.java | 5 +-
.../lucene/search/spans/AssertingSpanQuery.java | 12 +-
.../lucene/search/spans/AssertingSpanWeight.java | 7 -
solr/CHANGES.txt | 2 +-
.../java/org/apache/solr/ltr/LTRScoringQuery.java | 15 +-
.../java/org/apache/solr/ltr/feature/Feature.java | 13 +-
.../solr/ltr/feature/OriginalScoreFeature.java | 7 -
.../org/apache/solr/ltr/feature/SolrFeature.java | 9 -
.../exporter/SolrExporterIntegrationTest.java | 12 +-
.../solr/legacy/LegacyNumericRangeQuery.java | 8 +-
.../apache/solr/parser/SolrQueryParserBase.java | 8 +-
.../java/org/apache/solr/query/FilterQuery.java | 5 +
.../java/org/apache/solr/query/SolrRangeQuery.java | 8 +-
.../java/org/apache/solr/schema/LatLonType.java | 7 +
.../apache/solr/search/AbstractReRankQuery.java | 6 +
.../org/apache/solr/search/AnalyticsQuery.java | 8 +-
.../solr/search/CollapsingQParserPlugin.java | 6 +
.../apache/solr/search/ExportQParserPlugin.java | 6 +
.../src/java/org/apache/solr/search/Filter.java | 11 +-
.../solr/search/GraphTermsQParserPlugin.java | 20 +-
.../org/apache/solr/search/HashQParserPlugin.java | 6 +
.../org/apache/solr/search/JoinQParserPlugin.java | 6 +
.../apache/solr/search/SolrConstantScoreQuery.java | 6 +
.../org/apache/solr/search/SolrIndexSearcher.java | 5 +
.../java/org/apache/solr/search/WrappedQuery.java | 10 +-
.../solr/search/join/BlockJoinFacetFilter.java | 6 +
.../org/apache/solr/search/join/GraphQuery.java | 14 +-
.../solr/search/join/ScoreJoinQParserPlugin.java | 6 +
.../apache/solr/search/stats/ExactStatsCache.java | 34 +-
.../org/apache/solr/security/JWTAuthPlugin.java | 1 -
.../apache/solr/update/DeleteByQueryWrapper.java | 13 +-
.../org/apache/solr/update/SolrIndexSplitter.java | 6 +
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 3 +
.../cloud/autoscaling/sim/SimCloudManager.java | 75 +++-
.../autoscaling/sim/SimClusterStateProvider.java | 438 +++++++++++----------
.../autoscaling/sim/SimSolrCloudTestCase.java | 22 +-
.../autoscaling/sim/TestSimExtremeIndexing.java | 4 +-
.../cloud/autoscaling/sim/TestSimLargeCluster.java | 36 ++
.../apache/solr/search/RankQueryTestPlugin.java | 6 +
.../solr/uninverting/TestFieldCacheSortRandom.java | 8 +-
solr/solr-ref-guide/src/blockjoin-faceting.adoc | 2 +-
.../src/indexing-and-basic-data-operations.adoc | 15 +-
.../src/indexing-nested-documents.adoc | 151 +++++++
solr/solr-ref-guide/src/json-facet-api.adoc | 2 +-
.../src/json-faceting-domain-changes.adoc | 2 +-
solr/solr-ref-guide/src/other-parsers.adoc | 2 +-
.../src/searching-nested-documents.adoc | 202 ++++++++++
solr/solr-ref-guide/src/searching.adoc | 2 +
.../src/transforming-and-indexing-custom-json.adoc | 100 -----
.../src/transforming-result-documents.adoc | 6 +-
.../src/uploading-data-with-index-handlers.adoc | 102 -----
.../java/org/apache/solr/common/util/Utils.java | 1 +
221 files changed, 2934 insertions(+), 1492 deletions(-)
[lucene-solr] 01/02: Fix some logic issues in /admin/segments
reporting.
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-11127-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4ff4785a7857ec5fae1a6ebc91cfe8e710da2e41
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Fri Mar 15 11:15:14 2019 +0100
Fix some logic issues in /admin/segments reporting.
---
.../apache/solr/cloud/CollectionsAPISolrJTest.java | 22 ++++++++++++++++++----
1 file changed, 18 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
index 829bd88..03fd1eb 100644
--- a/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/CollectionsAPISolrJTest.java
@@ -84,6 +84,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
public void beforeTest() throws Exception {
configureCluster(4)
.addConfig("conf", configset("cloud-minimal"))
+ .addConfig("conf2", configset("cloud-dynamic"))
.configure();
// clear any persisted auto scaling configuration
@@ -606,7 +607,7 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
@Test
public void testColStatus() throws Exception {
final String collectionName = "collectionStatusTest";
- CollectionAdminRequest.createCollection(collectionName, "conf", 2, 2)
+ CollectionAdminRequest.createCollection(collectionName, "conf2", 2, 2)
.process(cluster.getSolrClient());
cluster.waitForActiveCollection(collectionName, 2, 4);
@@ -617,11 +618,24 @@ public class CollectionsAPISolrJTest extends SolrCloudTestCase {
for (int i = 0; i < 10; i++) {
SolrInputDocument doc = new SolrInputDocument();
doc.addField("id", String.valueOf(i));
+ doc.addField("number_i", i);
doc.addField("number_l", i);
+ doc.addField("number_f", i);
+ doc.addField("number_d", i);
+ doc.addField("number_ti", i);
+ doc.addField("number_tl", i);
+ doc.addField("number_tf", i);
+ doc.addField("number_td", i);
+ doc.addField("point", i + "," + i);
+ doc.addField("pointD", i + "," + i);
+ doc.addField("store", (i * 5) + "," + (i * 5));
+ doc.addField("boolean_b", true);
+ doc.addField("multi_int_with_docvals", i);
doc.addField("string_s", String.valueOf(i));
- doc.addField("string_txt", String.valueOf(i));
- doc.addField("timestamp", new Date());
- doc.addField("data_bin", binData);
+ doc.addField("tv_mv_string", "this is a test " + i);
+ doc.addField("timestamp_dt", new Date());
+ doc.addField("timestamp_tdt", new Date());
+ doc.addField("payload", binData);
client.add(collectionName, doc);
}
client.commit(collectionName);