final_load.cc first version

debug/loadstep.cc → debug/final_load.cc

@@ -191,9 +191,20 @@ void local_wrapper(const Item &i, const FieldMeta &fm, Analysis &a,
     //为什么这里不是push item??
 //    append_list->push_back(&(const_cast<Item&>(i)));
     //do not use the plain strategy 
-
     std::vector<Item *> l;
-    my_typical_rewrite_insert_type(i,fm,a,&l);
+    const uint64_t salt = fm.getHasSalt() ? randomValue() : 0;
+    uint64_t IV = salt;
+    for (auto it : fm.orderedOnionMetas()) {
+        const onion o = it.first->getValue();
+        OnionMeta * const om = it.second;
+        l.push_back(my_encrypt_item_layers(i, o, *om, a, IV));
+    }
+    if (fm.getHasSalt()) {
+        l.push_back(new Item_int(static_cast<ulonglong>(salt)));
+    }
+
+
+
     for (auto it : l) {
         append_list->push_back(it);
     }

debug/loadtemp.cc

@@ -223,7 +223,6 @@ main(int argc, char* argv[]){
     /*load and decrypt*/
     ResType res =  load_files(db,table);
 
-
     /*transform*/
     rawMySQLReturnValue str;
     transform_to_rawMySQLReturnValue(str,res);

util/Makefrag

 OBJDIRS += util
-UTILSRC := onions.cc cryptdb_log.cc ctr.cc util.cc version.cc et.cc
+UTILSRC := onions.cc cryptdb_log.cc ctr.cc util.cc version.cc constants.cc
 
 all:    $(OBJDIR)/libedbutil.so $(OBJDIR)/libedbutil.a
 

util/et.cc → util/constants.cc

-#include "util/et.hh"
+#include "util/constants.hh"
 const char *cryptdb_dir = getenv("CRYPTDB_DIR");
 //assert(cryptdb_dir!=NULL);