WIP - Elastic 9.0 Client Preview

niemyjski · niemyjski · commit 62cb72ef84b0 · 2025-04-14T13:45:23.000-05:00
elastic/elasticsearch-net#8496
diff --git a/src/Foundatio.Parsers.ElasticQueries/Extensions/DefaultQueryNodeExtensions.cs b/src/Foundatio.Parsers.ElasticQueries/Extensions/DefaultQueryNodeExtensions.cs
@@ -44,12 +44,11 @@ public static Query GetDefaultQuery(this TermNode node, IQueryVisitorContext con
 
             if (!node.IsQuotedTerm && node.UnescapedTerm.EndsWith("*"))
             {
-                query = new QueryStringQuery
+                query = new QueryStringQuery(node.UnescapedTerm)
                 {
                     Fields = fields,
                     AllowLeadingWildcard = false,
-                    AnalyzeWildcard = true,
-                    Query = node.UnescapedTerm
+                    AnalyzeWildcard = true
                 };
             }
             else
@@ -58,25 +57,18 @@ public static Query GetDefaultQuery(this TermNode node, IQueryVisitorContext con
                 {
                     if (node.IsQuotedTerm)
                     {
-                        query = new MatchPhraseQuery(fields[0])
-                        {
-                            Query = node.UnescapedTerm
-                        };
+                        query = new MatchPhraseQuery(fields[0], node.UnescapedTerm);
                     }
                     else
                     {
-                        query = new MatchQuery(fields[0])
-                        {
-                            Query = node.UnescapedTerm
-                        };
+                        query = new MatchQuery(fields[0], node.UnescapedTerm);
                     }
                 }
                 else
                 {
-                    query = new MultiMatchQuery
+                    query = new MultiMatchQuery(node.UnescapedTerm)
                     {
                         Fields = fields,
-                        Query = node.UnescapedTerm,
                         Type = node.IsQuotedTerm ? TextQueryType.Phrase : null
                     };
                 }
@@ -86,17 +78,11 @@ public static Query GetDefaultQuery(this TermNode node, IQueryVisitorContext con
         {
             if (!node.IsQuotedTerm && node.UnescapedTerm.EndsWith("*"))
             {
-                query = new PrefixQuery(field)
-                {
-                    Value = node.UnescapedTerm.TrimEnd('*')
-                };
+                query = new PrefixQuery(field, node.UnescapedTerm.TrimEnd('*'));
             }
             else
             {
-                query = new TermQuery(field)
-                {
-                    Value = node.UnescapedTerm
-                };
+                query = new TermQuery(field, node.UnescapedTerm);
             }
         }
 
@@ -155,7 +141,7 @@ public static async Task<Query> GetDefaultQueryAsync(this TermRangeNode node, IQ
 
     public static Query GetDefaultQuery(this ExistsNode node, IQueryVisitorContext context)
     {
-        return new ExistsQuery { Field = node.UnescapedField };
+        return new ExistsQuery(node.UnescapedField);
     }
 
     public static Query GetDefaultQuery(this MissingNode node, IQueryVisitorContext context)
@@ -164,10 +150,7 @@ public static Query GetDefaultQuery(this MissingNode node, IQueryVisitorContext
         {
             MustNot =
             [
-                new ExistsQuery
-                {
-                    Field = node.UnescapedField
-                }
+                new ExistsQuery(node.UnescapedField)
             ]
         };
     }
diff --git a/src/Foundatio.Parsers.ElasticQueries/Visitors/GeoVisitor.cs b/src/Foundatio.Parsers.ElasticQueries/Visitors/GeoVisitor.cs
@@ -24,7 +24,7 @@ public override async Task VisitAsync(TermNode node, IQueryVisitorContext contex
             return;
 
         string location = _resolveGeoLocation != null ? await _resolveGeoLocation(node.Term).ConfigureAwait(false) ?? node.Term : node.Term;
-        var query = new GeoDistanceQuery { Field = node.Field, Location = location, Distance = node.Proximity ?? "10mi" };
+        var query = new GeoDistanceQuery(node.Proximity ?? "10mi", node.Field, location);
         node.SetQuery(query);
     }
 
@@ -33,8 +33,9 @@ public override void Visit(TermRangeNode node, IQueryVisitorContext context)
         if (context is not IElasticQueryVisitorContext elasticContext || !elasticContext.MappingResolver.IsGeoPropertyType(node.Field))
             return;
 
-        var box = GeoBounds.TopLeftBottomRight(new TopLeftBottomRightGeoBounds { TopLeft = node.Min, BottomRight = node.Max });
-        var query = new GeoBoundingBoxQuery { BoundingBox = box, Field = node.Field };
+        // NOTE: Feedback here: https://github.com/elastic/elasticsearch-net/issues/8496
+        var box = GeoBounds.TopLeftBottomRight(new TopLeftBottomRightGeoBounds(node.Max, node.Min));
+        var query = new GeoBoundingBoxQuery(box, node.Field);
         node.SetQuery(query);
     }
 }
diff --git a/src/Foundatio.Parsers.ElasticQueries/Visitors/NestedVisitor.cs b/src/Foundatio.Parsers.ElasticQueries/Visitors/NestedVisitor.cs
@@ -19,7 +19,8 @@ public override Task VisitAsync(GroupNode node, IQueryVisitorContext context)
         if (nestedProperty == null)
             return base.VisitAsync(node, context);
 
-        node.SetQuery(new NestedQuery { Path = nestedProperty });
+        // NOTE: This nested query will be updated in the CombineQueriesVisitor.
+        node.SetQuery(new NestedQuery(nestedProperty, new Query()));
 
         return base.VisitAsync(node, context);
     }
diff --git a/tests/Foundatio.Parsers.ElasticQueries.Tests/ElasticQueryParserTests.cs b/tests/Foundatio.Parsers.ElasticQueries.Tests/ElasticQueryParserTests.cs
@@ -847,10 +847,10 @@ public async Task NestedFilterProcessor()
             .Text(e => e.Field2, o => o.Index())
             .Text(e => e.Field3, o => o.Index())
             .IntegerNumber(e => e.Field4)
-            .Nested<MyType>(r => r.Name(n => n.Nested.First()).Properties(p1 => p1
-                .Text(e => e.Field1, o => o.Index())
-                .Text(e => e.Field2, o => o.Index())
-                .Text(e => e.Field3, o => o.Index())
+            .Nested(e => e.Nested, o => o.Properties(p1 => p1
+                .Text(e1 => e1.Field1, o1 => o1.Index())
+                .Text(e1 => e1.Field2, o1 => o1.Index())
+                .Text(e1 => e1.Field3, o1 => o1.Index())
                 .IntegerNumber(e => e.Field4)
             ))
         ));
@@ -919,10 +919,10 @@ public async Task NestedFilterProcessor2()
             .Text(e => e.Field2, o => o.Index())
             .Text(e => e.Field3, o => o.Index())
             .IntegerNumber(e => e.Field4)
-            .Nested<MyType>(r => r.Name(n => n.Nested.First()).Properties(p1 => p1
-                .Text(e => e.Field1, o => o.Index())
-                .Text(e => e.Field2, o => o.Index())
-                .Text(e => e.Field3, o => o.Index())
+            .Nested(e => e.Nested, o => o.Properties(p1 => p1
+                .Text(e1 => e1.Field1, o1 => o1.Index())
+                .Text(e1 => e1.Field2, o1 => o1.Index())
+                .Text(e1 => e1.Field3, o1 => o1.Index())
                 .IntegerNumber(e => e.Field4)
             ))
         ));
@@ -985,9 +985,9 @@ public async Task CanGenerateMatchQuery()
     public async Task CanBuildAliasQueryProcessor()
     {
         string index = await CreateRandomIndexAsync<MyType>(m => m.Properties(p => p
-            .Object<Dictionary<string, object>>(f => f.Name(e => e.Data).Properties(p2 => p2
-                .Text(e => e.Name("@browser_version"))
-                .FieldAlias(a => a.Name("browser.version").Path("data.@browser_version"))))));
+            .Object(f => f.Data, o => o.Properties(p2 => p2
+                .Text("@browser_version")
+                .FieldAlias("browser.version", o1 => o1.Path("data.@browser_version"))))));
 
         var processor = new ElasticQueryParser(c => c.SetLoggerFactory(Log));
         var result = await processor.BuildQueryAsync("browser.version:1", new ElasticQueryVisitorContext().UseScoring());

Original file line number	Diff line number	Diff line change
`@@ -44,12 +44,11 @@ public static Query GetDefaultQuery(this TermNode node, IQueryVisitorContext con`
`44`	`44`
`45`	`45`	`if (!node.IsQuotedTerm && node.UnescapedTerm.EndsWith("*"))`
`46`	`46`	`{`
`47`		`- query = new QueryStringQuery`
	`47`	`+ query = new QueryStringQuery(node.UnescapedTerm)`
`48`	`48`	`{`
`49`	`49`	`Fields = fields,`
`50`	`50`	`AllowLeadingWildcard = false,`
`51`		`- AnalyzeWildcard = true,`
`52`		`- Query = node.UnescapedTerm`
	`51`	`+ AnalyzeWildcard = true`
`53`	`52`	`};`
`54`	`53`	`}`
`55`	`54`	`else`
`@@ -58,25 +57,18 @@ public static Query GetDefaultQuery(this TermNode node, IQueryVisitorContext con`
`58`	`57`	`{`
`59`	`58`	`if (node.IsQuotedTerm)`
`60`	`59`	`{`
`61`		`- query = new MatchPhraseQuery(fields[0])`
`62`		`- {`
`63`		`- Query = node.UnescapedTerm`
`64`		`- };`
	`60`	`+ query = new MatchPhraseQuery(fields[0], node.UnescapedTerm);`
`65`	`61`	`}`
`66`	`62`	`else`
`67`	`63`	`{`
`68`		`- query = new MatchQuery(fields[0])`
`69`		`- {`
`70`		`- Query = node.UnescapedTerm`
`71`		`- };`
	`64`	`+ query = new MatchQuery(fields[0], node.UnescapedTerm);`
`72`	`65`	`}`
`73`	`66`	`}`
`74`	`67`	`else`
`75`	`68`	`{`
`76`		`- query = new MultiMatchQuery`
	`69`	`+ query = new MultiMatchQuery(node.UnescapedTerm)`
`77`	`70`	`{`
`78`	`71`	`Fields = fields,`
`79`		`- Query = node.UnescapedTerm,`
`80`	`72`	`Type = node.IsQuotedTerm ? TextQueryType.Phrase : null`
`81`	`73`	`};`
`82`	`74`	`}`
`@@ -86,17 +78,11 @@ public static Query GetDefaultQuery(this TermNode node, IQueryVisitorContext con`
`86`	`78`	`{`
`87`	`79`	`if (!node.IsQuotedTerm && node.UnescapedTerm.EndsWith("*"))`
`88`	`80`	`{`
`89`		`- query = new PrefixQuery(field)`
`90`		`- {`
`91`		`- Value = node.UnescapedTerm.TrimEnd('*')`
`92`		`- };`
	`81`	`+ query = new PrefixQuery(field, node.UnescapedTerm.TrimEnd('*'));`
`93`	`82`	`}`
`94`	`83`	`else`
`95`	`84`	`{`
`96`		`- query = new TermQuery(field)`
`97`		`- {`
`98`		`- Value = node.UnescapedTerm`
`99`		`- };`
	`85`	`+ query = new TermQuery(field, node.UnescapedTerm);`
`100`	`86`	`}`
`101`	`87`	`}`
`102`	`88`
`@@ -155,7 +141,7 @@ public static async Task<Query> GetDefaultQueryAsync(this TermRangeNode node, IQ`
`155`	`141`
`156`	`142`	`public static Query GetDefaultQuery(this ExistsNode node, IQueryVisitorContext context)`
`157`	`143`	`{`
`158`		`- return new ExistsQuery { Field = node.UnescapedField };`
	`144`	`+ return new ExistsQuery(node.UnescapedField);`
`159`	`145`	`}`
`160`	`146`
`161`	`147`	`public static Query GetDefaultQuery(this MissingNode node, IQueryVisitorContext context)`
`@@ -164,10 +150,7 @@ public static Query GetDefaultQuery(this MissingNode node, IQueryVisitorContext`
`164`	`150`	`{`
`165`	`151`	`MustNot =`
`166`	`152`	`[`
`167`		`- new ExistsQuery`
`168`		`- {`
`169`		`- Field = node.UnescapedField`
`170`		`- }`
	`153`	`+ new ExistsQuery(node.UnescapedField)`
`171`	`154`	`]`
`172`	`155`	`};`
`173`	`156`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ public override async Task VisitAsync(TermNode node, IQueryVisitorContext contex`
`24`	`24`	`return;`
`25`	`25`
`26`	`26`	`string location = _resolveGeoLocation != null ? await _resolveGeoLocation(node.Term).ConfigureAwait(false) ?? node.Term : node.Term;`
`27`		`- var query = new GeoDistanceQuery { Field = node.Field, Location = location, Distance = node.Proximity ?? "10mi" };`
	`27`	`+ var query = new GeoDistanceQuery(node.Proximity ?? "10mi", node.Field, location);`
`28`	`28`	`node.SetQuery(query);`
`29`	`29`	`}`
`30`	`30`
`@@ -33,8 +33,9 @@ public override void Visit(TermRangeNode node, IQueryVisitorContext context)`
`33`	`33`	`if (context is not IElasticQueryVisitorContext elasticContext \|\| !elasticContext.MappingResolver.IsGeoPropertyType(node.Field))`
`34`	`34`	`return;`
`35`	`35`
`36`		`- var box = GeoBounds.TopLeftBottomRight(new TopLeftBottomRightGeoBounds { TopLeft = node.Min, BottomRight = node.Max });`
`37`		`- var query = new GeoBoundingBoxQuery { BoundingBox = box, Field = node.Field };`
	`36`	`+ // NOTE: Feedback here: https://github.com/elastic/elasticsearch-net/issues/8496`
	`37`	`+ var box = GeoBounds.TopLeftBottomRight(new TopLeftBottomRightGeoBounds(node.Max, node.Min));`
	`38`	`+ var query = new GeoBoundingBoxQuery(box, node.Field);`
`38`	`39`	`node.SetQuery(query);`
`39`	`40`	`}`
`40`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,8 @@ public override Task VisitAsync(GroupNode node, IQueryVisitorContext context)`
`19`	`19`	`if (nestedProperty == null)`
`20`	`20`	`return base.VisitAsync(node, context);`
`21`	`21`
`22`		`- node.SetQuery(new NestedQuery { Path = nestedProperty });`
	`22`	`+ // NOTE: This nested query will be updated in the CombineQueriesVisitor.`
	`23`	`+ node.SetQuery(new NestedQuery(nestedProperty, new Query()));`
`23`	`24`
`24`	`25`	`return base.VisitAsync(node, context);`
`25`	`26`	`}`