diff --git a/src/backends/postgresql/delete.cpp b/src/backends/postgresql/delete.cpp index a87fda4..ee50a74 100644 --- a/src/backends/postgresql/delete.cpp +++ b/src/backends/postgresql/delete.cpp @@ -29,7 +29,7 @@ namespace dindb { namespace { - IDDescMap fetch_existing_ids (pq::Connection& parConn, const std::vector& parIDs) { + IDDescMap fetch_existing_ids (pq::Connection& parConn, const std::vector& parIDs) { using boost::lexical_cast; IDDescMap retmap; @@ -39,7 +39,7 @@ namespace dindb { std::ostringstream oss; oss << "SELECT \"id\",\"desc\" FROM \"sets\" WHERE \"id\"="; - boost::copy(parIDs, infix_ostream_iterator(oss, " OR \"id\"=")); + boost::copy(parIDs, infix_ostream_iterator(oss, " OR \"id\"=")); oss << ';'; auto resultset = parConn.query(oss.str()); @@ -50,7 +50,7 @@ namespace dindb { } } //unnamed namespace - void delete_group_from_db (pq::Connection& parDB, const std::vector& parIDs, ConfirmDeleCallback parConf) { + void delete_group_from_db (pq::Connection& parDB, const std::vector& parIDs, ConfirmDeleCallback parConf) { assert(parDB.is_connected()); const auto dele_ids = fetch_existing_ids(parDB, parIDs); @@ -65,9 +65,9 @@ namespace dindb { ids.reserve(dele_ids.size()); std::ostringstream oss; oss << "BEGIN;\nDELETE FROM \"files\" WHERE \"group_id\"="; - boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator(oss, " OR \"group_id\"=")); + boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator(oss, " OR \"group_id\"=")); oss << ";\nDELETE FROM \"sets\" WHERE \"id\"="; - boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator(oss, " OR \"id\"=")); + boost::copy(dele_ids | boost::adaptors::map_keys, infix_ostream_iterator(oss, " OR \"id\"=")); oss << ";\nCOMMIT;"; parDB.query(oss.str()); diff --git a/src/backends/postgresql/delete.hpp b/src/backends/postgresql/delete.hpp index 341cc47..befe62a 100644 --- a/src/backends/postgresql/delete.hpp +++ b/src/backends/postgresql/delete.hpp @@ -22,7 +22,6 @@ #include #include #include -#include #include namespace pq { @@ -30,10 +29,10 @@ namespace pq { } //namespace pq namespace dindb { - using IDDescMap = std::map; + using IDDescMap = std::map; using ConfirmDeleCallback = std::function; - void delete_group_from_db ( pq::Connection& parDB, const std::vector& parIDs, ConfirmDeleCallback parConf ); + void delete_group_from_db ( pq::Connection& parDB, const std::vector& parIDs, ConfirmDeleCallback parConf ); } //namespace dindb #endif diff --git a/src/backends/redis/backend_redis.cpp b/src/backends/redis/backend_redis.cpp index 711d1b9..34e4912 100644 --- a/src/backends/redis/backend_redis.cpp +++ b/src/backends/redis/backend_redis.cpp @@ -148,7 +148,7 @@ namespace dindb { dindb::delete_all_tags(m_redis, m_dele_tag_if_in_set, parRegexes, parSet); } - void BackendRedis::delete_group (const std::vector& parIDs, ConfirmDeleCallback parConf) { + 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) { diff --git a/src/backends/redis/backend_redis.hpp b/src/backends/redis/backend_redis.hpp index be03011..bd24782 100644 --- a/src/backends/redis/backend_redis.hpp +++ b/src/backends/redis/backend_redis.hpp @@ -42,7 +42,7 @@ namespace dindb { virtual void delete_all_tags ( const std::vector& parFiles, GroupIDType parSet ) override; virtual void delete_all_tags ( const std::vector& parRegexes, GroupIDType parSet ) override; - virtual void delete_group ( const std::vector& parIDs, ConfirmDeleCallback parConf ) override; + virtual void delete_group ( const std::vector& parIDs, ConfirmDeleCallback parConf ) override; virtual void write_files ( const std::vector& parData, const mchlib::SetRecordDataFull& parSetData, const std::string& parSignature ) override; virtual bool search_file_by_hash ( mchlib::FileRecordData& parItem, mchlib::SetRecordDataFull& parSet, const mchlib::TigerHash& parHash ) override; diff --git a/src/backends/redis/tag.cpp b/src/backends/redis/tag.cpp index e979c64..9af54cb 100644 --- a/src/backends/redis/tag.cpp +++ b/src/backends/redis/tag.cpp @@ -37,7 +37,7 @@ namespace std { namespace dindb { namespace { - std::string make_file_key (uint64_t parID) { + std::string make_file_key (FileIDType parID) { return PROGRAM_NAME ":file:" + dinhelp::lexical_cast(parID); } @@ -54,7 +54,7 @@ namespace dindb { return retval; } - void run_id_based_script (redis::Command& parRedis, redis::Script& parScript, const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { + void run_id_based_script (redis::Command& parRedis, redis::Script& parScript, const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { using dinhelp::lexical_cast; auto batch = parRedis.make_batch(); @@ -105,7 +105,7 @@ namespace dindb { } } //unnamed namespace - void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { + void tag_files (redis::Command& parRedis, redis::Script& parTagIfInSet, const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { run_id_based_script(parRedis, parTagIfInSet, parFiles, parTags, parSet); } @@ -113,7 +113,7 @@ namespace dindb { run_regex_based_script(parRedis, parTagIfInSet, parRegexes, parTags, parSet); } - void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { + void delete_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet) { run_id_based_script(parRedis, parDeleIfInSet, parFiles, parTags, parSet); } @@ -121,7 +121,7 @@ namespace dindb { run_regex_based_script(parRedis, parDeleIfInSet, parRegexes, parTags, parSet); } - void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector& parFiles, GroupIDType parSet) { + void delete_all_tags (redis::Command& parRedis, redis::Script& parDeleIfInSet, const std::vector& parFiles, GroupIDType parSet) { auto batch = parRedis.make_batch(); for (const auto file_id : parFiles) { const auto file_key = make_file_key(file_id); @@ -147,7 +147,7 @@ namespace dindb { const auto regexes = compile_regexes(parRegexes); std::set dele_tags; - std::vector ids; + std::vector ids; for (const auto& itm : parRedis.scan(PROGRAM_NAME ":file:*")) { const auto& file_key = itm; diff --git a/src/backends/redis/tag.hpp b/src/backends/redis/tag.hpp index 1b4b55b..93c6962 100644 --- a/src/backends/redis/tag.hpp +++ b/src/backends/redis/tag.hpp @@ -21,7 +21,6 @@ #include "backends/db_backend.hpp" #include #include -#include namespace redis { class Command; @@ -32,7 +31,7 @@ namespace dindb { void tag_files ( redis::Command& parRedis, redis::Script& parTagIfInSet, - const std::vector& parFiles, + const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet ); @@ -47,7 +46,7 @@ namespace dindb { void delete_tags ( redis::Command& parRedis, redis::Script& parDeleIfInSet, - const std::vector& parFiles, + const std::vector& parFiles, const std::vector& parTags, GroupIDType parSet ); @@ -61,7 +60,7 @@ namespace dindb { void delete_all_tags ( redis::Command& parRedis, redis::Script& parDeleIfInSet, - const std::vector& parFiles, + const std::vector& parFiles, GroupIDType parSet ); void delete_all_tags (