Skip to content

Commit 741445a

Browse files
authored
[Remove] TypeFieldMapper (#3196)
Removes last trace of TypeFieldMapper since types have been removed and NestedPathFieldMapper is now available. Signed-off-by: Nicholas Walter Knize <nknize@apache.org>
1 parent 112a108 commit 741445a

File tree

2 files changed

+1
-192
lines changed

2 files changed

+1
-192
lines changed

server/src/main/java/org/opensearch/common/lucene/search/Queries.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
package org.opensearch.common.lucene.search;
3434

3535
import org.apache.lucene.index.LeafReaderContext;
36-
import org.apache.lucene.index.Term;
3736
import org.apache.lucene.queries.ExtendedCommonTermsQuery;
3837
import org.apache.lucene.search.BooleanClause;
3938
import org.apache.lucene.search.BooleanClause.Occur;
@@ -43,17 +42,14 @@
4342
import org.apache.lucene.search.IndexSearcher;
4443
import org.apache.lucene.search.MatchAllDocsQuery;
4544
import org.apache.lucene.search.MatchNoDocsQuery;
46-
import org.apache.lucene.search.PrefixQuery;
4745
import org.apache.lucene.search.Query;
4846
import org.apache.lucene.search.QueryVisitor;
4947
import org.apache.lucene.search.ScoreMode;
5048
import org.apache.lucene.search.Scorer;
5149
import org.apache.lucene.search.Weight;
52-
import org.apache.lucene.util.BytesRef;
5350
import org.opensearch.OpenSearchException;
5451
import org.opensearch.common.Nullable;
5552
import org.opensearch.index.mapper.SeqNoFieldMapper;
56-
import org.opensearch.index.mapper.TypeFieldMapper;
5753

5854
import java.io.IOException;
5955
import java.util.Collection;
@@ -87,7 +83,7 @@ public static Query newLenientFieldQuery(String field, RuntimeException e) {
8783
}
8884

8985
public static Query newNestedFilter() {
90-
return new PrefixQuery(new Term(TypeFieldMapper.NAME, new BytesRef("__")));
86+
return not(newNonNestedFilter());
9187
}
9288

9389
/**

server/src/main/java/org/opensearch/index/mapper/TypeFieldMapper.java

Lines changed: 0 additions & 187 deletions
This file was deleted.

0 commit comments

Comments
 (0)