Skip to content

[fix](csv) fix failed to get prop from connection context #53159

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
morningman merged 1 commit into from
Jul 15, 2025
Merged

[fix](csv) fix failed to get prop from connection context #53159

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
4 changes: 0 additions & 4 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1306,10 +1306,6 @@ public void notifyPropertiesUpdated(Map<String, String> updatedProps) {
}
}

public ThreadPoolExecutor getThreadPoolExecutor() {
return threadPoolWithPreAuth;
}

public CatalogProperty getCatalogProperty() {
return catalogProperty;
}
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataOps.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -582,7 +582,7 @@ private Namespace getNamespace() {
}

public ThreadPoolExecutor getThreadPoolWithPreAuth() {
return dorisCatalog.getThreadPoolExecutor();
return dorisCatalog.getThreadPoolWithPreAuth();
}

private void performDropView(String remoteDbName, String remoteViewName) throws DdlException {
Expand Down
18 changes: 16 additions & 2 deletions ...rc/main/java/org/apache/doris/datasource/property/fileformat/CsvFileFormatProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,16 @@ public class CsvFileFormatProperties extends FileFormatProperties {
public static final String PROP_ENCLOSE = "enclose";
public static final String PROP_ESCAPE = "escape";

public static final String PROP_ENABLE_TEXT_VALIDATE_UTF8 = "enable_text_validate_utf8";

private String headerType = "";
private String columnSeparator = DEFAULT_COLUMN_SEPARATOR;
private String lineDelimiter = DEFAULT_LINE_DELIMITER;
private boolean trimDoubleQuotes;
private int skipLines;
private byte enclose;
private byte escape;
private boolean enableTextValidateUTF8 = true;

public CsvFileFormatProperties(String formatName) {
super(TFileFormatType.FORMAT_CSV_PLAIN, formatName);
Expand Down Expand Up @@ -118,6 +121,18 @@ public void analyzeFileFormatProperties(Map<String, String> formatProperties, bo
PROP_COMPRESS_TYPE, "UNKNOWN", isRemoveOriginProperty);
compressionType = Util.getFileCompressType(compressTypeStr);

// get ENABLE_TEXT_VALIDATE_UTF8 from properties map first,
// if not exist, try getting from session variable,
// if connection context is null, use "true" as default value.
String validateUtf8 = getOrDefault(formatProperties, PROP_ENABLE_TEXT_VALIDATE_UTF8, "",
isRemoveOriginProperty);
if (Strings.isNullOrEmpty(validateUtf8)) {
enableTextValidateUTF8 = ConnectContext.get() == null ? true
: ConnectContext.get().getSessionVariable().enableTextValidateUtf8;
} else {
enableTextValidateUTF8 = Boolean.parseBoolean(validateUtf8);
}

} catch (org.apache.doris.common.AnalysisException e) {
throw new AnalysisException(e.getMessage());
}
Expand All @@ -142,8 +157,7 @@ public TFileAttributes toTFileAttributes() {
fileAttributes.setHeaderType(headerType);
fileAttributes.setTrimDoubleQuotes(trimDoubleQuotes);
fileAttributes.setSkipLines(skipLines);
fileAttributes.setEnableTextValidateUtf8(
ConnectContext.get().getSessionVariable().enableTextValidateUtf8);
fileAttributes.setEnableTextValidateUtf8(enableTextValidateUTF8);
return fileAttributes;
}

Expand Down
Loading