Skip to content

Commit 7d38197

Browse files
authored
Merge branch 'apache:main' into test/read-batch+hashbucketing
2 parents 2247f59 + fcd5dd9 commit 7d38197

File tree

977 files changed

+40400
-11106
lines changed

Some content is hidden

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

977 files changed

+40400
-11106
lines changed

.asf.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ github:
3939
required_approving_review_count: 1
4040

4141
required_linear_history: true
42+
43+
del_branch_on_merge: true
4244

4345
features:
4446
wiki: true

.github/ISSUE_TEMPLATE/iceberg_bug_report.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,9 @@ body:
2828
description: What Apache Iceberg version are you using?
2929
multiple: false
3030
options:
31-
- "1.6.1 (latest release)"
31+
- "1.7.1 (latest release)"
32+
- "1.7.0"
33+
- "1.6.1"
3234
- "1.6.0"
3335
- "1.5.2"
3436
- "1.5.1"

.github/labeler.yml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -130,12 +130,6 @@ MR:
130130
'mr/**/*'
131131
]
132132

133-
PIG:
134-
- changed-files:
135-
- any-glob-to-any-file: [
136-
'pig/**/*'
137-
]
138-
139133
AWS:
140134
- changed-files:
141135
- any-glob-to-any-file: [

.github/workflows/delta-conversion-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,22 @@ on:
3737
- '.github/workflows/jmh-benchmarks-ci.yml'
3838
- '.github/workflows/kafka-connect-ci.yml'
3939
- '.github/workflows/labeler.yml'
40-
- '.github/workflows/licence-check.yml'
40+
- '.github/workflows/license-check.yml'
4141
- '.github/workflows/open-api.yml'
4242
- '.github/workflows/publish-snapshot.yml'
4343
- '.github/workflows/recurring-jmh-benchmarks.yml'
4444
- '.github/workflows/site-ci.yml'
4545
- '.github/workflows/spark-ci.yml'
4646
- '.github/workflows/stale.yml'
4747
- '.gitignore'
48-
- '.asf.yml'
48+
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'mr/**'
5151
- 'hive3/**'
5252
- 'hive3-orc-bundle/**'
5353
- 'hive-runtime/**'
5454
- 'flink/**'
5555
- 'kafka-connect/**'
56-
- 'pig/**'
5756
- 'docs/**'
5857
- 'site/**'
5958
- 'open-api/**'

.github/workflows/flink-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,22 @@ on:
3737
- '.github/workflows/jmh-benchmarks-ci.yml'
3838
- '.github/workflows/kafka-connect-ci.yml'
3939
- '.github/workflows/labeler.yml'
40-
- '.github/workflows/licence-check.yml'
40+
- '.github/workflows/license-check.yml'
4141
- '.github/workflows/open-api.yml'
4242
- '.github/workflows/publish-snapshot.yml'
4343
- '.github/workflows/recurring-jmh-benchmarks.yml'
4444
- '.github/workflows/site-ci.yml'
4545
- '.github/workflows/spark-ci.yml'
4646
- '.github/workflows/stale.yml'
4747
- '.gitignore'
48-
- '.asf.yml'
48+
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'mr/**'
5151
- 'hive3/**'
5252
- 'hive3-orc-bundle/**'
5353
- 'hive-runtime/**'
5454
- 'kafka-connect/**'
5555
- 'spark/**'
56-
- 'pig/**'
5756
- 'docs/**'
5857
- 'site/**'
5958
- 'open-api/**'

.github/workflows/hive-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,21 +37,20 @@ on:
3737
- '.github/workflows/jmh-benchmarks-ci.yml'
3838
- '.github/workflows/kafka-connect-ci.yml'
3939
- '.github/workflows/labeler.yml'
40-
- '.github/workflows/licence-check.yml'
40+
- '.github/workflows/license-check.yml'
4141
- '.github/workflows/open-api.yml'
4242
- '.github/workflows/publish-snapshot.yml'
4343
- '.github/workflows/recurring-jmh-benchmarks.yml'
4444
- '.github/workflows/site-ci.yml'
4545
- '.github/workflows/spark-ci.yml'
4646
- '.github/workflows/stale.yml'
4747
- '.gitignore'
48-
- '.asf.yml'
48+
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'arrow/**'
5151
- 'spark/**'
5252
- 'flink/**'
5353
- 'kafka-connect/**'
54-
- 'pig/**'
5554
- 'docs/**'
5655
- 'site/**'
5756
- 'open-api/**'

.github/workflows/java-ci.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,15 +37,15 @@ on:
3737
- '.github/workflows/jmh-benchmarks-ci.yml'
3838
- '.github/workflows/kafka-connect-ci.yml'
3939
- '.github/workflows/labeler.yml'
40-
- '.github/workflows/licence-check.yml'
40+
- '.github/workflows/license-check.yml'
4141
- '.github/workflows/open-api.yml'
4242
- '.github/workflows/publish-snapshot.yml'
4343
- '.github/workflows/recurring-jmh-benchmarks.yml'
4444
- '.github/workflows/site-ci.yml'
4545
- '.github/workflows/spark-ci.yml'
4646
- '.github/workflows/stale.yml'
4747
- '.gitignore'
48-
- '.asf.yml'
48+
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'docs/**'
5151
- 'site/**'

.github/workflows/kafka-connect-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,23 +37,22 @@ on:
3737
- '.github/workflows/java-ci.yml'
3838
- '.github/workflows/jmh-benchmarks-ci.yml'
3939
- '.github/workflows/labeler.yml'
40-
- '.github/workflows/licence-check.yml'
40+
- '.github/workflows/license-check.yml'
4141
- '.github/workflows/open-api.yml'
4242
- '.github/workflows/publish-snapshot.yml'
4343
- '.github/workflows/recurring-jmh-benchmarks.yml'
4444
- '.github/workflows/site-ci.yml'
4545
- '.github/workflows/spark-ci.yml'
4646
- '.github/workflows/stale.yml'
4747
- '.gitignore'
48-
- '.asf.yml'
48+
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'mr/**'
5151
- 'flink/**'
5252
- 'hive3/**'
5353
- 'hive3-orc-bundle/**'
5454
- 'hive-runtime/**'
5555
- 'spark/**'
56-
- 'pig/**'
5756
- 'docs/**'
5857
- 'site/**'
5958
- 'open-api/**'
Lines changed: 63 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,63 @@
1+
#
2+
# Licensed to the Apache Software Foundation (ASF) under one
3+
# or more contributor license agreements. See the NOTICE file
4+
# distributed with this work for additional information
5+
# regarding copyright ownership. The ASF licenses this file
6+
# to you under the Apache License, Version 2.0 (the
7+
# "License"); you may not use this file except in compliance
8+
# with the License. You may obtain a copy of the License at
9+
#
10+
# http://www.apache.org/licenses/LICENSE-2.0
11+
#
12+
# Unless required by applicable law or agreed to in writing,
13+
# software distributed under the License is distributed on an
14+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
# KIND, either express or implied. See the License for the
16+
# specific language governing permissions and limitations
17+
# under the License.
18+
#
19+
20+
name: Build and Push 'iceberg-rest-fixture' Docker Image
21+
22+
on:
23+
push:
24+
tags:
25+
- 'apache-iceberg-[0-9]+.[0-9]+.[0-9]+'
26+
workflow_dispatch:
27+
28+
env:
29+
DOCKER_IMAGE_TAG: iceberg-rest-fixture
30+
DOCKER_IMAGE_VERSION: latest
31+
DOCKER_REPOSITORY: apache
32+
33+
jobs:
34+
build:
35+
runs-on: ubuntu-latest
36+
steps:
37+
- uses: actions/checkout@v3
38+
- uses: actions/setup-java@v4
39+
with:
40+
distribution: zulu
41+
java-version: 21
42+
- name: Build Iceberg Open API project
43+
run: ./gradlew :iceberg-open-api:shadowJar
44+
- name: Login to Docker Hub
45+
run: |
46+
docker login -u ${{ secrets.DOCKERHUB_USER }} -p ${{ secrets.DOCKERHUB_TOKEN }}
47+
- name: Set the tagged version
48+
# for tag 'apache-iceberg-1.7.1', publish image 'apache/iceberg-rest-fixture:1.7.1'
49+
if: github.event_name == 'push' && contains(github.ref, 'refs/tags/')
50+
run: |
51+
echo "DOCKER_IMAGE_VERSION=`echo ${{ github.ref }} | tr -d -c 0-9.`" >> "$GITHUB_ENV"
52+
- name: Set up QEMU
53+
uses: docker/setup-qemu-action@v3
54+
- name: Set up Docker Buildx
55+
uses: docker/setup-buildx-action@v3
56+
- name: Build and Push
57+
uses: docker/build-push-action@v6
58+
with:
59+
context: ./
60+
file: ./docker/iceberg-rest-fixture/Dockerfile
61+
platforms: linux/amd64,linux/arm64
62+
push: true
63+
tags: ${{ env.DOCKER_REPOSITORY }}/${{ env.DOCKER_IMAGE_TAG }}:${{ env.DOCKER_IMAGE_VERSION }}

.github/workflows/spark-ci.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ on:
3838
- '.github/workflows/jmh-benchmarks-ci.yml'
3939
- '.github/workflows/kafka-connect-ci.yml'
4040
- '.github/workflows/labeler.yml'
41-
- '.github/workflows/licence-check.yml'
41+
- '.github/workflows/license-check.yml'
4242
- '.github/workflows/open-api.yml'
4343
- '.github/workflows/publish-snapshot.yml'
4444
- '.github/workflows/recurring-jmh-benchmarks.yml'
4545
- '.github/workflows/site-ci.yml'
4646
- '.github/workflows/stale.yml'
4747
- '.gitignore'
48-
- '.asf.yml'
48+
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'site/**'
5151
- 'mr/**'
@@ -54,7 +54,6 @@ on:
5454
- 'hive-runtime/**'
5555
- 'flink/**'
5656
- 'kafka-connect/**'
57-
- 'pig/**'
5857
- 'docs/**'
5958
- 'open-api/**'
6059
- 'format/**'

0 commit comments

Comments
 (0)