diff --git a/src/common/backend/catalog/pg_builtin_proc.cpp b/src/common/backend/catalog/pg_builtin_proc.cpp
index 243fae407..f42bd2c09 100755
--- a/src/common/backend/catalog/pg_builtin_proc.cpp
+++ b/src/common/backend/catalog/pg_builtin_proc.cpp
@@ -115,9 +115,9 @@ static void InitHashTable(int size)
 static HTAB* get_name_hash_table_type() 
 {
 #if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
-    if (a_nameHash != NULL && u_sess->attr.attr_sql.whale) {
+    if (a_nameHash != NULL && DB_IS_CMPT(A_FORMAT)) {
         return a_nameHash;
-    } else if (b_nameHash != NULL && u_sess->attr.attr_sql.dolphin) {
+    } else if (b_nameHash != NULL && DB_IS_CMPT(B_FORMAT)) {
         return b_nameHash;
     }
 #endif
@@ -127,9 +127,9 @@ static HTAB* get_name_hash_table_type()
 static HTAB* get_oid_hash_table_type()
 {
 #if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
-    if (a_oidHash != NULL && u_sess->attr.attr_sql.whale) {
+    if (a_oidHash != NULL && DB_IS_CMPT(A_FORMAT)) {
         return a_oidHash;
-    } else if (b_oidHash != NULL && u_sess->attr.attr_sql.dolphin) {
+    } else if (b_oidHash != NULL && DB_IS_CMPT(B_FORMAT)) {
         return b_oidHash;
     }
 #endif
diff --git a/src/gausskernel/optimizer/commands/extension.cpp b/src/gausskernel/optimizer/commands/extension.cpp
index 473bc4d7c..ab7dfe0e8 100644
--- a/src/gausskernel/optimizer/commands/extension.cpp
+++ b/src/gausskernel/optimizer/commands/extension.cpp
@@ -1428,13 +1428,6 @@ void CreateExtension(CreateExtensionStmt* stmt)
 
     u_sess->exec_cxt.extension_is_valid = true;
 
-#if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
-    if (pg_strcasecmp(stmt->extname, "dolphin") == 0) {
-         u_sess->attr.attr_sql.dolphin = true;
-    } else if (pg_strcasecmp(stmt->extname, "whale") == 0) {
-         u_sess->attr.attr_sql.whale = true;
-    }
-#endif
     /*
      * Insert new tuple into pg_extension, and create dependency entries.
      */
@@ -1468,7 +1461,10 @@ void CreateExtension(CreateExtensionStmt* stmt)
     u_sess->exec_cxt.extension_is_valid = false;
 #if (!defined(ENABLE_MULTIPLE_NODES)) && (!defined(ENABLE_PRIVATEGAUSS))
     if (pg_strcasecmp(stmt->extname, "dolphin") == 0) {
+        u_sess->attr.attr_sql.dolphin = true;
         InitBSqlPluginHookIfNeeded();
+    } else if (pg_strcasecmp(stmt->extname, "whale") == 0) {
+        u_sess->attr.attr_sql.whale = true;
     }
 #endif
 }
diff --git a/src/include/knl/knl_instance.h b/src/include/knl/knl_instance.h
index 293c2e235..b0cd9c017 100755
--- a/src/include/knl/knl_instance.h
+++ b/src/include/knl/knl_instance.h
@@ -1335,7 +1335,6 @@ typedef struct knl_instance_context {
 
 #ifndef ENABLE_MULTIPLE_NODES
     void *raw_parser_hook[DB_CMPT_MAX];
-    void *plsql_parser_hook[DB_CMPT_MAX];
     char *llvmIrFilePath[DB_CMPT_MAX];
     pthread_mutex_t loadPluginLock[DB_CMPT_MAX];
 #endif