Skip to content

Commit 05ce98c

Browse files
committed
fix conficts
1 parent 49a1b72 commit 05ce98c

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/iceberg/table_metadata.cc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
#include <ranges>
3030
#include <string>
3131
#include <unordered_map>
32+
#include <unordered_set>
3233
#include <utility>
3334

3435
#include <nlohmann/json.hpp>
@@ -426,7 +427,7 @@ class TableMetadataBuilder::Impl {
426427
Status SetDefaultSortOrder(int32_t order_id);
427428
Result<int32_t> AddSortOrder(const SortOrder& order);
428429
Status SetProperties(const std::unordered_map<std::string, std::string>& updated);
429-
Status RemoveProperties(const std::vector<std::string>& removed);
430+
Status RemoveProperties(const std::unordered_set<std::string>& removed);
430431

431432
std::unique_ptr<TableMetadata> Build();
432433

@@ -590,7 +591,7 @@ Status TableMetadataBuilder::Impl::SetProperties(
590591
}
591592

592593
Status TableMetadataBuilder::Impl::RemoveProperties(
593-
const std::vector<std::string>& removed) {
594+
const std::unordered_set<std::string>& removed) {
594595
// If removed is empty, return early (no-op)
595596
if (removed.empty()) {
596597
return {};
@@ -820,7 +821,7 @@ TableMetadataBuilder& TableMetadataBuilder::SetProperties(
820821
}
821822

822823
TableMetadataBuilder& TableMetadataBuilder::RemoveProperties(
823-
const std::vector<std::string>& removed) {
824+
const std::unordered_set<std::string>& removed) {
824825
ICEBERG_BUILDER_RETURN_IF_ERROR(impl_->RemoveProperties(removed));
825826
return *this;
826827
}

0 commit comments

Comments
 (0)