This is an automated email from the ASF dual-hosted git repository.
lzljs3620320 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/paimon-trino.git
The following commit(s) were added to refs/heads/main by this push:
new 74f3dbd Support version down to 420 (#68)
74f3dbd is described below
commit 74f3dbd5d0b1b0a0283f5ad4f944bfb924d4df45
Author: YeJunHao <[email protected]>
AuthorDate: Fri Apr 26 11:55:20 2024 +0800
Support version down to 420 (#68)
---
.github/workflows/ci-jdk17.yml | 2 +-
.github/workflows/publish_snapshot_jdk17.yml | 2 +-
{paimon-trino-422 => paimon-trino-420}/pom.xml | 6 +++---
.../src/main/assembly/paimon.xml | 0
.../src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java | 2 +-
.../src/test/java/org/apache/paimon/trino/TestTrino420ITCase.java | 8 ++++----
.../src/test/resources/log4j2-test.properties | 0
.../src/test/java/org/apache/paimon/trino/TestTrino427ITCase.java | 2 +-
pom.xml | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/.github/workflows/ci-jdk17.yml b/.github/workflows/ci-jdk17.yml
index 3e9d15b..9712770 100644
--- a/.github/workflows/ci-jdk17.yml
+++ b/.github/workflows/ci-jdk17.yml
@@ -30,4 +30,4 @@ jobs:
java-version: 17
- name: Build
run: |
- mvn clean install -P '!toolchain' -pl
paimon-trino-common,paimon-trino-422,paimon-trino-427
+ mvn clean install -P '!toolchain' -pl
paimon-trino-common,paimon-trino-420,paimon-trino-427
diff --git a/.github/workflows/publish_snapshot_jdk17.yml
b/.github/workflows/publish_snapshot_jdk17.yml
index 322e1de..5b581ea 100644
--- a/.github/workflows/publish_snapshot_jdk17.yml
+++ b/.github/workflows/publish_snapshot_jdk17.yml
@@ -81,6 +81,6 @@ jobs:
echo "<password>$ASF_PASSWORD</password>" >> $tmp_settings
echo "</server></servers></settings>" >> $tmp_settings
- mvn --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip
-DskipTests -Papache-release -pl
paimon-trino-common,paimon-trino-422,paimon-trino-427
+ mvn --settings $tmp_settings clean deploy -Dgpg.skip -Drat.skip
-DskipTests -Papache-release -pl
paimon-trino-common,paimon-trino-420,paimon-trino-427
rm $tmp_settings
diff --git a/paimon-trino-422/pom.xml b/paimon-trino-420/pom.xml
similarity index 98%
rename from paimon-trino-422/pom.xml
rename to paimon-trino-420/pom.xml
index 691e174..f139787 100644
--- a/paimon-trino-422/pom.xml
+++ b/paimon-trino-420/pom.xml
@@ -28,13 +28,13 @@ under the License.
<version>0.8-SNAPSHOT</version>
</parent>
- <artifactId>paimon-trino-422</artifactId>
- <name>Paimon : Trino : 422</name>
+ <artifactId>paimon-trino-420</artifactId>
+ <name>Paimon : Trino : 420</name>
<properties>
<target.java.version>17</target.java.version>
<jdk.test.version>17</jdk.test.version>
- <trino.version>422</trino.version>
+ <trino.version>420</trino.version>
<airlift.version>235</airlift.version>
<slice.version>0.45</slice.version>
<maven.toolchains.plugin.version>3.1.0</maven.toolchains.plugin.version>
diff --git a/paimon-trino-422/src/main/assembly/paimon.xml
b/paimon-trino-420/src/main/assembly/paimon.xml
similarity index 100%
rename from paimon-trino-422/src/main/assembly/paimon.xml
rename to paimon-trino-420/src/main/assembly/paimon.xml
diff --git
a/paimon-trino-422/src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java
b/paimon-trino-420/src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java
similarity index 98%
rename from
paimon-trino-422/src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java
rename to
paimon-trino-420/src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java
index 94290ee..c9eca78 100644
---
a/paimon-trino-422/src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java
+++
b/paimon-trino-420/src/main/java/org/apache/paimon/trino/fileio/TrinoFileIO.java
@@ -90,7 +90,7 @@ public class TrinoFileIO implements FileIO {
public FileStatus[] listStatus(Path path) throws IOException {
List<FileStatus> fileStatusList = new ArrayList<>();
Location location = Location.of(path.toString());
- // In version trino 422, trinoFileSystem could only search for files
(directories don't
+ // In version trino 420, trinoFileSystem could only search for files
(directories don't
// count in files in trino)
// Therefore, this interface only return FileStatus those are file.
if (trinoFileSystem.directoryExists(location).orElse(false)) {
diff --git
a/paimon-trino-422/src/test/java/org/apache/paimon/trino/TestTrino422ITCase.java
b/paimon-trino-420/src/test/java/org/apache/paimon/trino/TestTrino420ITCase.java
similarity index 89%
rename from
paimon-trino-422/src/test/java/org/apache/paimon/trino/TestTrino422ITCase.java
rename to
paimon-trino-420/src/test/java/org/apache/paimon/trino/TestTrino420ITCase.java
index 68009d7..dbe0622 100644
---
a/paimon-trino-422/src/test/java/org/apache/paimon/trino/TestTrino422ITCase.java
+++
b/paimon-trino-420/src/test/java/org/apache/paimon/trino/TestTrino420ITCase.java
@@ -18,11 +18,11 @@
package org.apache.paimon.trino;
-/** {@link TestTrinoITCase} for Trino 422. */
-public class TestTrino422ITCase extends TestTrinoITCase {
+/** {@link TestTrinoITCase} for Trino 420. */
+public class TestTrino420ITCase extends TestTrinoITCase {
- public TestTrino422ITCase() {
- super(422);
+ public TestTrino420ITCase() {
+ super(420);
}
@Override
diff --git a/paimon-trino-422/src/test/resources/log4j2-test.properties
b/paimon-trino-420/src/test/resources/log4j2-test.properties
similarity index 100%
rename from paimon-trino-422/src/test/resources/log4j2-test.properties
rename to paimon-trino-420/src/test/resources/log4j2-test.properties
diff --git
a/paimon-trino-427/src/test/java/org/apache/paimon/trino/TestTrino427ITCase.java
b/paimon-trino-427/src/test/java/org/apache/paimon/trino/TestTrino427ITCase.java
index 28a979a..b36e176 100644
---
a/paimon-trino-427/src/test/java/org/apache/paimon/trino/TestTrino427ITCase.java
+++
b/paimon-trino-427/src/test/java/org/apache/paimon/trino/TestTrino427ITCase.java
@@ -18,7 +18,7 @@
package org.apache.paimon.trino;
-/** {@link TestTrinoITCase} for Trino 422. */
+/** {@link TestTrinoITCase} for Trino 427. */
public class TestTrino427ITCase extends TestTrinoITCase {
public TestTrino427ITCase() {
diff --git a/pom.xml b/pom.xml
index 6b5969c..7c6258d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -22,7 +22,7 @@ under the License.
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<modules>
- <module>paimon-trino-422</module>
+ <module>paimon-trino-420</module>
<module>paimon-trino-427</module>
<module>paimon-trino-common</module>
</modules>