Skip to content

Commit 97bdb7c

Browse files
committed
fix ci
1 parent 412f6a4 commit 97bdb7c

5 files changed

Lines changed: 5 additions & 6 deletions

File tree

.clang-tidy

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Checks: |
2121
clang-analyzer-*,
2222
google-*,
2323
modernize-*,
24-
misc-include-cleaner,
2524
readability-identifier-naming,
2625
readability-isolate-declaration,
2726
-modernize-use-nodiscard,
@@ -42,7 +41,5 @@ CheckOptions:
4241
value: '_'
4342
- key: modernize-use-scoped-lock.WarnOnSingleLocks
4443
value: 'false'
45-
- key: misc-include-cleaner.IgnoreHeaders
46-
value: 'arrow/.*;avro/.*;aws/.*;cpr/.*;gmock/.*;gtest/.*;nanoarrow/.*;nlohmann/.*;parquet/.*;roaring/.*;spdlog/.*;sqlpp23/.*;thrift/.*'
4744

4845
HeaderFilterRegex: 'src/iceberg|example'

.github/workflows/aws_test.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,7 @@ jobs:
200200
- name: Build and test Iceberg
201201
shell: bash
202202
env:
203+
CMAKE_TOOLCHAIN_FILE: /usr/local/share/vcpkg/scripts/buildsystems/vcpkg.cmake
203204
CMAKE_PREFIX_PATH: /usr/local/share/vcpkg/installed/x64-linux
204205
run: |
205206
meson setup builddir -Dsigv4=enabled

src/iceberg/transaction.cc

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,8 @@ const TableMetadata& TransactionContext::current() const {
8787
return metadata_builder->current();
8888
}
8989

90-
Result<std::unique_ptr<LocationProvider>> TransactionContext::LocationProvider() const {
90+
Result<std::unique_ptr<LocationProvider>> TransactionContext::NewLocationProvider()
91+
const {
9192
return iceberg::LocationProvider::Make(current().location, current().properties);
9293
}
9394

src/iceberg/transaction.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ class ICEBERG_EXPORT TransactionContext {
188188
const TableMetadata* base() const;
189189
const TableMetadata& current() const;
190190
std::string MetadataFileLocation(std::string_view filename) const;
191-
Result<std::unique_ptr<LocationProvider>> LocationProvider() const;
191+
Result<std::unique_ptr<LocationProvider>> NewLocationProvider() const;
192192

193193
std::shared_ptr<Table> table;
194194
std::unique_ptr<TableMetadataBuilder> metadata_builder;

src/iceberg/update/merging_snapshot_update.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,7 @@ MergingSnapshotUpdate::MergeDVs() {
816816
return result;
817817
}
818818

819-
ICEBERG_ASSIGN_OR_RAISE(auto location_provider, ctx_->LocationProvider());
819+
ICEBERG_ASSIGN_OR_RAISE(auto location_provider, ctx_->NewLocationProvider());
820820
auto output_path = location_provider->NewDataLocation(
821821
std::format("merged-dvs-{}-{}.puffin", SnapshotId(), ++dv_merge_attempt_));
822822

0 commit comments

Comments
 (0)