Skip to content

Commit 7792896

Browse files
authored
Hive: Remove Hive runtime (apache#11801)
1 parent c7910bb commit 7792896

File tree

83 files changed

+113
-13058
lines changed

Some content is hidden

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

83 files changed

+113
-13058
lines changed

.github/labeler.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,10 +100,7 @@ ORC:
100100
HIVE:
101101
- changed-files:
102102
- any-glob-to-any-file: [
103-
'hive3/**/*',
104103
'hive-metastore/**/*',
105-
'hive-runtime/**/*',
106-
'hive3-orc-bundle/**/*'
107104
]
108105

109106
DATA:

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ on:
4848
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'mr/**'
51-
- 'hive3/**'
52-
- 'hive3-orc-bundle/**'
53-
- 'hive-runtime/**'
5451
- 'flink/**'
5552
- 'kafka-connect/**'
5653
- 'docs/**'
@@ -89,7 +86,7 @@ jobs:
8986
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
9087
restore-keys: ${{ runner.os }}-gradle-
9188
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
92-
- run: ./gradlew -DsparkVersions=3.5 -DscalaVersion=2.12 -DhiveVersions= -DkafkaVersions= -DflinkVersions= :iceberg-delta-lake:check -Pquick=true -x javadoc
89+
- run: ./gradlew -DsparkVersions=3.5 -DscalaVersion=2.12 -DkafkaVersions= -DflinkVersions= :iceberg-delta-lake:check -Pquick=true -x javadoc
9390
- uses: actions/upload-artifact@v4
9491
if: failure()
9592
with:
@@ -118,7 +115,7 @@ jobs:
118115
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
119116
restore-keys: ${{ runner.os }}-gradle-
120117
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
121-
- run: ./gradlew -DsparkVersions=3.5 -DscalaVersion=2.13 -DhiveVersions= -DkafkaVersions= -DflinkVersions= :iceberg-delta-lake:check -Pquick=true -x javadoc
118+
- run: ./gradlew -DsparkVersions=3.5 -DscalaVersion=2.13 -DkafkaVersions= -DflinkVersions= :iceberg-delta-lake:check -Pquick=true -x javadoc
122119
- uses: actions/upload-artifact@v4
123120
if: failure()
124121
with:

.github/workflows/flink-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,9 +48,6 @@ on:
4848
- '.asf.yaml'
4949
- 'dev/**'
5050
- 'mr/**'
51-
- 'hive3/**'
52-
- 'hive3-orc-bundle/**'
53-
- 'hive-runtime/**'
5451
- 'kafka-connect/**'
5552
- 'spark/**'
5653
- 'docs/**'
@@ -92,7 +89,7 @@ jobs:
9289
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
9390
restore-keys: ${{ runner.os }}-gradle-
9491
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
95-
- run: ./gradlew -DsparkVersions= -DhiveVersions= -DkafkaVersions= -DflinkVersions=${{ matrix.flink }} :iceberg-flink:iceberg-flink-${{ matrix.flink }}:check :iceberg-flink:iceberg-flink-runtime-${{ matrix.flink }}:check -Pquick=true -x javadoc
92+
- run: ./gradlew -DsparkVersions= -DkafkaVersions= -DflinkVersions=${{ matrix.flink }} :iceberg-flink:iceberg-flink-${{ matrix.flink }}:check :iceberg-flink:iceberg-flink-runtime-${{ matrix.flink }}:check -Pquick=true -x javadoc
9693
- uses: actions/upload-artifact@v4
9794
if: failure()
9895
with:

.github/workflows/hive-ci.yml

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -87,36 +87,7 @@ jobs:
8787
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
8888
restore-keys: ${{ runner.os }}-gradle-
8989
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
90-
- run: ./gradlew -DsparkVersions= -DhiveVersions=2 -DflinkVersions= -DkafkaVersions= -Pquick=true :iceberg-mr:check :iceberg-hive-runtime:check -x javadoc
91-
- uses: actions/upload-artifact@v4
92-
if: failure()
93-
with:
94-
name: test logs
95-
path: |
96-
**/build/testlogs
97-
98-
hive3-tests:
99-
runs-on: ubuntu-22.04
100-
strategy:
101-
matrix:
102-
jvm: [11, 17, 21]
103-
env:
104-
SPARK_LOCAL_IP: localhost
105-
steps:
106-
- uses: actions/checkout@v4
107-
- uses: actions/setup-java@v4
108-
with:
109-
distribution: zulu
110-
java-version: ${{ matrix.jvm }}
111-
- uses: actions/cache@v4
112-
with:
113-
path: |
114-
~/.gradle/caches
115-
~/.gradle/wrapper
116-
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
117-
restore-keys: ${{ runner.os }}-gradle-
118-
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
119-
- run: ./gradlew -DsparkVersions= -DhiveVersions=3 -DflinkVersions= -DkafkaVersions= -Pquick=true :iceberg-hive3-orc-bundle:check :iceberg-hive3:check :iceberg-hive-runtime:check -x javadoc
90+
- run: ./gradlew -DsparkVersions= -DflinkVersions= -DkafkaVersions= -Pquick=true :iceberg-mr:check -x javadoc
12091
- uses: actions/upload-artifact@v4
12192
if: failure()
12293
with:

.github/workflows/java-ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
8484
restore-keys: ${{ runner.os }}-gradle-
8585
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
86-
- run: ./gradlew check -DsparkVersions= -DhiveVersions= -DflinkVersions= -DkafkaVersions= -Pquick=true -x javadoc
86+
- run: ./gradlew check -DsparkVersions= -DflinkVersions= -DkafkaVersions= -Pquick=true -x javadoc
8787
- uses: actions/upload-artifact@v4
8888
if: failure()
8989
with:

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

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ on:
4949
- 'dev/**'
5050
- 'mr/**'
5151
- 'flink/**'
52-
- 'hive3/**'
53-
- 'hive3-orc-bundle/**'
54-
- 'hive-runtime/**'
5552
- 'spark/**'
5653
- 'docs/**'
5754
- 'site/**'
@@ -91,7 +88,7 @@ jobs:
9188
restore-keys: ${{ runner.os }}-gradle-
9289
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
9390
- run: |
94-
./gradlew -DsparkVersions= -DhiveVersions= -DflinkVersions= -DkafkaVersions=3 \
91+
./gradlew -DsparkVersions= -DflinkVersions= -DkafkaVersions=3 \
9592
:iceberg-kafka-connect:iceberg-kafka-connect-events:check \
9693
:iceberg-kafka-connect:iceberg-kafka-connect:check \
9794
:iceberg-kafka-connect:iceberg-kafka-connect-runtime:check \

.github/workflows/publish-snapshot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,4 +41,4 @@ jobs:
4141
- run: |
4242
./gradlew printVersion
4343
./gradlew -DallModules publishApachePublicationToMavenRepository -PmavenUser=${{ secrets.NEXUS_USER }} -PmavenPassword=${{ secrets.NEXUS_PW }}
44-
./gradlew -DflinkVersions= -DsparkVersions=3.3,3.4,3.5 -DscalaVersion=2.13 -DkafkaVersions=3 -DhiveVersions= publishApachePublicationToMavenRepository -PmavenUser=${{ secrets.NEXUS_USER }} -PmavenPassword=${{ secrets.NEXUS_PW }}
44+
./gradlew -DflinkVersions= -DsparkVersions=3.3,3.4,3.5 -DscalaVersion=2.13 -DkafkaVersions=3 publishApachePublicationToMavenRepository -PmavenUser=${{ secrets.NEXUS_USER }} -PmavenPassword=${{ secrets.NEXUS_PW }}

.github/workflows/spark-ci.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,6 @@ on:
4949
- 'dev/**'
5050
- 'site/**'
5151
- 'mr/**'
52-
- 'hive3/**'
53-
- 'hive3-orc-bundle/**'
54-
- 'hive-runtime/**'
5552
- 'flink/**'
5653
- 'kafka-connect/**'
5754
- 'docs/**'
@@ -102,7 +99,7 @@ jobs:
10299
tool-cache: false
103100
- run: echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
104101
- run: |
105-
./gradlew -DsparkVersions=${{ matrix.spark }} -DscalaVersion=${{ matrix.scala }} -DhiveVersions= -DflinkVersions= -DkafkaVersions= \
102+
./gradlew -DsparkVersions=${{ matrix.spark }} -DscalaVersion=${{ matrix.scala }} -DflinkVersions= -DkafkaVersions= \
106103
:iceberg-spark:iceberg-spark-${{ matrix.spark }}_${{ matrix.scala }}:check \
107104
:iceberg-spark:iceberg-spark-extensions-${{ matrix.spark }}_${{ matrix.scala }}:check \
108105
:iceberg-spark:iceberg-spark-runtime-${{ matrix.spark }}_${{ matrix.scala }}:check \

dev/stage-binaries.sh

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,9 @@
2121
SCALA_VERSION=2.12
2222
FLINK_VERSIONS=1.18,1.19,1.20
2323
SPARK_VERSIONS=3.3,3.4,3.5
24-
HIVE_VERSIONS=2,3
2524
KAFKA_VERSIONS=3
2625

27-
./gradlew -Prelease -DscalaVersion=$SCALA_VERSION -DflinkVersions=$FLINK_VERSIONS -DsparkVersions=$SPARK_VERSIONS -DhiveVersions=$HIVE_VERSIONS -DkafkaVersions=$KAFKA_VERSIONS publishApachePublicationToMavenRepository
26+
./gradlew -Prelease -DscalaVersion=$SCALA_VERSION -DflinkVersions=$FLINK_VERSIONS -DsparkVersions=$SPARK_VERSIONS -DkafkaVersions=$KAFKA_VERSIONS publishApachePublicationToMavenRepository
2827

2928
# Also publish Scala 2.13 Artifacts for versions that support it.
3029
# Flink does not yet support 2.13 (and is largely dropping a user-facing dependency on Scala). Hive doesn't need a Scala specification.

gradle.properties

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ jmhJsonOutputPath=build/reports/jmh/results.json
1818
jmhIncludeRegex=.*
1919
systemProp.defaultFlinkVersions=1.20
2020
systemProp.knownFlinkVersions=1.18,1.19,1.20
21-
systemProp.defaultHiveVersions=2
22-
systemProp.knownHiveVersions=2,3
2321
systemProp.defaultSparkVersions=3.5
2422
systemProp.knownSparkVersions=3.3,3.4,3.5
2523
systemProp.defaultKafkaVersions=3

0 commit comments

Comments
 (0)