thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-20 08:40:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Small fixes

Browse Source
This commit is contained in:
kssenii 2023-07-20 18:21:37 +02:00
parent fe53cd3d74
commit d2195cff11
4 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/Storages/S3Queue/S3QueueHolder.cpp
View File

@ -74,9 +74,9 @@ S3QueueHolder::S3QueueProcessedCollection::S3QueueProcessedCollection(const UInt
{
}
void S3QueueHolder::S3QueueProcessedCollection::parse(const String & s)
void S3QueueHolder::S3QueueProcessedCollection::parse(const String & collection_str)
{
ReadBufferFromString buf(s);
ReadBufferFromString buf(collection_str);
read(buf);
// Remove old items
if (max_age > 0)
@ -111,9 +111,9 @@ S3QueueHolder::S3QueueFailedCollection::S3QueueFailedCollection(const UInt64 & m
{
}
void S3QueueHolder::S3QueueFailedCollection::parse(const String & s)
void S3QueueHolder::S3QueueFailedCollection::parse(const String & collection_str)
{
ReadBufferFromString buf(s);
ReadBufferFromString buf(collection_str);
read(buf);
}
@ -124,8 +124,7 @@ bool S3QueueHolder::S3QueueFailedCollection::add(const String & file_name)
= std::find_if(files.begin(), files.end(), [&file_name](const TrackedCollectionItem & s) { return s.file_path == file_name; });
if (failed_it != files.end())
{
failed_it->retries_count--;
if (failed_it->retries_count == 0)
if (failed_it->retries_count == 0 || --failed_it->retries_count == 0)
{
return false;
}
@ -138,7 +137,7 @@ bool S3QueueHolder::S3QueueFailedCollection::add(const String & file_name)
return true;
}
S3QueueHolder::S3FilesCollection S3QueueHolder::S3QueueFailedCollection::getFilesWithoutRetries()
S3QueueHolder::S3FilesCollection S3QueueHolder::S3QueueFailedCollection::getFileNames()
{
S3FilesCollection failed_keys;
for (const auto & pair : files)
@ -233,7 +232,7 @@ S3QueueHolder::S3FilesCollection S3QueueHolder::getFailedFiles()
auto failed_collection = S3QueueFailedCollection(max_loading_retries);
failed_collection.parse(failed_files);
return failed_collection.getFilesWithoutRetries();
return failed_collection.getFileNames();
}
String S3QueueHolder::getMaxProcessedFile()

8
src/Storages/S3Queue/S3QueueHolder.h
View File

@ -45,7 +45,7 @@ public:
String toString() const;
S3FilesCollection getFileNames();
virtual void parse(const String & s) = 0;
virtual void parse(const String & collection_str) = 0;
protected:
TrackedFiles files;
@ -59,7 +59,7 @@ public:
public:
S3QueueProcessedCollection(const UInt64 & max_size_, const UInt64 & max_age_);
void parse(const String & s) override;
void parse(const String & collection_str) override;
void add(const String & file_name);
private:
@ -72,10 +72,10 @@ public:
public:
S3QueueFailedCollection(const UInt64 & max_retries_count_);
void parse(const String & s) override;
void parse(const String & collection_str) override;
bool add(const String & file_name);
S3FilesCollection getFilesWithoutRetries();
S3FilesCollection getFileNames();
private:
UInt64 max_retries_count;

8
src/Storages/S3Queue/S3QueueTableMetadata.cpp
View File

@ -43,10 +43,10 @@ String S3QueueTableMetadata::toString() const
return oss.str();
}
void S3QueueTableMetadata::read(const String & s)
void S3QueueTableMetadata::read(const String & metadata_str)
{
Poco::JSON::Parser parser;
auto json = parser.parse(s).extract<Poco::JSON::Object::Ptr>();
auto json = parser.parse(metadata_str).extract<Poco::JSON::Object::Ptr>();
after_processing = json->getValue<String>("after_processing");
mode = json->getValue<String>("mode");
s3queue_tracked_files_limit = json->getValue<UInt64>("s3queue_tracked_files_limit");
@ -54,10 +54,10 @@ void S3QueueTableMetadata::read(const String & s)
format_name = json->getValue<String>("format_name");
}
S3QueueTableMetadata S3QueueTableMetadata::parse(const String & s)
S3QueueTableMetadata S3QueueTableMetadata::parse(const String & metadata_str)
{
S3QueueTableMetadata metadata;
metadata.read(s);
metadata.read(metadata_str);
return metadata;
}

4
src/Storages/S3Queue/S3QueueTableMetadata.h
View File

@ -26,8 +26,8 @@ struct S3QueueTableMetadata
S3QueueTableMetadata() = default;
S3QueueTableMetadata(const StorageS3::Configuration & configuration, const S3QueueSettings & engine_settings);
void read(const String & s);
static S3QueueTableMetadata parse(const String & s);
void read(const String & metadata_str);
static S3QueueTableMetadata parse(const String & metadata_str);
String toString() const;