thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-22 07:31:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix test

Browse Source
This commit is contained in:
kssenii 2022-03-10 19:16:26 +01:00
parent d54b0779e9
commit ddcb020d26
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Disks/IDiskRemote.cpp
View File

@ -27,12 +27,12 @@ namespace ErrorCodes
extern const int PATH_ACCESS_DENIED;; extern const int PATH_ACCESS_DENIED;;
extern const int FILE_DOESNT_EXIST; extern const int FILE_DOESNT_EXIST;
extern const int BAD_FILE_TYPE; extern const int BAD_FILE_TYPE;
extern const int MEMORY_LIMIT_EXCEEDED;
} }
IDiskRemote::Metadata IDiskRemote::Metadata::readMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_) IDiskRemote::Metadata IDiskRemote::Metadata::readMetadata(const String & remote_fs_root_path_, DiskPtr metadata_disk_, const String & metadata_file_path_)
{ {
Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_); Metadata result(remote_fs_root_path_, metadata_disk_, metadata_file_path_);
result.load(); result.load();
return result; return result;
@ -140,6 +140,9 @@ void IDiskRemote::Metadata::load()
if (e.code() == ErrorCodes::UNKNOWN_FORMAT) if (e.code() == ErrorCodes::UNKNOWN_FORMAT)
throw; throw;
if (e.code() == ErrorCodes::MEMORY_LIMIT_EXCEEDED)
throw;
throw Exception("Failed to read metadata file", e, ErrorCodes::UNKNOWN_FORMAT); throw Exception("Failed to read metadata file", e, ErrorCodes::UNKNOWN_FORMAT);
} }
} }

16
src/Disks/IO/CachedReadBufferFromRemoteFS.cpp
View File

@ -485,6 +485,9 @@ bool CachedReadBufferFromRemoteFS::updateImplementationBufferIfNeeded()
bool CachedReadBufferFromRemoteFS::nextImpl() bool CachedReadBufferFromRemoteFS::nextImpl()
{ {
if (IFileCache::shouldBypassCache())
throw Exception(ErrorCodes::LOGICAL_ERROR, "Using cache when not allowed");
if (!initialized) if (!initialized)
initialize(file_offset_of_buffer_end, getTotalSizeToRead()); initialize(file_offset_of_buffer_end, getTotalSizeToRead());
@ -500,9 +503,16 @@ bool CachedReadBufferFromRemoteFS::nextImpl()
bool download_current_segment = read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE; bool download_current_segment = read_type == ReadType::REMOTE_FS_READ_AND_PUT_IN_CACHE;
if (download_current_segment) if (download_current_segment)
{ {
bool file_segment_already_completed = !file_segment->isDownloader(); try
if (!file_segment_already_completed) {
file_segment->completeBatchAndResetDownloader(); bool file_segment_already_completed = !file_segment->isDownloader();
if (!file_segment_already_completed)
file_segment->completeBatchAndResetDownloader();
}
catch (...)
{
tryLogCurrentException(__PRETTY_FUNCTION__);
}
} }
assert(!file_segment->isDownloader()); assert(!file_segment->isDownloader());