From f2f58eaf3d5bde049be74a44ec7b0936eaed0145 Mon Sep 17 00:00:00 2001 From: xufei Date: Thu, 2 Jan 2025 17:14:38 +0800 Subject: [PATCH] save work Signed-off-by: xufei --- dbms/src/Core/Defines.h | 3 --- dbms/src/Flash/Mpp/MPPTask.cpp | 16 ---------------- dbms/src/Interpreters/Settings.h | 3 --- 3 files changed, 22 deletions(-) diff --git a/dbms/src/Core/Defines.h b/dbms/src/Core/Defines.h index 9a6b13ed477..4541205784f 100644 --- a/dbms/src/Core/Defines.h +++ b/dbms/src/Core/Defines.h @@ -40,9 +40,6 @@ #define DEFAULT_MAX_READ_TSO 0xFFFFFFFFFFFFFFFF #define DEFAULT_UNSPECIFIED_SCHEMA_VERSION (-1) -#define DEFAULT_MPP_TASK_TIMEOUT 10 -#define DEFAULT_MPP_TASK_RUNNING_TIMEOUT (DEFAULT_MPP_TASK_TIMEOUT + 30) -#define DEFAULT_MPP_TASK_WAITING_TIMEOUT 36000 // Timeout for building one disagg task in the TiFlash write node. // Including read index / wait index / generate segments snapshots. diff --git a/dbms/src/Flash/Mpp/MPPTask.cpp b/dbms/src/Flash/Mpp/MPPTask.cpp index 8e2f65c16af..75c1040f762 100644 --- a/dbms/src/Flash/Mpp/MPPTask.cpp +++ b/dbms/src/Flash/Mpp/MPPTask.cpp @@ -407,22 +407,6 @@ void MPPTask::prepare(const mpp::DispatchTaskRequest & task_request) context->setSetting("read_tso", start_ts); context->setSetting("schema_version", schema_ver); - if (unlikely(task_request.timeout() < 0)) - { - /// this is only for test - context->setSetting("mpp_task_timeout", static_cast(5)); - context->setSetting("mpp_task_running_timeout", static_cast(10)); - } - else - { - context->setSetting("mpp_task_timeout", task_request.timeout()); - if (task_request.timeout() > 0) - { - /// in the implementation, mpp_task_timeout is actually the task writing tunnel timeout - /// so make the mpp_task_running_timeout a little bigger than mpp_task_timeout - context->setSetting("mpp_task_running_timeout", task_request.timeout() + 30); - } - } context->getTimezoneInfo().resetByDAGRequest(dag_req); bool is_root_mpp_task = false; diff --git a/dbms/src/Interpreters/Settings.h b/dbms/src/Interpreters/Settings.h index 4c2e5dbeca4..44917406312 100644 --- a/dbms/src/Interpreters/Settings.h +++ b/dbms/src/Interpreters/Settings.h @@ -49,9 +49,6 @@ struct Settings M(SettingInt64, batch_send_min_limit, DEFAULT_BATCH_SEND_MIN_LIMIT, "default minimal chunk size of exchanging data among TiFlash.") \ M(SettingInt64, batch_send_min_limit_compression, -1, "default minimal chunk size of exchanging data among TiFlash when using data compression.") \ M(SettingInt64, schema_version, DEFAULT_UNSPECIFIED_SCHEMA_VERSION, "TiDB query schema version.") \ - M(SettingUInt64, mpp_task_timeout, DEFAULT_MPP_TASK_TIMEOUT, "mpp task max endurable time.") \ - M(SettingUInt64, mpp_task_running_timeout, DEFAULT_MPP_TASK_RUNNING_TIMEOUT, "mpp task max time that running without any progress.") \ - M(SettingUInt64, mpp_task_waiting_timeout, DEFAULT_MPP_TASK_WAITING_TIMEOUT, "mpp task max time that waiting first data block from source input stream.") \ M(SettingInt64, safe_point_update_interval_seconds, 1, "The interval in seconds to update safe point from PD.") \ M(SettingUInt64, max_block_size, DEFAULT_BLOCK_SIZE, "Maximum block rows for reading") \ M(SettingUInt64, max_block_bytes, DEFAULT_BLOCK_BYTES, "Maximum block bytes for reading") \