From 45286613d31831c6b1360900fc96e7c1025bac9d Mon Sep 17 00:00:00 2001 From: qevolg <2227465945@qq.com> Date: Tue, 11 Feb 2025 15:04:35 +0800 Subject: [PATCH 1/3] fix(keeper): fix sql for log.logs stable --- tools/keeper/process/handle.go | 4 +++- tools/keeper/process/handle_test.go | 6 ++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tools/keeper/process/handle.go b/tools/keeper/process/handle.go index 980902daca..ea02dd91f3 100644 --- a/tools/keeper/process/handle.go +++ b/tools/keeper/process/handle.go @@ -411,9 +411,11 @@ func (p *Processor) Prepare() { func (p *Processor) withDBName(tableName string) string { b := pool.BytesPoolGet() + b.WriteByte('`') b.WriteString(p.db) - b.WriteByte('.') + b.WriteString("`.`") b.WriteString(tableName) + b.WriteByte('`') return b.String() } diff --git a/tools/keeper/process/handle_test.go b/tools/keeper/process/handle_test.go index bfd5c369b4..55f469eabb 100644 --- a/tools/keeper/process/handle_test.go +++ b/tools/keeper/process/handle_test.go @@ -119,3 +119,9 @@ func Test_getStatusStr(t *testing.T) { assert.Equal(t, tt.expected, res) } } + +func Test_withDBName(t *testing.T) { + processor := &Processor{db: "db"} + res := processor.withDBName("test") + assert.Equal(t, res, "`db`.`test`") +} From 3c30a941fc46b68630da4cdd47e4a7de1fa6f2b4 Mon Sep 17 00:00:00 2001 From: qevolg <2227465945@qq.com> Date: Tue, 11 Feb 2025 15:13:07 +0800 Subject: [PATCH 2/3] chore: update taoskeeper ci --- .../workflows/{taoskeeper-ci.yml => taoskeeper-ci-build.yml} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename .github/workflows/{taoskeeper-ci.yml => taoskeeper-ci-build.yml} (95%) diff --git a/.github/workflows/taoskeeper-ci.yml b/.github/workflows/taoskeeper-ci-build.yml similarity index 95% rename from .github/workflows/taoskeeper-ci.yml rename to .github/workflows/taoskeeper-ci-build.yml index 7f84eaa401..71bb1c9a51 100644 --- a/.github/workflows/taoskeeper-ci.yml +++ b/.github/workflows/taoskeeper-ci-build.yml @@ -1,4 +1,4 @@ -name: taosKeeper CI +name: taosKeeper Build on: push: @@ -8,7 +8,7 @@ on: jobs: build: runs-on: ubuntu-latest - name: Run unit tests + name: Build and test on ubuntu-latest steps: - name: Checkout the repository From fdcd81d802cac8ddfa0c5f5edf3d8831d0f649cb Mon Sep 17 00:00:00 2001 From: qevolg <2227465945@qq.com> Date: Tue, 11 Feb 2025 15:15:49 +0800 Subject: [PATCH 3/3] style(keeper): format code --- tools/keeper/util/empty_test.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools/keeper/util/empty_test.go b/tools/keeper/util/empty_test.go index 5d82866721..b38609ec73 100644 --- a/tools/keeper/util/empty_test.go +++ b/tools/keeper/util/empty_test.go @@ -1,8 +1,6 @@ package util -import ( - "testing" -) +import "testing" func TestEmpty(t *testing.T) { }