Skip to content

[Fix](multi-catalog) Fix all nested type test which introduced by #19518(support insert-only transactional table). #20194

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
merged 1 commit into from
May 30, 2023
Merged

[Fix](multi-catalog) Fix all nested type test which introduced by #19518(support insert-only transactional table). #20194

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
20 changes: 11 additions & 9 deletions be/src/vec/exec/format/orc/vorc_reader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,17 +264,17 @@ Status OrcReader::get_parsed_schema(std::vector<std::string>* col_names,

Status OrcReader::_init_read_columns() {
auto& root_type = _reader->getType();
_is_acid = _check_acid_schema(root_type);

std::vector<std::string> orc_cols;
std::vector<std::string> orc_cols_lower_case;
_init_orc_cols(root_type, orc_cols, orc_cols_lower_case);

bool is_acid = _check_acid_schema(root_type);
for (auto& col_name : _column_names) {
if (_is_hive) {
auto iter = _scan_params.slot_name_to_schema_pos.find(col_name);
DCHECK(iter != _scan_params.slot_name_to_schema_pos.end());
int pos = iter->second;
if (is_acid) {
if (_is_acid) {
orc_cols_lower_case[ACID_ROW_OFFSET + 1 + pos] = iter->first;
} else {
orc_cols_lower_case[pos] = iter->first;
Expand All @@ -285,7 +285,7 @@ Status OrcReader::_init_read_columns() {
_missing_cols.emplace_back(col_name);
} else {
int pos = std::distance(orc_cols_lower_case.begin(), iter);
if (is_acid) {
if (_is_acid) {
auto read_col = fmt::format("{}.{}", ACID_EVENT_FIELD_NAMES[ACID_ROW_OFFSET],
orc_cols[pos]);
_read_cols.emplace_back(read_col);
Expand All @@ -309,9 +309,11 @@ void OrcReader::_init_orc_cols(const orc::Type& type, std::vector<std::string>&
for (int i = 0; i < type.getSubtypeCount(); ++i) {
orc_cols.emplace_back(type.getFieldName(i));
orc_cols_lower_case.emplace_back(_get_field_name_lower_case(&type, i));
const orc::Type* sub_type = type.getSubtype(i);
if (sub_type->getKind() == orc::TypeKind::STRUCT) {
_init_orc_cols(*sub_type, orc_cols, orc_cols_lower_case);
if (_is_acid) {
const orc::Type* sub_type = type.getSubtype(i);
if (sub_type->getKind() == orc::TypeKind::STRUCT) {
_init_orc_cols(*sub_type, orc_cols, orc_cols_lower_case);
}
}
}
}
Expand Down Expand Up @@ -753,7 +755,7 @@ Status OrcReader::_init_select_types(const orc::Type& type, int idx) {
_colname_to_idx[name] = idx++;
const orc::Type* sub_type = type.getSubtype(i);
_col_orc_type.push_back(sub_type);
if (sub_type->getKind() == orc::TypeKind::STRUCT) {
if (_is_acid && sub_type->getKind() == orc::TypeKind::STRUCT) {
_init_select_types(*sub_type, idx);
}
}
Expand Down Expand Up @@ -1255,7 +1257,7 @@ void OrcReader::_fill_batch_vec(std::vector<orc::ColumnVectorBatch*>& result,
orc::ColumnVectorBatch* batch, int idx) {
for (auto* field : down_cast<orc::StructVectorBatch*>(batch)->fields) {
result.push_back(field);
if (_col_orc_type[idx++]->getKind() == orc::TypeKind::STRUCT) {
if (_is_acid && _col_orc_type[idx++]->getKind() == orc::TypeKind::STRUCT) {
_fill_batch_vec(result, field, idx);
}
}
Expand Down
1 change: 1 addition & 0 deletions be/src/vec/exec/format/orc/vorc_reader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,6 +461,7 @@ class OrcReader : public GenericReader {
std::unique_ptr<IColumn::Filter> _filter = nullptr;
LazyReadContext _lazy_read_ctx;
std::unique_ptr<TextConverter> _text_converter = nullptr;
bool _is_acid = false;
};

class ORCFileInputStream : public orc::InputStream {
Expand Down