From 09276ff8858d7ffbddfdd2e6c9a35db61408c0ca Mon Sep 17 00:00:00 2001 From: David Hall Date: Thu, 1 Sep 2016 12:43:00 -0500 Subject: [PATCH] Comment debug lines. Change a debug line to be more useful. --- dbcon/mysql/ha_calpont_ddl.cpp | 9 ++++----- dbcon/mysql/ha_calpont_execplan.cpp | 6 +++--- oam/oamcpp/oamcache.cpp | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/dbcon/mysql/ha_calpont_ddl.cpp b/dbcon/mysql/ha_calpont_ddl.cpp index b73450ff3..19c6f20db 100755 --- a/dbcon/mysql/ha_calpont_ddl.cpp +++ b/dbcon/mysql/ha_calpont_ddl.cpp @@ -614,15 +614,14 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl { SqlParser parser; THD *thd = current_thd; -//#ifdef INFINIDB_DEBUG +#ifdef INFINIDB_DEBUG cout << "ProcessDDLStatement: " << schema << "." << table << ":" << ddlStatement << endl; -//#endif +#endif parser.setDefaultSchema(schema); int rc = 0; IDBCompressInterface idbCompress; parser.Parse(ddlStatement.c_str()); - cout << "ProcessDDLStatement: finished parse " << schema << "." << table << endl; if (!thd->infinidb_vtable.cal_conn_info) thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info()); cal_connection_info* ci = reinterpret_cast(thd->infinidb_vtable.cal_conn_info); @@ -2079,7 +2078,7 @@ int ha_calpont_impl_delete_table_(const char *db, const char *name, cal_connecti } std::string stmt(query); algorithm::to_upper(stmt); - cout << "ha_calpont_impl_delete_table: " << schema.c_str() << "." << tbl.c_str() << " " << stmt.c_str() << endl; +// cout << "ha_calpont_impl_delete_table: " << schema.c_str() << "." << tbl.c_str() << " " << stmt.c_str() << endl; // @bug 4158 allow table name with 'restrict' in it (but not by itself) std::string::size_type fpos; fpos = stmt.rfind(" RESTRICT"); @@ -2105,7 +2104,7 @@ int ha_calpont_impl_delete_table_(const char *db, const char *name, cal_connecti stmt = thd->query(); stmt += ";"; int rc = ProcessDDLStatement(stmt, schema, tbl, tid2sid(thd->thread_id), emsg); - cout << "ProcessDDLStatement rc=" << rc << endl; +// cout << "ProcessDDLStatement rc=" << rc << endl; if (rc != 0) { push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, emsg.c_str()); diff --git a/dbcon/mysql/ha_calpont_execplan.cpp b/dbcon/mysql/ha_calpont_execplan.cpp index 15ba39c94..af45d853c 100755 --- a/dbcon/mysql/ha_calpont_execplan.cpp +++ b/dbcon/mysql/ha_calpont_execplan.cpp @@ -4579,11 +4579,11 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i // @todo process from subquery if (table_ptr->derived) { - cout << "DERIVED TABLE DEBUG" << endl; + // cout << "DERIVED TABLE DEBUG" << endl; String str; (table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED); - cout << str.ptr() << endl; - cout << "DERIVED TABLE DEBUG END" << endl; + // cout << str.ptr() << endl; + // cout << "DERIVED TABLE DEBUG END" << endl; SELECT_LEX *select_cursor = table_ptr->derived->first_select(); FromSubQuery fromSub(gwi, select_cursor); diff --git a/oam/oamcpp/oamcache.cpp b/oam/oamcpp/oamcache.cpp index 7f60338b0..4a2174ded 100644 --- a/oam/oamcpp/oamcache.cpp +++ b/oam/oamcpp/oamcache.cpp @@ -133,7 +133,7 @@ void OamCache::checkReload() if (state != oam::ACTIVE) { ostringstream os; - os << "OamCache::checkReload shows state for pm" << num << " as " << state; + os << "OamCache::checkReload shows state for pm" << num << " as " << oamState[state]; oam.writeLog(os.str(), logging::LOG_TYPE_WARNING); } }