Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[improve](schema-change) support nested type with varchar type to support length growing #46639

Open
wants to merge 9 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 35 additions & 0 deletions fe/fe-common/src/main/java/org/apache/doris/catalog/Type.java
Original file line number Diff line number Diff line change
Expand Up @@ -511,6 +511,41 @@ public boolean isDecimalV3OrContainsDecimalV3() {
return false;
}

// This method defines the char type or complex type nested char type
// to support the schema-change behavior of length growth.
public boolean isSupportSchemaChangeForCharType(Type other) {
if ((this.getPrimitiveType() == PrimitiveType.VARCHAR && other.getPrimitiveType() == PrimitiveType.VARCHAR) || (
amorynan marked this conversation as resolved.
Show resolved Hide resolved
this.getPrimitiveType() == PrimitiveType.CHAR && other.getPrimitiveType() == PrimitiveType.VARCHAR) || (
this.getPrimitiveType() == PrimitiveType.CHAR && other.getPrimitiveType() == PrimitiveType.CHAR)) {
if (this.getLength() > other.getLength()) {
return false;
} else {
return true;
amorynan marked this conversation as resolved.
Show resolved Hide resolved
}
}
if (this.isStructType() && other.isStructType()) {
StructType thisStructType = (StructType) this;
StructType otherStructType = (StructType) other;
if (thisStructType.getFields().size() != otherStructType.getFields().size()) {
return false;
}
for (int i = 0; i < thisStructType.getFields().size(); i++) {
if (!thisStructType.getFields().get(i).getType().isSupportSchemaChangeForCharType(
otherStructType.getFields().get(i).getType())) {
return false;
}
}
return true;
} else if (this.isArrayType() && other.isArrayType()) {
return ((ArrayType) this).getItemType().isSupportSchemaChangeForCharType(((ArrayType) other).getItemType());
} else if (this.isMapType() && other.isMapType()) {
return ((MapType) this).getKeyType().isSupportSchemaChangeForCharType(((MapType) other).getKeyType())
&&
((MapType) this).getValueType().isSupportSchemaChangeForCharType(((MapType) other).getValueType());
}
return false;
}

public boolean isDecimalV3() {
return isScalarType(PrimitiveType.DECIMAL32) || isScalarType(PrimitiveType.DECIMAL64)
|| isScalarType(PrimitiveType.DECIMAL128) || isScalarType(PrimitiveType.DECIMAL256);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -627,8 +627,9 @@ private boolean processModifyColumn(ModifyColumnClause alterClause, OlapTable ol
if (!col.equals(modColumn)) {
typeChanged = true;
// TODO:the case where columnPos is not empty has not been considered
if (columnPos == null && col.getDataType() == PrimitiveType.VARCHAR
&& modColumn.getDataType() == PrimitiveType.VARCHAR) {
if (columnPos == null && ((col.getDataType() == PrimitiveType.VARCHAR
&& modColumn.getDataType() == PrimitiveType.VARCHAR)
|| col.getDataType().isComplexType())) {
amorynan marked this conversation as resolved.
Show resolved Hide resolved
col.checkSchemaChangeAllowed(modColumn);
lightSchemaChange = olapTable.getEnableLightSchemaChange();
}
Expand Down
15 changes: 4 additions & 11 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Column.java
Original file line number Diff line number Diff line change
Expand Up @@ -844,11 +844,6 @@ public void checkSchemaChangeAllowed(Column other) throws DdlException {
throw new DdlException("Dest column name is empty");
}

// now nested type can only support change order
if (type.isComplexType() && !type.equals(other.type)) {
throw new DdlException("Can not change " + type + " to " + other);
}

if (!ColumnType.isSchemaChangeAllowed(type, other.type)) {
throw new DdlException("Can not change " + getDataType() + " to " + other.getDataType());
}
Expand Down Expand Up @@ -885,12 +880,10 @@ public void checkSchemaChangeAllowed(Column other) throws DdlException {
}
}

if ((getDataType() == PrimitiveType.VARCHAR && other.getDataType() == PrimitiveType.VARCHAR) || (
getDataType() == PrimitiveType.CHAR && other.getDataType() == PrimitiveType.VARCHAR) || (
getDataType() == PrimitiveType.CHAR && other.getDataType() == PrimitiveType.CHAR)) {
if (getStrLen() > other.getStrLen()) {
throw new DdlException("Cannot shorten string length");
}
// Nested types only support changing the order and increasing the length of the nested char type
// Char-type only support length growing
if (!type.isSupportSchemaChangeForCharType(other.type)) {
amorynan marked this conversation as resolved.
Show resolved Hide resolved
amorynan marked this conversation as resolved.
Show resolved Hide resolved
throw new DdlException("Cannot shorten string length for type " + type.toSql() + " to " + other.toSql());
}

// now we support convert decimal to varchar type
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
-- This file is automatically generated. You should know what you did if you want to edit this
-- !sc_origin --
0 ["2025-01-01"] {"amory":"better"} {"col":"commiter"}
1 ["2025-01-02"] {"doris":"better"} {"col":"amory"}

-- !sc_after --
0 ["2025-01-01"] {"amory":"better"} {"col":"commiter"}
1 ["2025-01-02"] {"doris":"better"} {"col":"amory"}
2 ["2025-01-03-22-33"] {"doris":"better"} {"col":"amory"}

-- !sc_origin --
0 ["2025-01-01"] {"amory":"better"} {"col":"commiter"}
1 ["2025-01-02"] {"doris":"better"} {"col":"amory"}
2 ["2025-01-03-22-33"] {"doris":"better"} {"col":"amory"}

-- !sc_after --
0 ["2025-01-01"] {"amory":"better"} {"col":"commiter"}
1 ["2025-01-02"] {"doris":"better"} {"col":"amory"}
2 ["2025-01-03-22-33"] {"doris":"better"} {"col":"amory"}

-- !sc_origin --
0 ["2025-01-01"] {"amory":"better"} {"col":"commiter"}
1 ["2025-01-02"] {"doris":"better"} {"col":"amory"}
2 ["2025-01-03-22-33"] {"doris":"better"} {"col":"amory"}

-- !sc_after --
0 ["2025-01-01"] {"amory":"better"} {"col":"commiter"}
1 ["2025-01-02"] {"doris":"better"} {"col":"amory"}
2 ["2025-01-03-22-33"] {"doris":"better"} {"col":"amory"}
4 ["2025-01-03-22-33"] {"doris":"better"} {"col":"amoryIsBetter"}

Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
// 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.

import org.codehaus.groovy.runtime.IOGroovyMethods
import java.util.concurrent.TimeUnit
import org.awaitility.Awaitility

suite ("test_varchar_sc_in_complex") {
def getJobState = { tableName ->
def jobStateResult = sql """ SHOW ALTER TABLE COLUMN WHERE IndexName='${tableName}' ORDER BY createtime DESC LIMIT 1 """
return jobStateResult[0][9]
}

def tableName = "test_varchar_sc_in_complex"

try {

String backend_id;
def backendId_to_backendIP = [:]
def backendId_to_backendHttpPort = [:]
getBackendIpHttpPort(backendId_to_backendIP, backendId_to_backendHttpPort);

sql """ DROP TABLE IF EXISTS ${tableName} """
sql """
CREATE TABLE IF NOT EXISTS ${tableName} (
`c0` LARGEINT NOT NULL,
`c_a` ARRAY<VARCHAR(10)>,
`c_m` MAP<VARCHAR(10),VARCHAR(10)>,
`c_s` STRUCT<col:VARCHAR(10)>
) DISTRIBUTED BY HASH(c0) BUCKETS 1
PROPERTIES ( "replication_num" = "1", "light_schema_change" = "true" )
"""

sql """ insert into ${tableName} values
(0,['2025-01-01'], {'amory':'better'}, named_struct('col','commiter'));
"""
sql """ insert into ${tableName} values
(1,['2025-01-02'], {'doris':'better'}, named_struct('col','amory'));
"""
// this can be insert but with cut off the left string to 10
test {
sql """ insert into ${tableName} values
(11, ['2025-01-03-22-33'], {'doris111111111':'better2222222222'}, named_struct('col','amoryIsBetter'));
"""
exception "Insert has filtered data in strict mode"
}

test {
sql """ alter table ${tableName} modify column c_a array<varchar(3)>
"""
exception "Cannot shorten string length"
}

test {
sql """ alter table ${tableName} modify column c_m map<varchar(3),varchar(3)>
"""
exception "Cannot shorten string length"
}

test {
sql """ alter table ${tableName} modify column c_s struct<col:varchar(3)>
"""
amorynan marked this conversation as resolved.
Show resolved Hide resolved
exception "Cannot shorten string length"
amorynan marked this conversation as resolved.
Show resolved Hide resolved
}


sql """ alter table ${tableName} modify column c_a array<varchar(20)> """
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

plz add a case as such like:

alter table ${tableName} modify column c_a array<varchar(20)> after c_s

cuz modify type+reorder will do link schema change rather than light schema change
we shall test this case additionaly

int max_try_secs = 300
Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> {
String result = getJobState(tableName)
if (result == "FINISHED") {
return true;
}
return false;
});

String[][] res = sql """ desc ${tableName} """
logger.info(res[1][1])
// array varchar(10)
assertEquals(res[1][1].toLowerCase(),"array<varchar(20)>")

qt_sc_origin " select * from ${tableName} order by c0; "

// then insert some data to modified array with varchar(20)
sql """ insert into ${tableName} values
(2,['2025-01-03-22-33'], {'doris':'better'}, named_struct('col','amory'));
"""
qt_sc_after " select * from ${tableName} order by c0; "

// map varchar(10)
sql """ alter table ${tableName} modify column c_m map<varchar(20),varchar(20)> """
amorynan marked this conversation as resolved.
Show resolved Hide resolved
Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> {
String result = getJobState(tableName)
if (result == "FINISHED") {
return true;
}
return false;
});

res = sql """ desc ${tableName} """
logger.info(res[2][1])
assertEquals(res[2][1].toLowerCase(),"map<varchar(20),varchar(20)>")

// insert some data to modified map with varchar(20)
qt_sc_origin " select * from ${tableName} order by c0; "
sql """ insert into ts values
(3,['2025-01-03-22-33'], {'doris111111111':'better2222222222'}, named_struct('col','amory'));
"""
qt_sc_after " select * from ${tableName} order by c0; "

// struct varchar(10)
sql """ alter table ${tableName} modify column c_s struct<col:varchar(20)> """
amorynan marked this conversation as resolved.
Show resolved Hide resolved
Awaitility.await().atMost(max_try_secs, TimeUnit.SECONDS).with().pollDelay(100, TimeUnit.MILLISECONDS).await().until(() -> {
String result = getJobState(tableName)
if (result == "FINISHED") {
return true;
}
return false;
});

res = sql """ desc ${tableName} """
logger.info(res[3][1])
assertEquals(res[3][1].toLowerCase(),"struct<col:varchar(20)>")

// insert some data to modified struct with varchar(20)
qt_sc_origin " select * from ${tableName} order by c0; "
sql """ insert into ${tableName} values
(4,['2025-01-03-22-33'], {'doris':'better'}, named_struct('col','amoryIsBetter'));
"""
qt_sc_after " select * from ${tableName} order by c0; "
} finally {
try_sql("DROP TABLE IF EXISTS ${tableName}")
}

}
Loading