Skip to content

P
Practical-Cryptdb
Commit 21104153 authored by yiwenshao's avatar yiwenshao
Browse files
Options

remove more

parent ee6f5ee6
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 8 deletions
debug/try_select_data.cc
View file @ 21104153
...@@ -40,13 +40,12 @@ void parseResType(const ResType &rd) { ...@@ -40,13 +40,12 @@ void parseResType(const ResType &rd) {
} }
} }
static void sp_next_second(std::string db, std::string query,const help_select & hs,ResType inRes){ static void sp_next_second(const help_select & hs,ResType inRes){
ps->safeCreateEmbeddedTHD(); ps->safeCreateEmbeddedTHD();
const ResType &resin = inRes; const ResType &resin = inRes;
try{ try{
//AbstractQueryExecutor::ResultType::RESULTS //AbstractQueryExecutor::ResultType::RESULTS
NextParams nparams(*ps,db,query); ps->getSchemaCache().updateStaleness(ps->getEConn(),false);
nparams.ps.getSchemaCache().updateStaleness(nparams.ps.getEConn(),false);
const auto &res = decryptResults(resin,hs.rmeta); const auto &res = decryptResults(resin,hs.rmeta);
parseResType(res); parseResType(res);
}catch(...){ }catch(...){
...@@ -54,16 +53,15 @@ static void sp_next_second(std::string db, std::string query,const help_select & ...@@ -54,16 +53,15 @@ static void sp_next_second(std::string db, std::string query,const help_select &
} }
} }
static void sp_next_first(std::string db, std::string query,const help_select &hs){ static void sp_next_first(const help_select &hs){
ps->safeCreateEmbeddedTHD(); ps->safeCreateEmbeddedTHD();
try{ try{
//AbstractQueryExecutor::ResultType::QUERY_COME_AGAIN //AbstractQueryExecutor::ResultType::QUERY_COME_AGAIN
NextParams nparams(*ps,db,query); ps->getSchemaCache().updateStaleness(ps->getEConn(),false);
nparams.ps.getSchemaCache().updateStaleness(nparams.ps.getEConn(),false);
const std::string next_query = hs.query; const std::string next_query = hs.query;
rawMySQLReturnValue resRemote = executeAndGetResultRemote(globalConn,next_query); rawMySQLReturnValue resRemote = executeAndGetResultRemote(globalConn,next_query);
const auto &againGet = MygetResTypeFromLuaTable(false,&resRemote); const auto &againGet = MygetResTypeFromLuaTable(false,&resRemote);
sp_next_second(db,query,hs,againGet); sp_next_second(hs,againGet);
}catch(...){ }catch(...){
std::cout<<"first next error"<<std::endl; std::cout<<"first next error"<<std::endl;
} }
...@@ -275,7 +273,7 @@ static void testCreateTableHandler(std::string query,std::string db="tdb"){ ...@@ -275,7 +273,7 @@ static void testCreateTableHandler(std::string query,std::string db="tdb"){
my_gather_select(analysis,lex); my_gather_select(analysis,lex);
help_select hs = my_rewrite_select(analysis,lex); help_select hs = my_rewrite_select(analysis,lex);
//QueryRewrite *qr = new QueryRewrite(QueryRewrite(true, analysis.rmeta, analysis.kill_zone, executor)); //QueryRewrite *qr = new QueryRewrite(QueryRewrite(true, analysis.rmeta, analysis.kill_zone, executor));
sp_next_first(db,query,hs); sp_next_first(hs);
} }
int int
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment