Fix duplicate table creation in global db (#498)

chuan · web-flow · commit f0ebc8561e66 · 2021-01-21T14:00:53.000-08:00
diff --git a/production/catalog/src/ddl_executor.cpp b/production/catalog/src/ddl_executor.cpp
@@ -8,6 +8,7 @@
 #include <memory>
 
 #include "gaia/common.hpp"
+#include "gaia/db/catalog.hpp"
 #include "gaia/exception.hpp"
 #include "db_helpers.hpp"
 #include "fbs_generator.hpp"
@@ -693,7 +694,7 @@ inline gaia_id_t ddl_executor_t::find_db_id_no_lock(const string& dbname) const
 
 string ddl_executor_t::get_full_table_name(const string& db, const string& table)
 {
-    if (db.empty())
+    if (db.empty() || db == c_empty_db_name)
     {
         return table;
     }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include <memory>`
`9`	`9`
`10`	`10`	`#include "gaia/common.hpp"`
	`11`	`+#include "gaia/db/catalog.hpp"`
`11`	`12`	`#include "gaia/exception.hpp"`
`12`	`13`	`#include "db_helpers.hpp"`
`13`	`14`	`#include "fbs_generator.hpp"`
`@@ -693,7 +694,7 @@ inline gaia_id_t ddl_executor_t::find_db_id_no_lock(const string& dbname) const`
`693`	`694`
`694`	`695`	`string ddl_executor_t::get_full_table_name(const string& db, const string& table)`
`695`	`696`	`{`
`696`		`- if (db.empty())`
	`697`	`+ if (db.empty() \|\| db == c_empty_db_name)`
`697`	`698`	`{`
`698`	`699`	`return table;`
`699`	`700`	`}`