Skip to content

Commit eb16d1b

Browse files
committed
fix clang
1 parent 5cb4d52 commit eb16d1b

2 files changed

Lines changed: 14 additions & 14 deletions

File tree

src/paimon/common/data/shredding/map_shared_shredding_utils.cpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -203,19 +203,19 @@ Result<int32_t> GetRequiredInt32(const std::shared_ptr<arrow::KeyValueMetadata>&
203203
return parsed.value();
204204
}
205205

206-
std::string SerializeFieldDict(const MapSharedShreddingFieldMeta& file_meta) {
206+
std::string SerializeFieldDict(const MapSharedShreddingFieldMeta& field_meta) {
207207
return JsonEncodeObject([&](rapidjson::Document* doc,
208208
rapidjson::Document::AllocatorType* alloc) {
209-
for (const auto& [name, id] : file_meta.name_to_id) {
209+
for (const auto& [name, id] : field_meta.name_to_id) {
210210
doc->AddMember(rapidjson::Value(name.c_str(), *alloc), rapidjson::Value(id), *alloc);
211211
}
212212
});
213213
}
214214

215-
std::string SerializeFieldColumns(const MapSharedShreddingFieldMeta& file_meta) {
215+
std::string SerializeFieldColumns(const MapSharedShreddingFieldMeta& field_meta) {
216216
return JsonEncodeObject(
217217
[&](rapidjson::Document* doc, rapidjson::Document::AllocatorType* alloc) {
218-
for (const auto& [field_id, col_vec] : file_meta.field_to_columns) {
218+
for (const auto& [field_id, col_vec] : field_meta.field_to_columns) {
219219
rapidjson::Value array(rapidjson::kArrayType);
220220
std::vector<int32_t> sorted_cols(col_vec.begin(), col_vec.end());
221221
std::sort(sorted_cols.begin(), sorted_cols.end());
@@ -228,11 +228,11 @@ std::string SerializeFieldColumns(const MapSharedShreddingFieldMeta& file_meta)
228228
});
229229
}
230230

231-
std::string SerializeOverflowSet(const MapSharedShreddingFieldMeta& file_meta) {
231+
std::string SerializeOverflowSet(const MapSharedShreddingFieldMeta& field_meta) {
232232
return JsonEncodeArray(
233233
[&](rapidjson::Document* doc, rapidjson::Document::AllocatorType* alloc) {
234-
std::vector<int32_t> sorted(file_meta.overflow_field_set.begin(),
235-
file_meta.overflow_field_set.end());
234+
std::vector<int32_t> sorted(field_meta.overflow_field_set.begin(),
235+
field_meta.overflow_field_set.end());
236236
std::sort(sorted.begin(), sorted.end());
237237
for (int32_t field_id : sorted) {
238238
doc->PushBack(field_id, *alloc);
@@ -308,26 +308,26 @@ Result<std::set<int32_t>> DeserializeOverflowSet(const std::string& json_str) {
308308

309309
} // namespace
310310

311-
Status MapSharedShreddingUtils::SerializeMetadata(const MapSharedShreddingFieldMeta& file_meta,
311+
Status MapSharedShreddingUtils::SerializeMetadata(const MapSharedShreddingFieldMeta& field_meta,
312312
const std::string& compression,
313313
arrow::KeyValueMetadata* metadata) {
314314
metadata->Append(MapShreddingDefine::kStorageLayout,
315315
MapShreddingDefine::kStorageLayoutSharedShredding);
316316
metadata->Append(MapSharedShreddingDefine::kVersion,
317317
std::to_string(MapSharedShreddingDefine::kCurrentVersion));
318318

319-
std::string field_dict_json = SerializeFieldDict(file_meta);
319+
std::string field_dict_json = SerializeFieldDict(field_meta);
320320
metadata->Append(MapSharedShreddingDefine::kFieldDictOriginalSize,
321321
std::to_string(field_dict_json.size()));
322322
PAIMON_ASSIGN_OR_RAISE(std::string compressed_dict,
323323
CompressString(field_dict_json, compression));
324324
metadata->Append(MapSharedShreddingDefine::kFieldDict, std::move(compressed_dict));
325325

326-
metadata->Append(MapSharedShreddingDefine::kFieldColumns, SerializeFieldColumns(file_meta));
327-
metadata->Append(MapSharedShreddingDefine::kOverflowSet, SerializeOverflowSet(file_meta));
328-
metadata->Append(MapSharedShreddingDefine::kNumColumns, std::to_string(file_meta.num_columns));
326+
metadata->Append(MapSharedShreddingDefine::kFieldColumns, SerializeFieldColumns(field_meta));
327+
metadata->Append(MapSharedShreddingDefine::kOverflowSet, SerializeOverflowSet(field_meta));
328+
metadata->Append(MapSharedShreddingDefine::kNumColumns, std::to_string(field_meta.num_columns));
329329
metadata->Append(MapSharedShreddingDefine::kMaxRowWidth,
330-
std::to_string(file_meta.max_row_width));
330+
std::to_string(field_meta.max_row_width));
331331

332332
return Status::OK();
333333
}

src/paimon/common/data/shredding/map_shared_shredding_utils.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class MapSharedShreddingUtils {
8585
/// @param field_meta The field-level shredding metadata to serialize.
8686
/// @param compression Compression codec name for field_dict compression.
8787
/// @param[out] metadata The KeyValueMetadata to append entries to.
88-
static Status SerializeMetadata(const MapSharedShreddingFieldMeta& file_meta,
88+
static Status SerializeMetadata(const MapSharedShreddingFieldMeta& field_meta,
8989
const std::string& compression,
9090
arrow::KeyValueMetadata* metadata);
9191

0 commit comments

Comments
 (0)