Skip to content

Commit 8267836

Browse files
gmarzMpdreamz
gmarz
authored and
Mpdreamz
committed
Remove missing query (#2302)
Closes #2297
1 parent 350db18 commit 8267836

File tree

11 files changed

+9
-121
lines changed

11 files changed

+9
-121
lines changed

‎src/Nest/Nest.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1102,7 +1102,6 @@
11021102
<Compile Include="QueryDsl\TermLevel\Fuzzy\FuzzyQueryBase.cs" />
11031103
<Compile Include="QueryDsl\TermLevel\Fuzzy\FuzzyQueryJsonConverter.cs" />
11041104
<Compile Include="QueryDsl\TermLevel\Ids\IdsQuery.cs" />
1105-
<Compile Include="QueryDsl\TermLevel\Missing\MissingQuery.cs" />
11061105
<Compile Include="QueryDsl\TermLevel\Prefix\PrefixQuery.cs" />
11071106
<Compile Include="QueryDsl\TermLevel\Range\DateRangeQuery .cs" />
11081107
<Compile Include="QueryDsl\TermLevel\Range\NumericRangeQuery.cs" />

‎src/Nest/QueryDsl/Abstractions/Container/IQueryContainer.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,9 +155,6 @@ public interface IQueryContainer
155155
[JsonProperty("exists")]
156156
IExistsQuery Exists { get; set; }
157157

158-
[JsonProperty("missing")]
159-
IMissingQuery Missing { get; set; }
160-
161158
[JsonProperty("type")]
162159
ITypeQuery Type { get; set; }
163160

‎src/Nest/QueryDsl/Abstractions/Container/QueryContainer-Assignments.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ public partial class QueryContainer : IQueryContainer, IDescriptor
5252
private IGeoHashCellQuery _geoHashCell;
5353
private IScriptQuery _script;
5454
private IExistsQuery _exists;
55-
private IMissingQuery _missing;
5655
private ITypeQuery _type;
5756
private IRawQuery _raw;
5857
private IPercolateQuery _percolate;
@@ -116,7 +115,6 @@ private T Set<T>(T value) where T : IQuery
116115
IGeoHashCellQuery IQueryContainer.GeoHashCell { get { return _geoHashCell; } set { _geoHashCell = Set(value); } }
117116
IScriptQuery IQueryContainer.Script { get { return _script; } set { _script = Set(value); } }
118117
IExistsQuery IQueryContainer.Exists { get { return _exists; } set { _exists = Set(value); } }
119-
IMissingQuery IQueryContainer.Missing { get { return _missing; } set { _missing = Set(value); } }
120118
ITypeQuery IQueryContainer.Type { get { return _type; } set { _type = Set(value); } }
121119
IPercolateQuery IQueryContainer.Percolate { get { return _percolate; } set { _percolate = Set(value); } }
122120
IParentIdQuery IQueryContainer.ParentId { get { return _parentId; } set { _parentId = Set(value); } }

‎src/Nest/QueryDsl/Abstractions/Container/QueryContainerDescriptor.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -321,14 +321,14 @@ public QueryContainer MatchNone(Func<MatchNoneQueryDescriptor, IMatchNoneQuery>
321321
/// The term query maps to Lucene TermQuery.
322322
/// </summary>
323323
public QueryContainer Term(Expression<Func<T, object>> field, object value, double? boost = null, string name = null) =>
324-
this.Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
324+
this.Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
325325

326326
/// <summary>
327327
/// Matches documents that have fields that contain a term (not analyzed).
328328
/// The term query maps to Lucene TermQuery.
329329
/// </summary>
330330
public QueryContainer Term(Field field, object value, double? boost = null, string name = null) =>
331-
this.Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
331+
this.Term(t => t.Field(field).Value(value).Boost(boost).Name(name));
332332

333333
/// <summary>
334334
/// Matches documents that have fields that contain a term (not analyzed).
@@ -345,7 +345,7 @@ public QueryContainer Term(Func<TermQueryDescriptor<T>, ITermQuery> selector) =>
345345
/// not start with one of the wildcards * or ?. The wildcard query maps to Lucene WildcardQuery.
346346
/// </summary>
347347
public QueryContainer Wildcard(Expression<Func<T, object>> field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
348-
this.Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
348+
this.Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
349349

350350
/// <summary>
351351
/// Matches documents that have fields matching a wildcard expression (not analyzed).
@@ -355,7 +355,7 @@ public QueryContainer Wildcard(Expression<Func<T, object>> field, string value,
355355
/// one of the wildcards * or ?. The wildcard query maps to Lucene WildcardQuery.
356356
/// </summary>
357357
public QueryContainer Wildcard(Field field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
358-
this.Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
358+
this.Wildcard(t => t.Field(field).Value(value).Rewrite(rewrite).Boost(boost).Name(name));
359359

360360
/// <summary>
361361
/// Matches documents that have fields matching a wildcard expression (not analyzed).
@@ -372,14 +372,14 @@ public QueryContainer Wildcard(Func<WildcardQueryDescriptor<T>, IWildcardQuery>
372372
/// The prefix query maps to Lucene PrefixQuery.
373373
/// </summary>
374374
public QueryContainer Prefix(Expression<Func<T, object>> field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
375-
this.Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
375+
this.Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
376376

377377
/// <summary>
378378
/// Matches documents that have fields containing terms with a specified prefix (not analyzed).
379379
/// The prefix query maps to Lucene PrefixQuery.
380380
/// </summary>
381381
public QueryContainer Prefix(Field field, string value, double? boost = null, RewriteMultiTerm? rewrite = null, string name = null) =>
382-
this.Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
382+
this.Prefix(t => t.Field(field).Value(value).Boost(boost).Rewrite(rewrite).Name(name));
383383

384384
/// <summary>
385385
/// Matches documents that have fields containing terms with a specified prefix (not analyzed).
@@ -479,12 +479,9 @@ public QueryContainer Script(Func<ScriptQueryDescriptor<T>, IScriptQuery> select
479479
WrapInContainer(selector, (query, container) => container.Script = query);
480480

481481
public QueryContainer Exists(Func<ExistsQueryDescriptor<T>, IExistsQuery> selector) =>
482-
WrapInContainer(selector, (query, container) => container.Exists = query);
483-
484-
public QueryContainer Missing(Func<MissingQueryDescriptor<T>, IMissingQuery> selector) =>
485-
WrapInContainer(selector, (query, container) => container.Missing = query);
486-
487-
public QueryContainer Type(Func<TypeQueryDescriptor, ITypeQuery> selector) =>
482+
WrapInContainer(selector, (query, container) => container.Exists = query);
483+
484+
public QueryContainer Type(Func<TypeQueryDescriptor, ITypeQuery> selector) =>
488485
WrapInContainer(selector, (query, container) => container.Type = query);
489486

490487
public QueryContainer Type<TOther>() => this.Type(q => q.Value<TOther>());

‎src/Nest/QueryDsl/Query.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,9 +102,6 @@ public static QueryContainer MatchPhrase(Func<MatchPhraseQueryDescriptor<T>, IMa
102102
public static QueryContainer MatchPhrasePrefix(Func<MatchPhrasePrefixQueryDescriptor<T>, IMatchQuery> selector) =>
103103
new QueryContainerDescriptor<T>().MatchPhrasePrefix(selector);
104104

105-
public static QueryContainer Missing(Func<MissingQueryDescriptor<T>, IMissingQuery> selector) =>
106-
new QueryContainerDescriptor<T>().Missing(selector);
107-
108105
public static QueryContainer MoreLikeThis(Func<MoreLikeThisQueryDescriptor<T>, IMoreLikeThisQuery> selector) =>
109106
new QueryContainerDescriptor<T>().MoreLikeThis(selector);
110107

‎src/Nest/QueryDsl/TermLevel/Missing/MissingQuery.cs

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

‎src/Nest/QueryDsl/Visitor/DslPrettyPrintVisitor.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,8 +144,6 @@ private void Write(string queryType, Field field = null)
144144

145145
public virtual void Visit(ITypeQuery query) => Write("type");
146146

147-
public virtual void Visit(IMissingQuery query) => Write("missing");
148-
149147
public virtual void Visit(IGeoPolygonQuery query) => Write("geo_polygon");
150148

151149
public virtual void Visit(IGeoDistanceRangeQuery query) => Write("geo_distance_range");

‎src/Nest/QueryDsl/Visitor/QueryVisitor.cs

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ public interface IQueryVisitor
5656
void Visit(ITermsQuery query);
5757
void Visit(ITypeQuery query);
5858
void Visit(IScriptQuery query);
59-
void Visit(IMissingQuery query);
6059
void Visit(IGeoPolygonQuery query);
6160
void Visit(IGeoDistanceRangeQuery query);
6261
void Visit(IGeoDistanceQuery query);
@@ -198,8 +197,6 @@ public virtual void Visit(ITypeQuery query) { }
198197

199198
public virtual void Visit(IScriptQuery query) { }
200199

201-
public virtual void Visit(IMissingQuery query) { }
202-
203200
public virtual void Visit(IGeoPolygonQuery query) { }
204201

205202
public virtual void Visit(IGeoDistanceRangeQuery query) { }

‎src/Nest/QueryDsl/Visitor/QueryWalker.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public void Walk(IQueryContainer qd, IQueryVisitor visitor)
5353
VisitQuery(qd.Match, visitor, (v, d) => v.Visit(d));
5454
VisitQuery(qd.Type, visitor, (v, d) => v.Visit(d));
5555
VisitQuery(qd.Script, visitor, (v, d) => v.Visit(d));
56-
VisitQuery(qd.Missing, visitor, (v, d) => v.Visit(d));
5756
VisitQuery(qd.Exists, visitor, (v, d) => v.Visit(d));
5857
VisitQuery(qd.GeoPolygon, visitor, (v, d) => v.Visit(d));
5958
VisitQuery(qd.GeoDistanceRange, visitor, (v, d) => v.Visit(d));

‎src/Tests/QueryDsl/TermLevel/Missing/MissingQueryUsageTests.cs

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

‎src/Tests/Tests.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,6 @@
489489
<Compile Include=".\QueryDsl\TermLevel\Fuzzy\FuzzyNumericQueryUsageTests.cs" />
490490
<Compile Include=".\QueryDsl\TermLevel\Fuzzy\FuzzyQueryUsageTests.cs" />
491491
<Compile Include=".\QueryDsl\TermLevel\Ids\IdsQueryUsageTests.cs" />
492-
<Compile Include=".\QueryDsl\TermLevel\Missing\MissingQueryUsageTests.cs" />
493492
<Compile Include=".\QueryDsl\TermLevel\Prefix\PrefixQueryUsageTests.cs" />
494493
<Compile Include=".\QueryDsl\TermLevel\Range\DateRangeQueryUsageTests.cs" />
495494
<Compile Include=".\QueryDsl\TermLevel\Range\NumericRangeQueryUsageTests.cs" />

0 commit comments

Comments
 (0)