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.

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

[Improve] Remove catalogTable field in CatalogTableUtil #5521

Merged
merged 1 commit into from
Sep 20, 2023
Merged

[Improve] Remove catalogTable field in CatalogTableUtil #5521

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
6 changes: 6 additions & 0 deletions seatunnel-api/src/main/java/org/apache/seatunnel/api/table/catalog/CatalogTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@

package org.apache.seatunnel.api.table.catalog;

import org.apache.seatunnel.api.table.type.SeaTunnelRowType;

import java.io.Serializable;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -91,6 +93,10 @@ public TableSchema getTableSchema() {
return tableSchema;
}

public SeaTunnelRowType getSeaTunnelRowType() {
return tableSchema.toPhysicalRowDataType();
}

public Map<String, String> getOptions() {
return options;
}
Expand Down
32 changes: 10 additions & 22 deletions seatunnel-api/src/main/java/org/apache/seatunnel/api/table/catalog/CatalogTableUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
import org.apache.seatunnel.common.utils.JsonUtils;
import org.apache.seatunnel.common.utils.SeaTunnelException;

import lombok.Getter;
import lombok.extern.slf4j.Slf4j;

import java.io.Serializable;
Expand Down Expand Up @@ -70,12 +69,6 @@ public class CatalogTableUtil implements Serializable {
new SeaTunnelRowType(
new String[] {"content"}, new SeaTunnelDataType<?>[] {BasicType.STRING_TYPE});

@Getter private final CatalogTable catalogTable;

private CatalogTableUtil(CatalogTable catalogTable) {
this.catalogTable = catalogTable;
}

@Deprecated
public static CatalogTable getCatalogTable(String tableName, SeaTunnelRowType rowType) {
TableSchema.Builder schemaBuilder = TableSchema.builder();
Expand Down Expand Up @@ -108,7 +101,7 @@ public static List<CatalogTable> getCatalogTables(Config config, ClassLoader cla
// Highest priority: specified schema
Map<String, String> schemaMap = readonlyConfig.get(CatalogTableUtil.SCHEMA);
if (schemaMap != null && schemaMap.size() > 0) {
CatalogTable catalogTable = CatalogTableUtil.buildWithConfig(config).getCatalogTable();
CatalogTable catalogTable = CatalogTableUtil.buildWithConfig(config);
return Collections.singletonList(catalogTable);
}

Expand Down Expand Up @@ -158,7 +151,7 @@ public static List<CatalogTable> getCatalogTablesFromConfig(
if (schemaMap.isEmpty()) {
throw new SeaTunnelException("Schema config can not be empty");
}
CatalogTable catalogTable = CatalogTableUtil.buildWithConfig(config).getCatalogTable();
CatalogTable catalogTable = CatalogTableUtil.buildWithConfig(config);
return Collections.singletonList(catalogTable);
}

Expand Down Expand Up @@ -194,31 +187,26 @@ public static List<CatalogTable> getCatalogTablesFromConfig(
factoryId)));
}

public static CatalogTableUtil buildWithConfig(Config config) {
public static CatalogTable buildWithConfig(Config config) {
CheckResult checkResult = CheckConfigUtil.checkAllExists(config, "schema");
if (!checkResult.isSuccess()) {
throw new RuntimeException(
"Schema config need option [schema], please correct your config first");
}
TableSchema tableSchema = parseTableSchema(config.getConfig("schema"));
return new CatalogTableUtil(
CatalogTable.of(
// TODO: other table info
TableIdentifier.of("", "", ""),
tableSchema,
new HashMap<>(),
new ArrayList<>(),
""));
return CatalogTable.of(
// TODO: other table info
TableIdentifier.of("", "", ""),
tableSchema,
new HashMap<>(),
new ArrayList<>(),
"");
}

public static SeaTunnelRowType buildSimpleTextSchema() {
return SIMPLE_SCHEMA;
}

public SeaTunnelRowType getSeaTunnelRowType() {
return catalogTable.getTableSchema().toPhysicalRowDataType();
}

public static SeaTunnelDataType<?> parseDataType(String columnStr) {
SqlType sqlType = null;
try {
Expand Down