RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 13:37:44 +00:00
Code Issues Activity Actions

Userland: Rename IPC ClientConnection => ConnectionFromClient

Browse source 
This was done with CLion's automatic rename feature and with:
find . -name ClientConnection.h
    | rename 's/ClientConnection\.h/ConnectionFromClient.h/'

find . -name ClientConnection.cpp
    | rename 's/ClientConnection\.cpp/ConnectionFromClient.cpp/'
This commit is contained in:
Itamar 2022-02-25 12:18:30 +02:00 • committed by Andreas Kling
parent efac862570
commit 3a71748e5d
137 changed files with 896 additions and 896 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Services/SQLServer/CMakeLists.txt
View file

@ -8,7 +8,7 @@ compile_ipc(SQLServer.ipc SQLServerEndpoint.h)
compile_ipc(SQLClient.ipc SQLClientEndpoint.h)
set(SOURCES
ClientConnection.cpp
ConnectionFromClient.cpp
DatabaseConnection.cpp
main.cpp
SQLClientEndpoint.h

32
Userland/Services/SQLServer/ClientConnection.cpp → Userland/Services/SQLServer/ConnectionFromClient.cpp
View file

@ -7,15 +7,15 @@
#include <AK/String.h>
#include <AK/Vector.h>
#include <LibSQL/Result.h>
#include <SQLServer/ClientConnection.h>
#include <SQLServer/ConnectionFromClient.h>
#include <SQLServer/DatabaseConnection.h>
#include <SQLServer/SQLStatement.h>
namespace SQLServer {
static HashMap<int, RefPtr<ClientConnection>> s_connections;
static HashMap<int, RefPtr<ConnectionFromClient>> s_connections;
RefPtr<ClientConnection> ClientConnection::client_connection_for(int client_id)
RefPtr<ConnectionFromClient> ConnectionFromClient::client_connection_for(int client_id)
{
if (s_connections.contains(client_id))
return *s_connections.get(client_id).value();
@ -23,31 +23,31 @@ RefPtr<ClientConnection> ClientConnection::client_connection_for(int client_id)
return nullptr;
}
ClientConnection::ClientConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket, int client_id)
: IPC::ClientConnection<SQLClientEndpoint, SQLServerEndpoint>(*this, move(socket), client_id)
ConnectionFromClient::ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket> socket, int client_id)
: IPC::ConnectionFromClient<SQLClientEndpoint, SQLServerEndpoint>(*this, move(socket), client_id)
{
s_connections.set(client_id, *this);
}
ClientConnection::~ClientConnection()
ConnectionFromClient::~ConnectionFromClient()
{
}
void ClientConnection::die()
void ConnectionFromClient::die()
{
s_connections.remove(client_id());
}
Messages::SQLServer::ConnectResponse ClientConnection::connect(String const& database_name)
Messages::SQLServer::ConnectResponse ConnectionFromClient::connect(String const& database_name)
{
dbgln_if(SQLSERVER_DEBUG, "ClientConnection::connect(database_name: {})", database_name);
dbgln_if(SQLSERVER_DEBUG, "ConnectionFromClient::connect(database_name: {})", database_name);
auto database_connection = DatabaseConnection::construct(database_name, client_id());
return { database_connection->connection_id() };
}
void ClientConnection::disconnect(int connection_id)
void ConnectionFromClient::disconnect(int connection_id)
{
dbgln_if(SQLSERVER_DEBUG, "ClientConnection::disconnect(connection_id: {})", connection_id);
dbgln_if(SQLSERVER_DEBUG, "ConnectionFromClient::disconnect(connection_id: {})", connection_id);
auto database_connection = DatabaseConnection::connection_for(connection_id);
if (database_connection)
database_connection->disconnect();
@ -55,13 +55,13 @@ void ClientConnection::disconnect(int connection_id)
dbgln("Database connection has disappeared");
}
Messages::SQLServer::SqlStatementResponse ClientConnection::sql_statement(int connection_id, String const& sql)
Messages::SQLServer::SqlStatementResponse ConnectionFromClient::sql_statement(int connection_id, String const& sql)
{
dbgln_if(SQLSERVER_DEBUG, "ClientConnection::sql_statement(connection_id: {}, sql: '{}')", connection_id, sql);
dbgln_if(SQLSERVER_DEBUG, "ConnectionFromClient::sql_statement(connection_id: {}, sql: '{}')", connection_id, sql);
auto database_connection = DatabaseConnection::connection_for(connection_id);
if (database_connection) {
auto statement_id = database_connection->sql_statement(sql);
dbgln_if(SQLSERVER_DEBUG, "ClientConnection::sql_statement -> statement_id = {}", statement_id);
dbgln_if(SQLSERVER_DEBUG, "ConnectionFromClient::sql_statement -> statement_id = {}", statement_id);
return { statement_id };
} else {
dbgln("Database connection has disappeared");
@ -69,9 +69,9 @@ Messages::SQLServer::SqlStatementResponse ClientConnection::sql_statement(int co
}
}
void ClientConnection::statement_execute(int statement_id)
void ConnectionFromClient::statement_execute(int statement_id)
{
dbgln_if(SQLSERVER_DEBUG, "ClientConnection::statement_execute_query(statement_id: {})", statement_id);
dbgln_if(SQLSERVER_DEBUG, "ConnectionFromClient::statement_execute_query(statement_id: {})", statement_id);
auto statement = SQLStatement::statement_for(statement_id);
if (statement && statement->connection()->client_id() == client_id()) {
statement->execute();

14
Userland/Services/SQLServer/ClientConnection.h → Userland/Services/SQLServer/ConnectionFromClient.h
View file

@ -7,25 +7,25 @@
#pragma once
#include <AK/HashMap.h>
#include <LibIPC/ClientConnection.h>
#include <LibIPC/ConnectionFromClient.h>
#include <SQLServer/SQLClientEndpoint.h>
#include <SQLServer/SQLServerEndpoint.h>
namespace SQLServer {
class ClientConnection final
: public IPC::ClientConnection<SQLClientEndpoint, SQLServerEndpoint> {
C_OBJECT(ClientConnection);
class ConnectionFromClient final
: public IPC::ConnectionFromClient<SQLClientEndpoint, SQLServerEndpoint> {
C_OBJECT(ConnectionFromClient);
public:
virtual ~ClientConnection() override;
virtual ~ConnectionFromClient() override;
virtual void die() override;
static RefPtr<ClientConnection> client_connection_for(int client_id);
static RefPtr<ConnectionFromClient> client_connection_for(int client_id);
private:
explicit ClientConnection(NonnullOwnPtr<Core::Stream::LocalSocket>, int client_id);
explicit ConnectionFromClient(NonnullOwnPtr<Core::Stream::LocalSocket>, int client_id);
virtual Messages::SQLServer::ConnectResponse connect(String const&) override;
virtual Messages::SQLServer::SqlStatementResponse sql_statement(int, String const&) override;

10
Userland/Services/SQLServer/DatabaseConnection.cpp
View file

@ -5,7 +5,7 @@
*/
#include <AK/LexicalPath.h>
#include <SQLServer/ClientConnection.h>
#include <SQLServer/ConnectionFromClient.h>
#include <SQLServer/DatabaseConnection.h>
#include <SQLServer/SQLStatement.h>
@ -30,7 +30,7 @@ DatabaseConnection::DatabaseConnection(String database_name, int client_id)
, m_client_id(client_id)
{
if (LexicalPath path(m_database_name); (path.title() != m_database_name) || (path.dirname() != ".")) {
auto client_connection = ClientConnection::client_connection_for(m_client_id);
auto client_connection = ConnectionFromClient::client_connection_for(m_client_id);
client_connection->async_connection_error(m_connection_id, (int)SQL::SQLErrorCode::InvalidDatabaseName, m_database_name);
return;
}
@ -39,7 +39,7 @@ DatabaseConnection::DatabaseConnection(String database_name, int client_id)
s_connections.set(m_connection_id, *this);
deferred_invoke([this]() {
m_database = SQL::Database::construct(String::formatted("/home/anon/sql/{}.db", m_database_name));
auto client_connection = ClientConnection::client_connection_for(m_client_id);
auto client_connection = ConnectionFromClient::client_connection_for(m_client_id);
if (auto maybe_error = m_database->open(); maybe_error.is_error()) {
client_connection->async_connection_error(m_connection_id, (int)SQL::SQLErrorCode::InternalError, maybe_error.error().string_literal());
return;
@ -59,7 +59,7 @@ void DatabaseConnection::disconnect()
deferred_invoke([this]() {
m_database = nullptr;
s_connections.remove(m_connection_id);
auto client_connection = ClientConnection::client_connection_for(client_id());
auto client_connection = ConnectionFromClient::client_connection_for(client_id());
if (client_connection)
client_connection->async_disconnected(m_connection_id);
else
@ -70,7 +70,7 @@ void DatabaseConnection::disconnect()
int DatabaseConnection::sql_statement(String const& sql)
{
dbgln_if(SQLSERVER_DEBUG, "DatabaseConnection::sql_statement(connection_id {}, database '{}', sql '{}'", connection_id(), m_database_name, sql);
auto client_connection = ClientConnection::client_connection_for(client_id());
auto client_connection = ConnectionFromClient::client_connection_for(client_id());
if (!client_connection) {
warnln("Cannot notify client of database disconnection. Client disconnected");
return -1;

2
Userland/Services/SQLServer/Forward.h
View file

@ -7,7 +7,7 @@
#pragma once
namespace SQLServer {
class ClientConnection;
class ConnectionFromClient;
class DatabaseConnection;
class SQLStatement;
}

10
Userland/Services/SQLServer/SQLStatement.cpp
View file

@ -6,7 +6,7 @@
#include <LibCore/Object.h>
#include <LibSQL/AST/Parser.h>
#include <SQLServer/ClientConnection.h>
#include <SQLServer/ConnectionFromClient.h>
#include <SQLServer/DatabaseConnection.h>
#include <SQLServer/SQLStatement.h>
@ -37,7 +37,7 @@ void SQLStatement::report_error(SQL::Result result)
{
dbgln_if(SQLSERVER_DEBUG, "SQLStatement::report_error(statement_id {}, error {}", statement_id(), result.error_string());
auto client_connection = ClientConnection::client_connection_for(connection()->client_id());
auto client_connection = ConnectionFromClient::client_connection_for(connection()->client_id());
s_statements.remove(statement_id());
remove_from_parent();
@ -54,7 +54,7 @@ void SQLStatement::report_error(SQL::Result result)
void SQLStatement::execute()
{
dbgln_if(SQLSERVER_DEBUG, "SQLStatement::execute(statement_id {}", statement_id());
auto client_connection = ClientConnection::client_connection_for(connection()->client_id());
auto client_connection = ConnectionFromClient::client_connection_for(connection()->client_id());
if (!client_connection) {
warnln("Cannot yield next result. Client disconnected");
return;
@ -75,7 +75,7 @@ void SQLStatement::execute()
return;
}
auto client_connection = ClientConnection::client_connection_for(connection()->client_id());
auto client_connection = ConnectionFromClient::client_connection_for(connection()->client_id());
if (!client_connection) {
warnln("Cannot return statement execution results. Client disconnected");
return;
@ -122,7 +122,7 @@ bool SQLStatement::should_send_result_rows() const
void SQLStatement::next()
{
VERIFY(!m_result->is_empty());
auto client_connection = ClientConnection::client_connection_for(connection()->client_id());
auto client_connection = ConnectionFromClient::client_connection_for(connection()->client_id());
if (!client_connection) {
warnln("Cannot yield next result. Client disconnected");
return;

4
Userland/Services/SQLServer/main.cpp
View file

@ -8,7 +8,7 @@
#include <LibCore/System.h>
#include <LibIPC/MultiServer.h>
#include <LibMain/Main.h>
#include <SQLServer/ClientConnection.h>
#include <SQLServer/ConnectionFromClient.h>
#include <stdio.h>
#include <sys/stat.h>
@ -26,6 +26,6 @@ ErrorOr<int> serenity_main(Main::Arguments)
Core::EventLoop event_loop;
auto server = TRY(IPC::MultiServer<SQLServer::ClientConnection>::try_create());
auto server = TRY(IPC::MultiServer<SQLServer::ConnectionFromClient>::try_create());
return event_loop.exec();
}