Skip to content

Commit b89a685

Browse files
plusplusjiajiaplusplusjiajia
authored
[fs] Extract jindo dls to separate module (#7263)
1 parent 6af6711 commit b89a685

File tree

7 files changed

+203
-54
lines changed

7 files changed

+203
-54
lines changed

‎paimon-filesystems/paimon-jindo/pom.xml‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -123,58 +123,5 @@
123123
<version>1.1.3</version>
124124
<scope>test</scope>
125125
</dependency>
126-
127-
<dependency>
128-
<groupId>org.apache.hadoop</groupId>
129-
<artifactId>hadoop-hdfs</artifactId>
130-
<version>${hadoop.version}</version>
131-
<scope>test</scope>
132-
<type>test-jar</type>
133-
<exclusions>
134-
<exclusion>
135-
<groupId>log4j</groupId>
136-
<artifactId>log4j</artifactId>
137-
</exclusion>
138-
<exclusion>
139-
<groupId>ch.qos.reload4j</groupId>
140-
<artifactId>reload4j</artifactId>
141-
</exclusion>
142-
<exclusion>
143-
<groupId>org.slf4j</groupId>
144-
<artifactId>slf4j-reload4j</artifactId>
145-
</exclusion>
146-
</exclusions>
147-
</dependency>
148-
149-
<dependency>
150-
<groupId>org.apache.hadoop</groupId>
151-
<artifactId>hadoop-common</artifactId>
152-
<scope>test</scope>
153-
<type>test-jar</type>
154-
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
155-
<exclusions>
156-
<exclusion>
157-
<groupId>log4j</groupId>
158-
<artifactId>log4j</artifactId>
159-
</exclusion>
160-
<exclusion>
161-
<groupId>org.slf4j</groupId>
162-
<artifactId>slf4j-log4j12</artifactId>
163-
</exclusion>
164-
<exclusion>
165-
<!-- This dependency is no longer shipped with the JDK since Java 9.-->
166-
<groupId>jdk.tools</groupId>
167-
<artifactId>jdk.tools</artifactId>
168-
</exclusion>
169-
<exclusion>
170-
<groupId>ch.qos.reload4j</groupId>
171-
<artifactId>reload4j</artifactId>
172-
</exclusion>
173-
<exclusion>
174-
<groupId>org.slf4j</groupId>
175-
<artifactId>slf4j-reload4j</artifactId>
176-
</exclusion>
177-
</exclusions>
178-
</dependency>
179126
</dependencies>
180127
</project>

‎paimon-filesystems/paimon-jindo/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,4 +14,3 @@
1414
# limitations under the License.
1515

1616
org.apache.paimon.jindo.JindoLoader
17-
org.apache.paimon.jindodls.JindoDLSLoader

‎paimon-filesystems/paimon-jindodls/pom.xml‎

Lines changed: 186 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,186 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
~ Licensed to the Apache Software Foundation (ASF) under one
4+
~ or more contributor license agreements. See the NOTICE file
5+
~ distributed with this work for additional information
6+
~ regarding copyright ownership. The ASF licenses this file
7+
~ to you under the Apache License, Version 2.0 (the
8+
~ "License"); you may not use this file except in compliance
9+
~ with the License. You may obtain a copy of the License at
10+
~
11+
~ http://www.apache.org/licenses/LICENSE-2.0
12+
~
13+
~ Unless required by applicable law or agreed to in writing, software
14+
~ distributed under the License is distributed on an "AS IS" BASIS,
15+
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
16+
~ See the License for the specific language governing permissions and
17+
~ limitations under the License.
18+
-->
19+
<project xmlns="http://maven.apache.org/POM/4.0.0"
20+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
22+
<modelVersion>4.0.0</modelVersion>
23+
24+
<parent>
25+
<artifactId>paimon-filesystems</artifactId>
26+
<groupId>org.apache.paimon</groupId>
27+
<version>1.4-SNAPSHOT</version>
28+
</parent>
29+
30+
<artifactId>paimon-jindodls</artifactId>
31+
<name>Paimon : FileSystems : Jindo DLS</name>
32+
<packaging>jar</packaging>
33+
34+
<properties>
35+
<jindodata.version>6.9.1</jindodata.version>
36+
</properties>
37+
38+
<repositories>
39+
<repository>
40+
<id>jindodata</id>
41+
<url>https://jindodata-binary.oss-cn-shanghai.aliyuncs.com/mvn-repo/</url>
42+
</repository>
43+
</repositories>
44+
45+
<dependencies>
46+
<dependency>
47+
<groupId>org.apache.paimon</groupId>
48+
<artifactId>paimon-jindo</artifactId>
49+
<version>${project.version}</version>
50+
<scope>provided</scope>
51+
</dependency>
52+
<dependency>
53+
<groupId>org.apache.paimon</groupId>
54+
<artifactId>paimon-common</artifactId>
55+
<version>${project.version}</version>
56+
<scope>provided</scope>
57+
</dependency>
58+
59+
<dependency>
60+
<groupId>org.apache.hadoop</groupId>
61+
<artifactId>hadoop-common</artifactId>
62+
<version>${hadoop.version}</version>
63+
<scope>provided</scope>
64+
<exclusions>
65+
<exclusion>
66+
<groupId>*</groupId>
67+
<artifactId>*</artifactId>
68+
</exclusion>
69+
</exclusions>
70+
</dependency>
71+
72+
<dependency>
73+
<groupId>com.aliyun.jindodata</groupId>
74+
<artifactId>jindo-core</artifactId>
75+
<version>${jindodata.version}</version>
76+
<scope>provided</scope>
77+
<exclusions>
78+
<exclusion>
79+
<groupId>*</groupId>
80+
<artifactId>*</artifactId>
81+
</exclusion>
82+
</exclusions>
83+
</dependency>
84+
85+
<dependency>
86+
<groupId>com.aliyun.jindodata</groupId>
87+
<artifactId>jindo-sdk</artifactId>
88+
<version>${jindodata.version}</version>
89+
<scope>provided</scope>
90+
<exclusions>
91+
<exclusion>
92+
<groupId>*</groupId>
93+
<artifactId>*</artifactId>
94+
</exclusion>
95+
</exclusions>
96+
</dependency>
97+
98+
<dependency>
99+
<groupId>org.apache.hadoop</groupId>
100+
<artifactId>hadoop-hdfs-client</artifactId>
101+
<version>${hadoop.version}</version>
102+
<scope>test</scope>
103+
<exclusions>
104+
<exclusion>
105+
<groupId>org.apache.avro</groupId>
106+
<artifactId>avro</artifactId>
107+
</exclusion>
108+
<exclusion>
109+
<groupId>log4j</groupId>
110+
<artifactId>log4j</artifactId>
111+
</exclusion>
112+
<exclusion>
113+
<groupId>org.slf4j</groupId>
114+
<artifactId>slf4j-log4j12</artifactId>
115+
</exclusion>
116+
</exclusions>
117+
</dependency>
118+
119+
<dependency>
120+
<groupId>commons-collections</groupId>
121+
<artifactId>commons-collections</artifactId>
122+
<version>3.2.2</version>
123+
<scope>test</scope>
124+
</dependency>
125+
126+
<dependency>
127+
<groupId>commons-logging</groupId>
128+
<artifactId>commons-logging</artifactId>
129+
<version>1.1.3</version>
130+
<scope>test</scope>
131+
</dependency>
132+
133+
<dependency>
134+
<groupId>org.apache.hadoop</groupId>
135+
<artifactId>hadoop-hdfs</artifactId>
136+
<version>${hadoop.version}</version>
137+
<scope>test</scope>
138+
<type>test-jar</type>
139+
<exclusions>
140+
<exclusion>
141+
<groupId>log4j</groupId>
142+
<artifactId>log4j</artifactId>
143+
</exclusion>
144+
<exclusion>
145+
<groupId>ch.qos.reload4j</groupId>
146+
<artifactId>reload4j</artifactId>
147+
</exclusion>
148+
<exclusion>
149+
<groupId>org.slf4j</groupId>
150+
<artifactId>slf4j-reload4j</artifactId>
151+
</exclusion>
152+
</exclusions>
153+
</dependency>
154+
155+
<dependency>
156+
<groupId>org.apache.hadoop</groupId>
157+
<artifactId>hadoop-common</artifactId>
158+
<scope>test</scope>
159+
<type>test-jar</type>
160+
<version>${hadoop.version}</version><!--$NO-MVN-MAN-VER$-->
161+
<exclusions>
162+
<exclusion>
163+
<groupId>log4j</groupId>
164+
<artifactId>log4j</artifactId>
165+
</exclusion>
166+
<exclusion>
167+
<groupId>org.slf4j</groupId>
168+
<artifactId>slf4j-log4j12</artifactId>
169+
</exclusion>
170+
<exclusion>
171+
<!-- This dependency is no longer shipped with the JDK since Java 9.-->
172+
<groupId>jdk.tools</groupId>
173+
<artifactId>jdk.tools</artifactId>
174+
</exclusion>
175+
<exclusion>
176+
<groupId>ch.qos.reload4j</groupId>
177+
<artifactId>reload4j</artifactId>
178+
</exclusion>
179+
<exclusion>
180+
<groupId>org.slf4j</groupId>
181+
<artifactId>slf4j-reload4j</artifactId>
182+
</exclusion>
183+
</exclusions>
184+
</dependency>
185+
</dependencies>
186+
</project>

paimon-filesystems/paimon-jindo/src/main/java/org/apache/paimon/jindodls/JindoDLSLoader.java renamed to paimon-filesystems/paimon-jindodls/src/main/java/org/apache/paimon/jindodls/JindoDLSLoader.java

File renamed without changes.

‎paimon-filesystems/paimon-jindodls/src/main/resources/META-INF/services/org.apache.paimon.fs.FileIOLoader‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one or more
2+
# contributor license agreements. See the NOTICE file distributed with
3+
# this work for additional information regarding copyright ownership.
4+
# The ASF licenses this file to You under the Apache License, Version 2.0
5+
# (the "License"); you may not use this file except in compliance with
6+
# the License. You may obtain a copy of the License at
7+
#
8+
# http://www.apache.org/licenses/LICENSE-2.0
9+
#
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+
16+
org.apache.paimon.jindodls.JindoDLSLoader

paimon-filesystems/paimon-jindo/src/test/java/org/apache/paimon/jindodls/DLSFileIOTest.java renamed to paimon-filesystems/paimon-jindodls/src/test/java/org/apache/paimon/jindodls/DLSFileIOTest.java

File renamed without changes.

‎paimon-filesystems/pom.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<module>paimon-cosn</module>
4343
<module>paimon-cosn-impl</module>
4444
<module>paimon-jindo</module>
45+
<module>paimon-jindodls</module>
4546
<module>paimon-gs</module>
4647
<module>paimon-gs-impl</module>
4748
<module>paimon-azure</module>

0 commit comments

Comments
 (0)