Get API now uses pooled connections

Use pooled connections for threaded reads from API.

Author: Jesse Nicholson

DistillNET/DistillNET/DistillNET.nuspec

@@ -2,10 +2,10 @@
 <package >
   <metadata>
     <id>DistillNET</id>
-    <version>1.0.4</version>
+    <version>1.1.4</version>
     <title>DistillNET</title>
     <authors>TechnikEmpire</authors>
-	<releaseNotes>Bug fix release resolving an issue failing to commit transactions.</releaseNotes>
+	<releaseNotes>Modified in memory connection string, as well as filter lookup API, to enable threaded reads. Connections are now created on read (pooled) to comply with one transaction per connection.</releaseNotes>
     <owners>TechnikEmpire</owners>
 	<projectUrl>https://github.com/TechnikEmpire/DistillNET</projectUrl>
 	<requireLicenseAcceptance>true</requireLicenseAcceptance>

DistillNET/DistillNET/DistillNET/FilterDbCollection.cs

@@ -66,14 +66,14 @@ public FilterDbCollection(string dbAbsolutePath, bool overwrite = true, bool use
 
             if(useMemory)
             {
-                m_connection = new SQLiteConnection("Data Source=:memory:;Version=3;");
+                m_connection = new SQLiteConnection("FullUri=file::memory:?cache=shared;Version=3;");
             }
             else
             {
                 m_connection = new SQLiteConnection(string.Format("Data Source={0};Version=3;", dbAbsolutePath));
             }
 
-            m_connection.Flags = SQLiteConnectionFlags.NoConnectionPool | SQLiteConnectionFlags.NoConvertSettings | SQLiteConnectionFlags.NoVerifyTypeAffinity;
+            m_connection.Flags = SQLiteConnectionFlags.UseConnectionPool | SQLiteConnectionFlags.NoConvertSettings | SQLiteConnectionFlags.NoVerifyTypeAffinity;
             m_connection.Open();
 
             ConfigureDatabase();
@@ -361,41 +361,44 @@ private async Task<List<UrlFilter>> GetFiltersForDomain(string domain, bool isWh
 
             var allPossibleVariations = GetAllPossibleSubdomains(domain);
 
-            using(var tsx = m_connection.BeginTransaction())
-            using(var cmd = m_connection.CreateCommand())
+            using(var myConn = new SQLiteConnection(m_connection))
             {
-                switch(isWhitelist)
+                using(var tsx = myConn.BeginTransaction())
+                using(var cmd = myConn.CreateCommand())
                 {
-                    case true:
+                    switch(isWhitelist)
                     {
-                        cmd.CommandText = @"SELECT * from UrlFiltersIndex where Domains = $domainId AND IsWhitelist = 1";
-                    }
-                    break;
+                        case true:
+                        {
+                            cmd.CommandText = @"SELECT * from UrlFiltersIndex where Domains = $domainId AND IsWhitelist = 1";
+                        }
+                        break;
 
-                    default:
-                    {
-                        cmd.CommandText = @"SELECT * from UrlFiltersIndex where Domains = $domainId AND IsWhitelist = 0";
+                        default:
+                        {
+                            cmd.CommandText = @"SELECT * from UrlFiltersIndex where Domains = $domainId AND IsWhitelist = 0";
+                        }
+                        break;
                     }
-                    break;
-                }
-
-                var domainSumParam = new SQLiteParameter("$domainId", System.Data.DbType.String);
-                cmd.Parameters.Add(domainSumParam);
 
-                foreach(var sub in allPossibleVariations)
-                {
-                    cmd.Parameters[0].Value = sub;
+                    var domainSumParam = new SQLiteParameter("$domainId", System.Data.DbType.String);
+                    cmd.Parameters.Add(domainSumParam);
 
-                    using(var reader = await cmd.ExecuteReaderAsync())
+                    foreach(var sub in allPossibleVariations)
                     {
-                        while(await reader.ReadAsync())
+                        cmd.Parameters[0].Value = sub;
+
+                        using(var reader = await cmd.ExecuteReaderAsync())
                         {
-                            short catId = reader.GetInt16(1);
-                            retVal.Add((UrlFilter)m_ruleParser.ParseAbpFormattedRule(reader.GetString(3), catId));
+                            while(await reader.ReadAsync())
+                            {
+                                short catId = reader.GetInt16(1);
+                                retVal.Add((UrlFilter)m_ruleParser.ParseAbpFormattedRule(reader.GetString(3), catId));
+                            }
                         }
                     }
+                    tsx.Commit();
                 }
-                tsx.Commit();
             }
 
             return retVal;

DistillNET/DistillNET/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.4.0")]
-[assembly: AssemblyFileVersion("1.0.4.0")]
+[assembly: AssemblyVersion("1.1.4.0")]
+[assembly: AssemblyFileVersion("1.1.4.0")]