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

Commit

Permalink
bug fix,when using range_query within filtered_query
Browse files Browse the repository at this point in the history
  • Loading branch information
medcl committed Nov 25, 2011
1 parent 8e9a8e5 commit f186d03
Show file tree
Hide file tree
Showing 41 changed files with 1,711 additions and 39 deletions.
Binary file modified ElasticSearch.Client.suo
Binary file not shown.
76 changes: 38 additions & 38 deletions ElasticSearch.Client/ElasticSearch.Client.csproj
Expand Up @@ -95,104 +95,104 @@
<Compile Include="Mapping\Store.cs" />
<Compile Include="Mapping\TypeSetting.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="QueryDSL\Converters\AndFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\NumericRangeFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\AndFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\NumericRangeFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\AndFilter.cs" />
<Compile Include="QueryDSL\Converters\BoolFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\BoolFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\BoolFilter.cs" />
<Compile Include="QueryDSL\Filter\ExistsFilter.cs" />
<Compile Include="QueryDSL\Converters\ExistsFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\LimitFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\GeoBBoxFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\GeoDistanceFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\ExistsFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\LimitFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\GeoBBoxFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\GeoDistanceFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\GeoBoundingBoxFilter.cs" />
<Compile Include="QueryDSL\Filter\GeoDistanceFilter.cs" />
<Compile Include="QueryDSL\Filter\GeoDistanceRangeFilter.cs" />
<Compile Include="QueryDSL\Converters\GeoDistanceRangeFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\GeoDistanceRangeFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\GeoPolygonFilter.cs" />
<Compile Include="QueryDSL\Converters\GeoPolygonFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\GeoPolygonFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\HasChildFilter.cs" />
<Compile Include="QueryDSL\Converters\HasChildFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\HasChildFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\LimitFilter.cs" />
<Compile Include="QueryDSL\Filter\MatchAllFilter.cs" />
<Compile Include="QueryDSL\Converters\MatchAllFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\MatchAllFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\MatchAllQuery.cs" />
<Compile Include="QueryDSL\Filter\MatchAllQueryConverter.cs" />
<Compile Include="QueryDSL\Filter\MissingFilter.cs" />
<Compile Include="QueryDSL\Converters\MissingFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\MissingFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\NestedFilter.cs" />
<Compile Include="QueryDSL\Filter\NestedFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\NotFilter.cs" />
<Compile Include="QueryDSL\Converters\NotFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\NotFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\NumericRangeFilter.cs" />
<Compile Include="QueryDSL\Filter\OrFilter.cs" />
<Compile Include="QueryDSL\Converters\OrFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\OrFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\PrefixFilter.cs" />
<Compile Include="QueryDSL\Converters\PrefixFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\PrefixFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\RangeFilter.cs" />
<Compile Include="QueryDSL\Converters\RangeFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\RangeFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\ScriptFilter.cs" />
<Compile Include="QueryDSL\Converters\ScriptFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\ScriptFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\TermsFilter.cs" />
<Compile Include="QueryDSL\Converters\TermsFilterConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\TermsFilterConverter.cs" />
<Compile Include="QueryDSL\Filter\TypeFilter.cs" />
<Compile Include="QueryDSL\Converters\TypeFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\TypeFilterConvert.cs" />
<Compile Include="QueryDSL\Query\BoolQuery.cs" />
<Compile Include="QueryDSL\Query\BoostingQuery.cs" />
<Compile Include="QueryDSL\Query\ConstantScoreQuery.cs" />
<Compile Include="QueryDSL\Converters\ConstantScoreQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\BoostingQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\BoolQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\ConstantScoreQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\Query\BoostingQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\Query\BoolQueryConverter.cs" />
<Compile Include="QueryDSL\ElasticQuery.cs" />
<Compile Include="QueryDSL\Converters\ElasticQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\ElasticQueryConverter.cs" />
<Compile Include="Domain\Field.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="QueryDSL\Converters\FilteredQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\Query\FilteredQueryConvert.cs" />
<Compile Include="QueryDSL\Query\CustomFiltersScoreQuery.cs" />
<Compile Include="QueryDSL\Query\CustomFiltersScoreQueryConverterer.cs" />
<Compile Include="QueryDSL\Query\CustomScoreQuery.cs" />
<Compile Include="QueryDSL\Converters\CustomScoreQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\CustomScoreQueryConverter.cs" />
<Compile Include="QueryDSL\Query\DisjunctionMaxQuery.cs" />
<Compile Include="QueryDSL\Converters\DisjunctionMaxQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\DisjunctionMaxQueryConverter.cs" />
<Compile Include="QueryDSL\Query\FieldQuery.cs" />
<Compile Include="QueryDSL\Converters\FieldQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\FieldQueryConverter.cs" />
<Compile Include="QueryDSL\Query\FilteredQuery.cs" />
<Compile Include="QueryDSL\IQuery.cs" />
<Compile Include="QueryDSL\Converters\QueryFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\QueryFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\QueryFilter.cs" />
<Compile Include="QueryDSL\Filter\IdsFilter.cs" />
<Compile Include="QueryDSL\Converters\IdsFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Filter\IdsFilterConvert.cs" />
<Compile Include="QueryDSL\Query\FuzzyLikeThisQuery.cs" />
<Compile Include="QueryDSL\Converters\FuzzyLikeThisQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\FuzzyLikeThisQueryConverter.cs" />
<Compile Include="QueryDSL\Query\FuzzyQuery.cs" />
<Compile Include="QueryDSL\Converters\FuzzyQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\FuzzyQueryConverter.cs" />
<Compile Include="QueryDSL\Query\HasChildQuery.cs" />
<Compile Include="QueryDSL\Query\HasChildQueryConverter.cs" />
<Compile Include="QueryDSL\Query\IdsQuery.cs" />
<Compile Include="QueryDSL\Converters\IdsQueryConverterer.cs" />
<Compile Include="QueryDSL\Converters\Query\IdsQueryConverterer.cs" />
<Compile Include="QueryDSL\Query\MoreLikeThisQuery.cs" />
<Compile Include="QueryDSL\Query\MoreLikeThisQueryConverter.cs" />
<Compile Include="QueryDSL\Query\NestedQuery.cs" />
<Compile Include="QueryDSL\Query\NestedQueryConverterer.cs" />
<Compile Include="QueryDSL\Query\PrefixQuery.cs" />
<Compile Include="QueryDSL\Query\PrefixQueryConverter.cs" />
<Compile Include="QueryDSL\Query\QueryStringQuery.cs" />
<Compile Include="QueryDSL\Converters\QueryStringConverter.cs" />
<Compile Include="QueryDSL\Converters\TermFilterConvert.cs" />
<Compile Include="QueryDSL\Converters\Query\QueryStringConverter.cs" />
<Compile Include="QueryDSL\Converters\Filter\TermFilterConvert.cs" />
<Compile Include="QueryDSL\Filter\TermFilter.cs" />
<Compile Include="QueryDSL\Query\RangeQuery.cs" />
<Compile Include="QueryDSL\Query\RangeQueryConverter.cs" />
<Compile Include="QueryDSL\Query\TermQuery.cs" />
<Compile Include="QueryDSL\Converters\TermQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\Query\TermQueryConvert.cs" />
<Compile Include="QueryDSL\Query\TermsQuery.cs" />
<Compile Include="QueryDSL\Converters\TermsQueryConvert.cs" />
<Compile Include="QueryDSL\Converters\Query\TermsQueryConvert.cs" />
<Compile Include="QueryDSL\Query\TextQuery.cs" />
<Compile Include="QueryDSL\Converters\TextQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\TextQueryConverter.cs" />
<Compile Include="QueryDSL\Query\TopChildrenQuery.cs" />
<Compile Include="QueryDSL\Query\TopChildrenQueryConverterer.cs" />
<Compile Include="QueryDSL\Query\WildcardQuery.cs" />
<Compile Include="QueryDSL\Converters\WildcardQueryConverter.cs" />
<Compile Include="QueryDSL\Converters\Query\WildcardQueryConverter.cs" />
<Compile Include="QueryString\Conditional.cs" />
<Compile Include="QueryString\ExpressionEx.cs" />
<Compile Include="Transport\Connection\Connection.cs" />
Expand Down
@@ -0,0 +1,39 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class AndFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
AndFilter term = (AndFilter)value;
if (term != null)
{
writer.WriteStartObject();
writer.WritePropertyName("and");
writer.WriteStartObject();
writer.WritePropertyName("filters");
writer.WriteStartArray();
foreach (var filter in term.Filters)
{
serializer.Serialize(writer, filter);
}
writer.WriteEndArray();
writer.WriteEndObject();
writer.WriteRaw(",\"_cache\": " + term.Cache.ToString().ToLower());
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(AndFilter).IsAssignableFrom(objectType);
}
}
}
@@ -0,0 +1,62 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class BoolFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
BoolFilter term = (BoolFilter)value;
if (term != null)
{
writer.WriteStartObject();
writer.WritePropertyName("bool");
writer.WriteStartObject();
bool pre = false;
if (term.MustFilters != null && term.MustFilters.Count > 0)
{
writer.WritePropertyName("must");
writer.WriteStartArray();
foreach (var VARIABLE in term.MustFilters)
{
serializer.Serialize(writer, VARIABLE);
}
writer.WriteEndArray();
}
if (term.MustNotFilters != null && term.MustNotFilters.Count > 0)
{
writer.WritePropertyName("must_not");
writer.WriteStartArray();
foreach (var VARIABLE in term.MustNotFilters)
{
serializer.Serialize(writer, VARIABLE);
}
writer.WriteEndArray();
}
if (term.ShouldFilters != null && term.ShouldFilters.Count > 0)
{
writer.WritePropertyName("should");
writer.WriteStartArray();
foreach (var shouldQuery in term.ShouldFilters)
{
serializer.Serialize(writer, shouldQuery);
}
writer.WriteEndArray();
}
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(BoolFilter).IsAssignableFrom(objectType);
}
}
}
@@ -0,0 +1,34 @@
using System;
using System.Text;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class ExistsFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
// {"exists" : { "field" : "user" }}
ExistsFilter term = (ExistsFilter)value;
if (term != null)
{
var stringBuilder = new StringBuilder();
stringBuilder.Append("{exists:{ \"field\" : \"");
stringBuilder.Append(term.Filed);
stringBuilder.Append("\"}}");

writer.WriteRawValue(stringBuilder.ToString());
}
}

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

public override bool CanConvert(Type objectType)
{
return typeof(ExistsFilter).IsAssignableFrom(objectType);
}
}
}
@@ -0,0 +1,23 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class GeoBBoxFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
throw new NotImplementedException();
}

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

public override bool CanConvert(Type objectType)
{
throw new NotImplementedException();
}
}
}
@@ -0,0 +1,23 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class GeoDistanceFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
throw new NotImplementedException();
}

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

public override bool CanConvert(Type objectType)
{
throw new NotImplementedException();
}
}
}
@@ -0,0 +1,23 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class GeoDistanceRangeFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
throw new NotImplementedException();
}

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

public override bool CanConvert(Type objectType)
{
throw new NotImplementedException();
}
}
}
@@ -0,0 +1,23 @@
using System;
using Newtonsoft.Json;

namespace ElasticSearch.Client.QueryDSL
{
internal class GeoPolygonFilterConverter : JsonConverter
{
public override void WriteJson(JsonWriter writer, object value, JsonSerializer serializer)
{
throw new NotImplementedException();
}

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

public override bool CanConvert(Type objectType)
{
throw new NotImplementedException();
}
}
}

0 comments on commit f186d03

Please sign in to comment.