Skip to content

Handle short form queries #4324

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 28, 2020
Merged

Handle short form queries #4324

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c8d591
Handle short form queries
russcam Jan 24, 2020
5445bc9
Move ShortFormQuery bytes to base query dsl test class
russcam Jan 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
66 changes: 58 additions & 8 deletions src/Nest/QueryDsl/Abstractions/FieldName/FieldNameQueryFormatter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
using Elasticsearch.Net.Utf8Json;
using Elasticsearch.Net.Extensions;
using Elasticsearch.Net.Utf8Json;
using Elasticsearch.Net.Utf8Json.Internal;

namespace Nest
{
Expand Down Expand Up @@ -34,18 +36,66 @@ public override void Serialize(ref JsonWriter writer, TInterface value, IJsonFor
public override TInterface Deserialize(ref JsonReader reader, IJsonFormatterResolver formatterResolver)
{
reader.ReadIsBeginObjectWithVerify();
var token = reader.GetCurrentJsonToken();

if (reader.ReadIsEndObject())
return default;

TInterface query = null;
string fieldName = null;
if (token != JsonToken.EndObject)
var fieldName = reader.ReadPropertyName();
var token = reader.GetCurrentJsonToken();
switch (token)
{
fieldName = reader.ReadPropertyName();
query = base.Deserialize(ref reader, formatterResolver);
case JsonToken.BeginObject:
query = base.Deserialize(ref reader, formatterResolver);
reader.ReadIsEndObjectWithVerify();
break;
case JsonToken.Null:
reader.ReadNext();
break;
default:
query = new T();
switch (query)
{
case ITermQuery termQuery:
switch (token)
{
case JsonToken.String:
termQuery.Value = reader.ReadString();
break;
case JsonToken.Number:
var segment = reader.ReadNumberSegment();
if (segment.IsLong())
termQuery.Value = NumberConverter.ReadInt64(segment.Array, segment.Offset, out var count);
else
termQuery.Value = NumberConverter.ReadDouble(segment.Array, segment.Offset, out var count);
break;
case JsonToken.True:
case JsonToken.False:
termQuery.Value = reader.ReadBoolean();
break;
}
reader.ReadIsEndObjectWithVerify();
break;
case IMatchQuery matchQuery:
matchQuery.Query = reader.ReadString();
reader.ReadIsEndObjectWithVerify();
break;
case IMatchPhraseQuery matchPhraseQuery:
matchPhraseQuery.Query = reader.ReadString();
reader.ReadIsEndObjectWithVerify();
break;
case IMatchPhrasePrefixQuery matchPhrasePrefixQuery:
matchPhrasePrefixQuery.Query = reader.ReadString();
reader.ReadIsEndObjectWithVerify();
break;
case IMatchBoolPrefixQuery matchBoolPrefixQuery:
matchBoolPrefixQuery.Query = reader.ReadString();
reader.ReadIsEndObjectWithVerify();
break;
}
break;
}

reader.ReadIsEndObjectWithVerify();

if (query == null)
return null;

Expand Down
18 changes: 17 additions & 1 deletion tests/Tests/QueryDsl/FullText/Match/MatchUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using Nest;
using System.IO;
using System.Text;
using Elastic.Xunit.XunitPlumbing;
using FluentAssertions;
using Nest;
using Newtonsoft.Json;
using Tests.Core.ManagedElasticsearch.Clusters;
using Tests.Domain;
using Tests.Framework.EndpointTests.TestState;
Expand Down Expand Up @@ -69,5 +74,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.Name("named_query")
.AutoGenerateSynonymsPhraseQuery(false)
);

//hide
[U] public void DeserializeShortForm()
{
var json = JsonConvert.SerializeObject(new { description = "project description" });
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
var query = Client.RequestResponseSerializer.Deserialize<IMatchQuery>(stream);
query.Should().NotBeNull();
query.Field.Should().Be(new Field("description"));
query.Query.Should().Be("project description");
}
}
}
17 changes: 16 additions & 1 deletion tests/Tests/QueryDsl/FullText/MatchBoolPrefix/MatchBoolPrefixUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
using Elastic.Xunit.XunitPlumbing;
using System.IO;
using System.Text;
using Elastic.Xunit.XunitPlumbing;
using FluentAssertions;
using Nest;
using Newtonsoft.Json;
using Tests.Core.ManagedElasticsearch.Clusters;
using Tests.Domain;
using Tests.Framework.EndpointTests.TestState;
Expand Down Expand Up @@ -59,5 +63,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.FuzzyRewrite(MultiTermQueryRewrite.TopTermsBlendedFreqs(10))
.Name("named_query")
);

//hide
[U] public void DeserializeShortForm()
{
var json = JsonConvert.SerializeObject(new { description = "project description" });
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
var query = Client.RequestResponseSerializer.Deserialize<IMatchBoolPrefixQuery>(stream);
query.Should().NotBeNull();
query.Field.Should().Be(new Field("description"));
query.Query.Should().Be("project description");
}
}
}
18 changes: 17 additions & 1 deletion tests/Tests/QueryDsl/FullText/MatchPhrase/MatchPhraseUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using Nest;
using System.IO;
using System.Text;
using Elastic.Xunit.XunitPlumbing;
using FluentAssertions;
using Nest;
using Newtonsoft.Json;
using Tests.Core.ManagedElasticsearch.Clusters;
using Tests.Domain;
using Tests.Framework.EndpointTests.TestState;
Expand Down Expand Up @@ -51,5 +56,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.Slop(2)
.Name("named_query")
);

//hide
[U] public void DeserializeShortForm()
{
var json = JsonConvert.SerializeObject(new { description = "project description" });
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
var query = Client.RequestResponseSerializer.Deserialize<IMatchPhraseQuery>(stream);
query.Should().NotBeNull();
query.Field.Should().Be(new Field("description"));
query.Query.Should().Be("project description");
}
}
}
18 changes: 17 additions & 1 deletion tests/Tests/QueryDsl/FullText/MatchPhrasePrefix/MatchPhrasePrefixUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using Nest;
using System.IO;
using System.Text;
using Elastic.Xunit.XunitPlumbing;
using FluentAssertions;
using Nest;
using Newtonsoft.Json;
using Tests.Core.ManagedElasticsearch.Clusters;
using Tests.Domain;
using Tests.Framework.EndpointTests.TestState;
Expand Down Expand Up @@ -54,5 +59,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.Slop(2)
.Name("named_query")
);

//hide
[U] public void DeserializeShortForm()
{
var json = JsonConvert.SerializeObject(new { description = "project description" });
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
var query = Client.RequestResponseSerializer.Deserialize<IMatchPhrasePrefixQuery>(stream);
query.Should().NotBeNull();
query.Field.Should().Be(new Field("description"));
query.Query.Should().Be("project description");
}
}
}
16 changes: 16 additions & 0 deletions tests/Tests/QueryDsl/TermLevel/Prefix/PrefixQueryUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using System.IO;
using System.Text;
using Elastic.Xunit.XunitPlumbing;
using FluentAssertions;
using Nest;
using Newtonsoft.Json;
using Tests.Core.ManagedElasticsearch.Clusters;
using Tests.Domain;
using Tests.Framework.EndpointTests.TestState;
Expand Down Expand Up @@ -47,5 +52,16 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.Value("proj")
.Rewrite(MultiTermQueryRewrite.TopTerms(10))
);

//hide
[U] public void DeserializeShortForm()
{
var json = JsonConvert.SerializeObject(new { description = "project description" });
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
var query = Client.RequestResponseSerializer.Deserialize<IPrefixQuery>(stream);
query.Should().NotBeNull();
query.Field.Should().Be(new Field("description"));
query.Value.Should().Be("project description");
}
}
}
16 changes: 16 additions & 0 deletions tests/Tests/QueryDsl/TermLevel/Term/TermQueryUsageTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
using System.IO;
using System.Text;
using Elastic.Xunit.XunitPlumbing;
using FluentAssertions;
using Nest;
using Newtonsoft.Json;
using Tests.Core.ManagedElasticsearch.Clusters;
using Tests.Domain;
using Tests.Framework.EndpointTests.TestState;
Expand Down Expand Up @@ -44,6 +49,17 @@ protected override QueryContainer QueryFluent(QueryContainerDescriptor<Project>
.Field(p => p.Description)
.Value("project description")
);

//hide
[U] public void DeserializeShortForm()
{
var json = JsonConvert.SerializeObject(new { description = "project description" });
using var stream = new MemoryStream(Encoding.UTF8.GetBytes(json));
var query = Client.RequestResponseSerializer.Deserialize<ITermQuery>(stream);
query.Should().NotBeNull();
query.Field.Should().Be(new Field("description"));
query.Value.Should().Be("project description");
}
}

/**[float]
Expand Down