Skip to content
This repository has been archived by the owner on Jul 18, 2018. It is now read-only.

Commit

Permalink
Added boosted filters support for CustomFilterScoreQuery
Browse files Browse the repository at this point in the history 
Current CustomFiltersScoreQuery does not support boosted filters
  • Loading branch information
Paleta committed Oct 5, 2012
1 parent fc65bab commit 9bf7262
Show file tree
Hide file tree
Showing 3 changed files with 153 additions and 100 deletions.
54 changes: 31 additions & 23 deletions ElasticSearch.Client/QueryDSL/Converters/Filter/TermFilterConvert.cs
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,32 @@
using Newtonsoft.Json;
using System;
namespace ElasticSearch.Client.QueryDSL
{
internal class TermFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
TermFilter term = (TermFilter)value;
if (term != null)
writer.WriteRawValue(string.Format("{{term: {{ \"{0}\" : \"{1}\"}} }}", term.Field, term.Value));
}

public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}

public override bool CanConvert(Type objectType)
{
return typeof(TermFilter).IsAssignableFrom(objectType);
}
}
using Newtonsoft.Json;
using System;
namespace ElasticSearch.Client.QueryDSL
{
internal class TermFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
TermFilter term = (TermFilter)value;
if (term != null)
{
writer.WriteStartObject();
writer.WritePropertyName("term");
writer.WriteStartObject();
writer.WritePropertyName(term.Field);
writer.WriteValue(term.Value);
writer.WriteEndObject();
writer.WriteEndObject();
}
}

public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}

public override bool CanConvert(Type objectType)
{
return typeof(TermFilter).IsAssignableFrom(objectType);
}
}
}
94 changes: 64 additions & 30 deletions ElasticSearch.Client/QueryDSL/Query/CustomFiltersScoreQuery.cs
View file
Original file line number Diff line number Diff line change
@@ -1,31 +1,65 @@
using System.Collections.Generic;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
/// <summary>
/// A custom_filters_score query allows to execute a query, and if the hit matches a provided filter (ordered), use either a boost or a script associated with it to compute the score
/// </summary>
[JsonConverter(typeof(CustomFiltersScoreQueryConverterer))]
[JsonObject("custom_filters_score")]
public class CustomFiltersScoreQuery:IQuery
{
public IQuery Query;
public List<IFilter> Filters;
/// <summary>
/// A score_mode can be defined to control how multiple matching filters control the score. By default, it is set to first which means the first matching filter will control the score of the result. It can also be set to max/total/avg which will aggregate the result from all matching filters based on the aggregation type.
/// </summary>
public string ScoreMode;

/// <summary>
/// A script can be used instead of boost for more complex score calculations. With optional params and lang (on the same level as query and filters).
/// </summary>
public string Script;

public CustomFiltersScoreQuery(IQuery query,List<IFilter> filters)
{
Query = query;
Filters = filters;
}
}
using System.Collections.Generic;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
/// <summary>
/// A custom_filters_score query allows to execute a query, and if the hit matches a provided filter (ordered), use either a boost or a script associated with it to compute the score
/// </summary>
[JsonConverter(typeof(CustomFiltersScoreQueryConverterer))]
[JsonObject("custom_filters_score")]
public class CustomFiltersScoreQuery: IQuery
{
public IQuery Query;
public IDictionary<IFilter, double> Filters;
/// <summary>
/// A score_mode can be defined to control how multiple matching filters control the score. By default, it is set to first which means the first matching filter will control the score of the result. It can also be set to max/total/avg which will aggregate the result from all matching filters based on the aggregation type.
/// </summary>
public ScoreModeEnum ScoreMode = ScoreModeEnum.NotSet;

/// <summary>
/// A script can be used instead of boost for more complex score calculations. With optional params and lang (on the same level as query and filters).
/// </summary>
public string Script;

public CustomFiltersScoreQuery(IQuery query, List<IFilter> filters)
{
Query = query;
foreach (var filter in filters)
{
Filters.Add(filter, 1);
}
}

public CustomFiltersScoreQuery(IQuery query, IDictionary<IFilter, double> boostedFilters)
{
Filters = boostedFilters;
}

public CustomFiltersScoreQuery AddBoostedFilter(IFilter filter, double boost)
{
Filters.Add(filter, boost);
return this;
}

public CustomFiltersScoreQuery SetFilterBoost(IFilter filter, double boost)
{
if (Filters.ContainsKey(filter))
{
Filters[filter] = boost;
}
return this;
}

public enum ScoreModeEnum
{
First,
Min,
Max,
Total,
Avg,
Multiply,
NotSet
}
}
}
105 changes: 58 additions & 47 deletions ElasticSearch.Client/QueryDSL/Query/CustomFiltersScoreQueryConverterer.cs
View file
Original file line number Diff line number Diff line change
@@ -1,48 +1,59 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class CustomFiltersScoreQueryConverterer:JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
CustomFiltersScoreQuery term = (CustomFiltersScoreQuery)value;
if (term != null)
{
writer.WriteStartObject();
writer.WritePropertyName("custom_filters_score");
writer.WriteStartObject();
writer.WritePropertyName("query");
serializer.Serialize(writer,term.Query);
writer.WritePropertyName("filters");

writer.WriteStartArray();
foreach (var filter in term.Filters)
{
serializer.Serialize(writer,filter);
}
writer.WriteEndArray();

writer.WritePropertyName("score_mode");
writer.WriteValue(term.ScoreMode);

writer.WritePropertyName("script");
writer.WriteValue(term.Script);

writer.WriteEndObject();
writer.WriteEndObject();
}
}

public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}

public override bool CanConvert(Type objectType)
{
return typeof(CustomFiltersScoreQuery).IsAssignableFrom(objectType);
}
}
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class CustomFiltersScoreQueryConverterer: JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
CustomFiltersScoreQuery term = (CustomFiltersScoreQuery)value;
if (term != null)
{
writer.WriteStartObject();
writer.WritePropertyName("custom_filters_score");
writer.WriteStartObject();
writer.WritePropertyName("query");
serializer.Serialize(writer, term.Query);
writer.WritePropertyName("filters");

writer.WriteStartArray();
foreach (var filter in term.Filters)
{
writer.WriteStartObject();
writer.WritePropertyName("filter");
serializer.Serialize(writer, filter.Key);
writer.WritePropertyName("boost");
writer.WriteValue(filter.Value);
writer.WriteEndObject();
}
writer.WriteEndArray();

if (term.ScoreMode != CustomFiltersScoreQuery.ScoreModeEnum.NotSet)
{
writer.WritePropertyName("score_mode");
writer.WriteValue(term.ScoreMode.ToString());
}

if (!string.IsNullOrEmpty(term.Script))
{
writer.WritePropertyName("script");
writer.WriteValue(term.Script);
}

writer.WriteEndObject();
writer.WriteEndObject();
}
}

public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer)
{
throw new NotImplementedException();
}

public override bool CanConvert(Type objectType)
{
return typeof(CustomFiltersScoreQuery).IsAssignableFrom(objectType);
}
}
}

0 comments on commit 9bf7262

Please sign in to comment.