Skip to content

branch-3.1: [opt](hive) unify the serde name of hive table #54189 #54265

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
morrySnow merged 1 commit into from
Aug 4, 2025
Merged

branch-3.1: [opt](hive) unify the serde name of hive table #54189 #54265

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 fe/fe-core/src/main/java/org/apache/doris/datasource/hive/HiveMetaStoreClientHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ public class HiveMetaStoreClientHelper {
public static final String LEGACY_HIVE_JSON_SERDE = "org.apache.hadoop.hive.serde2.JsonSerDe";
public static final String OPENX_JSON_SERDE = "org.openx.data.jsonserde.JsonSerDe";
public static final String HIVE_TEXT_SERDE = "org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe";
public static final String HIVE_CSV_SERDE = "org.apache.hadoop.hive.serde2.OpenCSVSerde";
public static final String HIVE_OPEN_CSV_SERDE = "org.apache.hadoop.hive.serde2.OpenCSVSerde";
public static final String HIVE_MULTI_DELIMIT_SERDE = "org.apache.hadoop.hive.serde2.MultiDelimitSerDe";

public enum HiveFileFormat {
Expand Down
10 changes: 5 additions & 5 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/hive/source/HiveScanNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -436,7 +436,7 @@ public TFileFormatType getFileFormatType() throws UserException {
}
} else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_TEXT_SERDE)) {
type = TFileFormatType.FORMAT_TEXT;
} else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_CSV_SERDE)) {
} else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_OPEN_CSV_SERDE)) {
type = TFileFormatType.FORMAT_CSV_PLAIN;
} else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_MULTI_DELIMIT_SERDE)) {
type = TFileFormatType.FORMAT_TEXT;
Expand Down Expand Up @@ -490,7 +490,7 @@ protected TFileAttributes getFileAttributes() throws UserException {
// TODO: support skip footer count
fileAttributes.setSkipLines(HiveProperties.getSkipHeaderCount(table));
String serDeLib = table.getSd().getSerdeInfo().getSerializationLib();
if (serDeLib.equals("org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe")
if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_TEXT_SERDE)
|| serDeLib.equals(HiveMetaStoreClientHelper.HIVE_MULTI_DELIMIT_SERDE)) {
TFileTextScanRangeParams textParams = new TFileTextScanRangeParams();
// set properties of LazySimpleSerDe and MultiDelimitSerDe
Expand All @@ -511,7 +511,7 @@ protected TFileAttributes getFileAttributes() throws UserException {
fileAttributes.setHeaderType("");
fileAttributes.setEnableTextValidateUtf8(
sessionVariable.enableTextValidateUtf8);
} else if (serDeLib.equals("org.apache.hadoop.hive.serde2.OpenCSVSerde")) {
} else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_OPEN_CSV_SERDE)) {
TFileTextScanRangeParams textParams = new TFileTextScanRangeParams();
// set set properties of OpenCSVSerde
// 1. set column separator
Expand All @@ -531,7 +531,7 @@ protected TFileAttributes getFileAttributes() throws UserException {
}
fileAttributes.setEnableTextValidateUtf8(
sessionVariable.enableTextValidateUtf8);
} else if (serDeLib.equals("org.apache.hive.hcatalog.data.JsonSerDe")) {
} else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_JSON_SERDE)) {
TFileTextScanRangeParams textParams = new TFileTextScanRangeParams();
textParams.setColumnSeparator("\t");
textParams.setLineDelimiter("\n");
Expand All @@ -544,7 +544,7 @@ protected TFileAttributes getFileAttributes() throws UserException {
fileAttributes.setReadJsonByLine(true);
fileAttributes.setStripOuterArray(false);
fileAttributes.setHeaderType("");
} else if (serDeLib.equals("org.openx.data.jsonserde.JsonSerDe")) {
} else if (serDeLib.equals(HiveMetaStoreClientHelper.OPENX_JSON_SERDE)) {
if (!sessionVariable.isReadHiveJsonInOneColumn()) {
TFileTextScanRangeParams textParams = new TFileTextScanRangeParams();
textParams.setColumnSeparator("\t");
Expand Down