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

Fix bad conflict resolution

Browse Source
This commit is contained in:
kssenii 2024-12-09 18:34:42 +01:00
parent bed4eaaafa
commit 5e51114a6a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Storages/ObjectStorage/DataLakes/IcebergMetadata.cpp
View File

@ -74,6 +74,8 @@ IcebergMetadata::IcebergMetadata(
current_schema_id = schema_id; current_schema_id = schema_id;
} }
namespace
{
enum class ManifestEntryStatus : uint8_t enum class ManifestEntryStatus : uint8_t
{ {
EXISTING = 0, EXISTING = 0,
@ -123,6 +125,8 @@ bool operator!=(const Poco::JSON::Object & first, const Poco::JSON::Object & sec
return !(first == second); return !(first == second);
} }
}
DataTypePtr IcebergSchemaProcessor::getSimpleType(const String & type_name) DataTypePtr IcebergSchemaProcessor::getSimpleType(const String & type_name)
{ {