yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

feat: add async queries (#113)

Browse Source
This commit is contained in:
Axel Cocat
2023-04-01 18:33:31 +02:00
committed by GitHub
parent 50329656fb
commit fb1f240177
6 changed files with 102 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
README.md
View File

@@ -118,3 +118,4 @@ Eluna API for AC:
- Added `ItemTemplate` methods: https://github.com/azerothcore/mod-eluna/pull/84
- Added logging with `ELUNA_LOG_INFO` for `RunCommand()`: https://github.com/azerothcore/mod-eluna/pull/75
- Added `GetOwnerHalaa` and `SetOwnerHalaa`: https://github.com/azerothcore/mod-eluna/pull/79
- Added `WorldDBQueryAsync`, `CharDBQueryAsync` and `AuthDBQueryAsync`: https://github.com/azerothcore/mod-eluna/pull/113

98
src/LuaEngine/GlobalMethods.h
View File

@@ -1271,11 +1271,46 @@ namespace LuaGlobalFunctions
return 0;
}
template <typename T>
int DBQueryAsync(lua_State* L, DatabaseWorkerPool<T>& db)
{
const char* query = Eluna::CHECKVAL<const char*>(L, 1);
luaL_checktype(L, 2, LUA_TFUNCTION);
lua_pushvalue(L, 2);
int funcRef = luaL_ref(L, LUA_REGISTRYINDEX);
if (funcRef == LUA_REFNIL || funcRef == LUA_NOREF)
{
luaL_argerror(L, 2, "unable to make a ref to function");
return 0;
}
Eluna::GEluna->queryProcessor.AddCallback(db.AsyncQuery(query).WithCallback([L, funcRef](QueryResult result)
{
ElunaQuery* eq = result ? new ElunaQuery(result) : nullptr;
LOCK_ELUNA;
// Get function
lua_rawgeti(L, LUA_REGISTRYINDEX, funcRef);
// Push parameters
Eluna::Push(L, eq);
// Call function
Eluna::GEluna->ExecuteCall(1, 0);
luaL_unref(L, LUA_REGISTRYINDEX, funcRef);
}));
return 0;
}
/**
* Executes a SQL query on the world database and returns an [ElunaQuery].
*
* The query is always executed synchronously
* (i.e. execution halts until the query has finished and then results are returned).
* If you need to execute the query asynchronously, use [Global:WorldDBQueryAsync] instead.
*
* local Q = WorldDBQuery("SELECT entry, name FROM creature_template LIMIT 10")
* if Q then
@@ -1308,6 +1343,29 @@ namespace LuaGlobalFunctions
return 1;
}
/**
* Executes an asynchronous SQL query on the world database and passes an [ElunaQuery] to a callback function.
*
* The query is executed asynchronously
* (i.e. the server keeps running while the query is executed in parallel, and results are passed to a callback function).
* If you need to execute the query synchronously, use [Global:WorldDBQuery] instead.
*
* WorldDBQueryAsync("SELECT entry, name FROM creature_template LIMIT 10", function(Q)
* if Q then
* repeat
* local entry, name = Q:GetUInt32(0), Q:GetString(1)
* print(entry, name)
* until not Q:NextRow()
* end
* end)
*
* @param string sql : query to execute
*/
int WorldDBQueryAsync(lua_State* L)
{
return DBQueryAsync(L, WorldDatabase);
}
/**
* Executes a SQL query on the world database.
*
@@ -1315,7 +1373,7 @@ namespace LuaGlobalFunctions
* If you need to execute the query synchronously, use [Global:WorldDBQuery] instead.
*
* Any results produced are ignored.
* If you need results from the query, use [Global:WorldDBQuery] instead.
* If you need results from the query, use [Global:WorldDBQuery] or [Global:WorldDBQueryAsync] instead.
*
* WorldDBExecute("DELETE FROM my_table")
*
@@ -1333,6 +1391,7 @@ namespace LuaGlobalFunctions
*
* The query is always executed synchronously
* (i.e. execution halts until the query has finished and then results are returned).
* If you need to execute the query asynchronously, use [Global:CharDBQueryAsync] instead.
*
* For an example see [Global:WorldDBQuery].
*
@@ -1359,6 +1418,22 @@ namespace LuaGlobalFunctions
return 1;
}
/**
* Executes an asynchronous SQL query on the character database and passes an [ElunaQuery] to a callback function.
*
* The query is executed asynchronously
* (i.e. the server keeps running while the query is executed in parallel, and results are passed to a callback function).
* If you need to execute the query synchronously, use [Global:CharDBQuery] instead.
*
* For an example see [Global:WorldDBQueryAsync].
*
* @param string sql : query to execute
*/
int CharDBQueryAsync(lua_State* L)
{
return DBQueryAsync(L, CharacterDatabase);
}
/**
* Executes a SQL query on the character database.
*
@@ -1366,7 +1441,7 @@ namespace LuaGlobalFunctions
* If you need to execute the query synchronously, use [Global:CharDBQuery] instead.
*
* Any results produced are ignored.
* If you need results from the query, use [Global:CharDBQuery] instead.
* If you need results from the query, use [Global:CharDBQuery] or [Global:CharDBQueryAsync] instead.
*
* CharDBExecute("DELETE FROM my_table")
*
@@ -1384,6 +1459,7 @@ namespace LuaGlobalFunctions
*
* The query is always executed synchronously
* (i.e. execution halts until the query has finished and then results are returned).
* If you need to execute the query asynchronously, use [Global:AuthDBQueryAsync] instead.
*
* For an example see [Global:WorldDBQuery].
*
@@ -1410,6 +1486,22 @@ namespace LuaGlobalFunctions
return 1;
}
/**
* Executes an asynchronous SQL query on the character database and passes an [ElunaQuery] to a callback function.
*
* The query is executed asynchronously
* (i.e. the server keeps running while the query is executed in parallel, and results are passed to a callback function).
* If you need to execute the query synchronously, use [Global:AuthDBQuery] instead.
*
* For an example see [Global:WorldDBQueryAsync].
*
* @param string sql : query to execute
*/
int AuthDBQueryAsync(lua_State* L)
{
return DBQueryAsync(L, LoginDatabase);
}
/**
* Executes a SQL query on the login database.
*
@@ -1417,7 +1509,7 @@ namespace LuaGlobalFunctions
* If you need to execute the query synchronously, use [Global:AuthDBQuery] instead.
*
* Any results produced are ignored.
* If you need results from the query, use [Global:AuthDBQuery] instead.
* If you need results from the query, use [Global:AuthDBQuery] or [Global:AuthDBQueryAsync] instead.
*
* AuthDBExecute("DELETE FROM my_table")
*

1
src/LuaEngine/LuaEngine.cpp
View File

@@ -164,6 +164,7 @@ enabled(false),
L(NULL),
eventMgr(NULL),
httpManager(),
queryProcessor(),
ServerEventBindings(NULL),
PlayerEventBindings(NULL),

1
src/LuaEngine/LuaEngine.h
View File

@@ -240,6 +240,7 @@ public:
lua_State* L;
EventMgr* eventMgr;
HttpManager httpManager;
QueryCallbackProcessor queryProcessor;
BindingMap< EventKey<Hooks::ServerEvents> >* ServerEventBindings;
BindingMap< EventKey<Hooks::PlayerEvents> >* PlayerEventBindings;

3
src/LuaEngine/LuaFunctions.cpp
View File

@@ -128,10 +128,13 @@ luaL_Reg GlobalMethods[] =
{ "RunCommand", &LuaGlobalFunctions::RunCommand },
{ "SendWorldMessage", &LuaGlobalFunctions::SendWorldMessage },
{ "WorldDBQuery", &LuaGlobalFunctions::WorldDBQuery },
{ "WorldDBQueryAsync", &LuaGlobalFunctions::WorldDBQueryAsync },
{ "WorldDBExecute", &LuaGlobalFunctions::WorldDBExecute },
{ "CharDBQuery", &LuaGlobalFunctions::CharDBQuery },
{ "CharDBQueryAsync", &LuaGlobalFunctions::CharDBQueryAsync },
{ "CharDBExecute", &LuaGlobalFunctions::CharDBExecute },
{ "AuthDBQuery", &LuaGlobalFunctions::AuthDBQuery },
{ "AuthDBQueryAsync", &LuaGlobalFunctions::AuthDBQueryAsync },
{ "AuthDBExecute", &LuaGlobalFunctions::AuthDBExecute },
{ "CreateLuaEvent", &LuaGlobalFunctions::CreateLuaEvent },
{ "RemoveEventById", &LuaGlobalFunctions::RemoveEventById },

1
src/LuaEngine/ServerHooks.cpp
View File

@@ -322,6 +322,7 @@ void Eluna::OnWorldUpdate(uint32 diff)
eventMgr->globalProcessor->Update(diff);
httpManager.HandleHttpResponses();
queryProcessor.ProcessReadyCallbacks();
START_HOOK(WORLD_EVENT_ON_UPDATE);
Push(diff);