Skip to content

Commit 1542836

Browse files
committed
基于TIS transformer的主表与维表的宽表构建 datavane/tis#483
1 parent 1096771 commit 1542836

17 files changed

Lines changed: 680 additions & 52 deletions

File tree

tis-datax/tis-datax-doris-plugin/src/main/java/com/qlangtech/tis/plugin/datax/doris/DorisAutoCreateTable.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ protected final void appendExtraConstraint(BlockScriptBuffer ddlScript) {
287287

288288
protected DorisType convertType(IColMetaGetter col) {
289289

290-
final DorisType type = col.getType().accept((columnTokenRecognise));
290+
final DorisType type = Objects.requireNonNull(col.getType(), "col:" + col.getName() + " relevant colType can not be null") //
291+
.accept((columnTokenRecognise));
291292

292293
DorisType fixType = col.getType().accept(new DataType.PartialTypeVisitor<DorisType>() {
293294

tis-datax/tis-datax-local-executor/pom.xml

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,7 @@
3131
<artifactId>tis-datax-local-executor</artifactId>
3232
<packaging>tpi</packaging>
3333
<dependencies>
34-
<!--https://github.com/ben-manes/caffeine-->
35-
<dependency>
36-
<groupId>com.github.ben-manes.caffeine</groupId>
37-
<artifactId>caffeine</artifactId>
38-
<version>2.9.2</version>
39-
</dependency>
34+
4035

4136
<dependency>
4237
<groupId>com.qlangtech.tis.plugins</groupId>

tis-datax/tis-datax-local-executor/src/test/java/com/qlangtech/tis/plugin/datax/TestLocalDataXJobSubmit.java

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,14 +19,6 @@
1919
package com.qlangtech.tis.plugin.datax;
2020

2121
import com.alibaba.datax.common.element.QueryCriteria;
22-
import com.github.benmanes.caffeine.cache.CacheLoader;
23-
import com.github.benmanes.caffeine.cache.Caffeine;
24-
import com.github.benmanes.caffeine.cache.LoadingCache;
25-
import com.github.benmanes.caffeine.cache.RemovalCause;
26-
import com.google.common.cache.CacheBuilder;
27-
28-
import com.github.benmanes.caffeine.cache.RemovalListener;
29-
import com.google.common.cache.RemovalNotification;
3022
import com.qlangtech.tis.assemble.FullbuildPhase;
3123
import com.qlangtech.tis.cloud.ITISCoordinator;
3224
import com.qlangtech.tis.datax.CuratorDataXTaskMessage;
@@ -44,28 +36,16 @@
4436
import com.qlangtech.tis.manage.common.CenterResource;
4537
import com.qlangtech.tis.manage.common.HttpUtils;
4638
import com.qlangtech.tis.manage.common.TisUTF8;
47-
import com.qlangtech.tis.plugin.datax.DataXPipelinePreviewProcessorExecutor.PreviewLaunchParam;
48-
import com.qlangtech.tis.realtime.utils.NetUtils;
4939
import com.qlangtech.tis.solrj.util.ZkUtils;
50-
import com.tis.hadoop.rpc.ITISRpcService;
5140
import com.tis.hadoop.rpc.RpcServiceReference;
5241
import com.tis.hadoop.rpc.StatusRpcClientFactory;
5342
import junit.framework.Assert;
5443
import junit.framework.TestCase;
55-
import org.apache.commons.exec.ExecuteWatchdog;
56-
import org.checkerframework.checker.nullness.qual.NonNull;
57-
import org.checkerframework.checker.nullness.qual.Nullable;
5844
import org.easymock.EasyMock;
5945

6046
import java.io.File;
61-
import java.net.URL;
6247
import java.util.Collections;
63-
import java.util.Enumeration;
6448
import java.util.Optional;
65-
import java.util.concurrent.Executors;
66-
import java.util.concurrent.ScheduledExecutorService;
67-
import java.util.concurrent.TimeUnit;
68-
import java.util.concurrent.atomic.AtomicReference;
6949

7050
/**
7151
* @author: 百岁(baisui@qlangtech.com)

tis-transformer/pom.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,14 @@
4444
<version>${project.version}</version>
4545
<scope>test</scope>
4646
</dependency>
47+
48+
<!-- https://github.com/ben-manes/caffeine-->
49+
<dependency>
50+
<groupId>com.github.ben-manes.caffeine</groupId>
51+
<artifactId>caffeine</artifactId>
52+
<version>3.2.3</version>
53+
</dependency>
54+
4755
</dependencies>
4856
<build>
4957

0 commit comments

Comments
 (0)