You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/11/24 07:08:08 UTC
[GitHub] [dolphinscheduler] caishunfeng commented on a diff in pull request #12860: [Feature-9467] add DM DataSource
caishunfeng commented on code in PR #12860:
URL: https://github.com/apache/dolphinscheduler/pull/12860#discussion_r1031118703
##########
dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/DruidDataSourceClient.java:
##########
@@ -0,0 +1,129 @@
+/*
+ * 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.api.client;
+
+import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider;
+import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
+import org.apache.dolphinscheduler.spi.datasource.DataSourceClient;
+import org.apache.dolphinscheduler.spi.enums.DbType;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.google.common.base.Stopwatch;
+
+public class DruidDataSourceClient implements DataSourceClient {
+
+ private static final Logger logger = LoggerFactory.getLogger(DruidDataSourceClient.class);
+
+ public static final String COMMON_USER = "root";
+ public static final String COMMON_VALIDATION_QUERY = "select 1";
+
+ protected final BaseConnectionParam baseConnectionParam;
+ protected DruidDataSource dataSource;
+ protected JdbcTemplate jdbcTemplate;
+
+ public DruidDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+ this.baseConnectionParam = baseConnectionParam;
+ preInit();
+ checkEnv(baseConnectionParam);
+ initClient(baseConnectionParam, dbType);
+ checkClient();
+ }
+
+ protected void preInit() {
+ logger.info("preInit in DruidDataSourceClient");
+ }
+
+ protected void checkEnv(BaseConnectionParam baseConnectionParam) {
+ checkValidationQuery(baseConnectionParam);
+ checkUser(baseConnectionParam);
+ }
+
+ /**
+ * HikariCP does not support DM, druid supports DM
+ * @param baseConnectionParam
+ * @param dbType
+ */
+ protected void initClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+ this.dataSource = JDBCDataSourceProvider.createDruidDataSource(baseConnectionParam, dbType);
+ this.jdbcTemplate = new JdbcTemplate(dataSource);
+ }
+
+ protected void checkUser(BaseConnectionParam baseConnectionParam) {
+ if (StringUtils.isBlank(baseConnectionParam.getUser())) {
+ setDefaultUsername(baseConnectionParam);
+ }
+ }
+
+ protected void setDefaultUsername(BaseConnectionParam baseConnectionParam) {
+ baseConnectionParam.setUser(COMMON_USER);
+ }
+
+ protected void checkValidationQuery(BaseConnectionParam baseConnectionParam) {
+ if (StringUtils.isBlank(baseConnectionParam.getValidationQuery())) {
+ setDefaultValidationQuery(baseConnectionParam);
+ }
+ }
+
+ protected void setDefaultValidationQuery(BaseConnectionParam baseConnectionParam) {
+ baseConnectionParam.setValidationQuery(COMMON_VALIDATION_QUERY);
+ }
+
+ @Override
+ public void checkClient() {
+ // Checking data source client
+ Stopwatch stopwatch = Stopwatch.createStarted();
+ try {
+ this.jdbcTemplate.execute(this.baseConnectionParam.getValidationQuery());
+ } catch (Exception e) {
+ throw new RuntimeException("JDBC connect failed", e);
+ } finally {
+ logger.info("Time to execute check jdbc client with sql {} for {} ms ",
+ this.baseConnectionParam.getValidationQuery(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+ }
Review Comment:
```suggestion
try {
this.jdbcTemplate.execute(this.baseConnectionParam.getValidationQuery());
logger.info("Time to execute check jdbc client with sql {} for {} ms ",
this.baseConnectionParam.getValidationQuery(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
} catch (Exception e) {
throw new RuntimeException("JDBC connect failed", e);
}
```
##########
dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-dm/src/main/java/org/apache/dolphinscheduler/plugin/datasource/dm/param/DmDataSourceProcessor.java:
##########
@@ -0,0 +1,160 @@
+/*
+ * 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.dm.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 org.apache.commons.lang3.StringUtils;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.auto.service.AutoService;
+
+@AutoService(DataSourceProcessor.class)
+public class DmDataSourceProcessor extends AbstractDataSourceProcessor {
+
+ private final Logger logger = LoggerFactory.getLogger(DmDataSourceProcessor.class);
+
+ @Override
+ public BaseDataSourceParamDTO castDatasourceParamDTO(String paramJson) {
+ return JSONUtils.parseObject(paramJson, DmDataSourceParamDTO.class);
+ }
+
+ @Override
+ public BaseDataSourceParamDTO createDatasourceParamDTO(String connectionJson) {
+ DmConnectionParam connectionParams = (DmConnectionParam) createConnectionParams(connectionJson);
+ DmDataSourceParamDTO dmDatasourceParamDTO = new DmDataSourceParamDTO();
+
+ dmDatasourceParamDTO.setUserName(connectionParams.getUser());
+ dmDatasourceParamDTO.setDatabase(connectionParams.getDatabase());
+ dmDatasourceParamDTO.setOther(parseOther(connectionParams.getOther()));
+
+ String address = connectionParams.getAddress();
+ String[] hostSeperator = address.split(Constants.DOUBLE_SLASH);
+ String[] hostPortArray = hostSeperator[hostSeperator.length - 1].split(Constants.COMMA);
+ dmDatasourceParamDTO.setPort(Integer.parseInt(hostPortArray[0].split(Constants.COLON)[1]));
+ dmDatasourceParamDTO.setHost(hostPortArray[0].split(Constants.COLON)[0]);
+
+ return dmDatasourceParamDTO;
+ }
+
+ @Override
+ public BaseConnectionParam createConnectionParams(BaseDataSourceParamDTO dataSourceParam) {
+ DmDataSourceParamDTO dmDatasourceParam = (DmDataSourceParamDTO) dataSourceParam;
+ String address = String
+ .format("%s%s:%s", DataSourceConstants.JDBC_DM, dmDatasourceParam.getHost(),
+ dmDatasourceParam.getPort());
+ String jdbcUrl = StringUtils.isEmpty(dmDatasourceParam.getDatabase()) ? address
+ : String.format("%s/%s", address,
+ dmDatasourceParam.getDatabase());
+
+ DmConnectionParam dmConnectionParam = new DmConnectionParam();
+ dmConnectionParam.setJdbcUrl(jdbcUrl);
+ dmConnectionParam.setDatabase(dmConnectionParam.getDatabase());
+ dmConnectionParam.setAddress(address);
+ dmConnectionParam.setUser(dmDatasourceParam.getUserName());
+ dmConnectionParam.setPassword(PasswordUtils.encodePassword(dmDatasourceParam.getPassword()));
+ dmConnectionParam.setDriverClassName(getDatasourceDriver());
+ dmConnectionParam.setValidationQuery(getValidationQuery());
+ dmConnectionParam.setOther(transformOther(dmDatasourceParam.getOther()));
+ dmConnectionParam.setProps(dmDatasourceParam.getOther());
+
+ return dmConnectionParam;
+ }
+
+ @Override
+ public ConnectionParam createConnectionParams(String connectionJson) {
+ return JSONUtils.parseObject(connectionJson, DmConnectionParam.class);
+ }
+
+ @Override
+ public String getDatasourceDriver() {
+ return DataSourceConstants.COM_DM_JDBC_DRIVER;
+ }
+
+ @Override
+ public String getValidationQuery() {
+ return DataSourceConstants.DM_VALIDATION_QUERY;
+ }
+
+ @Override
+ public String getJdbcUrl(ConnectionParam connectionParam) {
+ DmConnectionParam dmConnectionParam = (DmConnectionParam) connectionParam;
+ String jdbcUrl = dmConnectionParam.getJdbcUrl();
+ if (!StringUtils.isEmpty(dmConnectionParam.getOther())) {
Review Comment:
```suggestion
if (StringUtils.isNotEmpty(dmConnectionParam.getOther())) {
```
##########
dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/client/DruidDataSourceClient.java:
##########
@@ -0,0 +1,129 @@
+/*
+ * 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.api.client;
+
+import org.apache.dolphinscheduler.plugin.datasource.api.provider.JDBCDataSourceProvider;
+import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam;
+import org.apache.dolphinscheduler.spi.datasource.DataSourceClient;
+import org.apache.dolphinscheduler.spi.enums.DbType;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.concurrent.TimeUnit;
+
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.jdbc.core.JdbcTemplate;
+
+import com.alibaba.druid.pool.DruidDataSource;
+import com.google.common.base.Stopwatch;
+
+public class DruidDataSourceClient implements DataSourceClient {
+
+ private static final Logger logger = LoggerFactory.getLogger(DruidDataSourceClient.class);
+
+ public static final String COMMON_USER = "root";
+ public static final String COMMON_VALIDATION_QUERY = "select 1";
+
+ protected final BaseConnectionParam baseConnectionParam;
+ protected DruidDataSource dataSource;
+ protected JdbcTemplate jdbcTemplate;
+
+ public DruidDataSourceClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+ this.baseConnectionParam = baseConnectionParam;
+ preInit();
+ checkEnv(baseConnectionParam);
+ initClient(baseConnectionParam, dbType);
+ checkClient();
+ }
+
+ protected void preInit() {
+ logger.info("preInit in DruidDataSourceClient");
+ }
+
+ protected void checkEnv(BaseConnectionParam baseConnectionParam) {
+ checkValidationQuery(baseConnectionParam);
+ checkUser(baseConnectionParam);
+ }
+
+ /**
+ * HikariCP does not support DM, druid supports DM
+ * @param baseConnectionParam
+ * @param dbType
+ */
+ protected void initClient(BaseConnectionParam baseConnectionParam, DbType dbType) {
+ this.dataSource = JDBCDataSourceProvider.createDruidDataSource(baseConnectionParam, dbType);
+ this.jdbcTemplate = new JdbcTemplate(dataSource);
+ }
+
+ protected void checkUser(BaseConnectionParam baseConnectionParam) {
+ if (StringUtils.isBlank(baseConnectionParam.getUser())) {
+ setDefaultUsername(baseConnectionParam);
+ }
+ }
+
+ protected void setDefaultUsername(BaseConnectionParam baseConnectionParam) {
+ baseConnectionParam.setUser(COMMON_USER);
+ }
+
+ protected void checkValidationQuery(BaseConnectionParam baseConnectionParam) {
+ if (StringUtils.isBlank(baseConnectionParam.getValidationQuery())) {
+ setDefaultValidationQuery(baseConnectionParam);
+ }
+ }
+
+ protected void setDefaultValidationQuery(BaseConnectionParam baseConnectionParam) {
+ baseConnectionParam.setValidationQuery(COMMON_VALIDATION_QUERY);
+ }
+
+ @Override
+ public void checkClient() {
+ // Checking data source client
+ Stopwatch stopwatch = Stopwatch.createStarted();
+ try {
+ this.jdbcTemplate.execute(this.baseConnectionParam.getValidationQuery());
+ } catch (Exception e) {
+ throw new RuntimeException("JDBC connect failed", e);
+ } finally {
+ logger.info("Time to execute check jdbc client with sql {} for {} ms ",
+ this.baseConnectionParam.getValidationQuery(), stopwatch.elapsed(TimeUnit.MILLISECONDS));
+ }
+ }
+
+ @Override
+ public Connection getConnection() {
+ try {
+ return this.dataSource.getConnection();
+ } catch (SQLException e) {
+ logger.error("get druidDataSource Connection fail SQLException: {}", e.getMessage(), e);
Review Comment:
```suggestion
logger.error("get druidDataSource Connection fail SQLException: ", e);
```
--
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: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org