Skip to content

Commit ed42c96

Browse files
kinoxyz1kinoxyz1
committed
[fixed-DTStack#1690][connection][arctic] Update arctic version
1 parent 264efc2 commit ed42c96

File tree

2 files changed

+131
-5
lines changed

2 files changed

+131
-5
lines changed

‎chunjun-connectors/chunjun-connector-arctic/pom.xml

+130-5
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,12 @@
3232
<name>ChunJun : Connector : Arctic</name>
3333

3434
<properties>
35-
<hadoop.version>2.7.5</hadoop.version>
36-
<iceberg.version>0.13.2</iceberg.version>
37-
<arctic.version>0.4.0</arctic.version>
35+
<iceberg.version>1.1.0</iceberg.version>
36+
<arctic.version>0.5.0-SNAPSHOT</arctic.version>
3837
<connector.dir>arctic</connector.dir>
38+
<hive.version>3.1.2</hive.version>
39+
<parquet.version>1.12.2</parquet.version>
40+
<hadoop.version>2.7.5</hadoop.version>
3941
</properties>
4042

4143
<dependencies>
@@ -67,7 +69,7 @@
6769
<dependency>
6870
<groupId>org.apache.hadoop</groupId>
6971
<artifactId>hadoop-common</artifactId>
70-
<version>${hadoop.version}</version>
72+
<version>${hadoop2.version}</version>
7173
<exclusions>
7274
<exclusion>
7375
<artifactId>commons-cli</artifactId>
@@ -92,8 +94,123 @@
9294

9395
<dependency>
9496
<groupId>com.netease.arctic</groupId>
95-
<artifactId>arctic-flink-1.12</artifactId>
97+
<artifactId>arctic-flink-1.15</artifactId>
9698
<version>${arctic.version}</version>
99+
<exclusions>
100+
<exclusion>
101+
<artifactId>parquet-hadoop-bundle</artifactId>
102+
<groupId>org.apache.parquet</groupId>
103+
</exclusion>
104+
</exclusions>
105+
</dependency>
106+
107+
<dependency>
108+
<groupId>org.apache.iceberg</groupId>
109+
<artifactId>iceberg-flink-1.15</artifactId>
110+
<version>${iceberg.version}</version>
111+
</dependency>
112+
113+
<!-- kino added -->
114+
<dependency>
115+
<groupId>org.apache.parquet</groupId>
116+
<artifactId>parquet-avro</artifactId>
117+
<version>${parquet.version}</version>
118+
</dependency>
119+
<dependency>
120+
<groupId>org.apache.parquet</groupId>
121+
<artifactId>parquet-hadoop-bundle</artifactId>
122+
<version>1.8.1</version>
123+
</dependency>
124+
<dependency>
125+
<groupId>org.apache.hive</groupId>
126+
<artifactId>hive-exec</artifactId>
127+
<version>${hive.version}</version>
128+
<exclusions>
129+
<exclusion>
130+
<artifactId>calcite-core</artifactId>
131+
<groupId>org.apache.calcite</groupId>
132+
</exclusion>
133+
<exclusion>
134+
<artifactId>calcite-avatica</artifactId>
135+
<groupId>org.apache.calcite</groupId>
136+
</exclusion>
137+
<exclusion>
138+
<artifactId>derby</artifactId>
139+
<groupId>org.apache.derby</groupId>
140+
</exclusion>
141+
<exclusion>
142+
<groupId>org.xerial.snappy</groupId>
143+
<artifactId>snappy-java</artifactId>
144+
</exclusion>
145+
<exclusion>
146+
<artifactId>slf4j-log4j12</artifactId>
147+
<groupId>org.slf4j</groupId>
148+
</exclusion>
149+
<exclusion>
150+
<artifactId>slf4j-api</artifactId>
151+
<groupId>org.slf4j</groupId>
152+
</exclusion>
153+
<exclusion>
154+
<artifactId>log4j</artifactId>
155+
<groupId>log4j</groupId>
156+
</exclusion>
157+
<exclusion>
158+
<artifactId>guava</artifactId>
159+
<groupId>com.google.guava</groupId>
160+
</exclusion>
161+
<exclusion>
162+
<artifactId>commons-logging</artifactId>
163+
<groupId>commons-logging</groupId>
164+
</exclusion>
165+
<exclusion>
166+
<artifactId>commons-lang</artifactId>
167+
<groupId>commons-lang</groupId>
168+
</exclusion>
169+
<exclusion>
170+
<artifactId>commons-cli</artifactId>
171+
<groupId>commons-cli</groupId>
172+
</exclusion>
173+
<exclusion>
174+
<artifactId>commons-io</artifactId>
175+
<groupId>commons-io</groupId>
176+
</exclusion>
177+
<exclusion>
178+
<artifactId>junit</artifactId>
179+
<groupId>junit</groupId>
180+
</exclusion>
181+
<exclusion>
182+
<artifactId>commons-codec</artifactId>
183+
<groupId>commons-codec</groupId>
184+
</exclusion>
185+
<exclusion>
186+
<artifactId>commons-httpclient</artifactId>
187+
<groupId>commons-httpclient</groupId>
188+
</exclusion>
189+
<exclusion>
190+
<groupId>org.apache.hadoop</groupId>
191+
<artifactId>hadoop-yarn-api</artifactId>
192+
</exclusion>
193+
<exclusion>
194+
<artifactId>hadoop-yarn-common</artifactId>
195+
<groupId>org.apache.hadoop</groupId>
196+
</exclusion>
197+
<exclusion>
198+
<artifactId>hadoop-yarn-server-applicationhistoryservice</artifactId>
199+
<groupId>org.apache.hadoop</groupId>
200+
</exclusion>
201+
<exclusion>
202+
<artifactId>hadoop-yarn-server-common</artifactId>
203+
<groupId>org.apache.hadoop</groupId>
204+
</exclusion>
205+
<exclusion>
206+
<artifactId>hadoop-yarn-server-resourcemanager</artifactId>
207+
<groupId>org.apache.hadoop</groupId>
208+
</exclusion>
209+
<exclusion>
210+
<groupId>org.apache.parquet</groupId>
211+
<artifactId>parquet-column</artifactId>
212+
</exclusion>
213+
</exclusions>
97214
</dependency>
98215
</dependencies>
99216

@@ -142,6 +259,14 @@
142259
<pattern>org.apache.avro</pattern>
143260
<shadedPattern>org.apache.flink.avro.shaded.org.apache.avro</shadedPattern>
144261
</relocation>
262+
<relocation>
263+
<pattern>org.apache.iceberg</pattern>
264+
<shadedPattern>shade.iceberg.org.apache.iceberg</shadedPattern>
265+
</relocation>
266+
<relocation>
267+
<pattern>org.apache.parquet.schema</pattern>
268+
<shadedPattern>shade.parquet.org.apache.parquet.schema</shadedPattern>
269+
</relocation>
145270
</relocations>
146271
</configuration>
147272
</execution>

‎chunjun-connectors/chunjun-connector-starrocks/src/main/java/com/dtstack/chunjun/connector/starrocks/converter/StarRocksRawTypeMapper.java

+1
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ public static DataType apply(TypeConfig type) {
6060
case "DATE":
6161
return DataTypes.DATE();
6262
case "DATETIME":
63+
case "TIMESTAMP":
6364
return DataTypes.TIMESTAMP(0);
6465
case "HLL":
6566
case "BITMAP":

0 commit comments

Comments
 (0)