From 141ada19b00fb9d0dd1a260d86d97bbb709a0f5e Mon Sep 17 00:00:00 2001
From: Giacomo Pozzoni <giacomopoz@gmail.com>
Date: Sat, 30 May 2020 15:43:54 +0000
Subject: Cherry pick some db commits (#24713)

* Core/DBLayer: Implement async transaction completion callbacks

(cherry picked from commit 0f0ca3a9194d76afa0227943e86469ad8368c5e2)

# Conflicts:
#	src/server/bnetserver/REST/LoginRESTService.cpp
#	src/server/bnetserver/Server/Session.cpp
#	src/server/bnetserver/Server/Session.h
#	src/server/database/Database/Transaction.cpp
#	src/server/game/Handlers/CharacterHandler.cpp
#	src/server/game/Handlers/SpellHandler.cpp
#	src/server/game/Server/WorldSession.cpp
#	src/server/game/Server/WorldSocket.cpp
#	src/server/game/Server/WorldSocket.h

* Core/Misc: Fixed char enum packet sometimes not showing newly created character when client latency is too low

(cherry picked from commit fc9d2e728e5c21bd2a1645a29be60d0e280ad940)

# Conflicts:
#	src/server/game/Handlers/CharacterHandler.cpp

* Fix no-pch build

* Core/Player: Wait for correct transaction on character creation

(cherry picked from commit 01c68b2aa2ed25ea9b4c007f238a0e958f6525b1)

# Conflicts:
#	src/server/game/Entities/Player/Player.cpp

* Fix warning

* Remove unused login transaction

Co-authored-by: Shauren <shauren.trinity@gmail.com>
---
 src/server/database/Database/Transaction.h | 36 ++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

(limited to 'src/server/database/Database/Transaction.h')

diff --git a/src/server/database/Database/Transaction.h b/src/server/database/Database/Transaction.h
index b11f94ce14e..205b06908fd 100644
--- a/src/server/database/Database/Transaction.h
+++ b/src/server/database/Database/Transaction.h
@@ -22,6 +22,7 @@
 #include "DatabaseEnvFwd.h"
 #include "SQLOperation.h"
 #include "StringFormat.h"
+#include <functional>
 #include <mutex>
 #include <vector>
 
@@ -72,6 +73,7 @@ class TC_DATABASE_API TransactionTask : public SQLOperation
 {
     template <class T> friend class DatabaseWorkerPool;
     friend class DatabaseWorker;
+    friend class TransactionCallback;
 
     public:
         TransactionTask(std::shared_ptr<TransactionBase> trans) : m_trans(trans) { }
@@ -79,9 +81,43 @@ class TC_DATABASE_API TransactionTask : public SQLOperation
 
     protected:
         bool Execute() override;
+        int TryExecute();
+        void CleanupOnFailure();
 
         std::shared_ptr<TransactionBase> m_trans;
         static std::mutex _deadlockLock;
 };
 
+class TC_DATABASE_API TransactionWithResultTask : public TransactionTask
+{
+public:
+    TransactionWithResultTask(std::shared_ptr<TransactionBase> trans) : TransactionTask(trans) { }
+
+    TransactionFuture GetFuture() { return m_result.get_future(); }
+
+protected:
+    bool Execute() override;
+
+    TransactionPromise m_result;
+};
+
+class TC_DATABASE_API TransactionCallback
+{
+public:
+    TransactionCallback(TransactionFuture&& future) : m_future(std::move(future)) { }
+    TransactionCallback(TransactionCallback&&) = default;
+
+    TransactionCallback& operator=(TransactionCallback&&) = default;
+
+    void AfterComplete(std::function<void(bool)> callback) &
+    {
+        m_callback = std::move(callback);
+    }
+
+    bool InvokeIfReady();
+
+    TransactionFuture m_future;
+    std::function<void(bool)> m_callback;
+};
+
 #endif
-- 
cgit v1.2.3