Add MySQL Cache Manager & code cleanup
This commit is contained in:
committed by
Brendan Le Glaunec
parent
faa2570883
commit
8a8e4faa42
@@ -0,0 +1,85 @@
|
||||
// Copyright 2016 Etix Labs
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cppconn/resultset.h> // for ResultSet
|
||||
#include <mutex> // for mutex
|
||||
#include <stdbool.h> // for bool, false
|
||||
#include <string> // for string
|
||||
#include <utility> // for pair, make_pair
|
||||
|
||||
#include "query_result.h"
|
||||
|
||||
namespace sql {
|
||||
class Connection;
|
||||
class Driver;
|
||||
class ResultSet;
|
||||
}
|
||||
|
||||
namespace etix {
|
||||
|
||||
namespace cameradar {
|
||||
|
||||
namespace mysql {
|
||||
|
||||
//! MySQL Database connection handling
|
||||
//! Abstracts all connection to the database
|
||||
class db_connection {
|
||||
private:
|
||||
static const std::string create_database_query;
|
||||
|
||||
//! SQL driver
|
||||
sql::Driver* driver = nullptr;
|
||||
//! SQL connection
|
||||
sql::Connection* connection = nullptr;
|
||||
std::mutex access_mtx;
|
||||
bool connected = false;
|
||||
|
||||
std::string db_name;
|
||||
|
||||
//! Create the database if it doesn't exist at connector launch
|
||||
empty_result create_database(void);
|
||||
|
||||
public:
|
||||
db_connection(void);
|
||||
~db_connection(void);
|
||||
|
||||
//! Try to connect to the database
|
||||
std::pair<bool, std::string> connect(const std::string& host,
|
||||
const std::string& user,
|
||||
const std::string& pass,
|
||||
const std::string& db_name,
|
||||
bool create_db_if_not_exist = true);
|
||||
|
||||
//! Execute a MySQL command
|
||||
empty_result execute(const std::string& request);
|
||||
|
||||
//! Execute a query
|
||||
query_result<sql::ResultSet*> query(const std::string& query);
|
||||
|
||||
bool is_connected();
|
||||
|
||||
//! Return db_name
|
||||
const std::string&
|
||||
get_db_name(void) const {
|
||||
return this->db_name;
|
||||
}
|
||||
};
|
||||
|
||||
} // mysql
|
||||
|
||||
} // cameradar
|
||||
|
||||
} // etix
|
||||
@@ -0,0 +1,81 @@
|
||||
// Copyright 2016 Etix Labs
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#pragma once
|
||||
|
||||
#include <cachemanager.h>
|
||||
#include <configuration.h>
|
||||
#include <db_conn.h>
|
||||
#include <fmt.h>
|
||||
#include <logger.h>
|
||||
#include <stream_model.h>
|
||||
#include <vector>
|
||||
|
||||
namespace etix {
|
||||
|
||||
namespace cameradar {
|
||||
|
||||
struct mysql_configuration {
|
||||
unsigned int port;
|
||||
std::string host;
|
||||
std::string db_name;
|
||||
std::string user;
|
||||
std::string password;
|
||||
|
||||
mysql_configuration() = default;
|
||||
|
||||
mysql_configuration(unsigned int port,
|
||||
const std::string& host,
|
||||
const std::string& db_name,
|
||||
const std::string& user = "",
|
||||
const std::string& password = "")
|
||||
: port(port), host(host), db_name(db_name), user(user), password(password) {}
|
||||
};
|
||||
|
||||
class mysql_cache_manager : public cache_manager_base {
|
||||
private:
|
||||
static const std::string name;
|
||||
std::vector<etix::cameradar::stream_model> streams;
|
||||
std::shared_ptr<etix::cameradar::configuration> configuration;
|
||||
etix::cameradar::mysql_configuration db_conf;
|
||||
etix::cameradar::mysql::db_connection connection;
|
||||
|
||||
static const std::string create_table_query;
|
||||
static const std::string insert_with_id_query;
|
||||
static const std::string exist_query;
|
||||
static const std::string get_results_query;
|
||||
static const std::string update_result_query;
|
||||
|
||||
public:
|
||||
using cache_manager_base::cache_manager_base;
|
||||
~mysql_cache_manager();
|
||||
|
||||
// Specific to MySQL
|
||||
bool execute_query(const std::string& query);
|
||||
|
||||
const std::string& get_name() const override;
|
||||
static const std::string& static_get_name();
|
||||
bool load_mysql_conf(std::shared_ptr<etix::cameradar::configuration> configuration);
|
||||
bool configure(std::shared_ptr<etix::cameradar::configuration> configuration) override;
|
||||
|
||||
void set_streams(std::vector<etix::cameradar::stream_model> model);
|
||||
|
||||
void update_stream(const etix::cameradar::stream_model& newmodel);
|
||||
|
||||
std::vector<etix::cameradar::stream_model> get_streams();
|
||||
|
||||
std::vector<etix::cameradar::stream_model> get_valid_streams();
|
||||
};
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,65 @@
|
||||
// Copyright 2016 Etix Labs
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 (the "License");
|
||||
// you may not use this file except in compliance with the License.
|
||||
// You may obtain a copy of the License at
|
||||
//
|
||||
// http://www.apache.org/licenses/LICENSE-2.0
|
||||
//
|
||||
// Unless required by applicable law or agreed to in writing, software
|
||||
// distributed under the License is distributed on an "AS IS" BASIS,
|
||||
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
// See the License for the specific language governing permissions and
|
||||
// limitations under the License.
|
||||
|
||||
#pragma once
|
||||
|
||||
namespace etix {
|
||||
|
||||
namespace cameradar {
|
||||
|
||||
namespace mysql {
|
||||
|
||||
enum class execute_result { success, not_found, no_row_updated, sql_error, error };
|
||||
|
||||
//! Wrapper of a DB query result
|
||||
//! Templated on the data type we want to return (list<model>, bool, whatever)
|
||||
template <typename DataType>
|
||||
struct query_result {
|
||||
DataType data;
|
||||
execute_result state;
|
||||
std::string error_msg;
|
||||
|
||||
inline bool
|
||||
success(void) const {
|
||||
return state == execute_result::success;
|
||||
}
|
||||
inline bool
|
||||
error(void) const {
|
||||
return not success();
|
||||
}
|
||||
};
|
||||
|
||||
//! Empty query result for when we just want to return the status
|
||||
//! of the request with no associated data
|
||||
template <>
|
||||
struct query_result<void> {
|
||||
execute_result state;
|
||||
std::string error_msg;
|
||||
|
||||
inline bool
|
||||
success(void) const {
|
||||
return state == execute_result::success;
|
||||
}
|
||||
inline bool
|
||||
error(void) const {
|
||||
return not success();
|
||||
}
|
||||
};
|
||||
typedef query_result<void> empty_result;
|
||||
|
||||
} //! mysql
|
||||
|
||||
} //! cameradar
|
||||
|
||||
} //! etix
|
||||
Reference in New Issue
Block a user