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

Fix merge conflicts

Browse Source
This commit is contained in:
alesapin 2023-06-06 11:47:29 +02:00
parent 614451998d
commit 1506545db0
1 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/Storages/StorageAzure.cpp
View File

@ -230,13 +230,10 @@ StorageAzure::Configuration StorageAzure::getConfiguration(ASTs & engine_args, C
configuration.blobs_paths = {configuration.blob_path};
LOG_INFO(&Poco::Logger::get("StorageAzure"), "get_format_from_file = {}", get_format_from_file);
// if (configuration.format == "auto" && get_format_from_file)
// configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.blob_path, true);
configuration.format = "TSV";
if (configuration.format == "auto" && get_format_from_file)
configuration.format = FormatFactory::instance().getFormatFromFileName(configuration.blob_path, true);
return configuration;
}
@ -367,11 +364,6 @@ AzureClientPtr StorageAzure::createClient(StorageAzure::Configuration configurat
}
}
}
auto managed_identity_credential = std::make_shared<Azure::Identity::ManagedIdentityCredential>();
result = std::make_unique<BlobContainerClient>(configuration.connection_url, managed_identity_credential);
LOG_INFO(&Poco::Logger::get("StorageAzure"), "createClient account_name & account_key ");
}
return result;
@ -613,7 +605,7 @@ Pipe StorageAzure::read(
size_t num_streams)
{
if (partition_by && configuration.withWildcard())
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Reading from a partitioned S3 storage is not implemented yet");
throw Exception(ErrorCodes::NOT_IMPLEMENTED, "Reading from a partitioned Azure storage is not implemented yet");
Pipes pipes;
@ -1079,7 +1071,7 @@ StorageAzureSource::StorageAzureSource(
, container(container_)
, file_iterator(file_iterator_)
, create_reader_pool(CurrentMetrics::ObjectStorageAzureThreads, CurrentMetrics::ObjectStorageAzureThreadsActive, 1)
, create_reader_scheduler(threadPoolCallbackRunner<ReaderHolder>(create_reader_pool, "CreateAzureReader"))
, create_reader_scheduler(threadPoolCallbackRunner<ReaderHolder>(create_reader_pool, "AzureReader"))
{
reader = createReader();
if (reader)