Commit 55f4d7d8 authored by Casualet's avatar Casualet

mini

parent 3c469b60
...@@ -1032,7 +1032,7 @@ static bool cmp(rawReturnValue &resraw){ ...@@ -1032,7 +1032,7 @@ static bool cmp(rawReturnValue &resraw){
} }
return true; return true;
} }
/*
void static cmp2(rawReturnValue & res1,rawReturnValue & res2){ void static cmp2(rawReturnValue & res1,rawReturnValue & res2){
if(res1.fieldNames == res2.fieldNames){ if(res1.fieldNames == res2.fieldNames){
cout<<"field name pass"<<endl; cout<<"field name pass"<<endl;
...@@ -1058,7 +1058,7 @@ void static cmp2(rawReturnValue & res1,rawReturnValue & res2){ ...@@ -1058,7 +1058,7 @@ void static cmp2(rawReturnValue & res1,rawReturnValue & res2){
cout<<"choosen onions not pass"<<endl; cout<<"choosen onions not pass"<<endl;
} }
} }
*/
int int
...@@ -1290,12 +1290,7 @@ main(int argc, char* argv[]) { ...@@ -1290,12 +1290,7 @@ main(int argc, char* argv[]) {
} }
std::shared_ptr<ReturnMeta> rm = getReturnMeta(fms,res); std::shared_ptr<ReturnMeta> rm = getReturnMeta(fms,res);
std::string backq = getTestQuery(*schema,res,db,table); std::string backq = getTestQuery(*schema,res,db,table);
rawReturnValue remote_res = executeAndGetResultRemote(globalConn,backq); executeAndGetResultRemote(globalConn,backq);
for(auto &item:res){
remote_res.choosen_onions.push_back(item.choosenOnions[0]);
}
rawReturnValue resraw2; rawReturnValue resraw2;
vector<vector<string>> res_field = load_table_fields(res_meta); vector<vector<string>> res_field = load_table_fields(res_meta);
resraw2.rowValues = res_field; resraw2.rowValues = res_field;
...@@ -1304,7 +1299,6 @@ main(int argc, char* argv[]) { ...@@ -1304,7 +1299,6 @@ main(int argc, char* argv[]) {
for(unsigned int i=0;i<res_meta.field_types.size();++i){ for(unsigned int i=0;i<res_meta.field_types.size();++i){
resraw2.fieldTypes.push_back(static_cast<enum_field_types>(std::stoi(res_meta.field_types[i]))); resraw2.fieldTypes.push_back(static_cast<enum_field_types>(std::stoi(res_meta.field_types[i])));
} }
cmp2(remote_res,resraw2);
ResType rawtorestype = MygetResTypeFromLuaTable(false, &resraw2); ResType rawtorestype = MygetResTypeFromLuaTable(false, &resraw2);
auto finalresults = decryptResults(rawtorestype,*rm); auto finalresults = decryptResults(rawtorestype,*rm);
parseResType(finalresults); parseResType(finalresults);
......
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