Skip to content

Commit

Permalink
[Fix-#]Shaded paimon (DataLinkDC#2912)
Browse files Browse the repository at this point in the history
* shaded-paimon

* shaded paimon

* shaded paimon
  • Loading branch information
gaoyan1998 authored Jan 5, 2024
1 parent 7d3ec39 commit 85ee58c
Show file tree
Hide file tree
Showing 5 changed files with 36 additions and 39 deletions.
6 changes: 3 additions & 3 deletions dinky-admin/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -292,9 +292,9 @@
</exclusions>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-bundle</artifactId>
<version>0.5.0-incubating</version>
<groupId>io.github.datalinkdc</groupId>
<artifactId>dinky-shaded-paimon</artifactId>
<version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,9 @@

import org.dinky.data.constant.PaimonTableConstant;
import org.dinky.data.paimon.CacheData;
import org.dinky.shaded.paimon.data.BinaryString;
import org.dinky.utils.PaimonUtil;

import org.apache.paimon.data.BinaryString;

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,14 +31,13 @@
import org.dinky.mapper.MetricsMapper;
import org.dinky.service.JobInstanceService;
import org.dinky.service.MonitorService;
import org.dinky.shaded.paimon.data.BinaryString;
import org.dinky.shaded.paimon.data.Timestamp;
import org.dinky.shaded.paimon.predicate.Predicate;
import org.dinky.shaded.paimon.predicate.PredicateBuilder;
import org.dinky.utils.JsonUtils;
import org.dinky.utils.PaimonUtil;

import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateBuilder;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
Expand Down
4 changes: 2 additions & 2 deletions dinky-admin/src/main/java/org/dinky/utils/PaimonTypeUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@

package org.dinky.utils;

import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypes;
import org.dinky.shaded.paimon.types.DataType;
import org.dinky.shaded.paimon.types.DataTypes;

import java.math.BigDecimal;
import java.time.LocalDateTime;
Expand Down
53 changes: 26 additions & 27 deletions dinky-admin/src/main/java/org/dinky/utils/PaimonUtil.java
Original file line number Diff line number Diff line change
Expand Up @@ -26,33 +26,32 @@
import org.dinky.data.annotations.paimon.PartitionKey;
import org.dinky.data.annotations.paimon.PrimaryKey;
import org.dinky.function.constant.PathConstant;

import org.apache.paimon.catalog.Catalog;
import org.apache.paimon.catalog.CatalogContext;
import org.apache.paimon.catalog.CatalogFactory;
import org.apache.paimon.catalog.Identifier;
import org.apache.paimon.data.BinaryRow;
import org.apache.paimon.data.BinaryRowWriter;
import org.apache.paimon.data.BinaryString;
import org.apache.paimon.data.BinaryWriter;
import org.apache.paimon.data.InternalRow;
import org.apache.paimon.data.Timestamp;
import org.apache.paimon.fs.Path;
import org.apache.paimon.predicate.Predicate;
import org.apache.paimon.predicate.PredicateBuilder;
import org.apache.paimon.reader.RecordReader;
import org.apache.paimon.schema.Schema;
import org.apache.paimon.table.Table;
import org.apache.paimon.table.sink.BatchTableCommit;
import org.apache.paimon.table.sink.BatchTableWrite;
import org.apache.paimon.table.sink.BatchWriteBuilder;
import org.apache.paimon.table.sink.CommitMessage;
import org.apache.paimon.table.source.ReadBuilder;
import org.apache.paimon.table.source.Split;
import org.apache.paimon.table.source.TableRead;
import org.apache.paimon.types.DataField;
import org.apache.paimon.types.DataType;
import org.apache.paimon.types.DataTypeRoot;
import org.dinky.shaded.paimon.catalog.Catalog;
import org.dinky.shaded.paimon.catalog.CatalogContext;
import org.dinky.shaded.paimon.catalog.CatalogFactory;
import org.dinky.shaded.paimon.catalog.Identifier;
import org.dinky.shaded.paimon.data.BinaryRow;
import org.dinky.shaded.paimon.data.BinaryRowWriter;
import org.dinky.shaded.paimon.data.BinaryString;
import org.dinky.shaded.paimon.data.BinaryWriter;
import org.dinky.shaded.paimon.data.InternalRow;
import org.dinky.shaded.paimon.data.Timestamp;
import org.dinky.shaded.paimon.fs.Path;
import org.dinky.shaded.paimon.predicate.Predicate;
import org.dinky.shaded.paimon.predicate.PredicateBuilder;
import org.dinky.shaded.paimon.reader.RecordReader;
import org.dinky.shaded.paimon.schema.Schema;
import org.dinky.shaded.paimon.table.Table;
import org.dinky.shaded.paimon.table.sink.BatchTableCommit;
import org.dinky.shaded.paimon.table.sink.BatchTableWrite;
import org.dinky.shaded.paimon.table.sink.BatchWriteBuilder;
import org.dinky.shaded.paimon.table.sink.CommitMessage;
import org.dinky.shaded.paimon.table.source.ReadBuilder;
import org.dinky.shaded.paimon.table.source.Split;
import org.dinky.shaded.paimon.table.source.TableRead;
import org.dinky.shaded.paimon.types.DataField;
import org.dinky.shaded.paimon.types.DataType;
import org.dinky.shaded.paimon.types.DataTypeRoot;

import java.io.IOException;
import java.lang.reflect.Field;
Expand Down

0 comments on commit 85ee58c

Please sign in to comment.