Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions be/src/exec/schema_scanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ Status SchemaScanner::init(RuntimeState* state, SchemaScannerParam* param, Objec
}

_param = param;
_timezone = state->timezone();
_timezone_obj = state->timezone_obj();
_is_init = true;

Expand Down
1 change: 1 addition & 0 deletions be/src/exec/schema_scanner.h
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,7 @@ class SchemaScanner {
std::atomic<bool> _eos = false;
std::atomic<bool> _opened = false;
std::atomic<bool> _async_thread_running = false;
std::string _timezone;
cctz::time_zone _timezone_obj;
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ Status SchemaActiveQueriesScanner::_get_active_queries_block_from_fe() {
}
schema_table_params.replay_to_other_fe = true;
schema_table_params.__isset.replay_to_other_fe = true;
schema_table_params.__set_time_zone(_timezone_obj.name());
schema_table_params.__set_time_zone(_timezone);

TFetchSchemaTableDataRequest request;
request.__set_schema_table_name(TSchemaTableName::ACTIVE_QUERIES);
Expand Down
2 changes: 1 addition & 1 deletion be/src/exec/schema_scanner/schema_partitions_scanner.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Status SchemaPartitionsScanner::get_onedb_info_from_fe(int64_t dbId) {
schema_table_request_params.__set_current_user_ident(*_param->common_param->current_user_ident);
schema_table_request_params.__set_catalog(*_param->common_param->catalog);
schema_table_request_params.__set_dbId(dbId);
schema_table_request_params.__set_time_zone(_timezone_obj.name());
schema_table_request_params.__set_time_zone(_timezone);

TFetchSchemaTableDataRequest request;
request.__set_schema_table_name(TSchemaTableName::PARTITIONS);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ SchemaProcessListScanner::~SchemaProcessListScanner() = default;
Status SchemaProcessListScanner::start(RuntimeState* state) {
TShowProcessListRequest request;
request.__set_show_full_sql(true);
request.__set_time_zone(state->timezone_obj().name());
request.__set_time_zone(state->timezone());

for (const auto& fe_addr : _param->common_param->fe_addr_list) {
TShowProcessListResult tmp_ret;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,4 +225,15 @@ suite("test_information_schema_timezone", "p0,external,hive,kerberos,external_do

// set time_zone back
sql """ SET time_zone = "Asia/Shanghai" """

// 8. Test offset format timezone (e.g. +08:00)
// This tests the fix for cctz returning "Fixed/UTC+08:00:00" format
sql """ SET time_zone = '+08:00' """
sql """
select a.*, b.*, c.NAME as WORKLOAD_GROUP_NAME
from information_schema.active_queries a
left join information_schema.backend_active_tasks b on a.QUERY_ID = b.QUERY_ID
left join information_schema.workload_groups c on a.WORKLOAD_GROUP_ID = c.ID
"""
sql """ SET time_zone = "Asia/Shanghai" """
}
Loading