Skip to content

[BugFix](ParquetReader) Branch 1.2 lts fix parquet pushdown error #30076

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
yiguolei merged 2 commits into from
Feb 4, 2024
Merged

[BugFix](ParquetReader) Branch 1.2 lts fix parquet pushdown error #30076

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
8d2833b
fix date type conjunct push down to parquet bug
GoGoWen Jan 17, 2024
70b31e2
fix code style
GoGoWen Jan 29, 2024
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
6 changes: 4 additions & 2 deletions be/src/olap/row_cursor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,8 @@ Status RowCursor::_init(const std::vector<uint32_t>& columns) {
return Status::Error<INIT_FAILED>();
}
_variable_len += column_schema(cid)->get_variable_len();
if (_schema->column(cid)->type() == OLAP_FIELD_TYPE_STRING || _schema->column(cid)->type() == OLAP_FIELD_TYPE_JSONB) {
if (_schema->column(cid)->type() == OLAP_FIELD_TYPE_STRING ||
_schema->column(cid)->type() == OLAP_FIELD_TYPE_JSONB) {
++_string_field_count;
}
}
Expand Down Expand Up @@ -221,7 +222,8 @@ Status RowCursor::allocate_memory_for_string_type(TabletSchemaSPtr schema) {
char** long_text_ptr = _long_text_buf;
for (auto cid : _schema->column_ids()) {
fixed_ptr = _fixed_buf + _schema->column_offset(cid);
if (_schema->column(cid)->type() == OLAP_FIELD_TYPE_STRING || _schema->column(cid)->type() == OLAP_FIELD_TYPE_JSONB) {
if (_schema->column(cid)->type() == OLAP_FIELD_TYPE_STRING ||
_schema->column(cid)->type() == OLAP_FIELD_TYPE_JSONB) {
Slice* slice = reinterpret_cast<Slice*>(fixed_ptr + 1);
_schema->mutable_column(cid)->set_long_text_buf(long_text_ptr);
slice->data = *(long_text_ptr);
Expand Down
2 changes: 0 additions & 2 deletions be/src/runtime/export_sink.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,6 @@
#include "util/types.h"
#include "util/uid_util.h"



namespace doris {

ExportSink::ExportSink(ObjectPool* pool, const RowDescriptor& row_desc,
Expand Down
7 changes: 7 additions & 0 deletions be/src/vec/exec/format/parquet/parquet_pred_cmp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,6 +220,13 @@ class ParquetPredicate {
std::is_same_v<CppType, DateV2Value<DateV2ValueType>>) {
min_value.from_unixtime(min_date_value * 24 * 60 * 60, ctz);
max_value.from_unixtime(max_date_value * 24 * 60 * 60, ctz);

// as DateTimeValue can not compare date and datetime, so need
// cast to date here
if constexpr (std::is_same_v<CppType, DateTimeValue>) {
min_value.cast_to_date();
max_value.cast_to_date();
}
} else {
return false;
}
Expand Down