thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-29 02:52:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Rename DirectoryMonitor::current_batch_file to current_file

Browse Source 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
This commit is contained in:
Azat Khuzhin 2023-01-21 10:07:44 +01:00
parent 3f892e52ab
commit 16646c0923
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Storages/Distributed/DirectoryMonitor.cpp
View File

@ -570,7 +570,7 @@ ConnectionPoolPtr StorageDistributedDirectoryMonitor::createPool(const std::stri
bool StorageDistributedDirectoryMonitor::hasPendingFiles() const
{
return fs::exists(current_batch_file_path) || !current_batch_file.empty() || !pending_files.empty();
return fs::exists(current_batch_file_path) || !current_file.empty() || !pending_files.empty();
}
void StorageDistributedDirectoryMonitor::initializeFilesFromDisk()
@ -639,11 +639,11 @@ void StorageDistributedDirectoryMonitor::processFiles()
else
{
/// Process unprocessed file.
if (!current_batch_file.empty())
processFile(current_batch_file);
if (!current_file.empty())
processFile(current_file);
while (pending_files.tryPop(current_batch_file))
processFile(current_batch_file);
while (pending_files.tryPop(current_file))
processFile(current_file);
}
}
@ -694,7 +694,7 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
if (isFileBrokenErrorCode(e.code(), e.isRemoteException()))
{
markAsBroken(file_path);
current_batch_file.clear();
current_file.clear();
}
throw;
}
@ -708,7 +708,7 @@ void StorageDistributedDirectoryMonitor::processFile(const std::string & file_pa
auto dir_sync_guard = getDirectorySyncGuard(dir_fsync, disk, relative_path);
markAsSend(file_path);
current_batch_file.clear();
current_file.clear();
LOG_TRACE(log, "Finished processing `{}` (took {} ms)", file_path, watch.elapsedMilliseconds());
}

2
src/Storages/Distributed/DirectoryMonitor.h
View File

@ -111,7 +111,7 @@ private:
/// This is pending data (due to some error) for should_batch_inserts==true
std::string current_batch_file_path;
/// This is pending data (due to some error) for should_batch_inserts==false
std::string current_batch_file;
std::string current_file;
struct BatchHeader;
struct Batch;