Work with LiteDB has been improved

Sergey · Sergey · commit b8aa00dc2793 · 2017-02-09T16:04:52.000+03:00
diff --git a/JMeterTests/StressTest_PollCounters_TestService.jmx b/JMeterTests/StressTest_PollCounters_TestService.jmx
@@ -15,12 +15,12 @@
         <collectionProp name="Arguments.arguments">
           <elementProp name="host_url" elementType="Argument">
             <stringProp name="Argument.name">host_url</stringProp>
-            <stringProp name="Argument.value">perfon.1gb.ru</stringProp>
+            <stringProp name="Argument.value">localhost</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="host_port" elementType="Argument">
             <stringProp name="Argument.name">host_port</stringProp>
-            <stringProp name="Argument.value">80</stringProp>
+            <stringProp name="Argument.value">8010</stringProp>
             <stringProp name="Argument.metadata">=</stringProp>
           </elementProp>
           <elementProp name="api_prefix" elementType="Argument">
diff --git a/Perfon.Core/PerfCounterStorages/IPerfomanceCountersStorage.cs b/Perfon.Core/PerfCounterStorages/IPerfomanceCountersStorage.cs
@@ -25,7 +25,7 @@ public interface IPerfomanceCountersStorage
         /// <param name="counterName"></param>
         /// <param name="date"></param>
         /// <returns></returns>
-        Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null);
+        Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip = 0);
 
         /// <summary>
         /// Get list of names of all perf counters in the storage
diff --git a/Perfon.Core/PerfCounterStorages/PerfCounterCSVFileStorage.cs b/Perfon.Core/PerfCounterStorages/PerfCounterCSVFileStorage.cs
@@ -72,7 +72,7 @@ public async Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)
             }
         }
 
-        public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null)
+        public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip=0)
         {
             var list = new List<PerfCounterValue>();
 
diff --git a/Perfon.Core/PerfCounterStorages/PerfCounterInMemoryCacheStorage.cs b/Perfon.Core/PerfCounterStorages/PerfCounterInMemoryCacheStorage.cs
@@ -101,7 +101,7 @@ public async Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)
             }
         }
 
-        public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null)
+        public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip = 0)
         {
             if (!date.HasValue)
             {
diff --git a/Perfon.Core/PerfCounterStorages/PerfCounterLiteDbStorage.cs b/Perfon.Core/PerfCounterStorages/PerfCounterLiteDbStorage.cs
@@ -45,36 +45,37 @@ public Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)
 
                 using (var db = new LiteDatabase(PathToDbFolder + dbName))
                 {
-                    // Get customer collection
-                    foreach (var counter in counters)
+                    using (var trans = db.BeginTrans())
                     {
-                        try
+                        // Get customer collection
+                        foreach (var counter in counters)
                         {
-                            var countersColl = db.GetCollection<PerfCounterValue>(counter.Name.GetHashCode().ToString());
-                            var names = db.GetCollection("CounterNames");
-
-                            // Index document using a document property
-                            //countersColl.EnsureIndex("Timestamp", true);
-
-                            var id = names.Find(Query.EQ("Name", counter.Name)).FirstOrDefault();
-                            if (id == null)
+                            try
                             {
-                                var doc = new BsonDocument();
-                                doc.Add("Name", counter.Name);
-                                names.Insert(doc);
-                            }
+                                var countersColl = db.GetCollection<PerfCounterValue>(counter.Name.GetHashCode().ToString());
+                                var names = db.GetCollection("CounterNames");
 
-                            var item = new PerfCounterValue(now, counter.Value);
+                                var id = names.Find(Query.EQ("Name", counter.Name)).FirstOrDefault();
+                                if (id == null)
+                                {
+                                    var doc = new BsonDocument();
+                                    doc.Add("Name", counter.Name);
+                                    names.Insert(doc);
+                                }
 
-                            countersColl.Insert(item);
-                        }
-                        catch (Exception exc)
-                        {
-                            if (OnError != null)
+                                var item = new PerfCounterValue(now, counter.Value);
+
+                                countersColl.Insert(item);
+                            }
+                            catch (Exception exc)
                             {
-                                OnError(new object(), new ErrorEventArgs(exc.ToString()));
+                                if (OnError != null)
+                                {
+                                    OnError(new object(), new ErrorEventArgs(exc.ToString()));
+                                }
                             }
                         }
+                        trans.Commit();
                     }
                 }
             }
@@ -89,7 +90,7 @@ public Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)
             return Task.Delay(0);
         }
 
-        public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null)
+        public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip=0)
         {
             var list = new List<PerfCounterValue>();
 
@@ -102,14 +103,15 @@ public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName
 
             try
             {
-                var dbName = GetDbName(date.Value);
-
-                using (var db = new LiteDatabase(PathToDbFolder+dbName))
+                using (var db = new LiteDatabase(GetDbReadOnlyName(date.Value)))
                 {
-                    var countersColl = db.GetCollection<PerfCounterValue>(counterName.GetHashCode().ToString());
-
-                    list = countersColl.FindAll().Where(a => a.Timestamp.Date == date).ToList();
+                    list = db.Engine.Find(counterName.GetHashCode().ToString(), Query.GTE("Timestamp", new BsonValue(date)), skip).Select(a =>
+                        {
+                            return new PerfCounterValue(a["Timestamp"].AsDateTime, (float)a["Value"].AsDouble);
+                        }).ToList();
 
+                    //var countersColl = db.GetCollection<PerfCounterValue>(counterName.GetHashCode().ToString());
+                    //list = countersColl.FindAll().Where(a => a.Timestamp.Date == date).ToList();
                 }
             }
             catch (Exception exc)
@@ -135,14 +137,10 @@ public Task<IEnumerable<string>> GetCountersList()
 
                 using (var db = new LiteDatabase(PathToDbFolder + dbName))
                 {
-                    // Get customer collection
-                    var names = db.GetCollection("CounterNames");
-
-                    // Index document using a document property
-                    //countersColl.EnsureIndex("Timestamp", true);
-
-                    res = names.FindAll().Select(a => a["Name"].AsString).ToList();
+                    //var names = db.GetCollection("CounterNames");
+                    //res = names.FindAll().Select(a => a["Name"].AsString).ToList();
 
+                    res = db.Engine.FindAll("CounterNames").Select(a => a["Name"].AsString).ToList();
                 }
             }
             catch (Exception exc)
@@ -164,7 +162,12 @@ private static string GetDbName(DateTime now)
         {
             return "perfCounters_" + now.ToString("yyyy-MM-dd") + ".litedb";
         }
+        private string GetDbReadOnlyName(DateTime date)
+        {
+            return "Filename=" + PathToDbFolder + GetDbName(date) + ";Mode=ReadOnly;Timeout=" + TimeSpan.FromSeconds(30);
+        }
 
         
+        
     }
 }
diff --git a/Perfon.Core/Perfon.Core.nuspec b/Perfon.Core/Perfon.Core.nuspec
@@ -9,7 +9,7 @@
     <projectUrl>http://perfon.1gb.ru/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>First stable release</releaseNotes>
+    <releaseNotes>Dashboard bug fix</releaseNotes>
     <copyright>$copyright$</copyright>
     <tags>Performance Monitoring .Net </tags>
   </metadata>
diff --git a/Perfon.Core/Properties/AssemblyInfo.cs b/Perfon.Core/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.w.0")]
diff --git a/Perfon.WebApi/Controllers/PerfCountersController.cs b/Perfon.WebApi/Controllers/PerfCountersController.cs
@@ -20,7 +20,7 @@ namespace Perfon.WebApi
     public class PerfCountersController : ApiController
     {
         readonly string keyList = "PerfListCounters";
-            
+
 
         public IPerfomanceCountersStorage Db
         {
@@ -36,16 +36,16 @@ public IPerfomanceCountersStorage Db
         /// Get counters list
         /// </summary>
         /// <returns></returns>
-        [Route("api/perfcounters")]        
+        [Route("api/perfcounters")]
         public async Task<IHttpActionResult> Get()
         {
             var res = MemoryCache.Default.Get(keyList) as IEnumerable<string>;
 
-            if (res == null)
+            if (res == null || res.Count() <= 0)
             {
                 // Not the best solution. Use Lazy here??
                 res = await Db.GetCountersList();
-                MemoryCache.Default.Add(keyList, res, new DateTimeOffset(DateTime.Now.AddSeconds(10)));
+                MemoryCache.Default.Add(keyList, res, new DateTimeOffset(DateTime.Now.AddSeconds(60)));
             }
 
             return Ok(res);
@@ -59,19 +59,25 @@ public async Task<IHttpActionResult> Get()
         [Route("api/perfcounters")] ///{*name}
         public async Task<IHttpActionResult> Get([FromUri]string name, [FromUri]DateTime? date = null, [FromUri]int? skip = null)
         {
-            string key = name+date.GetHashCode();
+            int skip2 = 0;
+            if (skip.HasValue)
+            {
+                skip2 = skip.Value;
+            }
+
+            string key = name + date.GetHashCode();
             var res = MemoryCache.Default.Get(key) as IEnumerable<PerfCounterValue>;
 
             if (res == null)
             {
                 // Not the best solution. Use Lazy here??
                 res = await Db.QueryCounterValues(name, date);
-                MemoryCache.Default.Add(key, res, new DateTimeOffset(DateTime.Now.AddSeconds(2)));
+                MemoryCache.Default.Add(key, res, new DateTimeOffset(DateTime.Now.AddSeconds(3)));
             }
 
-            if (res != null && skip.HasValue)
+            if (res != null && skip2 > 0)
             {
-                res = res.Skip(skip.Value);
+                res = res.Skip(skip2).ToList();
             }
 
             return Ok(res);
diff --git a/Perfon.WebApi/Perfon.WebApi.nuspec b/Perfon.WebApi/Perfon.WebApi.nuspec
@@ -9,7 +9,7 @@
     <projectUrl>http://perfon.1gb.ru/</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>$description$</description>
-    <releaseNotes>First stable release</releaseNotes>
+    <releaseNotes>Dashboard bug fix</releaseNotes>
     <copyright>$copyright$</copyright>
     <tags>Performance Monitoring Web Api .Net </tags>
 	<dependencies>
diff --git a/Perfon.WebApi/Properties/AssemblyInfo.cs b/Perfon.WebApi/Properties/AssemblyInfo.cs
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.1.0")]
-[assembly: AssemblyFileVersion("1.0.1.0")]
+[assembly: AssemblyVersion("1.0.2.0")]
+[assembly: AssemblyFileVersion("1.0.2.0")]
diff --git a/TestServer/Global.asax.cs b/TestServer/Global.asax.cs
@@ -30,7 +30,7 @@ protected void Application_Start()
             PerfMonitor.RegisterLiteDbStorage(AppDomain.CurrentDomain.BaseDirectory + "\\" + ConfigurationManager.AppSettings["DB_Path"]);
             PerfMonitor.OnError += (a, b) => 
             {                
-                File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + "\\errors.log", DateTime.Now.ToString()+" "+ b.Message);
+                File.AppendAllText(AppDomain.CurrentDomain.BaseDirectory + "\\errors.log", "\n"+DateTime.Now.ToString()+" "+ b.Message);
                 Console.WriteLine("PerfLibForWebApi:" + b.Message);
             };
             var thr1 = new ThresholdMaxNotification(500);
diff --git a/TestServer/TestServer.csproj b/TestServer/TestServer.csproj
@@ -5,7 +5,7 @@
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <ProjectGuid>{B64FB6A5-7477-4485-9FA2-742DB69C11EE}</ProjectGuid>
-    <ProjectTypeGuids>{E3E379DF-F4C6-4180-9B81-6769533ABE47};{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
+    <ProjectTypeGuids>{349c5851-65df-11da-9384-00065b846f21};{fae04ec0-301f-11d3-bf4b-00c04f79efbc}</ProjectTypeGuids>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>TestServer</RootNamespace>

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ public async Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)`
`72`	`72`	`}`
`73`	`73`	`}`
`74`	`74`
`75`		`- public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null)`
	`75`	`+ public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip=0)`
`76`	`76`	`{`
`77`	`77`	`var list = new List<PerfCounterValue>();`
`78`	`78`
Original file line number	Diff line number	Diff line change
`@@ -101,7 +101,7 @@ public async Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)`
`101`	`101`	`}`
`102`	`102`	`}`
`103`	`103`
`104`		`- public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null)`
	`104`	`+ public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip = 0)`
`105`	`105`	`{`
`106`	`106`	`if (!date.HasValue)`
`107`	`107`	`{`
Original file line number	Diff line number	Diff line change
`@@ -45,36 +45,37 @@ public Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)`
`45`	`45`
`46`	`46`	`using (var db = new LiteDatabase(PathToDbFolder + dbName))`
`47`	`47`	`{`
`48`		`- // Get customer collection`
`49`		`- foreach (var counter in counters)`
	`48`	`+ using (var trans = db.BeginTrans())`
`50`	`49`	`{`
`51`		`- try`
	`50`	`+ // Get customer collection`
	`51`	`+ foreach (var counter in counters)`
`52`	`52`	`{`
`53`		`- var countersColl = db.GetCollection<PerfCounterValue>(counter.Name.GetHashCode().ToString());`
`54`		`- var names = db.GetCollection("CounterNames");`
`55`		`-`
`56`		`- // Index document using a document property`
`57`		`- //countersColl.EnsureIndex("Timestamp", true);`
`58`		`-`
`59`		`- var id = names.Find(Query.EQ("Name", counter.Name)).FirstOrDefault();`
`60`		`- if (id == null)`
	`53`	`+ try`
`61`	`54`	`{`
`62`		`- var doc = new BsonDocument();`
`63`		`- doc.Add("Name", counter.Name);`
`64`		`- names.Insert(doc);`
`65`		`- }`
	`55`	`+ var countersColl = db.GetCollection<PerfCounterValue>(counter.Name.GetHashCode().ToString());`
	`56`	`+ var names = db.GetCollection("CounterNames");`
`66`	`57`
`67`		`- var item = new PerfCounterValue(now, counter.Value);`
	`58`	`+ var id = names.Find(Query.EQ("Name", counter.Name)).FirstOrDefault();`
	`59`	`+ if (id == null)`
	`60`	`+ {`
	`61`	`+ var doc = new BsonDocument();`
	`62`	`+ doc.Add("Name", counter.Name);`
	`63`	`+ names.Insert(doc);`
	`64`	`+ }`
`68`	`65`
`69`		`- countersColl.Insert(item);`
`70`		`- }`
`71`		`- catch (Exception exc)`
`72`		`- {`
`73`		`- if (OnError != null)`
	`66`	`+ var item = new PerfCounterValue(now, counter.Value);`
	`67`	`+`
	`68`	`+ countersColl.Insert(item);`
	`69`	`+ }`
	`70`	`+ catch (Exception exc)`
`74`	`71`	`{`
`75`		`- OnError(new object(), new ErrorEventArgs(exc.ToString()));`
	`72`	`+ if (OnError != null)`
	`73`	`+ {`
	`74`	`+ OnError(new object(), new ErrorEventArgs(exc.ToString()));`
	`75`	`+ }`
`76`	`76`	`}`
`77`	`77`	`}`
	`78`	`+ trans.Commit();`
`78`	`79`	`}`
`79`	`80`	`}`
`80`	`81`	`}`
`@@ -89,7 +90,7 @@ public Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)`
`89`	`90`	`return Task.Delay(0);`
`90`	`91`	`}`
`91`	`92`
`92`		`- public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null)`
	`93`	`+ public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName, DateTime? date = null, int skip=0)`
`93`	`94`	`{`
`94`	`95`	`var list = new List<PerfCounterValue>();`
`95`	`96`
`@@ -102,14 +103,15 @@ public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName`
`102`	`103`
`103`	`104`	`try`
`104`	`105`	`{`
`105`		`- var dbName = GetDbName(date.Value);`
`106`		`-`
`107`		`- using (var db = new LiteDatabase(PathToDbFolder+dbName))`
	`106`	`+ using (var db = new LiteDatabase(GetDbReadOnlyName(date.Value)))`
`108`	`107`	`{`
`109`		`- var countersColl = db.GetCollection<PerfCounterValue>(counterName.GetHashCode().ToString());`
`110`		`-`
`111`		`- list = countersColl.FindAll().Where(a => a.Timestamp.Date == date).ToList();`
	`108`	`+ list = db.Engine.Find(counterName.GetHashCode().ToString(), Query.GTE("Timestamp", new BsonValue(date)), skip).Select(a =>`
	`109`	`+ {`
	`110`	`+ return new PerfCounterValue(a["Timestamp"].AsDateTime, (float)a["Value"].AsDouble);`
	`111`	`+ }).ToList();`
`112`	`112`
	`113`	`+ //var countersColl = db.GetCollection<PerfCounterValue>(counterName.GetHashCode().ToString());`
	`114`	`+ //list = countersColl.FindAll().Where(a => a.Timestamp.Date == date).ToList();`
`113`	`115`	`}`
`114`	`116`	`}`
`115`	`117`	`catch (Exception exc)`
`@@ -135,14 +137,10 @@ public Task<IEnumerable<string>> GetCountersList()`
`135`	`137`
`136`	`138`	`using (var db = new LiteDatabase(PathToDbFolder + dbName))`
`137`	`139`	`{`
`138`		`- // Get customer collection`
`139`		`- var names = db.GetCollection("CounterNames");`
`140`		`-`
`141`		`- // Index document using a document property`
`142`		`- //countersColl.EnsureIndex("Timestamp", true);`
`143`		`-`
`144`		`- res = names.FindAll().Select(a => a["Name"].AsString).ToList();`
	`140`	`+ //var names = db.GetCollection("CounterNames");`
	`141`	`+ //res = names.FindAll().Select(a => a["Name"].AsString).ToList();`
`145`	`142`
	`143`	`+ res = db.Engine.FindAll("CounterNames").Select(a => a["Name"].AsString).ToList();`
`146`	`144`	`}`
`147`	`145`	`}`
`148`	`146`	`catch (Exception exc)`
`@@ -164,7 +162,12 @@ private static string GetDbName(DateTime now)`
`164`	`162`	`{`
`165`	`163`	`return "perfCounters_" + now.ToString("yyyy-MM-dd") + ".litedb";`
`166`	`164`	`}`
	`165`	`+ private string GetDbReadOnlyName(DateTime date)`
	`166`	`+ {`
	`167`	`+ return "Filename=" + PathToDbFolder + GetDbName(date) + ";Mode=ReadOnly;Timeout=" + TimeSpan.FromSeconds(30);`
	`168`	`+ }`
`167`	`169`
`168`	`170`
	`171`	`+`
`169`	`172`	`}`
`170`	`173`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ namespace Perfon.WebApi`
`20`	`20`	`public class PerfCountersController : ApiController`
`21`	`21`	`{`
`22`	`22`	`readonly string keyList = "PerfListCounters";`
`23`		`-`
	`23`	`+`
`24`	`24`
`25`	`25`	`public IPerfomanceCountersStorage Db`
`26`	`26`	`{`
`@@ -36,16 +36,16 @@ public IPerfomanceCountersStorage Db`
`36`	`36`	`/// Get counters list`
`37`	`37`	`/// </summary>`
`38`	`38`	`/// <returns></returns>`
`39`		`- [Route("api/perfcounters")]`
	`39`	`+ [Route("api/perfcounters")]`
`40`	`40`	`public async Task<IHttpActionResult> Get()`
`41`	`41`	`{`
`42`	`42`	`var res = MemoryCache.Default.Get(keyList) as IEnumerable<string>;`
`43`	`43`
`44`		`- if (res == null)`
	`44`	`+ if (res == null \|\| res.Count() <= 0)`
`45`	`45`	`{`
`46`	`46`	`// Not the best solution. Use Lazy here??`
`47`	`47`	`res = await Db.GetCountersList();`
`48`		`- MemoryCache.Default.Add(keyList, res, new DateTimeOffset(DateTime.Now.AddSeconds(10)));`
	`48`	`+ MemoryCache.Default.Add(keyList, res, new DateTimeOffset(DateTime.Now.AddSeconds(60)));`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`return Ok(res);`
`@@ -59,19 +59,25 @@ public async Task<IHttpActionResult> Get()`
`59`	`59`	`[Route("api/perfcounters")] ///{*name}`
`60`	`60`	`public async Task<IHttpActionResult> Get([FromUri]string name, [FromUri]DateTime? date = null, [FromUri]int? skip = null)`
`61`	`61`	`{`
`62`		`- string key = name+date.GetHashCode();`
	`62`	`+ int skip2 = 0;`
	`63`	`+ if (skip.HasValue)`
	`64`	`+ {`
	`65`	`+ skip2 = skip.Value;`
	`66`	`+ }`
	`67`	`+`
	`68`	`+ string key = name + date.GetHashCode();`
`63`	`69`	`var res = MemoryCache.Default.Get(key) as IEnumerable<PerfCounterValue>;`
`64`	`70`
`65`	`71`	`if (res == null)`
`66`	`72`	`{`
`67`	`73`	`// Not the best solution. Use Lazy here??`
`68`	`74`	`res = await Db.QueryCounterValues(name, date);`
`69`		`- MemoryCache.Default.Add(key, res, new DateTimeOffset(DateTime.Now.AddSeconds(2)));`
	`75`	`+ MemoryCache.Default.Add(key, res, new DateTimeOffset(DateTime.Now.AddSeconds(3)));`
`70`	`76`	`}`
`71`	`77`
`72`		`- if (res != null && skip.HasValue)`
	`78`	`+ if (res != null && skip2 > 0)`
`73`	`79`	`{`
`74`		`- res = res.Skip(skip.Value);`
	`80`	`+ res = res.Skip(skip2).ToList();`
`75`	`81`	`}`
`76`	`82`
`77`	`83`	`return Ok(res);`