fuweng11 commented on code in PR #10329:
URL: https://github.com/apache/inlong/pull/10329#discussion_r1625646655
##########
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/ExtractNodeProviderFactory.java:
##########
@@ -20,54 +20,34 @@
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.pojo.sort.node.base.ExtractNodeProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.HudiProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.IcebergProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.KafkaProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.MongoDBProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.MySQLBinlogProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.OracleProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.PostgreSQLProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.PulsarProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.RedisProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.SQLServerProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.TubeMqProvider;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Factory of the extract node provider.
*/
+@Service
+@Slf4j
public class ExtractNodeProviderFactory {
/**
* The extract node provider collection
*/
- private static final List<ExtractNodeProvider> EXTRACT_NODE_PROVIDER_LIST
= new ArrayList<>();
-
- static {
- // The Providers Parsing SourceInfo to ExtractNode which sort needed
- EXTRACT_NODE_PROVIDER_LIST.add(new HudiProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new KafkaProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new MongoDBProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new OracleProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new PulsarProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new RedisProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new TubeMqProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new SQLServerProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new PostgreSQLProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new MySQLBinlogProvider());
- EXTRACT_NODE_PROVIDER_LIST.add(new IcebergProvider());
-
- }
+ @Autowired
+ private List<ExtractNodeProvider> EXTRACT_NODE_PROVIDER_LIST = new
ArrayList<>();
Review Comment:
Fixed.
##########
inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/sort/node/LoadNodeProviderFactory.java:
##########
@@ -20,67 +20,34 @@
import org.apache.inlong.manager.common.enums.ErrorCodeEnum;
import org.apache.inlong.manager.common.exceptions.BusinessException;
import org.apache.inlong.manager.pojo.sort.node.base.LoadNodeProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.ClickHouseProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.DorisProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.ElasticsearchProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.GreenplumProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.HBaseProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.HDFSProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.HiveProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.HudiProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.IcebergProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.KafkaProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.KuduProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.MySQLProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.OracleProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.PostgreSQLProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.RedisProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.SQLServerProvider;
-import org.apache.inlong.manager.pojo.sort.node.provider.StarRocksProvider;
-import
org.apache.inlong.manager.pojo.sort.node.provider.TDSQLPostgreSQLProvider;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
import java.util.ArrayList;
import java.util.List;
/**
* Factory of the load node provider.
*/
+@Service
+@Slf4j
public class LoadNodeProviderFactory {
/**
* The load node provider collection
*/
- private static final List<LoadNodeProvider> LOAD_NODE_PROVIDER_LIST = new
ArrayList<>();
-
- static {
- // The Providers Parsing SinkInfo to LoadNode which sort needed
- LOAD_NODE_PROVIDER_LIST.add(new KafkaProvider());
- LOAD_NODE_PROVIDER_LIST.add(new ClickHouseProvider());
- LOAD_NODE_PROVIDER_LIST.add(new DorisProvider());
- LOAD_NODE_PROVIDER_LIST.add(new ElasticsearchProvider());
- LOAD_NODE_PROVIDER_LIST.add(new GreenplumProvider());
- LOAD_NODE_PROVIDER_LIST.add(new HBaseProvider());
- LOAD_NODE_PROVIDER_LIST.add(new HDFSProvider());
- LOAD_NODE_PROVIDER_LIST.add(new HiveProvider());
- LOAD_NODE_PROVIDER_LIST.add(new HudiProvider());
- LOAD_NODE_PROVIDER_LIST.add(new IcebergProvider());
- LOAD_NODE_PROVIDER_LIST.add(new KuduProvider());
- LOAD_NODE_PROVIDER_LIST.add(new MySQLProvider());
- LOAD_NODE_PROVIDER_LIST.add(new OracleProvider());
- LOAD_NODE_PROVIDER_LIST.add(new PostgreSQLProvider());
- LOAD_NODE_PROVIDER_LIST.add(new RedisProvider());
- LOAD_NODE_PROVIDER_LIST.add(new SQLServerProvider());
- LOAD_NODE_PROVIDER_LIST.add(new StarRocksProvider());
- LOAD_NODE_PROVIDER_LIST.add(new TDSQLPostgreSQLProvider());
- }
+ @Autowired
+ private List<LoadNodeProvider> LOAD_NODE_PROVIDER_LIST = new ArrayList<>();
Review Comment:
Fixed.
##########
inlong-manager/manager-common/src/main/java/org/apache/inlong/manager/common/fieldtype/strategy/DefaultFieldTypeStrategy.java:
##########
@@ -17,13 +17,50 @@
package org.apache.inlong.manager.common.fieldtype.strategy;
+import org.apache.inlong.manager.common.fieldtype.FieldTypeMappingReader;
+
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static
org.apache.inlong.manager.common.consts.InlongConstants.LEFT_BRACKET;
+
/**
* The default field type mapping strategy
*/
-public class DefaultFieldTypeStrategy implements FieldTypeMappingStrategy {
+@Service
+public abstract class DefaultFieldTypeStrategy implements
FieldTypeMappingStrategy {
+
+ private final static String NULLABLE_PATTERN = "^NULLABLE\\((.*)\\)$";
+
+ private static final Pattern PATTERN = Pattern.compile(NULLABLE_PATTERN);
+
+ protected FieldTypeMappingReader reader = null;
+
+ @Override
+ public String getSourceToSinkFieldTypeMapping(String sourceType) {
+ if (reader == null) {
+ return sourceType;
+ }
+ String dataType = StringUtils.substringBefore(sourceType,
LEFT_BRACKET).toUpperCase();
+ return
reader.getSOURCE_TO_SINK_FIELD_TYPE_MAPPING_MAP().getOrDefault(dataType,
sourceType.toUpperCase());
+ }
@Override
- public String getFieldTypeMapping(String sourceType) {
- return sourceType;
+ public String getStreamToSinkFieldTypeMapping(String sourceType) {
+ if (reader == null) {
+ return sourceType;
+ }
+ if (StringUtils.isNotBlank(sourceType)) {
+ Matcher matcher = PATTERN.matcher(sourceType.toUpperCase());
+ if (matcher.matches()) {
+ // obtain the field type modified by Nullable, for example,
uint8(12) in Nullable(uint8(12))
+ sourceType = matcher.group(1);
+ }
+ }
+ String dataType = StringUtils.substringBefore(sourceType,
LEFT_BRACKET).toUpperCase();
+ return
reader.getSOURCE_TO_SINK_FIELD_TYPE_MAPPING_MAP().getOrDefault(dataType,
sourceType.toUpperCase());
Review Comment:
Fixed.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
