thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-11-21 23:21:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Handle some problems with tests

Browse Source
This commit is contained in:
divanik 2024-10-28 11:47:01 +00:00
parent ca040906c3
commit 07508cb381
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Disks/ObjectStorages/S3/S3ObjectStorage.cpp
View File

@ -500,8 +500,7 @@ void S3ObjectStorage::applyNewSettings(
}
auto current_settings = s3_settings.get();
if (options.allow_client_change
&& (current_settings->auth_settings.hasUpdates(modified_settings->auth_settings) || for_disk_s3))
if (options.allow_client_change && (current_settings->auth_settings.hasUpdates(modified_settings->auth_settings) || for_disk_s3))
{
auto new_client = getClient(uri, *modified_settings, context, for_disk_s3);
client.set(std::move(new_client));

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

@ -30,10 +30,13 @@ 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) override
{
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;

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

@ -87,8 +87,9 @@ StorageObjectStorage::StorageObjectStorage(
, distributed_processing(distributed_processing_)
, log(getLogger(fmt::format("Storage{}({})", configuration->getEngineName(), table_id_.getFullTableName())))
{
configuration_->update(object_storage_, context);
ColumnsDescription columns{columns_};
LOG_DEBUG(&Poco::Logger::get("StorageObjectStorage Creation"), "Columns size {}", columns.size());
configuration->update(object_storage, context);
std::string sample_path;
resolveSchemaAndFormat(columns, configuration->format, object_storage, configuration, format_settings, sample_path, context);

3
src/Storages/ObjectStorage/registerStorageObjectStorage.cpp
View File

@ -27,7 +27,6 @@ static std::shared_ptr<StorageObjectStorage> createStorageObjectStorage(
StorageObjectStorage::Configuration::initialize(*configuration, args.engine_args, context, false);
// Use format settings from global server context + settings from
// the SETTINGS clause of the create query. Settings from current
// session and user are ignored.
@ -251,6 +250,7 @@ void registerStorageDeltaLake(StorageFactory & factory)
.source_access_type = AccessType::S3,
});
#endif
UNUSED(factory);
}
#endif
@ -272,5 +272,6 @@ void registerStorageHudi(StorageFactory & factory)
.source_access_type = AccessType::S3,
});
#endif
UNUSED(factory);
}
}