Skip to content

Commit abf5850

Browse files
nknizepeternied
authored andcommitted
Revert "[Rename] server/src/main/java/org/apache (opensearch-project#162)"
This reverts commit c50e8c8 which went should have merged to the rename branch instead of the main branch. Signed-off-by: Peter Nied <petern@amazon.com>
1 parent 4c709c2 commit abf5850

11 files changed

+25
-25
lines changed

server/src/main/java/org/apache/lucene/analysis/miscellaneous/DeDuplicatingTokenFilter.java

+8-8
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import org.apache.lucene.analysis.TokenStream;
2525
import org.apache.lucene.analysis.tokenattributes.TermToBytesRefAttribute;
2626
import org.apache.lucene.util.BytesRef;
27-
import org.opensearch.common.hash.MurmurHash3;
27+
import org.elasticsearch.common.hash.MurmurHash3;
2828

2929
import java.io.IOException;
3030
import java.util.ArrayList;
@@ -34,14 +34,14 @@
3434
* have a minimum length - 6 is a good heuristic as it avoids filtering common
3535
* idioms/phrases but detects longer sections that are typical of cut+paste
3636
* copies of text.
37-
*
37+
*
3838
* <p>
3939
* Internally each token is hashed/moduloed into a single byte (so 256 possible
4040
* values for each token) and then recorded in a trie of seen byte sequences
4141
* using a {@link DuplicateByteSequenceSpotter}. This trie is passed into the
4242
* TokenFilter constructor so a single object can be reused across multiple
4343
* documents.
44-
*
44+
*
4545
* <p>
4646
* The emitDuplicates setting controls if duplicate tokens are filtered from
4747
* results or are output (the {@link DuplicateSequenceAttribute} attribute can
@@ -57,7 +57,7 @@ public DeDuplicatingTokenFilter(TokenStream in, DuplicateByteSequenceSpotter byt
5757
}
5858

5959
/**
60-
*
60+
*
6161
* @param in
6262
* The input token stream
6363
* @param byteStreamDuplicateSpotter
@@ -110,9 +110,9 @@ public final boolean incrementToken() throws IOException {
110110
}
111111

112112
public void loadAllTokens() throws IOException {
113-
// TODO consider changing this implementation to emit tokens as-we-go
114-
// rather than buffering all. However this array is perhaps not the
115-
// bulk of memory usage (in practice the dupSequenceSpotter requires
113+
// TODO consider changing this implementation to emit tokens as-we-go
114+
// rather than buffering all. However this array is perhaps not the
115+
// bulk of memory usage (in practice the dupSequenceSpotter requires
116116
// ~5x the original content size in its internal tree ).
117117
allTokens = new ArrayList<State>(256);
118118

@@ -198,4 +198,4 @@ private void recordLengthInfoState(short[] maxNumSightings, State[] tokenStates,
198198
}
199199

200200
}
201-
}
201+
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
package org.apache.lucene.index;
2121

22-
import org.opensearch.common.lucene.Lucene;
22+
import org.elasticsearch.common.lucene.Lucene;
2323

2424
import java.io.IOException;
2525
import java.util.ArrayList;

server/src/main/java/org/apache/lucene/queries/BinaryDocValuesRangeQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import org.apache.lucene.search.Weight;
3333
import org.apache.lucene.store.ByteArrayDataInput;
3434
import org.apache.lucene.util.BytesRef;
35-
import org.opensearch.index.mapper.RangeType;
35+
import org.elasticsearch.index.mapper.RangeType;
3636

3737
import java.io.IOException;
3838
import java.util.Objects;

server/src/main/java/org/apache/lucene/queries/ExtendedCommonTermsQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.apache.lucene.queries;
2121

2222
import org.apache.lucene.search.BooleanClause.Occur;
23-
import org.opensearch.common.lucene.search.Queries;
23+
import org.elasticsearch.common.lucene.search.Queries;
2424

2525
/**
2626
* Extended version of {@link CommonTermsQuery} that allows to pass in a

server/src/main/java/org/apache/lucene/queries/SearchAfterSortedDocQuery.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import org.apache.lucene.search.Sort;
3434
import org.apache.lucene.search.SortField;
3535
import org.apache.lucene.search.Weight;
36-
import org.opensearch.common.lucene.Lucene;
36+
import org.elasticsearch.common.lucene.Lucene;
3737

3838
import java.io.IOException;
3939
import java.util.Arrays;

server/src/main/java/org/apache/lucene/search/grouping/CollapseTopFieldDocs.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import org.apache.lucene.search.TopFieldDocs;
2727
import org.apache.lucene.search.TotalHits;
2828
import org.apache.lucene.util.PriorityQueue;
29-
import org.opensearch.common.util.CollectionUtils;
29+
import org.elasticsearch.common.util.CollectionUtils;
3030

3131
import java.util.ArrayList;
3232
import java.util.HashSet;

server/src/main/java/org/apache/lucene/search/grouping/CollapsingDocValuesSource.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@
2929
import org.apache.lucene.index.SortedSetDocValues;
3030
import org.apache.lucene.search.Scorable;
3131
import org.apache.lucene.util.BytesRef;
32-
import org.opensearch.index.fielddata.AbstractNumericDocValues;
33-
import org.opensearch.index.fielddata.AbstractSortedDocValues;
34-
import org.opensearch.index.mapper.MappedFieldType;
32+
import org.elasticsearch.index.fielddata.AbstractNumericDocValues;
33+
import org.elasticsearch.index.fielddata.AbstractSortedDocValues;
34+
import org.elasticsearch.index.mapper.MappedFieldType;
3535

3636
import java.io.IOException;
3737
import java.util.Collection;

server/src/main/java/org/apache/lucene/search/grouping/CollapsingTopDocsCollector.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import org.apache.lucene.search.Sort;
2626
import org.apache.lucene.search.SortField;
2727
import org.apache.lucene.search.TotalHits;
28-
import org.opensearch.index.mapper.MappedFieldType;
28+
import org.elasticsearch.index.mapper.MappedFieldType;
2929

3030
import java.io.IOException;
3131
import java.util.Collection;

server/src/main/java/org/apache/lucene/search/uhighlight/CustomPassageFormatter.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
package org.apache.lucene.search.uhighlight;
2121

2222
import org.apache.lucene.search.highlight.Encoder;
23-
import org.opensearch.search.fetch.subphase.highlight.HighlightUtils;
23+
import org.elasticsearch.search.fetch.subphase.highlight.HighlightUtils;
2424

2525
/**
2626
* Custom passage formatter that allows us to:

server/src/main/java/org/apache/lucene/search/uhighlight/CustomUnifiedHighlighter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131
import org.apache.lucene.search.spans.SpanQuery;
3232
import org.apache.lucene.search.spans.SpanTermQuery;
3333
import org.apache.lucene.util.BytesRef;
34-
import org.opensearch.common.CheckedSupplier;
35-
import org.opensearch.common.Nullable;
36-
import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
37-
import org.opensearch.index.IndexSettings;
34+
import org.elasticsearch.common.CheckedSupplier;
35+
import org.elasticsearch.common.Nullable;
36+
import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
37+
import org.elasticsearch.index.IndexSettings;
3838

3939
import java.io.IOException;
4040
import java.text.BreakIterator;

server/src/main/java/org/apache/lucene/search/vectorhighlight/CustomFieldQuery.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@
3030
import org.apache.lucene.search.SynonymQuery;
3131
import org.apache.lucene.search.TermQuery;
3232
import org.apache.lucene.search.spans.SpanTermQuery;
33-
import org.opensearch.common.lucene.search.MultiPhrasePrefixQuery;
34-
import org.opensearch.common.lucene.search.function.FunctionScoreQuery;
35-
import org.opensearch.index.search.ESToParentBlockJoinQuery;
33+
import org.elasticsearch.common.lucene.search.MultiPhrasePrefixQuery;
34+
import org.elasticsearch.common.lucene.search.function.FunctionScoreQuery;
35+
import org.elasticsearch.index.search.ESToParentBlockJoinQuery;
3636

3737
import java.io.IOException;
3838
import java.util.Collection;

0 commit comments

Comments
 (0)