Skip to content

Commit 1c26b12

Browse files
committed
enhance the ai agent facibility
1 parent 57ef855 commit 1c26b12

File tree

26 files changed

+333
-213
lines changed

26 files changed

+333
-213
lines changed

create-ln.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
# https://blog.csdn.net/qq_38425719/article/details/102515854
2+
3+
#CURRENT_PATH=`$(pwd)`;
4+
for f in `find $(pwd) -name '*.tpi' -print`
5+
do
6+
echo " ln -s $f "
7+
rm -f /opt/data/tis/libs/plugins/${f##*/}
8+
ln -s $f /opt/data/tis/libs/plugins/${f##*/}
9+
done ;
10+

pkg.sh

Lines changed: 0 additions & 5 deletions
This file was deleted.

tis-datax/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<module>executor/tis-datax-executor</module>
9494
<module>tis-datax-local-executor-utils</module>
9595
<module>tis-datax-kingbase-plugin</module>
96-
96+
<module>tis-datax-kingbase-v8-plugin</module>
9797

9898

9999
</modules>

tis-incr/tis-realtime-flink/src/main/java/com/qlangtech/plugins/incr/flink/alert/AddMonitorForEvents.java renamed to tis-datax/tis-datax-common-plugin/src/main/java/com/qlangtech/plugins/incr/flink/alert/AddMonitorForEvents.java

File renamed without changes.

tis-datax/tis-datax-common-plugin/src/main/java/com/qlangtech/tis/zeppelin/TISZeppelinClient.java

Lines changed: 0 additions & 149 deletions
This file was deleted.

tis-incr/tis-realtime-flink/src/main/resources/com/qlangtech/plugins/incr/flink/alert/AddMonitorForEvents.json renamed to tis-datax/tis-datax-common-plugin/src/main/resources/com/qlangtech/plugins/incr/flink/alert/AddMonitorForEvents.json

File renamed without changes.

tis-datax/tis-datax-dameng-plugin/src/main/java/com/qlangtech/tis/plugin/datax/dameng/ds/DaMengDataSourceFactory.java

Lines changed: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
import com.qlangtech.tis.plugin.ds.BasicDataSourceFactory;
1111
import com.qlangtech.tis.plugin.ds.ColumnMetaData;
1212
import com.qlangtech.tis.plugin.ds.DBConfig;
13-
1413
import com.qlangtech.tis.plugin.ds.DataDumpers;
1514
import com.qlangtech.tis.plugin.ds.DataSourceFactory;
1615
import com.qlangtech.tis.plugin.ds.DataType;
@@ -20,10 +19,10 @@
2019
import com.qlangtech.tis.plugin.ds.SplitTableStrategy;
2120
import com.qlangtech.tis.plugin.ds.TISTable;
2221
import com.qlangtech.tis.plugin.ds.TableInDB;
23-
import com.qlangtech.tis.plugin.ds.TableNotFoundException;
22+
import com.qlangtech.tis.plugin.timezone.TISTimeZone;
2423
import com.qlangtech.tis.runtime.module.misc.IControlMsgHandler;
2524
import com.qlangtech.tis.sql.parser.tuple.creator.EntityName;
26-
import dm.jdbc.driver.DmdbType;
25+
import dm.jdbc.desc.Configuration;
2726
import org.apache.commons.lang.StringUtils;
2827

2928
import java.sql.Connection;
@@ -32,6 +31,7 @@
3231
import java.sql.SQLException;
3332
import java.sql.Statement;
3433
import java.sql.Types;
34+
import java.time.ZoneId;
3535
import java.util.ArrayList;
3636
import java.util.Iterator;
3737
import java.util.LinkedHashMap;
@@ -56,6 +56,9 @@ public class DaMengDataSourceFactory extends BasicDataSourceFactory implements D
5656
@FormField(ordinal = 1, validate = {Validator.require})
5757
public SplitTableStrategy splitTableStrategy;
5858

59+
@FormField(ordinal = 12, validate = {Validator.require})
60+
public TISTimeZone timeZone;
61+
5962
//https://blog.csdn.net/Shadow_Light/article/details/100749537
6063

6164
@Override
@@ -69,6 +72,11 @@ protected String getNodeDesc() {
6972
return Objects.requireNonNull(splitTableStrategy, "splitTableStrategy can not be null").getNodeDesc();
7073
}
7174

75+
@Override
76+
public final Optional<ZoneId> getTimeZone() {
77+
return Optional.of(timeZone.getTimeZone());
78+
}
79+
7280
@Override
7381
public void fillTableInDB(TableInDB tabs) {
7482
super.fillTableInDB(tabs);
@@ -106,12 +114,14 @@ public JDBCConnection createConnection(String jdbcUrl, Optional<Properties> prop
106114
java.util.Properties info = props.orElse(new java.util.Properties());
107115

108116
if (this.userName != null) {
109-
info.put("user", this.userName);
117+
info.put(Configuration.user.getName(), this.userName);
110118
}
111119
if (password != null) {
112-
info.put("password", password);
120+
info.put(Configuration.password.getName(), password);
113121
}
114122
//info.put("connectTimeout", "60000");
123+
info.setProperty(Configuration.localTimezone.getName() //
124+
, Objects.requireNonNull(this.timeZone, "timezone can not be null").getTimeZone().getId());
115125
Connection connect = driver.connect(jdbcUrl, info);
116126
connect.setAutoCommit(true);
117127
return new JDBCConnection(connect, jdbcUrl);
@@ -524,6 +534,7 @@ public static class DefaultDescriptor extends BasicRdbmsDataSourceFactoryDescrip
524534
public Optional<String> getDefaultDataXReaderDescName() {
525535
return Optional.of(DataXDaMengReader.DATAX_NAME);
526536
}
537+
527538
@Override
528539
public boolean supportFacade() {
529540
return false;

tis-datax/tis-datax-dameng-plugin/src/main/resources/com/qlangtech/tis/plugin/datax/dameng/ds/DaMengDataSourceFactory.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,10 @@
1717
},
1818
"nodeDesc": {
1919
"disable": true
20+
},
21+
"timeZone": {
22+
"dftVal": "default",
23+
"label": "所在时区",
24+
"help": "设置服务端所在时区,有两种输入方式:1. default 从下拉框中选择,2. customize:用户手动输入时区编码"
2025
}
2126
}

tis-datax/tis-datax-kingbase-plugin/src/main/java/com/qlangtech/tis/plugin/datax/kingbase/DataXKingBaseReader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
import com.qlangtech.tis.extension.TISExtension;
2222
import com.qlangtech.tis.plugin.datax.DataXPostgresqlReader;
23-
import com.qlangtech.tis.plugin.ds.kingbase.KingBaseDataSourceFactory;
23+
import com.qlangtech.tis.plugin.ds.kingbase.BasicKingBaseDataSourceFactory;
2424

2525
/**
2626
*
@@ -33,7 +33,7 @@ public class DataXKingBaseReader extends DataXPostgresqlReader {
3333
public static class KingBaseDescriptor extends DefaultDescriptor{
3434
@Override
3535
public String getDisplayName() {
36-
return KingBaseDataSourceFactory.KingBase_NAME;
36+
return BasicKingBaseDataSourceFactory.KingBase_NAME;
3737
}
3838

3939
@Override

tis-datax/tis-datax-kingbase-plugin/src/main/java/com/qlangtech/tis/plugin/datax/kingbase/DataXKingBaseWriter.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import com.qlangtech.tis.extension.TISExtension;
2222
import com.qlangtech.tis.plugin.datax.DataXPostgresqlWriter;
2323
import com.qlangtech.tis.plugin.datax.common.AutoCreateTable;
24-
import com.qlangtech.tis.plugin.ds.kingbase.KingBaseDataSourceFactory;
24+
import com.qlangtech.tis.plugin.ds.kingbase.BasicKingBaseDataSourceFactory;
2525

2626
import java.util.Objects;
2727

@@ -32,8 +32,8 @@
3232
public class DataXKingBaseWriter extends DataXPostgresqlWriter {
3333

3434
@Override
35-
public KingBaseDataSourceFactory getDataSourceFactory() {
36-
return (KingBaseDataSourceFactory) super.getDataSourceFactory();
35+
public BasicKingBaseDataSourceFactory getDataSourceFactory() {
36+
return (BasicKingBaseDataSourceFactory) super.getDataSourceFactory();
3737
}
3838

3939

@@ -50,7 +50,7 @@ public KingBaseDescriptor() {
5050

5151
@Override
5252
public String getDisplayName() {
53-
return KingBaseDataSourceFactory.KingBase_NAME;
53+
return BasicKingBaseDataSourceFactory.KingBase_NAME;
5454
}
5555

5656
@Override

0 commit comments

Comments
 (0)