add doxygen

.gitignore

@@ -33,3 +33,5 @@ packages/tls/mysqlWrapper/main
 *.conf
 input/sql
 token.cc
+html
+latex

conf/CURRENT.conf

@@ -5,8 +5,8 @@
 [onions for num]
 oDET: DET
 oOPE: OPE
-#oAGG: HOM
-oASHE: ASHE
+oAGG: HOM
+#oASHE: ASHE
 
 [end]
 

main/ddl_handler.cc

@@ -16,8 +16,7 @@
 
 //################################################################Create table handler#########################################################################################
 AbstractQueryExecutor *
-        CreateTableHandler::rewriteAndUpdate(Analysis &a, LEX *lex, const Preamble &pre) const
-    {
+        CreateTableHandler::rewriteAndUpdate(Analysis &a, LEX *lex, const Preamble &pre) const {
         assert(a.deltas.size() == 0);
 
         TEST_DatabaseDiscrepancy(pre.dbname, a.getDatabaseName());

main/rewrite_main.cc

@@ -1334,7 +1334,6 @@ Rewriter::dispatchOnLex(Analysis &a, const std::string &query)
             return new OnionAdjustmentExecutor(std::move(deltas),
                                                adjust_queries);
         }
-        //为什么两种情况返回的executor是不一样的?一个用了get一个没有用?  
         return executor.get();
     } else if (ddl_dispatcher->canDo(lex)) {
         const SQLHandler &handler = ddl_dispatcher->dispatch(lex);
@@ -1364,7 +1363,6 @@ Rewriter::dispatchOnLex(Analysis &a, const std::string &query)
 QueryRewrite
 Rewriter::rewrite(const std::string &q, const SchemaInfo &schema,
                   const std::string &default_db, const ProxyState &ps){
-    //LOG(cdb_v) << "q " << q;
     assert(0 == mysql_thread_init());
     Analysis analysis(default_db, schema, ps.getMasterKey(),
                       ps.defaultSecurityRating());

mysqlproxy/ConnectWrapper.cc

@@ -187,36 +187,35 @@ rewrite(lua_State *const L) {
         strtoull(xlua_tolstring(L, 3).c_str(), NULL, 10);
 
     c_wrapper->last_query = query;
-    if (EXECUTE_QUERIES) {
-        try {
-            TEST_Text(retrieveDefaultDatabase(_thread_id, ps->getConn(),
-                                              &c_wrapper->default_db),
-                      "proxy failed to retrieve default database!");
-            // save a reference so a second thread won't eat objects
-            // that DeltaOuput wants later(a shared_ptr for the schemaInfo)
-            const std::shared_ptr<const SchemaInfo> &schema =
-                ps->getSchemaInfo();
-            c_wrapper->schema_info_refs.push_back(schema);
-
-            //parse, rewrite, delta, adjust, returnMeta, 
-            std::unique_ptr<QueryRewrite> qr =
-                std::unique_ptr<QueryRewrite>(new QueryRewrite(
-                    Rewriter::rewrite(query, 
-                                     *schema.get(),
-                                     c_wrapper->default_db, *ps)));
-
-            assert(qr);
-            c_wrapper->setQueryRewrite(std::move(qr));
-        } catch (const AbstractException &e) {
-            lua_pushboolean(L, false);              // status
-            xlua_pushlstring(L, e.to_string());     // error message
-            return 2;
-        } catch (const CryptDBError &e) {
-            lua_pushboolean(L, false);              // status
-            xlua_pushlstring(L, e.msg);             // error message
-            return 2;
-        }
+
+    try {
+        TEST_Text(retrieveDefaultDatabase(_thread_id, ps->getConn(),
+                                          &c_wrapper->default_db),
+                  "proxy failed to retrieve default database!");
+        // save a reference so a second thread won't eat objects
+        // that DeltaOuput wants later(a shared_ptr for the schemaInfo)
+        const std::shared_ptr<const SchemaInfo> &schema =
+            ps->getSchemaInfo();
+        c_wrapper->schema_info_refs.push_back(schema);
+
+        //parse, rewrite, delta, adjust, returnMeta, 
+        std::unique_ptr<QueryRewrite> qr =
+            std::unique_ptr<QueryRewrite>(new QueryRewrite(
+                Rewriter::rewrite(query, 
+                                 *schema.get(),
+                                 c_wrapper->default_db, *ps)));
+        assert(qr);
+        c_wrapper->setQueryRewrite(std::move(qr));
+    } catch (const AbstractException &e) {
+        lua_pushboolean(L, false);              // status
+        xlua_pushlstring(L, e.to_string());     // error message
+        return 2;
+    } catch (const CryptDBError &e) {
+        lua_pushboolean(L, false);              // status
+        xlua_pushlstring(L, e.msg);             // error message
+        return 2;
     }
+
     lua_pushboolean(L, true);                       // status
     lua_pushnil(L);                                 // error message
     return 2;