diff --git a/docs/configs/docsdev.js b/docs/configs/docsdev.js index 88e0850cc3..95f042b55c 100644 --- a/docs/configs/docsdev.js +++ b/docs/configs/docsdev.js @@ -271,6 +271,10 @@ export default { title: 'HIVE', link: '/en-us/docs/dev/user_doc/guide/datasource/hive.html', }, + { + title: 'KYUUBI', + link: '/en-us/docs/dev/user_doc/guide/datasource/kyuubi.html', + }, { title: 'Spark', link: '/en-us/docs/dev/user_doc/guide/datasource/spark.html', @@ -964,6 +968,10 @@ export default { title: 'HIVE', link: '/zh-cn/docs/dev/user_doc/guide/datasource/hive.html', }, + { + title: 'KYUUBI', + link: '/zh-cn/docs/dev/user_doc/guide/datasource/kyuubi.html', + }, { title: 'Spark', link: '/zh-cn/docs/dev/user_doc/guide/datasource/spark.html', diff --git a/docs/docs/en/guide/datasource/kyuubi.md b/docs/docs/en/guide/datasource/kyuubi.md new file mode 100644 index 0000000000..6fc5c020e6 --- /dev/null +++ b/docs/docs/en/guide/datasource/kyuubi.md @@ -0,0 +1,33 @@ +# KYUUBI + +## Use HiveServer2 + +![kyuubi](../../../../img/new_ui/dev/datasource/kyuubi.png) + +## Datasource Parameters + +| **Datasource** | **Description** | +|----------------------------|-----------------------------------------------------------| +| Datasource | Select KYUUBI. | +| Datasource name | Enter the name of the DataSource. | +| Description | Enter a description of the DataSource. | +| IP/Host Name | Enter the KYUUBI service IP. | +| Port | Enter the KYUUBI service port. | +| Username | Set the username for KYUUBI connection. | +| Password | Set the password for KYUUBI connection. | +| Database name | Enter the database name of the KYUUBI connection. | +| Jdbc connection parameters | Parameter settings for KYUUBI connection, in JSON format. | + +```Kerberos Authentication +just simply configure them in the connection parameters if kerberos authentication is required. + +clientKeytab: path of Kerberos keytab file for client authentication + +clientPrincipal: Kerberos principal for client authentication + +serverPrincipal: Kerberos principal configured by kyuubi.kinit.principal at the server side. +``` + +## Native Supported + +Yes, could use this datasource by default. diff --git a/docs/docs/zh/guide/datasource/kyuubi.md b/docs/docs/zh/guide/datasource/kyuubi.md new file mode 100644 index 0000000000..b880df6a32 --- /dev/null +++ b/docs/docs/zh/guide/datasource/kyuubi.md @@ -0,0 +1,29 @@ +# KYUUBI数据源 + +## 使用HiveServer2 + +![kyuubi](../../../../img/new_ui/dev/datasource/kyuubi.png) + +- 数据源：选择 KYUUBI +- 数据源名称：输入数据源的名称 +- 描述：输入数据源的描述 +- IP 主机名：输入连接 KYUUBI 的 IP +- 端口：输入连接 KYUUBI 的端口 +- 用户名：设置连接 KYUUBI 的用户名 +- 密码：设置连接 KYUUBI 的密码 +- 数据库名：输入连接 KYUUBI 的数据库名称 +- Jdbc 连接参数：用于 KYUUBI 连接的参数设置，以 JSON 形式填写 + +```Kerberos 验证 +如需Kerberos验证，请直接配置相应参数在jdbc连接参数中 + +clientKeytab: 用户客户端验证的keytab文件路径 + +clientPrincipal: 用户客户端验证的Kerberos principal + +serverPrincipal: 在服务端通过kyuubi.kinit.principal配置的Kerberos principal. +``` + +## 是否原生支持 + +是，数据源不需要任务附加操作即可使用。 diff --git a/docs/img/new_ui/dev/datasource/kyuubi.png b/docs/img/new_ui/dev/datasource/kyuubi.png new file mode 100644 index 0000000000..abdfdcb6df Binary files /dev/null and b/docs/img/new_ui/dev/datasource/kyuubi.png differ diff --git a/dolphinscheduler-bom/pom.xml b/dolphinscheduler-bom/pom.xml index 76afdeb291..0bff3cb112 100644 --- a/dolphinscheduler-bom/pom.xml +++ b/dolphinscheduler-bom/pom.xml @@ -67,6 +67,7 @@ 31.1-jre 42.4.1 2.3.9 + 1.7.0 2.11.0 6.1.1 0.3.2-patch11 @@ -537,7 +538,11 @@ - + + org.apache.kyuubi + kyuubi-hive-jdbc-shaded + ${kyuubi-jdbc.version} + commons-io commons-io diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/DataSourceConstants.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/DataSourceConstants.java index f2f580a8b8..16e66d515a 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/DataSourceConstants.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/constants/DataSourceConstants.java @@ -37,6 +37,7 @@ public class DataSourceConstants { public static final String COM_ATHENA_JDBC_DRIVER = "com.simba.athena.jdbc.Driver"; public static final String COM_TRINO_JDBC_DRIVER = "io.trino.jdbc.TrinoDriver"; public static final String COM_DAMENG_JDBC_DRIVER = "dm.jdbc.driver.DmDriver"; + public static final String ORG_APACHE_KYUUBI_JDBC_DRIVER = "org.apache.kyuubi.jdbc.KyuubiHiveDriver"; public static final String COM_OCEANBASE_JDBC_DRIVER = "com.oceanbase.jdbc.Driver"; /** @@ -55,12 +56,15 @@ public class DataSourceConstants { public static final String TRINO_VALIDATION_QUERY = "select 1"; public static final String DAMENG_VALIDATION_QUERY = "select 1"; + public static final String KYUUBI_VALIDATION_QUERY = "select 1"; + /** * jdbc url */ public static final String JDBC_MYSQL = "jdbc:mysql://"; public static final String JDBC_POSTGRESQL = "jdbc:postgresql://"; public static final String JDBC_HIVE_2 = "jdbc:hive2://"; + public static final String JDBC_KYUUBI = "jdbc:kyuubi://"; public static final String JDBC_CLICKHOUSE = "jdbc:clickhouse://"; public static final String JDBC_ORACLE_SID = "jdbc:oracle:thin:@"; public static final String JDBC_ORACLE_SERVICE_NAME = "jdbc:oracle:thin:@//"; diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml index 010343bde8..5eda89cc12 100644 --- a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-all/pom.xml @@ -112,5 +112,10 @@ dolphinscheduler-datasource-ssh ${project.version} + + org.apache.dolphinscheduler + dolphinscheduler-datasource-kyuubi + ${project.version} + diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml new file mode 100644 index 0000000000..86381d7aad --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/pom.xml @@ -0,0 +1,56 @@ + + + + 4.0.0 + + org.apache.dolphinscheduler + dolphinscheduler-datasource-plugin + dev-SNAPSHOT + + + dolphinscheduler-datasource-kyuubi + jar + ${project.artifactId} + + + + org.apache.dolphinscheduler + dolphinscheduler-spi + provided + + + + org.apache.dolphinscheduler + dolphinscheduler-datasource-api + ${project.version} + + + + org.apache.dolphinscheduler + dolphinscheduler-task-api + provided + + + + org.apache.kyuubi + kyuubi-hive-jdbc-shaded + + + + diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannel.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannel.java new file mode 100644 index 0000000000..28c85c8a2c --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannel.java @@ -0,0 +1,31 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi; + +import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; +import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel; +import org.apache.dolphinscheduler.spi.datasource.DataSourceClient; +import org.apache.dolphinscheduler.spi.enums.DbType; + +public class KyuubiDataSourceChannel implements DataSourceChannel { + + @Override + public DataSourceClient createDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) { + return new KyuubiDataSourceClient(baseConnectionParam, dbType); + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java new file mode 100644 index 0000000000..4c67a2098f --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactory.java @@ -0,0 +1,37 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi; + +import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel; +import org.apache.dolphinscheduler.spi.datasource.DataSourceChannelFactory; + +import com.google.auto.service.AutoService; + +@AutoService(DataSourceChannelFactory.class) +public class KyuubiDataSourceChannelFactory implements DataSourceChannelFactory { + + @Override + public String getName() { + return "kyuubi"; + } + + @Override + public DataSourceChannel create() { + return new KyuubiDataSourceChannel(); + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceClient.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceClient.java new file mode 100644 index 0000000000..3e0af69577 --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceClient.java @@ -0,0 +1,75 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi; + +import org.apache.dolphinscheduler.plugin.datasource.api.client.CommonDataSourceClient; +import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider; +import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import java.sql.Connection; +import java.sql.SQLException; + +import lombok.extern.slf4j.Slf4j; + +import org.springframework.jdbc.core.JdbcTemplate; + +@Slf4j +public class KyuubiDataSourceClient extends CommonDataSourceClient { + + public KyuubiDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) { + super(baseConnectionParam, dbType); + } + + @Override + protected void preInit() { + log.info("PreInit in {}", getClass().getName()); + } + + @Override + protected void initClient(BaseConnectionParam baseConnectionParam, DbType dbType) { + + this.dataSource = JDBCDataSourceProvider.createOneSessionJdbcDataSource(baseConnectionParam, dbType); + this.jdbcTemplate = new JdbcTemplate(dataSource); + log.info("Init {} success.", getClass().getName()); + } + + @Override + protected void checkEnv(BaseConnectionParam baseConnectionParam) { + super.checkEnv(baseConnectionParam); + } + + @Override + public Connection getConnection() { + Connection connection = null; + while (connection == null) { + try { + connection = dataSource.getConnection(); + } catch (SQLException e) { + log.error("Failed to get Kyuubi Connection.", e); + } + } + return connection; + } + + @Override + public void close() { + super.close(); + log.info("Closed Kyuubi datasource client."); + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiConnectionParam.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiConnectionParam.java new file mode 100644 index 0000000000..9c9097f897 --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiConnectionParam.java @@ -0,0 +1,38 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi.param; + +import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; + +public class KyuubiConnectionParam extends BaseConnectionParam { + + @Override + public String toString() { + return "KyuubiConnectionParam{" + + "user='" + user + '\'' + + ", password='" + password + '\'' + + ", address='" + address + '\'' + + ", database='" + database + '\'' + + ", jdbcUrl='" + jdbcUrl + '\'' + + ", driverLocation='" + driverLocation + '\'' + + ", driverClassName='" + driverClassName + '\'' + + ", validationQuery='" + validationQuery + '\'' + + ", other='" + other + '\'' + + '}'; + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceParamDTO.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceParamDTO.java new file mode 100644 index 0000000000..e81151fcfd --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceParamDTO.java @@ -0,0 +1,41 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi.param; + +import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO; +import org.apache.dolphinscheduler.spi.enums.DbType; + +public class KyuubiDataSourceParamDTO extends BaseDataSourceParamDTO { + + @Override + public String toString() { + return "KyuubiDataSourceParamDTO{" + + "host='" + host + '\'' + + ", port=" + port + + ", database='" + database + '\'' + + ", userName='" + userName + '\'' + + ", password='" + password + '\'' + + ", other='" + other + '\'' + + '}'; + } + + @Override + public DbType getType() { + return DbType.KYUUBI; + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessor.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessor.java new file mode 100644 index 0000000000..37fa9ab929 --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/main/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessor.java @@ -0,0 +1,147 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi.param; + +import org.apache.dolphinscheduler.common.constants.Constants; +import org.apache.dolphinscheduler.common.constants.DataSourceConstants; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.plugin.datasource.api.datasource.AbstractDataSourceProcessor; +import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO; +import org.apache.dolphinscheduler.plugin.datasource.api.datasource.DataSourceProcessor; +import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils; +import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; +import org.apache.dolphinscheduler.spi.datasource.ConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import org.apache.commons.collections4.MapUtils; + +import java.sql.Connection; +import java.sql.DriverManager; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import com.google.auto.service.AutoService; + +@AutoService(DataSourceProcessor.class) +public class KyuubiDataSourceProcessor extends AbstractDataSourceProcessor { + + @Override + public BaseDataSourceParamDTO castDatasourceParamDTO(String paramJson) { + return JSONUtils.parseObject(paramJson, KyuubiDataSourceParamDTO.class); + } + + @Override + public BaseDataSourceParamDTO createDatasourceParamDTO(String connectionJson) { + KyuubiDataSourceParamDTO kyuubiDataSourceParamDTO = new KyuubiDataSourceParamDTO(); + KyuubiConnectionParam kyuubiConnectionParam = (KyuubiConnectionParam) createConnectionParams(connectionJson); + kyuubiDataSourceParamDTO.setDatabase(kyuubiConnectionParam.getDatabase()); + kyuubiDataSourceParamDTO.setUserName(kyuubiConnectionParam.getUser()); + kyuubiDataSourceParamDTO.setOther(kyuubiConnectionParam.getOther()); + + String[] tmpArray = kyuubiConnectionParam.getAddress().split(Constants.DOUBLE_SLASH); + StringBuilder hosts = new StringBuilder(); + String[] hostPortArray = tmpArray[tmpArray.length - 1].split(Constants.COMMA); + for (String hostPort : hostPortArray) { + hosts.append(hostPort.split(Constants.COLON)[0]).append(Constants.COMMA); + } + hosts.deleteCharAt(hosts.length() - 1); + kyuubiDataSourceParamDTO.setHost(hosts.toString()); + kyuubiDataSourceParamDTO.setPort(Integer.parseInt(hostPortArray[0].split(Constants.COLON)[1])); + + return kyuubiDataSourceParamDTO; + } + + @Override + public BaseConnectionParam createConnectionParams(BaseDataSourceParamDTO datasourceParam) { + KyuubiDataSourceParamDTO kyuubiParam = (KyuubiDataSourceParamDTO) datasourceParam; + StringBuilder address = new StringBuilder(); + address.append(DataSourceConstants.JDBC_KYUUBI); + for (String zkHost : kyuubiParam.getHost().split(",")) { + address.append(String.format("%s:%s,", zkHost, kyuubiParam.getPort())); + } + address.deleteCharAt(address.length() - 1); + String jdbcUrl = address + "/" + kyuubiParam.getDatabase(); + KyuubiConnectionParam kyuubiConnectionParam = new KyuubiConnectionParam(); + kyuubiConnectionParam.setDatabase(kyuubiParam.getDatabase()); + kyuubiConnectionParam.setAddress(address.toString()); + kyuubiConnectionParam.setJdbcUrl(jdbcUrl); + kyuubiConnectionParam.setUser(kyuubiParam.getUserName()); + kyuubiConnectionParam.setPassword(PasswordUtils.encodePassword(kyuubiParam.getPassword())); + kyuubiConnectionParam.setDriverClassName(getDatasourceDriver()); + kyuubiConnectionParam.setValidationQuery(getValidationQuery()); + kyuubiConnectionParam.setOther(kyuubiParam.getOther()); + return kyuubiConnectionParam; + } + + @Override + public ConnectionParam createConnectionParams(String connectionJson) { + return JSONUtils.parseObject(connectionJson, KyuubiConnectionParam.class); + + } + + @Override + public String getDatasourceDriver() { + return DataSourceConstants.ORG_APACHE_KYUUBI_JDBC_DRIVER; + } + + @Override + public String getValidationQuery() { + return DataSourceConstants.KYUUBI_VALIDATION_QUERY; + } + + @Override + public String getJdbcUrl(ConnectionParam connectionParam) { + KyuubiConnectionParam kyuubiConnectionParam = (KyuubiConnectionParam) connectionParam; + String jdbcUrl = kyuubiConnectionParam.getJdbcUrl(); + + if (MapUtils.isNotEmpty(kyuubiConnectionParam.getOther())) { + return jdbcUrl + "?" + transformOther(kyuubiConnectionParam.getOther()); + } + return jdbcUrl; + } + + @Override + public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException { + KyuubiConnectionParam kyuubiConnectionParam = (KyuubiConnectionParam) connectionParam; + Class.forName(getDatasourceDriver()); + return DriverManager.getConnection(getJdbcUrl(connectionParam), + kyuubiConnectionParam.getUser(), PasswordUtils.decodePassword(kyuubiConnectionParam.getPassword())); + } + + @Override + public DbType getDbType() { + return DbType.KYUUBI; + } + + @Override + public DataSourceProcessor create() { + return new KyuubiDataSourceProcessor(); + } + + private String transformOther(Map otherMap) { + if (MapUtils.isEmpty(otherMap)) { + return null; + } + List otherList = new ArrayList<>(); + otherMap.forEach((key, value) -> otherList.add(String.format("%s=%s", key, value))); + return String.join(";", otherList); + } + +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactoryTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactoryTest.java new file mode 100644 index 0000000000..bc837cbe43 --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelFactoryTest.java @@ -0,0 +1,39 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi; + +import org.apache.dolphinscheduler.spi.datasource.DataSourceChannel; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; + +public class KyuubiDataSourceChannelFactoryTest { + + @Test + public void testCreate() { + KyuubiDataSourceChannelFactory sourceChannelFactory = new KyuubiDataSourceChannelFactory(); + DataSourceChannel dataSourceChannel = sourceChannelFactory.create(); + Assertions.assertNotNull(dataSourceChannel); + } + + @Test + public void testGetName() { + KyuubiDataSourceChannelFactory sourceChannelFactory = new KyuubiDataSourceChannelFactory(); + Assertions.assertEquals("kyuubi", sourceChannelFactory.getName()); + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelTest.java new file mode 100644 index 0000000000..78e3a33d2b --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceChannelTest.java @@ -0,0 +1,40 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi; + +import org.apache.dolphinscheduler.plugin.datasource.kyuubi.param.KyuubiConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class KyuubiDataSourceChannelTest { + + @Test + public void testCreateDataSourceClient() { + KyuubiDataSourceChannel sourceChannel = Mockito.mock(KyuubiDataSourceChannel.class); + KyuubiDataSourceClient dataSourceClient = Mockito.mock(KyuubiDataSourceClient.class); + Mockito.when(sourceChannel.createDataSourceClient(Mockito.any(), Mockito.any())).thenReturn(dataSourceClient); + Assertions + .assertNotNull(sourceChannel.createDataSourceClient(new KyuubiConnectionParam(), DbType.KYUUBI)); + } +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceClientTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceClientTest.java new file mode 100644 index 0000000000..041420cc48 --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/KyuubiDataSourceClientTest.java @@ -0,0 +1,73 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi; + +import org.apache.dolphinscheduler.plugin.datasource.kyuubi.param.KyuubiConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import java.sql.Connection; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class KyuubiDataSourceClientTest { + + @Mock + private KyuubiDataSourceClient kyuubiDataSourceClient; + + @Test + public void testPreInit() { + kyuubiDataSourceClient.preInit(); + Mockito.verify(kyuubiDataSourceClient).preInit(); + } + + @Test + public void testCheckEnv() { + + KyuubiConnectionParam kyuubiConnectionParam = new KyuubiConnectionParam(); + kyuubiDataSourceClient.checkEnv(kyuubiConnectionParam); + Mockito.verify(kyuubiDataSourceClient).checkEnv(kyuubiConnectionParam); + } + + @Test + public void testInitClient() { + KyuubiConnectionParam kyuubiConnectionParam = new KyuubiConnectionParam(); + kyuubiDataSourceClient.initClient(kyuubiConnectionParam, DbType.KYUUBI); + Mockito.verify(kyuubiDataSourceClient).initClient(kyuubiConnectionParam, DbType.KYUUBI); + } + + @Test + public void testCheckClient() { + kyuubiDataSourceClient.checkClient(); + Mockito.verify(kyuubiDataSourceClient).checkClient(); + } + + @Test + public void testGetConnection() { + Connection connection = Mockito.mock(Connection.class); + Mockito.when(kyuubiDataSourceClient.getConnection()).thenReturn(connection); + Assertions.assertNotNull(kyuubiDataSourceClient.getConnection()); + + } + +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java new file mode 100644 index 0000000000..865565c5dc --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/param/KyuubiDataSourceProcessorTest.java @@ -0,0 +1,172 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi.param; + +import org.apache.dolphinscheduler.common.constants.DataSourceConstants; +import org.apache.dolphinscheduler.common.utils.JSONUtils; +import org.apache.dolphinscheduler.plugin.datasource.api.utils.CommonUtils; +import org.apache.dolphinscheduler.plugin.datasource.api.utils.DataSourceUtils; +import org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils; +import org.apache.dolphinscheduler.spi.datasource.ConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import java.util.HashMap; +import java.util.Map; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.MockedStatic; +import org.mockito.Mockito; +import org.mockito.junit.jupiter.MockitoExtension; + +@ExtendWith(MockitoExtension.class) +public class KyuubiDataSourceProcessorTest { + + private KyuubiDataSourceProcessor kyuubiDatasourceProcessor = new KyuubiDataSourceProcessor(); + @Test + public void testCheckDatasourceParam() { + KyuubiDataSourceParamDTO kyuubiDatasourceParamDTO = new KyuubiDataSourceParamDTO(); + kyuubiDatasourceParamDTO.setHost("localhost"); + kyuubiDatasourceParamDTO.setDatabase("default"); + Map other = new HashMap<>(); + other.put("serverTimezone", "Asia/Shanghai"); + kyuubiDatasourceParamDTO.setOther(other); + DataSourceUtils.checkDatasourceParam(kyuubiDatasourceParamDTO); + Assertions.assertTrue(true); + } + + @Test + public void testBuildConnectionParams() { + KyuubiDataSourceParamDTO kyuubiDataSourceParamDTO = new KyuubiDataSourceParamDTO(); + kyuubiDataSourceParamDTO.setHost("localhost"); + kyuubiDataSourceParamDTO.setDatabase("default"); + kyuubiDataSourceParamDTO.setUserName("root"); + kyuubiDataSourceParamDTO.setPort(3306); + kyuubiDataSourceParamDTO.setPassword("123456"); + + try ( + MockedStatic mockedStaticPasswordUtils = Mockito.mockStatic(PasswordUtils.class); + MockedStatic mockedStaticCommonUtils = Mockito.mockStatic(CommonUtils.class)) { + mockedStaticPasswordUtils.when(() -> PasswordUtils.encodePassword(Mockito.anyString())) + .thenReturn("123456"); + mockedStaticCommonUtils.when(CommonUtils::getKerberosStartupState).thenReturn(false); + ConnectionParam connectionParam = DataSourceUtils.buildConnectionParams(kyuubiDataSourceParamDTO); + Assertions.assertNotNull(connectionParam); + } + } + + @Test + public void testBuildConnectionParams2() { + KyuubiDataSourceParamDTO kyuubiDataSourceParamDTO = new KyuubiDataSourceParamDTO(); + kyuubiDataSourceParamDTO.setHost("localhost"); + kyuubiDataSourceParamDTO.setDatabase("default"); + kyuubiDataSourceParamDTO.setUserName("root"); + kyuubiDataSourceParamDTO.setPort(3306); + kyuubiDataSourceParamDTO.setPassword("123456"); + ConnectionParam connectionParam = + DataSourceUtils.buildConnectionParams(DbType.KYUUBI, JSONUtils.toJsonString(kyuubiDataSourceParamDTO)); + Assertions.assertNotNull(connectionParam); + } + @Test + public void testCreateConnectionParams() { + Map props = new HashMap<>(); + props.put("serverTimezone", "utc"); + KyuubiDataSourceParamDTO kyuubiDataSourceParamDTO = new KyuubiDataSourceParamDTO(); + kyuubiDataSourceParamDTO.setHost("localhost1,localhost2"); + kyuubiDataSourceParamDTO.setPort(5142); + kyuubiDataSourceParamDTO.setUserName("default"); + kyuubiDataSourceParamDTO.setDatabase("default"); + kyuubiDataSourceParamDTO.setOther(props); + + try ( + MockedStatic mockedStaticPasswordUtils = Mockito.mockStatic(PasswordUtils.class); + MockedStatic mockedStaticCommonUtils = Mockito.mockStatic(CommonUtils.class)) { + mockedStaticPasswordUtils.when(() -> PasswordUtils.encodePassword(Mockito.anyString())).thenReturn("test"); + KyuubiConnectionParam connectionParams = (KyuubiConnectionParam) kyuubiDatasourceProcessor + .createConnectionParams(kyuubiDataSourceParamDTO); + Assertions.assertNotNull(connectionParams); + Assertions.assertEquals("jdbc:kyuubi://localhost1:5142,localhost2:5142", connectionParams.getAddress()); + } + } + + @Test + public void testCreateConnectionParams2() { + String connectionParam = "{\"user\":\"default\",\"address\":\"jdbc:kyuubi://localhost1:5142,localhost2:5142\"" + + ",\"jdbcUrl\":\"jdbc:kyuubi://localhost1:5142,localhost2:5142/default\"}"; + KyuubiConnectionParam connectionParams = (KyuubiConnectionParam) kyuubiDatasourceProcessor + .createConnectionParams(connectionParam); + Assertions.assertNotNull(connectionParam); + Assertions.assertEquals("default", connectionParams.getUser()); + } + @Test + public void testCreateDatasourceParamDTO() { + String connectionParam = "{\"user\":\"default\",\"address\":\"jdbc:kyuubi://localhost1:5142,localhost2:5142\"" + + ",\"jdbcUrl\":\"jdbc:kyuubi://localhost1:5142,localhost2:5142/default\"}"; + KyuubiDataSourceParamDTO kyuubiDataSourceParamDTO = (KyuubiDataSourceParamDTO) kyuubiDatasourceProcessor + .createDatasourceParamDTO(connectionParam); + Assertions.assertEquals("default", kyuubiDataSourceParamDTO.getUserName()); + } + + @Test + public void testGetDatasourceDriver() { + Assertions.assertEquals(DataSourceConstants.ORG_APACHE_KYUUBI_JDBC_DRIVER, + kyuubiDatasourceProcessor.getDatasourceDriver()); + } + + @Test + public void testGetJdbcUrl() { + KyuubiConnectionParam connectionParam = new KyuubiConnectionParam(); + connectionParam.setJdbcUrl("jdbc:kyuubi://localhost1:5142,localhost2:5142/default"); + Map other = new HashMap<>(); + other.put("serverTimezone", "Asia/Shanghai"); + connectionParam.setOther(other); + Assertions.assertEquals("jdbc:kyuubi://localhost1:5142,localhost2:5142/default?serverTimezone=Asia/Shanghai", + kyuubiDatasourceProcessor.getJdbcUrl(connectionParam)); + } + + @Test + public void testDbType() { + Assertions.assertEquals(18, DbType.KYUUBI.getCode()); + Assertions.assertEquals("kyuubi", DbType.KYUUBI.getDescp()); + Assertions.assertEquals(DbType.KYUUBI, DbType.of(18)); + } + + @Test + public void testGetDbType() { + Assertions.assertEquals(DbType.KYUUBI, kyuubiDatasourceProcessor.getDbType()); + } + + @Test + public void testGetValidationQuery() { + Assertions.assertEquals(DataSourceConstants.KYUUBI_VALIDATION_QUERY, + kyuubiDatasourceProcessor.getValidationQuery()); + } + + @Test + public void testBuildString() { + KyuubiDataSourceParamDTO kyuubiDataSourceParamDTO = new KyuubiDataSourceParamDTO(); + kyuubiDataSourceParamDTO.setHost("localhost"); + kyuubiDataSourceParamDTO.setDatabase("default"); + kyuubiDataSourceParamDTO.setUserName("root"); + kyuubiDataSourceParamDTO.setPort(3306); + kyuubiDataSourceParamDTO.setPassword("123456"); + Assertions.assertNotNull(kyuubiDataSourceParamDTO.toString()); + } + +} diff --git a/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/provider/KyuubiJDBCDataSourceProviderTest.java b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/provider/KyuubiJDBCDataSourceProviderTest.java new file mode 100644 index 0000000000..5c135f5004 --- /dev/null +++ b/dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-kyuubi/src/test/java/org/apache/dolphinscheduler/plugin/datasource/kyuubi/provider/KyuubiJDBCDataSourceProviderTest.java @@ -0,0 +1,60 @@ +/* + * 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.dolphinscheduler.plugin.datasource.kyuubi.provider; + +import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider; +import org.apache.dolphinscheduler.plugin.datasource.kyuubi.param.KyuubiConnectionParam; +import org.apache.dolphinscheduler.spi.enums.DbType; + +import org.junit.jupiter.api.Assertions; +import org.junit.jupiter.api.Test; +import org.mockito.MockedStatic; +import org.mockito.Mockito; + +import com.zaxxer.hikari.HikariDataSource; + +public class KyuubiJDBCDataSourceProviderTest { + + @Test + public void testCreateJdbcDataSource() { + try ( + MockedStatic mockedJDBCDataSourceProvider = + Mockito.mockStatic(JDBCDataSourceProvider.class)) { + HikariDataSource dataSource = Mockito.mock(HikariDataSource.class); + mockedJDBCDataSourceProvider + .when(() -> JDBCDataSourceProvider.createJdbcDataSource(Mockito.any(), Mockito.any())) + .thenReturn(dataSource); + Assertions.assertNotNull( + JDBCDataSourceProvider.createJdbcDataSource(new KyuubiConnectionParam(), DbType.KYUUBI)); + } + } + + @Test + public void testCreateOneSessionJdbcDataSource() { + try ( + MockedStatic mockedJDBCDataSourceProvider = + Mockito.mockStatic(JDBCDataSourceProvider.class)) { + HikariDataSource dataSource = Mockito.mock(HikariDataSource.class); + mockedJDBCDataSourceProvider + .when(() -> JDBCDataSourceProvider.createOneSessionJdbcDataSource(Mockito.any(), Mockito.any())) + .thenReturn(dataSource); + Assertions.assertNotNull( + JDBCDataSourceProvider.createOneSessionJdbcDataSource(new KyuubiConnectionParam(), DbType.KYUUBI)); + } + } +} diff --git a/dolphinscheduler-datasource-plugin/pom.xml b/dolphinscheduler-datasource-plugin/pom.xml index 53bfa9e009..97ece76fa8 100644 --- a/dolphinscheduler-datasource-plugin/pom.xml +++ b/dolphinscheduler-datasource-plugin/pom.xml @@ -42,6 +42,7 @@ dolphinscheduler-datasource-all dolphinscheduler-datasource-redshift dolphinscheduler-datasource-athena + dolphinscheduler-datasource-kyuubi dolphinscheduler-datasource-trino dolphinscheduler-datasource-starrocks dolphinscheduler-datasource-azure-sql diff --git a/dolphinscheduler-dist/release-docs/licenses/LICENSE-kyuubi-hive-jdbc.txt b/dolphinscheduler-dist/release-docs/licenses/LICENSE-kyuubi-hive-jdbc.txt new file mode 100644 index 0000000000..837c400271 --- /dev/null +++ b/dolphinscheduler-dist/release-docs/licenses/LICENSE-kyuubi-hive-jdbc.txt @@ -0,0 +1,218 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed 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. + +------------------------------------------------------------------------------------ +This product bundles various third-party components under other open source licenses. +This section summarizes those components and their licenses. See licenses/ +for text of these licenses. + +Apache License Version 2.0 +-------------------------- +kyuubi-server/src/main/resources/org/apache/kyuubi/ui/swagger/* + +MIT license +----------- +kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/assets/fonts/* +kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/icon.min.css +kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.css +kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/semantic.min.js +kyuubi-server/src/main/resources/org/apache/kyuubi/ui/static/jquery-3.6.0.min.js diff --git a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java index 90d556feaf..3244f2b9ea 100644 --- a/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java +++ b/dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/enums/DbType.java @@ -45,7 +45,8 @@ public enum DbType { AZURESQL(14, "azuresql"), DAMENG(15, "dameng"), OCEANBASE(16, "oceanbase"), - SSH(17, "ssh"); + SSH(17, "ssh"), + KYUUBI(18, "kyuubi"); private static final Map DB_TYPE_MAP = Arrays.stream(DbType.values()).collect(toMap(DbType::getCode, Functions.identity())); diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-udfs.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-udfs.ts index 6ac9712718..3c2f444354 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-udfs.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/fields/use-udfs.ts @@ -23,12 +23,15 @@ export function useUdfs(model: { [field: string]: any }): IJsonItem { const { t } = useI18n() const options = ref([]) const loading = ref(false) - const span = computed(() => (['HIVE', 'SPARK'].includes(model.type) ? 24 : 0)) + const span = computed(() => + ['HIVE', 'SPARK', 'KYUUBI'].includes(model.type) ? 24 : 0 + ) const getUdfs = async () => { if (loading.value) return loading.value = true - const res = await queryUdfFuncList({ type: model.type }) + const type = model.type === 'KYUUBI' ? 'HIVE' : model.type + const res = await queryUdfFuncList({ type }) options.value = res.map((udf: { id: number; funcName: string }) => ({ value: String(udf.id), label: udf.funcName @@ -39,7 +42,7 @@ export function useUdfs(model: { [field: string]: any }): IJsonItem { watch( () => model.type, (value) => { - if (['HIVE', 'SPARK'].includes(value)) { + if (['HIVE', 'SPARK', 'KYUUBI'].includes(value)) { getUdfs() } } diff --git a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts index b4c346834a..8b54dc03e4 100644 --- a/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts +++ b/dolphinscheduler-ui/src/views/projects/task/components/node/format-data.ts @@ -203,6 +203,10 @@ export function formatParams(data: INodeData): { if (data.udfs) taskParams.udfs = data.udfs.join(',') taskParams.connParams = data.connParams } + + if (data.type === 'KYUUBI') { + if (data.udfs) taskParams.udfs = data.udfs.join(',') + } } if (data.taskType === 'PROCEDURE') { diff --git a/tools/dependencies/known-dependencies.txt b/tools/dependencies/known-dependencies.txt index be7e550e7a..ed9e5e3bd2 100644 --- a/tools/dependencies/known-dependencies.txt +++ b/tools/dependencies/known-dependencies.txt @@ -474,3 +474,4 @@ sshd-sftp-2.8.0.jar sshd-common-2.8.0.jar sshd-core-2.8.0.jar jcl-over-slf4j-1.7.36.jar +kyuubi-hive-jdbc-shaded-1.7.0.jar \ No newline at end of file