Skip to content

Commit eebf18c

Browse files
committed
[Bug][Transform]fix custom udf throw exception
1 parent 372bc17 commit eebf18c

File tree

12 files changed

+20
-38
lines changed

12 files changed

+20
-38
lines changed

seatunnel-dist/src/main/assembly/assembly-bin-ci.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,6 @@
148148
<unpack>false</unpack>
149149
<includes>
150150
<include>org.apache.seatunnel:connector-*:jar</include>
151-
<include>org.apache.seatunnel:seatunnel-transforms-v2:jar</include>
152151
</includes>
153152
<excludes>
154153
<exclude>org.apache.seatunnel:connector-common</exclude>
@@ -195,6 +194,7 @@
195194
<include>org.apache.hive:hive-exec:jar</include>
196195
<include>org.apache.hive:hive-service:jar</include>
197196
<include>org.apache.thrift:libfb303:jar</include>
197+
<include>org.apache.seatunnel:seatunnel-transforms-v2:jar</include>
198198
</includes>
199199
<outputFileNameMapping>${artifact.file.name}</outputFileNameMapping>
200200
<outputDirectory>/lib</outputDirectory>

seatunnel-dist/src/main/assembly/assembly-bin.xml

+13-1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,19 @@
187187
<scope>provided</scope>
188188
</dependencySet>
189189

190+
<!-- ============ SeaTunnel Transforms-v2 Jar============ -->
191+
<dependencySet>
192+
<useProjectArtifact>false</useProjectArtifact>
193+
<useTransitiveDependencies>true</useTransitiveDependencies>
194+
<unpack>false</unpack>
195+
<includes>
196+
<include>org.apache.seatunnel:seatunnel-transforms-v2:jar</include>
197+
</includes>
198+
<outputFileNameMapping>${artifact.file.name}</outputFileNameMapping>
199+
<outputDirectory>/lib</outputDirectory>
200+
<scope>provided</scope>
201+
</dependencySet>
202+
190203
<!-- ============ Connectors Jars And Transforms V2 Jar ============ -->
191204
<!-- SeaTunnel connectors for Demo -->
192205
<dependencySet>
@@ -196,7 +209,6 @@
196209
<includes>
197210
<include>org.apache.seatunnel:connector-fake:jar</include>
198211
<include>org.apache.seatunnel:connector-console:jar</include>
199-
<include>org.apache.seatunnel:seatunnel-transforms-v2:jar</include>
200212
</includes>
201213
<outputDirectory>/connectors</outputDirectory>
202214
<scope>provided</scope>

seatunnel-e2e/seatunnel-e2e-common/src/test/java/org/apache/seatunnel/e2e/common/util/ContainerUtil.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public static void copySeaTunnelStarterToContainer(
205205
Paths.get(PROJECT_ROOT_PATH, "seatunnel-transforms-v2", "target", transformJar);
206206
container.withCopyFileToContainer(
207207
MountableFile.forHostPath(transformJarPath),
208-
Paths.get(seatunnelHomeInContainer, "connectors", transformJar).toString());
208+
Paths.get(seatunnelHomeInContainer, "lib", transformJar).toString());
209209

210210
// copy transform-udf
211211
String transformUdfJar = "seatunnel-transforms-v2-udf.jar";

seatunnel-e2e/seatunnel-transforms-v2-e2e/seatunnel-transforms-v2-e2e-udf/pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
-->
162
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
173
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
184
<modelVersion>4.0.0</modelVersion>

seatunnel-e2e/seatunnel-transforms-v2-e2e/seatunnel-transforms-v2-udf/pom.xml

-14
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,4 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2-
<!--
3-
Licensed to the Apache Software Foundation (ASF) under one or more
4-
contributor license agreements. See the NOTICE file distributed with
5-
this work for additional information regarding copyright ownership.
6-
The ASF licenses this file to You under the Apache License, Version 2.0
7-
(the "License"); you may not use this file except in compliance with
8-
the License. You may obtain a copy of the License at
9-
http://www.apache.org/licenses/LICENSE-2.0
10-
Unless required by applicable law or agreed to in writing, software
11-
distributed under the License is distributed on an "AS IS" BASIS,
12-
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13-
See the License for the specific language governing permissions and
14-
limitations under the License.
15-
-->
162
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
173
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
184
<modelVersion>4.0.0</modelVersion>

seatunnel-e2e/seatunnel-transforms-v2-e2e/seatunnel-transforms-v2-udf/src/main/java/org/apache/seatunnel/e2e/transform/udf/ExampleUdf.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import org.apache.seatunnel.api.table.type.BasicType;
2121
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
22-
import org.apache.seatunnel.api.transform.sql.ZetaUDF;
22+
import org.apache.seatunnel.transform.sql.zeta.functions.udf.ZetaUDF;
2323

2424
import com.google.auto.service.AutoService;
2525

seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/sql/zeta/ZetaSQLEngine.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@
2222
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
2323
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
2424
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
25-
import org.apache.seatunnel.api.transform.sql.ZetaUDF;
2625
import org.apache.seatunnel.common.exception.CommonErrorCodeDeprecated;
2726
import org.apache.seatunnel.transform.exception.TransformException;
2827
import org.apache.seatunnel.transform.sql.SQLEngine;
28+
import org.apache.seatunnel.transform.sql.zeta.functions.udf.ZetaUDF;
2929

3030
import org.apache.commons.collections4.CollectionUtils;
3131

seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/sql/zeta/ZetaSQLFunction.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import org.apache.seatunnel.api.table.type.SeaTunnelRow;
2626
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
2727
import org.apache.seatunnel.api.table.type.SqlType;
28-
import org.apache.seatunnel.api.transform.sql.ZetaUDF;
2928
import org.apache.seatunnel.common.exception.CommonErrorCodeDeprecated;
3029
import org.apache.seatunnel.common.exception.SeaTunnelRuntimeException;
3130
import org.apache.seatunnel.transform.exception.TransformException;
@@ -34,6 +33,7 @@
3433
import org.apache.seatunnel.transform.sql.zeta.functions.NumericFunction;
3534
import org.apache.seatunnel.transform.sql.zeta.functions.StringFunction;
3635
import org.apache.seatunnel.transform.sql.zeta.functions.SystemFunction;
36+
import org.apache.seatunnel.transform.sql.zeta.functions.udf.ZetaUDF;
3737

3838
import org.apache.commons.lang3.ArrayUtils;
3939
import org.apache.commons.lang3.tuple.Pair;

seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/sql/zeta/ZetaSQLType.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
2727
import org.apache.seatunnel.api.table.type.SeaTunnelRowType;
2828
import org.apache.seatunnel.api.table.type.SqlType;
29-
import org.apache.seatunnel.api.transform.sql.ZetaUDF;
3029
import org.apache.seatunnel.common.exception.CommonErrorCodeDeprecated;
3130
import org.apache.seatunnel.transform.exception.TransformException;
3231
import org.apache.seatunnel.transform.sql.zeta.functions.ArrayFunction;
32+
import org.apache.seatunnel.transform.sql.zeta.functions.udf.ZetaUDF;
3333

3434
import org.apache.commons.collections4.CollectionUtils;
3535

seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/sql/zeta/functions/udf/DesDecrypt.java

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.seatunnel.api.table.type.BasicType;
2121
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
22-
import org.apache.seatunnel.api.transform.sql.ZetaUDF;
2322

2423
import com.google.auto.service.AutoService;
2524

seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/sql/zeta/functions/udf/DesEncrypt.java

-1
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919

2020
import org.apache.seatunnel.api.table.type.BasicType;
2121
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
22-
import org.apache.seatunnel.api.transform.sql.ZetaUDF;
2322

2423
import com.google.auto.service.AutoService;
2524

seatunnel-api/src/main/java/org/apache/seatunnel/api/transform/sql/ZetaUDF.java renamed to seatunnel-transforms-v2/src/main/java/org/apache/seatunnel/transform/sql/zeta/functions/udf/ZetaUDF.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.seatunnel.api.transform.sql;
18+
package org.apache.seatunnel.transform.sql.zeta.functions.udf;
1919

2020
import org.apache.seatunnel.api.table.type.SeaTunnelDataType;
2121

0 commit comments

Comments
 (0)