Skip to content

Commit f012421

Browse files
committed
partially fix build issue
1 parent 2df9bbb commit f012421

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

src/Storages/ObjectStorage/StorageObjectStorage.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ SinkToStoragePtr StorageObjectStorage::import(
501501
object_storage,
502502
configuration,
503503
format_settings,
504-
getInMemoryMetadataPtr()->getSampleBlock(),
504+
std::make_shared<const Block>(getInMemoryMetadataPtr()->getSampleBlock()),
505505
local_context);
506506
}
507507

src/Storages/ObjectStorage/StorageObjectStorageConfiguration.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -88,15 +88,15 @@ void StorageObjectStorageConfiguration::initialize(
8888
}
8989
}
9090

91-
if (configuration_to_initialize.partition_strategy_type == PartitionStrategyFactory::StrategyType::HIVE)
91+
if (partition_strategy_type == PartitionStrategyFactory::StrategyType::HIVE)
9292
{
93-
configuration_to_initialize.file_path_generator = std::make_shared<ObjectStorageAppendFilePathGenerator>(
94-
configuration_to_initialize.getRawPath().path,
95-
configuration_to_initialize.format);
93+
file_path_generator = std::make_shared<ObjectStorageAppendFilePathGenerator>(
94+
getRawPath().path,
95+
format);
9696
}
9797
else
9898
{
99-
configuration_to_initialize.file_path_generator = std::make_shared<ObjectStorageWildcardFilePathGenerator>(configuration_to_initialize.getRawPath().path);
99+
file_path_generator = std::make_shared<ObjectStorageWildcardFilePathGenerator>(getRawPath().path);
100100
}
101101

102102
if (format == "auto")
@@ -116,7 +116,7 @@ void StorageObjectStorageConfiguration::initialize(
116116
else
117117
FormatFactory::instance().checkFormatName(format);
118118

119-
configuration_to_initialize.read_path = configuration_to_initialize.file_path_generator->getPathForRead();
119+
read_path = file_path_generator->getPathForRead();
120120
initialized = true;
121121
}
122122

@@ -149,7 +149,7 @@ StorageObjectStorageConfiguration::Path StorageObjectStorageConfiguration::getPa
149149
return getPathForWrite(partition_id, /* filename_override */ "");
150150
}
151151

152-
StorageObjectStorage::Configuration::Path StorageObjectStorage::Configuration::getPathForWrite(const std::string & partition_id, const std::string & filename_override) const
152+
StorageObjectStorageConfiguration::Path StorageObjectStorageConfiguration::getPathForWrite(const std::string & partition_id, const std::string & filename_override) const
153153
{
154154
return Path {file_path_generator->getPathForWrite(partition_id, filename_override)};
155155
}

0 commit comments

Comments
 (0)