Skip to content

Commit f4e241a

Browse files
format code
1 parent 75f5be0 commit f4e241a

2 files changed

Lines changed: 18 additions & 10 deletions

File tree

src/iceberg/avro/avro_schema_util.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,8 @@ Status ToAvroNodeVisitor::Visit(const StructType& type, ::avro::NodePtr* node) {
236236

237237
std::string origFieldName = std::string(sub_field.name());
238238
bool isValidFieldName = ValidAvroName(origFieldName);
239-
std::string fieldName = isValidFieldName ? origFieldName : SanitizeFieldName(origFieldName);
239+
std::string fieldName =
240+
isValidFieldName ? origFieldName : SanitizeFieldName(origFieldName);
240241

241242
(*node)->addName(fieldName);
242243
(*node)->addLeaf(field_node);

test/avro_schema_test.cc

Lines changed: 16 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,13 @@ TEST(ToAvroNodeVisitorTest, StructTypeWithFieldNames) {
275275

276276
ASSERT_EQ(node->names(), 6);
277277

278-
EXPECT_EQ(node->nameAt(0), "user_x2Dname"); // "user-name" -> "user_x2Dname"
279-
EXPECT_EQ(node->nameAt(2), "email_x2Eaddress"); // "email.address" -> "email_x2Eaddress"
280-
EXPECT_EQ(node->nameAt(4), "_123field"); // "123field" -> "_123field"
281-
EXPECT_EQ(node->nameAt(5), "field_x20with_x20spaces"); // "field with spaces" -> "field_x20with_x20spaces"
278+
EXPECT_EQ(node->nameAt(0), "user_x2Dname"); // "user-name" -> "user_x2Dname"
279+
EXPECT_EQ(node->nameAt(2),
280+
"email_x2Eaddress"); // "email.address" -> "email_x2Eaddress"
281+
EXPECT_EQ(node->nameAt(4), "_123field"); // "123field" -> "_123field"
282+
EXPECT_EQ(
283+
node->nameAt(5),
284+
"field_x20with_x20spaces"); // "field with spaces" -> "field_x20with_x20spaces"
282285

283286
EXPECT_EQ(node->nameAt(1), "valid_field");
284287
EXPECT_EQ(node->nameAt(3), "AnotherField");
@@ -296,10 +299,14 @@ TEST(ToAvroNodeVisitorTest, StructTypeWithFieldNames) {
296299
EXPECT_FALSE(attrs1.getAttribute("iceberg-field-name").has_value());
297300
EXPECT_FALSE(attrs3.getAttribute("iceberg-field-name").has_value());
298301

299-
ASSERT_NO_FATAL_FAILURE(CheckIcebergFieldName(node, /*index=*/0, /*original_name=*/"user-name"));
300-
ASSERT_NO_FATAL_FAILURE(CheckIcebergFieldName(node, /*index=*/2, /*original_name=*/"email.address"));
301-
ASSERT_NO_FATAL_FAILURE(CheckIcebergFieldName(node, /*index=*/4, /*original_name=*/"123field"));
302-
ASSERT_NO_FATAL_FAILURE(CheckIcebergFieldName(node, /*index=*/5, /*original_name=*/"field with spaces"));
302+
ASSERT_NO_FATAL_FAILURE(
303+
CheckIcebergFieldName(node, /*index=*/0, /*original_name=*/"user-name"));
304+
ASSERT_NO_FATAL_FAILURE(
305+
CheckIcebergFieldName(node, /*index=*/2, /*original_name=*/"email.address"));
306+
ASSERT_NO_FATAL_FAILURE(
307+
CheckIcebergFieldName(node, /*index=*/4, /*original_name=*/"123field"));
308+
ASSERT_NO_FATAL_FAILURE(
309+
CheckIcebergFieldName(node, /*index=*/5, /*original_name=*/"field with spaces"));
303310
}
304311

305312

@@ -1558,4 +1565,4 @@ TEST_F(NameMappingAvroSchemaTest, MissingFieldIdError) {
15581565
auto result = MakeAvroNodeWithFieldIds(avro_schema.root(), *name_mapping);
15591566
ASSERT_THAT(result, IsError(ErrorKind::kInvalidSchema));
15601567
}
1561-
} // namespace iceberg::avro
1568+
} // namespace iceberg::avro

0 commit comments

Comments
 (0)