database/mariadb-columnstore-engine
1
0
Fork 0
mirror of https://github.com/mariadb-corporation/mariadb-columnstore-engine.git synced 2025-07-30 19:23:07 +03:00
Code Activity

MCOL-343 Change references to String::ptr() into String::c_ptr()

Browse Source
This commit is contained in:
David Hall
2016-10-03 15:54:55 -05:00
parent a966fa3382
commit d50721d65a
2 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dbcon/joblist/joblist.vpj
View File

@ -202,6 +202,7 @@
<F N="batchprimitiveprocessor-jl.cpp"/> <F N="batchprimitiveprocessor-jl.cpp"/>
<F N="columncommand-jl.cpp"/> <F N="columncommand-jl.cpp"/>
<F N="command-jl.cpp"/> <F N="command-jl.cpp"/>
<F N="crossenginestep.cpp"/>
<F N="dictstep-jl.cpp"/> <F N="dictstep-jl.cpp"/>
<F N="diskjoinstep.cpp"/> <F N="diskjoinstep.cpp"/>
<F N="distributedenginecomm.cpp"/> <F N="distributedenginecomm.cpp"/>
@ -257,6 +258,7 @@
<F N="columncommand-jl.h"/> <F N="columncommand-jl.h"/>
<F N="command-jl.h"/> <F N="command-jl.h"/>
<F N="constantdatalist.h"/> <F N="constantdatalist.h"/>
<F N="crossenginestep.h"/>
<F N="datalist.h"/> <F N="datalist.h"/>
<F N="datalistimpl.h"/> <F N="datalistimpl.h"/>
<F N="dictstep-jl.h"/> <F N="dictstep-jl.h"/>

24
dbcon/mysql/ha_calpont_execplan.cpp
View File

@ -21,7 +21,7 @@
*/ */
/** @file */ /** @file */
//#define DEBUG_WALK_COND
#include <my_config.h> #include <my_config.h>
#include <string> #include <string>
#include <iostream> #include <iostream>
@ -222,7 +222,7 @@ void debug_walk(const Item *item, void *arg)
{ {
Item_string* isp = (Item_string*)item; Item_string* isp = (Item_string*)item;
String val, *str = isp->val_str(&val); String val, *str = isp->val_str(&val);
cout << "STRING_ITEM: >" << str->ptr() << '<' << endl; cout << "STRING_ITEM: >" << str->c_ptr() << '<' << endl;
break; break;
} }
case Item::REAL_ITEM: case Item::REAL_ITEM:
@ -550,7 +550,7 @@ void debug_walk(const Item *item, void *arg)
break; break;
} }
if (str) if (str)
cout << ": (" << str->ptr() << ')' << endl; cout << ": (" << str->c_ptr() << ')' << endl;
else else
cout << ": <NULL>" << endl; cout << ": <NULL>" << endl;
break; break;
@ -1018,9 +1018,9 @@ bool buildPredicateItem(Item_func* ifp, gp_walk_info* gwip)
// @bug5811. This filter string is for cross engine to use. // @bug5811. This filter string is for cross engine to use.
// Use real table name. // Use real table name.
ifp->print(&str, QT_INFINIDB_DERIVED); ifp->print(&str, QT_INFINIDB_DERIVED);
//IDEBUG(cout << str.ptr() << endl); //IDEBUG(cout << str.c_ptr() << endl);
if (str.ptr()) if (str.ptr())
cf->data(str.ptr()); cf->data(str.c_ptr());
ParseTree* ptp = new ParseTree(cf); ParseTree* ptp = new ParseTree(cf);
gwip->ptWorkStack.push(ptp); gwip->ptWorkStack.push(ptp);
return true; return true;
@ -1099,7 +1099,7 @@ bool buildPredicateItem(Item_func* ifp, gp_walk_info* gwip)
ifp->print(&str, QT_INFINIDB_DERIVED); ifp->print(&str, QT_INFINIDB_DERIVED);
IDEBUG(cout << str.ptr() << endl); IDEBUG(cout << str.ptr() << endl);
if (str.ptr()) if (str.ptr())
cf->data(str.ptr()); cf->data(str.c_ptr());
ParseTree* ptp = new ParseTree(cf); ParseTree* ptp = new ParseTree(cf);
gwip->ptWorkStack.push(ptp); gwip->ptWorkStack.push(ptp);
} }
@ -3797,9 +3797,7 @@ void gp_walk(const Item *item, void *arg)
string cval; string cval;
if (str->ptr()) if (str->ptr())
{ {
cval = str->ptr(); cval = str->c_ptr();
// MariaDB doesn't always put a null terminator. Trim to proper length.
cval = cval.substr(0, str->length());
} }
size_t spos = cval.find_last_not_of(" "); size_t spos = cval.find_last_not_of(" ");
if (spos != string::npos) if (spos != string::npos)
@ -4582,7 +4580,7 @@ int getSelectPlan(gp_walk_info& gwi, SELECT_LEX& select_lex, SCSEP& csep, bool i
// 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.c_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();
@ -6622,7 +6620,7 @@ int cp_get_table_plan(THD* thd, SCSEP& csep, cal_table_info& ti)
if (bitmap_is_set(read_set, field->field_index)) if (bitmap_is_set(read_set, field->field_index))
{ {
SimpleColumn* sc = new SimpleColumn(table->s->db.str, table->s->table_name.str, field->field_name, sessionID); SimpleColumn* sc = new SimpleColumn(table->s->db.str, table->s->table_name.str, field->field_name, sessionID);
string alias(table->alias.ptr()); string alias(table->alias.c_ptr());
sc->tableAlias(lower(alias)); sc->tableAlias(lower(alias));
assert (sc); assert (sc);
boost::shared_ptr<SimpleColumn> spsc(sc); boost::shared_ptr<SimpleColumn> spsc(sc);
@ -6634,7 +6632,7 @@ int cp_get_table_plan(THD* thd, SCSEP& csep, cal_table_info& ti)
if (gwi->columnMap.empty()) if (gwi->columnMap.empty())
{ {
CalpontSystemCatalog::TableName tn = make_table(table->s->db.str, table->s->table_name.str); CalpontSystemCatalog::TableName tn = make_table(table->s->db.str, table->s->table_name.str);
CalpontSystemCatalog::TableAliasName tan = make_aliastable(table->s->db.str, table->s->table_name.str, table->alias.ptr()); CalpontSystemCatalog::TableAliasName tan = make_aliastable(table->s->db.str, table->s->table_name.str, table->alias.c_ptr());
SimpleColumn *sc = getSmallestColumn(csc, tn, tan, table, *gwi); SimpleColumn *sc = getSmallestColumn(csc, tn, tan, table, *gwi);
SRCP srcp(sc); SRCP srcp(sc);
gwi->columnMap.insert(CalpontSelectExecutionPlan::ColumnMap::value_type(sc->columnName(), srcp)); gwi->columnMap.insert(CalpontSelectExecutionPlan::ColumnMap::value_type(sc->columnName(), srcp));
@ -6676,7 +6674,7 @@ int cp_get_table_plan(THD* thd, SCSEP& csep, cal_table_info& ti)
csep->returnedCols(gwi->returnedCols); csep->returnedCols(gwi->returnedCols);
csep->columnMap(gwi->columnMap); csep->columnMap(gwi->columnMap);
CalpontSelectExecutionPlan::TableList tblist; CalpontSelectExecutionPlan::TableList tblist;
tblist.push_back(make_aliastable(table->s->db.str, table->s->table_name.str, table->alias.ptr())); tblist.push_back(make_aliastable(table->s->db.str, table->s->table_name.str, table->alias.c_ptr()));
csep->tableList(tblist); csep->tableList(tblist);
// @bug 3321. Set max number of blocks in a dictionary file to be scanned for filtering // @bug 3321. Set max number of blocks in a dictionary file to be scanned for filtering