Skip to content

Commit 68433a7

Browse files
authored
[Fix](package)Revert be-extension package management changes due to class loading issues (apache#58255)
apache#57979 This PR reverts recent modifications to the be-extension package management. The changes introduced class loading problems that caused the hadoop-jin catalog system tables to become unusable.
1 parent 67d6fa9 commit 68433a7

9 files changed

Lines changed: 67 additions & 25 deletions

File tree

‎fe/be-java-extensions/avro-scanner/pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ under the License.
4141
<artifactId>avro-mapred</artifactId>
4242
<version>${avro.version}</version>
4343
</dependency>
44+
<dependency>
45+
<groupId>org.apache.doris</groupId>
46+
<artifactId>java-common</artifactId>
47+
<version>${project.version}</version>
48+
</dependency>
4449
<dependency>
4550
<groupId>org.apache.hadoop</groupId>
4651
<artifactId>hadoop-client</artifactId>
@@ -58,8 +63,7 @@ under the License.
5863
</dependency>
5964
<dependency>
6065
<groupId>org.apache.doris</groupId>
61-
<artifactId>preload-extensions</artifactId>
62-
<version>${project.version}</version>
66+
<artifactId>hive-catalog-shade</artifactId>
6367
<scope>provided</scope>
6468
</dependency>
6569
</dependencies>

‎fe/be-java-extensions/hadoop-hudi-scanner/pom.xml‎

Lines changed: 28 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -39,35 +39,37 @@ under the License.
3939
<dependencies>
4040
<dependency>
4141
<groupId>org.apache.doris</groupId>
42-
<artifactId>preload-extensions</artifactId>
42+
<artifactId>java-common</artifactId>
4343
<version>${project.version}</version>
44-
<scope>provided</scope>
44+
<exclusions>
45+
<exclusion>
46+
<groupId>org.apache.thrift</groupId>
47+
<artifactId>libthrift</artifactId>
48+
</exclusion>
49+
</exclusions>
4550
</dependency>
51+
4652
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-client -->
4753
<dependency>
4854
<groupId>org.apache.hadoop</groupId>
4955
<artifactId>hadoop-hdfs-client</artifactId>
5056
<version>${hadoop.version}</version>
51-
<scope>provided</scope>
5257
</dependency>
5358

5459
<!-- https://mvnrepository.com/artifact/org.apache.hadoop/hadoop-common -->
5560
<dependency>
5661
<groupId>org.apache.hadoop</groupId>
5762
<artifactId>hadoop-common</artifactId>
58-
<scope>provided</scope>
5963
</dependency>
6064

6165
<dependency>
6266
<groupId>org.apache.hadoop</groupId>
6367
<artifactId>hadoop-aws</artifactId>
64-
<scope>provided</scope>
6568
</dependency>
6669

6770
<dependency>
6871
<groupId>org.apache.hadoop</groupId>
6972
<artifactId>hadoop-mapreduce-client-core</artifactId>
70-
<scope>provided</scope>
7173
</dependency>
7274

7375
<!-- https://mvnrepository.com/artifact/org.apache.hudi/hudi-common -->
@@ -116,6 +118,26 @@ under the License.
116118
<version>${parquet.version}</version>
117119
</dependency>
118120

121+
<!-- https://mvnrepository.com/artifact/org.apache.parquet/parquet-avro -->
122+
<dependency>
123+
<groupId>org.apache.parquet</groupId>
124+
<artifactId>parquet-avro</artifactId>
125+
<version>${parquet.version}</version>
126+
</dependency>
127+
128+
<!-- https://mvnrepository.com/artifact/org.apache.avro/avro -->
129+
<dependency>
130+
<groupId>org.apache.avro</groupId>
131+
<artifactId>avro</artifactId>
132+
<version>${avro.version}</version>
133+
<exclusions>
134+
<exclusion>
135+
<groupId>org.apache.commons</groupId>
136+
<artifactId>commons-compress</artifactId>
137+
</exclusion>
138+
</exclusions>
139+
</dependency>
140+
119141
<dependency>
120142
<groupId>io.airlift</groupId>
121143
<artifactId>concurrent</artifactId>

‎fe/be-java-extensions/iceberg-metadata-scanner/pom.xml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,16 @@ under the License.
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.apache.doris</groupId>
40-
<artifactId>preload-extensions</artifactId>
40+
<artifactId>java-common</artifactId>
4141
<version>${project.version}</version>
42-
<scope>provided</scope>
42+
<exclusions>
43+
<exclusion>
44+
<groupId>org.apache.thrift</groupId>
45+
<artifactId>libthrift</artifactId>
46+
</exclusion>
47+
</exclusions>
4348
</dependency>
49+
4450
<dependency>
4551
<groupId>org.apache.iceberg</groupId>
4652
<artifactId>iceberg-core</artifactId>

‎fe/be-java-extensions/java-udf/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,8 @@ under the License.
3838
<dependencies>
3939
<dependency>
4040
<groupId>org.apache.doris</groupId>
41-
<artifactId>preload-extensions</artifactId>
41+
<artifactId>java-common</artifactId>
4242
<version>${project.version}</version>
43-
<scope>provided</scope>
4443
</dependency>
4544
<!-- https://mvnrepository.com/artifact/com.esotericsoftware/reflectasm -->
4645
<dependency>

‎fe/be-java-extensions/jdbc-scanner/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ under the License.
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.apache.doris</groupId>
40-
<artifactId>preload-extensions</artifactId>
40+
<artifactId>java-common</artifactId>
4141
<version>${project.version}</version>
42-
<scope>provided</scope>
4342
</dependency>
4443
<dependency>
4544
<groupId>com.zaxxer</groupId>

‎fe/be-java-extensions/max-compute-scanner/pom.xml‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,8 @@ under the License.
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.apache.doris</groupId>
40-
<artifactId>preload-extensions</artifactId>
40+
<artifactId>java-common</artifactId>
4141
<version>${project.version}</version>
42-
<scope>provided</scope>
4342
</dependency>
4443
<dependency>
4544
<groupId>com.aliyun.odps</groupId>
@@ -72,6 +71,11 @@ under the License.
7271
</exclusion>
7372
</exclusions>
7473
</dependency>
74+
<dependency>
75+
<groupId>org.apache.arrow</groupId>
76+
<artifactId>arrow-memory-unsafe</artifactId>
77+
<version>${arrow.version}</version>
78+
</dependency>
7579
</dependencies>
7680

7781
<build>

‎fe/be-java-extensions/paimon-scanner/pom.xml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,14 @@ under the License.
3737
<dependencies>
3838
<dependency>
3939
<groupId>org.apache.doris</groupId>
40-
<artifactId>preload-extensions</artifactId>
40+
<artifactId>java-common</artifactId>
4141
<version>${project.version}</version>
42-
<scope>provided</scope>
4342
</dependency>
43+
<dependency>
44+
<groupId>org.apache.hadoop</groupId>
45+
<artifactId>hadoop-azure</artifactId>
46+
</dependency>
47+
4448
<dependency>
4549
<groupId>org.apache.paimon</groupId>
4650
<artifactId>paimon-core</artifactId>
@@ -59,6 +63,12 @@ under the License.
5963
<version>${paimon.version}</version>
6064
</dependency>
6165

66+
<dependency>
67+
<groupId>org.apache.doris</groupId>
68+
<artifactId>hive-catalog-shade</artifactId>
69+
<version>${doris.hive.catalog.shade.version}</version>
70+
</dependency>
71+
6272
</dependencies>
6373

6474
<build>

‎fe/be-java-extensions/preload-extensions/pom.xml‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,24 +36,22 @@ under the License.
3636
</properties>
3737

3838
<dependencies>
39-
<dependency>
40-
<groupId>org.apache.doris</groupId>
41-
<artifactId>java-common</artifactId>
42-
<version>${project.version}</version>
43-
</dependency>
4439
<dependency>
4540
<groupId>org.apache.arrow</groupId>
4641
<artifactId>arrow-memory-unsafe</artifactId>
4742
<version>${arrow.version}</version>
43+
<scope>compile</scope>
4844
</dependency>
4945
<dependency>
5046
<groupId>org.apache.parquet</groupId>
5147
<artifactId>parquet-avro</artifactId>
48+
<scope>compile</scope>
5249
</dependency>
5350
<dependency>
5451
<groupId>org.scala-lang</groupId>
5552
<artifactId>scala-library</artifactId>
5653
<version>${scala.version}</version>
54+
<scope>compile</scope>
5755
</dependency>
5856
<!-- For Avro and Hudi Scanner PreLoad -->
5957
<dependency>
@@ -87,6 +85,7 @@ under the License.
8785
<!-- version of spark's jackson module is error -->
8886
<groupId>com.fasterxml.jackson.module</groupId>
8987
<artifactId>jackson-module-scala_${scala.binary.version}</artifactId>
88+
<version>${jackson.version}</version>
9089
<exclusions>
9190
<exclusion>
9291
<groupId>com.google.guava</groupId>

‎fe/be-java-extensions/trino-connector-scanner/pom.xml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,8 @@ under the License.
3535
<dependencies>
3636
<dependency>
3737
<groupId>org.apache.doris</groupId>
38-
<artifactId>preload-extensions</artifactId>
38+
<artifactId>java-common</artifactId>
3939
<version>${project.version}</version>
40-
<scope>provided</scope>
4140
</dependency>
4241
<dependency>
4342
<groupId>io.trino</groupId>

0 commit comments

Comments
 (0)