Skip to content

[fix](systable) refactor code to avoid wrong usage #40568

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
Sep 10, 2024
Merged

[fix](systable) refactor code to avoid wrong usage #40568

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
fa7ad25
[fix](systable) refactor code to avoid wrong usage
Vallishp Sep 9, 2024
e312625
Merge branch 'master' into schema_scanner_code_refactor
Vallishp Sep 9, 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
11 changes: 11 additions & 0 deletions be/src/exec/schema_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,17 @@ Status SchemaScanner::insert_block_column(TCell cell, int col_index, vectorized:
break;
}

case TYPE_DATETIME: {
std::vector<void*> datas(1);
VecDateTimeValue src[1];
src[0].from_date_str(cell.stringVal.data(), cell.stringVal.size());
datas[0] = src;
auto data = datas[0];
reinterpret_cast<vectorized::ColumnVector<vectorized::Int64>*>(col_ptr)->insert_data(
reinterpret_cast<char*>(data), 0);
nullable_column->get_null_map_data().emplace_back(0);
break;
}
default: {
std::stringstream ss;
ss << "unsupported column type:" << type;
Expand Down
26 changes: 4 additions & 22 deletions be/src/exec/schema_scanner/schema_active_queries_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "exec/schema_scanner/schema_active_queries_scanner.h"

#include "exec/schema_scanner/schema_scanner_helper.h"
#include "runtime/client_cache.h"
#include "runtime/exec_env.h"
#include "runtime/runtime_state.h"
Expand Down Expand Up @@ -101,27 +100,10 @@ Status SchemaActiveQueriesScanner::_get_active_queries_block_from_fe() {

for (int i = 0; i < result_data.size(); i++) {
TRow row = result_data[i];

SchemaScannerHelper::insert_string_value(0, row.column_value[0].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(1, row.column_value[1].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_int_value(2, row.column_value[2].longVal,
_active_query_block.get());
SchemaScannerHelper::insert_int_value(3, row.column_value[3].longVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(4, row.column_value[4].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(5, row.column_value[5].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(6, row.column_value[6].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(7, row.column_value[7].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(8, row.column_value[8].stringVal,
_active_query_block.get());
SchemaScannerHelper::insert_string_value(9, row.column_value[9].stringVal,
_active_query_block.get());
for (int j = 0; j < _s_tbls_columns.size(); j++) {
RETURN_IF_ERROR(insert_block_column(row.column_value[j], j, _active_query_block.get(),
_s_tbls_columns[j].type));
}
}
return Status::OK();
}
Expand Down
18 changes: 2 additions & 16 deletions be/src/exec/schema_scanner/schema_partitions_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
#include <stdint.h>

#include "exec/schema_scanner/schema_helper.h"
#include "exec/schema_scanner/schema_scanner_helper.h"
#include "runtime/client_cache.h"
#include "runtime/exec_env.h"
#include "runtime/runtime_state.h"
Expand Down Expand Up @@ -147,22 +146,9 @@ Status SchemaPartitionsScanner::get_onedb_info_from_fe(int64_t dbId) {

for (int i = 0; i < result_data.size(); i++) {
TRow row = result_data[i];

for (int j = 0; j < _s_tbls_columns.size(); j++) {
if ((_s_tbls_columns[j].type == TYPE_BIGINT) || _s_tbls_columns[j].type == TYPE_INT) {
SchemaScannerHelper::insert_int_value(j, row.column_value[j].longVal,
_partitions_block.get());
} else if (_s_tbls_columns[j].type == TYPE_DATETIME) {
std::vector<void*> datas(1);
VecDateTimeValue src[1];
src[0].from_date_str(row.column_value[j].stringVal.data(),
row.column_value[j].stringVal.size());
datas[0] = src;
SchemaScannerHelper::insert_datetime_value(j, datas, _partitions_block.get());
} else {
SchemaScannerHelper::insert_string_value(j, row.column_value[j].stringVal,
_partitions_block.get());
}
RETURN_IF_ERROR(insert_block_column(row.column_value[j], j, _partitions_block.get(),
_s_tbls_columns[j].type));
}
}
return Status::OK();
Expand Down
15 changes: 2 additions & 13 deletions be/src/exec/schema_scanner/schema_routine_scanner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "exec/schema_scanner/schema_routine_scanner.h"

#include "exec/schema_scanner/schema_scanner_helper.h"
#include "runtime/client_cache.h"
#include "runtime/exec_env.h"
#include "runtime/runtime_state.h"
Expand Down Expand Up @@ -103,19 +102,9 @@ Status SchemaRoutinesScanner::get_block_from_fe() {

for (int i = 0; i < result_data.size(); i++) {
TRow row = result_data[i];

for (int j = 0; j < _s_tbls_columns.size(); j++) {
if (_s_tbls_columns[j].type == TYPE_DATETIME) {
std::vector<void*> datas(1);
VecDateTimeValue src[1];
src[0].from_date_str(row.column_value[j].stringVal.data(),
row.column_value[j].stringVal.size());
datas[0] = src;
SchemaScannerHelper::insert_datetime_value(j, datas, _routines_block.get());
} else {
SchemaScannerHelper::insert_string_value(j, row.column_value[j].stringVal,
_routines_block.get());
}
RETURN_IF_ERROR(insert_block_column(row.column_value[j], j, _routines_block.get(),
_s_tbls_columns[j].type));
}
}
return Status::OK();
Expand Down