Merge branch 'bugfix/pq_mock_event_fd'

yeti-switch · Aug 16, 2023 · f15ab5b · f15ab5b
2 parents 6256b69 + 3cf4d6a
commit f15ab5b
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 7 deletions.
diff --git a/apps/postgresql/conn/MockConnection.cpp b/apps/postgresql/conn/MockConnection.cpp
@@ -5,7 +5,7 @@
 #include <netinet/in.h>
 #include <arpa/inet.h>
 #include <unistd.h>
-
+#include <sys/eventfd.h>
 
 MockConnection::MockConnection(IConnectionHandler* handler)
   : Connection("mock", "mock", handler)
@@ -22,10 +22,16 @@ void MockConnection::check_conn()
 
     if(status == CONNECTION_BAD) {
         status = CONNECTION_MADE;
-        handler->onSock(this, IConnectionHandler::PG_SOCK_READ);
+        handler->onSock(this, IConnectionHandler::PG_SOCK_WRITE);
     } else if(status == CONNECTION_MADE) {
         status = CONNECTION_OK;
         handler->onConnect(this);
+        handler->onSock(this, IConnectionHandler::PG_SOCK_READ);
+    } else if(status == CONNECTION_OK) {
+        int64_t u;
+        do {
+            u = ::read(conn_fd, &u, sizeof(int64_t));
+        } while(u > 0);
     }
 }
 
@@ -46,7 +52,7 @@ bool MockConnection::reset_conn()
         conn_fd = -1;
     }
 
-    conn_fd = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP);
+    conn_fd = eventfd(0, EFD_NONBLOCK);
     handler->onSock(this, IConnectionHandler::PG_SOCK_NEW);
 
     return true;
@@ -70,7 +76,8 @@ bool MockConnection::start_pipe()
 
 bool MockConnection::sync_pipe()
 {
-    return true;
+    uint64_t u = 1;
+    return write(conn_fd, &u, sizeof(u)) == sizeof(u);
 }
 
 bool MockConnection::exit_pipe()

diff --git a/apps/postgresql/query/MockQueryImpl.h b/apps/postgresql/query/MockQueryImpl.h
@@ -9,5 +9,9 @@ class MockQueryImpl : public IQueryImpl
         : IQueryImpl(cmd, single){}
     virtual ~MockQueryImpl(){}
 
-    int exec() override { is_send = true; return 1; }
+    int exec() override {
+        uint64_t u = 1;
+        is_send = write(conn->getSocket(), &u, sizeof(u)) == sizeof(u);
+        return 1;
+    }
 };
diff --git a/apps/postgresql/trans/MockTransactionImpl.cpp b/apps/postgresql/trans/MockTransactionImpl.cpp
@@ -1,6 +1,7 @@
 #include "MockTransactionImpl.h"
 
 #include "Transaction.h"
+#include "../conn/Connection.h"
 #include "../query/QueryChain.h"
 
 MockTransactionImpl::MockTransactionImpl(Transaction* h, TransactionType t, TestServer* server_)
@@ -32,12 +33,17 @@ bool MockTransactionImpl::check_trans()
         ERROR("unknown query");
         return true;
     }
-        
+
     if((status == PQTRANS_IDLE &&
        query->is_finished()) ||
         status == PQTRANS_ACTIVE) {
-        status = PQTRANS_ACTIVE;    
+        status = PQTRANS_ACTIVE;
         return !server->checkTail(query_);
+    } if(status == PQTRANS_INERROR && !synced) {
+        synced = true;
+        query->set_finished();
+    } else if(status == PQTRANS_INERROR && synced) {
+        status = PQTRANS_IDLE;
     }
 
     return true;
@@ -84,6 +90,7 @@ int MockTransactionImpl::fetch_result()
             if(!errorcode.empty()) {
                 parent->handler->onErrorCode(parent, errorcode);
             }
+            status = PQTRANS_INERROR;
         } else {
             AmArg res;
             while(server->getResponse(query_, res)) {