From dd5a590423bf7a58f37d8d2aee55ca40ef7f1ebd Mon Sep 17 00:00:00 2001
From: dapan1121 <89396746@qq.com>
Date: Wed, 2 Jun 2021 15:21:35 +0800
Subject: [PATCH 1/3] add keep value check

---
 src/client/src/tscSQLParser.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index f8aa444d9e..50ae545a8e 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -5648,11 +5648,17 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
     tVariantListItem* p0 = taosArrayGet(pKeep, 0);
     switch (s) {
       case 1: {
+        if ((int32_t)p0->pVar.i64 <= 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+        }
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
       }
         break;
       case 2: {
         tVariantListItem* p1 = taosArrayGet(pKeep, 1);
+        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+        }        
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
         pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
         break;
@@ -5661,6 +5667,10 @@ static int32_t setKeepOption(SSqlCmd* pCmd, SCreateDbMsg* pMsg, SCreateDbInfo* p
         tVariantListItem* p1 = taosArrayGet(pKeep, 1);
         tVariantListItem* p2 = taosArrayGet(pKeep, 2);
 
+        if ((int32_t)p0->pVar.i64 <= 0 || (int32_t)p1->pVar.i64 <= 0 || (int32_t)p2->pVar.i64 <= 0) {
+          return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
+        } 
+
         pMsg->daysToKeep = htonl((int32_t)p0->pVar.i64);
         pMsg->daysToKeep1 = htonl((int32_t)p1->pVar.i64);
         pMsg->daysToKeep2 = htonl((int32_t)p2->pVar.i64);

From fa6bc96dacb7533bed01f81c7b615b399d9b3a0c Mon Sep 17 00:00:00 2001
From: dapan1121 <89396746@qq.com>
Date: Wed, 2 Jun 2021 17:59:47 +0800
Subject: [PATCH 2/3] fix case issue

---
 tests/script/general/db/alter_option.sim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/script/general/db/alter_option.sim b/tests/script/general/db/alter_option.sim
index 170ba21c28..c3bb23855f 100644
--- a/tests/script/general/db/alter_option.sim
+++ b/tests/script/general/db/alter_option.sim
@@ -129,8 +129,8 @@ sql alter database db keep 20
 sql_error alter database db keep 10
 sql_error alter database db keep 9
 sql_error alter database db keep 1
-sql alter database db keep 0
-sql alter database db keep -1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
 sql_error alter database db keep 365001
 
 print ============== step cache

From 4679c4bf5d42f135cc578ce07e8e41b59df7a6e3 Mon Sep 17 00:00:00 2001
From: dapan1121 <89396746@qq.com>
Date: Thu, 3 Jun 2021 09:39:52 +0800
Subject: [PATCH 3/3] fix case issue

---
 tests/script/general/db/topic1.sim | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/script/general/db/topic1.sim b/tests/script/general/db/topic1.sim
index 42613405af..2b4cce5e64 100644
--- a/tests/script/general/db/topic1.sim
+++ b/tests/script/general/db/topic1.sim
@@ -385,8 +385,8 @@ sql alter database db keep 20
 sql_error alter database db keep 10
 sql_error alter database db keep 9
 sql_error alter database db keep 1
-sql alter database db keep 0
-sql alter database db keep -1
+sql_error alter database db keep 0
+sql_error alter database db keep -1
 sql_error alter database db keep 365001
 
 sql_error alter topic db keep 40