From d7fd1d032b831920d40bfc700d058036ce474f66 Mon Sep 17 00:00:00 2001
From: thesnallygaster <92674455+thesnallygaster@users.noreply.github.com>
Date: Fri, 23 Aug 2024 16:41:49 +0200
Subject: [PATCH] =?UTF-8?q?feat:=20Add=20option=20to=20change=20max=5Fexec?=
 =?UTF-8?q?ution=5Ftime=20setting=20for=20clickhouse=20=E2=80=A6=20(#5683)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pkg/query-service/app/clickhouseReader/reader.go  | 1 +
 pkg/query-service/app/clickhouseReader/wrapper.go | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/pkg/query-service/app/clickhouseReader/reader.go b/pkg/query-service/app/clickhouseReader/reader.go
index 8dce05250d..2fc7383d5b 100644
--- a/pkg/query-service/app/clickhouseReader/reader.go
+++ b/pkg/query-service/app/clickhouseReader/reader.go
@@ -184,6 +184,7 @@ func NewReaderFromClickhouseConnection(
 	wrap := clickhouseConnWrapper{
 		conn: db,
 		settings: ClickhouseQuerySettings{
+			MaxExecutionTime:                    os.Getenv("ClickHouseMaxExecutionTime"),
 			MaxExecutionTimeLeaf:                os.Getenv("ClickHouseMaxExecutionTimeLeaf"),
 			TimeoutBeforeCheckingExecutionSpeed: os.Getenv("ClickHouseTimeoutBeforeCheckingExecutionSpeed"),
 			MaxBytesToRead:                      os.Getenv("ClickHouseMaxBytesToRead"),
diff --git a/pkg/query-service/app/clickhouseReader/wrapper.go b/pkg/query-service/app/clickhouseReader/wrapper.go
index c575aa7226..fc0a71dc8d 100644
--- a/pkg/query-service/app/clickhouseReader/wrapper.go
+++ b/pkg/query-service/app/clickhouseReader/wrapper.go
@@ -11,6 +11,7 @@ import (
 )
 
 type ClickhouseQuerySettings struct {
+	MaxExecutionTime                    string
 	MaxExecutionTimeLeaf                string
 	TimeoutBeforeCheckingExecutionSpeed string
 	MaxBytesToRead                      string
@@ -47,6 +48,10 @@ func (c clickhouseConnWrapper) addClickHouseSettings(ctx context.Context, query
 		settings["max_bytes_to_read"] = c.settings.MaxBytesToRead
 	}
 
+	if c.settings.MaxExecutionTime != "" {
+		settings["max_execution_time"] = c.settings.MaxExecutionTime
+	}
+
 	if c.settings.MaxExecutionTimeLeaf != "" {
 		settings["max_execution_time_leaf"] = c.settings.MaxExecutionTimeLeaf
 	}