!1725 重命名b_sql_plugin

Merge pull request !1725 from 仲夏十三/dolphin

src/common/backend/catalog/pg_builtin_proc.cpp

@@ -52,7 +52,7 @@ static_assert(sizeof(false) == sizeof(char), "illegal bool size");
 static struct HTAB* nameHash = NULL;
 static struct HTAB* oidHash = NULL;
 
-/* for b_sql_plugin */
+/* for dolphin */
 struct HTAB* b_nameHash = NULL;
 struct HTAB* b_oidHash = NULL;
 
@@ -118,7 +118,7 @@ static const FuncGroup* NameHashTableAccess(HASHACTION action, const char* name,
 
     Assert(name != NULL);
 
-    if (DB_IS_CMPT(B_FORMAT) && b_nameHash != NULL && u_sess->attr.attr_sql.b_sql_plugin) {
+    if (DB_IS_CMPT(B_FORMAT) && b_nameHash != NULL && u_sess->attr.attr_sql.dolphin) {
         result = (HashEntryNameToFuncGroup *)hash_search(b_nameHash, &temp_name, action, &found);
     } else {
         result = (HashEntryNameToFuncGroup *)hash_search(nameHash, &temp_name, action, &found);
@@ -144,7 +144,7 @@ static const Builtin_func* OidHashTableAccess(HASHACTION action, Oid oid, const
     bool found = false;
     Assert(oid > 0);
 
-    if (DB_IS_CMPT(B_FORMAT) && b_oidHash != NULL && u_sess->attr.attr_sql.b_sql_plugin) {
+    if (DB_IS_CMPT(B_FORMAT) && b_oidHash != NULL && u_sess->attr.attr_sql.dolphin) {
         result = (HashEntryOidToBuiltinFunc *)hash_search(b_oidHash, &oid, action, &found);
     } else {
         result = (HashEntryOidToBuiltinFunc *)hash_search(oidHash, &oid, action, &found);

src/common/backend/utils/init/postinit.cpp

@@ -2712,8 +2712,8 @@ void PostgresInitializer::InitExtensionVariable()
     }
     
     /* check whether the extension has been created */
-    const char* b_sql_plugin = "b_sql_plugin";
-    u_sess->attr.attr_sql.b_sql_plugin = CheckIfExtensionExists(b_sql_plugin);
+    const char* dolphin = "dolphin";
+    u_sess->attr.attr_sql.dolphin = CheckIfExtensionExists(dolphin);
 }
 
 void PostgresInitializer::FinishInit()

src/common/pl/plpgsql/src/gram.y

@@ -10342,7 +10342,7 @@ check_sql_expr(const char *stmt, int location, int leaderlen)
     u_sess->plsql_cxt.plpgsql_yylloc = plpgsql_yylloc;
     RawParserHook parser_hook= raw_parser;
 #ifndef ENABLE_MULTIPLE_NODES
-    if (u_sess->attr.attr_sql.b_sql_plugin) {
+    if (u_sess->attr.attr_sql.dolphin) {
         int id = GetCustomParserId();
         if (id >= 0 && g_instance.raw_parser_hook[id] != NULL) {
             parser_hook = (RawParserHook)g_instance.raw_parser_hook[id];

src/gausskernel/optimizer/commands/extension.cpp

@@ -1175,7 +1175,7 @@ void CreateExtension(CreateExtensionStmt* stmt)
         FEATURE_NOT_PUBLIC_ERROR("EXTENSION is not yet supported.");
     }
 
-    if (pg_strcasecmp(stmt->extname, "b_sql_plugin") == 0 && !DB_IS_CMPT(B_FORMAT)) {
+    if (pg_strcasecmp(stmt->extname, "dolphin") == 0 && !DB_IS_CMPT(B_FORMAT)) {
         ereport(ERROR,
             (errmsg("please create extension \"%s\" with B type DBCOMPATIBILITY", stmt->extname)));
     }
@@ -1418,8 +1418,8 @@ void CreateExtension(CreateExtensionStmt* stmt)
 
     u_sess->exec_cxt.extension_is_valid = true;
 
-    if (pg_strcasecmp(stmt->extname, "b_sql_plugin") == 0) {
-         u_sess->attr.attr_sql.b_sql_plugin = true;
+    if (pg_strcasecmp(stmt->extname, "dolphin") == 0) {
+         u_sess->attr.attr_sql.dolphin = true;
     }
 
     /*

src/gausskernel/process/tcop/postgres.cpp

@@ -825,10 +825,10 @@ void client_read_ended(void)
 #define INIT_PLUGIN_OBJECT "init_plugin_object"
 void InitBSqlPluginHookIfNeeded()
 {
-    const char* b_sql_plugin = "b_sql_plugin";
+    const char* dolphin = "dolphin";
     CFunInfo tmpCF;
 
-    tmpCF = load_external_function(b_sql_plugin, INIT_PLUGIN_OBJECT, false, false);
+    tmpCF = load_external_function(dolphin, INIT_PLUGIN_OBJECT, false, false);
     if (tmpCF.user_fn != NULL) {
         ((void* (*)(void))(tmpCF.user_fn))();
     }
@@ -862,7 +862,7 @@ List* pg_parse_query(const char* query_string, List** query_string_locationlist)
 
     List* (*parser_hook)(const char*, List**) = raw_parser;
 #ifndef ENABLE_MULTIPLE_NODES
-    if (u_sess->attr.attr_sql.b_sql_plugin) {
+    if (u_sess->attr.attr_sql.dolphin) {
         int id = GetCustomParserId();
         if (id >= 0 && g_instance.raw_parser_hook[id] != NULL) {
             parser_hook = (List* (*)(const char*, List**))g_instance.raw_parser_hook[id];
@@ -7574,7 +7574,7 @@ int PostgresMain(int argc, char* argv[], const char* dbname, const char* usernam
         init_set_params_htab();
 
 #ifndef ENABLE_MULTIPLE_NODES
-    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && u_sess->attr.attr_sql.b_sql_plugin) {
+    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && u_sess->attr.attr_sql.dolphin) {
         InitBSqlPluginHookIfNeeded();
     }
 #endif

src/gausskernel/process/threadpool/threadpool_worker.cpp

@@ -848,7 +848,7 @@ static bool InitSession(knl_session_context* session)
     t_thrd.proc_cxt.PostInit->InitSession();
 
 #ifndef ENABLE_MULTIPLE_NODES
-    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && u_sess->attr.attr_sql.b_sql_plugin) {
+    if (u_sess->proc_cxt.MyDatabaseId != InvalidOid && DB_IS_CMPT(B_FORMAT) && u_sess->attr.attr_sql.dolphin) {
         InitBSqlPluginHookIfNeeded();
     }
 #endif

src/include/knl/knl_guc/knl_session_attr_sql.h

@@ -238,7 +238,7 @@ typedef struct knl_session_attr_sql {
 #ifndef ENABLE_MULTIPLE_NODES
     bool enable_custom_parser;
 #endif
-    bool b_sql_plugin;
+    bool dolphin;
 } knl_session_attr_sql;
 
 #endif /* SRC_INCLUDE_KNL_KNL_SESSION_ATTR_SQL */