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

Fix some binary_tidy mistakes

Browse Source
This commit is contained in:
divanik 2024-09-16 11:59:43 +00:00
parent 0c3679c76e
commit a908527421
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/libarchive vendored

@ -1 +1 @@
Subproject commit 313aa1fa10b657de791e3202c168a6c833bc3543 Subproject commit 0c21691b177fac5f4cceca2a1ff2ddfa5d60f51c

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

@ -282,7 +282,7 @@ IcebergSchemaProcessor::getSchemaTransformationDag(const Poco::JSON::Object::Ptr
auto name = field->getValue<String>("name"); auto name = field->getValue<String>("name");
bool required = field->getValue<bool>("required"); bool required = field->getValue<bool>("required");
auto type = getFieldType(field, "type", required); auto type = getFieldType(field, "type", required);
if (old_schema_entries.count(id)) if (old_schema_entries.contains(id))
{ {
auto [old_json, old_node] = old_schema_entries.find(id)->second; auto [old_json, old_node] = old_schema_entries.find(id)->second;
if (field->isObject("type")) if (field->isObject("type"))
@ -368,7 +368,7 @@ std::shared_ptr<const ActionsDAG> IcebergSchemaProcessor::getSchemaTransformatio
current_new_id = -1; current_new_id = -1;
}); });
Poco::JSON::Object::Ptr old_schema, new_schema; Poco::JSON::Object::Ptr old_schema, new_schema;
if (transform_dags_by_ids.count({old_id, new_id})) if (transform_dags_by_ids.contains({old_id, new_id}))
{ {
return transform_dags_by_ids.at({old_id, new_id}); return transform_dags_by_ids.at({old_id, new_id});
} }
@ -395,18 +395,18 @@ std::shared_ptr<const ActionsDAG> IcebergSchemaProcessor::getSchemaTransformatio
return transform_dags_by_ids[{old_id, new_id}] = getSchemaTransformationDag(old_schema, new_schema); return transform_dags_by_ids[{old_id, new_id}] = getSchemaTransformationDag(old_schema, new_schema);
} }
void IcebergSchemaProcessor::addIcebergTableSchema(Poco::JSON::Object::Ptr schema) void IcebergSchemaProcessor::addIcebergTableSchema(Poco::JSON::Object::Ptr schema_ptr)
{ {
Int32 schema_id = schema->getValue<Int32>("schema-id"); Int32 schema_id = schema_ptr->getValue<Int32>("schema-id");
if (iceberg_table_schemas_by_ids.count(schema_id)) if (iceberg_table_schemas_by_ids.contains(schema_id))
{ {
chassert(clickhouse_table_schemas_by_ids.count(schema_id) > 0); chassert(clickhouse_table_schemas_by_ids.contains(schema_id) > 0);
chassert(*iceberg_table_schemas_by_ids.at(schema_id) == *schema); chassert(*iceberg_table_schemas_by_ids.at(schema_id) == *schema_ptr);
} }
else else
{ {
iceberg_table_schemas_by_ids[schema_id] = schema; iceberg_table_schemas_by_ids[schema_id] = schema_ptr;
auto fields = schema->get("fields").extract<Poco::JSON::Array::Ptr>(); auto fields = schema_ptr->get("fields").extract<Poco::JSON::Array::Ptr>();
auto clickhouse_schema = std::make_shared<NamesAndTypesList>(); auto clickhouse_schema = std::make_shared<NamesAndTypesList>();
for (size_t i = 0; i != fields->size(); ++i) for (size_t i = 0; i != fields->size(); ++i)
{ {
@ -723,7 +723,7 @@ DataFileInfos IcebergMetadata::getDataFileInfos() const
if (ManifestEntryStatus(status) == ManifestEntryStatus::DELETED) if (ManifestEntryStatus(status) == ManifestEntryStatus::DELETED)
{ {
LOG_TEST(log, "Processing delete file for path: {}", file_path); LOG_TEST(log, "Processing delete file for path: {}", file_path);
chassert(files.count(file_path) == 0); chassert(files.contains(file_path) == 0);
} }
else else
{ {

2
src/Storages/ObjectStorage/DataLakes/IcebergMetadata.h
View File

@ -72,7 +72,7 @@ class IcebergSchemaProcessor
using Node = ActionsDAG::Node; using Node = ActionsDAG::Node;
public: public:
void addIcebergTableSchema(Poco::JSON::Object::Ptr ptr); void addIcebergTableSchema(Poco::JSON::Object::Ptr schema_ptr);
std::shared_ptr<NamesAndTypesList> getClickhouseTableSchemaById(Int32 id); std::shared_ptr<NamesAndTypesList> getClickhouseTableSchemaById(Int32 id);
std::shared_ptr<const ActionsDAG> getSchemaTransformationDagByIds(Int32 old_id, Int32 new_id); std::shared_ptr<const ActionsDAG> getSchemaTransformationDagByIds(Int32 old_id, Int32 new_id);