[lucene-solr] 02/02: Resolve conflicts in CHANGES.

[to...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

tomoko pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 422cf144390a40477c19dbc0c88a82f104c62d5d
Merge: 98c85a0 8e81f47
Author: Tomoko Uchida <to...@apache.org>
AuthorDate: Sat Jun 22 16:41:27 2019 +0900

    Resolve conflicts in CHANGES.

 lucene/CHANGES.txt                                 |   3 +
 .../desktop/components/AnalysisPanelProvider.java  | 197 ++++------
 .../desktop/components/SearchPanelProvider.java    |   4 +-
 .../analysis/SimpleAnalyzeResultPanelOperator.java |  32 ++
 .../analysis/SimpleAnalyzeResultPanelProvider.java | 196 ++++++++++
 .../StepByStepAnalyzeResultPanelOperator.java      |  31 ++
 .../StepByStepAnalyzeResultPanelProvider.java      | 415 +++++++++++++++++++++
 .../lucene/luke/models/analysis/Analysis.java      |  76 ++++
 .../lucene/luke/models/analysis/AnalysisImpl.java  | 191 +++++++++-
 .../luke/app/desktop/messages/messages.properties  |   2 +
 .../luke/models/analysis/AnalysisImplTest.java     |  40 ++
 11 files changed, 1042 insertions(+), 145 deletions(-)

diff --cc lucene/CHANGES.txt
index 09ef1fa,4e94c5d..7e0c4f8
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@@ -30,50 -26,17 +30,51 @@@ Bug fixe
  Other
  
  * LUCENE-8768: Fix Javadocs build in Java 11. (Namgyu Kim)
+ 
 +* LUCENE-8778: Define analyzer SPI names as static final fields and document the names in Javadocs.
 +  (Tomoko Uchida, Uwe Schindler)
 +
  ======================= Lucene 8.2.0 =======================
  
 +API Changes
 +
 +* LUCENE-8865: IndexSearcher now uses Executor instead of ExecutorSerivce.
 +  This change is fully backwards compatible since ExecutorService directly
 +  implements Executor. (Simon Willnauer)
 +
 +New Features
 +
 +* LUCENE-8815: Provide a DoubleValues implementation for retrieving the value of features without
 +  requiring a separate numeric field. Note that as feature values are stored with only 8 bits of 
 +  mantissa the values returned may have a delta from the original values indexed.
 +  (Colin Goodheart-Smithe via Adrien Grand)
 +
 +* LUCENE-8803: Provide a FeatureSortfield to allow sorting search hits by descending value of a
 +  feature. This is exposed via the factory method FeatureField#newFeatureSort.
 +  (Colin Goodheart-Smithe via Adrien Grand)
 +
 +* LUCENE-8784: The KoreanTokenizer now preserves punctuations if discardPunctuation is set
 +  to false (defaults to true).
 +  (Namgyu Kim via Jim Ferenczi)
 +
 +* LUCENE-8812: Add new KoreanNumberFilter that can change Hangul character to number
 +  and process decimal point. It is similar to the JapaneseNumberFilter.
 +  (Namgyu Kim)
 +
 +* LUCENE-8362: Add doc-value support to range fields. (Atri Sharma via Adrien Grand)
 +
 +* LUCENE-8766: Add monitor subproject (previously Luwak monitoring library). This
 +  allows a stream of documents to be matched against a set of registered queries
 +  in an efficient manner, for use as a monitoring or classification tool.
 +  (Alan Woodward)
 +
  Bug Fixes
  
 +* LUCENE-8831: Fixed LatLonShapeBoundingBoxQuery .hashCode methods. (Ignacio Vera)
 +
 +* LUCENE-8775: Improve tessellator to handle better cases where a hole share a vertex
 +  with the polygon. (Ignacio Vera)
 +
  * LUCENE-8785: Ensure new threadstates are locked before retrieving the number of active threadstates.
    This causes assertion errors and potentially broken field attributes in the IndexWriter when
    IndexWriter#deleteAll is called while actively indexing. (Simon Willnauer)
@@@ -99,56 -46,8 +100,58 @@@ Improvement
  * LUCENE-7840: Non-scoring BooleanQuery now removes SHOULD clauses before building the scorer supplier
    as opposed to eliminating them during scoring construction. (Atri Sharma via Jim Ferenczi)
  
 +* LUCENE-8770: BlockMaxConjunctionScorer now leverages two-phase iterators in order to avoid
 +  executing the second phase when scorers don't intersect. (Adrien Grand, Jim Ferenczi)
 +
 +* LUCENE-8757: When provided with an ExecutorService to run queries across
 +  multiple threads, IndexSearcher now groups small segments together, up to
 +  250k docs per slice. (Atri Sharma via Adrien Grand)
 +
 +* LUCENE-8818: Fix smokeTestRelease.py encoding bug (janhoy)
 +
 +* LUCENE-8845: Allow Intervals.prefix() and Intervals.wildcard() to specify
 +  their maximum allowed expansions (Alan Woodward)
 +
 +* LUCENE-8848 LUCENE-7757 LUCENE-8492: The UnifiedHighlighter now detects that parts of the query are not understood by
 +  it, and thus it should not make optimizations that result in no highlights or slow highlighting.  This generally works
 +  best for WEIGHT_MATCHES mode.  Consequently queries produced by ComplexPhraseQueryParser and the surround QueryParser
 +  will now highlight correctly. (David Smiley)
 +
+ * LUCENE-8793: Luke enhanced UI for CustomAnalyzer: show detailed analysis steps. (Jun Ohtani via Tomoko Uchida)
+ 
 +Optimizations
 +
 +* LUCENE-8796: Use exponential search instead of binary search in
 +  IntArrayDocIdSet#advance method (Luca Cavanna via Adrien Grand)
 +
 +* LUCENE-8865: Use incoming thread for execution if IndexSearcher has an executor.
 +  Now caller threads execute at least one search on an index even if there is
 +  an executor provided to minimize thread context switching. (Simon Willnauer)
 +
 +Test Framework
 +
 +* LUCENE-8825: CheckHits now display the shard index in case of mismatch
 +  between top hits. (Atri Sharma via Adrien Grand)
 +
 +Other
 +
 +* LUCENE-8847: Code Cleanup: Remove StringBuilder.append with concatenated
 +  strings. (Koen De Groote via Uwe Schindler)
 +
 +* LUCENE-8861: Script to find open Github PRs that needs attention (janhoy)
 +
 +* LUCENE-8852: ReleaseWizard tool for release managers (janhoy)
 +
 +======================= Lucene 8.1.1 =======================
 +(No Changes)
 +
 +Improvements
 +
 +* LUCENE-8781: FST lookup performance has been improved in many cases by
 +  encoding Arcs using full-sized arrays with gaps. The new encoding is
 +  enabled for postings in the default codec and for suggesters. (Mike Sokolov)
 +
 +
  ======================= Lucene 8.1.0 =======================
  
  API Changes