enable incr sync pipeline context param bind #342

datavane · Aug 11, 2024 · 98d14a4 · 98d14a4
1 parent e80962c
commit 98d14a4
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 9 deletions.
diff --git a/datax-config/src/main/java/com/alibaba/datax/core/job/ITransformerBuildInfo.java b/datax-config/src/main/java/com/alibaba/datax/core/job/ITransformerBuildInfo.java
@@ -56,17 +56,15 @@ public interface ITransformerBuildInfo {
 
     /**
      * 取得source端对应字段的meta（未经transformer处理，通过T之后字段类型可能已经变化），该方法在增量处理中使用
+     *
      * @return
      */
-    public List<IColMetaGetter> originColsWithContextParams();
+    List<IColMetaGetter> originColsWithContextParams();
 
     /**
      * 取得执行当前上线文绑定的参数，例如，当前数据库的名称等
      *
      * @return
      */
-    // List<ContextParamConfig> getContextParms();
-
-    // List<String> relevantOutterColKeys();
-    public <T extends IColMetaGetter> List<IColMetaGetter> overwriteColsWithContextParams(List<T> sourceCols);
+    <T extends IColMetaGetter> List<IColMetaGetter> overwriteColsWithContextParams(List<T> sourceCols);
 }
diff --git a/tis-plugin/src/main/java/com/qlangtech/tis/plugin/ComponentMeta.java b/tis-plugin/src/main/java/com/qlangtech/tis/plugin/ComponentMeta.java
@@ -31,6 +31,7 @@
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
@@ -65,7 +66,7 @@ public static Map<String, Long> getGlobalPluginStoreLastModifyTimestamp(Componen
 
 
     public ComponentMeta(List<IRepositoryResource> resources) {
-        this.resources = Sets.newHashSet(resources);
+        this.resources = resources.stream().filter((res) -> res.getTargetFile() != null).collect(Collectors.toSet());
     }
 
     public ComponentMeta(IRepositoryResource resource) {
@@ -94,8 +95,14 @@ public Set<PluginMeta> loadPluginMeta() {
 
         return loadPluginMeta(() -> {
             List<File> cfgs = Lists.newArrayList();
+            XmlFile xmlFile = null;
+
             for (IRepositoryResource res : this.resources) {
-                File targetFile = res.getTargetFile().getFile();
+                xmlFile = res.getTargetFile();
+                if (xmlFile == null) {
+                    continue;
+                }
+                File targetFile = xmlFile.getFile();
                 if (!targetFile.exists()) {
                     continue;
                 }

diff --git a/tis-web-config/config.properties b/tis-web-config/config.properties
@@ -30,8 +30,8 @@ tis.datasource.type=derby
 tis.datasource.dbname=tis_console_db
 
 
-assemble.host=192.168.28.190
-tis.host=192.168.28.190
+assemble.host=192.168.28.108
+tis.host=192.168.28.108