diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj index f91ec6ccb04..335dfc0c982 100644 --- a/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj +++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/CodeGeneration.LowLevelClient.csproj @@ -77,6 +77,7 @@ + diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/DeleteWarmerDescriptorOverrides.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/DeleteWarmerDescriptorOverrides.cs new file mode 100644 index 00000000000..9242f327cd6 --- /dev/null +++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/DeleteWarmerDescriptorOverrides.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; + +namespace CodeGeneration.LowLevelClient.Overrides.Descriptors +{ + public class DeleteWarmerDescriptorOverrides : IDescriptorOverrides + { + public IEnumerable SkipQueryStringParams + { + get + { + return new string[] + { + "name" + }; + } + } + } +} diff --git a/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs b/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs index 19d11e63e0a..596a03e8f30 100644 --- a/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs +++ b/src/CodeGeneration/CodeGeneration.LowLevelClient/Overrides/Descriptors/SearchDescriptorOverrides.cs @@ -33,7 +33,10 @@ public IEnumerable SkipQueryStringParams "version", "q", //we dont support GET searches "fields", - "sort" + "sort", + "_source", + "_source_include", + "_source_exclude" }; } } diff --git a/src/Nest/DSL/CountDescriptor.cs b/src/Nest/DSL/CountDescriptor.cs index 13cc9fb2ddd..b5a151ed715 100644 --- a/src/Nest/DSL/CountDescriptor.cs +++ b/src/Nest/DSL/CountDescriptor.cs @@ -5,19 +5,17 @@ namespace Nest { [DescriptorFor("Count")] - [JsonConverter(typeof(CustomJsonConverter))] public partial class CountDescriptor : QueryPathDescriptorBase, T, CountQueryString> - , IActAsQuery , IPathInfo - , ICustomJson where T : class { - BaseQuery IActAsQuery._Query { get; set; } + [JsonProperty("query")] + internal BaseQuery _Query { get; set; } public CountDescriptor Query(Func, BaseQuery> querySelector) { - ((IActAsQuery)this)._Query = querySelector(new QueryDescriptor()); + this._Query = querySelector(new QueryDescriptor()); return this; } @@ -31,10 +29,5 @@ ElasticsearchPathInfo IPathInfo.ToPathInfo(I return pathInfo; } - - object ICustomJson.GetCustomJson() - { - return ((IActAsQuery) this)._Query; - } } } diff --git a/src/Nest/DSL/FluentDictionary.cs b/src/Nest/DSL/FluentDictionary.cs index c5dde9f4c18..7a5e30a5bd8 100644 --- a/src/Nest/DSL/FluentDictionary.cs +++ b/src/Nest/DSL/FluentDictionary.cs @@ -1,7 +1,23 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Linq.Expressions; +using Nest.Resolvers; namespace Nest { + public class FluentFieldList : List where T : class + { + public new FluentFieldList Add(Expression> k) + { + base.Add(k); + return this; + } + public new FluentFieldList Add(string k) + { + base.Add(k); + return this; + } + } public class FluentDictionary : Dictionary { public FluentDictionary() diff --git a/src/Nest/DSL/IQueryDescriptor.cs b/src/Nest/DSL/IQueryDescriptor.cs index c6c2aa0286e..2178d6e6351 100644 --- a/src/Nest/DSL/IQueryDescriptor.cs +++ b/src/Nest/DSL/IQueryDescriptor.cs @@ -41,9 +41,6 @@ interface IQueryDescriptor BaseQuery Terms(string field, params string[] terms); BaseQuery TermsDescriptor(Action> selector); BaseQuery TermsDescriptor(Action> selector); - BaseQuery Text(Action> selector); - BaseQuery TextPhrase(Action> selector); - BaseQuery TextPhrasePrefix(Action> selector); BaseQuery Match(Action> selector); BaseQuery MatchPhrase(Action> selector); BaseQuery MatchPhrasePrefix(Action> selector); diff --git a/src/Nest/DSL/PartialFieldDescriptor.cs b/src/Nest/DSL/PartialFieldDescriptor.cs deleted file mode 100644 index 6aae14e6782..00000000000 --- a/src/Nest/DSL/PartialFieldDescriptor.cs +++ /dev/null @@ -1,49 +0,0 @@ -using System.Linq.Expressions; -using Nest.Resolvers; -using Newtonsoft.Json; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nest -{ - public class PartialFieldDescriptor where T : class - { - internal string _Field { get; set; } - - [JsonProperty("include")] - internal IEnumerable _Include { get; set; } - - [JsonProperty("exclude")] - internal IEnumerable _Exclude { get; set; } - - public PartialFieldDescriptor PartialField(string field) - { - this._Field = field; - return this; - } - - public PartialFieldDescriptor Include(params string[] paths) - { - this._Include = paths.Select(p => (PropertyPathMarker) p); - return this; - } - - public PartialFieldDescriptor Exclude(params string[] paths) - { - this._Exclude = paths.Select(p => (PropertyPathMarker) p); - return this; - } - public PartialFieldDescriptor Include(params Expression>[] paths) - { - this._Include = paths.Select(p => (PropertyPathMarker) p); - return this; - } - public PartialFieldDescriptor Exclude(params Expression>[] paths) - { - this._Exclude = paths.Select(p => (PropertyPathMarker) p); - return this; - } - } -} diff --git a/src/Nest/DSL/Query/RawQuery.cs b/src/Nest/DSL/Query/RawQuery.cs deleted file mode 100644 index be2042cc326..00000000000 --- a/src/Nest/DSL/Query/RawQuery.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Linq.Expressions; -using Nest.Resolvers; -using Newtonsoft.Json.Serialization; -using Newtonsoft.Json; -using Nest.Resolvers.Converters; - -namespace Nest -{ - [JsonConverter(typeof(CustomJsonConverter))] - [JsonObject(MemberSerialization = MemberSerialization.OptIn)] - public class RawQuery : IQuery, ICustomJson - { - internal object Json { get; set; } - bool IQuery.IsConditionless { get { return this.Json == null || this.Json.ToString().IsNullOrEmpty(); } } - - object ICustomJson.GetCustomJson() - { - return this.Json; - } - } -} diff --git a/src/Nest/DSL/Query/TextPhrasePrefixQueryDescriptor.cs b/src/Nest/DSL/Query/TextPhrasePrefixQueryDescriptor.cs deleted file mode 100644 index acd7d43d1a8..00000000000 --- a/src/Nest/DSL/Query/TextPhrasePrefixQueryDescriptor.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using System.Linq.Expressions; - -namespace Nest -{ - /// - /// A Query that matches documents containing a particular sequence of terms. - /// It allows for prefix matches on the last term in the text. - /// - /// Type of document - public class TextPhrasePrefixQueryDescriptor : TextQueryDescriptor where T : class - { - [JsonProperty(PropertyName = "type")] - internal override string _Type { get { return "phrase_prefix"; } } - } -} diff --git a/src/Nest/DSL/Query/TextPhraseQueryDescriptor.cs b/src/Nest/DSL/Query/TextPhraseQueryDescriptor.cs deleted file mode 100644 index c4ad63f1219..00000000000 --- a/src/Nest/DSL/Query/TextPhraseQueryDescriptor.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using System.Linq.Expressions; - -namespace Nest -{ - /// - /// A Query that matches documents containing a particular sequence of terms. A PhraseQuery is built by QueryParser for input like "new york". - /// - /// Type of document - public class TextPhraseQueryDescriptor : TextQueryDescriptor where T : class - { - [JsonProperty(PropertyName = "type")] - internal override string _Type { get { return "phrase"; } } - } -} diff --git a/src/Nest/DSL/Query/TextQueryDescriptor.cs b/src/Nest/DSL/Query/TextQueryDescriptor.cs deleted file mode 100644 index 9e1045ce092..00000000000 --- a/src/Nest/DSL/Query/TextQueryDescriptor.cs +++ /dev/null @@ -1,104 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using Newtonsoft.Json; -using Newtonsoft.Json.Converters; -using System.Linq.Expressions; -using Nest.Resolvers; - -namespace Nest -{ - [JsonObject(MemberSerialization = MemberSerialization.OptIn)] - public class TextQueryDescriptor : IQuery where T : class - { - [JsonProperty(PropertyName = "type")] - internal virtual string _Type { get { return null; } } - - [JsonProperty(PropertyName = "query")] - internal string _Query { get; set; } - - [JsonProperty(PropertyName = "analyzer")] - internal string _Analyzer { get; set; } - - [JsonProperty(PropertyName = "fuzziness")] - internal double? _Fuzziness { get; set; } - - [JsonProperty(PropertyName = "prefix_length")] - internal int? _PrefixLength { get; set; } - - [JsonProperty(PropertyName = "max_expansions")] - internal int? _MaxExpansions { get; set; } - - [JsonProperty(PropertyName = "slop")] - internal int? _Slop { get; set; } - - [JsonProperty(PropertyName = "boost")] - internal double? _Boost { get; set; } - - [JsonProperty(PropertyName = "operator")] - [JsonConverter(typeof(StringEnumConverter))] - internal Operator? _Operator { get; set; } - - bool IQuery.IsConditionless - { - get - { - return this._Field.IsConditionless() || this._Query.IsNullOrEmpty(); - } - } - - internal PropertyPathMarker _Field { get; set; } - public TextQueryDescriptor OnField(string field) - { - this._Field = field; - return this; - } - public TextQueryDescriptor OnField(Expression> objectPath) - { - this._Field = objectPath; - return this; - } - - public TextQueryDescriptor Query(string query) - { - this._Query = query; - return this; - } - public TextQueryDescriptor Analyzer(string analyzer) - { - this._Analyzer = analyzer; - return this; - } - public TextQueryDescriptor Fuzziness(double fuzziness) - { - this._Fuzziness = fuzziness; - return this; - } - public TextQueryDescriptor Boost(double boost) - { - this._Boost = boost; - return this; - } - public TextQueryDescriptor PrefixLength(int prefixLength) - { - this._PrefixLength = prefixLength; - return this; - } - public TextQueryDescriptor MaxExpansions(int maxExpansions) - { - this._MaxExpansions = maxExpansions; - return this; - } - public TextQueryDescriptor Slop(int slop) - { - this._Slop = slop; - return this; - } - public TextQueryDescriptor Operator(Operator op) - { - this._Operator = op; - return this; - } - } -} diff --git a/src/Nest/DSL/QueryDescriptor.cs b/src/Nest/DSL/QueryDescriptor.cs index b8cb2361176..0da87a80be6 100644 --- a/src/Nest/DSL/QueryDescriptor.cs +++ b/src/Nest/DSL/QueryDescriptor.cs @@ -281,52 +281,6 @@ public BaseQuery FuzzyDate(Action> selector) return this.New(query, q => q.FuzzyQueryDescriptor = fuzzy); } - /// - /// The default text query is of type boolean. It means that the text provided is analyzed and the analysis - /// process constructs a boolean query from the provided text. - /// - public BaseQuery Text(Action> selector) - { - var query = new TextQueryDescriptor(); - selector(query); - - var text = new Dictionary() - { - { query._Field, query} - }; - return this.New(query, q => q.TextQueryDescriptor = text); - } - - /// - /// The text_phrase query analyzes the text and creates a phrase query out of the analyzed text. - /// - public BaseQuery TextPhrase(Action> selector) - { - var query = new TextPhraseQueryDescriptor(); - selector(query); - - var text = new Dictionary() - { - { query._Field, query} - }; - return this.New(query, q => q.TextQueryDescriptor = text); - } - - /// - /// The text_phrase_prefix is the same as text_phrase, expect it allows for prefix matches on the last term - /// in the text - /// - public BaseQuery TextPhrasePrefix(Action> selector) - { - var query = new TextPhrasePrefixQueryDescriptor(); - selector(query); - - var text = new Dictionary() - { - { query._Field, query} - }; - return this.New(query, q => q.TextQueryDescriptor = text); - } /// /// The default text query is of type boolean. It means that the text provided is analyzed and the analysis diff --git a/src/Nest/DSL/Search/SourceDescriptor.cs b/src/Nest/DSL/Search/SourceDescriptor.cs new file mode 100644 index 00000000000..e8794992e8c --- /dev/null +++ b/src/Nest/DSL/Search/SourceDescriptor.cs @@ -0,0 +1,50 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Linq.Expressions; +using System.Text; +using Nest.Resolvers; +using Newtonsoft.Json; + +namespace Nest.DSL.Search +{ + public class SourceDescriptor where T : class + { + [JsonProperty("include")] + internal IEnumerable _Include { get; set; } + + [JsonProperty("exclude")] + internal IEnumerable _Exclude { get; set; } + + public SourceDescriptor Include(params string[] fields) + { + this._Include = fields.Select(f => (PropertyPathMarker) f).ToList(); + return this; + } + public SourceDescriptor Include(params Expression>[] fields) + { + this._Include = fields.Select(f => (PropertyPathMarker) f).ToList(); + return this; + } + public SourceDescriptor Include(Func, FluentFieldList> fields) + { + this._Include = fields(new FluentFieldList()).ToList(); + return this; + } + public SourceDescriptor Exclude(params string[] fields) + { + this._Exclude = fields.Select(f => (PropertyPathMarker) f).ToList(); + return this; + } + public SourceDescriptor Exclude(params Expression>[] fields) + { + this._Exclude = fields.Select(f => (PropertyPathMarker) f).ToList(); + return this; + } + public SourceDescriptor Exclude(Func, FluentFieldList> fields) + { + this._Exclude = fields(new FluentFieldList()).ToList(); + return this; + } + } +} diff --git a/src/Nest/DSL/SearchDescriptor.cs b/src/Nest/DSL/SearchDescriptor.cs index 30880e2f55d..aaa043464aa 100644 --- a/src/Nest/DSL/SearchDescriptor.cs +++ b/src/Nest/DSL/SearchDescriptor.cs @@ -3,6 +3,7 @@ using System.Linq; using System.Security.Cryptography; using System.Text; +using Nest.DSL.Search; using Newtonsoft.Json; using Newtonsoft.Json.Converters; using Nest.Resolvers.Converters; @@ -280,10 +281,20 @@ internal RawOrFilterDescriptor _FilterOrRaw [JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))] internal FluentDictionary _ScriptFields { get; set; } - [JsonProperty(PropertyName = "partial_fields")] - [JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))] - internal Dictionary> _PartialFields { get; set; } + [JsonProperty(PropertyName = "_source")] + internal object _Source { get; set; } + public SearchDescriptor Source(bool include = true) + { + this._Source = include; + return this; + } + + public SearchDescriptor Source(Func, SourceDescriptor> sourceSelector) + { + this._Source = sourceSelector(new SourceDescriptor()); + return this; + } /// /// The number of hits to return. Defaults to 10. When using scroll search type /// size is actually multiplied by the number of shards! @@ -449,6 +460,16 @@ public SearchDescriptor Fields(params Expression>[] expressio this._Fields = expressions.Select(e => (PropertyPathMarker)e).ToList(); return this; } + + /// + /// Allows to selectively load specific fields for each document + /// represented by a search hit. Defaults to load the internal _source field. + /// + public SearchDescriptor Fields(Func, FluentFieldList> properties) + { + this._Fields = properties(new FluentFieldList()).ToList(); + return this; + } /// /// Allows to selectively load specific fields for each document /// represented by a search hit. Defaults to load the internal _source field. @@ -480,30 +501,6 @@ public SearchDescriptor ScriptFields( return this; } - public SearchDescriptor PartialFields(params Action>[] partialFieldDescriptor) - { - if (this._PartialFields == null) - this._PartialFields = new Dictionary>(); - - var descriptors = new List>(); - - foreach (var selector in partialFieldDescriptor) - { - var filter = new PartialFieldDescriptor(); - selector(filter); - descriptors.Add(filter); - } - - foreach (var d in descriptors) - { - var key = d._Field; - if (string.IsNullOrEmpty(key)) - throw new DslException("Could not infer key for highlight field descriptor"); - - this._PartialFields.Add(key, d); - } - return this; - } /// /// Allows to add one or more sort on specific fields. Each sort can be reversed as well. diff --git a/src/Nest/DSL/_Descriptors.generated.cs b/src/Nest/DSL/_Descriptors.generated.cs index 093b86565db..49f96aa9e20 100644 --- a/src/Nest/DSL/_Descriptors.generated.cs +++ b/src/Nest/DSL/_Descriptors.generated.cs @@ -2284,14 +2284,6 @@ public DeleteWarmerDescriptor MasterTimeout(string master_timeout) return this; } - - ///A comma-separated list of warmer names to delete (supports wildcards); use `_all` to delete all warmers in the specified indices. You must specify a name either in the uri or in the parameters. - public DeleteWarmerDescriptor Name(params string[] name) - { - this._QueryString.Name(name); - return this; - } - } @@ -4464,30 +4456,6 @@ public SearchDescriptor Source(string source) } - ///True or false to return the _source field or not, or a list of fields to return - public SearchDescriptor Source(params string[] _source) - { - this._QueryString.Source(_source); - return this; - } - - - ///A list of fields to exclude from the returned _source field - public SearchDescriptor SourceExclude(params string[] _source_exclude) - { - this._QueryString.SourceExclude(_source_exclude); - return this; - } - - - ///A list of fields to extract and return from the _source field - public SearchDescriptor SourceInclude(params string[] _source_include) - { - this._QueryString.SourceInclude(_source_include); - return this; - } - - ///Specific 'tag' of the request for logging and statistical purposes public SearchDescriptor Stats(params string[] stats) { diff --git a/src/Nest/Domain/Connection/AsyncRequestOperation.cs b/src/Nest/Domain/Connection/AsyncRequestOperation.cs new file mode 100644 index 00000000000..b36ac9f9e4e --- /dev/null +++ b/src/Nest/Domain/Connection/AsyncRequestOperation.cs @@ -0,0 +1,143 @@ +using System; +using System.IO; +using System.Net; +using System.Text; +using System.Threading; +using System.Threading.Tasks; +using Nest.Domain.Connection; + +namespace Nest +{ + public class AsyncRequestOperation : TaskCompletionSource, IDisposable + { + private readonly HttpWebRequest m_request; + private readonly string m_requestData; + private readonly IConnectionSettings m_connectionSettings; + private ConnectionStatusTracer m_tracer; + private WebResponse m_response; + private Stream m_responseStream; + + public AsyncRequestOperation(HttpWebRequest request, string requestData, IConnectionSettings connectionSettings, ConnectionStatusTracer tracer) + { + m_request = request; + m_requestData = requestData; + m_connectionSettings = connectionSettings; + m_tracer = tracer; + Start(); + } + + private void Start() + { + if (this.m_requestData != null) + WriteRequestDataAsync(); + else + GetResponseAsync(); + } + + private void WriteRequestDataAsync() + { + this.m_request.BeginGetRequestStream(this.Monitor(ar => + { + var r = this.m_request.EndGetRequestStream(ar); + var buffer = Encoding.UTF8.GetBytes(this.m_requestData); + r.BeginWrite(buffer, 0, buffer.Length, this.Monitor(writeIar => + { + r.EndWrite(writeIar); + GetResponseAsync(); + }), null); + }), null); + } + + private void GetResponseAsync() + { + this.m_request.BeginGetResponse(this.Monitor(iarResponse => + { + m_response = m_request.EndGetResponse(iarResponse); + m_responseStream = m_response.GetResponseStream(); + + var buffer = new byte[8192]; + var result = new MemoryStream(buffer.Length); + ReadResponseStreamAsync(this.m_responseStream, buffer, result); + + }), null); + } + + private void ReadResponseStreamAsync(Stream stream, byte[] buffer, MemoryStream result) + { + stream.BeginRead(buffer, 0, buffer.Length, this.Monitor(iar => + { + var bytes = stream.EndRead(iar); + if (bytes == 0) + { + Done(result); + return; + } + + result.Write(buffer, 0, bytes); + ReadResponseStreamAsync(stream, buffer, result); + + }), null); + } + + private void Done(ConnectionStatus connectionStatus) + { + m_tracer.SetResult(connectionStatus); + TrySetResult(connectionStatus); + Dispose(); + } + + private void Done(Stream result) + { + result.Position = 0; + var reader = new StreamReader(result); + Done(new ConnectionStatus(this.m_connectionSettings, reader.ReadToEnd()) + { + Request = this.m_requestData, + RequestUrl = this.m_request.RequestUri.ToString(), + RequestMethod = this.m_request.Method + }); + + } + + private AsyncCallback Monitor(AsyncCallback callback) + { + return ar => + { + try + { + callback(ar); + } + catch (WebException webException) + { + var connectionStatus = new ConnectionStatus(this.m_connectionSettings, webException) + { + Request = this.m_requestData, + RequestUrl = this.m_request.RequestUri.ToString(), + RequestMethod = this.m_request.Method + }; + m_connectionSettings.ConnectionStatusHandler(connectionStatus); + Done(connectionStatus); + } + catch (Exception e) + { + TrySetException(e); + Dispose(); + } + }; + } + + public void Dispose() + { + Dispose(ref m_response); + Dispose(ref m_responseStream); + Dispose(ref m_tracer); + } + + private static void Dispose(ref T disposable) where T : class, IDisposable + { + var d = Interlocked.Exchange(ref disposable, null); + if (d != null) + d.Dispose(); + } + } +} \ No newline at end of file diff --git a/src/Nest/Domain/CovariantDictionary.cs b/src/Nest/Domain/CovariantDictionary.cs deleted file mode 100644 index d94da70fe2f..00000000000 --- a/src/Nest/Domain/CovariantDictionary.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; - -namespace Nest -{ - public interface ICovariantDictionary where T : class - { - T this[string key] { get; } - - IEnumerable> Items { get; } - } - - public interface ICovariantItem where T : class - { - string Key { get; } - T Value { get; } - } - - public class CovariantDictionary : ICovariantDictionary where T : class - { - public T this[string key] - { - get - { - var pair = this.Items.EmptyIfNull().FirstOrDefault(x => x.Key == key); - return pair == null ? null : pair.Value; - } - } - - public IEnumerable> Items { get; internal set; } - } - - public class CovariantItem : ICovariantItem - where T : class - { - public string Key { get; internal set; } - public T Value { get; internal set; } - } -} diff --git a/src/Nest/Domain/DSL/Query.cs b/src/Nest/Domain/DSL/Query.cs index 40a0762f882..66b2d9d2c01 100644 --- a/src/Nest/Domain/DSL/Query.cs +++ b/src/Nest/Domain/DSL/Query.cs @@ -201,20 +201,6 @@ public static BaseQuery TermsDescriptor(Action> se return new QueryDescriptor().TermsDescriptor(selector); } - public static BaseQuery Text(Action> selector) - { - return new QueryDescriptor().Text(selector); - } - - public static BaseQuery TextPhrase(Action> selector) - { - return new QueryDescriptor().TextPhrase(selector); - } - - public static BaseQuery TextPhrasePrefix(Action> selector) - { - return new QueryDescriptor().TextPhrasePrefix(selector); - } public static BaseQuery Match(Action> selector) { diff --git a/src/Nest/Domain/FieldSelection.cs b/src/Nest/Domain/FieldSelection.cs index 3d321e90a8a..8cefc30df99 100644 --- a/src/Nest/Domain/FieldSelection.cs +++ b/src/Nest/Domain/FieldSelection.cs @@ -11,7 +11,7 @@ namespace Nest.Domain { - public interface IFieldSelection + public interface IFieldSelection { } @@ -34,15 +34,15 @@ internal FieldSelection(ElasticInferrer inferrer, IDictionary va [JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))] internal IDictionary FieldValues { get; set; } - public K FieldValue(Expression> objectPath) + public K[] FieldValue(Expression> objectPath) { var path = this.Infer.PropertyPath(objectPath); - return this.FieldValue(path); + return this.FieldValue(path); } - public K FieldValue(Expression> objectPath) + public K[] FieldValue(Expression> objectPath) { var path = this.Infer.PropertyPath(objectPath); - return this.FieldValue(path); + return this.FieldValue(path); } public K FieldValue(string path) diff --git a/src/Nest/Domain/Hit/Hit.cs b/src/Nest/Domain/Hit/Hit.cs index fdf65118666..c47378d1adb 100644 --- a/src/Nest/Domain/Hit/Hit.cs +++ b/src/Nest/Domain/Hit/Hit.cs @@ -2,51 +2,53 @@ using System.Collections.Generic; using System.Linq; using System.Text; +using Nest.Domain; using Newtonsoft.Json; namespace Nest { //[JsonConverter(typeof(ConcreteTypeConverter))] - public interface IHit where T : class - { - T Fields { get; } - T Source { get; } - string Index { get; } - double Score { get; } - string Type { get; } - string Version { get; } - string Id { get; } + public interface IHit where T : class + { + //IFieldSelection Fields { get; } + T Source { get; } + string Index { get; } + double Score { get; } + string Type { get; } + string Version { get; } + string Id { get; } - IEnumerable Sorts { get; } + IEnumerable Sorts { get; } HighlightFieldDictionary Highlights { get; } - Explanation Explanation { get; } - ICovariantDictionary PartialFields { get; } - } + Explanation Explanation { get; } + } - [JsonObject] - public class Hit : IHit - where T : class - { - [JsonProperty(PropertyName = "fields")] - public T Fields { get; internal set; } - [JsonProperty(PropertyName = "_source")] - public T Source { get; internal set; } - [JsonProperty(PropertyName = "_index")] - public string Index { get; internal set; } - [JsonProperty(PropertyName = "_score")] - public double Score { get; internal set; } - [JsonProperty(PropertyName = "_type")] - public string Type { get; internal set; } - [JsonProperty(PropertyName = "_version")] - public string Version { get; internal set; } - [JsonProperty(PropertyName = "_id")] - public string Id { get; internal set; } + [JsonObject] + public class Hit : IHit + where T : class + { + [JsonProperty(PropertyName = "fields")] + internal IDictionary _fields { get; set; } + [JsonIgnore] + public FieldSelection Fields { get; internal set; } + [JsonProperty(PropertyName = "_source")] + public T Source { get; internal set; } + [JsonProperty(PropertyName = "_index")] + public string Index { get; internal set; } + [JsonProperty(PropertyName = "_score")] + public double Score { get; internal set; } + [JsonProperty(PropertyName = "_type")] + public string Type { get; internal set; } + [JsonProperty(PropertyName = "_version")] + public string Version { get; internal set; } + [JsonProperty(PropertyName = "_id")] + public string Id { get; internal set; } - [JsonProperty(PropertyName = "sort")] - public IEnumerable Sorts { get; internal set; } + [JsonProperty(PropertyName = "sort")] + public IEnumerable Sorts { get; internal set; } - [JsonProperty(PropertyName = "highlight")] + [JsonProperty(PropertyName = "highlight")] [JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))] internal Dictionary> _Highlight { get; set; } @@ -62,21 +64,14 @@ public HighlightFieldDictionary Highlights DocumentId = this.Id, Field = kv.Key, Highlights = kv.Value - }).ToDictionary(k=>k.Field, v=>v); + }).ToDictionary(k => k.Field, v => v); return new HighlightFieldDictionary(highlights); - } + } } [JsonProperty(PropertyName = "_explanation")] public Explanation Explanation { get; internal set; } - - public ICovariantDictionary PartialFields { get; internal set; } - - public Hit() - { - - } - } + } } diff --git a/src/Nest/Domain/Hit/MultiGetHit.cs b/src/Nest/Domain/Hit/MultiGetHit.cs index 5a06f26ec28..61072292506 100644 --- a/src/Nest/Domain/Hit/MultiGetHit.cs +++ b/src/Nest/Domain/Hit/MultiGetHit.cs @@ -13,7 +13,7 @@ public interface IMultiGetHit where T : class string Index { get; } - bool Exists { get; } + bool Found { get; } string Type { get; } @@ -35,8 +35,8 @@ public class MultiGetHit : IMultiGetHit [JsonProperty(PropertyName = "_index")] public string Index { get; internal set; } - [JsonProperty(PropertyName = "exists")] - public bool Exists { get; internal set; } + [JsonProperty(PropertyName = "found")] + public bool Found { get; internal set; } [JsonProperty(PropertyName = "_type")] public string Type { get; internal set; } diff --git a/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs b/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs index 42e3f833914..c527e20301c 100644 --- a/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs +++ b/src/Nest/Domain/Mapping/Descriptors/StringMappingDescriptor.cs @@ -55,11 +55,7 @@ public StringMappingDescriptor OmitNorms(bool omitNorms = true) this._Mapping.OmitNorms = omitNorms; return this; } - public StringMappingDescriptor OmitTermFrequencyAndPositions(bool omitTermFrequencyAndPositions = true) - { - this._Mapping.OmitTermFrequencyAndPositions = omitTermFrequencyAndPositions; - return this; - } + public StringMappingDescriptor IndexOptions(IndexOptions indexOptions) { this._Mapping.IndexOptions = indexOptions; diff --git a/src/Nest/Domain/Mapping/Types/StringMapping.cs b/src/Nest/Domain/Mapping/Types/StringMapping.cs index a23b6501751..4ed51b47304 100644 --- a/src/Nest/Domain/Mapping/Types/StringMapping.cs +++ b/src/Nest/Domain/Mapping/Types/StringMapping.cs @@ -46,9 +46,6 @@ public class StringMapping : IElasticType, IElasticCoreType [JsonProperty("omit_norms")] public bool? OmitNorms { get; set; } - [JsonProperty("omit_term_freq_and_positions")] - public bool? OmitTermFrequencyAndPositions { get; set; } - [JsonProperty("index_options"), JsonConverter(typeof(StringEnumConverter))] public IndexOptions? IndexOptions { get; set; } diff --git a/src/Nest/Domain/Responses/BulkCreateResponseItem.cs b/src/Nest/Domain/Responses/BulkCreateResponseItem.cs index 92b7355347c..8b74cb20a90 100644 --- a/src/Nest/Domain/Responses/BulkCreateResponseItem.cs +++ b/src/Nest/Domain/Responses/BulkCreateResponseItem.cs @@ -16,8 +16,8 @@ public class BulkCreateResponseItem : BulkOperationResponseItem public override string Id { get; internal set; } [JsonProperty("_version")] public override string Version { get; internal set; } - [JsonProperty("ok")] - public override bool OK { get; internal set; } + [JsonProperty("status")] + public override int Status { get; internal set; } [JsonProperty("error")] public override string Error { get; internal set; } } diff --git a/src/Nest/Domain/Responses/BulkDeleteResponseItem.cs b/src/Nest/Domain/Responses/BulkDeleteResponseItem.cs index 5bc4237b5ba..e523914af1e 100644 --- a/src/Nest/Domain/Responses/BulkDeleteResponseItem.cs +++ b/src/Nest/Domain/Responses/BulkDeleteResponseItem.cs @@ -16,8 +16,10 @@ public class BulkDeleteResponseItem : BulkOperationResponseItem public override string Id { get; internal set; } [JsonProperty("_version")] public override string Version { get; internal set; } - [JsonProperty("ok")] - public override bool OK { get; internal set; } + [JsonProperty("status")] + public override int Status { get; internal set; } + [JsonProperty("found")] + public bool Found { get; internal set; } [JsonProperty("error")] public override string Error { get; internal set; } } diff --git a/src/Nest/Domain/Responses/BulkIndexResponseItem.cs b/src/Nest/Domain/Responses/BulkIndexResponseItem.cs index dae2c261d6a..c8164d66fed 100644 --- a/src/Nest/Domain/Responses/BulkIndexResponseItem.cs +++ b/src/Nest/Domain/Responses/BulkIndexResponseItem.cs @@ -17,8 +17,8 @@ public class BulkIndexResponseItem : BulkOperationResponseItem public override string Id { get; internal set; } [JsonProperty("_version")] public override string Version { get; internal set; } - [JsonProperty("ok")] - public override bool OK { get; internal set; } + [JsonProperty("status")] + public override int Status { get; internal set; } [JsonProperty("error")] public override string Error { get; internal set; } diff --git a/src/Nest/Domain/Responses/BulkOperationResponseItem.cs b/src/Nest/Domain/Responses/BulkOperationResponseItem.cs index 2b2ab0e1e95..0be0746e1ed 100644 --- a/src/Nest/Domain/Responses/BulkOperationResponseItem.cs +++ b/src/Nest/Domain/Responses/BulkOperationResponseItem.cs @@ -12,7 +12,7 @@ public abstract class BulkOperationResponseItem public abstract string Type { get; internal set; } public abstract string Id { get; internal set; } public abstract string Version { get; internal set; } - public abstract bool OK { get; internal set; } + public abstract int Status { get; internal set; } public abstract string Error { get; internal set; } } } \ No newline at end of file diff --git a/src/Nest/Domain/Responses/BulkResponse.cs b/src/Nest/Domain/Responses/BulkResponse.cs index 56820151312..849cb665a2f 100644 --- a/src/Nest/Domain/Responses/BulkResponse.cs +++ b/src/Nest/Domain/Responses/BulkResponse.cs @@ -10,6 +10,9 @@ public class BulkResponse : BaseResponse, IBulkResponse [JsonProperty("took")] public int Took { get; internal set; } + [JsonProperty("errors")] + public bool Errors { get; internal set; } + [JsonProperty("items")] public IEnumerable Items { get; internal set; } } diff --git a/src/Nest/Domain/Responses/BulkUpdateResponseItem.cs b/src/Nest/Domain/Responses/BulkUpdateResponseItem.cs index 9b170a1646c..1607a7b6a17 100644 --- a/src/Nest/Domain/Responses/BulkUpdateResponseItem.cs +++ b/src/Nest/Domain/Responses/BulkUpdateResponseItem.cs @@ -16,8 +16,8 @@ public class BulkUpdateResponseItem : BulkOperationResponseItem public override string Id { get; internal set; } [JsonProperty("_version")] public override string Version { get; internal set; } - [JsonProperty("ok")] - public override bool OK { get; internal set; } + [JsonProperty("status")] + public override int Status { get; internal set; } [JsonProperty("error")] public override string Error { get; internal set; } } diff --git a/src/Nest/Domain/Responses/GetMappingResponse.cs b/src/Nest/Domain/Responses/GetMappingResponse.cs index 7de9dafd22f..28ce39b51d9 100644 --- a/src/Nest/Domain/Responses/GetMappingResponse.cs +++ b/src/Nest/Domain/Responses/GetMappingResponse.cs @@ -9,6 +9,11 @@ public interface IGetMappingResponse : IResponse RootObjectMapping Mapping { get; } } + internal class GetRootObjectMappingWrapping : Dictionary>> + { + + } + public class GetMappingResponse : BaseResponse, IGetMappingResponse { public GetMappingResponse() @@ -16,13 +21,23 @@ public GetMappingResponse() this.IsValid = true; } - internal GetMappingResponse(ConnectionStatus status, Dictionary dict) + internal GetMappingResponse(ConnectionStatus status, GetRootObjectMappingWrapping dict) { - this.IsValid = status.Success; - if (dict == null || dict.Count <= 0) return; - var mapping = dict.First(); + this.IsValid = status.Success && dict != null && dict.Count > 0; + if (!this.IsValid) return; + var firstNode = dict.First(); + var mappingNode = firstNode.Value["mappings"]; + if (mappingNode == null) + { + this.IsValid = false; + return; + } + var mapping = mappingNode.First(); if (mapping.Value == null) + { + this.IsValid = false; return; + } mapping.Value.Name = mapping.Key; this.Mapping = mapping.Value; } diff --git a/src/Nest/Domain/Responses/GetResponse.cs b/src/Nest/Domain/Responses/GetResponse.cs index 1dcdccef730..577a4c62648 100644 --- a/src/Nest/Domain/Responses/GetResponse.cs +++ b/src/Nest/Domain/Responses/GetResponse.cs @@ -11,7 +11,7 @@ namespace Nest { public interface IGetResponse : IResponse where T : class { - bool Exists { get; } + bool Found { get; } string Index { get; } string Type { get; } string Id { get; } @@ -38,8 +38,8 @@ public class GetResponse : BaseResponse, IGetResponse where T : class [JsonProperty(PropertyName = "_version")] public string Version { get; private set; } - [JsonProperty(PropertyName = "exists")] - public bool Exists { get; private set; } + [JsonProperty(PropertyName = "found")] + public bool Found { get; private set; } [JsonProperty(PropertyName = "_source")] public T Source { get; private set; } @@ -68,9 +68,9 @@ public FieldSelection Fields } } - public K FieldValue(Expression> objectPath) + public K[] FieldValue(Expression> objectPath) { - if (this.Fields == null) return default(K); + if (this.Fields == null) return default(K[]); return this.Fields.FieldValue(objectPath); } diff --git a/src/Nest/Domain/Responses/IBulkResponse.cs b/src/Nest/Domain/Responses/IBulkResponse.cs index a48a00f98e6..c2135f08a04 100644 --- a/src/Nest/Domain/Responses/IBulkResponse.cs +++ b/src/Nest/Domain/Responses/IBulkResponse.cs @@ -5,6 +5,7 @@ namespace Nest public interface IBulkResponse : IResponse { int Took { get; } + bool Errors { get; } IEnumerable Items { get; } } } \ No newline at end of file diff --git a/src/Nest/Domain/Responses/IShardsOperationResponse.cs b/src/Nest/Domain/Responses/IShardsOperationResponse.cs new file mode 100644 index 00000000000..0102c363b25 --- /dev/null +++ b/src/Nest/Domain/Responses/IShardsOperationResponse.cs @@ -0,0 +1,15 @@ +using Newtonsoft.Json; + +namespace Nest +{ + public interface IShardsOperationResponse : IResponse + { + ShardsMetaData Shards { get; } + } + + public class ShardsOperationResponse : BaseResponse, IShardsOperationResponse + { + [JsonProperty("_shards")] + public ShardsMetaData Shards { get; internal set; } + } +} \ No newline at end of file diff --git a/src/Nest/Domain/Responses/IndicesOperationResponse.cs b/src/Nest/Domain/Responses/IndicesOperationResponse.cs index da36ceed286..94b0b0ad381 100644 --- a/src/Nest/Domain/Responses/IndicesOperationResponse.cs +++ b/src/Nest/Domain/Responses/IndicesOperationResponse.cs @@ -4,7 +4,6 @@ namespace Nest { public interface IIndicesOperationResponse : IResponse { - bool OK { get; } bool Acknowledged { get; } } @@ -16,10 +15,7 @@ public IndicesOperationResponse() this.IsValid = true; } - [JsonProperty(PropertyName = "ok")] - public bool OK { get; internal set; } - [JsonProperty(PropertyName = "acknowledged")] public bool Acknowledged { get; internal set; } - } + } } \ No newline at end of file diff --git a/src/Nest/Domain/Responses/IndicesResponse.cs b/src/Nest/Domain/Responses/IndicesResponse.cs index 75e06999705..17f89bfd01a 100644 --- a/src/Nest/Domain/Responses/IndicesResponse.cs +++ b/src/Nest/Domain/Responses/IndicesResponse.cs @@ -4,15 +4,15 @@ namespace Nest { public interface IIndicesResponse : IResponse { - bool OK { get; } + bool Acknowledged { get; } ShardsMetaData ShardsHit { get; } } [JsonObject] public class IndicesResponse : BaseResponse, IIndicesResponse { - [JsonProperty(PropertyName = "ok")] - public bool OK { get; private set; } + [JsonProperty(PropertyName = "acknowledged")] + public bool Acknowledged { get; private set; } [JsonProperty(PropertyName = "_shards")] public ShardsMetaData ShardsHit { get; private set; } diff --git a/src/Nest/Domain/Responses/IndicesShardResponse.cs b/src/Nest/Domain/Responses/IndicesShardResponse.cs deleted file mode 100644 index bf45081d08e..00000000000 --- a/src/Nest/Domain/Responses/IndicesShardResponse.cs +++ /dev/null @@ -1,25 +0,0 @@ -using Newtonsoft.Json; - -namespace Nest -{ - public interface IIndicesShardResponse : IResponse - { - bool OK { get; } - ShardsMetaData Shards { get; } - } - - [JsonObject] - public class IndicesShardResponse : BaseResponse, IIndicesShardResponse - { - public IndicesShardResponse() - { - this.IsValid = true; - } - - [JsonProperty(PropertyName = "ok")] - public bool OK { get; internal set; } - - [JsonProperty(PropertyName = "_shards")] - public ShardsMetaData Shards { get; internal set; } - } -} \ No newline at end of file diff --git a/src/Nest/Domain/Responses/QueryResponse.cs b/src/Nest/Domain/Responses/QueryResponse.cs index 255434cf864..a03b813fdd8 100644 --- a/src/Nest/Domain/Responses/QueryResponse.cs +++ b/src/Nest/Domain/Responses/QueryResponse.cs @@ -10,7 +10,7 @@ namespace Nest public interface IQueryResponse : IResponse where T : class { ShardsMetaData Shards { get; } - HitsMetaData Hits { get; } + HitsMetaData HitsMetaData { get; } IDictionary Facets { get; } IDictionary Suggest { get; } int ElapsedMilliseconds { get; } @@ -18,7 +18,7 @@ public interface IQueryResponse : IResponse where T : class long Total { get; } double MaxScore { get; } IEnumerable Documents { get; } - IEnumerable> DocumentsWithMetaData { get; } + IEnumerable> Hits { get; } HighlightDocumentDictionary Highlights { get; } F Facet(Expression> expression) where F : class, IFacet; F Facet(string fieldName) where F : class, IFacet; @@ -38,7 +38,7 @@ public QueryResponse() public ShardsMetaData Shards { get; internal set; } [JsonProperty(PropertyName = "hits")] - public HitsMetaData Hits { get; internal set; } + public HitsMetaData HitsMetaData { get; internal set; } [JsonProperty(PropertyName = "facets")] [JsonConverter(typeof(DictionaryKeysAreNotPropertyNamesJsonConverter))] @@ -60,11 +60,11 @@ public long Total { get { - if (this.Hits == null) + if (this.HitsMetaData == null) { return 0; } - return this.Hits.Total; + return this.HitsMetaData.Total; } } @@ -72,42 +72,39 @@ public double MaxScore { get { - if (this.Hits == null) + if (this.HitsMetaData == null) { return 0; } - return this.Hits.MaxScore; + return this.HitsMetaData.MaxScore; } } + private IList _documents; public IEnumerable Documents { get { - if (this.Hits != null) - { - foreach (var hit in this.Hits.Hits) - { - yield return hit.Source ?? hit.Fields; - } - } + if (this.HitsMetaData != null && this._documents == null) + this._documents = this.HitsMetaData.Hits.Select(h => h.Source).ToList(); + return this._documents; } } - - public IEnumerable> DocumentsWithMetaData + + [JsonIgnore] + public IEnumerable> Hits { get { - if (this.Hits != null) + if (this.HitsMetaData != null) { - return this.Hits.Hits; + return this.HitsMetaData.Hits; } return new List>(); } } - public F Facet(Expression> expression) where F : class, IFacet { var fieldName = this.ConnectionStatus.Infer.PropertyPath(expression); @@ -171,11 +168,11 @@ public HighlightDocumentDictionary Highlights get { var dict = new HighlightDocumentDictionary(); - if (this.Hits == null || !this.Hits.Hits.HasAny()) + if (this.HitsMetaData == null || !this.HitsMetaData.Hits.HasAny()) return dict; - foreach (var hit in this.Hits.Hits) + foreach (var hit in this.HitsMetaData.Hits) { if (!hit.Highlights.Any()) continue; diff --git a/src/Nest/Domain/Responses/ReindexObservable.cs b/src/Nest/Domain/Responses/ReindexObservable.cs index f1ad554d4ef..b18864b1060 100644 --- a/src/Nest/Domain/Responses/ReindexObservable.cs +++ b/src/Nest/Domain/Responses/ReindexObservable.cs @@ -85,7 +85,7 @@ public IBulkResponse IndexSearchResults(IQueryResponse searchResult,IObserver throw new ReindexException(searchResult.ConnectionStatus, "reindex failed on scroll #" + page); var bb = new BulkDescriptor(); - foreach (var d in searchResult.DocumentsWithMetaData) + foreach (var d in searchResult.Hits) { IHit d1 = d; bb.Index(bi => bi.Object(d1.Source).Type(d1.Type).Index(toIndex).Id(d.Id)); diff --git a/src/Nest/ElasticClient-ClearCache.cs b/src/Nest/ElasticClient-ClearCache.cs index adee788bde5..c8e151e1df0 100644 --- a/src/Nest/ElasticClient-ClearCache.cs +++ b/src/Nest/ElasticClient-ClearCache.cs @@ -12,10 +12,10 @@ public partial class ElasticClient /// Clears the cache for the given indices, if no index is specified will clear cache of ALL indices /// /// defaults to clearing all the caches on all indices - public IIndicesResponse ClearCache(Func selector = null) + public IShardsOperationResponse ClearCache(Func selector = null) { selector = selector ?? (s => s); - return this.Dispatch( + return this.Dispatch( selector, (p, d)=> this.RawDispatch.IndicesClearCacheDispatch(p) ); @@ -25,10 +25,10 @@ public IIndicesResponse ClearCache(Func /// defaults to clearing all the caches on all indices - public Task ClearCacheAsync(Func selector = null) + public Task ClearCacheAsync(Func selector = null) { selector = selector ?? (s => s); - return this.DispatchAsync( + return this.DispatchAsync( selector, (p, d)=> this.RawDispatch.IndicesClearCacheDispatchAsync(p) ); diff --git a/src/Nest/ElasticClient-Flush.cs b/src/Nest/ElasticClient-Flush.cs index 0eee4dc4d89..98c44816561 100644 --- a/src/Nest/ElasticClient-Flush.cs +++ b/src/Nest/ElasticClient-Flush.cs @@ -6,17 +6,17 @@ namespace Nest { public partial class ElasticClient { - public IIndicesOperationResponse Flush(Func selector) + public IShardsOperationResponse Flush(Func selector) { - return this.Dispatch( + return this.Dispatch( selector, (p, d) => this.RawDispatch.IndicesFlushDispatch(p) ); } - public Task FlushAsync(Func selector) + public Task FlushAsync(Func selector) { - return this.DispatchAsync( + return this.DispatchAsync( selector, (p, d) => this.RawDispatch.IndicesFlushDispatchAsync(p) ); diff --git a/src/Nest/ElasticClient-MappingIndex.cs b/src/Nest/ElasticClient-MappingIndex.cs index b6ff3c5f0ef..cf12af3e1be 100644 --- a/src/Nest/ElasticClient-MappingIndex.cs +++ b/src/Nest/ElasticClient-MappingIndex.cs @@ -17,7 +17,7 @@ public partial class ElasticClient public IIndexSettingsResponse GetIndexSettings(Func selector) { return this.Dispatch( - selector, + s=> selector(s.FlatSettings()), (p, d) => this.RawDispatch.IndicesGetSettingsDispatch(p), (c, d) => this.Serializer.DeserializeIndexSettingsResponse(c) ); @@ -26,7 +26,7 @@ public IIndexSettingsResponse GetIndexSettings(Func GetIndexSettingsAsync(Func selector) { return this.DispatchAsync( - selector, + s=> selector(s.FlatSettings()), (p, d) => this.RawDispatch.IndicesGetSettingsDispatchAsync(p), (c, d) => this.Serializer.DeserializeIndexSettingsResponse(c) ); diff --git a/src/Nest/ElasticClient-Optimize.cs b/src/Nest/ElasticClient-Optimize.cs index 82d6e8f283f..cf87a81915b 100644 --- a/src/Nest/ElasticClient-Optimize.cs +++ b/src/Nest/ElasticClient-Optimize.cs @@ -7,19 +7,19 @@ namespace Nest public partial class ElasticClient { - public IIndicesOperationResponse Optimize(Func optimizeSelector = null) + public IShardsOperationResponse Optimize(Func optimizeSelector = null) { optimizeSelector = optimizeSelector ?? (s => s); - return this.Dispatch( + return this.Dispatch( optimizeSelector, (p,d) => this.RawDispatch.IndicesOptimizeDispatch(p) ); } - public Task OptimizeAsync(Func optimizeSelector = null) + public Task OptimizeAsync(Func optimizeSelector = null) { optimizeSelector = optimizeSelector ?? (s => s); - return this.DispatchAsync( + return this.DispatchAsync( optimizeSelector, (p,d) => this.RawDispatch.IndicesOptimizeDispatchAsync(p) ); diff --git a/src/Nest/ElasticClient-Refresh.cs b/src/Nest/ElasticClient-Refresh.cs index 7e14df7da88..b8d762d183b 100644 --- a/src/Nest/ElasticClient-Refresh.cs +++ b/src/Nest/ElasticClient-Refresh.cs @@ -7,19 +7,19 @@ namespace Nest public partial class ElasticClient { - public IIndicesShardResponse Refresh(Func refreshSelector = null) + public IShardsOperationResponse Refresh(Func refreshSelector = null) { refreshSelector = refreshSelector ?? (s => s); - return this.Dispatch( + return this.Dispatch( refreshSelector, (p,d) => this.RawDispatch.IndicesRefreshDispatch(p) ); } - public Task RefreshAsync(Func refreshSelector = null) + public Task RefreshAsync(Func refreshSelector = null) { refreshSelector = refreshSelector ?? (s => s); - return this.DispatchAsync( + return this.DispatchAsync( refreshSelector, (p,d)=> this.RawDispatch.IndicesRefreshDispatchAsync(p) ); diff --git a/src/Nest/ElasticClient-Snapshot.cs b/src/Nest/ElasticClient-Snapshot.cs index 4578fc9ea11..9205c49f69c 100644 --- a/src/Nest/ElasticClient-Snapshot.cs +++ b/src/Nest/ElasticClient-Snapshot.cs @@ -6,19 +6,19 @@ namespace Nest { public partial class ElasticClient { - public IIndicesShardResponse Snapshot(Func snapshotSelector = null) + public IShardsOperationResponse Snapshot(Func snapshotSelector = null) { snapshotSelector = snapshotSelector ?? (s => s); - return this.Dispatch( + return this.Dispatch( snapshotSelector, (p, d) => this.RawDispatch.IndicesSnapshotIndexDispatch(p) ); } - public Task SnapshotAsync(Func snapshotSelector = null) + public Task SnapshotAsync(Func snapshotSelector = null) { snapshotSelector = snapshotSelector ?? (s => s); - return this.DispatchAsync( + return this.DispatchAsync( snapshotSelector, (p, d) => this.RawDispatch.IndicesSnapshotIndexDispatchAsync(p) ); diff --git a/src/Nest/ExposedInternals/ElasticSerializer.cs b/src/Nest/ExposedInternals/ElasticSerializer.cs index de6206956cf..a3a69560076 100644 --- a/src/Nest/ExposedInternals/ElasticSerializer.cs +++ b/src/Nest/ExposedInternals/ElasticSerializer.cs @@ -125,10 +125,7 @@ public IQueryResponse DeserializeSearchResponse(ConnectionS { var types = (originalSearchDescriptor._Types ?? Enumerable.Empty()) .Where(t => t.Type != null); - var partialFields = originalSearchDescriptor._PartialFields.EmptyIfNull().Select(x => x.Key); - if (originalSearchDescriptor._ConcreteTypeSelector == null && ( - types.Any(t => t.Type != typeof(TResult))) - || partialFields.Any()) + if (originalSearchDescriptor._ConcreteTypeSelector == null && types.Any(t => t.Type != typeof(TResult))) { var inferrer = new ElasticInferrer(this._settings); var typeDictionary = types @@ -148,7 +145,7 @@ public IQueryResponse DeserializeSearchResponse(ConnectionS return this.DeserializeInternal>( status, - piggyBackJsonConverter: new ConcreteTypeConverter(originalSearchDescriptor._ConcreteTypeSelector, partialFields) + piggyBackJsonConverter: new ConcreteTypeConverter(originalSearchDescriptor._ConcreteTypeSelector) ); } @@ -297,10 +294,11 @@ public TemplateResponse DeserializeTemplateResponse(ConnectionStatus c, GetTempl }; } + public GetMappingResponse DeserializeGetMappingResponse(ConnectionStatus c) { var dict = c.Success - ? c.Deserialize>() + ? c.Deserialize() : null; return new GetMappingResponse(c, dict); diff --git a/src/Nest/IElasticClient.cs b/src/Nest/IElasticClient.cs index a409af4dab6..9cb1516dbe6 100644 --- a/src/Nest/IElasticClient.cs +++ b/src/Nest/IElasticClient.cs @@ -36,10 +36,10 @@ Task UpdateAsync(Func, UpdateDescr Task OpenIndexAsync(Func openIndexSelector); IIndicesOperationResponse CloseIndex(Func closeIndexSelector); Task CloseIndexAsync(Func closeIndexSelector); - IIndicesShardResponse Snapshot(Func snapShotSelector = null); - Task SnapshotAsync(Func snapShotSelector = null); - IIndicesShardResponse Refresh(Func refreshSelector = null); - Task RefreshAsync(Func refreshSelector = null); + IShardsOperationResponse Snapshot(Func snapShotSelector = null); + Task SnapshotAsync(Func snapShotSelector = null); + IShardsOperationResponse Refresh(Func refreshSelector = null); + Task RefreshAsync(Func refreshSelector = null); ISegmentsResponse Segments(Func segmentsSelector = null); Task SegmentsAsync(Func segmentsSelector = null); IClusterStateResponse ClusterState(Func clusterStateSelector = null); @@ -70,14 +70,14 @@ Task UpdateAsync(Func, UpdateDescr Task GetMappingAsync(Func selector); IIndicesResponse DeleteMapping(Func selector); Task DeleteMappingAsync(Func selector); - IIndicesOperationResponse Flush(Func selector); - Task FlushAsync(Func selector); + IShardsOperationResponse Flush(Func selector); + Task FlushAsync(Func selector); IIndexSettingsResponse GetIndexSettings(Func selector); Task GetIndexSettingsAsync(Func selector); IIndicesResponse DeleteIndex(Func selector); Task DeleteIndexAsync(Func selector); - IIndicesResponse ClearCache(Func selector = null); - Task ClearCacheAsync(Func selector = null); + IShardsOperationResponse ClearCache(Func selector = null); + Task ClearCacheAsync(Func selector = null); IIndicesOperationResponse CreateIndex(string index, Func createIndexSelector = null); Task CreateIndexAsync(string index, Func createIndexSelector); IRootInfoResponse RootNodeInfo(Func selector = null); @@ -144,8 +144,8 @@ Task IndexAsync(T @object, Func, IndexDesc Task IndexManyAsync(IEnumerable objects, string index = null, string type = null) where T : class; - IIndicesOperationResponse Optimize(Func optimizeSelector = null); - Task OptimizeAsync(Func optimizeSelector = null); + IShardsOperationResponse Optimize(Func optimizeSelector = null); + Task OptimizeAsync(Func optimizeSelector = null); IStatusResponse Status(Func selector = null); Task StatusAsync(Func selector = null); diff --git a/src/Nest/Nest.csproj b/src/Nest/Nest.csproj index 730357dc3cb..01fc3ec557e 100644 --- a/src/Nest/Nest.csproj +++ b/src/Nest/Nest.csproj @@ -109,6 +109,7 @@ + @@ -138,6 +139,7 @@ + @@ -262,7 +264,6 @@ - @@ -270,7 +271,6 @@ - @@ -448,9 +448,6 @@ - - - @@ -577,7 +574,6 @@ - diff --git a/src/Nest/QueryStringParameters/FluentQueryString.cs b/src/Nest/QueryStringParameters/FluentQueryString.cs index 28c13d8738d..ee29736c8c3 100644 --- a/src/Nest/QueryStringParameters/FluentQueryString.cs +++ b/src/Nest/QueryStringParameters/FluentQueryString.cs @@ -17,7 +17,7 @@ public abstract class FluentQueryString where T : FluentQueryString public T Add(string name, object value) { - _QueryStringDictionary.Add(name, value); + _QueryStringDictionary[name] = value; return (T)this; } diff --git a/src/Nest/QueryStringParameters/QueryStringParameters.Generated.cs b/src/Nest/QueryStringParameters/QueryStringParameters.Generated.cs index e1b325fbdf5..8c6244d69ea 100644 --- a/src/Nest/QueryStringParameters/QueryStringParameters.Generated.cs +++ b/src/Nest/QueryStringParameters/QueryStringParameters.Generated.cs @@ -2601,16 +2601,6 @@ public DeleteWarmerQueryString MasterTimeout(string master_timeout) return this; } - - internal string[] _name { get; set; } - ///A comma-separated list of warmer names to delete (supports wildcards); use `_all` to delete all warmers in the specified indices. You must specify a name either in the uri or in the parameters. - public DeleteWarmerQueryString Name(params string[] name) - { - this._name = name; - this.Add("name", this._name); - return this; - } - } @@ -5042,36 +5032,6 @@ public SearchQueryString Source(string source) } - internal string[] __source { get; set; } - ///True or false to return the _source field or not, or a list of fields to return - public SearchQueryString Source(params string[] _source) - { - this.__source = _source; - this.Add("_source", this.__source); - return this; - } - - - internal string[] __source_exclude { get; set; } - ///A list of fields to exclude from the returned _source field - public SearchQueryString SourceExclude(params string[] _source_exclude) - { - this.__source_exclude = _source_exclude; - this.Add("_source_exclude", this.__source_exclude); - return this; - } - - - internal string[] __source_include { get; set; } - ///A list of fields to extract and return from the _source field - public SearchQueryString SourceInclude(params string[] _source_include) - { - this.__source_include = _source_include; - this.Add("_source_include", this.__source_include); - return this; - } - - internal string[] _stats { get; set; } ///Specific 'tag' of the request for logging and statistical purposes public SearchQueryString Stats(params string[] stats) diff --git a/src/Nest/RawElasticClient.cs b/src/Nest/RawElasticClient.cs index b8bbfdc71da..9212b92ddd0 100644 --- a/src/Nest/RawElasticClient.cs +++ b/src/Nest/RawElasticClient.cs @@ -121,6 +121,10 @@ protected ConnectionStatus DoRequest(string method, string path, object data = n private static byte[] _enter = Encoding.UTF8.GetBytes("\n"); private byte[] PostData(object data) { + var bytes = data as byte[]; + if (bytes != null) + return bytes; + var s = data as string; if (s != null) return s.Utf8Bytes(); diff --git a/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs b/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs index 1aaba3500a3..43c8b936cf2 100644 --- a/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs +++ b/src/Nest/Resolvers/Converters/ConcreteTypeConverter.cs @@ -2,6 +2,7 @@ using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; +using Nest.Domain; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Nest.Resolvers; @@ -46,23 +47,19 @@ internal class ConcreteTypeConverter : JsonConverter where T : class { internal readonly Type _baseType; internal readonly Func, Type> _concreteTypeSelector; - internal readonly IEnumerable _partialFields; public override bool CanWrite { get { return false; } } public override bool CanRead { get { return true; } } public ConcreteTypeConverter() {} - public ConcreteTypeConverter(Func, Type> concreteTypeSelector) - : this(concreteTypeSelector, new string[0]) { } - public ConcreteTypeConverter(Func, Type> concreteTypeSelector, IEnumerable partialFields) + public ConcreteTypeConverter(Func, Type> concreteTypeSelector) { concreteTypeSelector.ThrowIfNull("concreteTypeSelector"); this._baseType = typeof(T); this._concreteTypeSelector = concreteTypeSelector; - this._partialFields = partialFields; } public override object ReadJson(JsonReader reader, Type objectType, object existingValue, JsonSerializer serializer) @@ -76,20 +73,19 @@ public override object ReadJson(JsonReader reader, Type objectType, object exist return GetUsingConcreteTypeConverter(reader, serializer, realConcreteConverter); } - var instance = typeof(Hit).CreateInstance(); + var instance = (Hit)(typeof(Hit).CreateInstance()); serializer.Populate(reader, instance); + instance.Fields = new FieldSelection(elasticContractResolver.Infer, instance._fields); return instance; } private static object GetUsingConcreteTypeConverter(JsonReader reader, JsonSerializer serializer, ConcreteTypeConverter realConcreteConverter) { var jObject = CreateIntermediateJObject(reader); - var concreteType = GetConcreteTypeUsingSelector(realConcreteConverter, jObject); + var concreteType = GetConcreteTypeUsingSelector(serializer, realConcreteConverter, jObject); var hit = GetHitTypeInstance(concreteType); PopulateHit(serializer, jObject.CreateReader(), hit); - AppendPartialFields(serializer, realConcreteConverter, concreteType, hit, jObject); - return hit; } @@ -109,48 +105,23 @@ private static object GetHitTypeInstance(Type concreteType) return hitType.CreateInstance(); } - private static void AppendPartialFields(JsonSerializer serializer, - ConcreteTypeConverter realConcreteConverter, - Type concreteType, dynamic hit, JObject jObject) - { - if (realConcreteConverter == null) - return; - dynamic d = jObject; - var partialFields = realConcreteConverter._partialFields; - if (partialFields.Any()) - { - var item = typeof (CovariantItem<>).CreateGenericInstance(concreteType); - - dynamic items = typeof(List<>).CreateGenericInstance(item.GetType()); - foreach (var pf in partialFields) - { - dynamic partial = concreteType.CreateInstance(); - - serializer.Populate(d.fields[pf].CreateReader(), partial); - - dynamic dictItem = item.GetType().CreateInstance(); - dictItem.Key = pf; - dictItem.Value = partial; - items.Add(dictItem); - } - dynamic dict = typeof(CovariantDictionary<>).CreateGenericInstance(concreteType); ; - dict.Items = items; - hit.PartialFields = dict; - } - } private static dynamic GetConcreteTypeUsingSelector( + JsonSerializer serializer, ConcreteTypeConverter realConcreteConverter, JObject jObject) { + var elasticContractResolver = serializer.ContractResolver as ElasticContractResolver; var baseType = realConcreteConverter._baseType; var selector = realConcreteConverter._concreteTypeSelector; Hit hitDynamic = new Hit(); dynamic d = jObject; - + var fields = jObject["fields"]; + var fieldSelection = fields != null ? fields.ToObject>() : null; //favor manual mapping over doing Populate twice. - hitDynamic.Fields = d.fields; + hitDynamic._fields = fieldSelection; + hitDynamic.Fields = new FieldSelection(elasticContractResolver.Infer, fieldSelection); hitDynamic.Source = d._source; hitDynamic.Index = d._index; hitDynamic.Score = (d._score is double) ? d._score : default(double); @@ -160,8 +131,8 @@ private static dynamic GetConcreteTypeUsingSelector( hitDynamic.Sorts = d.sort; hitDynamic._Highlight = d.highlight is Dictionary> ? d.highlight : null; hitDynamic.Explanation = d._explanation is Explanation ? d._explanation : null; - - var concreteType = selector(hitDynamic.Source, hitDynamic); + object o = hitDynamic.Source ?? ElasticsearchResponse.Create(fieldSelection) ?? new object {}; + var concreteType = selector(o, hitDynamic); return concreteType; } diff --git a/src/Nest/Resolvers/Converters/ElasticTypeConverter.cs b/src/Nest/Resolvers/Converters/ElasticTypeConverter.cs index 2481d3e80dc..8d8638ccaf7 100644 --- a/src/Nest/Resolvers/Converters/ElasticTypeConverter.cs +++ b/src/Nest/Resolvers/Converters/ElasticTypeConverter.cs @@ -21,10 +21,14 @@ public override void WriteJson(JsonWriter writer, object value, JsonSerializer s private IElasticType GetTypeFromJObject(JObject po, JsonSerializer serializer) { JToken typeToken; + JToken fieldsToken; serializer.TypeNameHandling = TypeNameHandling.None; if (po.TryGetValue("type", out typeToken)) { var type = typeToken.Value().ToLowerInvariant(); + var hasFields = po.TryGetValue("fields", out fieldsToken); + if (hasFields) + type = "multi_field"; switch (type) { case "string": diff --git a/src/Nest/Resolvers/Converters/MultiSearchConverter.cs b/src/Nest/Resolvers/Converters/MultiSearchConverter.cs index ac8464db7d4..2ce6ade9118 100644 --- a/src/Nest/Resolvers/Converters/MultiSearchConverter.cs +++ b/src/Nest/Resolvers/Converters/MultiSearchConverter.cs @@ -46,6 +46,9 @@ IConnectionSettings settings ) where T : class { + try + { + var hit = new QueryResponse(); var reader = tuple.Hit.CreateReader(); serializer.Populate(reader, hit); @@ -61,6 +64,12 @@ IConnectionSettings settings } collection.Add(tuple.Descriptor.Key, hit); + } + catch (Exception e) + { + + throw; + } } diff --git a/src/Tests/Nest.Tests.Integration.Yaml/cluster.node_info/10_basic.yaml.cs b/src/Tests/Nest.Tests.Integration.Yaml/cluster.node_info/10_basic.yaml.cs new file mode 100644 index 00000000000..d94a8394b14 --- /dev/null +++ b/src/Tests/Nest.Tests.Integration.Yaml/cluster.node_info/10_basic.yaml.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Nest; +using NUnit.Framework; +using Nest.Tests.Integration.Yaml; + + +namespace Nest.Tests.Integration.Yaml.ClusterNodeInfo +{ + public partial class ClusterNodeInfoTests + { + + + [NCrunch.Framework.ExclusivelyUses("ElasticsearchYamlTests")] + public class NodeInfoTestTests : YamlTestsBase + { + [Test] + public void NodeInfoTestTest() + { + + //do cluster.node_info + this.Do(()=> this._client.ClusterNodeInfoGet()); + + //is_true _response.ok; + this.IsTrue(_response.ok); + + //is_true _response.nodes; + this.IsTrue(_response.nodes); + + //is_true _response.cluster_name; + this.IsTrue(_response.cluster_name); + + } + } + } +} + diff --git a/src/Tests/Nest.Tests.Integration.Yaml/cluster.node_stats/10_basic.yaml.cs b/src/Tests/Nest.Tests.Integration.Yaml/cluster.node_stats/10_basic.yaml.cs new file mode 100644 index 00000000000..b50371a5742 --- /dev/null +++ b/src/Tests/Nest.Tests.Integration.Yaml/cluster.node_stats/10_basic.yaml.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Nest; +using NUnit.Framework; +using Nest.Tests.Integration.Yaml; + + +namespace Nest.Tests.Integration.Yaml.ClusterNodeStats +{ + public partial class ClusterNodeStatsTests + { + + + [NCrunch.Framework.ExclusivelyUses("ElasticsearchYamlTests")] + public class NodesStatsTests : YamlTestsBase + { + [Test] + public void NodesStatsTest() + { + + //do cluster.node_stats + this.Do(()=> this._client.ClusterNodeStatsGet(nv=>nv + .Add("indices", @"true") + .Add("transport", @"true") + )); + + //is_true _response.cluster_name; + this.IsTrue(_response.cluster_name); + + //is_true _response.nodes; + this.IsTrue(_response.nodes); + + } + } + } +} + diff --git a/src/Tests/Nest.Tests.Integration.Yaml/indices.analyze/20_analyze_text_format.yaml.cs b/src/Tests/Nest.Tests.Integration.Yaml/indices.analyze/20_analyze_text_format.yaml.cs new file mode 100644 index 00000000000..3c2d77982bb --- /dev/null +++ b/src/Tests/Nest.Tests.Integration.Yaml/indices.analyze/20_analyze_text_format.yaml.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Nest; +using NUnit.Framework; +using Nest.Tests.Integration.Yaml; + + +namespace Nest.Tests.Integration.Yaml.IndicesAnalyze +{ + public partial class IndicesAnalyzeTests + { + + + [NCrunch.Framework.ExclusivelyUses("ElasticsearchYamlTests")] + public class TextFormatTests : YamlTestsBase + { + [Test] + public void TextFormatTest() + { + + //do indices.analyze + this.Do(()=> this._client.IndicesAnalyzeGet(nv=>nv + .Add("format", @"text") + .Add("text", @"tHE BLACK and white! AND red") + )); + + //match _response.tokens: + this.IsMatch(_response.tokens, @"[black:4->9:] + +4: +[white:14->19:] + +6: +[red:25->28:] +"); + + } + } + } +} + diff --git a/src/Tests/Nest.Tests.Integration.Yaml/mget/20_fields_pre_0.90.3.yaml.cs b/src/Tests/Nest.Tests.Integration.Yaml/mget/20_fields_pre_0.90.3.yaml.cs new file mode 100644 index 00000000000..c7f8d3129ac --- /dev/null +++ b/src/Tests/Nest.Tests.Integration.Yaml/mget/20_fields_pre_0.90.3.yaml.cs @@ -0,0 +1,258 @@ +using System; +using System.Collections.Generic; +using System.Collections.Specialized; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Nest; +using NUnit.Framework; +using Nest.Tests.Integration.Yaml; + + +namespace Nest.Tests.Integration.Yaml.Mget +{ + public partial class MgetTests + { + + + [NCrunch.Framework.ExclusivelyUses("ElasticsearchYamlTests")] + public class FieldsPre0903Tests : YamlTestsBase + { + [Test] + public void FieldsPre0903Test() + { + + //skip 0.90.3 - 999; + this.Skip("0.90.3 - 999", "Tests pre 0.90.2 for single string fields"); + + //do index + _body = new { + foo= "bar" + }; + this.Do(()=> this._client.IndexPost("test_1", "test", "1", _body)); + + //do cluster.health + this.Do(()=> this._client.ClusterHealthGet(nv=>nv + .Add("wait_for_status", @"yellow") + )); + + //do mget + _body = new { + docs= new dynamic[] { + new { + _id= "1" + }, + new { + _id= "1", + fields= "foo" + }, + new { + _id= "1", + fields= new [] { + "foo" + } + }, + new { + _id= "1", + fields= new [] { + "foo", + "_source" + } + } + } + }; + this.Do(()=> this._client.MgetPost("test_1", "test", _body)); + + //is_false _response.docs[0].fields; + this.IsFalse(_response.docs[0].fields); + + //match _response.docs[0]._source: + this.IsMatch(_response.docs[0]._source, new { + foo= "bar" + }); + + //match _response.docs[2].fields.foo: + this.IsMatch(_response.docs[2].fields.foo, @"bar"); + + //is_false _response.docs[2]._source; + this.IsFalse(_response.docs[2]._source); + + //match _response.docs[3].fields.foo: + this.IsMatch(_response.docs[3].fields.foo, @"bar"); + + //match _response.docs[3]._source: + this.IsMatch(_response.docs[3]._source, new { + foo= "bar" + }); + + //do mget + _body = new { + docs= new dynamic[] { + new { + _id= "1" + }, + new { + _id= "1", + fields= "foo" + }, + new { + _id= "1", + fields= new [] { + "foo" + } + }, + new { + _id= "1", + fields= new [] { + "foo", + "_source" + } + } + } + }; + this.Do(()=> this._client.MgetPost("test_1", "test", _body, nv=>nv + .Add("fields", @"foo") + )); + + //match _response.docs[0].fields.foo: + this.IsMatch(_response.docs[0].fields.foo, @"bar"); + + //is_false _response.docs[0]._source; + this.IsFalse(_response.docs[0]._source); + + //match _response.docs[1].fields.foo: + this.IsMatch(_response.docs[1].fields.foo, @"bar"); + + //is_false _response.docs[1]._source; + this.IsFalse(_response.docs[1]._source); + + //match _response.docs[2].fields.foo: + this.IsMatch(_response.docs[2].fields.foo, @"bar"); + + //is_false _response.docs[2]._source; + this.IsFalse(_response.docs[2]._source); + + //match _response.docs[3].fields.foo: + this.IsMatch(_response.docs[3].fields.foo, @"bar"); + + //match _response.docs[3]._source: + this.IsMatch(_response.docs[3]._source, new { + foo= "bar" + }); + + //do mget + _body = new { + docs= new dynamic[] { + new { + _id= "1" + }, + new { + _id= "1", + fields= "foo" + }, + new { + _id= "1", + fields= new [] { + "foo" + } + }, + new { + _id= "1", + fields= new [] { + "foo", + "_source" + } + } + } + }; + this.Do(()=> this._client.MgetPost("test_1", "test", _body, nv=>nv + .Add("fields", new [] { + @"foo" + }) + )); + + //match _response.docs[0].fields.foo: + this.IsMatch(_response.docs[0].fields.foo, @"bar"); + + //is_false _response.docs[0]._source; + this.IsFalse(_response.docs[0]._source); + + //match _response.docs[1].fields.foo: + this.IsMatch(_response.docs[1].fields.foo, @"bar"); + + //is_false _response.docs[1]._source; + this.IsFalse(_response.docs[1]._source); + + //match _response.docs[2].fields.foo: + this.IsMatch(_response.docs[2].fields.foo, @"bar"); + + //is_false _response.docs[2]._source; + this.IsFalse(_response.docs[2]._source); + + //match _response.docs[3].fields.foo: + this.IsMatch(_response.docs[3].fields.foo, @"bar"); + + //match _response.docs[3]._source: + this.IsMatch(_response.docs[3]._source, new { + foo= "bar" + }); + + //do mget + _body = new { + docs= new dynamic[] { + new { + _id= "1" + }, + new { + _id= "1", + fields= "foo" + }, + new { + _id= "1", + fields= new [] { + "foo" + } + }, + new { + _id= "1", + fields= new [] { + "foo", + "_source" + } + } + } + }; + this.Do(()=> this._client.MgetPost("test_1", "test", _body, nv=>nv + .Add("fields", new [] { + @"foo", + @"_source" + }) + )); + + //match _response.docs[0].fields.foo: + this.IsMatch(_response.docs[0].fields.foo, @"bar"); + + //match _response.docs[0]._source: + this.IsMatch(_response.docs[0]._source, new { + foo= "bar" + }); + + //match _response.docs[2].fields.foo: + this.IsMatch(_response.docs[2].fields.foo, @"bar"); + + //is_false _response.docs[2]._source; + this.IsFalse(_response.docs[2]._source); + + //match _response.docs[3].fields.foo: + this.IsMatch(_response.docs[3].fields.foo, @"bar"); + + //match _response.docs[3]._source: + this.IsMatch(_response.docs[3]._source, new { + foo= "bar" + }); + + } + } + } +} + diff --git a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkPercolateTests.cs b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkPercolateTests.cs index 284bf913063..3eaa98da484 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkPercolateTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkPercolateTests.cs @@ -38,8 +38,9 @@ public void BulkIndexWithPercolate() result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); + result.Errors.Should().BeFalse(); - result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(2).And.OnlyContain(r => r.OK); + result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(2); var indexResponses = result.Items.OfType().ToList(); // tests on percolated responses diff --git a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs index 51588555255..f97f714c0bb 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkTests.cs @@ -24,8 +24,9 @@ public void Bulk() ); result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); + result.Errors.Should().BeFalse(); - result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(3).And.OnlyContain(r => r.OK); + result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(3); var deleteResponses = result.Items.OfType(); var createResponses = result.Items.OfType(); var indexResponses = result.Items.OfType(); @@ -58,8 +59,9 @@ public void BulkWithFixedIndex() ); result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); + result.Errors.Should().BeFalse(); - result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(3).And.OnlyContain(r => r.OK); + result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(3); var deleteResponses = result.Items.OfType(); var createResponses = result.Items.OfType(); var indexResponses = result.Items.OfType(); @@ -93,8 +95,9 @@ public void BulkWithFixedIndexOveriddenIndividualy() ); result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); + result.Errors.Should().BeFalse(); - result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(3).And.OnlyContain(r=>r.OK); + result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(3); var deleteResponses = result.Items.OfType(); var createResponses = result.Items.OfType(); var indexResponses = result.Items.OfType(); @@ -125,8 +128,9 @@ public void BulkAlternativeWayOfWriting() var result = this._client.Bulk(d=>descriptor); result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); + result.Errors.Should().BeFalse(); - result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(1000).And.OnlyContain(r => r.OK); + result.Items.Should().NotBeNull().And.NotBeEmpty().And.HaveCount(1000); } } diff --git a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs index b211d1b5a3e..15498beb9f5 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Bulk/BulkUpdateTests.cs @@ -34,9 +34,9 @@ public void BulkUpdateObject() result = this._client.Bulk(d=>descriptor); result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); + result.Errors.Should().BeFalse(); result.Items.Count().Should().Be(1000); result.Items.All(i => i != null).Should().BeTrue(); - result.Items.All(i => i.OK).Should().BeTrue(); var updatedObject = this._client.Source(i=>i.Id(5000)); Assert.NotNull(updatedObject); diff --git a/src/Tests/Nest.Tests.Integration/Core/DeleteTests.cs b/src/Tests/Nest.Tests.Integration/Core/DeleteTests.cs index 511dd66eab4..b74e5476f3d 100644 --- a/src/Tests/Nest.Tests.Integration/Core/DeleteTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/DeleteTests.cs @@ -40,7 +40,7 @@ public void GetDocumentById() ); Assert.Greater(queryResults.Total, 0); - var hit = queryResults.Hits.Hits.First(); + var hit = queryResults.HitsMetaData.Hits.First(); var documentToFind = hit.Source; //act @@ -174,9 +174,9 @@ public void RemoveAllByPassingAsIEnumerable() var deleteResult = this._client.Bulk(b => b.DeleteMany(result.Documents).Refresh()); Assert.True(deleteResult.IsValid, deleteResult.ConnectionStatus.Result); + Assert.False(deleteResult.Errors, deleteResult.ConnectionStatus.Result); Assert.IsNotEmpty(deleteResult.Items); - Assert.True(deleteResult.Items.All(i => i.OK)); result = this._client.Search(q => q.MatchAll()); Assert.IsNotEmpty(result.Documents); @@ -196,9 +196,9 @@ public void RemoveAllByPassingAsIEnumerableOfBulkParameters() var deleteResult = this._client.Bulk(b=>b.DeleteMany(result.Documents, (p, o) => p.VersionType(VersionType.Internal)).Refresh()); Assert.True(deleteResult.IsValid, deleteResult.ConnectionStatus.Result); + Assert.False(deleteResult.Errors, deleteResult.ConnectionStatus.Result); Assert.IsNotEmpty(deleteResult.Items); - Assert.True(deleteResult.Items.All(i => i.OK)); result = this._client.Search(q => q.MatchAll()); Assert.IsNotNull(result); diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs index ed18f8326f6..12ac0ee05df 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Get/GetFullTests.cs @@ -23,7 +23,7 @@ private void DefaultAssertations(IGetResponse result) result.Index.Should().Be(ElasticsearchConfiguration.DefaultIndex); result.Type.Should().Be("elasticsearchprojects"); result.Version.Should().Be("1"); - result.Exists.Should().BeTrue(); + result.Found.Should().BeTrue(); } [Test] @@ -55,9 +55,9 @@ public void GetUsingDescriptorWithTypeAndFields() result.Source.Should().BeNull(); result.Fields.Should().NotBeNull(); result.Fields.FieldValues.Should().NotBeNull().And.HaveCount(4); - result.Fields.FieldValue(p => p.Name).Should().Be("pyelasticsearch"); - result.Fields.FieldValue(p => p.Id).Should().Be(1); - result.Fields.FieldValue(p => p.DoubleValue).Should().NotBe(default(double)); + result.Fields.FieldValue(p => p.Name).Should().BeEquivalentTo(new [] {"pyelasticsearch"}); + result.Fields.FieldValue(p => p.Id).Should().BeEquivalentTo( new []{1}); + result.Fields.FieldValue(p => p.DoubleValue).Should().NotBeEquivalentTo(new [] {default(double) }); } @@ -66,7 +66,7 @@ public void GetMissing() { int doesNotExistId = 1234567; var result = this._client.Get(doesNotExistId); - result.Exists.Should().BeFalse(); + result.Found.Should().BeFalse(); } } } diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs index 65cae2dee7f..0ac5768ad99 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Get/GetMultiTests.cs @@ -50,7 +50,7 @@ public void GetMultiSimpleWithMissingItem() var missingPerson = result.Get(100000); missingPerson.Should().NotBeNull(); - missingPerson.Exists.Should().BeFalse(); + missingPerson.Found.Should().BeFalse(); var missingPersonDirect = result.Source(100000); missingPersonDirect.Should().BeNull(); @@ -77,14 +77,14 @@ public void GetMultiWithMetaData() var personHit = people.FirstOrDefault(p => p.Id == "100"); personHit.Should().NotBeNull(); - personHit.Exists.Should().BeTrue(); + personHit.Found.Should().BeTrue(); personHit.Version.Should().NotBeNullOrEmpty().And.Match("1"); var person = personHit.FieldSelection; person.Should().NotBeNull(); - person.FieldValue(p=>p.Id).Should().Be(100); - person.FieldValue(p => p.FirstName) - .Should().NotBeNullOrEmpty(); + person.FieldValue(p=>p.Id).Should().BeEquivalentTo(new []{100}); + person.FieldValue(p => p.FirstName) + .Should().NotBeEmpty(); } @@ -103,20 +103,20 @@ public void GetMultiWithMetaDataUsingCleanApi() var personHit = result.Get(100); personHit.Should().NotBeNull(); - personHit.Exists.Should().BeTrue(); + personHit.Found.Should().BeTrue(); personHit.Version.Should().NotBeNullOrEmpty().And.Match("1"); //personHit.FieldSelection would work too var personFieldSelection = result.GetFieldSelection(100); personFieldSelection.Should().NotBeNull(); - personFieldSelection.FieldValue(p => p.Id).Should().Be(100); - personFieldSelection.FieldValue(p => p.FirstName) - .Should().NotBeNullOrEmpty(); + personFieldSelection.FieldValue(p => p.Id).Should().BeEquivalentTo(new []{100}); + personFieldSelection.FieldValue(p => p.FirstName) + .Should().NotBeEmpty(); var projectFieldSelection = result.GetFieldSelection(1); projectFieldSelection.Should().NotBeNull(); - projectFieldSelection.FieldValue(p => p.Id).Should().Be(1); - projectFieldSelection.FieldValue(p => p.Followers.First().FirstName) + projectFieldSelection.FieldValue(p => p.Id).Should().BeEquivalentTo(new []{1}); + projectFieldSelection.FieldValue(p => p.Followers.First().FirstName) .Should().NotBeEmpty(); } diff --git a/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs b/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs index 25ea518f9dc..869bf0fe604 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Get/GetTests.cs @@ -39,7 +39,7 @@ public void GetWithFields() ); Assert.NotNull(elasticSearchProject); - Assert.IsNotNullOrEmpty(elasticSearchProject.FieldValue(p=>p.Name)); + Assert.IsNotEmpty(elasticSearchProject.FieldValue(p=>p.Name)); } [Test] public void GetWithFieldsDeep() @@ -51,16 +51,11 @@ public void GetWithFieldsDeep() Assert.NotNull(fieldSelection); var name = fieldSelection.FieldValue(f => f.Name); - Assert.IsNotNullOrEmpty(name); - var list = fieldSelection.FieldValue>(f=>f.Followers.First().FirstName); + Assert.IsNotEmpty(name); + var list = fieldSelection.FieldValue(f=>f.Followers.First().FirstName); Assert.NotNull(list); Assert.IsNotEmpty(list); - var array = fieldSelection.FieldValue(f => f.Followers.First().FirstName); - Assert.NotNull(array); - Assert.IsNotEmpty(array); - var enumerable = fieldSelection.FieldValue>(f => f.Followers.First().FirstName); - Assert.NotNull(enumerable); - Assert.IsNotEmpty(enumerable); + } } } diff --git a/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs b/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs index e8dec025b55..0a82c334bdf 100644 --- a/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs +++ b/src/Tests/Nest.Tests.Integration/Core/Map/Properties/PropertiesTests.cs @@ -26,7 +26,6 @@ public void StringProperty() .IndexOptions(IndexOptions.positions) .NullValue("my_special_null_value") .OmitNorms() - .OmitTermFrequencyAndPositions() .PositionOffsetGap(1) .SearchAnalyzer("standard") .Store() diff --git a/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs b/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs index 91bae5f52d9..cef04ae29ad 100644 --- a/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs +++ b/src/Tests/Nest.Tests.Integration/Index/GetIdFromElasticsearchTests.cs @@ -40,8 +40,8 @@ public void IndexmanyWithoutIdShouldSetIdFromElasticseach() }; var response = this._client.IndexMany(newProjects); Assert.IsTrue(response.IsValid, response.ConnectionStatus.Result); + Assert.IsFalse(response.Errors, response.ConnectionStatus.Result); Assert.IsNotEmpty(response.Items); - Assert.True(response.Items.All(i => i.OK), response.ConnectionStatus.Result); Assert.True(response.Items.All(i => !i.Id.IsNullOrEmpty())); } } diff --git a/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs b/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs index 6a2d3352c25..8fbf1a30d0b 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/AliasTests.cs @@ -14,7 +14,6 @@ public void SimpleAddRemoveAlias() var r = this._client.Alias(a=>a.Add(o=>o.Index(index).Alias(alias))); Assert.True(r.IsValid); - Assert.True(r.OK); Assert.True(r.Acknowledged); var count1 = this._client.Count(c => c.Index(index).Query(q => q.MatchAll())); var count2 = this._client.Count(c => c.Index(alias).Query(q => q.MatchAll())); @@ -33,7 +32,6 @@ public void SimpleRenameAlias() var r = this._client.Alias(a=>a.Add(o=>o.Index(index).Alias(alias))); Assert.True(r.IsValid); - Assert.True(r.OK); Assert.True(r.Acknowledged); var count1 = this._client.Count(c=>c.Index(index).Query(q=>q.MatchAll())); var count2 = this._client.Count(c=>c.Index(alias).Query(q=>q.MatchAll())); diff --git a/src/Tests/Nest.Tests.Integration/Indices/Analysis/Analyzers/AnalyzerTests.cs b/src/Tests/Nest.Tests.Integration/Indices/Analysis/Analyzers/AnalyzerTests.cs index 82412880829..37223c83201 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/Analysis/Analyzers/AnalyzerTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/Analysis/Analyzers/AnalyzerTests.cs @@ -26,7 +26,7 @@ public AnalyzerTestResult MapAndAnalyze( result.Should().NotBeNull(); result.IsValid.Should().BeTrue(); - result.OK.Should().BeTrue(); + result.Acknowledged.Should().BeTrue(); result.Acknowledged.Should().BeTrue(); //index a doc so we can be sure a shard is available diff --git a/src/Tests/Nest.Tests.Integration/Indices/ClearCacheTests.cs b/src/Tests/Nest.Tests.Integration/Indices/ClearCacheTests.cs index 312317b4e13..a8825fef74b 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/ClearCacheTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/ClearCacheTests.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; +using FluentAssertions; using Nest.Tests.MockData.Domain; using NUnit.Framework; @@ -13,7 +14,8 @@ public void test_clear_cache() var client = this._client; var status = client.ClearCache(); Assert.True(status.IsValid); - Assert.True(status.OK); + status.Shards.Total.Should().BeGreaterThan(0); + Assert.AreEqual(status.Shards.Total, status.Shards.Successful); } [Test] public void test_clear_cache_specific() @@ -21,7 +23,8 @@ public void test_clear_cache_specific() var client = this._client; var status = client.ClearCache(cc=>cc.Filter().Recycler()); Assert.True(status.IsValid); - Assert.True(status.OK); + status.Shards.Total.Should().BeGreaterThan(0); + Assert.AreEqual(status.Shards.Total, status.Shards.Successful); } [Test] public void test_clear_cache_generic_specific() @@ -29,7 +32,8 @@ public void test_clear_cache_generic_specific() var client = this._client; var status = client.ClearCache(cc=>cc.Index().Filter().Recycler()); Assert.True(status.IsValid); - Assert.True(status.OK); + status.Shards.Total.Should().BeGreaterThan(0); + Assert.AreEqual(status.Shards.Total, status.Shards.Successful); } [Test] public void test_clear_cache_generic_specific_indices() @@ -37,7 +41,8 @@ public void test_clear_cache_generic_specific_indices() var client = this._client; var status = client.ClearCache(cc=>cc.Indices(_settings.DefaultIndex, _settings.DefaultIndex + "_clone").Filter().Recycler()); Assert.True(status.IsValid); - Assert.True(status.OK); + status.Shards.Total.Should().BeGreaterThan(0); + Assert.AreEqual(status.Shards.Total, status.Shards.Successful); } } } \ No newline at end of file diff --git a/src/Tests/Nest.Tests.Integration/Indices/FlushTests.cs b/src/Tests/Nest.Tests.Integration/Indices/FlushTests.cs index b9303e707ac..248a0c3dddc 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/FlushTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/FlushTests.cs @@ -1,4 +1,5 @@ -using Nest.Tests.MockData.Domain; +using FluentAssertions; +using Nest.Tests.MockData.Domain; using NUnit.Framework; namespace Nest.Tests.Integration.Indices @@ -10,13 +11,17 @@ public class FlushTests : IntegrationTests public void FlushAll() { var r = this._client.Flush(f=>f.AllIndices()); - Assert.True(r.OK, r.ConnectionStatus.ToString()); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void FlushIndex() { var r = this._client.Flush(f=>f.Index(ElasticsearchConfiguration.DefaultIndex)); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void FlushIndeces() @@ -24,13 +29,17 @@ public void FlushIndeces() var r = this._client.Flush(f=>f .Indices( ElasticsearchConfiguration.DefaultIndex, ElasticsearchConfiguration.DefaultIndex + "_clone") ); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void FlushTyped() { var r = this._client.Flush(f=>f.Index()); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } } diff --git a/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs b/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs index 0d169593692..934f52f933d 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/IndicesTests.cs @@ -225,14 +225,14 @@ public void CreateIndex() var response = client.CreateIndex(indexName, i=>i.InitializeUsing(settings)); Assert.IsTrue(response.IsValid); - Assert.IsTrue(response.OK); + Assert.IsTrue(response.Acknowledged); var mappingResult = this._client.GetMapping(gm=>gm.Index(indexName).Type("mytype")); mappingResult.Mapping.Should().NotBeNull(); var deleteResponse = client.DeleteIndex(i=>i.Index(indexName)); Assert.IsTrue(deleteResponse.IsValid); - Assert.IsTrue(deleteResponse.OK); + Assert.IsTrue(deleteResponse.Acknowledged); } @@ -298,7 +298,7 @@ public void PutMapping() var response = this._client.Map(m=>m.InitializeUsing(mapping)); Assert.IsTrue(response.IsValid, response.ConnectionStatus.ToString()); - Assert.IsTrue(response.OK, response.ConnectionStatus.ToString()); + Assert.IsTrue(response.Acknowledged, response.ConnectionStatus.ToString()); mapping = this._client.GetMapping(gm => gm.Index().Type()).Mapping; Assert.IsNotNull(mapping.Properties.ContainsKey(fieldName)); @@ -339,7 +339,7 @@ public void CreateIndexMultiFieldMap() var response = client.CreateIndex(indexName, i=>i.InitializeUsing(settings)); Assert.IsTrue(response.IsValid); - Assert.IsTrue(response.OK); + Assert.IsTrue(response.Acknowledged); var inferrer = new ElasticInferrer(this._settings); var typeName = inferrer.PropertyName(typeMapping.Name); @@ -348,7 +348,7 @@ public void CreateIndexMultiFieldMap() var deleteResponse = client.DeleteIndex(i=>i.Index(indexName)); Assert.IsTrue(deleteResponse.IsValid); - Assert.IsTrue(deleteResponse.OK); + Assert.IsTrue(deleteResponse.Acknowledged); } } diff --git a/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs b/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs index fabd7976388..40ef7463bbe 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/OpenCloseTests.cs @@ -10,11 +10,9 @@ public class OpenCloseTests : IntegrationTests public void CloseAndOpenIndex() { var r = this._client.CloseIndex(ElasticsearchConfiguration.DefaultIndex); - Assert.True(r.OK); Assert.True(r.Acknowledged); Assert.True(r.IsValid); r = this._client.OpenIndex(ElasticsearchConfiguration.DefaultIndex); - Assert.True(r.OK); Assert.True(r.Acknowledged); Assert.True(r.IsValid); } @@ -22,11 +20,9 @@ public void CloseAndOpenIndex() public void CloseAndOpenIndexTyped() { var r = this._client.CloseIndex(); - Assert.True(r.OK); Assert.True(r.Acknowledged); Assert.True(r.IsValid); r = this._client.OpenIndex(); - Assert.True(r.OK); Assert.True(r.Acknowledged); Assert.True(r.IsValid); } @@ -34,7 +30,6 @@ public void CloseAndOpenIndexTyped() public void CloseAndSearchAndOpenIndex() { var r = this._client.CloseIndex(ElasticsearchConfiguration.DefaultIndex); - Assert.True(r.OK); Assert.True(r.Acknowledged); Assert.True(r.IsValid); var results = this.SearchRaw( @@ -48,7 +43,6 @@ public void CloseAndSearchAndOpenIndex() Assert.True(results.ConnectionStatus.Error.ExceptionMessage.Contains("ClusterBlockException")); Assert.True(results.ConnectionStatus.Error.ExceptionMessage.Contains("index closed")); r = this._client.OpenIndex(ElasticsearchConfiguration.DefaultIndex); - Assert.True(r.OK); Assert.True(r.Acknowledged); Assert.True(r.IsValid); } diff --git a/src/Tests/Nest.Tests.Integration/Indices/OptimizeTests.cs b/src/Tests/Nest.Tests.Integration/Indices/OptimizeTests.cs index c7fdc9ab2ea..b16dafffb91 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/OptimizeTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/OptimizeTests.cs @@ -1,4 +1,5 @@ -using Nest.Tests.MockData.Domain; +using FluentAssertions; +using Nest.Tests.MockData.Domain; using NUnit.Framework; namespace Nest.Tests.Integration.Indices @@ -10,30 +11,40 @@ public class OptimizeTests : IntegrationTests public void OptimizeAll() { var r = this._client.Optimize(); - Assert.True(r.OK, r.ConnectionStatus.ToString()); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void OptimizeIndex() { var r = this._client.Optimize(o=>o.Index(ElasticsearchConfiguration.DefaultIndex)); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void OptimizeIndices() { var r = this._client.Optimize(o=>o.Indices(ElasticsearchConfiguration.DefaultIndex, ElasticsearchConfiguration.DefaultIndex + "_clone" )); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void OptimizeTyped() { var r = this._client.Optimize(o=>o.Index()); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } public void OptimizeAllWithParameters() { var r = this._client.Optimize(o=>o.MaxNumSegments(2)); - Assert.True(r.OK, r.ConnectionStatus.ToString()); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } } diff --git a/src/Tests/Nest.Tests.Integration/Indices/RefreshTests.cs b/src/Tests/Nest.Tests.Integration/Indices/RefreshTests.cs index a25ab4ec61b..ba33293e4f6 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/RefreshTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/RefreshTests.cs @@ -1,4 +1,5 @@ -using Nest.Tests.MockData.Domain; +using FluentAssertions; +using Nest.Tests.MockData.Domain; using NUnit.Framework; namespace Nest.Tests.Integration.Indices @@ -10,13 +11,17 @@ public class RefreshTests : IntegrationTests public void RefreshAll() { var r = this._client.Refresh(); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void RefreshIndex() { var r = this._client.Refresh(e=>e.Index(ElasticsearchConfiguration.DefaultIndex)); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void RefreshIndeces() @@ -24,13 +29,17 @@ public void RefreshIndeces() var r = this._client.Refresh(rr=>rr .Indices(ElasticsearchConfiguration.DefaultIndex, ElasticsearchConfiguration.DefaultIndex + "_clone" ) ); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void RefreshTyped() { var r = this._client.Refresh(rr => rr.Index()); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } } } \ No newline at end of file diff --git a/src/Tests/Nest.Tests.Integration/Indices/SnapshotTests.cs b/src/Tests/Nest.Tests.Integration/Indices/SnapshotTests.cs index 187a9692dd3..ef262af56f2 100644 --- a/src/Tests/Nest.Tests.Integration/Indices/SnapshotTests.cs +++ b/src/Tests/Nest.Tests.Integration/Indices/SnapshotTests.cs @@ -1,4 +1,5 @@ -using Nest.Tests.MockData.Domain; +using FluentAssertions; +using Nest.Tests.MockData.Domain; using NUnit.Framework; namespace Nest.Tests.Integration.Indices @@ -10,13 +11,17 @@ public class SnapshotTests : IntegrationTests public void SnapshotAll() { var r = this._client.Snapshot(); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void SnapshotIndex() { var r = this._client.Snapshot(s=>s.Index(ElasticsearchConfiguration.DefaultIndex)); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void SnapshotIndices() @@ -25,14 +30,17 @@ public void SnapshotIndices() ElasticsearchConfiguration.DefaultIndex, ElasticsearchConfiguration.DefaultIndex + "_clone") ); - - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } [Test] public void SnapshotTyped() { var r = this._client.Snapshot(s=>s.Index()); - Assert.True(r.OK); + r.Shards.Should().NotBeNull(); + r.Shards.Total.Should().BeGreaterThan(0); + r.Shards.Total.Should().Be(r.Shards.Successful); } } } \ No newline at end of file diff --git a/src/Tests/Nest.Tests.Integration/Integration/HighlightTests.cs b/src/Tests/Nest.Tests.Integration/Integration/HighlightTests.cs index a212b3cf228..b291630fb66 100644 --- a/src/Tests/Nest.Tests.Integration/Integration/HighlightTests.cs +++ b/src/Tests/Nest.Tests.Integration/Integration/HighlightTests.cs @@ -44,7 +44,7 @@ public void TestHighlight() Assert.NotNull(highlights["content"]); Assert.Greater(highlights["content"].Highlights.Count(), 0); - highlights = result.DocumentsWithMetaData.First().Highlights; + highlights = result.Hits.First().Highlights; Assert.NotNull(highlights); Assert.NotNull(highlights["content"]); Assert.Greater(highlights["content"].Highlights.Count(), 0); diff --git a/src/Tests/Nest.Tests.Integration/Integration/Query/TextPhrasePrefixQueryTests.cs b/src/Tests/Nest.Tests.Integration/Integration/Query/TextPhrasePrefixQueryTests.cs deleted file mode 100644 index 9d940cc36bf..00000000000 --- a/src/Tests/Nest.Tests.Integration/Integration/Query/TextPhrasePrefixQueryTests.cs +++ /dev/null @@ -1,129 +0,0 @@ -using System.Linq; -using System.Threading; -using FluentAssertions; -using NUnit.Framework; -using Nest.Tests.MockData; -using Nest.Tests.MockData.Domain; - -namespace Nest.Tests.Integration.Integration.Query -{ - /// - /// Integrated tests of NumericRangeFilter with elasticsearch. - /// - [TestFixture] - public class TextPhrasePrefixQueryTests : IntegrationTests - { - /// - /// Document used in test. - /// - private ElasticsearchProject _LookFor; - - [TestFixtureSetUp] - public void Initialize() - { - _LookFor = NestTestData.Session.Single().Get(); - _LookFor.Name = "one two three four"; - var status = this._client.Index(_LookFor, i=>i.Refresh()).ConnectionStatus; - Assert.True(status.Success, status.Result); - } - - - /// - /// Test control. If this test fail, the problem not in TextPhrasePrefixQuery. - /// - [Test] - public void TestControl() - { - var id = _LookFor.Id; - var filterId = Filter.Term(e => e.Id, id); - - var results = this._client.Search( - s => s.Filter(filterId && filterId) - ); - - Assert.True(results.IsValid, results.ConnectionStatus.Result); - Assert.True(results.ConnectionStatus.Success, results.ConnectionStatus.Result); - Assert.AreEqual(1, results.Total); - } - - /// - /// Set of query that should not filter de documento _LookFor. - /// - [Test] - public void TestNotFiltered() - { - var id = _LookFor.Id; - var filterId = Filter.Term(e => e.Id, id); - var querySlop0 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one two") - .Slop(0)); - var querySlop1 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one three") - .Slop(1)); - var queryPrefix1 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one t") - .Slop(0) - .PrefixLength(1)); - var queryPrefix2 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one tw") - .Slop(0) - .PrefixLength(2)); - - var results = this._client.Search( - s => s.Filter(filterId) - .Query(querySlop0 && querySlop1 && queryPrefix1 && queryPrefix2) - ); - - Assert.True(results.IsValid, results.ConnectionStatus.Result); - Assert.True(results.ConnectionStatus.Success, results.ConnectionStatus.Result); - Assert.AreEqual(1, results.Total); - } - - /// - /// Set of query that should filter de documento _LookFor. - /// - [Test] - public void TestFiltered() - { - var id = _LookFor.Id; - var filterId = Filter.Term(e => e.Id, id); - var querySlop0 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one three") - .Slop(0)); - var querySlop1 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one four") - .Slop(1)); - var queryPrefix2 = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one th") - .Slop(0) - .PrefixLength(2)); - var queryFail = Query.TextPhrasePrefix( - textPhrasePrefix => textPhrasePrefix - .OnField(p => p.Name) - .Query("one fail")); - - var results = this._client.Search( - s => s.Filter(filterId) - .Query(querySlop0 || querySlop1 || queryPrefix2 || queryFail) - ); - - Assert.True(results.IsValid, results.ConnectionStatus.Result); - Assert.True(results.ConnectionStatus.Success, results.ConnectionStatus.Result); - Assert.AreEqual(0, results.Total); - } - } -} diff --git a/src/Tests/Nest.Tests.Integration/Integration/Query/TextPhraseQueryTests.cs b/src/Tests/Nest.Tests.Integration/Integration/Query/TextPhraseQueryTests.cs deleted file mode 100644 index 82c26ca6717..00000000000 --- a/src/Tests/Nest.Tests.Integration/Integration/Query/TextPhraseQueryTests.cs +++ /dev/null @@ -1,117 +0,0 @@ -using System.Linq; -using System.Threading; -using FluentAssertions; -using NUnit.Framework; -using Nest.Tests.MockData; -using Nest.Tests.MockData.Domain; - -namespace Nest.Tests.Integration.Integration.Query -{ - /// - /// Integrated tests of NumericRangeFilter with elasticsearch. - /// - [TestFixture] - public class TextPhraseQueryTests : IntegrationTests - { - /// - /// Document used in test. - /// - private ElasticsearchProject _LookFor; - - - [TestFixtureSetUp] - public void Initialize() - { - _LookFor = NestTestData.Session.Single().Get(); - _LookFor.Name = "one two three four"; - var status = this._client.Index(_LookFor, i=>i.Refresh()).ConnectionStatus; - Assert.True(status.Success, status.Result); - } - - /// - /// Test control. If this test fail, the problem not in TextPhraseQuery. - /// - [Test] - public void TestControl() - { - var id = _LookFor.Id; - var filterId = Filter.Term(e => e.Id, id); - - var results = this._client.Search( - s => s.Filter(filterId) - ); - - Assert.True(results.IsValid, results.ConnectionStatus.Result); - Assert.True(results.ConnectionStatus.Success, results.ConnectionStatus.Result); - Assert.AreEqual(1, results.Total); - } - - /// - /// Set of filters that should not filter de documento _LookFor. - /// - [Test] - public void TestNotFiltered() - { - var id = _LookFor.Id; - var filterId = Filter.Term(e => e.Id, id); - var querySlop0 = Query.TextPhrase( - textPhrase => textPhrase - .OnField(p => p.Name) - .Query("one two") - .Slop(0) - .Operator(Operator.and)); - var querySlop1 = Query.TextPhrase( - textPhrase => textPhrase - .OnField(p => p.Name) - .Query("one three") - .Slop(1) - .Operator(Operator.and)); - - var results = this._client.Search( - s => s.Filter(filterId) - .Query(querySlop0 && querySlop1) - ); - - Assert.True(results.IsValid, results.ConnectionStatus.Result); - Assert.True(results.ConnectionStatus.Success, results.ConnectionStatus.Result); - Assert.AreEqual(1, results.Total); - } - - /// - /// Set of filters that should filter de documento _LookFor. - /// - [Test] - public void TestFiltered() - { - var id = _LookFor.Id; - var filterId = Filter.Term(e => e.Id, id); - var querySlop0 = Query.TextPhrase( - textPhrase => textPhrase - .OnField(p => p.Name) - .Query("one three") - .Slop(0)); - var querySlop1 = Query.TextPhrase( - textPhrase => textPhrase - .OnField(p => p.Name) - .Query("one four") - .Slop(1)); - var queryFail = Query.TextPhrase( - textPhrase => textPhrase - .OnField(p => p.Name) - .Query("one fail")); - var queryFailOr = Query.TextPhrase( - textPhrase => textPhrase - .OnField(p => p.Name) - .Query("fail fail")); - - var results = this._client.Search( - s => s.Filter(filterId) - .Query(querySlop0 || querySlop1 || queryFail || queryFailOr) - ); - - Assert.True(results.IsValid, results.ConnectionStatus.Result); - Assert.True(results.ConnectionStatus.Success, results.ConnectionStatus.Result); - Assert.AreEqual(0, results.Total); - } - } -} diff --git a/src/Tests/Nest.Tests.Integration/Mapping/MapTests.cs b/src/Tests/Nest.Tests.Integration/Mapping/MapTests.cs index 959a0e9adc2..99aa14f67b2 100644 --- a/src/Tests/Nest.Tests.Integration/Mapping/MapTests.cs +++ b/src/Tests/Nest.Tests.Integration/Mapping/MapTests.cs @@ -55,8 +55,7 @@ public void SimpleMapByAttributes() var x = this._client.CreateIndex(index, s => s .AddMapping(m => m.MapFromAttributes()) ); - Assert.IsTrue(x.OK, x.ConnectionStatus.ToString()); - Assert.IsTrue(x.OK); + Assert.IsTrue(x.Acknowledged, x.ConnectionStatus.ToString()); var typeMapping = this._client.GetMapping(i => i.Index(index).Type("elasticsearchprojects")); typeMapping.Should().NotBeNull(); @@ -73,9 +72,9 @@ public void SimpleMapByAttributesUsingType() var x = this._client.CreateIndex(index, s => s .AddMapping(a=>a.MapFromAttributes()) ); - Assert.IsTrue(x.OK, x.ConnectionStatus.ToString()); + Assert.IsTrue(x.Acknowledged, x.ConnectionStatus.ToString()); var xx = this._client.Map(m=>m.Type(typeof(ElasticsearchProject)).Index(index)); - Assert.IsTrue(xx.OK); + Assert.IsTrue(xx.Acknowledged); var typeMapping = this._client.GetMapping(i => i.Index(index).Type("elasticsearchprojects")); typeMapping.Should().NotBeNull(); @@ -107,7 +106,7 @@ public void DynamicMap() { var index = ElasticsearchConfiguration.NewUniqueIndexName(); var x = this._client.CreateIndex(index, s => s); - Assert.IsTrue(x.OK, x.ConnectionStatus.ToString()); + Assert.IsTrue(x.Acknowledged, x.ConnectionStatus.ToString()); var typeMappingResult = this._client.GetMapping(gm=>gm.Index(ElasticsearchConfiguration.DefaultIndex).Type("elasticsearchprojects")); typeMappingResult.IsValid.Should().BeTrue(); var typeMapping = typeMappingResult.Mapping; diff --git a/src/Tests/Nest.Tests.Integration/Mapping/NotAnalyzedTest.cs b/src/Tests/Nest.Tests.Integration/Mapping/NotAnalyzedTest.cs index 0fbaa55c46f..62ced6fa771 100644 --- a/src/Tests/Nest.Tests.Integration/Mapping/NotAnalyzedTest.cs +++ b/src/Tests/Nest.Tests.Integration/Mapping/NotAnalyzedTest.cs @@ -1,4 +1,5 @@ using System.Linq; +using FluentAssertions; using Nest.Tests.MockData.Domain; using NUnit.Framework; @@ -14,7 +15,7 @@ public void NotAnalyzedReturnsOneItem() var x = this._client.CreateIndex(index, s => s .AddMapping(m=>m.MapFromAttributes()) ); - Assert.IsTrue(x.OK, x.ConnectionStatus.ToString()); + Assert.IsTrue(x.Acknowledged, x.ConnectionStatus.ToString()); var typeMappingResponse = this._client.GetMapping(gm=>gm.Index(index).Type("elasticsearchprojects")); var typeMapping = typeMappingResponse.Mapping; @@ -50,7 +51,7 @@ public void AnalyzedReturnsMoreItems() ) ) ); - Assert.IsTrue(x.OK, x.ConnectionStatus.ToString()); + Assert.IsTrue(x.Acknowledged, x.ConnectionStatus.ToString()); var indexResult = this._client.Index( new ElasticsearchProject @@ -66,8 +67,8 @@ public void AnalyzedReturnsMoreItems() .MatchAll() ); var facets = result.FacetItems(f => f.Country); - Assert.AreEqual(3, facets.Count()); - Assert.AreEqual("royal", facets.FirstOrDefault().Term); + Assert.AreEqual(5, facets.Count()); + facets.Select(f=>f.Term).Should().Contain("royal"); } diff --git a/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj b/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj index a8b59db4685..a2d1cb7803b 100644 --- a/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj +++ b/src/Tests/Nest.Tests.Integration/Nest.Tests.Integration.csproj @@ -117,8 +117,6 @@ - - diff --git a/src/Tests/Nest.Tests.Integration/Search/ExplainTests.cs b/src/Tests/Nest.Tests.Integration/Search/ExplainTests.cs index 70b3ddaf306..98d2b82f5c0 100644 --- a/src/Tests/Nest.Tests.Integration/Search/ExplainTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/ExplainTests.cs @@ -20,9 +20,9 @@ public void SimpleExplain() ""match_all"" : { } } }" ); - Assert.True(queryResults.DocumentsWithMetaData.All(h=>h.Explanation != null)); - Assert.True(queryResults.DocumentsWithMetaData.All(h => h.Explanation.Details.Any())); - Assert.True(queryResults.DocumentsWithMetaData.All(h => h.Explanation.Details.All(d=>!d.Description.IsNullOrEmpty()))); + Assert.True(queryResults.Hits.All(h=>h.Explanation != null)); + Assert.True(queryResults.Hits.All(h => h.Explanation.Details.Any())); + Assert.True(queryResults.Hits.All(h => h.Explanation.Details.All(d=>!d.Description.IsNullOrEmpty()))); } [Test] public void ComplexExplain() @@ -41,9 +41,9 @@ public void ComplexExplain() } }" ); - Assert.True(queryResults.DocumentsWithMetaData.All(h=>h.Explanation != null)); - Assert.True(queryResults.DocumentsWithMetaData.All(h => h.Explanation.Details.Any())); - Assert.True(queryResults.DocumentsWithMetaData.All(h => h.Explanation.Details.All(d=>!d.Description.IsNullOrEmpty()))); + Assert.True(queryResults.Hits.All(h=>h.Explanation != null)); + Assert.True(queryResults.Hits.All(h => h.Explanation.Details.Any())); + Assert.True(queryResults.Hits.All(h => h.Explanation.Details.All(d=>!d.Description.IsNullOrEmpty()))); } diff --git a/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs b/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs index 7967784dddc..03e2485b645 100644 --- a/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/QueryDSLTests.cs @@ -34,7 +34,7 @@ public void MatchAllShortcut() var results = this._client.Search(s => s .From(0) .Size(10) - .Fields(f => f.Id, f => f.Country) + .Source(source=>source.Include(f => f.Id, f => f.Country)) .SortAscending(f => f.LOC) .SortDescending(f => f.Country) .MatchAll() @@ -127,132 +127,120 @@ public void TestTermFacet() .SortAscending(f => f.LOC) .SortDescending(f => f.Name) .MatchAll() - .FacetTerm(t => t.OnField(f=>f.Country).Size(20)) + .FacetTerm(t => t.OnField(f => f.Country).Size(20)) ); Assert.Greater(results.Facet(f => f.Country).Items.Count(), 0); - Assert.Greater(results.FacetItems(f=>f.Country).Count(), 0); + Assert.Greater(results.FacetItems(f => f.Country).Count(), 0); } - [Test] - public void TestPartialFields() - { - var results = this._client.Search(s => - s.From(0) - .Size(10) - .PartialFields(pf => pf.PartialField("partial1").Include("country", "origin.lon"), pf => pf.PartialField("partial2").Exclude("country")) - .MatchAll()); - Assert.True(results.Hits.Hits.All(h => h.PartialFields["partial2"].Country == null && h.PartialFields["partial2"].Origin != null)); - Assert.True(results.Hits.Hits.All(h => !string.IsNullOrEmpty(h.PartialFields["partial1"].Country))); - // this test depends on fact, that no origin has longitude part equal to 0, lat is ommited by elasticsearch in results, so presumably deserialized to 0. - Assert.True(results.Hits.Hits.All(h => h.PartialFields["partial1"].Origin.lon != 0 && h.PartialFields["partial1"].Origin.lat == 0)); - } - [Test] - public void TermSuggest() - { + + [Test] + public void TermSuggest() + { var country = this._client.Search(s => s.Size(1)).Documents.First().Country; var wrongCountry = country + "x"; - var results = this._client.Search(s => s - .Query(q => q.MatchAll()) + var results = this._client.Search(s => s + .Query(q => q.MatchAll()) .SuggestTerm("mySuggest", m => m.SuggestMode(SuggestMode.Always).Text(wrongCountry).Size(1).OnField("country")) - ); + ); - Assert.NotNull(results); - Assert.True(results.IsValid); + Assert.NotNull(results); + Assert.True(results.IsValid); - Assert.NotNull(results.Suggest); - Assert.NotNull(results.Suggest.Values); + Assert.NotNull(results.Suggest); + Assert.NotNull(results.Suggest.Values); - Assert.AreEqual(results.Suggest.Values.Count, 1); - Assert.AreEqual(results.Suggest.Values.First().Count(), 1); + Assert.AreEqual(results.Suggest.Values.Count, 1); + Assert.AreEqual(results.Suggest.Values.First().Count(), 1); - Assert.NotNull(results.Suggest.Values.First().First().Options); - Assert.GreaterOrEqual(results.Suggest.Values.First().First().Options.Count(), 1); + Assert.NotNull(results.Suggest.Values.First().First().Options); + Assert.GreaterOrEqual(results.Suggest.Values.First().First().Options.Count(), 1); - Assert.AreEqual(results.Suggest.Values.First().First().Options.First().Text, country); + Assert.AreEqual(results.Suggest.Values.First().First().Options.First().Text, country); Assert.AreEqual(results.Suggest["mySuggest"].First().Options.First().Text, country); - } + } - [Test] - public void PhraseSuggest() - { + [Test] + public void PhraseSuggest() + { var text = this._client.Search(s => s.Size(1)).Documents.First().Content.Split(' '); var phrase = string.Join(" ", text.Take(2)) + "x"; - var results = this._client.Search(s => s - .Query(q => q.MatchAll()) + var results = this._client.Search(s => s + .Query(q => q.MatchAll()) .SuggestPhrase("myPhraseSuggest", m => m.Text(phrase).Size(1).OnField("content")) - ); - - Assert.NotNull(results); - Assert.True(results.IsValid); + ); - Assert.NotNull(results.Suggest); - Assert.NotNull(results.Suggest.Values); + Assert.NotNull(results); + Assert.True(results.IsValid); - Assert.AreEqual(results.Suggest.Values.Count, 1); - Assert.AreEqual(results.Suggest.Values.First().Count(), 1); + Assert.NotNull(results.Suggest); + Assert.NotNull(results.Suggest.Values); - Assert.NotNull(results.Suggest.Values.First().First().Options); - Assert.GreaterOrEqual(results.Suggest.Values.First().First().Options.Count(), 1); + Assert.AreEqual(results.Suggest.Values.Count, 1); + Assert.AreEqual(results.Suggest.Values.First().Count(), 1); - } + Assert.NotNull(results.Suggest.Values.First().First().Options); + Assert.GreaterOrEqual(results.Suggest.Values.First().First().Options.Count(), 1); - [Test] - public void TestCustomFiltersScore() - { - //Counting score with script and boost - var defaultProject = NestTestData.Data.First(); - var result = this._client.Search(s => s - .From(0) - .Size(10) - .Query(q => q - .CustomFiltersScore(cfs => cfs - .Filters(f => f - .Filter(fd => fd - .Bool(bqd => bqd - .Should(x => x.Range(r => r.From(83).To(85).OnField(qfd => qfd.FloatValue))))) - .Script("myVal*2"), f => f - .Filter(fd => fd - .Query(fq => fq - .QueryString(qs => qs - .Query("true") - .OnField(fs => fs.BoolValue) - .Operator(Operator.and)))) - .Boost(1.5F)) - .Query(qd => qd - .QueryString(qs => qs - .Query(defaultProject.Country) - .OnField(fs => fs.Country) - .Operator(Operator.and))) - .ScoreMode(ScoreMode.total) - .Params(x => x.Add("myVal", 0.6F))))); + } - //Counting score with boost only (1.2F equals myVal from script before) - var result2 = this._client.Search(s => s - .From(0) - .Size(10) - .Query(q => q - .CustomFiltersScore(cfs => cfs - .Filters(f => f - .Filter(fd => fd - .Bool(bqd => bqd - .Should(x => x.Range(r => r.From(83).To(85).OnField(qfd => qfd.FloatValue))))) - .Boost(1.2F), f => f - .Filter(fd => fd - .Query(fq => fq - .QueryString(qs => qs - .Query("true") - .OnField(fs => fs.BoolValue) - .Operator(Operator.and)))) - .Boost(1.5F)) - .Query(qd => qd - .QueryString(qs => qs + [Test] + public void TestCustomFiltersScore() + { + //Counting score with script and boost + var defaultProject = NestTestData.Data.First(); + var result = this._client.Search(s => s + .From(0) + .Size(10) + .Query(q => q + .CustomFiltersScore(cfs => cfs + .Filters(f => f + .Filter(fd => fd + .Bool(bqd => bqd + .Should(x => x.Range(r => r.From(83).To(85).OnField(qfd => qfd.FloatValue))))) + .Script("myVal*2"), f => f + .Filter(fd => fd + .Query(fq => fq + .QueryString(qs => qs + .Query("true") + .OnField(fs => fs.BoolValue) + .Operator(Operator.and)))) + .Boost(1.5F)) + .Query(qd => qd + .QueryString(qs => qs + .Query(defaultProject.Country) + .OnField(fs => fs.Country) + .Operator(Operator.and))) + .ScoreMode(ScoreMode.total) + .Params(x => x.Add("myVal", 0.6F))))); + + //Counting score with boost only (1.2F equals myVal from script before) + var result2 = this._client.Search(s => s + .From(0) + .Size(10) + .Query(q => q + .CustomFiltersScore(cfs => cfs + .Filters(f => f + .Filter(fd => fd + .Bool(bqd => bqd + .Should(x => x.Range(r => r.From(83).To(85).OnField(qfd => qfd.FloatValue))))) + .Boost(1.2F), f => f + .Filter(fd => fd + .Query(fq => fq + .QueryString(qs => qs + .Query("true") + .OnField(fs => fs.BoolValue) + .Operator(Operator.and)))) + .Boost(1.5F)) + .Query(qd => qd + .QueryString(qs => qs .Query(defaultProject.Country) - .OnField(fs => fs.Country) - .Operator(Operator.and))) - .ScoreMode(ScoreMode.total)))); - Assert.AreEqual(result.Hits.Hits.First().Score, result2.Hits.Hits.First().Score); - } + .OnField(fs => fs.Country) + .Operator(Operator.and))) + .ScoreMode(ScoreMode.total)))); + Assert.AreEqual(result.HitsMetaData.Hits.First().Score, result2.HitsMetaData.Hits.First().Score); + } } } diff --git a/src/Tests/Nest.Tests.Integration/Search/QueryResponseMapperTests.cs b/src/Tests/Nest.Tests.Integration/Search/QueryResponseMapperTests.cs index d0d77b5b928..82e4df2e796 100644 --- a/src/Tests/Nest.Tests.Integration/Search/QueryResponseMapperTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/QueryResponseMapperTests.cs @@ -51,7 +51,7 @@ public void HitsMaxScoreIsSet() //.SortAscending(p => p.Id) ); - var hits = queryResults.Hits; + var hits = queryResults.HitsMetaData; Assert.AreEqual(1, hits.MaxScore); Assert.AreEqual(hits.Hits.Max(h => h.Score), hits.MaxScore); @@ -68,7 +68,7 @@ public void HitsSortsIsSet() .SortDescending(p => p.Id) ); - var hits = queryResults.Hits; + var hits = queryResults.HitsMetaData; Assert.True(hits.Hits.All(h => h.Sorts.Count() == 2)); } @@ -81,7 +81,7 @@ public void HitsSortsIsSetWithStringSort() .SortDescending(p => p.Id) ); - var hits = queryResults.Hits; + var hits = queryResults.HitsMetaData; Assert.NotNull(hits, queryResults.ConnectionStatus.ToString()); Assert.True(hits.Hits.All(h => h.Sorts.Count() == 2)); } @@ -206,34 +206,7 @@ public void DismaxQuery() ); this.TestDefaultAssertions(queryResults); } - [Test] - public void FieldQuery() - { - var queryResults = this.SearchRaw( - @" { ""query"" : { - ""field"" : { - ""followers.firstName"" : ""+" + this._LookFor.ToLower() + @" -something else"" - } - } }" - ); - this.TestDefaultAssertions(queryResults); - } - [Test] - public void ExtendedFieldQuery() - { - var queryResults = this.SearchRaw( - @" { ""query"" : { - ""field"" : { - ""followers.firstName"" : { - ""query"" : ""+" + this._LookFor.ToLower() + @" -something else"", - ""boost"" : 2.0, - ""enable_position_increments"": false - } - } - } }" - ); - this.TestDefaultAssertions(queryResults); - } + [Test] public void FilteredQuery() { @@ -530,7 +503,7 @@ public void QueryWithHighlightTest() var queryResults = this.SearchRaw(query); //assert - Assert.IsTrue(queryResults.DocumentsWithMetaData.First().Highlights["content"].Highlights.Count() > 0); + Assert.IsTrue(queryResults.Hits.First().Highlights["content"].Highlights.Count() > 0); } [Test] diff --git a/src/Tests/Nest.Tests.Integration/Search/ScriptFields/ScriptFieldsTest.cs b/src/Tests/Nest.Tests.Integration/Search/ScriptFields/ScriptFieldsTest.cs index eeb04deb551..c8b72c9ff60 100644 --- a/src/Tests/Nest.Tests.Integration/Search/ScriptFields/ScriptFieldsTest.cs +++ b/src/Tests/Nest.Tests.Integration/Search/ScriptFields/ScriptFieldsTest.cs @@ -28,8 +28,9 @@ public void SimpleExplain() ) ); Assert.True(queryResults.IsValid); - Assert.True(queryResults.Documents.Any()); - Assert.True(queryResults.Documents.All(d=>d.LocScriptField != 0)); + Assert.True(queryResults.Hits.Any()); + Assert.Fail("Figure out how to expose fields"); + // Assert.True(queryResults.Hits.All(h=>h.Fields.FieldValue(p=>p.LocScriptField) != 0)); } } } \ No newline at end of file diff --git a/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeScanTests.cs b/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeScanTests.cs index 386bafea2b6..13455ee6cfb 100644 --- a/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeScanTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeScanTests.cs @@ -50,7 +50,7 @@ public void SearchScrollOnly() .Scroll("2s") ); Assert.True(queryResults.IsValid); - Assert.True(queryResults.Documents.Any()); + Assert.True(queryResults.Hits.Any()); Assert.IsNotNullOrEmpty(queryResults.ScrollId); } } diff --git a/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeTests.cs b/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeTests.cs index c0c1cb5cf30..0928ca95eec 100644 --- a/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/SearchType/SearchTypeTests.cs @@ -22,7 +22,7 @@ public void SearchQueryAndFetch() ); Assert.True(queryResults.IsValid); - Assert.True(queryResults.Documents.Any()); + Assert.True(queryResults.Hits.Any()); } [Test] public void SearchQueryThenFetch() @@ -36,7 +36,7 @@ public void SearchQueryThenFetch() ); Assert.True(queryResults.IsValid); - Assert.True(queryResults.Documents.Any()); + Assert.True(queryResults.Hits.Any()); } [Test] @@ -51,7 +51,7 @@ public void SearchDfsQueryAndFetch() ); Assert.True(queryResults.IsValid); - Assert.True(queryResults.Documents.Any()); + Assert.True(queryResults.Hits.Any()); } [Test] public void SearchDfsQueryThenFetch() @@ -65,7 +65,7 @@ public void SearchDfsQueryThenFetch() ); Assert.True(queryResults.IsValid); - Assert.True(queryResults.Documents.Any()); + Assert.True(queryResults.Hits.Any()); } } diff --git a/src/Tests/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs b/src/Tests/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs index 2a7ffe85afc..ff4ac62b7e4 100644 --- a/src/Tests/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/SubClassSupport/SubClassSupportTests.cs @@ -15,6 +15,7 @@ public class SubClassSupportTests : IntegrationTests public abstract class MyBaseClass { public string Title { get; set; } + public string Description { get; set; } } public class ClassA : MyBaseClass { @@ -135,5 +136,111 @@ public void MultipleTypesUsingBaseClassMultiSearch() secondResult.Documents.OfType().Any().Should().BeTrue(); secondResult.Documents.OfType().Any().Should().BeTrue(); } + [Test] + public void MultipleTypesUsingBaseClassMultiSearchHits() + { + var data = Enumerable.Range(0, 100) + .Select(i => + { + MyBaseClass o = null; + if (i % 2 == 0) + o = new ClassA() { ClassAProperty = Guid.NewGuid().ToString() }; + else + o = new ClassB() { ClassBProperty = Guid.NewGuid().ToString() }; + o.Title = Guid.NewGuid().ToString(); + return o; + }); + + var resulta = this._client.Bulk(b => b.IndexMany(data.OfType()).Refresh()); + var resultb = this._client.Bulk(b => b.IndexMany(data.OfType()).Refresh()); + + var queryResults = this._client.MultiSearch(ms => ms + .Search("using_types", s => s.AllIndices() + .Types(typeof(ClassA), typeof(ClassB)) + .From(0) + .Size(100) + .Fields(p=>p.Title) + .MatchAll() + ) + .Search("using_selector", s => s.AllIndices() + .Types("classa", "classb") + .ConcreteTypeSelector((o, h) => o.classBProperty != null ? typeof(ClassB) : typeof(ClassA)) + .From(0) + .Size(100) + .Fields(f=>f.Add(p=>p.Title).Add("classBProperty")) + .MatchAll() + ) + ); + Assert.True(queryResults.IsValid); + var firstResult = queryResults.GetResponse("using_types"); + + Assert.True(firstResult.Documents.Any()); + firstResult.Hits.OfType>().Any().Should().BeTrue(); + firstResult.Hits.OfType>().Any().Should().BeTrue(); + + var secondResult = queryResults.GetResponse("using_selector"); + + Assert.True(secondResult.Documents.Any()); + secondResult.Hits.OfType>().Any().Should().BeTrue(); + secondResult.Hits.OfType>().Any().Should().BeTrue(); + } + + [Test] + public void MultipleTypesUsingBaseClassMultiSearchSourceInclude() + { + var data = Enumerable.Range(0, 100) + .Select(i => + { + MyBaseClass o = null; + if (i % 2 == 0) + o = new ClassA() { ClassAProperty = Guid.NewGuid().ToString() }; + else + o = new ClassB() { ClassBProperty = Guid.NewGuid().ToString() }; + o.Title = Guid.NewGuid().ToString(); + o.Description = Guid.NewGuid().ToString(); + return o; + }); + + var resulta = this._client.Bulk(b => b.IndexMany(data.OfType()).Refresh()); + var resultb = this._client.Bulk(b => b.IndexMany(data.OfType()).Refresh()); + + var queryResults = this._client.MultiSearch(ms => ms + .Search("using_types", s => s.AllIndices() + .Types(typeof(ClassA), typeof(ClassB)) + .From(0) + .Size(100) + .Source(source=>source + .Include(i=>i.Add(p=>p.Title).Add("classBProperty")) + ) + .MatchAll() + ) + .Search("using_selector", s => s.AllIndices() + .Types("classa", "classb") + .ConcreteTypeSelector((o, h) => o.classBProperty != null ? typeof(ClassB) : typeof(ClassA)) + .From(0) + .Size(100) + .Source(source=>source + .Include(i=>i.Add(p=>p.Description).Add("classBProperty")) + ) + .MatchAll() + ) + ); + Assert.True(queryResults.IsValid); + var firstResult = queryResults.GetResponse("using_types"); + + Assert.True(firstResult.Documents.Any()); + firstResult.Documents.All(d => !d.Title.IsNullOrEmpty()); + firstResult.Documents.All(d => d.Description.IsNullOrEmpty()); + firstResult.Documents.OfType().Any().Should().BeTrue(); + firstResult.Documents.OfType().Any().Should().BeTrue(); + + var secondResult = queryResults.GetResponse("using_selector"); + + Assert.True(secondResult.Documents.Any()); + secondResult.Documents.All(d => d.Title.IsNullOrEmpty()); + secondResult.Documents.All(d => !d.Description.IsNullOrEmpty()); + secondResult.Documents.OfType().Any().Should().BeTrue(); + secondResult.Documents.OfType().Any().Should().BeTrue(); + } } } \ No newline at end of file diff --git a/src/Tests/Nest.Tests.Integration/Search/VersionTests.cs b/src/Tests/Nest.Tests.Integration/Search/VersionTests.cs index db28ed5b385..0e72da76f47 100644 --- a/src/Tests/Nest.Tests.Integration/Search/VersionTests.cs +++ b/src/Tests/Nest.Tests.Integration/Search/VersionTests.cs @@ -19,7 +19,7 @@ public void WithVersion() ); Assert.True(queryResults.IsValid); Assert.Greater(queryResults.Total, 0); - Assert.True(queryResults.DocumentsWithMetaData.All(h => !h.Version.IsNullOrEmpty())); + Assert.True(queryResults.Hits.All(h => !h.Version.IsNullOrEmpty())); } [Test] public void NoVersion() @@ -31,7 +31,7 @@ public void NoVersion() Assert.True(queryResults.IsValid); Assert.Greater(queryResults.Total, 0); - Assert.True(queryResults.DocumentsWithMetaData.All(h => h.Version.IsNullOrEmpty())); + Assert.True(queryResults.Hits.All(h => h.Version.IsNullOrEmpty())); } } } \ No newline at end of file diff --git a/src/Tests/Nest.Tests.Integration/Template/TemplateTests.cs b/src/Tests/Nest.Tests.Integration/Template/TemplateTests.cs index bd2e998ded5..87f82018e86 100644 --- a/src/Tests/Nest.Tests.Integration/Template/TemplateTests.cs +++ b/src/Tests/Nest.Tests.Integration/Template/TemplateTests.cs @@ -16,7 +16,7 @@ public void SimplePutAndGet() .Template("donotinfluencothertests-*") .Order(42) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var templateResponse = this._client.GetTemplate("put-template-with-settings"); templateResponse.Should().NotBeNull(); @@ -42,7 +42,7 @@ public void PutTemplateWithSettings() .Add("index.number_of_replicas", 2) ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var templateResponse = this._client.GetTemplate("put-template-with-settings"); templateResponse.Should().NotBeNull(); @@ -68,7 +68,7 @@ public void PutTemplateWithMappings() .DisableAllField() ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var templateResponse = this._client.GetTemplate("put-template-with-mappings"); templateResponse.Should().NotBeNull(); @@ -97,7 +97,7 @@ public void PutTemplateWithWarmers() ) ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var templateResponse = this._client.GetTemplate("put-template-with-warmers"); templateResponse.Should().NotBeNull(); diff --git a/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs b/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs index 878ba5941f3..1c6193a2e28 100644 --- a/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs +++ b/src/Tests/Nest.Tests.Integration/Warmers/WarmersTests.cs @@ -22,7 +22,7 @@ public void SimplePutAndGet() //.Filter(filter => filter) // this is why there is a search descriptor ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var warmerResponse = this._client.GetWarmer("warmer_simpleputandget", wd => wd .Index() @@ -54,7 +54,7 @@ public void PutWithEmptyTypes() //.Filter(filter => filter) // this is why there is a search descriptor ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var warmerResponse = this._client.GetWarmer("warmer_putwithemptytypes", wd => wd .Index() @@ -81,7 +81,7 @@ public void PutToDefaultIndex() ) ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var warmerResponse = this._client.GetWarmer("warmer_puttodefaultindex", wd => wd .Index() @@ -111,17 +111,26 @@ public void Delete() ) ) ); - Assert.IsTrue(putResponse.OK); + Assert.IsTrue(putResponse.Acknowledged); var deleteResponse = this._client.DeleteWarmer("warmer_delete", wd => wd .Index() ); - Assert.IsTrue(deleteResponse.OK); - + Assert.IsTrue(deleteResponse.Acknowledged); + + this._client.Refresh(r => r.Index(ElasticsearchConfiguration.DefaultIndex)); + var warmerResponse = this._client.GetWarmer("warmer_delete", wd => wd .Index() ); + + var warmerResponse2 = this._client.GetWarmer("warmer_deleteasdkajsdkjahsdkahsdas", wd => wd + .Index() + ); warmerResponse.Should().NotBeNull(); + //TODO remove when this bug is fixed in elasticsearch + Assert.Pass("1.0 GA has a bug that does not return a 404 for missing warmers see #5155"); + warmerResponse.IsValid.Should().BeFalse(); warmerResponse.ConnectionStatus.Error.HttpStatusCode.Should().Be(HttpStatusCode.NotFound); } diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs index 85c99b14428..7dd196f9040 100644 --- a/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs +++ b/src/Tests/Nest.Tests.Unit/Core/Map/FluentMappingFullExampleTests.cs @@ -127,7 +127,6 @@ public void MapFluentFull() .IndexOptions(IndexOptions.positions) .NullValue("my_special_null_value") .OmitNorms() - .OmitTermFrequencyAndPositions() .PositionOffsetGap(1) .SearchAnalyzer("standard") .Store() diff --git a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs index 10c92d7c858..1835f641c67 100644 --- a/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs +++ b/src/Tests/Nest.Tests.Unit/Core/Map/Properties/PropertiesTests.cs @@ -23,7 +23,6 @@ public void StringProperty() .IndexOptions(IndexOptions.positions) .NullValue("my_special_null_value") .OmitNorms() - .OmitTermFrequencyAndPositions() .PositionOffsetGap(1) .SearchAnalyzer("standard") .Store() diff --git a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj index 3e0eb50408a..7a118ba417e 100644 --- a/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj +++ b/src/Tests/Nest.Tests.Unit/Nest.Tests.Unit.csproj @@ -241,9 +241,6 @@ - - - diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLess/ConditionLessTests.cs b/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLess/ConditionLessTests.cs index ef76f2fe259..e7535811db4 100644 --- a/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLess/ConditionLessTests.cs +++ b/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLess/ConditionLessTests.cs @@ -68,23 +68,6 @@ public void FuzzyDate() this.DoConditionlessQuery(q => q.FuzzyDate(fdq => fdq.OnField(p => p.StartedOn).Value(this._c.Date))); } - [Test] - public void Text() - { - this.DoConditionlessQuery(q => q.Text(tq => tq.OnField(p => p.Name).Query(this._c.Name1))); - } - - [Test] - public void TextPhrase() - { - this.DoConditionlessQuery(q => q.Text(tq => tq.OnField(p => p.Name).Query(this._c.Name1))); - } - - [Test] - public void TextPhrasePrefix() - { - this.DoConditionlessQuery(q => q.Text(tq => tq.OnField(p => p.Name).Query(this._c.Name1))); - } [Test] public void Nested() @@ -93,7 +76,7 @@ public void Nested() .Nested(qn => qn .Path(p => p.Followers) .Query(nqq => nqq - .Text(tq => tq + .Match(tq => tq .OnField(p => p.Name) .Query(this._c.Name1) ) diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLessStrict/ConditionLessStrictTests.cs b/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLessStrict/ConditionLessStrictTests.cs index 11a62cbc7ce..a12ebba68e2 100644 --- a/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLessStrict/ConditionLessStrictTests.cs +++ b/src/Tests/Nest.Tests.Unit/Search/Query/ConditionLessStrict/ConditionLessStrictTests.cs @@ -71,23 +71,6 @@ public void FuzzyDate() this.DoConditionlessQuery(q => q.FuzzyDate(fdq => fdq.OnField(p => p.StartedOn).Value(this._c.Date))); } - [Test] - public void Text() - { - this.DoConditionlessQuery(q => q.Text(tq => tq.OnField(p => p.Name).Query(this._c.Name1))); - } - - [Test] - public void TextPhrase() - { - this.DoConditionlessQuery(q => q.Text(tq => tq.OnField(p => p.Name).Query(this._c.Name1))); - } - - [Test] - public void TextPhrasePrefix() - { - this.DoConditionlessQuery(q => q.Text(tq => tq.OnField(p => p.Name).Query(this._c.Name1))); - } [Test] public void Nested() @@ -96,7 +79,7 @@ public void Nested() .Nested(qn => qn .Path(p => p.Followers) .Query(nqq => nqq - .Text(tq => tq + .Match(tq => tq .OnField(p => p.Name) .Query(this._c.Name1) ) diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextPhrasePrefixQueryJson.cs b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextPhrasePrefixQueryJson.cs deleted file mode 100644 index 03f39806450..00000000000 --- a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextPhrasePrefixQueryJson.cs +++ /dev/null @@ -1,70 +0,0 @@ -using NUnit.Framework; -using Nest.Tests.MockData.Domain; - -namespace Nest.Tests.Unit.Search.Query.Singles -{ - [TestFixture] - public class TextPhrasePrefixQueryJson - { - [Test] - public void TextPhrasePrefixQuery() - { - var s = new SearchDescriptor() - .From(0) - .Size(10) - .Query(q=>q - .TextPhrasePrefix(t=>t - .OnField(f=>f.Name) - .Query("this is a test") - ) - ); - - var json = TestElasticClient.Serialize(s); - var expected = @"{ from: 0, size: 10, - query : { - text: { - name : { - type: ""phrase_prefix"", - query : ""this is a test"" - } - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - [Test] - public void TextPhrasePrefixQuerySomeOptions() - { - var s = new SearchDescriptor() - .From(0) - .Size(10) - .Query(q => q - .TextPhrasePrefix(t => t - .OnField(f => f.Name) - .Query("this is a test") - .Fuzziness(1.0) - .Analyzer("my_analyzer") - .PrefixLength(2) - .Operator(Operator.and) - ) - ); - - var json = TestElasticClient.Serialize(s); - var expected = @"{ from: 0, size: 10, - query : { - text: { - name : { - type: ""phrase_prefix"", - query : ""this is a test"", - analyzer : ""my_analyzer"", - fuzziness: 1.0, - prefix_length: 2, - operator: ""and"" - } - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - } -} diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextPhraseQueryJson.cs b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextPhraseQueryJson.cs deleted file mode 100644 index 57d8673b981..00000000000 --- a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextPhraseQueryJson.cs +++ /dev/null @@ -1,68 +0,0 @@ -using NUnit.Framework; -using Nest.Tests.MockData.Domain; - -namespace Nest.Tests.Unit.Search.Query.Singles -{ - [TestFixture] - public class TextPhraseQueryJson - { - [Test] - public void TextPhraseQuery() - { - var s = new SearchDescriptor() - .From(0) - .Size(10) - .Query(q=>q - .TextPhrase(t=>t - .OnField(f=>f.Name) - .Query("this is a test") - ) - ); - - var json = TestElasticClient.Serialize(s); - var expected = @"{ from: 0, size: 10, - query : { - text: { - name : { - type: ""phrase"", - query : ""this is a test"" - } - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - [Test] - public void TextPhraseQuerySomeOptions() - { - var s = new SearchDescriptor() - .From(0) - .Size(10) - .Query(q => q - .TextPhrase(t => t - .OnField(f => f.Name) - .Query("this is a test") - .Fuzziness(1.0) - .Analyzer("my_analyzer") - .PrefixLength(2) - ) - ); - - var json = TestElasticClient.Serialize(s); - var expected = @"{ from: 0, size: 10, - query : { - text: { - name : { - type: ""phrase"", - query : ""this is a test"", - analyzer : ""my_analyzer"", - fuzziness: 1.0, - prefix_length: 2 - } - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - } -} diff --git a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextQueryJson.cs b/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextQueryJson.cs deleted file mode 100644 index d8eed203bde..00000000000 --- a/src/Tests/Nest.Tests.Unit/Search/Query/Singles/TextQueryJson.cs +++ /dev/null @@ -1,66 +0,0 @@ -using NUnit.Framework; -using Nest.Tests.MockData.Domain; - -namespace Nest.Tests.Unit.Search.Query.Singles -{ - [TestFixture] - public class TextQueryJson - { - [Test] - public void TextQuery() - { - var s = new SearchDescriptor() - .From(0) - .Size(10) - .Query(q=>q - .Text(t=>t - .OnField(f=>f.Name) - .Query("this is a test") - ) - ); - - var json = TestElasticClient.Serialize(s); - var expected = @"{ from: 0, size: 10, - query : { - text: { - name : { - query : ""this is a test"" - } - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - [Test] - public void TextQuerySomeOptions() - { - var s = new SearchDescriptor() - .From(0) - .Size(10) - .Query(q => q - .Text(t => t - .OnField(f => f.Name) - .Query("this is a test") - .Fuzziness(1.0) - .Analyzer("my_analyzer") - .PrefixLength(2) - ) - ); - - var json = TestElasticClient.Serialize(s); - var expected = @"{ from: 0, size: 10, - query : { - text: { - name : { - query : ""this is a test"", - analyzer : ""my_analyzer"", - fuzziness: 1.0, - prefix_length: 2 - } - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - } -} diff --git a/src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs b/src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs index a59ca7bfdf5..f50cfb7fc16 100644 --- a/src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs +++ b/src/Tests/Nest.Tests.Unit/Search/SearchOptions/SearchOptionTests.cs @@ -156,42 +156,6 @@ public void TestFieldsByName() Assert.True(json.JsonEquals(expected)); } - [Test] - public void TestPartialFields() - { - var s = new SearchDescriptor() - .PartialFields(x => x.PartialField("partial1").Include("id", "name").Exclude("number")); - var json = TestElasticClient.Serialize(s); - var expected = @"{ - partial_fields: { - ""partial1"" : { - ""include"" : [ ""id"", ""name"" ], - ""exclude"" : [ ""number"" ] - } - } - }"; - Assert.True(json.JsonEquals(expected)); - } - - [Test] - public void TestManyPartialFields() - { - var s = new SearchDescriptor() - .PartialFields(x => x.PartialField("partial1").Include("id"), x => x.PartialField("partial2").Exclude("id")); - var json = TestElasticClient.Serialize(s); - var expected = @"{ - partial_fields: { - ""partial1"" : { - ""include"" : [ ""id"" ] - }, - ""partial2"" : { - ""exclude"" : [ ""id"" ] - } - } - }"; - Assert.True(json.JsonEquals(expected), json); - } - [Test] public void TestSort() {