mod main

zhang xiao bin · zhang xiao bin · commit d8a0b6f380ee · 2020-08-14T14:24:28.000+08:00
diff --git a/async_mysql/main.cpp b/async_mysql/main.cpp
@@ -10,40 +10,13 @@
 #include <cstdio>
 #include <chrono>
 #include <thread>
+#include <cassert>
 #include <mysql/mysql.h>
 #include "mysql_io_service.h"
 #include "mysql_db.h"
 #include "mysql_result.h"
 #include "mysql_result_row.h"
 
-
-void mysql_read_result(MYSQL* m) {
-	if (0 == mysql_read_query_result(m)) {
-		MYSQL_RES *res = mysql_store_result(m);
-		MYSQL_ROW row;
-		int fields = mysql_num_fields(res);
-		while ((row = mysql_fetch_row(res)))
-		{
-			for (int i = 0; i < fields; i++)
-			{
-				printf("%s\t", row[i]);
-			}
-		}
-		std::thread::id tid = std::this_thread::get_id();
-		printf("a result for m->net.fd = %d  tid = %d \n", m->net.fd, tid);
-		mysql_free_result(res);
-	} else {
-		std::cout <<" mysql_read_query_result() failed for fd = "<< m->net.fd << " "<<mysql_error(m)<< ":"<<mysql_errno(m)<< std::endl;
-	}
-}
-
-void query(const std::string& sql,MYSQL *m)
-{
-	std::thread::id tid = std::this_thread::get_id();
-	auto ret = mysql_send_query(m, sql.c_str(), sql.size());
-	printf("query  mysql_send_query fd =  %d  tid =  %d \n", m->net.fd, tid);
-}
-
 int main(int argc, char* argv[])
 {
 #ifdef _WIN32
@@ -66,16 +39,6 @@ int main(int argc, char* argv[])
 
 	// 测试网络驱动
     gamesh::mysql::MysqlIOService* loop = new gamesh::mysql::MysqlIOService(1);
-	MYSQL* mysql = mysql_init(nullptr);
-	MYSQL* ret = mysql_real_connect(mysql, myslq_host.c_str(), "root","123456","gamesh_zxb",3306,nullptr,0);
-
-	auto readcb = [](void* ud) {
-		MYSQL* mysql = (MYSQL*)ud;
-		mysql_read_result(mysql);
-	};
-	
-	//loop->Track(mysql->net.fd, mysql, readcb, nullptr);
-
 
 	// 测试myslq查询器
 	gamesh::mysql::MysqlDB* db = new gamesh::mysql::MysqlDB(loop);
@@ -91,8 +54,6 @@ int main(int argc, char* argv[])
 #endif 
     while (true)
     {
-		db->query("select * from account");
-		/*
 		db->query("select * from account").onSuccess([](gamesh::mysql::Result&& result) {
 			assert(result.affectedRows() == 0);
 			for (auto row : result)
@@ -107,7 +68,7 @@ int main(int argc, char* argv[])
 			}).onFailure([](const char *error) {
 				std::cout << "Query error: " << error << std::endl;
 		});
-		*/
+		
 		//query("select * from bag;", mysql);
         std::this_thread::sleep_for(std::chrono::milliseconds(10));
     }
diff --git a/async_mysql/mysql_db.cpp b/async_mysql/mysql_db.cpp
@@ -166,7 +166,7 @@ namespace gamesh { namespace mysql {
             }
         };
        
-        printf("Result Cb %p ",resultcb);
+        printf("Result Cb %p \n",resultcb);
 
         loop_->PostTask([this, query, deferred, resultcb]() {
             loop_->Track(mysql_->net.fd, mysql_, resultcb, nullptr);
diff --git a/async_mysql/mysql_query_result_impl.h b/async_mysql/mysql_query_result_impl.h
@@ -8,6 +8,7 @@
 #include "dll_export.h"
 #include "mysql_result_impl.h"
 #include "mysql_query_result_field_impl.h"
+#include <cstdio>
 
 namespace gamesh { namespace mysql {
 
@@ -35,6 +36,7 @@ namespace gamesh { namespace mysql {
         }
         virtual ~QueryResultImpl()
         {
+            printf("~QueryResultImpl\n");
             mysql_free_result(_result);
         }
         const std::map<std::string, size_t>& fields() const override

Original file line number	Diff line number	Diff line change
`@@ -166,7 +166,7 @@ namespace gamesh { namespace mysql {`
`166`	`166`	`}`
`167`	`167`	`};`
`168`	`168`
`169`		`- printf("Result Cb %p ",resultcb);`
	`169`	`+ printf("Result Cb %p \n",resultcb);`
`170`	`170`
`171`	`171`	`loop_->PostTask([this, query, deferred, resultcb]() {`
`172`	`172`	`loop_->Track(mysql_->net.fd, mysql_, resultcb, nullptr);`
Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,7 @@`
`8`	`8`	`#include "dll_export.h"`
`9`	`9`	`#include "mysql_result_impl.h"`
`10`	`10`	`#include "mysql_query_result_field_impl.h"`
	`11`	`+#include <cstdio>`
`11`	`12`
`12`	`13`	`namespace gamesh { namespace mysql {`
`13`	`14`
`@@ -35,6 +36,7 @@ namespace gamesh { namespace mysql {`
`35`	`36`	`}`
`36`	`37`	`virtual ~QueryResultImpl()`
`37`	`38`	`{`
	`39`	`+ printf("~QueryResultImpl\n");`
`38`	`40`	`mysql_free_result(_result);`
`39`	`41`	`}`
`40`	`42`	`const std::map<std::string, size_t>& fields() const override`