Skip to content

[fix](meta_scanner) fix meta_scanner process ColumnNullable #28711

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
Dec 20, 2023
Merged

[fix](meta_scanner) fix meta_scanner process ColumnNullable #28711

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
bf567cf
fix
zhiqiang-hhhh Dec 20, 2023
defc83a
update queries doc
zhiqiang-hhhh Dec 20, 2023
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: 15 additions & 5 deletions be/src/vec/exec/scan/vmeta_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
#include <gen_cpp/PaloInternalService_types.h>
#include <gen_cpp/PlanNodes_types.h>

#include <algorithm>
#include <ostream>
#include <string>
#include <utility>
Expand Down Expand Up @@ -83,6 +84,17 @@ Status VMetaScanner::prepare(RuntimeState* state, const VExprContextSPtrs& conju
VLOG_CRITICAL << "VMetaScanner::prepare";
RETURN_IF_ERROR(VScanner::prepare(_state, conjuncts));
_tuple_desc = state->desc_tbl().get_tuple_descriptor(_tuple_id);
bool has_col_nullable =
std::any_of(std::begin(_tuple_desc->slots()), std::end(_tuple_desc->slots()),
[](SlotDescriptor* slot_desc) { return slot_desc->is_nullable(); });

if (has_col_nullable) {
// We do not allow any columns to be Nullable here, since FE can not
// transmit a NULL value to BE, so we can not distinguish a empty string
// from a NULL value.
return Status::InternalError("Logical error, VMetaScanner do not allow ColumnNullable");
}

RETURN_IF_ERROR(_fetch_metadata(_scan_range.meta_scan_range));
return Status::OK();
}
Expand Down Expand Up @@ -112,7 +124,7 @@ Status VMetaScanner::_get_block_impl(RuntimeState* state, Block* block, bool* eo
}
}
// fill block
static_cast<void>(_fill_block_with_remote_data(columns));
RETURN_IF_ERROR(_fill_block_with_remote_data(columns));
if (_meta_eos == true) {
if (block->rows() == 0) {
*eof = true;
Expand Down Expand Up @@ -146,11 +158,9 @@ Status VMetaScanner::_fill_block_with_remote_data(const std::vector<MutableColum
}

for (int _row_idx = 0; _row_idx < _batch_data.size(); _row_idx++) {
// No need to check nullable column since no nullable column is
// guaranteed in VMetaScanner::prepare
vectorized::IColumn* col_ptr = columns[col_idx].get();
if (slot_desc->is_nullable() == true) {
auto* nullable_column = reinterpret_cast<vectorized::ColumnNullable*>(col_ptr);
col_ptr = &nullable_column->get_nested_column();
}
switch (slot_desc->type().type) {
case TYPE_BOOLEAN: {
bool data = _batch_data[_row_idx].column_value[col_idx].boolVal;
Expand Down
6 changes: 3 additions & 3 deletions docs/en/docs/sql-manual/sql-functions/table-functions/queries.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ mysql> desc function queries();
+------------------+--------+------+-------+---------+-------+
| QueryId | TEXT | No | false | NULL | NONE |
| StartTime | BIGINT | No | false | NULL | NONE |
| EndTime | BIGINT | Yes | false | NULL | NONE |
| EventTime | BIGINT | Yes | false | NULL | NONE |
| EndTime | BIGINT | No | false | NULL | NONE |
| EventTime | BIGINT | No | false | NULL | NONE |
| Latency | BIGINT | No | false | NULL | NONE |
| State | TEXT | No | false | NULL | NONE |
| Database | TEXT | Yes | false | NULL | NONE |
| Database | TEXT | No | false | NULL | NONE |
| Sql | TEXT | No | false | NULL | NONE |
| FrontendInstance | TEXT | No | false | NULL | NONE |
+------------------+--------+------+-------+---------+-------+
Expand Down
6 changes: 3 additions & 3 deletions docs/zh-CN/docs/sql-manual/sql-functions/table-functions/queries.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@ mysql> desc function queries();
+------------------+--------+------+-------+---------+-------+
| QueryId | TEXT | No | false | NULL | NONE |
| StartTime | BIGINT | No | false | NULL | NONE |
| EndTime | BIGINT | Yes | false | NULL | NONE |
| EventTime | BIGINT | Yes | false | NULL | NONE |
| EndTime | BIGINT | No | false | NULL | NONE |
| EventTime | BIGINT | No | false | NULL | NONE |
| Latency | BIGINT | No | false | NULL | NONE |
| State | TEXT | No | false | NULL | NONE |
| Database | TEXT | Yes | false | NULL | NONE |
| Database | TEXT | No | false | NULL | NONE |
| Sql | TEXT | No | false | NULL | NONE |
| FrontendInstance | TEXT | No | false | NULL | NONE |
+------------------+--------+------+-------+---------+-------+
Expand Down
6 changes: 3 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/tablefunction/QueriesTableValuedFunction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ public class QueriesTableValuedFunction extends MetadataTableValuedFunction {
private static final ImmutableList<Column> SCHEMA = ImmutableList.of(
new Column("QueryId", ScalarType.createStringType()),
new Column("StartTime", PrimitiveType.BIGINT),
new Column("EndTime", PrimitiveType.BIGINT, true),
new Column("EventTime", PrimitiveType.BIGINT, true),
new Column("EndTime", PrimitiveType.BIGINT),
new Column("EventTime", PrimitiveType.BIGINT),
new Column("Latency", PrimitiveType.BIGINT),
new Column("State", ScalarType.createStringType()),
new Column("Database", ScalarType.createStringType(), true),
new Column("Database", ScalarType.createStringType()),
new Column("Sql", ScalarType.createStringType()),
new Column("FrontendInstance", ScalarType.createStringType()));

Expand Down