Commit 2bcb7b4f authored by yiwenshao's avatar yiwenshao

add doxygen

parent 90c255d8
...@@ -33,3 +33,5 @@ packages/tls/mysqlWrapper/main ...@@ -33,3 +33,5 @@ packages/tls/mysqlWrapper/main
*.conf *.conf
input/sql input/sql
token.cc token.cc
html
latex
This diff is collapsed.
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
[onions for num] [onions for num]
oDET: DET oDET: DET
oOPE: OPE oOPE: OPE
#oAGG: HOM oAGG: HOM
oASHE: ASHE #oASHE: ASHE
[end] [end]
......
...@@ -16,8 +16,7 @@ ...@@ -16,8 +16,7 @@
//################################################################Create table handler######################################################################################### //################################################################Create table handler#########################################################################################
AbstractQueryExecutor * 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); assert(a.deltas.size() == 0);
TEST_DatabaseDiscrepancy(pre.dbname, a.getDatabaseName()); TEST_DatabaseDiscrepancy(pre.dbname, a.getDatabaseName());
......
...@@ -1334,7 +1334,6 @@ Rewriter::dispatchOnLex(Analysis &a, const std::string &query) ...@@ -1334,7 +1334,6 @@ Rewriter::dispatchOnLex(Analysis &a, const std::string &query)
return new OnionAdjustmentExecutor(std::move(deltas), return new OnionAdjustmentExecutor(std::move(deltas),
adjust_queries); adjust_queries);
} }
//为什么两种情况返回的executor是不一样的?一个用了get一个没有用?
return executor.get(); return executor.get();
} else if (ddl_dispatcher->canDo(lex)) { } else if (ddl_dispatcher->canDo(lex)) {
const SQLHandler &handler = ddl_dispatcher->dispatch(lex); const SQLHandler &handler = ddl_dispatcher->dispatch(lex);
...@@ -1364,7 +1363,6 @@ Rewriter::dispatchOnLex(Analysis &a, const std::string &query) ...@@ -1364,7 +1363,6 @@ Rewriter::dispatchOnLex(Analysis &a, const std::string &query)
QueryRewrite QueryRewrite
Rewriter::rewrite(const std::string &q, const SchemaInfo &schema, Rewriter::rewrite(const std::string &q, const SchemaInfo &schema,
const std::string &default_db, const ProxyState &ps){ const std::string &default_db, const ProxyState &ps){
//LOG(cdb_v) << "q " << q;
assert(0 == mysql_thread_init()); assert(0 == mysql_thread_init());
Analysis analysis(default_db, schema, ps.getMasterKey(), Analysis analysis(default_db, schema, ps.getMasterKey(),
ps.defaultSecurityRating()); ps.defaultSecurityRating());
......
...@@ -187,7 +187,7 @@ rewrite(lua_State *const L) { ...@@ -187,7 +187,7 @@ rewrite(lua_State *const L) {
strtoull(xlua_tolstring(L, 3).c_str(), NULL, 10); strtoull(xlua_tolstring(L, 3).c_str(), NULL, 10);
c_wrapper->last_query = query; c_wrapper->last_query = query;
if (EXECUTE_QUERIES) {
try { try {
TEST_Text(retrieveDefaultDatabase(_thread_id, ps->getConn(), TEST_Text(retrieveDefaultDatabase(_thread_id, ps->getConn(),
&c_wrapper->default_db), &c_wrapper->default_db),
...@@ -204,7 +204,6 @@ rewrite(lua_State *const L) { ...@@ -204,7 +204,6 @@ rewrite(lua_State *const L) {
Rewriter::rewrite(query, Rewriter::rewrite(query,
*schema.get(), *schema.get(),
c_wrapper->default_db, *ps))); c_wrapper->default_db, *ps)));
assert(qr); assert(qr);
c_wrapper->setQueryRewrite(std::move(qr)); c_wrapper->setQueryRewrite(std::move(qr));
} catch (const AbstractException &e) { } catch (const AbstractException &e) {
...@@ -216,7 +215,7 @@ rewrite(lua_State *const L) { ...@@ -216,7 +215,7 @@ rewrite(lua_State *const L) {
xlua_pushlstring(L, e.msg); // error message xlua_pushlstring(L, e.msg); // error message
return 2; return 2;
} }
}
lua_pushboolean(L, true); // status lua_pushboolean(L, true); // status
lua_pushnil(L); // error message lua_pushnil(L); // error message
return 2; return 2;
......
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