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

Commit 5367c00

Browse files
committed
donno,lots of change...
1 parent d24ad6a commit 5367c00

File tree

276 files changed

+72
-40
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

276 files changed

+72
-40
lines changed

.gitignore

100644100755
File mode changed.

BenchmarkTests/Benchmark.csproj

100644100755
File mode changed.

BenchmarkTests/Benchmark.csproj.user

100644100755
File mode changed.

BenchmarkTests/Config/ElasticSearch.config

100644100755
File mode changed.

BenchmarkTests/Config/Logging.config

100644100755
File mode changed.

BenchmarkTests/Program.cs

100644100755
File mode changed.

BenchmarkTests/Properties/AssemblyInfo.cs

100644100755
File mode changed.

BenchmarkTests/app.config

100644100755
File mode changed.

ElasticSearch.Client.sln

100644100755
File mode changed.

ElasticSearch.Client/Config/ClusterDefinition.cs

100644100755
File mode changed.

ElasticSearch.Client/Config/ConnectionPoolConfig.cs

100644100755
File mode changed.

ElasticSearch.Client/Config/ElasticSearch.config

100644100755
File mode changed.

ElasticSearch.Client/Config/ElasticSearchConfig.cs

100644100755
File mode changed.

ElasticSearch.Client/Config/NodeDefinition.cs

100644100755
File mode changed.

ElasticSearch.Client/Config/TransportType.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/BulkObject.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/ClusterState.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/Document.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/Field.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/HitStatus.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/Hits.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/IndexItem.cs

100644100755
+8-3
Original file line numberDiff line numberDiff line change
@@ -92,13 +92,18 @@ static object RemoveInvalidChar(object str)
9292
{
9393
if (str is string)
9494
{
95-
var str1 = str.ToString();
95+
string str1 = str.ToString();
9696
if (str1.Contains("\0"))
9797
{
98-
str = str1.Replace("\0", string.Empty);
98+
str1 = str1.Replace("\0", string.Empty);
9999
}
100+
if (str1.Contains("\\"))
101+
{
102+
str1 = str1.Replace("\\", "\\\\");
103+
}
104+
return str1.FilterControlChar();
100105
}
101-
return str;
106+
return str;
102107
}
103108

104109
public string FieldsToJson()

ElasticSearch.Client/Domain/IndexSetting.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/OperateResult.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/SearchHits.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/SearchResult.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/ShardStatus.cs

100644100755
File mode changed.

ElasticSearch.Client/Domain/TemplateSetting.cs

100644100755
File mode changed.

ElasticSearch.Client/ElasticSearch.Client.csproj

100644100755
File mode changed.

ElasticSearch.Client/ElasticSearch.Client.csproj.user

100644100755
File mode changed.

ElasticSearch.Client/ElasticSearchClient.cs

100644100755
+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ public OperateResult Index(string index, string type, string indexKey, string js
7373
Contract.Assert(!string.IsNullOrEmpty(index));
7474
Contract.Assert(!string.IsNullOrEmpty(type));
7575
Contract.Assert(!string.IsNullOrEmpty(jsonData));
76-
Contract.Assert(!string.IsNullOrEmpty(indexKey));
76+
// Contract.Assert(!string.IsNullOrEmpty(indexKey));
7777

7878
string url = "/{0}/{1}/{2}/".Fill(index.Trim().ToLower(), type.Trim(), indexKey);
7979
//set parent-child relation
@@ -109,7 +109,7 @@ public bool PartialUpdate(string index, string type, string indexKey, string jso
109109
Contract.Assert(!string.IsNullOrEmpty(jsonData));
110110
Contract.Assert(!string.IsNullOrEmpty(indexKey));
111111

112-
var url = "/{0}/{1}/{2}/_update".Fill(index.Trim().ToLower(), type.Trim(), indexKey);
112+
var url = "/{0}/{1}/{2}/_partial_update".Fill(index.Trim().ToLower(), type.Trim(), indexKey);
113113

114114
//set parent-child relation
115115
if (!string.IsNullOrEmpty(routing))

ElasticSearch.Client/Exception/ElasticSearchException.cs

100644100755
File mode changed.

ElasticSearch.Client/Exception/ExceptionHandler.cs

100644100755
File mode changed.

ElasticSearch.Client/Exception/IndexMissingException.cs

100644100755
File mode changed.

ElasticSearch.Client/Exception/SearchPhaseExecutionException.cs

100644100755
File mode changed.

ElasticSearch.Client/Exception/TypeMissingException.cs

100644100755
File mode changed.

ElasticSearch.Client/Mapping/Enums.cs

100644100755
File mode changed.

ElasticSearch.Client/Mapping/IndexType.cs

100644100755
File mode changed.

ElasticSearch.Client/Mapping/Mapping.cs

100644100755
File mode changed.

ElasticSearch.Client/Mapping/NumType.cs

100644100755
File mode changed.

ElasticSearch.Client/Mapping/Store.cs

100644100755
File mode changed.

ElasticSearch.Client/Mapping/TypeSetting.cs

100644100755
File mode changed.

ElasticSearch.Client/Properties/AssemblyInfo.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/BooleanType.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/AndFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/BoolFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/ExistsFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/GeoBBoxFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/GeoDistanceFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/GeoDistanceRangeFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/GeoPolygonFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/HasChildFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/IdsFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/LimitFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/MatchAllFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/MissingFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/NestedFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/NotFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/NumericRangeFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/OrFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/PrefixFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/QueryFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/RangeFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/ScriptFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/TermFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/TermsFilterConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Filter/TypeFilterConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Misc/TermsFacetConverterer.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/BoolQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/BoostingQueryConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/ConstantScoreQueryConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/CustomScoreQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/DisjunctionMaxQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/ElasticQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/FieldQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/FilteredQueryConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/FuzzyLikeThisQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/FuzzyQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/IdsQueryConverterer.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/MatchAllQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/QueryStringConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/TermQueryConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/TermsQueryConvert.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/TextQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Converters/Query/WildcardQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/ElasticQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/AndFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/BoolFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/ExistsFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/GeoBoundingBoxFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/GeoDistanceFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/GeoDistanceRangeFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/GeoPolygonFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/HasChildFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/IdsFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/LimitFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/MatchAllFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/MatchAllQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/MissingFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/NestedFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/NotFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/NumericRangeFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/OrFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/PrefixFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/QueryFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/RangeFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/ScriptFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/TermFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/TermsFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Filter/TypeFilter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/IQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/BoolQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/BoostingQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/ConstantScoreQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/CustomFiltersScoreQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/CustomFiltersScoreQueryConverterer.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/CustomScoreQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/DisjunctionMaxQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/FieldQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/FilteredQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/FuzzyLikeThisQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/FuzzyQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/HasChildQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/HasChildQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/IdsQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/MoreLikeThisQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/MoreLikeThisQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/NestedQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/NestedQueryConverterer.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/PrefixQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/PrefixQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/QueryStringQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/RangeQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/RangeQueryConverter.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/TermQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/TermsQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/TextQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/TopChildrenQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/TopChildrenQueryConverterer.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryDSL/Query/WildcardQuery.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryString/Conditional.cs

100644100755
File mode changed.

ElasticSearch.Client/QueryString/ExpressionEx.cs

100644100755
File mode changed.

ElasticSearch.Client/Settings.StyleCop

100644100755
File mode changed.

ElasticSearch.Client/StyleCop.Cache

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/Connection.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/ConnectionBuilder.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/ConnectionPool.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/ConnectionProvider.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/ConnectionProviderFactory.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/IConnection.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/IConnectionProvider.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/LockTimeoutException.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/NormalConnectionProvider.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/PooledConnectionProvider.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/Server.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Connection/TimedLock.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/ElasticNode.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/ElasticNodeManager.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/ElasticSession.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Http/HttpAdaptor.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/IDL/Method.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/IDL/Rest.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/IDL/RestRequest.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/IDL/RestResponse.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/IDL/Status.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/RestProvider.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Collections/THashSet.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TBase.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TBase64Utils.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TBinaryProtocol.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TField.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TJSONProtocol.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TList.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TMap.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TMessage.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TMessageType.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TProtocol.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TProtocolException.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TProtocolFactory.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TProtocolUtil.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TSet.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TStruct.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Protocol/TType.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Server/TServer.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Server/TSimpleServer.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Server/TThreadPoolServer.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Server/TThreadedServer.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/TApplicationException.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/TProcessor.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/SocketConnectState.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TBufferedTransport.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TFramedTransport.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/THttpClient.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TServerSocket.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TServerTransport.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TSocket.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TSocketSettings.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TSocketV2.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TStreamTransport.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TTransport.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TTransportException.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/Thrift/Transport/TTransportFactory.cs

100644100755
File mode changed.

ElasticSearch.Client/Transport/ThriftAdaptor.cs

100644100755
File mode changed.

ElasticSearch.Client/Utils/AggregateCounter.cs

100644100755
File mode changed.

ElasticSearch.Client/Utils/ElasticSearchExtensions.cs

100644100755
+54-35
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,48 @@
55

66
namespace ElasticSearch.Client.Utils
77
{
8-
public static class ElasticSearchExtensions
9-
{
10-
public static string Fill(this string formatString, params object[] args)
11-
{
12-
Contract.Assert(formatString != null);
13-
Contract.Assert(args != null);
14-
return string.Format(formatString, args);
15-
}
16-
17-
/// <summary>
18-
/// Resolve Lucene Keyword
19-
/// </summary>
20-
/// <param name="searchKeyword"></param>
21-
/// <returns></returns>
22-
public static string ReplaceLuceneKeywordChar(this string searchKeyword)
23-
{
24-
if(searchKeyword.Length==1)
25-
{
26-
if (searchKeyword.StartsWith("!"))
27-
{
28-
searchKeyword = "*";
29-
}
30-
}
8+
public static class ElasticSearchExtensions
9+
{
10+
public static string Fill(this string formatString, params object[] args)
11+
{
12+
Contract.Assert(formatString != null);
13+
Contract.Assert(args != null);
14+
return string.Format(formatString, args);
15+
}
16+
17+
/// <summary>
18+
/// Resolve Lucene Keyword
19+
/// </summary>
20+
/// <param name="searchKeyword"></param>
21+
/// <returns></returns>
22+
public static string ReplaceLuceneKeywordChar(this string searchKeyword)
23+
{
24+
if (searchKeyword.Length == 1)
25+
{
26+
if (searchKeyword.StartsWith("!"))
27+
{
28+
searchKeyword = "*";
29+
}
30+
}
3131

32-
searchKeyword = searchKeyword.Replace(@"\", @"\\");
33-
string strFilter = ":*?~!@^-+'\"\\{}[]()";
34-
char[] arrFilterChar = strFilter.ToCharArray();
35-
foreach (char c in arrFilterChar)
36-
{
37-
searchKeyword = searchKeyword.Replace("" + c, @"\" + c);
38-
}
39-
return searchKeyword;
40-
}
32+
searchKeyword = searchKeyword.Replace(@"\", @"\\");
33+
string strFilter = ":*?~!@^-+'\"\\{}[]()";
34+
char[] arrFilterChar = strFilter.ToCharArray();
35+
foreach (char c in arrFilterChar)
36+
{
37+
searchKeyword = searchKeyword.Replace("" + c, @"\" + c);
38+
}
39+
return searchKeyword;
40+
}
4141

4242
public static void InitOrGetFacets(this SearchResult result)
4343
{
4444
if (result != null && !string.IsNullOrEmpty(result.Response))
4545
{
46-
if (result._facets == null) { result._facets = new Dictionary<string, Dictionary<string, int>>(); }
46+
if (result._facets == null)
47+
{
48+
result._facets = new Dictionary<string, Dictionary<string, int>>();
49+
}
4750
var jobject = JObject.Parse(result.Response);
4851
var facets = jobject["facets"];
4952
foreach (JToken jToken in facets)
@@ -75,7 +78,7 @@ public static void InitOrGetFacets(this SearchResult result)
7578
}
7679
catch (System.Exception e)
7780
{
78-
// logger.HandleException(e, "xxx_search_facets_json_parse_failure");
81+
// logger.HandleException(e, "xxx_search_facets_json_parse_failure");
7982
}
8083
}
8184

@@ -86,6 +89,22 @@ public static void InitOrGetFacets(this SearchResult result)
8689
}
8790
}
8891
}
89-
92+
93+
public static string FilterControlChar(this string controlStr)
94+
{
95+
var newArray = new char[controlStr.Length];
96+
for (int i = 0; i < controlStr.Length; i++)
97+
{
98+
newArray[i] = controlStr[i];
99+
if ((controlStr[i] >= 0 && controlStr[i] <= 31) || (controlStr[i] >= 127 && controlStr[i] <= 159))
100+
{
101+
newArray[i] = (char) 0x20;
102+
}
103+
}
104+
105+
return new string(newArray);
106+
107+
108+
}
90109
}
91110
}

ElasticSearch.Client/Utils/JsonBuilder.cs

100644100755
File mode changed.

ElasticSearch.Client/Utils/JsonDelegates.cs

100644100755
File mode changed.

ElasticSearch.Client/Utils/JsonSerializer.cs

100644100755
File mode changed.

ElasticSearch.Client/Utils/LogWrapper.cs

100644100755
File mode changed.

ElasticSearch.DataManager.sln

100644100755
File mode changed.

ElasticSearch.DataManager/Config/ElasticSearch.config

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/AnalyzeTest.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/AnalyzeTest.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/BulkIndex.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/BulkIndex.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Connect.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Connect.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Connect.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Export.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Export.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Export.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/FormBase.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/FormBase.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/FormBase.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/GetInput.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/GetInput.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/JsonView.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/JsonView.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/ModifyShard.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/ModifyShard.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/NewIndex.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/NewIndex.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/NewIndex.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/PostMapping.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/PostMapping.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Search.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Dialogs/Search.resx

100644100755
File mode changed.

ElasticSearch.DataManager/ElasticSearch.DataManager.csproj

100644100755
File mode changed.

ElasticSearch.DataManager/Form1.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Form1.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Form1.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Program.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Properties/AssemblyInfo.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Properties/Resources.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Properties/Resources.resx

100644100755
File mode changed.

ElasticSearch.DataManager/Properties/Settings.Designer.cs

100644100755
File mode changed.

ElasticSearch.DataManager/Properties/Settings.settings

100644100755
File mode changed.

ElasticSearch.DataManager/ScreenShot/Analyze.PNG

100644100755
File mode changed.

ElasticSearch.DataManager/ScreenShot/Connect.PNG

100644100755
File mode changed.

ElasticSearch.DataManager/ScreenShot/Menu.png

100644100755
File mode changed.

ElasticSearch.DataManager/ScreenShot/Migrate.PNG

100644100755
File mode changed.

ElasticSearch.DataManager/ScreenShot/ViewMapping.PNG

100644100755
File mode changed.

ElasticSearch.DataManager/app.config

100644100755
File mode changed.

ElasticSearch.Tests/BulkOperatesTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/ClusterSetupTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/Conditional/QueryByConditionalTests.cs

100644100755
+8
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,14 @@ public void AllInOne()
4646

4747
count = client.Count(app, indexType, Conditional.Get(ExpressionEx.Between("age", 22, 23, true)));
4848
Assert.AreEqual(2, count);
49+
50+
//a coplex example
51+
var cond1= Conditional.Get(ExpressionEx.Eq("name", "jack"))
52+
.And(ExpressionEx.Between("age",22,30))
53+
.And(ExpressionEx.Fuzzy("address","beijing",1.0f,4))
54+
.And(ExpressionEx.Le("no",87));
55+
Conditional cond2 = Conditional.Or(cond1, Conditional.Not(ExpressionEx.Eq("gender", "male")));
56+
client.Search("index", "type", cond2.Query);
4957

5058

5159
}

ElasticSearch.Tests/Easy2Go.cs

100644100755
File mode changed.

ElasticSearch.Tests/ElasticSearch.Tests.csproj

100644100755
File mode changed.

ElasticSearch.Tests/ExceptionTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/IndexingTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/MappingTest3.cs

100644100755
File mode changed.

ElasticSearch.Tests/MappingTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/MappingTests2.cs

100644100755
File mode changed.

ElasticSearch.Tests/Properties/AssemblyInfo.cs

100644100755
File mode changed.

ElasticSearch.Tests/QueryDSL/QueryDSLTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/QueryTests.cs

100644100755
File mode changed.

ElasticSearch.Tests/TemplateTests.cs

100644100755
File mode changed.

README.textile

100644100755
File mode changed.

libs/Aga.Controls.dll

100644100755
File mode changed.

libs/Json.Net.4.5.dll

100644100755
File mode changed.

libs/JsonViewer.dll

100644100755
File mode changed.

libs/Lucene.Net.2.9.dll

100644100755
File mode changed.

libs/Microsoft.Contracts.dll

100644100755
File mode changed.

libs/NetReflector.dll

100644100755
File mode changed.

libs/log4net.dll

100644100755
File mode changed.

libs/nunit.framework.dll

100644100755
File mode changed.

0 commit comments

Comments
 (0)