You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@linkis.apache.org by GitBox <gi...@apache.org> on 2022/07/09 09:09:59 UTC
[GitHub] [incubator-linkis] Dlimeng opened a new pull request, #2444: Dev 1.2.1 linkis metadata query add database
Dlimeng opened a new pull request, #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444
### What is the purpose of the change
Extend the database supported by Linkis DataSource, extend dm, greenplum, kingbase, oracle, postgres, sqlserver
### Brief change log
metadataManager Service implementation
Based on the mysql module, it integrates dm, greenplum, kingbase, oracle, postgres, sqlserver, and the protocol is separated from sql. The metadatamanager reflects multiple data sources, and is extended based on the mysql module and merged into one module.
### Does this pull request potentially affect one of the following parts:
1.linkis-metadata-query-server
loader：MetaClassLoaderManager maps mysql collection relationship classes to contain a variety of relational databases
2.linkis-metadata-query-service-mysql
db2,dm, greenplum, kingbase, oracle, postgres, sqlserver implement their own
Introduce each driver separately
dm driver : Dm7JdbcDriver16-7.6.0.165.jar
greenplum driver:greenplum-jdbc-5.1.4
kingbase driver:kingbase8-8.2.0.jar
oracle driver :ojdbc6-11.2.0.3.jar
postgres driver:postgresql-42.3.1.jar
sqlserver driver:
msbase-1.0.jar
mssqlserver-1.0.jar
msutil-1.0.jar
db2 driver:db2jcc4.jar
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r924014761
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java:
##########
@@ -30,6 +30,24 @@ public class MetaColumnInfo implements Serializable {
private boolean primaryKey;
private String name;
private String type;
+ private int length;
+ private String colComment;
+
+ public String getColComment() {
+ return colComment;
+ }
+
+ public void setColComment(String colComment) {
+ this.colComment = colComment;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public void setLength(int length) {
+ this.length = length;
+ }
Review Comment:
After this DTO class MetaColumnInfo is changed, the compatibility with the client needs to be considered for class `org.apache.linkis.datasource.client.response.MetadataGetColumnsResult`, whether it is better to provide a unit test to verify the compatibility, specify the linkis-datasource-client that depends on version 1.1.2.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r924047030
##########
docs/info-1.2.1.md:
##########
@@ -0,0 +1,11 @@
+## 参数变化
+
+
+| 模块名(服务名)| 类型 | 参数名 | 默认值 | 描述 |
+| ----------- | ----- | -------------------------------------------------------- | ---------------- | ------------------------------------------------------- |
+|ps-metadataquery | 新增 | | linkis-metadata-query-service-mysql| 在mysql元数据服务兼容oracle,kingbase,postgresql,sqlserver,db2,greenplum,dm,驱动外部引入 |
Review Comment:
参数名 wds.linkis.server.mdq.mysql.relationship
默认值 oracle,kingbase,postgresql,sqlserver,db2,greenplum,dm,mysql
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917794193
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java:
##########
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.metadata.query.service.db2;
+
+import org.apache.linkis.common.conf.CommonVars;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+
+import org.apache.logging.log4j.util.Strings;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class SqlConnection implements Closeable {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SqlConnection.class);
+
+ private static final CommonVars<String> SQL_DRIVER_CLASS =
+ CommonVars.apply(
+ "wds.linkis.server.mdm.service.db2.driver", "com.ibm.db2.jcc.DB2Driver");
+
+ private static final CommonVars<String> SQL_CONNECT_URL =
+ CommonVars.apply("wds.linkis.server.mdm.service.db2.url", "jdbc:db2://%s:%s/%s");
+
+ private Connection conn;
+
+ private ConnectMessage connectMessage;
+
+ public SqlConnection(
+ String host,
+ Integer port,
+ String username,
+ String password,
+ String database,
+ Map<String, Object> extraParams)
+ throws ClassNotFoundException, SQLException {
+ if (Strings.isBlank(database)) {
+ database = "SAMPLE";
+ }
+ connectMessage = new ConnectMessage(host, port, username, password, extraParams);
+ conn = getDBConnection(connectMessage, database);
+ // Try to create statement
+ Statement statement = conn.createStatement();
+ statement.close();
+ }
+
+ public List<String> getAllDatabases() throws SQLException {
+ // db2 "select schemaname from syscat.schemata"
+ List<java.lang.String> dataBaseName = new ArrayList<>();
+ Statement stmt = null;
+ ResultSet rs = null;
+ try {
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("list database directory");
+ // rs = stmt.executeQuery("SELECT * FROM SYSIBMADM.APPLICATIONS WITH UR");
+ // rs = stmt.executeQuery("select * from syscat.tables");
+ while (rs.next()) {
+ String db_name = rs.getString("DB_NAME");
+ System.out.println(db_name);
Review Comment:
" System.out.println" need to be removed
Some others file have same case
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917796349
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java:
##########
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.metadata.query.service.db2;
+
+import org.apache.linkis.common.conf.CommonVars;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+
+import org.apache.logging.log4j.util.Strings;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class SqlConnection implements Closeable {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SqlConnection.class);
+
+ private static final CommonVars<String> SQL_DRIVER_CLASS =
+ CommonVars.apply(
+ "wds.linkis.server.mdm.service.db2.driver", "com.ibm.db2.jcc.DB2Driver");
+
+ private static final CommonVars<String> SQL_CONNECT_URL =
+ CommonVars.apply("wds.linkis.server.mdm.service.db2.url", "jdbc:db2://%s:%s/%s");
+
+ private Connection conn;
+
+ private ConnectMessage connectMessage;
+
+ public SqlConnection(
+ String host,
+ Integer port,
+ String username,
+ String password,
+ String database,
+ Map<String, Object> extraParams)
+ throws ClassNotFoundException, SQLException {
+ if (Strings.isBlank(database)) {
+ database = "SAMPLE";
+ }
+ connectMessage = new ConnectMessage(host, port, username, password, extraParams);
+ conn = getDBConnection(connectMessage, database);
+ // Try to create statement
+ Statement statement = conn.createStatement();
+ statement.close();
+ }
+
+ public List<String> getAllDatabases() throws SQLException {
+ // db2 "select schemaname from syscat.schemata"
+ List<java.lang.String> dataBaseName = new ArrayList<>();
Review Comment:
optimize code style `List<String>`
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917635811
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/server/src/main/java/org/apache/linkis/metadata/query/server/loader/MetaClassLoaderManager.java:
##########
@@ -78,6 +85,7 @@ public BiFunction<String, Object[], Object> getInvoker(String dsType) throws Err
}
if (needToLoad) {
MetaServiceInstance finalServiceInstance1 = serviceInstance;
+ String finalBaseType = baseType;
Review Comment:
```
String finalBaseType = baseType;
String componentLib = stdLib + "/" + finalBaseType;
```
`String finalBaseType = baseType` not necessary?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917642181
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/pom.xml:
##########
@@ -55,11 +56,69 @@
</exclusions>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
+ <!--mysql-->
+<!-- <dependency>-->
+<!-- <groupId>mysql</groupId>-->
+<!-- <artifactId>mysql-connector-java</artifactId>-->
+<!-- <version>${mysql.version}</version>-->
+<!-- </dependency>-->
+
+<!-- <dependency>-->
+<!-- <groupId>com.oracle</groupId>-->
+<!-- <artifactId>ojdbc6</artifactId>-->
+<!-- <version>11.2.0.3</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/ojdbc6-11.2.0.3.jar</systemPath>-->
+<!-- </dependency>-->
+
+<!-- <dependency>-->
+<!-- <groupId>com.ibm.db2.jcc</groupId>-->
+<!-- <artifactId>db2jcc</artifactId>-->
+<!-- <version>db2jcc4</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.dameng</groupId>-->
+<!-- <artifactId>Dm7JdbcDriver16</artifactId>-->
+<!-- <version>7.6.0.165</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.pivotal</groupId>-->
+<!-- <artifactId>greenplum-jdbc</artifactId>-->
+<!-- <version>5.1.4</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.kingbase</groupId>-->
+<!-- <artifactId>kingbase8</artifactId>-->
+<!-- <version>8</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.postgresql</groupId>-->
+<!-- <artifactId>postgresql</artifactId>-->
+<!-- <version>${postgresql.version}</version>-->
+<!-- </dependency>-->
+
+
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.jdbc.sqlserver</groupId>-->
+<!-- <artifactId>msbase</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/msbase-1.0.jar</systemPath>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.jdbc.sqlserver</groupId>-->
+<!-- <artifactId>msutil</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/msutil-1.0.jar</systemPath>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.jdbc.sqlserver</groupId>-->
+<!-- <artifactId>mssqlserver</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/mssqlserver-1.0.jar</systemPath>-->
+<!-- </dependency>-->
Review Comment:
I don't know if each driver jar is under the apache license
If it is not satisfied, it can be include through scope test. If it is satisfied, you can directly introduce dependencies. You may need to confirm the license problem of the driver jar package.
Reference https://linkis.apache.org/zh-CN/community/development_specification/license
In addition, it is not a good way to include dependencies through systemPath
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917794193
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/src/main/java/org/apache/linkis/metadata/query/service/db2/SqlConnection.java:
##########
@@ -0,0 +1,249 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.linkis.metadata.query.service.db2;
+
+import org.apache.linkis.common.conf.CommonVars;
+import org.apache.linkis.metadata.query.common.domain.MetaColumnInfo;
+
+import org.apache.logging.log4j.util.Strings;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.Closeable;
+import java.io.IOException;
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public class SqlConnection implements Closeable {
+
+ private static final Logger LOG = LoggerFactory.getLogger(SqlConnection.class);
+
+ private static final CommonVars<String> SQL_DRIVER_CLASS =
+ CommonVars.apply(
+ "wds.linkis.server.mdm.service.db2.driver", "com.ibm.db2.jcc.DB2Driver");
+
+ private static final CommonVars<String> SQL_CONNECT_URL =
+ CommonVars.apply("wds.linkis.server.mdm.service.db2.url", "jdbc:db2://%s:%s/%s");
+
+ private Connection conn;
+
+ private ConnectMessage connectMessage;
+
+ public SqlConnection(
+ String host,
+ Integer port,
+ String username,
+ String password,
+ String database,
+ Map<String, Object> extraParams)
+ throws ClassNotFoundException, SQLException {
+ if (Strings.isBlank(database)) {
+ database = "SAMPLE";
+ }
+ connectMessage = new ConnectMessage(host, port, username, password, extraParams);
+ conn = getDBConnection(connectMessage, database);
+ // Try to create statement
+ Statement statement = conn.createStatement();
+ statement.close();
+ }
+
+ public List<String> getAllDatabases() throws SQLException {
+ // db2 "select schemaname from syscat.schemata"
+ List<java.lang.String> dataBaseName = new ArrayList<>();
+ Statement stmt = null;
+ ResultSet rs = null;
+ try {
+ stmt = conn.createStatement();
+ rs = stmt.executeQuery("list database directory");
+ // rs = stmt.executeQuery("SELECT * FROM SYSIBMADM.APPLICATIONS WITH UR");
+ // rs = stmt.executeQuery("select * from syscat.tables");
+ while (rs.next()) {
+ String db_name = rs.getString("DB_NAME");
+ System.out.println(db_name);
Review Comment:
" System.out.println" need to be removed
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] Dlimeng commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
Dlimeng commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r922767200
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/service/mysql/pom.xml:
##########
@@ -55,11 +56,69 @@
</exclusions>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>mysql</groupId>
- <artifactId>mysql-connector-java</artifactId>
- <version>${mysql.version}</version>
- </dependency>
+ <!--mysql-->
+<!-- <dependency>-->
+<!-- <groupId>mysql</groupId>-->
+<!-- <artifactId>mysql-connector-java</artifactId>-->
+<!-- <version>${mysql.version}</version>-->
+<!-- </dependency>-->
+
+<!-- <dependency>-->
+<!-- <groupId>com.oracle</groupId>-->
+<!-- <artifactId>ojdbc6</artifactId>-->
+<!-- <version>11.2.0.3</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/ojdbc6-11.2.0.3.jar</systemPath>-->
+<!-- </dependency>-->
+
+<!-- <dependency>-->
+<!-- <groupId>com.ibm.db2.jcc</groupId>-->
+<!-- <artifactId>db2jcc</artifactId>-->
+<!-- <version>db2jcc4</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.dameng</groupId>-->
+<!-- <artifactId>Dm7JdbcDriver16</artifactId>-->
+<!-- <version>7.6.0.165</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.pivotal</groupId>-->
+<!-- <artifactId>greenplum-jdbc</artifactId>-->
+<!-- <version>5.1.4</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.kingbase</groupId>-->
+<!-- <artifactId>kingbase8</artifactId>-->
+<!-- <version>8</version>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>org.postgresql</groupId>-->
+<!-- <artifactId>postgresql</artifactId>-->
+<!-- <version>${postgresql.version}</version>-->
+<!-- </dependency>-->
+
+
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.jdbc.sqlserver</groupId>-->
+<!-- <artifactId>msbase</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/msbase-1.0.jar</systemPath>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.jdbc.sqlserver</groupId>-->
+<!-- <artifactId>msutil</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/msutil-1.0.jar</systemPath>-->
+<!-- </dependency>-->
+<!-- <dependency>-->
+<!-- <groupId>com.microsoft.jdbc.sqlserver</groupId>-->
+<!-- <artifactId>mssqlserver</artifactId>-->
+<!-- <version>1.0</version>-->
+<!-- <scope>system</scope>-->
+<!-- <systemPath>${basedir}/src/main/lib/mssqlserver-1.0.jar</systemPath>-->
+<!-- </dependency>-->
Review Comment:
postgresql can be referenced directly, other references need to be downloaded from the official website
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917627370
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/cache/CacheConfiguration.java:
##########
@@ -30,4 +30,9 @@ public class CacheConfiguration {
/** Make a pool for each cache element */
public static final CommonVars<Integer> CACHE_IN_POOL_SIZE =
CommonVars.apply("wds.linkis.server.mdm.service.cache.in-pool.size", 5);
+
+ public static final CommonVars<String> MYSQL_RELATIONSHIP_LIST =
+ CommonVars.apply(
+ "wds.linkis.server.mdm.mysql.relationship",
Review Comment:
After renaming metadatamanager to metadataquery
wds.linkis.server.mdm.mysql.relationship: mdm ->mdq maybe batter?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] codecov[bot] commented on pull request #2444: Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
codecov[bot] commented on PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#issuecomment-1179513408
# [Codecov](https://codecov.io/gh/apache/incubator-linkis/pull/2444?src=pr&el=h1&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) Report
> Merging [#2444](https://codecov.io/gh/apache/incubator-linkis/pull/2444?src=pr&el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (7d261fb) into [dev-1.2.1](https://codecov.io/gh/apache/incubator-linkis/commit/526e01afeb309bac484ba2ca99e4631d06d66cf5?el=desc&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) (526e01a) will **decrease** coverage by `0.00%`.
> The diff coverage is `0.00%`.
```diff
@@ Coverage Diff @@
## dev-1.2.1 #2444 +/- ##
===============================================
- Coverage 18.60% 18.59% -0.01%
Complexity 1060 1060
===============================================
Files 544 544
Lines 16690 16694 +4
Branches 2495 2496 +1
===============================================
Hits 3105 3105
- Misses 13153 13157 +4
Partials 432 432
```
| [Impacted Files](https://codecov.io/gh/apache/incubator-linkis/pull/2444?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation) | Coverage Δ | |
|---|---|---|
| [...ta/query/server/loader/MetaClassLoaderManager.java](https://codecov.io/gh/apache/incubator-linkis/pull/2444/diff?src=pr&el=tree&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation#diff-bGlua2lzLXB1YmxpYy1lbmhhbmNlbWVudHMvbGlua2lzLWRhdGFzb3VyY2UvbGlua2lzLW1ldGFkYXRhLXF1ZXJ5L3NlcnZlci9zcmMvbWFpbi9qYXZhL29yZy9hcGFjaGUvbGlua2lzL21ldGFkYXRhL3F1ZXJ5L3NlcnZlci9sb2FkZXIvTWV0YUNsYXNzTG9hZGVyTWFuYWdlci5qYXZh) | `0.00% <0.00%> (ø)` | |
------
[Continue to review full report at Codecov](https://codecov.io/gh/apache/incubator-linkis/pull/2444?src=pr&el=continue&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
> **Legend** - [Click here to learn more](https://docs.codecov.io/docs/codecov-delta?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation)
> `Δ = absolute <relative> (impact)`, `ø = not affected`, `? = missing data`
> Powered by [Codecov](https://codecov.io/gh/apache/incubator-linkis/pull/2444?src=pr&el=footer&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Last update [526e01a...7d261fb](https://codecov.io/gh/apache/incubator-linkis/pull/2444?src=pr&el=lastupdated&utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation). Read the [comment docs](https://docs.codecov.io/docs/pull-request-comments?utm_medium=referral&utm_source=github&utm_content=comment&utm_campaign=pr+comments&utm_term=The+Apache+Software+Foundation).
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r924014761
##########
linkis-public-enhancements/linkis-datasource/linkis-metadata-query/common/src/main/java/org/apache/linkis/metadata/query/common/domain/MetaColumnInfo.java:
##########
@@ -30,6 +30,24 @@ public class MetaColumnInfo implements Serializable {
private boolean primaryKey;
private String name;
private String type;
+ private int length;
+ private String colComment;
+
+ public String getColComment() {
+ return colComment;
+ }
+
+ public void setColComment(String colComment) {
+ this.colComment = colComment;
+ }
+
+ public int getLength() {
+ return length;
+ }
+
+ public void setLength(int length) {
+ this.length = length;
+ }
Review Comment:
After this DTO class MetaColumnInfo is changed, the compatibility with the client needs to be considered for class `org.apache.linkis.datasource.client.response.MetadataGetColumnsResult`, whether it is better to provide a unit test to verify the compatibility, specify the linkis-datasource-client that depends on latest release version 1.1.2.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone merged pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone merged PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r924047030
##########
docs/info-1.2.1.md:
##########
@@ -0,0 +1,11 @@
+## 参数变化
+
+
+| 模块名(服务名)| 类型 | 参数名 | 默认值 | 描述 |
+| ----------- | ----- | -------------------------------------------------------- | ---------------- | ------------------------------------------------------- |
+|ps-metadataquery | 新增 | | linkis-metadata-query-service-mysql| 在mysql元数据服务兼容oracle,kingbase,postgresql,sqlserver,db2,greenplum,dm,驱动外部引入 |
Review Comment:
参数名 wds.linkis.server.mdq.mysql.relationship
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org
[GitHub] [incubator-linkis] casionone commented on a diff in pull request #2444: [Feature] Dev 1.2.1 linkis metadata query add database
Posted by GitBox <gi...@apache.org>.
casionone commented on code in PR #2444:
URL: https://github.com/apache/incubator-linkis/pull/2444#discussion_r917625780
##########
linkis-dist/package/db/linkis_dml.sql:
##########
@@ -465,6 +472,67 @@ INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `n
INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (1, 'databaseName', '数据库名(Database name)', NULL, 'TEXT', NULL, 0, '数据库名(Database name)', NULL, NULL, NULL, NULL, now(), now());
INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (4, 'envId', '集群环境(Cluster env)', NULL, 'SELECT', NULL, 1, '集群环境(Cluster env)', NULL, NULL, NULL, '/data-source-manager/env-list/all/type/4', now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'driverClassName', '驱动类名(Driver class name)', 'oracle.jdbc.driver.OracleDriver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (6, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 0, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
+
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'driverClassName', '驱动类名(Driver class name)', 'dm.jdbc.driver.DmDriver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (7, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 1, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'driverClassName', '驱动类名(Driver class name)', 'com.kingbase8.Driver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (8, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 1, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
+
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'driverClassName', '驱动类名(Driver class name)', 'org.postgresql.Driver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (9, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 1, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
+
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'driverClassName', '驱动类名(Driver class name)', 'com.microsoft.jdbc.sqlserver.SQLServerDriver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (10, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 1, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
+
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'driverClassName', '驱动类名(Driver class name)', 'com.ibm.db2.jcc.DB2Driver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (11, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 1, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
+
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'host', '主机名(Host)', NULL, 'TEXT', NULL, 1, '主机名(Host)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'port', '端口号(Port)', NULL, 'TEXT', NULL, 1, '端口号(Port)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'driverClassName', '驱动类名(Driver class name)', 'com.pivotal.jdbc.GreenplumDriver', 'TEXT', NULL, 1, '驱动类名(Driver class name)', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'params', '连接参数(Connection params)', NULL, 'TEXT', NULL, 0, '输入JSON格式(Input JSON format): {"param":"value"}', NULL, NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'username', '用户名(Username)', NULL, 'TEXT', NULL, 1, '用户名(Username)', '^[0-9A-Za-z_-]+$', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'password', '密码(Password)', NULL, 'PASSWORD', NULL, 1, '密码(Password)', '', NULL, NULL, NULL, now(), now());
+INSERT INTO `linkis_ps_dm_datasource_type_key` (`data_source_type_id`, `key`, `name`, `default_value`, `value_type`, `scope`, `require`, `description`, `value_regex`, `ref_id`, `ref_value`, `data_source`, `update_time`, `create_time`) VALUES (12, 'instance', '实例名(instance)', NULL, 'TEXT', NULL, 1, '实例名(instance)', NULL, NULL, NULL, NULL, now(), now());
Review Comment:
The Incremental SQL statements also need to be added to linkis-dist/package/db/upgrade/1.2.1_schema
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@linkis.apache.org
For additional commands, e-mail: notifications-help@linkis.apache.org