From e0652e617e2c384de401bbc64dbb8fa7e8b47c78 Mon Sep 17 00:00:00 2001
From: Nick <148735107+nick-bisonai@users.noreply.github.com>
Date: Wed, 21 Aug 2024 17:05:06 +0900
Subject: [PATCH] Revert "feat: implement db query timeout (#2167)" (#2169)

This reverts commit f10ee33d1c42b9b1cfec6a0213b7a4756f66ad06.
---
 node/pkg/db/pgsql.go | 17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

diff --git a/node/pkg/db/pgsql.go b/node/pkg/db/pgsql.go
index 5906c69ea..d27e1aa4c 100644
--- a/node/pkg/db/pgsql.go
+++ b/node/pkg/db/pgsql.go
@@ -6,7 +6,6 @@ import (
 	"fmt"
 	"strings"
 	"sync"
-	"time"
 
 	errorSentinel "bisonai.com/orakl/node/pkg/error"
 	"bisonai.com/orakl/node/pkg/secrets"
@@ -15,8 +14,6 @@ import (
 	"github.com/rs/zerolog/log"
 )
 
-const BasicTimeout = 10 * time.Second
-
 // singleton pattern
 // make sure env is loaded from main before calling this
 var (
@@ -103,9 +100,7 @@ func QueryRows[T any](ctx context.Context, queryString string, args map[string]a
 }
 
 func query(ctx context.Context, pool *pgxpool.Pool, query string, args map[string]any) (pgx.Rows, error) {
-	ctxWithTimeout, cancel := context.WithTimeout(ctx, BasicTimeout)
-	defer cancel()
-	return pool.Query(ctxWithTimeout, query, pgx.NamedArgs(args))
+	return pool.Query(ctx, query, pgx.NamedArgs(args))
 }
 
 func queryRow[T any](ctx context.Context, pool *pgxpool.Pool, queryString string, args map[string]any) (T, error) {
@@ -368,15 +363,9 @@ func GetTransientPool(ctx context.Context, connectionString string) (*pgxpool.Po
 }
 
 func QueryRowTransient[T any](ctx context.Context, pool *pgxpool.Pool, queryString string, args map[string]any) (T, error) {
-	ctxWithTimeout, cancel := context.WithTimeout(ctx, BasicTimeout)
-	defer cancel()
-
-	return queryRow[T](ctxWithTimeout, pool, queryString, args)
+	return queryRow[T](ctx, pool, queryString, args)
 }
 
 func QueryRowsTransient[T any](ctx context.Context, pool *pgxpool.Pool, queryString string, args map[string]any) ([]T, error) {
-	ctxWithTimeout, cancel := context.WithTimeout(ctx, BasicTimeout)
-	defer cancel()
-
-	return queryRows[T](ctxWithTimeout, pool, queryString, args)
+	return queryRows[T](ctx, pool, queryString, args)
 }