database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-08-01 06:46:55 +03:00
Code Activity

Comment debug lines. Change a debug line to be more useful.

Browse Source
This commit is contained in:
David Hall
2016-09-01 12:43:00 -05:00
parent 6714290b6d
commit 09276ff885
3 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
dbcon/mysql/ha_calpont_ddl.cpp
View File

@ -614,15 +614,14 @@ int ProcessDDLStatement(string& ddlStatement, string& schema, const string& tabl
{ {
SqlParser parser; SqlParser parser;
THD *thd = current_thd; THD *thd = current_thd;
//#ifdef INFINIDB_DEBUG #ifdef INFINIDB_DEBUG
cout << "ProcessDDLStatement: " << schema << "." << table << ":" << ddlStatement << endl; cout << "ProcessDDLStatement: " << schema << "." << table << ":" << ddlStatement << endl;
//#endif #endif
parser.setDefaultSchema(schema); parser.setDefaultSchema(schema);
int rc = 0; int rc = 0;
IDBCompressInterface idbCompress; IDBCompressInterface idbCompress;
parser.Parse(ddlStatement.c_str()); parser.Parse(ddlStatement.c_str());
cout << "ProcessDDLStatement: finished parse " << schema << "." << table << endl;
if (!thd->infinidb_vtable.cal_conn_info) if (!thd->infinidb_vtable.cal_conn_info)
thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info()); thd->infinidb_vtable.cal_conn_info = (void*)(new cal_connection_info());
cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(thd->infinidb_vtable.cal_conn_info); cal_connection_info* ci = reinterpret_cast<cal_connection_info*>(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); std::string stmt(query);
algorithm::to_upper(stmt); 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) // @bug 4158 allow table name with 'restrict' in it (but not by itself)
std::string::size_type fpos; std::string::size_type fpos;
fpos = stmt.rfind(" RESTRICT"); 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 = thd->query();
stmt += ";"; stmt += ";";
int rc = ProcessDDLStatement(stmt, schema, tbl, tid2sid(thd->thread_id), emsg); int rc = ProcessDDLStatement(stmt, schema, tbl, tid2sid(thd->thread_id), emsg);
cout << "ProcessDDLStatement rc=" << rc << endl; // cout << "ProcessDDLStatement rc=" << rc << endl;
if (rc != 0) if (rc != 0)
{ {
push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, emsg.c_str()); push_warning(thd, Sql_condition::WARN_LEVEL_WARN, 9999, emsg.c_str());

6
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -4579,11 +4579,11 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
// @todo process from subquery // @todo process from subquery
if (table_ptr->derived) if (table_ptr->derived)
{ {
cout << "DERIVED TABLE DEBUG" << endl; // cout << "DERIVED TABLE DEBUG" << endl;
String str; String str;
(table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED); (table_ptr->derived->first_select())->print(gwi.thd, &str, QT_INFINIDB_DERIVED);
cout << str.ptr() << endl; // cout << str.ptr() << endl;
cout << "DERIVED TABLE DEBUG END" << endl; // cout << "DERIVED TABLE DEBUG END" << endl;
SELECT_LEX *select_cursor = table_ptr->derived->first_select(); SELECT_LEX *select_cursor = table_ptr->derived->first_select();
FromSubQuery fromSub(gwi, select_cursor); FromSubQuery fromSub(gwi, select_cursor);

2
oam/oamcpp/oamcache.cpp
View File

@ -133,7 +133,7 @@ void OamCache::checkReload()
if (state != oam::ACTIVE) if (state != oam::ACTIVE)
{ {
ostringstream os; 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); oam.writeLog(os.str(), logging::LOG_TYPE_WARNING);
} }
} }