Skip to content

Commit 09fbb2f

Browse files
JPMS refactoring (org.apache.lucene) (#17241)
Signed-off-by: Prudhvi Godithi <pgodithi@amazon.com>
1 parent 8325812 commit 09fbb2f

File tree

99 files changed

+503
-1880
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

99 files changed

+503
-1880
lines changed

CHANGELOG-3.0.md

+3-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,9 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2929
- Add task completion count in search backpressure stats API ([#10028](https://github.com/opensearch-project/OpenSearch/pull/10028/))
3030
- Deprecate CamelCase `PathHierarchy` tokenizer name in favor to lowercase `path_hierarchy` ([#10894](https://github.com/opensearch-project/OpenSearch/pull/10894))
3131
- Breaking change: Do not request "search_pipelines" metrics by default in NodesInfoRequest ([#12497](https://github.com/opensearch-project/OpenSearch/pull/12497))
32-
- Refactor `:libs` module `bootstrap` package to eliminate top level split packages for JPMS support [#17117](https://github.com/opensearch-project/OpenSearch/pull/17117))
33-
- Refactor the codebase to eliminate top level split packages for JPMS support. [#17153](https://github.com/opensearch-project/OpenSearch/pull/17153))
32+
- Refactor `:libs` module `bootstrap` package to eliminate top level split packages for JPMS support ([#17117](https://github.com/opensearch-project/OpenSearch/pull/17117))
33+
- Refactor the codebase to eliminate top level split packages for JPMS support ([#17153](https://github.com/opensearch-project/OpenSearch/pull/17153)
34+
- Refactor `:server` module `org.apacge.lucene` package to eliminate top level split packages for JPMS support ([#17241](https://github.com/opensearch-project/OpenSearch/pull/17241))
3435

3536
### Deprecated
3637

modules/analysis-common/src/main/java/org/opensearch/analysis/common/CJKBigramFilterFactory.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434

3535
import org.apache.lucene.analysis.TokenStream;
3636
import org.apache.lucene.analysis.cjk.CJKBigramFilter;
37-
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
3837
import org.opensearch.common.settings.Settings;
3938
import org.opensearch.env.Environment;
4039
import org.opensearch.index.IndexSettings;
4140
import org.opensearch.index.analysis.AbstractTokenFilterFactory;
4241
import org.opensearch.index.analysis.TokenFilterFactory;
42+
import org.opensearch.lucene.analysis.miscellaneous.DisableGraphAttribute;
4343

4444
import java.util.Arrays;
4545
import java.util.HashSet;

modules/analysis-common/src/main/java/org/opensearch/analysis/common/CommonAnalysisModulePlugin.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
import org.apache.lucene.analysis.lv.LatvianAnalyzer;
9292
import org.apache.lucene.analysis.miscellaneous.ASCIIFoldingFilter;
9393
import org.apache.lucene.analysis.miscellaneous.DelimitedTermFrequencyTokenFilter;
94-
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
9594
import org.apache.lucene.analysis.miscellaneous.KeywordRepeatFilter;
9695
import org.apache.lucene.analysis.miscellaneous.LengthFilter;
9796
import org.apache.lucene.analysis.miscellaneous.LimitTokenCountFilter;
@@ -149,6 +148,7 @@
149148
import org.opensearch.indices.analysis.AnalysisModule;
150149
import org.opensearch.indices.analysis.AnalysisModule.AnalysisProvider;
151150
import org.opensearch.indices.analysis.PreBuiltCacheFactory.CachingStrategy;
151+
import org.opensearch.lucene.analysis.miscellaneous.DisableGraphAttribute;
152152
import org.opensearch.plugins.AnalysisPlugin;
153153
import org.opensearch.plugins.Plugin;
154154
import org.opensearch.plugins.ScriptPlugin;

modules/analysis-common/src/test/java/org/opensearch/analysis/common/CJKFilterFactoryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434

3535
import org.apache.lucene.analysis.TokenStream;
3636
import org.apache.lucene.analysis.Tokenizer;
37-
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
3837
import org.apache.lucene.analysis.standard.StandardTokenizer;
3938
import org.opensearch.index.analysis.AnalysisTestsHelper;
4039
import org.opensearch.index.analysis.TokenFilterFactory;
40+
import org.opensearch.lucene.analysis.miscellaneous.DisableGraphAttribute;
4141
import org.opensearch.test.OpenSearchTestCase;
4242
import org.opensearch.test.OpenSearchTokenStreamTestCase;
4343
import org.junit.Before;

modules/analysis-common/src/test/java/org/opensearch/analysis/common/ShingleTokenFilterTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,11 +35,11 @@
3535
import org.apache.lucene.analysis.TokenStream;
3636
import org.apache.lucene.analysis.Tokenizer;
3737
import org.apache.lucene.analysis.core.WhitespaceTokenizer;
38-
import org.apache.lucene.analysis.miscellaneous.DisableGraphAttribute;
3938
import org.opensearch.common.settings.Settings;
4039
import org.opensearch.env.Environment;
4140
import org.opensearch.index.analysis.AnalysisTestsHelper;
4241
import org.opensearch.index.analysis.TokenFilterFactory;
42+
import org.opensearch.lucene.analysis.miscellaneous.DisableGraphAttribute;
4343
import org.opensearch.test.OpenSearchTestCase;
4444
import org.opensearch.test.OpenSearchTokenStreamTestCase;
4545

server/src/main/java/org/apache/lucene/document/BinaryRange.java modules/percolator/src/main/java/org/opensearch/percolator/BinaryRange.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,12 @@
2929
* GitHub history for details.
3030
*/
3131

32-
package org.apache.lucene.document;
32+
package org.opensearch.percolator;
3333

34+
import org.apache.lucene.document.Field;
35+
import org.apache.lucene.document.FieldType;
36+
import org.apache.lucene.document.InetAddressPoint;
37+
import org.apache.lucene.document.RangeFieldQuery;
3438
import org.apache.lucene.search.Query;
3539
import org.apache.lucene.util.BytesRef;
3640

modules/percolator/src/main/java/org/opensearch/percolator/PercolatorFieldMapper.java

-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131

3232
package org.opensearch.percolator;
3333

34-
import org.apache.lucene.document.BinaryRange;
3534
import org.apache.lucene.document.Field;
3635
import org.apache.lucene.document.FieldType;
3736
import org.apache.lucene.document.NumericDocValuesField;

modules/percolator/src/main/java/org/opensearch/percolator/QueryAnalyzer.java

+1-2
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,7 @@
3131

3232
package org.opensearch.percolator;
3333

34-
import org.apache.lucene.document.BinaryRange;
3534
import org.apache.lucene.index.Term;
36-
import org.apache.lucene.queries.BlendedTermQuery;
3735
import org.apache.lucene.queries.spans.SpanOrQuery;
3836
import org.apache.lucene.queries.spans.SpanTermQuery;
3937
import org.apache.lucene.search.BooleanClause.Occur;
@@ -56,6 +54,7 @@
5654
import org.opensearch.Version;
5755
import org.opensearch.common.lucene.search.function.FunctionScoreQuery;
5856
import org.opensearch.index.query.DateRangeIncludingNowQuery;
57+
import org.opensearch.lucene.queries.BlendedTermQuery;
5958

6059
import java.io.IOException;
6160
import java.io.UncheckedIOException;

modules/percolator/src/test/java/org/opensearch/percolator/CandidateQueryTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
import org.apache.lucene.index.Term;
5858
import org.apache.lucene.index.TermsEnum;
5959
import org.apache.lucene.index.memory.MemoryIndex;
60-
import org.apache.lucene.queries.BlendedTermQuery;
6160
import org.apache.lucene.queries.CommonTermsQuery;
6261
import org.apache.lucene.queries.spans.SpanNearQuery;
6362
import org.apache.lucene.queries.spans.SpanNotQuery;
@@ -110,6 +109,7 @@
110109
import org.opensearch.index.mapper.NumberFieldMapper;
111110
import org.opensearch.index.mapper.ParseContext;
112111
import org.opensearch.index.query.QueryShardContext;
112+
import org.opensearch.lucene.queries.BlendedTermQuery;
113113
import org.opensearch.plugins.Plugin;
114114
import org.opensearch.test.OpenSearchSingleNodeTestCase;
115115
import org.opensearch.test.VersionUtils;

modules/percolator/src/test/java/org/opensearch/percolator/QueryAnalyzerTests.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@
3939
import org.apache.lucene.document.LongPoint;
4040
import org.apache.lucene.document.SortedNumericDocValuesField;
4141
import org.apache.lucene.index.Term;
42-
import org.apache.lucene.queries.BlendedTermQuery;
4342
import org.apache.lucene.queries.CommonTermsQuery;
4443
import org.apache.lucene.queries.intervals.IntervalQuery;
4544
import org.apache.lucene.queries.intervals.Intervals;
@@ -75,6 +74,7 @@
7574
import org.opensearch.common.lucene.search.function.RandomScoreFunction;
7675
import org.opensearch.common.network.InetAddresses;
7776
import org.opensearch.index.search.OpenSearchToParentBlockJoinQuery;
77+
import org.opensearch.lucene.queries.BlendedTermQuery;
7878
import org.opensearch.percolator.QueryAnalyzer.QueryExtraction;
7979
import org.opensearch.percolator.QueryAnalyzer.Result;
8080
import org.opensearch.test.OpenSearchTestCase;

modules/reindex/src/main/java/org/opensearch/index/reindex/ReindexValidator.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
import org.apache.lucene.util.automaton.Automata;
3636
import org.apache.lucene.util.automaton.Automaton;
3737
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
38-
import org.apache.lucene.util.automaton.MinimizationOperations;
3938
import org.apache.lucene.util.automaton.Operations;
4039
import org.opensearch.action.ActionRequestValidationException;
4140
import org.opensearch.action.DocWriteRequest;
@@ -50,6 +49,7 @@
5049
import org.opensearch.common.settings.Settings;
5150
import org.opensearch.core.common.Strings;
5251
import org.opensearch.index.IndexNotFoundException;
52+
import org.opensearch.lucene.util.automaton.MinimizationOperations;
5353
import org.opensearch.search.builder.SearchSourceBuilder;
5454

5555
import java.util.List;

plugins/mapper-annotated-text/src/main/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedPassageFormatter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@
3535
import org.apache.lucene.search.highlight.Encoder;
3636
import org.apache.lucene.search.uhighlight.Passage;
3737
import org.apache.lucene.search.uhighlight.PassageFormatter;
38-
import org.apache.lucene.search.uhighlight.Snippet;
3938
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedText;
4039
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedText.AnnotationToken;
40+
import org.opensearch.lucene.search.uhighlight.Snippet;
4141

4242
import java.io.UnsupportedEncodingException;
4343
import java.net.URLEncoder;

plugins/mapper-annotated-text/src/main/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434

3535
import org.apache.lucene.analysis.Analyzer;
3636
import org.apache.lucene.search.highlight.Encoder;
37-
import org.apache.lucene.search.uhighlight.CustomUnifiedHighlighter;
3837
import org.apache.lucene.search.uhighlight.PassageFormatter;
3938
import org.opensearch.index.mapper.DocumentMapper;
4039
import org.opensearch.index.mapper.MappedFieldType;
4140
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedHighlighterAnalyzer;
4241
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedText;
4342
import org.opensearch.index.query.QueryShardContext;
43+
import org.opensearch.lucene.search.uhighlight.CustomUnifiedHighlighter;
4444
import org.opensearch.search.fetch.FetchSubPhase.HitContext;
4545

4646
import java.io.IOException;

plugins/mapper-annotated-text/src/test/java/org/opensearch/search/fetch/subphase/highlight/AnnotatedTextHighlighterTests.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -51,24 +51,24 @@
5151
import org.apache.lucene.search.TopDocs;
5252
import org.apache.lucene.search.highlight.DefaultEncoder;
5353
import org.apache.lucene.search.uhighlight.CustomSeparatorBreakIterator;
54-
import org.apache.lucene.search.uhighlight.CustomUnifiedHighlighter;
55-
import org.apache.lucene.search.uhighlight.Snippet;
5654
import org.apache.lucene.search.uhighlight.SplittingBreakIterator;
5755
import org.apache.lucene.store.Directory;
5856
import org.apache.lucene.tests.index.RandomIndexWriter;
5957
import org.opensearch.core.common.Strings;
6058
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedHighlighterAnalyzer;
6159
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotatedText;
6260
import org.opensearch.index.mapper.annotatedtext.AnnotatedTextFieldMapper.AnnotationAnalyzerWrapper;
61+
import org.opensearch.lucene.search.uhighlight.CustomUnifiedHighlighter;
62+
import org.opensearch.lucene.search.uhighlight.Snippet;
6363
import org.opensearch.test.OpenSearchTestCase;
6464

6565
import java.net.URLEncoder;
6666
import java.text.BreakIterator;
6767
import java.util.ArrayList;
6868
import java.util.Locale;
6969

70+
import static org.opensearch.lucene.search.uhighlight.CustomUnifiedHighlighter.MULTIVAL_SEP_CHAR;
7071
import static org.hamcrest.CoreMatchers.equalTo;
71-
import static org.apache.lucene.search.uhighlight.CustomUnifiedHighlighter.MULTIVAL_SEP_CHAR;
7272

7373
public class AnnotatedTextHighlighterTests extends OpenSearchTestCase {
7474

server/src/main/java/org/apache/lucene/index/OneMergeHelper.java

-72
This file was deleted.

0 commit comments

Comments
 (0)