[feat](catalog) Support reading Hive table with MultiDelimitSerDe #51936
+368
−7
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Thank you for your contribution to Apache Doris. Please clearly describe your PR:
|
|
run buildall |
TPC-H: Total hot run time: 34300 ms |
TPC-DS: Total hot run time: 185362 ms |
ClickBench: Total hot run time: 29.37 s |
morningman
reviewed
Jun 23, 2025
| @@ -88,6 +88,13 @@ public static String getFieldDelimiter(Table table) { | |||
| DEFAULT_FIELD_DELIMITER, fieldDelim, serFormat)); | |||
| } | |||
|
|
|||
| public static String getMultiDelimitFieldDelimiter(Table table) { | |||
There was a problem hiding this comment.
This method is same as getFieldDelimiter()?
| CREATE DATABASE IF NOT EXISTS regression; | ||
| USE regression; | ||
|
|
||
| CREATE TABLE `multi_delimit_test`( |
There was a problem hiding this comment.
How about adding array and map type to test 'mapkey.delim' and 'collection.delim' too?
| } | ||
| process_value_func(data, value_start, size - value_start, _trimming_char, splitted_values); | ||
| } else { | ||
| size_t start = 0; |
There was a problem hiding this comment.
Need to add unit test for this algorithm
morningman
reviewed
Jun 23, 2025
|
|
||
| try { | ||
| // Test 1: MultiDelimitSerDe with |+| delimiter | ||
| hive_docker """ |
There was a problem hiding this comment.
I saw you already add hql in docker/thirdparties/docker-compose/hive/scripts/data/regression/multi_delimit_serde/create_table.hql, why need to create here again?
|
|
||
| hive_docker """INSERT OVERWRITE TABLE multi_delimit_test3 VALUES ('field1', 'field2', 'field3'), ('a', 'b', 'c')""" | ||
|
|
||
| qt_03 """SELECT * FROM multi_delimit_test3 ORDER BY col1""" |
There was a problem hiding this comment.
Please also test the insert command (Use Doris to write to Hive) for each table type
Comment on lines
475
to
476
| } else if (serDeLib.equals(HiveMetaStoreClientHelper.HIVE_MULTI_DELIMIT_SERDE)) { | ||
| TFileTextScanRangeParams textParams = new TFileTextScanRangeParams(); | ||
| // set properties of MultiDelimitSerDe | ||
| // 1. set column separator (support multi-character delimiters) | ||
| textParams.setColumnSeparator(HiveProperties.getMultiDelimitFieldDelimiter(table)); | ||
| // 2. set line delimiter | ||
| textParams.setLineDelimiter(HiveProperties.getLineDelimiter(table)); | ||
| // 3. set mapkv delimiter | ||
| textParams.setMapkvDelimiter(HiveProperties.getMapKvDelimiter(table)); | ||
| // 4. set collection delimiter | ||
| textParams.setCollectionDelimiter(HiveProperties.getCollectionDelimiter(table)); | ||
| // 5. set escape delimiter | ||
| HiveProperties.getEscapeDelimiter(table).ifPresent(d -> textParams.setEscape(d.getBytes()[0])); | ||
| // 6. set null format | ||
| textParams.setNullFormat(HiveProperties.getNullFormat(table)); | ||
| fileAttributes.setTextParams(textParams); | ||
| fileAttributes.setHeaderType(""); | ||
| fileAttributes.setEnableTextValidateUtf8( | ||
| sessionVariable.enableTextValidateUtf8); |
There was a problem hiding this comment.
These code is similar to org.apache.hadoop.hive.serde2.lazy.LazySimpleSerDe, should be merged together
| // hive will escape the field separator in string | ||
| if (_escape_char != 0 && i > 0 && data[i - 1] == _escape_char) { | ||
| continue; | ||
| if (_value_sep_len == 1) { |
There was a problem hiding this comment.
It isbetter to abstract the branch code into two functions, refer to PlainCsvTextFieldSplitter:
void PlainCsvTextFieldSplitter::do_split(const Slice& line, std::vector<Slice>* splitted_values) {
if (is_single_char_delim) {
_split_field_single_char(line, splitted_values);
} else {
_split_field_multi_char(line, splitted_values);
}
}
felixwluo
force-pushed
the
feat-hive-catalog
branch
from
5d3c224 to
1e01919
Compare
|
run buildall |
felixwluo
force-pushed
the
feat-hive-catalog
branch
from
7d03769 to
1fe5222
Compare
TPC-H: Total hot run time: 33690 ms |
|
run buildall |
TPC-H: Total hot run time: 34109 ms |
TPC-DS: Total hot run time: 186356 ms |
|
PR approved by anyone and no changes requested. |
ClickBench: Total hot run time: 29.2 s |
|
run buildall |
TPC-H: Total hot run time: 33679 ms |
TPC-DS: Total hot run time: 185403 ms |
FE UT Coverage ReportIncrement line coverage |
felixwluo
force-pushed
the
feat-hive-catalog
branch
from
e91eff9 to
f1b29b0
Compare
|
run buildall |
FE UT Coverage ReportIncrement line coverage |
felixwluo
force-pushed
the
feat-hive-catalog
branch
from
d437c2a to
8752d5c
Compare
|
run buildall |
FE UT Coverage ReportIncrement line coverage |
TPC-H: Total hot run time: 33928 ms |
TPC-DS: Total hot run time: 184973 ms |
ClickBench: Total hot run time: 29.69 s |
felixwluo
force-pushed
the
feat-hive-catalog
branch
from
b6182b8 to
3ebdfe2
Compare
|
run buildall |
felixwluo
force-pushed
the
feat-hive-catalog
branch
from
3ebdfe2 to
ece7b05
Compare
|
run buildall |
BE UT Coverage ReportIncrement line coverage Increment coverage report
|
|
run p0 |
|
run buildall |
FE UT Coverage ReportIncrement line coverage |
|
run buildall |
1 similar comment
|
run buildall |
FE UT Coverage ReportIncrement line coverage |
|
run buildall |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
What problem does this PR solve?
Issue Number: close #51846
Related PR: #xxx
Problem Summary:
Release note
None
Check List (For Author)
Test
Behavior changed:
Does this need documentation?
Check List (For Reviewer who merge this PR)