stable version befor we want to add layers for ASHE

debug/test_insertHandler.cc

@@ -51,7 +51,7 @@ main() {
     ConnectionInfo ci("localhost", "root", "letmein",3306);
     SharedProxyState *shared_ps = new SharedProxyState(ci, embeddedDir , master_key, determineSecurityRating());
     assert(shared_ps!=NULL);
-    std::string query1 = "insert into student values(1,\"zhangfei ZHAO DADKLAS  DFASLFKDJS\")";
+    std::string query1 = "insert into child values(1,\"zh Z D D\")";
     std::vector<std::string> querys{query1};
     for(auto item:querys){
         std::cout<<item<<std::endl;

util/onions.cc

@@ -8,13 +8,7 @@ onionlayout PLAIN_ONION_LAYOUT = {
     {oPLAIN, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL})}
 };
 
-
-/*******************************************************************************************
-***************************** Onion layout for numeric data ********************************
-********************************************************************************************
-*/
-
-//static 
+/***************************ofthen used*******************************************************/
 onionlayout NUM_ONION_LAYOUT = {
     {oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
                                   SECLEVEL::RND})},
@@ -22,6 +16,22 @@ onionlayout NUM_ONION_LAYOUT = {
     {oAGG, std::vector<SECLEVEL>({SECLEVEL::HOM})}
 };
 
+onionlayout STR_ONION_LAYOUT = {
+    {oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
+                                  SECLEVEL::RND})},
+    {oOPE, std::vector<SECLEVEL>({SECLEVEL::OPEFOREIGN, SECLEVEL::OPE, SECLEVEL::RND})},
+    {oSWP, std::vector<SECLEVEL>({SECLEVEL::SEARCH})}
+    // {oSWP, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL, SECLEVEL::DET,
+                                  // SECLEVEL::RND})}
+};
+
+/*******************************************************************************************
+***************************** Onion layout for numeric data ********************************
+********************************************************************************************
+*/
+
+
+
 //static 
 onionlayout NUM_ONION_LAYOUT_NOFOREIGN = {
     {oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
@@ -83,15 +93,6 @@ onionlayout NUM_ONION_LAYOUT_TEST{
 *********************************************************************************************
 */
 
-//static 
-onionlayout STR_ONION_LAYOUT = {
-    {oDET, std::vector<SECLEVEL>({SECLEVEL::DETJOIN, SECLEVEL::DET,
-                                  SECLEVEL::RND})},
-    {oOPE, std::vector<SECLEVEL>({SECLEVEL::OPEFOREIGN, SECLEVEL::OPE, SECLEVEL::RND})},
-    {oSWP, std::vector<SECLEVEL>({SECLEVEL::SEARCH})}
-    // {oSWP, std::vector<SECLEVEL>({SECLEVEL::PLAINVAL, SECLEVEL::DET,
-                                  // SECLEVEL::RND})}
-};
 
 //static 
 onionlayout STR_ONION_LAYOUT_WITHSEARCH{