Skip to content

Commit

Permalink
merge master, add pr 489,490,491
Browse files Browse the repository at this point in the history
  • Loading branch information
JNSimba committed Sep 20, 2024
1 parent af6144b commit 0533fa4
Show file tree
Hide file tree
Showing 11 changed files with 325 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,8 @@ public IllegalArgumentException(String msg, Throwable cause) {
public IllegalArgumentException(String arg, String value) {
super("argument '" + arg + "' is illegal, value is '" + value + "'.");
}

public IllegalArgumentException(String msg) {
super(msg);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,8 @@ public static boolean tryHttpConnection(String host) {
int responseCode = connection.getResponseCode();
String responseMessage = connection.getResponseMessage();
connection.disconnect();
if (200 == responseCode) {
if (responseCode < 500) {
// code greater than 500 means a server-side exception.
return true;
}
LOG.warn(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ public class SchemaChangeHelper {
private static final String CREATE_DATABASE_DDL = "CREATE DATABASE IF NOT EXISTS %s";
private static final String MODIFY_TYPE_DDL = "ALTER TABLE %s MODIFY COLUMN %s %s";
private static final String MODIFY_COMMENT_DDL = "ALTER TABLE %s MODIFY COLUMN %s COMMENT '%s'";
private static final String SHOW_FULL_COLUMN_DDL = "SHOW FULL COLUMNS FROM `%s`.`%s`";

public static void compareSchema(
Map<String, FieldSchema> updateFiledSchemaMap,
Expand Down Expand Up @@ -166,13 +167,19 @@ public static String buildModifyColumnDataTypeDDL(
String columnName = fieldSchema.getName();
String dataType = fieldSchema.getTypeString();
String comment = fieldSchema.getComment();
String defaultValue = fieldSchema.getDefaultValue();
StringBuilder modifyDDL =
new StringBuilder(
String.format(
MODIFY_TYPE_DDL,
DorisSchemaFactory.quoteTableIdentifier(tableIdentifier),
DorisSchemaFactory.identifier(columnName),
dataType));
if (StringUtils.isNotBlank(defaultValue)) {
modifyDDL
.append(" DEFAULT ")
.append(DorisSchemaFactory.quoteDefaultValue(defaultValue));
}
commentColumn(modifyDDL, comment);
return modifyDDL.toString();
}
Expand All @@ -183,6 +190,10 @@ private static void commentColumn(StringBuilder ddl, String comment) {
}
}

public static String buildShowFullColumnDDL(String database, String table) {
return String.format(SHOW_FULL_COLUMN_DDL, database, table);
}

public static List<DDLSchema> getDdlSchemas() {
return ddlSchemas;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.NullNode;
import org.apache.commons.codec.binary.Base64;
import org.apache.doris.flink.catalog.doris.DorisSystem;
import org.apache.doris.flink.catalog.doris.FieldSchema;
Expand Down Expand Up @@ -123,11 +124,30 @@ public boolean modifyColumnDataType(String database, String table, FieldSchema f
throws IOException, IllegalArgumentException {
if (!checkColumnExists(database, table, field.getName())) {
LOG.warn(
"The column {} is not exists in table {}, can not modify it type",
"The column {} is not exists in table {}, can not modify it's type",
field.getName(),
table);
return false;
}

String ddl = SchemaChangeHelper.buildShowFullColumnDDL(database, table);
String defaultValue = getDefaultValue(ddl, database, field.getName());
if (!StringUtils.isNullOrWhitespaceOnly(field.getDefaultValue())) {
// Can not change default value
if (!field.getDefaultValue().equals(defaultValue)) {
LOG.warn(
"Column:{} can not change default value from {} to {}, fallback it",
field.getName(),
defaultValue,
field.getDefaultValue());
field.setDefaultValue(defaultValue);
}
} else {
// If user does not give a default value, need fill it from
// original table schema to avoid change type failed if default value exists
field.setDefaultValue(defaultValue);
}

// If user does not give a comment, need fill it from
// original table schema to avoid miss comment
if (StringUtils.isNullOrWhitespaceOnly(field.getComment())) {
Expand Down Expand Up @@ -214,15 +234,42 @@ private boolean handleSchemaChange(String responseEntity) throws JsonProcessingE
}
}

private String getDefaultValue(String ddl, String database, String column)
throws IOException, IllegalArgumentException {
String responseEntity = executeThenReturnResponse(ddl, database);
JsonNode responseNode = objectMapper.readTree(responseEntity);
String code = responseNode.get("code").asText("-1");
if (code.equals("0")) {
JsonNode data = responseNode.get("data").get("data");
for (JsonNode node : data) {
if (node.get(0).asText().equals(column)) {
JsonNode defaultValueNode = node.get(5);
return (defaultValueNode instanceof NullNode)
? null
: defaultValueNode.asText();
}
}
return null;
} else {
throw new DorisSchemaChangeException(
"Failed to get default value, response: " + responseEntity);
}
}

/** execute sql in doris. */
public boolean execute(String ddl, String database)
private String executeThenReturnResponse(String ddl, String database)
throws IOException, IllegalArgumentException {
if (StringUtils.isNullOrWhitespaceOnly(ddl)) {
return false;
throw new IllegalArgumentException("ddl can not be null or empty string!");
}
LOG.info("Execute SQL: {}", ddl);
HttpPost httpPost = buildHttpPost(ddl, database);
String responseEntity = handleResponse(httpPost);
return handleResponse(httpPost);
}

public boolean execute(String ddl, String database)
throws IOException, IllegalArgumentException {
String responseEntity = executeThenReturnResponse(ddl, database);
return handleSchemaChange(responseEntity);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

import org.apache.doris.flink.container.instance.ContainerService;
import org.apache.doris.flink.container.instance.DorisContainer;
import org.apache.doris.flink.container.instance.DorisCustomerContainer;
import org.junit.BeforeClass;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down Expand Up @@ -48,7 +49,8 @@ private static void initDorisContainer() {
LOG.info("The doris container has been started and is running status.");
return;
}
dorisContainerService = new DorisContainer();
Boolean customerEnv = Boolean.valueOf(System.getProperty("customer_env", "false"));
dorisContainerService = customerEnv ? new DorisCustomerContainer() : new DorisContainer();
dorisContainerService.startContainer();
LOG.info("Doris container was started.");
}
Expand All @@ -74,9 +76,7 @@ protected String getDorisPassword() {
}

protected String getDorisQueryUrl() {
return String.format(
"jdbc:mysql://%s:%s",
getDorisInstanceHost(), dorisContainerService.getMappedPort(9030));
return dorisContainerService.getJdbcUrl();
}

protected String getDorisInstanceHost() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@ public interface ContainerService {

Connection getQueryConnection();

String getJdbcUrl();

String getInstanceHost();

Integer getMappedPort(int originalPort);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,11 @@ public Connection getQueryConnection() {
}
}

@Override
public String getJdbcUrl() {
return String.format(JDBC_URL, dorisContainer.getHost());
}

@Override
public String getInstanceHost() {
return dorisContainer.getHost();
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,132 @@
// 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.doris.flink.container.instance;

import org.apache.flink.util.Preconditions;

import org.apache.doris.flink.exception.DorisRuntimeException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.Statement;

/** Using a custom Doris environment */
public class DorisCustomerContainer implements ContainerService {
private static final Logger LOG = LoggerFactory.getLogger(DorisCustomerContainer.class);
private static final String JDBC_URL = "jdbc:mysql://%s:%s";

@Override
public void startContainer() {
LOG.info("Using doris customer containers env.");
checkParams();
if (!isRunning()) {
throw new DorisRuntimeException(
"Backend is not alive. Please check the doris cluster.");
}
}

private void checkParams() {
Preconditions.checkArgument(
System.getProperty("doris_host") != null, "doris_host is required.");
Preconditions.checkArgument(
System.getProperty("doris_query_port") != null, "doris_query_port is required.");
Preconditions.checkArgument(
System.getProperty("doris_http_port") != null, "doris_http_port is required.");
Preconditions.checkArgument(
System.getProperty("doris_user") != null, "doris_user is required.");
Preconditions.checkArgument(
System.getProperty("doris_passwd") != null, "doris_passwd is required.");
}

@Override
public boolean isRunning() {
try (Connection conn = getQueryConnection();
Statement stmt = conn.createStatement()) {
ResultSet showBackends = stmt.executeQuery("show backends");
while (showBackends.next()) {
String isAlive = showBackends.getString("Alive").trim();
if (Boolean.toString(true).equalsIgnoreCase(isAlive)) {
return true;
}
}
} catch (SQLException e) {
LOG.error("Failed to connect doris cluster.", e);
return false;
}
return false;
}

@Override
public Connection getQueryConnection() {
LOG.info("Try to get query connection from doris.");
String jdbcUrl =
String.format(
JDBC_URL,
System.getProperty("doris_host"),
System.getProperty("doris_query_port"));
try {
return DriverManager.getConnection(jdbcUrl, getUsername(), getPassword());
} catch (SQLException e) {
LOG.info("Failed to get doris query connection. jdbcUrl={}", jdbcUrl, e);
throw new DorisRuntimeException(e);
}
}

@Override
public String getJdbcUrl() {
return String.format(
JDBC_URL, System.getProperty("doris_host"), System.getProperty("doris_query_port"));
}

@Override
public String getInstanceHost() {
return System.getProperty("doris_host");
}

@Override
public Integer getMappedPort(int originalPort) {
return originalPort;
}

@Override
public String getUsername() {
return System.getProperty("doris_user");
}

@Override
public String getPassword() {
return System.getProperty("doris_passwd");
}

@Override
public String getFenodes() {
return System.getProperty("doris_host") + ":" + System.getProperty("doris_http_port");
}

@Override
public String getBenodes() {
return null;
}

@Override
public void close() {}
}
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,11 @@ public Connection getQueryConnection() {
}
}

@Override
public String getJdbcUrl() {
return mysqlcontainer.getJdbcUrl();
}

@Override
public void close() {
LOG.info("Stopping MySQL container.");
Expand Down
Loading

0 comments on commit 0533fa4

Please sign in to comment.