thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-24 16:42:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed some bugs

Browse Source
This commit is contained in:
divanik 2024-10-29 15:18:05 +00:00
parent a54df54405
commit 886603d625
3 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Storages/ObjectStorage/DataLakes/DataLakeConfiguration.h
View File

@ -30,16 +30,11 @@ public:
bool isDataLakeConfiguration() const override { return true; }
bool isStaticConfiguration() const override { return false; }
std::string getEngineName() const override { return DataLakeMetadata::name; }
void update(ObjectStoragePtr object_storage, ContextPtr local_context, bool update_base) override
void update(ObjectStoragePtr object_storage, ContextPtr local_context) override
{
if (update_base)
{
BaseStorageConfiguratixon::update(object_storage, local_context);
}
BaseStorageConfiguration::update(object_storage, local_context);
auto new_metadata = DataLakeMetadata::create(object_storage, weak_from_this(), local_context);
if (current_metadata && *current_metadata == *new_metadata)
return;

4
src/Storages/ObjectStorage/StorageObjectStorage.cpp
View File

@ -166,7 +166,7 @@ bool StorageObjectStorage::supportsSubsetOfColumns(const ContextPtr & context) c
return FormatFactory::instance().checkIfFormatSupportsSubsetOfColumns(configuration->format, context, format_settings);
}
void StorageObjectStorage::Configuration::update(ObjectStoragePtr object_storage_ptr, ContextPtr context, [[maybe_unused]] bool update_base)
void StorageObjectStorage::Configuration::update(ObjectStoragePtr object_storage_ptr, ContextPtr context)
{
IObjectStorage::ApplyNewSettingsOptions options{.allow_client_change = !isStaticConfiguration()};
object_storage_ptr->applyNewSettings(context->getConfigRef(), getTypeName() + ".", context, options);
@ -309,7 +309,7 @@ void StorageObjectStorage::read(
size_t max_block_size,
size_t num_streams)
{
configuration->update(object_storage, local_context, true);
configuration->update(object_storage, local_context);
printConfiguration(local_context->getConfigRef(), "Select query");
if (partition_by && configuration->withPartitionWildcard())
{

6
tests/integration/test_storage_iceberg/test.py
View File

@ -862,9 +862,9 @@ def test_restart_broken_s3(started_cluster):
instance.restart_clickhouse()
# assert "NoSuchBucket" in instance.query_and_get_error(
# f"SELECT count() FROM {TABLE_NAME}"
# )
assert "NoSuchBucket" in instance.query_and_get_error(
f"SELECT count() FROM {TABLE_NAME}"
)
time.sleep(10)