diff --git a/src/backends/postgresql/scan.cpp b/src/backends/postgresql/scan.cpp index ca5e09b..881c52d 100644 --- a/src/backends/postgresql/scan.cpp +++ b/src/backends/postgresql/scan.cpp @@ -104,8 +104,8 @@ namespace dindb { boost::string_ref(&parSetData.type, 1), parSignature, boost::string_ref(&parSetData.content_type, 1), - parSetData.fs_uuid, - parSetData.disk_label + parSetData.fs_uuid, + parSetData.disk_label ); assert(id_res.size() == 1); assert(id_res[0].size() == 1); diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp index 9b88ef2..1cf5e32 100644 --- a/src/backends/redis/backend_redis.cpp +++ b/src/backends/redis/backend_redis.cpp @@ -56,44 +56,44 @@ namespace YAML { } //namespace YAML namespace dindb { - BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, bool parConnect) : + BackendRedis::BackendRedis(std::string &&parAddress, uint16_t parPort, bool parConnect) : m_redis(std::move(parAddress), parPort, parConnect) { - } + } - BackendRedis::~BackendRedis() noexcept { - } + BackendRedis::~BackendRedis() noexcept { + } - void BackendRedis::connect() { + void BackendRedis::connect() { m_redis.connect(); } - void BackendRedis::disconnect() { - m_redis.disconnect(); - } - - void BackendRedis::tag_files (const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { - } - - void BackendRedis::tag_files (const std::vector& parRegexes, const std::vector& parTags, GroupIDType parSet) { - } - - void BackendRedis::delete_tags (const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { - } - - void BackendRedis::delete_tags (const std::vector& parRegexes, const std::vector& parTags, GroupIDType parSet) { + void BackendRedis::disconnect() { + m_redis.disconnect(); } - void BackendRedis::delete_all_tags (const std::vector& parFiles, GroupIDType parSet) { + void BackendRedis::tag_files (const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { } - void BackendRedis::delete_all_tags (const std::vector& parRegexes, GroupIDType parSet) { + void BackendRedis::tag_files (const std::vector& parRegexes, const std::vector& parTags, GroupIDType parSet) { } - void BackendRedis::delete_group (const std::vector& parIDs, ConfirmDeleCallback parConf) { + void BackendRedis::delete_tags (const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { } - void BackendRedis::write_files (const std::vector& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) { + void BackendRedis::delete_tags (const std::vector& parRegexes, const std::vector& parTags, GroupIDType parSet) { + } + + void BackendRedis::delete_all_tags (const std::vector& parFiles, GroupIDType parSet) { + } + + void BackendRedis::delete_all_tags (const std::vector& parRegexes, GroupIDType parSet) { + } + + void BackendRedis::delete_group (const std::vector& parIDs, ConfirmDeleCallback parConf) { + } + + void BackendRedis::write_files (const std::vector& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature) { using boost::lexical_cast; auto incr_reply = m_redis.run("HINCRBY " PROGRAM_NAME ":indices set 1"); @@ -101,39 +101,39 @@ namespace dindb { auto insert_set_reply = m_redis.run("HMSET %b name %b disk_label %b fs_uuid %b", set_key, parSetData.name, parSetData.disk_label, parSetData.fs_uuid); } - bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) { + bool BackendRedis::search_file_by_hash (mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash) { return false; } - std::vector BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) { + std::vector BackendRedis::locate_in_db (const std::string& parSearch, const TagList& parTags) { return std::vector(); } - std::vector BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) { + std::vector BackendRedis::locate_in_db (const mchlib::TigerHash& parSearch, const TagList& parTags) { return std::vector(); } - std::vector BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) { + std::vector BackendRedis::locate_sets_in_db (const std::string& parSearch, bool parCaseInsensitive) { return std::vector(); } - std::vector BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector& parSets, bool parCaseInsensitive) { + std::vector BackendRedis::locate_sets_in_db (const std::string& parSearch, const std::vector& parSets, bool parCaseInsensitive) { return std::vector(); } - std::vector BackendRedis::find_all_sets() { + std::vector BackendRedis::find_all_sets() { return std::vector(); } - std::vector> BackendRedis::find_set_details (const std::vector& parSets) { + std::vector> BackendRedis::find_set_details (const std::vector& parSets) { return std::vector>(); } - std::vector> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) { + std::vector> BackendRedis::find_file_details (GroupIDType parSetID, uint16_t parLevel, boost::string_ref parDir) { return std::vector>(); } - std::vector BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) { + std::vector BackendRedis::find_paths_starting_by (GroupIDType parGroupID, uint16_t parLevel, boost::string_ref parPath) { return std::vector(); } } //namespace dindb diff --git a/src/backends/redis/command.cpp b/src/backends/redis/command.cpp index 72d5ebd..f2b9e82 100644 --- a/src/backends/redis/command.cpp +++ b/src/backends/redis/command.cpp @@ -27,7 +27,7 @@ namespace redis { namespace { - using RedisReply = std::unique_ptr; + using RedisReply = std::unique_ptr; RedisReplyType make_redis_reply_type (redisReply* parReply) { using boost::transform_iterator; @@ -66,15 +66,15 @@ namespace redis { m_address(std::move(parAddress)), m_port(parPort) { - if (parConnect) - this->connect(); + if (parConnect) + this->connect(); } Command::~Command() noexcept { } - void Command::connect() { - if (not m_conn) { + void Command::connect() { + if (not m_conn) { struct timeval timeout = {5, 500000}; //5.5 seconds? RedisConnection conn( redisConnectWithTimeout(m_address.c_str(), m_port, timeout), @@ -93,7 +93,7 @@ namespace redis { } std::swap(conn, m_conn); } - } + } void Command::disconnect() { m_conn.reset();