From 297676eac29104b9b2bd684c07b1a5b4e40aa2db Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Wed, 16 Aug 2023 15:34:35 +0200 Subject: [PATCH 1/2] update duckdb, apply patch --- duckdb | 2 +- src/common/iceberg.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/duckdb b/duckdb index 35fde53..dc33a3d 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 35fde53437d93697136953ef4e23d89bf35018b2 +Subproject commit dc33a3d962c1257d31c66a6de4e1e0742e3e8141 diff --git a/src/common/iceberg.cpp b/src/common/iceberg.cpp index 9f43afd..ebea592 100644 --- a/src/common/iceberg.cpp +++ b/src/common/iceberg.cpp @@ -138,7 +138,7 @@ IcebergSnapshot IcebergSnapshot::ParseSnapShot(yyjson_val *snapshot) { idx_t IcebergSnapshot::GetTableVersion(string &path, FileSystem &fs) { auto meta_path = fs.JoinPath(path, "metadata"); - auto version_file_path = FileSystem::JoinPath(meta_path, "version-hint.text"); + auto version_file_path = fs.JoinPath(meta_path, "version-hint.text"); auto version_file_content = IcebergUtils::FileToString(version_file_path, fs); try { From 70548cfa3243121dfaf00cd86c6ddfa6c6143a3e Mon Sep 17 00:00:00 2001 From: Sam Ansmink Date: Wed, 16 Aug 2023 16:57:40 +0200 Subject: [PATCH 2/2] rename from upstream duckdb --- .github/workflows/Linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index 1d03c62..d017e26 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -72,7 +72,7 @@ jobs: - name: Setup Ubuntu if: ${{ matrix.arch == 'linux_amd64' || matrix.arch == 'linux_arm64' }} - uses: ./duckdb/.github/actions/ubuntu_16_setup + uses: ./duckdb/.github/actions/ubuntu_18_setup with: aarch64_cross_compile: 1