Skip to content

Commit f21e88e

Browse files
committed
try to fix windows ci
1 parent 66f982a commit f21e88e

File tree

3 files changed

+28
-69
lines changed

3 files changed

+28
-69
lines changed

src/iceberg/name_mapping.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,12 @@ class ICEBERG_EXPORT MappedFields {
7676

7777
friend bool operator==(const MappedFields& lhs, const MappedFields& rhs);
7878

79+
MappedFields(const MappedFields& other) = delete;
80+
MappedFields& operator=(const MappedFields& other) = delete;
81+
82+
MappedFields(MappedFields&& other) noexcept = default;
83+
MappedFields& operator=(MappedFields&& other) noexcept = default;
84+
7985
private:
8086
explicit MappedFields(std::vector<MappedField> fields);
8187

src/iceberg/util/checked_cast_internal.h

Lines changed: 0 additions & 61 deletions
This file was deleted.

test/name_mapping_test.cc

Lines changed: 22 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -176,16 +176,30 @@ TEST_F(NameMappingTest, MappedFieldsAccess) {
176176
}
177177

178178
TEST_F(NameMappingTest, ToString) {
179-
auto mapping = MakeNameMapping();
180-
auto expected = R"([
181-
([bar, foo] -> 1)
182-
([baz] -> 2)
183-
([qux] -> 3, [([hello] -> 4), ([world] -> 5)])
179+
{
180+
std::vector<MappedField> fields;
181+
fields.emplace_back(MappedField{.names = {"foo"}, .field_id = 1});
182+
183+
std::vector<MappedField> nested_fields;
184+
nested_fields.emplace_back(MappedField{.names = {"hello"}, .field_id = 3});
185+
nested_fields.emplace_back(MappedField{.names = {"world"}, .field_id = 4});
186+
auto nested_mapping = MappedFields::Make(std::move(nested_fields));
187+
fields.emplace_back(MappedField{
188+
.names = {"bar"}, .field_id = 2, .nested_mapping = std::move(nested_mapping)});
189+
190+
auto mapping = NameMapping::Make(std::move(fields));
191+
192+
auto expected = R"([
193+
([foo] -> 1)
194+
([bar] -> 2, [([hello] -> 3), ([world] -> 4)])
184195
])";
185-
EXPECT_EQ(ToString(*mapping), expected);
196+
EXPECT_EQ(ToString(*mapping), expected);
197+
}
186198

187-
auto empty_mapping = NameMapping::MakeEmpty();
188-
EXPECT_EQ(ToString(*empty_mapping), "[]");
199+
{
200+
auto empty_mapping = NameMapping::MakeEmpty();
201+
EXPECT_EQ(ToString(*empty_mapping), "[]");
202+
}
189203
}
190204

191205
} // namespace iceberg

0 commit comments

Comments
 (0)