Skip to content

Commit 03ac83e

Browse files
update code
1 parent 9288756 commit 03ac83e

File tree

2 files changed

+9
-9
lines changed

2 files changed

+9
-9
lines changed

src/iceberg/avro/avro_schema_util.cc

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ void SanitizeChar(char c, std::ostringstream& os) {
6767

6868
} // namespace
6969

70-
bool ValidAvroName(const std::string& name) {
70+
bool ValidAvroName(std::string_view name) {
7171
if (name.empty()) {
7272
return false;
7373
}
@@ -234,17 +234,17 @@ Status ToAvroNodeVisitor::Visit(const StructType& type, ::avro::NodePtr* node) {
234234
::avro::NodePtr field_node;
235235
ICEBERG_RETURN_UNEXPECTED(Visit(sub_field, &field_node));
236236

237-
std::string origFieldName = std::string(sub_field.name());
238-
bool isValidFieldName = ValidAvroName(origFieldName);
239-
std::string fieldName =
240-
isValidFieldName ? origFieldName : SanitizeFieldName(origFieldName);
237+
bool is_valid_field_name = ValidAvroName(sub_field.name());
238+
std::string field_name = is_valid_field_name ? std::string(sub_field.name())
239+
: SanitizeFieldName(sub_field.name());
241240

242-
(*node)->addName(fieldName);
241+
(*node)->addName(field_name);
243242
(*node)->addLeaf(field_node);
244243

245244
::avro::CustomAttributes attributes = GetAttributesWithFieldId(sub_field.field_id());
246-
if (!isValidFieldName) {
247-
attributes.addAttribute(std::string(kIcebergFieldNameProp), origFieldName,
245+
if (!is_valid_field_name) {
246+
attributes.addAttribute(std::string(kIcebergFieldNameProp),
247+
std::string(sub_field.name()),
248248
/*addQuotes=*/true);
249249
}
250250
(*node)->addCustomAttributesForField(attributes);

src/iceberg/avro/avro_schema_util_internal.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ bool HasMapLogicalType(const ::avro::NodePtr& node);
157157
///
158158
/// \param name The name to check.
159159
/// \return True if the name is valid, false otherwise.
160-
bool ValidAvroName(const std::string& name);
160+
bool ValidAvroName(std::string_view name);
161161

162162
/// \brief Create a new Avro node with field IDs from name mapping.
163163
/// \param original_node The original Avro node to copy.

0 commit comments

Comments
 (0)