Fix work with LiteDB

Author: Sergey

JMeterTests/!run_stressTest_poll_couters.bat

@@ -1,7 +1,7 @@
 
 SET PRJ_PATH=%CD%
 
-"c:\Program Files (x86)\JMeter\bin\jmeter" -e -n -t %PRJ_PATH%\StressTest_PollCounters_TestService.jmx -l %PRJ_PATH%\StressTest_PollCounters_TestService_res.jtl
+"c:\Program Files (x86)\JMeter\bin\jmeter" -e -n -t %PRJ_PATH%\StressTest_PollCounters_TestService.jmx -l %PRJ_PATH%\StressTest_PollCounters_TestService_res2.jtl
 
 rem  -l %PRJ_PATH%\test.jtl
 

Perfon.Core/PerfCounterStorages/PerfCounterLiteDbStorage.cs

@@ -43,7 +43,7 @@ public Task StorePerfCounters(IEnumerable<IPerfCounterData> counters)
 
                 var dbName = GetDbName(now);
 
-                using (var db = new LiteDatabase(PathToDbFolder + dbName))
+                using (var db = new LiteDatabase(dbName))
                 {
                     using (var trans = db.BeginTrans())
                     {
@@ -105,13 +105,13 @@ public Task<IEnumerable<PerfCounterValue>> QueryCounterValues(string counterName
             {
                 using (var db = new LiteDatabase(GetDbReadOnlyName(date.Value)))
                 {
-                    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();
+                    //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();
+                    var countersColl = db.GetCollection<PerfCounterValue>(counterName.GetHashCode().ToString());
+                    list = countersColl.FindAll().Where(a => a.Timestamp.Date == date).ToList();
                 }
             }
             catch (Exception exc)
@@ -133,14 +133,12 @@ public Task<IEnumerable<string>> GetCountersList()
             {
                 var now = DateTime.Now;
 
-                var dbName = GetDbName(now);
-
-                using (var db = new LiteDatabase(PathToDbFolder + dbName))
+                using (var db = new LiteDatabase(GetDbReadOnlyName(now)))
                 {
-                    //var names = db.GetCollection("CounterNames");
-                    //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();
+                    //res = db.Engine.FindAll("CounterNames").Select(a => a["Name"].AsString).ToList();
                 }
             }
             catch (Exception exc)
@@ -158,13 +156,21 @@ public Task<IEnumerable<string>> GetCountersList()
 
 
 
-        private static string GetDbName(DateTime now)
+        private string GetDbName(DateTime now)
         {
-            return "perfCounters_" + now.ToString("yyyy-MM-dd") + ".litedb";
+            return PathToDbFolder + "perfCounters_" + now.ToString("yyyy-MM-dd") + ".litedb";
         }
         private string GetDbReadOnlyName(DateTime date)
         {
-            return "Filename=" + PathToDbFolder + GetDbName(date) + ";Mode=ReadOnly;Timeout=" + TimeSpan.FromSeconds(30);
+            //return  GetDbName(date);
+
+            string journal = "";
+            if (date.Date != DateTime.Now.Date)
+            {
+                journal = ";Journal=false";
+            }
+            //;Mode=ReadOnly
+            return "Filename=" + GetDbName(date) + journal + ";Mode=ReadOnly";//;Timeout=" + TimeSpan.FromSeconds(30);
         }
 
 

Perfon.WebApi/Controllers/PerfCountersController.cs

@@ -68,7 +68,7 @@ public async Task<IHttpActionResult> Get([FromUri]string name, [FromUri]DateTime
             string key = name + date.GetHashCode();
             var res = MemoryCache.Default.Get(key) as IEnumerable<PerfCounterValue>;
 
-            if (res == null)
+            if (res == null || res.Count() <= 0)
             {
                 // Not the best solution. Use Lazy here??
                 res = await Db.QueryCounterValues(name, date);