Skip to content

[Hotfix][Jdbc] Fix table/query columns order merge for jdbc catalog #6771

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

Merged
Carl-Zhou-CN merged 1 commit into from
May 6, 2024
Merged

[Hotfix][Jdbc] Fix table/query columns order merge for jdbc catalog #6771

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
12 changes: 11 additions & 1 deletion .../src/main/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcCatalogUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,17 @@ static CatalogTable mergeCatalogTable(CatalogTable tableOfPath, CatalogTable tab
boolean schemaEquals =
schemaIncludeAllColumns && columnsOfMerge.size() == columnsOfPath.size();
if (schemaEquals) {
return tableOfPath;
// Reorder the field list
return CatalogTable.of(
tableOfPath.getTableId(),
TableSchema.builder()
.primaryKey(tableSchemaOfPath.getPrimaryKey())
.constraintKey(tableSchemaOfPath.getConstraintKeys())
.columns(columnsOfMerge)
.build(),
tableOfPath.getOptions(),
tableOfPath.getPartitionKeys(),
tableOfPath.getComment());
}

PrimaryKey primaryKeyOfPath = tableSchemaOfPath.getPrimaryKey();
Expand Down
44 changes: 33 additions & 11 deletions .../test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/utils/JdbcCatalogUtilsTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package org.apache.seatunnel.connectors.seatunnel.jdbc.utils;

import org.apache.seatunnel.api.table.catalog.CatalogTable;
import org.apache.seatunnel.api.table.catalog.Column;
import org.apache.seatunnel.api.table.catalog.ConstraintKey;
import org.apache.seatunnel.api.table.catalog.PhysicalColumn;
import org.apache.seatunnel.api.table.catalog.PrimaryKey;
Expand All @@ -30,6 +31,8 @@

import java.util.Arrays;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

public class JdbcCatalogUtilsTest {
Expand Down Expand Up @@ -103,9 +106,9 @@ public void testColumnEqualsMerge() {
TableSchema.builder()
.column(
PhysicalColumn.of(
"f1",
BasicType.LONG_TYPE,
null,
"f2",
BasicType.STRING_TYPE,
10,
true,
null,
null,
Expand All @@ -117,10 +120,10 @@ public void testColumnEqualsMerge() {
null))
.column(
PhysicalColumn.of(
"f2",
"f3",
BasicType.STRING_TYPE,
10,
true,
20,
false,
null,
null,
null,
Expand All @@ -131,10 +134,10 @@ public void testColumnEqualsMerge() {
null))
.column(
PhysicalColumn.of(
"f3",
BasicType.STRING_TYPE,
20,
false,
"f1",
BasicType.LONG_TYPE,
null,
true,
null,
null,
null,
Expand All @@ -149,7 +152,26 @@ public void testColumnEqualsMerge() {
null);

CatalogTable mergeTable = JdbcCatalogUtils.mergeCatalogTable(DEFAULT_TABLE, tableOfQuery);
Assertions.assertEquals(DEFAULT_TABLE, mergeTable);
Assertions.assertEquals(DEFAULT_TABLE.getTableId(), mergeTable.getTableId());
Assertions.assertEquals(DEFAULT_TABLE.getOptions(), mergeTable.getOptions());
Assertions.assertEquals(DEFAULT_TABLE.getComment(), mergeTable.getComment());
Assertions.assertEquals(DEFAULT_TABLE.getCatalogName(), mergeTable.getCatalogName());
Assertions.assertNotEquals(DEFAULT_TABLE.getTableSchema(), mergeTable.getTableSchema());
Assertions.assertEquals(
DEFAULT_TABLE.getTableSchema().getPrimaryKey(),
mergeTable.getTableSchema().getPrimaryKey());
Assertions.assertEquals(
DEFAULT_TABLE.getTableSchema().getConstraintKeys(),
mergeTable.getTableSchema().getConstraintKeys());

Map<String, Column> columnMap =
DEFAULT_TABLE.getTableSchema().getColumns().stream()
.collect(Collectors.toMap(e -> e.getName(), e -> e));
List<Column> sortByQueryColumns =
tableOfQuery.getTableSchema().getColumns().stream()
.map(e -> columnMap.get(e.getName()))
.collect(Collectors.toList());
Assertions.assertEquals(sortByQueryColumns, mergeTable.getTableSchema().getColumns());
}

@Test
Expand Down