Skip to content

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

finally able to use conf to configure the onionlayout

parent 14aa33e4
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 12 deletions
conf/CURRENT.conf
View file @ c7ca6705
...@@ -3,15 +3,16 @@ ...@@ -3,15 +3,16 @@
#oAGG: HOM #oAGG: HOM
#oASHE: ASHE #oASHE: ASHE
[onions for num] [onions for num]
oDET: DETJOIN DET RND #oDET: DETJOIN DET RND
oOPE: OPEFOREIGN OPE RND #oOPE: OPEFOREIGN OPE RND
oAGG: HOM #oAGG: HOM
oASHE: ASHE
[end] [end]
#oSWP: SEARCH #oSWP: SEARCH
#oDET: DETJOIN DET RND #oDET: DETJOIN DET RND
#oOPE: OPEFOREIGN OPE RND #oOPE: OPEFOREIGN OPE RND
[onions for str] [onions for str]
oDET: DETJOIN DET RND #oDET: DETJOIN DET RND
oOPE: OPEFOREIGN OPE RND #oOPE: OPEFOREIGN OPE RND
#oSWP: SEARCH oSWP: SEARCH
main/rewrite_main.cc
View file @ c7ca6705
...@@ -742,12 +742,12 @@ buildTypeTextTranslator(){ ...@@ -742,12 +742,12 @@ buildTypeTextTranslator(){
const std::vector<std::string> onion_layout_strings{ const std::vector<std::string> onion_layout_strings{
"PLAIN_ONION_LAYOUT", "NUM_ONION_LAYOUT", "PLAIN_ONION_LAYOUT", "NUM_ONION_LAYOUT",
"BEST_EFFORT_NUM_ONION_LAYOUT", "STR_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{ const std::vector<onionlayout> onion_layouts{
PLAIN_ONION_LAYOUT, NUM_ONION_LAYOUT, PLAIN_ONION_LAYOUT, NUM_ONION_LAYOUT,
BEST_EFFORT_NUM_ONION_LAYOUT, STR_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() == RETURN_FALSE_IF_FALSE(onion_layout_strings.size() ==
onion_layouts.size()); onion_layouts.size());
......
main/schema.cc
View file @ c7ca6705
...@@ -431,17 +431,17 @@ onionlayout FieldMeta::determineOnionLayout(const AES_KEY *const m_key, ...@@ -431,17 +431,17 @@ onionlayout FieldMeta::determineOnionLayout(const AES_KEY *const m_key,
/*we only support sensitive rating here*/ /*we only support sensitive rating here*/
if (SECURITY_RATING::SENSITIVE == sec_rating) { if (SECURITY_RATING::SENSITIVE == sec_rating) {
if (true == isMySQLTypeNumeric(f)) { if (true == isMySQLTypeNumeric(f)) {
//return CURRENT_NUM_LAYOUT; return CURRENT_NUM_LAYOUT;
//is_onionlayout_equal(CURRENT_NUM_LAYOUT,NUM_ONION_LAYOUT); //is_onionlayout_equal(CURRENT_NUM_LAYOUT,NUM_ONION_LAYOUT);
//is_onionlayout_equal(NUM_ONION_LAYOUT, CURRENT_NUM_LAYOUT); //is_onionlayout_equal(NUM_ONION_LAYOUT, CURRENT_NUM_LAYOUT);
// return CURRENT_NUM_LAYOUT; // return CURRENT_NUM_LAYOUT;
return NUM_ONION_LAYOUT; // return NUM_ONION_LAYOUT;
} else { } else {
// return CURRENT_STR_LAYOUT; return CURRENT_STR_LAYOUT;
//is_onionlayout_equal(CURRENT_STR_LAYOUT,STR_ONION_LAYOUT); //is_onionlayout_equal(CURRENT_STR_LAYOUT,STR_ONION_LAYOUT);
//is_onionlayout_equal(STR_ONION_LAYOUT,CURRENT_STR_LAYOUT); //is_onionlayout_equal(STR_ONION_LAYOUT,CURRENT_STR_LAYOUT);
// return CURRENT_STR_LAYOUT; // return CURRENT_STR_LAYOUT;
return STR_ONION_LAYOUT; // return STR_ONION_LAYOUT;
} }
} else if (SECURITY_RATING::BEST_EFFORT == sec_rating) { } else if (SECURITY_RATING::BEST_EFFORT == sec_rating) {
if (true == isMySQLTypeNumeric(f)) { if (true == isMySQLTypeNumeric(f)) {
......
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