This commit is contained in:
andrew (from workstation) 2020-05-17 13:24:23 +02:00
parent 1cd7f17fc3
commit 878022bc0d

View File

@ -3709,11 +3709,8 @@ void FileManager::memory_cleanup() {
for (unsigned int i = 1; i < file_id_info_.size(); i++) {
auto main_node_id = file_id_info_[i].node_id_;
if (main_node_id == 0) {
continue;
}
if (main_node_id != 0) {
auto &node = file_nodes_[main_node_id];
if (node != nullptr && ((int32) i) == node->main_file_id_.get()) {
if (time - file_id_insert_time_[i] > 5 /* MAIN FILE TTL */) {
for (auto &file_id : node->file_ids_) {
@ -3725,12 +3722,6 @@ void FileManager::memory_cleanup() {
}
}
/* DESTROY ASSOCIATED NODE */
auto file_node_id = file_id_info_[file_id.get()].node_id_;
if (file_node_id != 0) {
file_nodes_[file_node_id] = nullptr;
}
/* DESTROY ASSOCIATED FILE */
empty_file_ids_.push_back(file_id.get());
file_id_info_[file_id.get()] = FileIdInfo();
@ -3754,6 +3745,7 @@ void FileManager::memory_cleanup() {
}
}
}
}
LOG(INFO) << empty_file_ids_.size() << " empty ids and " << queries_container_.size() << " running queries";
is_closed_ = false;