Skip to content

[feat-#1293][chunjun-connector-hdfs] add assembleFieldProps for hdfs-connector #1294

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
FlechazoW merged 2 commits into from
Oct 9, 2022
Merged

[feat-#1293][chunjun-connector-hdfs] add assembleFieldProps for hdfs-connector #1294

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2463d1b
[feat-#1293][chunjun-connector-hdfs] add assembleFieldProps for hdfs …
liumengkai Oct 9, 2022
ea2be4d
[feat-#1293][chunjun-connector-hdfs] add assembleFieldProps for hdfs …
liumengkai Oct 9, 2022
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
16 changes: 10 additions & 6 deletions ...fs/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsOrcColumnConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.dtstack.chunjun.connector.hdfs.converter;

import com.dtstack.chunjun.conf.FieldConf;
import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf;
import com.dtstack.chunjun.constants.ConstantValue;
import com.dtstack.chunjun.converter.AbstractRowConverter;
import com.dtstack.chunjun.converter.IDeserializationConverter;
Expand Down Expand Up @@ -61,8 +62,8 @@ public class HdfsOrcColumnConverter
private List<String> ColumnNameList;
private transient Map<String, ColumnTypeUtil.DecimalInfo> decimalColInfo;

public HdfsOrcColumnConverter(List<FieldConf> fieldConfList) {
super(fieldConfList.size());
public HdfsOrcColumnConverter(List<FieldConf> fieldConfList, HdfsConf hdfsConf) {
super(fieldConfList.size(), hdfsConf);
for (int i = 0; i < fieldConfList.size(); i++) {
String type = fieldConfList.get(i).getType();
int left = type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL);
Expand All @@ -83,12 +84,15 @@ public RowData toInternal(RowData input) throws Exception {
ColumnRowData row = new ColumnRowData(input.getArity());
if (input instanceof GenericRowData) {
GenericRowData genericRowData = (GenericRowData) input;
List<FieldConf> fieldConfList = commonConf.getColumn();
for (int i = 0; i < input.getArity(); i++) {
row.addField(
(AbstractBaseColumn)
toInternalConverters
.get(i)
.deserialize(genericRowData.getField(i)));
assembleFieldProps(
fieldConfList.get(i),
(AbstractBaseColumn)
toInternalConverters
.get(i)
.deserialize(genericRowData.getField(i))));
}
} else {
throw new ChunJunRuntimeException(
Expand Down
16 changes: 10 additions & 6 deletions ...rc/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsParquetColumnConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.dtstack.chunjun.connector.hdfs.converter;

import com.dtstack.chunjun.conf.FieldConf;
import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf;
import com.dtstack.chunjun.connector.hdfs.util.HdfsUtil;
import com.dtstack.chunjun.constants.ConstantValue;
import com.dtstack.chunjun.converter.AbstractRowConverter;
Expand Down Expand Up @@ -64,8 +65,8 @@ public class HdfsParquetColumnConverter
private List<String> columnNameList;
private transient Map<String, ColumnTypeUtil.DecimalInfo> decimalColInfo;

public HdfsParquetColumnConverter(List<FieldConf> fieldConfList) {
super(fieldConfList.size());
public HdfsParquetColumnConverter(List<FieldConf> fieldConfList, HdfsConf hdfsConf) {
super(fieldConfList.size(), hdfsConf);
for (int i = 0; i < fieldConfList.size(); i++) {
String type = fieldConfList.get(i).getType();
int left = type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL);
Expand All @@ -86,12 +87,15 @@ public RowData toInternal(RowData input) throws Exception {
ColumnRowData row = new ColumnRowData(input.getArity());
if (input instanceof GenericRowData) {
GenericRowData genericRowData = (GenericRowData) input;
List<FieldConf> fieldConfList = commonConf.getColumn();
for (int i = 0; i < input.getArity(); i++) {
row.addField(
(AbstractBaseColumn)
toInternalConverters
.get(i)
.deserialize(genericRowData.getField(i)));
assembleFieldProps(
fieldConfList.get(i),
(AbstractBaseColumn)
toInternalConverters
.get(i)
.deserialize(genericRowData.getField(i))));
}
} else {
throw new ChunJunRuntimeException(
Expand Down
16 changes: 10 additions & 6 deletions ...s/src/main/java/com/dtstack/chunjun/connector/hdfs/converter/HdfsTextColumnConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.dtstack.chunjun.connector.hdfs.converter;

import com.dtstack.chunjun.conf.FieldConf;
import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf;
import com.dtstack.chunjun.constants.ConstantValue;
import com.dtstack.chunjun.converter.AbstractRowConverter;
import com.dtstack.chunjun.converter.IDeserializationConverter;
Expand Down Expand Up @@ -51,8 +52,8 @@
public class HdfsTextColumnConverter
extends AbstractRowConverter<RowData, RowData, String[], String> {

public HdfsTextColumnConverter(List<FieldConf> fieldConfList) {
super(fieldConfList.size());
public HdfsTextColumnConverter(List<FieldConf> fieldConfList, HdfsConf hdfsConf) {
super(fieldConfList.size(), hdfsConf);
for (int i = 0; i < fieldConfList.size(); i++) {
String type = fieldConfList.get(i).getType();
int left = type.indexOf(ConstantValue.LEFT_PARENTHESIS_SYMBOL);
Expand All @@ -73,12 +74,15 @@ public RowData toInternal(RowData input) throws Exception {
ColumnRowData row = new ColumnRowData(input.getArity());
if (input instanceof GenericRowData) {
GenericRowData genericRowData = (GenericRowData) input;
List<FieldConf> fieldConfList = commonConf.getColumn();
for (int i = 0; i < input.getArity(); i++) {
row.addField(
(AbstractBaseColumn)
toInternalConverters
.get(i)
.deserialize(genericRowData.getField(i)));
assembleFieldProps(
fieldConfList.get(i),
(AbstractBaseColumn)
toInternalConverters
.get(i)
.deserialize(genericRowData.getField(i))));
}
} else {
throw new ChunJunRuntimeException(
Expand Down
3 changes: 2 additions & 1 deletion ...connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/sink/HdfsSinkFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@ public DataStreamSink<RowData> createSink(DataStream<RowData> dataSet) {
useAbstractBaseColumn,
hdfsConf.getFileType(),
hdfsConf.getColumn(),
getRawTypeConverter());
getRawTypeConverter(),
hdfsConf);

builder.setRowConverter(rowConverter, useAbstractBaseColumn);
return createOutput(dataSet, builder.finish());
Expand Down
3 changes: 2 additions & 1 deletion ...ector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/source/HdfsSourceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,8 @@ public DataStream<RowData> createSource() {
useAbstractBaseColumn,
hdfsConf.getFileType(),
hdfsConf.getColumn(),
getRawTypeConverter());
getRawTypeConverter(),
hdfsConf);

builder.setRowConverter(rowConverter, useAbstractBaseColumn);
return createInput(builder.finish());
Expand Down
10 changes: 6 additions & 4 deletions ...hunjun-connector-hdfs/src/main/java/com/dtstack/chunjun/connector/hdfs/util/HdfsUtil.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
package com.dtstack.chunjun.connector.hdfs.util;

import com.dtstack.chunjun.conf.FieldConf;
import com.dtstack.chunjun.connector.hdfs.conf.HdfsConf;
import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcColumnConverter;
import com.dtstack.chunjun.connector.hdfs.converter.HdfsOrcRowConverter;
import com.dtstack.chunjun.connector.hdfs.converter.HdfsParquetColumnConverter;
Expand Down Expand Up @@ -331,18 +332,19 @@ public static AbstractRowConverter createRowConverter(
boolean useAbstractBaseColumn,
String fileType,
List<FieldConf> fieldConfList,
RawTypeConverter converter) {
RawTypeConverter converter,
HdfsConf hdfsConf) {
AbstractRowConverter rowConverter;
if (useAbstractBaseColumn) {
switch (FileType.getByName(fileType)) {
case ORC:
rowConverter = new HdfsOrcColumnConverter(fieldConfList);
rowConverter = new HdfsOrcColumnConverter(fieldConfList, hdfsConf);
break;
case PARQUET:
rowConverter = new HdfsParquetColumnConverter(fieldConfList);
rowConverter = new HdfsParquetColumnConverter(fieldConfList, hdfsConf);
break;
default:
rowConverter = new HdfsTextColumnConverter(fieldConfList);
rowConverter = new HdfsTextColumnConverter(fieldConfList, hdfsConf);
}
} else {
RowType rowType = TableUtil.createRowType(fieldConfList, converter);
Expand Down
3 changes: 2 additions & 1 deletion ...onnector-hive/src/main/java/com/dtstack/chunjun/connector/hive/sink/HiveOutputFormat.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -322,7 +322,8 @@ private BaseHdfsOutputFormat createHdfsOutputFormat(
useAbstractBaseColumn,
copyHiveConf.getFileType(),
fieldConfList,
HdfsRawTypeConverter::apply),
HdfsRawTypeConverter::apply,
hiveConf),
useAbstractBaseColumn);
builder.setInitAccumulatorAndDirty(false);

Expand Down
7 changes: 7 additions & 0 deletions chunjun-core/src/main/java/com/dtstack/chunjun/converter/AbstractRowConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ public AbstractRowConverter(int converterSize) {
this.toExternalConverters = new ArrayList<>(converterSize);
}

public AbstractRowConverter(int converterSize, ChunJunCommonConf commonConf) {
this.toInternalConverters = new ArrayList<>(converterSize);
this.toExternalConverters = new ArrayList<>(converterSize);
this.commonConf = commonConf;
}

protected IDeserializationConverter wrapIntoNullableInternalConverter(
IDeserializationConverter IDeserializationConverter) {
return val -> {
Expand Down Expand Up @@ -187,6 +193,7 @@ protected ISerializationConverter<SinkT> wrapIntoNullableExternalConverter(
public RowData toInternalLookup(LookupT input) throws Exception {
throw new RuntimeException("Subclass need rewriting");
}

/**
* BinaryRowData
*
Expand Down