finally able to use conf to configure the onionlayout

conf/CURRENT.conf

@@ -3,15 +3,16 @@
 #oAGG: HOM
 #oASHE: ASHE
 [onions for num]
-oDET: DETJOIN DET RND
-oOPE: OPEFOREIGN OPE RND
-oAGG: HOM
+#oDET: DETJOIN DET RND
+#oOPE: OPEFOREIGN OPE RND
+#oAGG: HOM
+oASHE: ASHE
 [end]
 
 #oSWP: SEARCH
 #oDET: DETJOIN DET RND
 #oOPE: OPEFOREIGN OPE RND
 [onions for str]
-oDET: DETJOIN DET RND
-oOPE: OPEFOREIGN OPE RND
-#oSWP: SEARCH
+#oDET: DETJOIN DET RND
+#oOPE: OPEFOREIGN OPE RND
+oSWP: SEARCH

main/rewrite_main.cc

@@ -742,12 +742,12 @@ buildTypeTextTranslator(){
     const std::vector<std::string> onion_layout_strings{
         "PLAIN_ONION_LAYOUT", "NUM_ONION_LAYOUT",
         "BEST_EFFORT_NUM_ONION_LAYOUT", "STR_ONION_LAYOUT",
-        "BEST_EFFORT_STR_ONION_LAYOUT"        
+        "BEST_EFFORT_STR_ONION_LAYOUT","CURRENT_NUM_LAYOUT","CURRENT_STR_LAYOUT"
     };
     const std::vector<onionlayout> onion_layouts{
         PLAIN_ONION_LAYOUT, NUM_ONION_LAYOUT,
         BEST_EFFORT_NUM_ONION_LAYOUT, STR_ONION_LAYOUT,
-        BEST_EFFORT_STR_ONION_LAYOUT
+        BEST_EFFORT_STR_ONION_LAYOUT,CURRENT_NUM_LAYOUT,CURRENT_STR_LAYOUT
     };
     RETURN_FALSE_IF_FALSE(onion_layout_strings.size() ==
                             onion_layouts.size());

main/schema.cc

@@ -431,17 +431,17 @@ onionlayout FieldMeta::determineOnionLayout(const AES_KEY *const m_key,
     /*we only support sensitive rating here*/
     if (SECURITY_RATING::SENSITIVE == sec_rating) {
         if (true == isMySQLTypeNumeric(f)) {
-              //return CURRENT_NUM_LAYOUT;
+            return CURRENT_NUM_LAYOUT;
             //is_onionlayout_equal(CURRENT_NUM_LAYOUT,NUM_ONION_LAYOUT);
             //is_onionlayout_equal(NUM_ONION_LAYOUT, CURRENT_NUM_LAYOUT);
 //            return CURRENT_NUM_LAYOUT;
-            return NUM_ONION_LAYOUT;
+//            return NUM_ONION_LAYOUT;
         } else {
-//              return CURRENT_STR_LAYOUT;
+              return CURRENT_STR_LAYOUT;
             //is_onionlayout_equal(CURRENT_STR_LAYOUT,STR_ONION_LAYOUT);
             //is_onionlayout_equal(STR_ONION_LAYOUT,CURRENT_STR_LAYOUT);
 //            return CURRENT_STR_LAYOUT;
-            return STR_ONION_LAYOUT;
+//            return STR_ONION_LAYOUT;
         }
     } else if (SECURITY_RATING::BEST_EFFORT == sec_rating) {
         if (true == isMySQLTypeNumeric(f)) {