diff --git a/src/client/src/tscSQLParser.c b/src/client/src/tscSQLParser.c
index 7bca794a28a07f90b0a922f7b0a59eae49165eac..f5966f462435ce342d08c14c288db1ddf1fd6d0d 100644
--- a/src/client/src/tscSQLParser.c
+++ b/src/client/src/tscSQLParser.c
@@ -6246,7 +6246,7 @@ int32_t tscCheckCreateDbParams(SSqlCmd* pCmd, SCreateDbMsg* pCreate) {
     return invalidSqlErrMsg(tscGetErrorMsgPayload(pCmd), msg);
   }
 
-  val = htons(pCreate->partitions);
+  val = (int16_t)htons(pCreate->partitions);
   if (val != -1 &&
       (val < TSDB_MIN_DB_PARTITON_OPTION || val > TSDB_MAX_DB_PARTITON_OPTION)) {
     snprintf(msg, tListLen(msg), "invalid topic option partition: %d valid range: [%d, %d]", val,
diff --git a/src/common/src/tglobal.c b/src/common/src/tglobal.c
index ce86112ec87d938bd36b960b75b2640cdb3716dd..9e405fdfe115e36cf0a1d64143a30ea9f19b1373 100644
--- a/src/common/src/tglobal.c
+++ b/src/common/src/tglobal.c
@@ -128,7 +128,7 @@ int32_t tsReplications  = TSDB_DEFAULT_DB_REPLICA_OPTION;
 int32_t tsQuorum        = TSDB_DEFAULT_DB_QUORUM_OPTION;
 int16_t tsPartitons     = TSDB_DEFAULT_DB_PARTITON_OPTION;
 int8_t  tsUpdate        = TSDB_DEFAULT_DB_UPDATE_OPTION;
-int8_t  tsCacheLastRow  = TSDB_DEFAULT_CACHE_BLOCK_SIZE;
+int8_t  tsCacheLastRow  = TSDB_DEFAULT_CACHE_LAST_ROW;
 int32_t tsMaxVgroupsPerDb  = 0;
 int32_t tsMinTablePerVnode = TSDB_TABLES_STEP;
 int32_t tsMaxTablePerVnode = TSDB_DEFAULT_TABLES;