Refactor the code

yandex · Dec 16, 2024 · 7ad0f48 · 7ad0f48
1 parent b4ea9ac
commit 7ad0f48
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 23 deletions.
diff --git a/internal/mysql/node.go b/internal/mysql/node.go
@@ -157,27 +157,21 @@ func (n *Node) traceQuery(query string, arg interface{}, result interface{}, err
 }
 
 func IsGtidQuery(query string) bool {
-	if query == DefaultQueries[queryGTIDExecuted] {
-		return true
-	}
-
-	if strings.HasPrefix(
-		query,
-		UtilityQueries[querySlaveStatus],
-	) {
-		return true
-	}
-
-	if strings.HasPrefix(
-		query,
-		UtilityQueries[queryReplicaStatus],
-	) {
-		return true
+	for _, gtidQuery := range GtidQueries {
+		if strings.HasPrefix(query, gtidQuery) {
+			return true
+		}
 	}
 
 	return false
 }
 
+var GtidQueries = []string{
+	DefaultQueries[queryGTIDExecuted],
+	strings.ReplaceAll(DefaultQueries[querySlaveStatus], ":channel", "''"),
+	strings.ReplaceAll(DefaultQueries[queryReplicaStatus], ":channel", ""),
+}
+
 //nolint:unparam
 func (n *Node) queryRow(queryName string, arg interface{}, result interface{}) error {
 	return n.queryRowWithTimeout(queryName, arg, result, n.config.DBTimeout)

diff --git a/internal/mysql/queries.go b/internal/mysql/queries.go
@@ -1,7 +1,5 @@
 package mysql
 
-import "strings"
-
 const (
 	queryPing                           = "ping"
 	querySlaveStatus                    = "slave_status"
@@ -145,8 +143,3 @@ var DefaultQueries = map[string]string{
 										)
 									ON DUPLICATE KEY UPDATE ts = CURRENT_TIMESTAMP(3)`,
 }
-
-var UtilityQueries = map[string]string{
-	querySlaveStatus:   strings.ReplaceAll(DefaultQueries[querySlaveStatus], ":channel", ""),
-	queryReplicaStatus: strings.ReplaceAll(DefaultQueries[queryReplicaStatus], ":channel", ""),
-}