rainlance/ntpa
1
0
Fork 0
mirror of https://bitbucket.org/anguist/ntpa synced 2025-12-08 14:58:42 +00:00
Code Issues Releases Wiki Activity

SQL optimization and related stuff

Browse Source
This commit is contained in:
Carsten Larsen
2016-09-04 22:35:06 +02:00
parent 8af544a6b7
commit 2be720527e
15 changed files with 68 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Ntp.Analyzer.Data/Sql/AssociationEntryMapper.cs
+4 -1
View File
@@ -29,7 +29,10 @@ using Ntp.Data.Provider;
namespace Ntp.Analyzer.Data.Sql
{
public class AssociationEntryMapper : FilteredSqlDatabaseMapper<AssociationEntry>
/// <summary>
/// OR/M mapper for table associationEntry.
/// </summary>
public sealed class AssociationEntryMapper : SqlDatabaseMapper<AssociationEntry>
{
internal AssociationEntryMapper(LogBase log)
: base(log)
Ntp.Analyzer.Data/Sql/DriftReadingDatabaseMapper.cs
+1 -1
View File
@@ -29,7 +29,7 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// ORM mapper for table driftReading.
/// OR/M mapper for table driftReading.
/// </summary>
public sealed class DriftReadingDatabaseMapper : FilteredSqlDatabaseMapper<DriftReading>
{
Ntp.Analyzer.Data/Sql/FilteredSqlDatabaseMapper.cs
+33 -17
View File
@@ -22,9 +22,13 @@
using System;
using Ntp.Analyzer.Objects;
using Ntp.Common.Log;
using Ntp.Data.Provider;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// OR/M mapper for tables with a large amount of rows.
/// </summary>
public abstract class FilteredSqlDatabaseMapper<T> : SqlDatabaseMapper<T>
where T : PersistentObject
{
@@ -33,12 +37,6 @@ namespace Ntp.Analyzer.Data.Sql
{
}
/// <summary>
/// Gets or sets the primary key of the entity to extract.
/// </summary>
/// <value>The primary key.</value>
public int? FilterId { get; set; }
/// <summary>
/// Gets or sets the time to use when extracting data. Only readings with a timestamp
/// later than FilterTime gets extracted.
@@ -49,7 +47,6 @@ namespace Ntp.Analyzer.Data.Sql
/// <summary>
/// Gets or sets the host
/// </summary>
/// <remarks>Always set this property while using other filter properties</remarks>
/// <value>The host.</value>
public Host FilterHost { get; set; }
@@ -63,17 +60,36 @@ namespace Ntp.Analyzer.Data.Sql
{
string preparedSql = base.PrepareSql(sql);
if (FilterId != null)
{
preparedSql += " WHERE Id = " + FilterId;
}
else
{
if (FilterTime != null)
preparedSql += " WHERE time > '" + FilterTime.Value.ToString("yyyy-MM-dd HH:mm") + "'";
if (FilterTime == null && FilterHost == null && FilterPeer == null)
return preparedSql;
if (FilterHost != null)
preparedSql += " AND hostId = " + FilterHost.Id;
bool filterAdded = false;
preparedSql += " WHERE ";
if (FilterTime != null)
{
var time = FilterTime.Value.ToUniversalTime();
var datePart = SqlDatabaseFactory.Instance.DateAddMinutes("time", "zone");
preparedSql += $"{datePart} > \'{time.ToString("yyyy-MM-dd HH:mm:ss")}\'";
filterAdded = true;
}
if (filterAdded)
preparedSql += " AND ";
if (FilterHost != null)
{
preparedSql += $"hostId = {FilterHost.Id}";
filterAdded = true;
}
if (filterAdded)
preparedSql += " AND ";
if (FilterPeer != null)
{
preparedSql += $"peerId = {FilterPeer.Id}";
}
return preparedSql;
Ntp.Analyzer.Data/Sql/HostDatabaseMapper.cs
+1 -1
View File
@@ -28,7 +28,7 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// ORM mapper for table host.
/// OR/M mapper for table host.
/// </summary>
public sealed class HostDatabaseMapper : SqlDatabaseMapper<Host>
{
Ntp.Analyzer.Data/Sql/HostIoReadingDatabaseMapper.cs
+3
View File
@@ -29,6 +29,9 @@ using Ntp.Data.Provider;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// OR/M mapper for table hostIoReading.
/// </summary>
public sealed class HostIoReadingDatabaseMapper : FilteredSqlDatabaseMapper<HostIoReading>
{
internal HostIoReadingDatabaseMapper(HostDatabaseMapper hostMapper, LogBase log)
Ntp.Analyzer.Data/Sql/HostReadingDatabaseMapper.cs
+1 -1
View File
@@ -29,7 +29,7 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// ORM mapper for table hostReading.
/// OR/M mapper for table hostReading.
/// </summary>
public sealed class HostReadingDatabaseMapper : FilteredSqlDatabaseMapper<HostReading>
{
Ntp.Analyzer.Data/Sql/PeerActivityDatabaseMapper.cs
+4 -1
View File
@@ -27,7 +27,10 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
public class PeerActivityDatabaseMapper : SqlDatabaseMapper<PeerActivity>
/// <summary>
/// OR/M mapper for table peerActivity.
/// </summary>
public sealed class PeerActivityDatabaseMapper : SqlDatabaseMapper<PeerActivity>
{
internal PeerActivityDatabaseMapper(
HostDatabaseMapper hostMapper,
Ntp.Analyzer.Data/Sql/PeerDatabaseMapper.cs
+1 -1
View File
@@ -28,7 +28,7 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// ORM mapper for table peer.
/// OR/M mapper for table peer.
/// </summary>
public sealed class PeerDatabaseMapper : SqlDatabaseMapper<Peer>
{
Ntp.Analyzer.Data/Sql/PeerReadingDatabaseMapper.cs
+1 -1
View File
@@ -29,7 +29,7 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// ORM mapper for table peerReading.
/// OR/M mapper for table peerReading.
/// </summary>
public sealed class PeerReadingDatabaseMapper : FilteredSqlDatabaseMapper<PeerReading>
{
Ntp.Analyzer.Data/Sql/ReadingBulkMapper.cs
+4 -1
View File
@@ -26,7 +26,10 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
public class ReadingBulkMapper : SqlDatabaseMapper<ReadingBulk>
/// <summary>
/// OR/M mapper for ReadingBulk objects. Reading bulks are not persisted.
/// </summary>
public sealed class ReadingBulkMapper : SqlDatabaseMapper<ReadingBulk>
{
public ReadingBulkMapper(LogBase log)
: base(log)
Ntp.Analyzer.Data/Sql/SqlDatabaseMapper.cs
+1 -1
View File
@@ -34,7 +34,7 @@ using Ntp.Data.Provider;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// Base class for ORM mappers. Can be used for mapping object stored in sql databases.
/// Base class for OR/M mappers. Can be used for mapping objects stored in SQL databases.
/// </summary>
public abstract class SqlDatabaseMapper<T> : DataMapper<T>, ITableInitializer
where T : PersistentObject
Ntp.Analyzer.Data/Sql/TimeServerDatabaseMapper.cs
+1 -1
View File
@@ -30,7 +30,7 @@ using Ntp.Common.Log;
namespace Ntp.Analyzer.Data.Sql
{
/// <summary>
/// ORM mapper for table timeServer.
/// OR/M mapper for table timeServer.
/// </summary>
public sealed class TimeServerDatabaseMapper : SqlDatabaseMapper<TimeServer>
{
Ntp.Data.Provider/MySqlFactory.cs
+5
View File
@@ -73,6 +73,11 @@ namespace Ntp.Data.Provider
return new MySqlParameter(name, value);
}
public override string DateAddMinutes(string dateColumn, string minuteColumn)
{
return $"{dateColumn} + interval {minuteColumn} minute";
}
public override string PrepareCheckTableSql(string table)
{
return PrepareSql(string.Format(CheckTableSql, Config.Name, table));
Ntp.Data.Provider/PostgreSqlFactory.cs
+6 -8
View File
@@ -107,6 +107,11 @@ namespace Ntp.Data.Provider
return new NpgsqlParameter(name, value);
}
public override string DateAddMinutes(string dateColumn, string minuteColumn)
{
return $"{dateColumn} + {minuteColumn} * INTERVAL '1 minute'";
}
public override string PrepareCheckTableSql(string table)
{
return PrepareSql(string.Format(CheckTableSql, Config.Name, table));
@@ -150,14 +155,7 @@ namespace Ntp.Data.Provider
if (Config.ConnectionTimeout.HasValue)
b.Append($"Timeout={Config.ConnectionTimeout.Value};");
if (Config.EnableSsl)
{
b.Append(@"SslMode=Require;");
}
else
{
b.Append(@"SslMode=Disable;");
}
b.Append(Config.EnableSsl ? @"SslMode=Require;" : @"SslMode=Disable;");
if (Config.Protocol.HasValue)
b.Append($"Protocol={Config.Protocol.Value};");
Ntp.Data.Provider/SqlDatabaseFactory.cs
+2
View File
@@ -58,6 +58,8 @@ namespace Ntp.Data.Provider
public abstract void CreateDatabase();
public abstract string DateAddMinutes(string dateColumn, string minuteColumn);
public static void Initialize(IDatabaseConfiguration factoryConfiguration)
{
Config = factoryConfiguration;