Skip to content

[FLINK-36285][doris] Fix unable to alter column type without default value specified #3725

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.

Sign up for GitHub

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

Closed
yuxiqian wants to merge 1 commit into from
Closed

[FLINK-36285][doris] Fix unable to alter column type without default value specified #3725

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion flink-cdc-connect/flink-cdc-pipeline-connectors/flink-cdc-pipeline-connector-doris/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ limitations under the License.
<name>flink-cdc-pipeline-connector-doris</name>

<properties>
<doris.connector.version>1.6.2</doris.connector.version>
<doris.connector.version>24.0.1</doris.connector.version>
</properties>

<dependencies>
Expand Down
34 changes: 34 additions & 0 deletions .../src/test/java/org/apache/flink/cdc/connectors/doris/sink/DorisMetadataApplierITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,21 @@ private List<Event> generateAlterColumnTypeEvents(TableId tableId) {
tableId, Collections.singletonMap("name", DataTypes.VARCHAR(19))));
}

private List<Event> generateAlterColumnTypeWithDefaultValueEvents(TableId tableId) {
Schema schema =
Schema.newBuilder()
.column(new PhysicalColumn("id", DataTypes.INT().notNull(), null))
.column(new PhysicalColumn("number", DataTypes.DOUBLE(), null, "2.71828"))
.column(new PhysicalColumn("name", DataTypes.VARCHAR(17), null, "Alice"))
.primaryKey("id")
.build();

return Arrays.asList(
new CreateTableEvent(tableId, schema),
new AlterColumnTypeEvent(
tableId, Collections.singletonMap("name", DataTypes.VARCHAR(19))));
}

private List<Event> generateNarrowingAlterColumnTypeEvents(TableId tableId) {
Schema schema =
Schema.newBuilder()
Expand Down Expand Up @@ -386,6 +401,25 @@ public void testDorisAlterColumnType() throws Exception {
assertEqualsInOrder(expected, actual);
}

@Test
public void testDorisAlterColumnTypeWithDefaultValue() throws Exception {
TableId tableId =
TableId.tableId(
DorisContainer.DORIS_DATABASE_NAME, DorisContainer.DORIS_TABLE_NAME);

runJobWithEvents(generateAlterColumnTypeWithDefaultValueEvents(tableId));

List<String> actual = inspectTableSchema(tableId);

List<String> expected =
Arrays.asList(
"id | INT | Yes | true | null",
"number | DOUBLE | Yes | false | 2.71828",
"name | VARCHAR(57) | Yes | false | Alice");

assertEqualsInOrder(expected, actual);
}

@Test(expected = JobExecutionException.class)
public void testDorisNarrowingAlterColumnType() throws Exception {
TableId tableId =
Expand Down
18 changes: 14 additions & 4 deletions ...r-doris/src/test/java/org/apache/flink/cdc/connectors/doris/sink/DorisPipelineITCase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.concurrent.TimeoutException;

import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.BENODES;
import static org.apache.flink.cdc.connectors.doris.sink.DorisDataSinkOptions.FENODES;
Expand All @@ -62,6 +63,7 @@ public class DorisPipelineITCase extends DorisSinkTestBase {
StreamExecutionEnvironment.getExecutionEnvironment();

private static final int DATABASE_OPERATION_TIMEOUT_SECONDS = 5;
private static final int DATA_FETCHING_TIMEOUT = 30;

@BeforeClass
public static void before() {
Expand Down Expand Up @@ -242,13 +244,21 @@ private void runValuesToDorisJob(boolean batchMode) throws Exception {

env.execute("Values to Doris Sink");

List<String> actual = fetchTableContent(tableId, 4);

List<String> expected =
Arrays.asList(
"17 | 6.28 | Doris Day | 2023-01-01 00:00:00",
"21 | 1.732 | Disenchanted | 2023-01-01 00:00:00");

assertEqualsInAnyOrder(expected, actual);
long timeout = System.currentTimeMillis() + DATA_FETCHING_TIMEOUT * 1000;

while (System.currentTimeMillis() < timeout) {
List<String> actual = fetchTableContent(tableId, 4);
if (actual.size() < expected.size()) {
Thread.sleep(1000L);
continue;
}
assertEqualsInAnyOrder(expected, actual);
return;
}
throw new TimeoutException("Failed to fetch enough records in time.");
}
}
2 changes: 1 addition & 1 deletion tools/ci/license_check.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ def check_jar_license(jar_file)
Zip::File.open(jar_file) do |jar|
jar.filter { |e| e.ftype == :file }
.filter { |e| !File.basename(e.name).downcase.end_with?(*BINARY_FILE_EXTENSIONS) }
.filter { |e| !File.basename(e.name).downcase.start_with? 'license', 'dependencies', 'notice' }
.filter { |e| !File.basename(e.name).downcase.start_with? 'license', 'dependencies', 'notice', 'third-party' }
.filter { |e| EXCEPTION_PACKAGES.none? { |ex| e.name.include? ex } }
.map do |e|
content = e.get_input_stream.read.force_encoding('UTF-8')
Expand Down