donno,lots of change...

Author: medcl

.gitignore

@@ -92,13 +92,18 @@ static object RemoveInvalidChar(object str)
 		{
 			if (str is string)
 			{
-				var str1 = str.ToString();
+				string str1 = str.ToString();
 				if (str1.Contains("\0"))
 				{
-					str = str1.Replace("\0", string.Empty);
+					str1 = str1.Replace("\0", string.Empty);
 				}
+                if (str1.Contains("\\"))
+                {
+                    str1 = str1.Replace("\\", "\\\\");
+                }
+			    return str1.FilterControlChar();
 			}
-			return str;
+            return str;
 		}
 
 		public string FieldsToJson()

BenchmarkTests/Benchmark.csproj

@@ -73,7 +73,7 @@ public OperateResult Index(string index, string type, string indexKey, string js
 			Contract.Assert(!string.IsNullOrEmpty(index));
 			Contract.Assert(!string.IsNullOrEmpty(type));
 			Contract.Assert(!string.IsNullOrEmpty(jsonData));
-			Contract.Assert(!string.IsNullOrEmpty(indexKey));
+//			Contract.Assert(!string.IsNullOrEmpty(indexKey));
 
 			string url = "/{0}/{1}/{2}/".Fill(index.Trim().ToLower(), type.Trim(), indexKey);
 			//set parent-child relation
@@ -109,7 +109,7 @@ public bool PartialUpdate(string index, string type, string indexKey, string jso
             Contract.Assert(!string.IsNullOrEmpty(jsonData));
             Contract.Assert(!string.IsNullOrEmpty(indexKey));
 
-            var url = "/{0}/{1}/{2}/_update".Fill(index.Trim().ToLower(), type.Trim(), indexKey);
+            var url = "/{0}/{1}/{2}/_partial_update".Fill(index.Trim().ToLower(), type.Trim(), indexKey);
 
             //set parent-child relation
             if (!string.IsNullOrEmpty(routing))

BenchmarkTests/Benchmark.csproj.user

@@ -5,45 +5,48 @@
 
 namespace ElasticSearch.Client.Utils
 {
-	public static class ElasticSearchExtensions
-	{
-		public static string Fill(this string formatString, params object[] args)
-		{
-			Contract.Assert(formatString != null);
-			Contract.Assert(args != null);
-			return string.Format(formatString, args);
-		}
-		
-		/// <summary>
-		///  Resolve Lucene Keyword
-		/// </summary>
-		/// <param name="searchKeyword"></param>
-		/// <returns></returns>
-		public static string ReplaceLuceneKeywordChar(this string searchKeyword)
-		{
-			if(searchKeyword.Length==1)
-			{
-				if (searchKeyword.StartsWith("!"))
-				{
-					searchKeyword = "*";
-				}
-			}
+    public static class ElasticSearchExtensions
+    {
+        public static string Fill(this string formatString, params object[] args)
+        {
+            Contract.Assert(formatString != null);
+            Contract.Assert(args != null);
+            return string.Format(formatString, args);
+        }
+
+        /// <summary>
+        ///  Resolve Lucene Keyword
+        /// </summary>
+        /// <param name="searchKeyword"></param>
+        /// <returns></returns>
+        public static string ReplaceLuceneKeywordChar(this string searchKeyword)
+        {
+            if (searchKeyword.Length == 1)
+            {
+                if (searchKeyword.StartsWith("!"))
+                {
+                    searchKeyword = "*";
+                }
+            }
 
-			searchKeyword = searchKeyword.Replace(@"\", @"\\");
-			string strFilter = ":*?~!@^-+'\"\\{}[]()";
-			char[] arrFilterChar = strFilter.ToCharArray();
-			foreach (char c in arrFilterChar)
-			{
-				searchKeyword = searchKeyword.Replace("" + c, @"\" + c);
-			}
-			return searchKeyword;
-		}
+            searchKeyword = searchKeyword.Replace(@"\", @"\\");
+            string strFilter = ":*?~!@^-+'\"\\{}[]()";
+            char[] arrFilterChar = strFilter.ToCharArray();
+            foreach (char c in arrFilterChar)
+            {
+                searchKeyword = searchKeyword.Replace("" + c, @"\" + c);
+            }
+            return searchKeyword;
+        }
 
         public static void InitOrGetFacets(this SearchResult result)
         {
             if (result != null && !string.IsNullOrEmpty(result.Response))
             {
-                if (result._facets == null) { result._facets = new Dictionary<string, Dictionary<string, int>>(); }
+                if (result._facets == null)
+                {
+                    result._facets = new Dictionary<string, Dictionary<string, int>>();
+                }
                 var jobject = JObject.Parse(result.Response);
                 var facets = jobject["facets"];
                 foreach (JToken jToken in facets)
@@ -75,7 +78,7 @@ public static void InitOrGetFacets(this SearchResult result)
                         }
                         catch (System.Exception e)
                         {
-//                            logger.HandleException(e, "xxx_search_facets_json_parse_failure");
+                            //                            logger.HandleException(e, "xxx_search_facets_json_parse_failure");
                         }
                     }
 
@@ -86,6 +89,22 @@ public static void InitOrGetFacets(this SearchResult result)
                 }
             }
         }
-    
+
+        public static string FilterControlChar(this string controlStr)
+        {
+            var newArray = new char[controlStr.Length];
+            for (int i = 0; i < controlStr.Length; i++)
+            {
+                newArray[i] = controlStr[i];
+                if ((controlStr[i] >= 0 && controlStr[i] <= 31) || (controlStr[i] >= 127 && controlStr[i] <= 159))
+                {
+                    newArray[i] = (char) 0x20;
+                }
+            }
+
+            return new string(newArray);
+
+
+        }
     }
 }

BenchmarkTests/Config/ElasticSearch.config

@@ -46,6 +46,14 @@ public void AllInOne()
 
 			count = client.Count(app,  indexType, Conditional.Get(ExpressionEx.Between("age", 22, 23, true)));
 			Assert.AreEqual(2, count);
+            
+            //a coplex example
+            var cond1= Conditional.Get(ExpressionEx.Eq("name", "jack"))
+                .And(ExpressionEx.Between("age",22,30))
+                .And(ExpressionEx.Fuzzy("address","beijing",1.0f,4))
+                .And(ExpressionEx.Le("no",87));
+            Conditional cond2 = Conditional.Or(cond1, Conditional.Not(ExpressionEx.Eq("gender", "male")));
+            client.Search("index", "type", cond2.Query);
 
 
 		}