diff --git a/include/libs/nodes/cmdnodes.h b/include/libs/nodes/cmdnodes.h
index 3a36601b11337f989f0eb4af08334cca5119200a..40a71050420c89d8c7cc44f1ae27124a51fa3e89 100644
--- a/include/libs/nodes/cmdnodes.h
+++ b/include/libs/nodes/cmdnodes.h
@@ -358,7 +358,7 @@ typedef struct SRestoreComponentNodeStmt {
 
 typedef struct SCreateTopicStmt {
   ENodeType type;
-  char      topicName[TSDB_TABLE_NAME_LEN];
+  char      topicName[TSDB_TOPIC_NAME_LEN];
   char      subDbName[TSDB_DB_NAME_LEN];
   char      subSTbName[TSDB_TABLE_NAME_LEN];
   bool      ignoreExists;
@@ -369,13 +369,13 @@ typedef struct SCreateTopicStmt {
 
 typedef struct SDropTopicStmt {
   ENodeType type;
-  char      topicName[TSDB_TABLE_NAME_LEN];
+  char      topicName[TSDB_TOPIC_NAME_LEN];
   bool      ignoreNotExists;
 } SDropTopicStmt;
 
 typedef struct SDropCGroupStmt {
   ENodeType type;
-  char      topicName[TSDB_TABLE_NAME_LEN];
+  char      topicName[TSDB_TOPIC_NAME_LEN];
   char      cgroup[TSDB_CGROUP_LEN];
   bool      ignoreNotExists;
 } SDropCGroupStmt;
diff --git a/source/libs/parser/src/parTranslater.c b/source/libs/parser/src/parTranslater.c
index fb028848428382155a8f1b0116273f641d86d8ff..00fa7ee7e22b0141bc00bb7b0a33cade1117d88f 100644
--- a/source/libs/parser/src/parTranslater.c
+++ b/source/libs/parser/src/parTranslater.c
@@ -6135,9 +6135,7 @@ static int32_t translateCreateTopic(STranslateContext* pCxt, SCreateTopicStmt* p
 static int32_t translateDropTopic(STranslateContext* pCxt, SDropTopicStmt* pStmt) {
   SMDropTopicReq dropReq = {0};
 
-  SName name;
-  tNameSetDbName(&name, pCxt->pParseCxt->acctId, pStmt->topicName, strlen(pStmt->topicName));
-  tNameGetFullDbName(&name, dropReq.name);
+  snprintf(dropReq.name, sizeof(dropReq.name), "%d.%s", pCxt->pParseCxt->acctId, pStmt->topicName);
   dropReq.igNotExists = pStmt->ignoreNotExists;
 
   return buildCmdMsg(pCxt, TDMT_MND_TMQ_DROP_TOPIC, (FSerializeFunc)tSerializeSMDropTopicReq, &dropReq);
diff --git a/tests/system-test/1-insert/drop.py b/tests/system-test/1-insert/drop.py
index 9954b3557e23df193a4c4f84c819fc508c39f5bb..8775450ff0eee5ce1bd82d6eb83dc2f85ed44ba4 100644
--- a/tests/system-test/1-insert/drop.py
+++ b/tests/system-test/1-insert/drop.py
@@ -129,6 +129,12 @@ class TDTestCase:
         tdSql.query(f'select * from information_schema.ins_topics where topic_name = "{topic_name}"')
         tdSql.checkEqual(tdSql.queryResult[0][3],f'create topic {topic_name} as select c0 from {self.dbname}.{stbname}')
         tdSql.execute(f'drop topic {topic_name}')
+
+        #TD-25222
+        long_topic_name="hhhhjjhhhhqwertyuiasdfghjklzxcvbnmhhhhjjhhhhqwertyuiasdfghjklzxcvbnmhhhhjjhhhhqwertyuiasdfghjklzxcvbnm"
+        tdSql.execute(f'create topic {long_topic_name} as select * from {self.dbname}.{stbname}')
+        tdSql.execute(f'drop topic {long_topic_name}')
+
         tdSql.execute(f'drop database {self.dbname}')
 
     def drop_stream_check(self):