Skip to content

Commit ea27138

Browse files
committed
Merge remote-tracking branch 'origin/main' into design/file-scan-delete-validation
# Conflicts: # crates/iceberg/src/arrow/caching_delete_file_loader.rs # crates/iceberg/src/delete_file_index.rs # crates/iceberg/src/scan/task.rs
2 parents 8330c6a + 3c91b39 commit ea27138

221 files changed

Lines changed: 13925 additions & 18202 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎.asf.yaml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ github:
9393
- c-thiel
9494
- mbutrovich
9595
- CTTY
96+
- comphead
9697
ghp_branch: gh-pages
9798
ghp_path: /
9899
copilot_code_review:

crates/sqllogictest/testdata/schedules/df_binary_predicate_pushdown.toml renamed to .github/labeler.yml

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
[engines]
19-
df = { type = "datafusion" }
20-
21-
[[steps]]
22-
engine = "df"
23-
slt = "df_test/binary_predicate_pushdown.slt"
18+
# Issue and pull request labeler configuration: https://github.com/github/issue-labeler
19+
# Labels issues and PRs whose title or body matches the regex.
20+
datafusion:
21+
- '/datafusion/i'

‎.github/workflows/audit.yml‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,7 @@ on:
3030
- "**/Cargo.lock"
3131

3232
pull_request:
33-
paths:
34-
- "**/Cargo.toml"
35-
- "**/Cargo.lock"
36-
- ".github/workflows/audit.yml"
33+
merge_group:
3734

3835
schedule:
3936
- cron: '0 0 * * *'

‎.github/workflows/bindings_python_ci.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
uses: $/.github/actions/setup-builder
9090
- name: Cache Rust artifacts
9191
if: runner.os != 'Linux'
92-
uses: swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
92+
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
9393
with:
9494
key: bindings-python
9595
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

‎.github/workflows/ci.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ jobs:
137137
uses: $/.github/actions/setup-builder
138138

139139
- name: Cache Rust artifacts
140-
uses: swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
140+
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
141141
with:
142142
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
143143

@@ -158,7 +158,7 @@ jobs:
158158
uses: $/.github/actions/setup-builder
159159

160160
- name: Cache Rust artifacts
161-
uses: swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
161+
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
162162
with:
163163
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
164164

@@ -199,7 +199,7 @@ jobs:
199199
uses: $/.github/actions/setup-builder
200200

201201
- name: Cache Rust artifacts
202-
uses: swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
202+
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
203203
with:
204204
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
205205

@@ -228,7 +228,7 @@ jobs:
228228
uses: $/.github/actions/setup-builder
229229

230230
- name: Cache Rust artifacts
231-
uses: swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
231+
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
232232
with:
233233
key: ${{ matrix.test-suite.name }}
234234
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}

crates/sqllogictest/testdata/schedules/df_insert_and_like.toml renamed to .github/workflows/labeler.yml

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#
12
# Licensed to the Apache Software Foundation (ASF) under one
23
# or more contributor license agreements. See the NOTICE file
34
# distributed with this work for additional information
@@ -14,14 +15,28 @@
1415
# KIND, either express or implied. See the License for the
1516
# specific language governing permissions and limitations
1617
# under the License.
18+
#
1719

18-
[engines]
19-
df = { type = "datafusion" }
20+
name: "Issue and Pull Request Labeler"
21+
on:
22+
issues:
23+
types: [opened, edited]
24+
pull_request_target: # zizmor: ignore[dangerous-triggers]
25+
types: [opened, edited]
2026

21-
[[steps]]
22-
engine = "df"
23-
slt = "df_test/insert_into.slt"
27+
permissions:
28+
contents: read
29+
issues: write
30+
pull-requests: write
2431

25-
[[steps]]
26-
engine = "df"
27-
slt = "df_test/like_predicate_pushdown.slt"
32+
jobs:
33+
triage:
34+
if: github.repository_owner == 'apache'
35+
runs-on: ubuntu-slim
36+
steps:
37+
- uses: github/issue-labeler@ccca1e16fcb66762200e616fc29b57b940c1cb67 # v3.5
38+
with:
39+
configuration-path: .github/labeler.yml # label -> regex rules
40+
enable-versioned-regex: 0 # required; 0 = no versioned configs
41+
include-title: 1 # match title
42+
include-body: 1 # match body (default)

‎.github/workflows/public-api.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
uses: $/.github/actions/setup-builder
4646

4747
- name: Cache Rust artifacts
48-
uses: swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
48+
uses: Swatinem/rust-cache@6323deb102c322ba6fcbdcafc7e3dddab59af2b6 # v2.9.2
4949
with:
5050
save-if: ${{ github.event_name == 'push' && github.ref == 'refs/heads/main' }}
5151

‎CHANGELOG.md‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,16 @@ All notable changes to this project will be documented in this file.
2424
The format is based on [Keep a Changelog](https://keepachangelog.com/)
2525
and this project adheres to [Semantic Versioning](https://semver.org/).
2626

27+
## [Unreleased]
28+
29+
### Breaking Changes
30+
31+
* `FileWrite::close`, `EncryptedOutputFile::write`, `ManifestListWriter::close`, and `PuffinWriter::close` now return `Result<io::FileMetadata>` instead of `Result<()>`. The returned size is the on-disk size, including encryption overhead. Custom `FileWrite` implementations must return the number of bytes stored.
32+
* `EncryptedOutputFile::key_metadata()` is replaced by `key_metadata_with_saved_file_metadata(&FileMetadata)`. Pass the metadata returned by `write()` or the writer's `close()` to include the stored length before encoding key metadata.
33+
* `EncryptedInputFile::metadata()` is now synchronous and derives the plaintext size from key metadata without a storage stat. Remove `.await` from calls to this method.
34+
* AGS1 readers now require `StandardKeyMetadata::file_length` and reject missing or invalid lengths without falling back to a storage stat. AGS1-encrypted manifests, manifest lists, and Puffin files written by earlier development builds without this field must be rewritten using a build that can still read them before upgrading. This matches the Java client's read contract.
35+
* `iceberg_catalog_loader::BoxedCatalogBuilder` has a new required method, `with_runtime`. Types implementing `CatalogBuilder` get it through the blanket impl; types implementing `BoxedCatalogBuilder` directly (for example, a wrapper around another `Box<dyn BoxedCatalogBuilder>`) must implement it, typically by forwarding the runtime to the builder they wrap.
36+
2737
## [v0.10.1] - 2026-07-28
2838

2939
* chore: Update crossbeam-epoch to 0.9.20, pin CI ruff version to 0.15.22 by @dannycjones in https://github.com/apache/iceberg-rust/pull/2911

0 commit comments

Comments
 (0)