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/03/01 09:45:21 UTC
[GitHub] [dolphinscheduler] ruanwenjun commented on a change in pull request #8564: [Feature-8527][Datasource] Add dataSource for Amazon Redshift
ruanwenjun commented on a change in pull request #8564:
URL: https://github.com/apache/dolphinscheduler/pull/8564#discussion_r816602694
##########
File path: dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/redshift/RedshiftDataSourceProcessor.java
##########
@@ -0,0 +1,140 @@
+/*
+ * 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.datasource.redshift;
+
+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.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.dolphinscheduler.spi.utils.Constants;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class RedshiftDataSourceProcessor extends AbstractDataSourceProcessor {
+
+ @Override
+ public BaseDataSourceParamDTO createDatasourceParamDTO(String connectionJson) {
+ RedshiftConnectionParam
+ connectionParams = (RedshiftConnectionParam) createConnectionParams(connectionJson);
+
+ String[] hostSeperator = connectionParams.getAddress().split(Constants.DOUBLE_SLASH);
+ String[] hostPortArray = hostSeperator[hostSeperator.length - 1].split(Constants.COMMA);
+
+ RedshiftDataSourceParamDTO
+ redshiftDatasourceParamDTO = new RedshiftDataSourceParamDTO();
+ redshiftDatasourceParamDTO.setPort(Integer.parseInt(hostPortArray[0].split(Constants.COLON)[1]));
+ redshiftDatasourceParamDTO.setHost(hostPortArray[0].split(Constants.COLON)[0]);
+ redshiftDatasourceParamDTO.setDatabase(connectionParams.getDatabase());
+ redshiftDatasourceParamDTO.setUserName(connectionParams.getUser());
+ redshiftDatasourceParamDTO.setOther(parseOther(connectionParams.getOther()));
+
+ return redshiftDatasourceParamDTO;
+ }
+
+ @Override
+ public BaseConnectionParam createConnectionParams(BaseDataSourceParamDTO datasourceParam) {
+ RedshiftDataSourceParamDTO redshiftParam = (RedshiftDataSourceParamDTO) datasourceParam;
+ String address = String.format("%s%s:%s", Constants.JDBC_REDSHIFT, redshiftParam.getHost(), redshiftParam.getPort());
+ String jdbcUrl = address + "/" + redshiftParam.getDatabase();
+
+ RedshiftConnectionParam
+ redshiftConnectionParam = new RedshiftConnectionParam();
+ redshiftConnectionParam.setUser(redshiftParam.getUserName());
+ redshiftConnectionParam.setPassword(PasswordUtils.encodePassword(redshiftParam.getPassword()));
+ redshiftConnectionParam.setOther(transformOther(redshiftParam.getOther()));
+ redshiftConnectionParam.setAddress(address);
+ redshiftConnectionParam.setJdbcUrl(jdbcUrl);
+ redshiftConnectionParam.setDatabase(redshiftParam.getDatabase());
+ redshiftConnectionParam.setDriverClassName(getDatasourceDriver());
+ redshiftConnectionParam.setValidationQuery(getValidationQuery());
+ redshiftConnectionParam.setProps(redshiftParam.getOther());
+
+ return redshiftConnectionParam;
+ }
+
+ @Override
+ public ConnectionParam createConnectionParams(String connectionJson) {
+ return JSONUtils.parseObject(connectionJson, RedshiftConnectionParam.class);
+ }
+
+ @Override
+ public String getDatasourceDriver() {
+ return Constants.COM_REDSHIFT_JDBC_DRIVER;
+ }
+
+ @Override
+ public String getValidationQuery() {
+ return Constants.REDHIFT_VALIDATION_QUERY;
+ }
+
+ @Override
+ public String getJdbcUrl(ConnectionParam connectionParam) {
+ RedshiftConnectionParam
+ redshiftConnectionParam = (RedshiftConnectionParam) connectionParam;
+ if (!StringUtils.isEmpty(redshiftConnectionParam.getOther())) {
+ return String.format("%s?%s", redshiftConnectionParam.getJdbcUrl(), redshiftConnectionParam.getOther());
+ }
+ return redshiftConnectionParam.getJdbcUrl();
+ }
+
+ @Override
+ public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
+ RedshiftConnectionParam redshiftConnectionParam = (RedshiftConnectionParam) connectionParam;
+ Class.forName(getDatasourceDriver());
+ return DriverManager.getConnection(getJdbcUrl(connectionParam),
+ redshiftConnectionParam.getUser(), PasswordUtils.decodePassword(redshiftConnectionParam.getPassword()));
+ }
+
+ @Override
+ public DbType getDbType() {
+ return DbType.REDSHIFT;
+ }
+
+ private String transformOther(Map<String, String> otherMap) {
+ if (MapUtils.isNotEmpty(otherMap)) {
+ List<String> list = new ArrayList<>();
Review comment:
Suggest to add initialize size.
```suggestion
List<String> list = new ArrayList<>(otherMap.size());
```
##########
File path: dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-api/src/main/java/org/apache/dolphinscheduler/plugin/datasource/api/datasource/redshift/RedshiftDataSourceProcessor.java
##########
@@ -0,0 +1,140 @@
+/*
+ * 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.datasource.redshift;
+
+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.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.dolphinscheduler.spi.utils.Constants;
+import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
+import org.apache.commons.collections4.MapUtils;
+import org.apache.commons.lang.StringUtils;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+
+public class RedshiftDataSourceProcessor extends AbstractDataSourceProcessor {
+
+ @Override
+ public BaseDataSourceParamDTO createDatasourceParamDTO(String connectionJson) {
+ RedshiftConnectionParam
+ connectionParams = (RedshiftConnectionParam) createConnectionParams(connectionJson);
+
+ String[] hostSeperator = connectionParams.getAddress().split(Constants.DOUBLE_SLASH);
+ String[] hostPortArray = hostSeperator[hostSeperator.length - 1].split(Constants.COMMA);
+
+ RedshiftDataSourceParamDTO
+ redshiftDatasourceParamDTO = new RedshiftDataSourceParamDTO();
+ redshiftDatasourceParamDTO.setPort(Integer.parseInt(hostPortArray[0].split(Constants.COLON)[1]));
+ redshiftDatasourceParamDTO.setHost(hostPortArray[0].split(Constants.COLON)[0]);
+ redshiftDatasourceParamDTO.setDatabase(connectionParams.getDatabase());
+ redshiftDatasourceParamDTO.setUserName(connectionParams.getUser());
+ redshiftDatasourceParamDTO.setOther(parseOther(connectionParams.getOther()));
+
+ return redshiftDatasourceParamDTO;
+ }
+
+ @Override
+ public BaseConnectionParam createConnectionParams(BaseDataSourceParamDTO datasourceParam) {
+ RedshiftDataSourceParamDTO redshiftParam = (RedshiftDataSourceParamDTO) datasourceParam;
+ String address = String.format("%s%s:%s", Constants.JDBC_REDSHIFT, redshiftParam.getHost(), redshiftParam.getPort());
+ String jdbcUrl = address + "/" + redshiftParam.getDatabase();
+
+ RedshiftConnectionParam
+ redshiftConnectionParam = new RedshiftConnectionParam();
+ redshiftConnectionParam.setUser(redshiftParam.getUserName());
+ redshiftConnectionParam.setPassword(PasswordUtils.encodePassword(redshiftParam.getPassword()));
+ redshiftConnectionParam.setOther(transformOther(redshiftParam.getOther()));
+ redshiftConnectionParam.setAddress(address);
+ redshiftConnectionParam.setJdbcUrl(jdbcUrl);
+ redshiftConnectionParam.setDatabase(redshiftParam.getDatabase());
+ redshiftConnectionParam.setDriverClassName(getDatasourceDriver());
+ redshiftConnectionParam.setValidationQuery(getValidationQuery());
+ redshiftConnectionParam.setProps(redshiftParam.getOther());
+
+ return redshiftConnectionParam;
+ }
+
+ @Override
+ public ConnectionParam createConnectionParams(String connectionJson) {
+ return JSONUtils.parseObject(connectionJson, RedshiftConnectionParam.class);
+ }
+
+ @Override
+ public String getDatasourceDriver() {
+ return Constants.COM_REDSHIFT_JDBC_DRIVER;
+ }
+
+ @Override
+ public String getValidationQuery() {
+ return Constants.REDHIFT_VALIDATION_QUERY;
+ }
+
+ @Override
+ public String getJdbcUrl(ConnectionParam connectionParam) {
+ RedshiftConnectionParam
+ redshiftConnectionParam = (RedshiftConnectionParam) connectionParam;
+ if (!StringUtils.isEmpty(redshiftConnectionParam.getOther())) {
+ return String.format("%s?%s", redshiftConnectionParam.getJdbcUrl(), redshiftConnectionParam.getOther());
+ }
+ return redshiftConnectionParam.getJdbcUrl();
+ }
+
+ @Override
+ public Connection getConnection(ConnectionParam connectionParam) throws ClassNotFoundException, SQLException {
+ RedshiftConnectionParam redshiftConnectionParam = (RedshiftConnectionParam) connectionParam;
+ Class.forName(getDatasourceDriver());
+ return DriverManager.getConnection(getJdbcUrl(connectionParam),
+ redshiftConnectionParam.getUser(), PasswordUtils.decodePassword(redshiftConnectionParam.getPassword()));
+ }
+
+ @Override
+ public DbType getDbType() {
+ return DbType.REDSHIFT;
+ }
+
+ private String transformOther(Map<String, String> otherMap) {
+ if (MapUtils.isNotEmpty(otherMap)) {
+ List<String> list = new ArrayList<>();
+ otherMap.forEach((key, value) -> list.add(String.format("%s=%s", key, value)));
+ return String.join(";", list);
Review comment:
It's better to extract the magic string ";", since this string has been used in two place.
--
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