From 0cfbcea252e9bdf69dbd957d2ba70a933495ba51 Mon Sep 17 00:00:00 2001 From: Rasmus Date: Tue, 24 Dec 2024 14:23:23 +0100 Subject: [PATCH] Testing database compression. --- Backend/Handler/IpScanner.cs | 3 +- Backend/Handler/ThreadHandler.cs | 8 +- .../{Discarded.db => CompressedDatabases.db} | Bin 16384 -> 12288 bytes Models/Handler/DbHandler.cs | 76 +++++++++++++++++- Models/Helper/CompressionHelper.cs | 22 +++++ Models/Helper/GetDatabasesHelper.cs | 9 +++ RSE.sln.DotSettings.user | 2 + 7 files changed, 112 insertions(+), 8 deletions(-) rename Models/BackupDB/{Discarded.db => CompressedDatabases.db} (71%) create mode 100644 Models/Helper/CompressionHelper.cs create mode 100644 Models/Helper/GetDatabasesHelper.cs diff --git a/Backend/Handler/IpScanner.cs b/Backend/Handler/IpScanner.cs index c8d2943..c78a0bf 100644 --- a/Backend/Handler/IpScanner.cs +++ b/Backend/Handler/IpScanner.cs @@ -181,7 +181,8 @@ public class IpScanner _ = IPAddress.TryParse(ip.ToString(), out IPAddress? address); if (address is not null) { - responseCode = ping.Send(address, _timeout, buf, null).Status; + responseCode = IPStatus.TimedOut; //ping.Send(address, _timeout, buf, null).Status; + Thread.Sleep(1); } } catch diff --git a/Backend/Handler/ThreadHandler.cs b/Backend/Handler/ThreadHandler.cs index 784c270..78c8f2c 100644 --- a/Backend/Handler/ThreadHandler.cs +++ b/Backend/Handler/ThreadHandler.cs @@ -31,7 +31,7 @@ public class ThreadHandler public void Start() { Thread scanner = new(StartScanner); - Thread indexer = new(StartContentFilter); + //Thread indexer = new(StartContentFilter); Thread database = new(StartDbHandler); Thread discarded = new(StartDiscardedDbHandler); Thread filtered = new(StartFilteredDbHandler); @@ -39,7 +39,7 @@ public class ThreadHandler Thread communication = new(StartCommunicationHandler); scanner.Start(); - indexer.Start(); + //indexer.Start(); database.Start(); discarded.Start(); filtered.Start(); @@ -47,7 +47,7 @@ public class ThreadHandler communication.Start(); scanner.Join(); - indexer.Join(); + //indexer.Join(); database.Join(); discarded.Join(); filtered.Join(); @@ -101,7 +101,7 @@ public class ThreadHandler private void StartDiscardedDbHandler() { - WaitHandle[] wait = _dbHandler.Start(4); + WaitHandle[] wait = _dbHandler.Start(3); WaitHandle.WaitAll(wait); diff --git a/Models/BackupDB/Discarded.db b/Models/BackupDB/CompressedDatabases.db similarity index 71% rename from Models/BackupDB/Discarded.db rename to Models/BackupDB/CompressedDatabases.db index ddddc9979f78fde1e680425326563baed6d0730b..4a547900dda6905478f96200534182152e226a85 100644 GIT binary patch delta 191 zcmZo@U~EX3AkWLpfB?)Bbu77oTqeGU4E)A?4>vOk6!J~B;13FK^kQTeH#TN$vMxzX z%1L$3&n+lQEiO(?aY+OUBo?O@V-aF<4svx2aa9O$bnL+# zkrJn;Ux=%_YmkDUe~5x#sE>~h7pGECetGfaQ~Y|94fr`083;^LVA;%K@P{7&Z}~U3 delta 391 zcmZojXlP)ZAkWLfz`(!+#Ed}9F;T~om%odFiElCkzXji9-m@DEqj>}QyBM>@_4OH> zluHtma#D*6bCTjqQgaL9!Q6O53;`DBAXmo_SA`HqCm&Y@B@Fq=UHozqo&`#rA+8Z2 zI$WGeL8-+B`FX{u&iN^+lQ-~-PQK4Co5Ez!^-a9)pVmZIA`JS(2HJg>AE-z _discardedConnectionStrings = []; private const string InsertStatement = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" + @@ -74,6 +76,10 @@ public class DbHandler " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" + " INSERT INTO Resume (ThreadNumber, StartRange, EndRange, FirstByte, SecondByte, ThirdByte, FourthByte)" + " VALUES (@threadNumber, @startRange, @endRange, @firstByte, @secondByte, @thirdByte, @fourthByte);"; + + private const string InsertIntoCompressedDbConnectionString = "PRAGMA synchronous = OFF; PRAGMA temp_store = MEMORY;" + + " PRAGMA journal_mode = MEMORY; PRAGMA foreign_keys = off;" + + " INSERT INTO CompressedDatabases (DbNumber, Rows) VALUES (@dbNumber, @rows)"; private const string ReadUnfilteredStatement = "SELECT * FROM Unfiltered WHERE Id = @id;"; private const string ReadUnfilteredIdsStatement = "SELECT Id FROM Unfiltered WHERE Filtered == 0;"; @@ -95,6 +101,7 @@ public class DbHandler private bool _stop; private bool _pause; private bool _paused; + private bool _compressing; private int _contentWaitTime; private int _discardedWaitTime; @@ -120,6 +127,7 @@ public class DbHandler _discardedConnectionString = $"Data Source={basePath}/Models/Discarded.db"; _filteredConnectionString = $"Data Source={basePath}/Models/Filtered.db"; _resumeConnectionString = $"Data Source={basePath}/Models/ScannerResume.db"; + _CompressedConnectionString = $"Data Source={basePath}/Models/CompressedDatabases.db"; } public void SetContentWaitTime(int waitTime) @@ -236,7 +244,9 @@ public class DbHandler DiscardedDbHandlerSetting discardedDbHandlerSetting = (DiscardedDbHandlerSetting)obj; Console.WriteLine($"Discarded DbHandler started with thread: ({discardedDbHandlerSetting.ThreadId})"); - string connectionString = CreateDiscardedDb(discardedDbHandlerSetting.ThreadId); + (string absolutePath, string connectionString) = CreateDiscardedDb(discardedDbHandlerSetting.ThreadId); + + int i = 0; while (!_stop) { @@ -247,15 +257,60 @@ public class DbHandler continue; } + if (i == Random.Shared.Next(1_000_000, 10_000_000) || i >= 10_000_000 && !_compressing) + { + _compressing = true; + + i = 0; + + Console.WriteLine("Compressing"); + + InsertCompressedDatabase(discardedDbHandlerSetting.ThreadId, GetDiscardedIndexes()); + + int compressedDatabases = GetDatabasesHelper.GetTotalCompressedDatabases($"{_basePath}/Models"); + + CompressionHelper.CompressFile(absolutePath, $"{absolutePath}_{compressedDatabases}.gz"); + + DropAndCreateDiscarded(discardedDbHandlerSetting.ThreadId); + + _compressing = false; + } + _discardedQueue.TryDequeue(out Discarded queueItem); InsertDiscarded(queueItem, connectionString); + + i++; } discardedDbHandlerSetting.Handle!.Set(); Console.WriteLine("Discarded DbHandler stopped."); } + + private void DropAndCreateDiscarded(int threadNumber) + { + string databaseName = $"Data Source={_basePath}/Models/Discarded{threadNumber}.db"; + + const string createStatement = "CREATE TABLE IF NOT EXISTS Discarded (Id INTEGER NOT NULL, Ip1 INTEGER NOT NULL, Ip2 INTEGER NOT NULL, Ip3 INTEGER NOT NULL, Ip4 INTEGER NOT NULL, ResponseCode INTEGER NOT NULL, PRIMARY KEY(Id AUTOINCREMENT))"; + const string dropStatement = "DROP TABLE Discarded;"; + const string vacuum = "VACUUM;"; + + using SqliteConnection connection = new(databaseName); + connection.Open(); + + SqliteCommand command = new(dropStatement, connection); + command.ExecuteNonQuery(); + + command = new(vacuum, connection); + command.ExecuteNonQuery(); + + command = new(createStatement, connection); + command.ExecuteNonQuery(); + command.Dispose(); + + connection.Close(); + } private void InsertUnfiltered(Unfiltered unfiltered) { @@ -423,6 +478,20 @@ public class DbHandler _ = command.ExecuteNonQuery(); connection.Close(); } + + private void InsertCompressedDatabase(int threadNumber, long rows) + { + using SqliteConnection connection = new(_CompressedConnectionString); + connection.Open(); + + using SqliteCommand command = new(InsertIntoCompressedDbConnectionString, connection); + + command.Parameters.AddWithValue("@dbNumber", threadNumber); + command.Parameters.AddWithValue("@rows", rows); + + _ = command.ExecuteNonQuery(); + connection.Close(); + } private void UpdateUnfiltered(Unfiltered unfiltered) { @@ -732,8 +801,9 @@ public class DbHandler _paused = false; } - private string CreateDiscardedDb(int threadNumber) + private (string, string) CreateDiscardedDb(int threadNumber) { + string absolutePath = $"{_basePath}/Models/Discarded{threadNumber}.db"; string databaseName = $"Data Source={_basePath}/Models/Discarded{threadNumber}.db"; const string createStatement = "CREATE TABLE IF NOT EXISTS Discarded (Id INTEGER NOT NULL, Ip1 INTEGER NOT NULL, Ip2 INTEGER NOT NULL, Ip3 INTEGER NOT NULL, Ip4 INTEGER NOT NULL, ResponseCode INTEGER NOT NULL, PRIMARY KEY(Id AUTOINCREMENT))"; @@ -746,7 +816,7 @@ public class DbHandler using SqliteCommand command = new(createStatement, connection); command.ExecuteNonQuery(); - return databaseName; + return (absolutePath, databaseName); } public void Stop() diff --git a/Models/Helper/CompressionHelper.cs b/Models/Helper/CompressionHelper.cs new file mode 100644 index 0000000..319b9ff --- /dev/null +++ b/Models/Helper/CompressionHelper.cs @@ -0,0 +1,22 @@ +using System.IO.Compression; + +namespace Models.Helper; + +public static class CompressionHelper +{ + public static void CompressFile(string sourceFile, string targetFile) + { + using FileStream originalFileStream = new(sourceFile, FileMode.Open); + using FileStream compressedFileStream = File.Create($"{targetFile}.gz"); + using GZipStream compressor = new(compressedFileStream, CompressionLevel.Fastest); + originalFileStream.CopyTo(compressor); + } + + public static void DecompressFile(string sourceFile, string targetFile) + { + using FileStream compressedFileStream = new(sourceFile, FileMode.Open); + using FileStream decompressedFileStream = File.Create($"{targetFile}.gz"); + using GZipStream decompressor = new(compressedFileStream, CompressionMode.Decompress); + decompressor.CopyTo(decompressedFileStream); + } +} \ No newline at end of file diff --git a/Models/Helper/GetDatabasesHelper.cs b/Models/Helper/GetDatabasesHelper.cs new file mode 100644 index 0000000..10051ab --- /dev/null +++ b/Models/Helper/GetDatabasesHelper.cs @@ -0,0 +1,9 @@ +namespace Models.Helper; + +public static class GetDatabasesHelper +{ + public static int GetTotalCompressedDatabases(string path) + { + return Directory.GetFiles(path, "*.gz").Length; + } +} \ No newline at end of file diff --git a/RSE.sln.DotSettings.user b/RSE.sln.DotSettings.user index 37aa8f6..60eba06 100644 --- a/RSE.sln.DotSettings.user +++ b/RSE.sln.DotSettings.user @@ -4,8 +4,10 @@ ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded + ForceIncluded ForceIncluded ForceIncluded ForceIncluded \ No newline at end of file