You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2020/08/14 14:04:57 UTC
[lucene-solr] branch jira/lucene-8962 updated (a2f392c -> 1f885db)
This is an automated email from the ASF dual-hosted git repository.
simonw pushed a change to branch jira/lucene-8962
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from a2f392c Merge branch 'master' into jira/lucene-8962
add 150a8da LUCENE-9463: Query match region retrieval component, passage scoring and formatting (#1750)
add 4a4d6fa Merge branch 'master' into jira/lucene-8962
add 1f885db Ensure we hold a valid ref to every SR while we merge them in the background
No new revisions were added by this update.
Summary of changes:
lucene/CHANGES.txt | 3 +
.../java/org/apache/lucene/index/IndexWriter.java | 10 +-
.../lucene/index/StandardDirectoryReader.java | 2 +-
lucene/highlighter/build.gradle | 1 +
lucene/highlighter/build.xml | 1 +
.../BreakIteratorShrinkingAdjuster.java | 86 +++
.../matchhighlight/CharSequenceIterator.java | 104 +++
.../matchhighlight/MatchRegionRetriever.java | 304 ++++++++
.../lucene/search/matchhighlight/OffsetRange.java | 65 ++
.../matchhighlight/OffsetsFromMatchIterator.java | 49 ++
.../matchhighlight/OffsetsFromPositions.java | 154 +++++
.../search/matchhighlight/OffsetsFromTokens.java | 97 +++
.../search/matchhighlight/OffsetsFromValues.java | 74 ++
.../matchhighlight/OffsetsRetrievalStrategy.java | 42 ++
.../OffsetsRetrievalStrategySupplier.java} | 19 +-
.../lucene/search/matchhighlight/Passage.java} | 26 +-
.../search/matchhighlight/PassageAdjuster.java} | 22 +-
.../search/matchhighlight/PassageFormatter.java | 214 ++++++
.../search/matchhighlight/PassageSelector.java | 273 ++++++++
.../search/matchhighlight/package-info.java} | 25 +-
.../matchhighlight/AsciiMatchRangeHighlighter.java | 81 +++
.../search/matchhighlight/MissingAnalyzer.java} | 26 +-
.../matchhighlight/TestMatchRegionRetriever.java | 767 +++++++++++++++++++++
.../search/matchhighlight/TestPassageSelector.java | 284 ++++++++
24 files changed, 2668 insertions(+), 61 deletions(-)
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/BreakIteratorShrinkingAdjuster.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/CharSequenceIterator.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/MatchRegionRetriever.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/OffsetRange.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/OffsetsFromMatchIterator.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/OffsetsFromPositions.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/OffsetsFromTokens.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/OffsetsFromValues.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/OffsetsRetrievalStrategy.java
copy lucene/highlighter/{build.gradle => src/java/org/apache/lucene/search/matchhighlight/OffsetsRetrievalStrategySupplier.java} (70%)
copy lucene/highlighter/{build.gradle => src/java/org/apache/lucene/search/matchhighlight/Passage.java} (57%)
copy lucene/highlighter/{build.gradle => src/java/org/apache/lucene/search/matchhighlight/PassageAdjuster.java} (69%)
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/PassageFormatter.java
create mode 100644 lucene/highlighter/src/java/org/apache/lucene/search/matchhighlight/PassageSelector.java
copy lucene/highlighter/{build.gradle => src/java/org/apache/lucene/search/matchhighlight/package-info.java} (57%)
create mode 100644 lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/AsciiMatchRangeHighlighter.java
copy lucene/highlighter/{build.gradle => src/test/org/apache/lucene/search/matchhighlight/MissingAnalyzer.java} (55%)
create mode 100644 lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestMatchRegionRetriever.java
create mode 100644 lucene/highlighter/src/test/org/apache/lucene/search/matchhighlight/TestPassageSelector.java