JDierkse/DataStorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add Timed Logging

Browse Source
This commit is contained in:
JDierkse
2020-06-10 10:21:11 +02:00
parent c6e21456cc
commit f1e6e298a4
7 changed files with 229 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
DataStorage/DataStorageClient.cpp
+21 -21
View File
@@ -1,14 +1,11 @@
#include "DataStorageClient.h"
#include "DataId.h"
#include <MySQLClient.h>
#include <sstream>
#include "DataStorageClientImpl.h"
namespace DataStorage {
DataStorageClient::DataStorageClient(const std::shared_ptr<MySQL::MySQLClient>& pMySQLClient, const std::string& table) :
m_pMySQLClient(pMySQLClient),
m_table(table)
m_pDataStorageClientImpl(new DataStorageClientImpl(pMySQLClient, table))
{
}
@@ -18,29 +15,32 @@ DataStorageClient::~DataStorageClient()
void DataStorageClient::LogValue(int deviceId, const std::string& dataName, int timestamp, int value)
{
int dataId = DataId(dataName).Id();
std::stringstream query;
query << "INSERT INTO `" << m_table << "` (device_id, data_id, timestamp, value) VALUES (" << deviceId << "," << dataId << ",FROM_UNIXTIME(" << timestamp << ")," << value << ");";
m_pMySQLClient->Execute(query.str());
m_pDataStorageClientImpl->LogValue(deviceId, dataName, timestamp, value);
}
void DataStorageClient::LogValue(int deviceId, const std::string& dataName, int timestamp, double value)
{
int dataId = DataId(dataName).Id();
std::stringstream query;
query << "INSERT INTO `" << m_table << "` (device_id, data_id, timestamp, value) VALUES (" << deviceId << "," << dataId << ",FROM_UNIXTIME(" << timestamp << ")," << value << ");";
m_pMySQLClient->Execute(query.str());
m_pDataStorageClientImpl->LogValue(deviceId, dataName, timestamp, value);
}
void DataStorageClient::LogValue(int deviceId, const std::string& dataName, int timestamp, const std::string& value)
{
int dataId = DataId(dataName).Id();
std::stringstream query;
query << "INSERT INTO `" << m_table << "` (device_id, data_id, timestamp, value) VALUES (" << deviceId << "," << dataId << ",FROM_UNIXTIME(" << timestamp << "),\"" << value << "\");";
m_pMySQLClient->Execute(query.str());
m_pDataStorageClientImpl->LogValue(deviceId, dataName, timestamp, value);
}
} // namespace DataStorageClientImpl
void DataStorageClient::LogValueTimed(int deviceId, const std::string& dataName, int value)
{
m_pDataStorageClientImpl->LogValueTimed(deviceId, dataName, value);
}
void DataStorageClient::LogValueTimed(int deviceId, const std::string& dataName, double value)
{
m_pDataStorageClientImpl->LogValueTimed(deviceId, dataName, value);
}
void DataStorageClient::LogValueTimed(int deviceId, const std::string& dataName, const std::string& value)
{
m_pDataStorageClientImpl->LogValueTimed(deviceId, dataName, value);
}
} // namespace DataStorage
DataStorage/DataStorageClientImpl.cpp
+89
View File
@@ -0,0 +1,89 @@
#include "DataStorageClientImpl.h"
#include "DataId.h"
#include <DateTime.h>
#include <MySQLClient.h>
#include <sstream>
namespace DataStorage {
DataStorageClientImpl::DataStorageClientImpl(const std::shared_ptr<MySQL::MySQLClient>& pMySQLClient, const std::string& table) :
m_pMySQLClient(pMySQLClient),
m_table(table),
m_metronome(Timer::Metronome::Quantity::Minutes, 5)
{
m_metronome.Connect(std::bind(&DataStorageClientImpl::MetronomeCallback, this));
}
DataStorageClientImpl::~DataStorageClientImpl()
{
}
void DataStorageClientImpl::LogValue(int deviceId, const std::string& dataName, int timestamp, int value)
{
int dataId = DataId(dataName).Id();
WriteValue(Device_Data(deviceId, dataId), timestamp, value);
}
void DataStorageClientImpl::LogValue(int deviceId, const std::string& dataName, int timestamp, double value)
{
int dataId = DataId(dataName).Id();
WriteValue(Device_Data(deviceId, dataId), timestamp, value);
}
void DataStorageClientImpl::LogValue(int deviceId, const std::string& dataName, int timestamp, const std::string& value)
{
int dataId = DataId(dataName).Id();
WriteValue(Device_Data(deviceId, dataId), timestamp, value);
}
void DataStorageClientImpl::LogValueTimed(int deviceId, const std::string& dataName, int value)
{
std::unique_lock<std::mutex> lock(m_mutex);
m_integerValues[Device_Data(deviceId, DataId(dataName).Id())] = value;
}
void DataStorageClientImpl::LogValueTimed(int deviceId, const std::string& dataName, double value)
{
std::unique_lock<std::mutex> lock(m_mutex);
m_doubleValues[Device_Data(deviceId, DataId(dataName).Id())] = value;
}
void DataStorageClientImpl::LogValueTimed(int deviceId, const std::string& dataName, const std::string& value)
{
std::unique_lock<std::mutex> lock(m_mutex);
m_stringValues[Device_Data(deviceId, DataId(dataName).Id())] = value;
}
void DataStorageClientImpl::MetronomeCallback()
{
int timestamp = DateTime::GetTimestamp();
std::unique_lock<std::mutex> lock(m_mutex);
ProcessValueMap(m_integerValues, timestamp);
ProcessValueMap(m_doubleValues, timestamp);
ProcessValueMap(m_stringValues, timestamp);
}
void DataStorageClientImpl::WriteValue(const Device_Data& device_data, int timestamp, int value)
{
std::stringstream query;
query << "INSERT INTO `" << m_table << "` (device_id, data_id, timestamp, value) VALUES (" << device_data.DeviceId() << "," << device_data.DataId() << ",FROM_UNIXTIME(" << timestamp << ")," << value << ");";
m_pMySQLClient->Execute(query.str());
}
void DataStorageClientImpl::WriteValue(const Device_Data& device_data, int timestamp, double value)
{
std::stringstream query;
query << "INSERT INTO `" << m_table << "` (device_id, data_id, timestamp, value) VALUES (" << device_data.DeviceId() << "," << device_data.DataId() << ",FROM_UNIXTIME(" << timestamp << ")," << value << ");";
m_pMySQLClient->Execute(query.str());
}
void DataStorageClientImpl::WriteValue(const Device_Data& device_data, int timestamp, const std::string& value)
{
std::stringstream query;
query << "INSERT INTO `" << m_table << "` (device_id, data_id, timestamp, value) VALUES (" << device_data.DeviceId() << "," << device_data.DataId() << ",FROM_UNIXTIME(" << timestamp << "),\"" << value << "\");";
m_pMySQLClient->Execute(query.str());
}
} // namespace DataStorage
DataStorage/DataStorageClientImpl.h
+101
View File
@@ -0,0 +1,101 @@
#ifndef DATASTORAGE_DATASTORAGECLIENTIMPL_H
#define DATASTORAGE_DATASTORAGECLIENTIMPL_H
#include <Metronome.h>
#include <map>
#include <memory>
#include <mutex>
#include <string>
namespace MySQL {
class MySQLClient;
} // namespace MySQL
namespace DataStorage {
class DataStorageClientImpl
{
public:
DataStorageClientImpl(const std::shared_ptr<MySQL::MySQLClient>& pMySQLClient, const std::string& table);
~DataStorageClientImpl();
public:
void LogValue(int deviceId, const std::string& dataName, int timestamp, int value);
void LogValue(int deviceId, const std::string& dataName, int timestamp, double value);
void LogValue(int deviceId, const std::string& dataName, int timestamp, const std::string& value);
void LogValueTimed(int deviceId, const std::string& dataName, int value);
void LogValueTimed(int deviceId, const std::string& dataName, double value);
void LogValueTimed(int deviceId, const std::string& dataName, const std::string& value);
public:
void MetronomeCallback();
private:
class Device_Data {
public:
Device_Data(int deviceId, int dataId) :
m_deviceId(deviceId),
m_dataId(dataId)
{
}
public:
int DeviceId() const
{
return m_deviceId;
}
int DataId() const
{
return m_dataId;
}
public:
bool operator=(const Device_Data& other) const
{
return m_deviceId == other.DeviceId() && m_dataId == other.DataId();
}
bool operator<(const Device_Data& other) const
{
return m_deviceId < other.DeviceId() || (m_deviceId == other.DeviceId() && m_dataId < other.DataId());
}
private:
int m_deviceId;
int m_dataId;
};
private:
void WriteValue(const Device_Data& device_data, int timestamp, int value);
void WriteValue(const Device_Data& device_data, int timestamp, double value);
void WriteValue(const Device_Data& device_data, int timestamp, const std::string& value);
private:
template <typename T>
void ProcessValueMap(std::map<Device_Data, T>& map, int timestamp)
{
for (const auto& keyValue : map)
WriteValue(keyValue.first, timestamp, keyValue.second);
map.clear();
}
private:
std::mutex m_mutex;
std::shared_ptr<MySQL::MySQLClient> m_pMySQLClient;
std::string m_table;
Timer::Metronome m_metronome;
std::map<Device_Data, int> m_integerValues;
std::map<Device_Data, double> m_doubleValues;
std::map<Device_Data, std::string> m_stringValues;
};
} // namespace DataStorage
#endif // DATASTORAGE_DATASTORAGECLIENTIMPL_H
Libraries/DateTime
Symlink
+1
View File
@@ -0,0 +1 @@
../../DateTime
Libraries/Timer
Symlink
+1
View File
@@ -0,0 +1 @@
../../Timer
Makefile.conf
+8
View File
@@ -14,6 +14,14 @@ LFLAGS += -lMySQL -lmysqlclient -lmysqlcppconn
LFLAGS += -L$(ROOTPATH)/Libraries/MySQL/lib/$(ARCH)
CFLAGS += -I$(ROOTPATH)/Libraries/MySQL/include
LFLAGS += -lTimer
LFLAGS += -L$(ROOTPATH)/Libraries/Timer/lib/$(ARCH)
CFLAGS += -I$(ROOTPATH)/Libraries/Timer/include
LFLAGS += -lDateTime
LFLAGS += -L$(ROOTPATH)/Libraries/DateTime/lib/$(ARCH)
CFLAGS += -I$(ROOTPATH)/Libraries/DateTime/include
LFLAGS += -lDataStorage
LFLAGS += -L$(ROOTPATH)/lib/$(ARCH)
CFLAGS += -I$(ROOTPATH) -I$(ROOTPATH)/include
include/DataStorageClient.h
+8 -3
View File
@@ -1,7 +1,6 @@
#ifndef DATASTORAGECLIENT_H
#define DATASTORAGECLIENT_H
#include "Timespan.h"
#include <memory>
#include <string>
@@ -27,9 +26,15 @@ public:
void LogValue(int deviceId, const std::string& dataName, int timestamp, double value);
void LogValue(int deviceId, const std::string& dataName, int timestamp, const std::string& value);
void LogValueTimed(int deviceId, const std::string& dataName, int value);
void LogValueTimed(int deviceId, const std::string& dataName, double value);
void LogValueTimed(int deviceId, const std::string& dataName, const std::string& value);
public:
void MetronomeCallback();
private:
std::shared_ptr<MySQL::MySQLClient> m_pMySQLClient;
std::string m_table;
std::unique_ptr<DataStorageClientImpl> m_pDataStorageClientImpl;
};
} // namespace DataStorage