--- parser3/src/main/pa_sql_driver_manager.C 2012/03/16 09:24:14 1.91 +++ parser3/src/main/pa_sql_driver_manager.C 2024/09/07 16:30:26 1.103 @@ -1,8 +1,8 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001-2012 Art. Lebedev Studio (http://www.artlebedev.com) - Author: Alexandr Petrosian (http://paf.design.ru) + Copyright (c) 2001-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev , Alexandr Petrosian */ #include "pa_sql_driver_manager.h" @@ -15,7 +15,7 @@ #include "pa_vtable.h" #include "pa_charsets.h" -volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.91 2012/03/16 09:24:14 moko Exp $" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H; +volatile const char * IDENT_PA_SQL_DRIVER_MANAGER_C="$Id: pa_sql_driver_manager.C,v 1.103 2024/09/07 16:30:26 moko Exp $" IDENT_PA_SQL_DRIVER_MANAGER_H IDENT_PA_SQL_CONNECTION_H; // globals @@ -23,7 +23,7 @@ SQL_Driver_manager* SQL_driver_manager=0 // consts -const time_t EXPIRE_UNUSED_CONNECTION_SECONDS=60; +const time_t EXPIRE_UNUSED_CONNECTION_SECONDS=10; const time_t CHECK_EXPIRED_CONNECTIONS_SECONDS=EXPIRE_UNUSED_CONNECTION_SECONDS*2; // helpers @@ -65,24 +65,22 @@ void SQL_Driver_services_impl::transcode charset_from_object=cache[0].object; } else { cache[0].name=charset_from_name; - cache[0].object=charset_from_object=&charsets.get(charset_from_name); + cache[0].object=charset_from_object=&pa_charsets.get_direct(charset_from_name); } if(charset_to_name==cache[1].name) { charset_to_object=cache[1].object; } else { cache[1].name=charset_to_name; - cache[1].object=charset_to_object=&charsets.get(charset_to_name); + cache[1].object=charset_to_object=&pa_charsets.get_direct(charset_to_name); } - String::C result=Charset::transcode(String::C(src, src_length), - *charset_from_object, - *charset_to_object); + String::C result=Charset::transcode(String::C(src, src_length), *charset_from_object, *charset_to_object); dst=result.str; dst_length=result.length; } catch(const Exception& e) { _throw(SQL_Error(e.type(), e.comment())); } catch(...) { - _throw(SQL_Error(0, "unknown error while transcoding in sql driver")); + _throw(SQL_Error("unknown error while transcoding in sql driver")); } } @@ -92,36 +90,24 @@ static void expire_connection(SQL_Connec if(connection.connected() && connection.expired(older_dies)) connection.disconnect(); } -static void expire_connections(SQL_Driver_manager::connection_cache_type::key_type /*key*/, - SQL_Driver_manager::connection_cache_type::value_type stack, - time_t older_dies) { +static void expire_connections(SQL_Driver_manager::connection_cache_type::key_type /*key*/, SQL_Driver_manager::connection_cache_type::value_type stack, time_t older_dies) { for(size_t i=0; itop_index(); i++) expire_connection(*stack->get(i), older_dies); } // SQL_Driver_manager -SQL_Driver_manager::SQL_Driver_manager(): - is_dlinited(false), prev_expiration_pass_time(0) { -} +SQL_Driver_manager::SQL_Driver_manager(): prev_expiration_pass_time(0) {} SQL_Driver_manager::~SQL_Driver_manager() { connection_cache.for_each(expire_connections, time(0)+(time_t)10/*=in future=expire all*/); - - if(is_dlinited) - lt_dlexit(); } /// @param aurl protocol://[driver-dependent] -SQL_Connection* SQL_Driver_manager::get_connection(const String& aurl, - Table *protocol2driver_and_client, - const char* arequest_charset, - const char* adocument_root) { +SQL_Connection* SQL_Driver_manager::get_connection(const String& aurl, Table *protocol2driver_and_client, const char* arequest_charset, const char* adocument_root) { // we have table for locating protocol's library if(!protocol2driver_and_client) - throw Exception(PARSER_RUNTIME, - &aurl, - "$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined"); + throw Exception(PARSER_RUNTIME, &aurl, "$" MAIN_SQL_NAME ":" MAIN_SQL_DRIVERS_NAME " table must be defined"); // first trying to get cached connection SQL_Connection* connection=get_connection_from_cache(aurl); @@ -139,9 +125,7 @@ SQL_Connection* SQL_Driver_manager::get_ else { // no cached connection or it were unpingabe: connect/reconnect url_cstr=aurl.cstrm(); if(!strstr(url_cstr, "://")) - throw Exception(PARSER_RUNTIME, - aurl.length()?&aurl:0, - "connection string must start with protocol://"); + throw Exception(PARSER_RUNTIME, aurl.length()?&aurl:0, "connection string must start with protocol://"); char *protocol_cstr=lsplit(&url_cstr, ':'); @@ -159,41 +143,24 @@ SQL_Connection* SQL_Driver_manager::get_ Table::Action_options options; if(protocol2driver_and_client->locate(0, protocol, options)) { if(!(library=protocol2driver_and_client->item(1)) || library->length()==0) - throw Exception(PARSER_RUNTIME, - 0, - "driver library column for protocol '%s' is empty", - protocol_cstr); + throw Exception(PARSER_RUNTIME, 0, "driver library column for protocol '%s' is empty", protocol_cstr); dlopen_file_spec=protocol2driver_and_client->item(2); } else - throw Exception(PARSER_RUNTIME, - &aurl, - "undefined protocol '%s'", - protocol_cstr); - - if(!is_dlinited) { - if(lt_dlinit()) - throw Exception(0, - library, - "prepare to dynamic loading failed, %s", lt_dlerror()); + throw Exception(PARSER_RUNTIME, &aurl, "undefined protocol '%s'", protocol_cstr); - is_dlinited=true; - } + pa_dlinit(); const char* filename=library->taint_cstr(String::L_FILE_SPEC); lt_dlhandle handle=lt_dlopen(filename); if (!handle) { const char* error=lt_dlerror(); - throw Exception(0, - library, - error?error:"can not open the module"); + throw Exception(0, library, error ? error : "can not open the module"); } SQL_Driver_create_func create=(SQL_Driver_create_func)(lt_dlsym(handle, SQL_DRIVER_CREATE_NAME)); if(!create) - throw Exception(0, - library, - "function '"SQL_DRIVER_CREATE_NAME"' was not found"); + throw Exception(0, library, "function '" SQL_DRIVER_CREATE_NAME "' was not found"); // create library-driver! driver=(*create)(); @@ -201,21 +168,14 @@ SQL_Connection* SQL_Driver_manager::get_ // validate driver api version int driver_api_version=driver->api_version(); if(driver_api_version!=SQL_DRIVER_API_VERSION) - throw Exception(0, - library, - "driver implements API version 0x%04X not equal to 0x%04X", - driver_api_version, SQL_DRIVER_API_VERSION); + throw Exception(0, library, "driver implements API version 0x%04X not equal to 0x%04X", driver_api_version, SQL_DRIVER_API_VERSION); // initialise by connecting to sql client dynamic link library char* dlopen_file_spec_cstr= dlopen_file_spec && dlopen_file_spec->length()? dlopen_file_spec->taint_cstrm(String::L_AS_IS):0; if(const char* error=driver->initialize(dlopen_file_spec_cstr)) - throw Exception(0, - library, - "driver failed to initialize client library '%s', %s", - dlopen_file_spec_cstr?dlopen_file_spec_cstr:"unspecifed", - error); + throw Exception(0, library, "driver failed to initialize client library '%s', %s", dlopen_file_spec_cstr ? dlopen_file_spec_cstr : "unspecifed", error); // cache it put_driver_to_cache(protocol, driver); @@ -233,8 +193,7 @@ SQL_Connection* SQL_Driver_manager::get_ return connection; } -void SQL_Driver_manager::close_connection(connection_cache_type::key_type url, - SQL_Connection* connection) { +void SQL_Driver_manager::close_connection(connection_cache_type::key_type url, SQL_Connection* connection) { put_connection_to_cache(url, connection); } @@ -247,9 +206,7 @@ SQL_Driver *SQL_Driver_manager::get_driv return driver_cache.get(protocol); } -void SQL_Driver_manager::put_driver_to_cache( - driver_cache_type::key_type protocol, - driver_cache_type::value_type driver) { +void SQL_Driver_manager::put_driver_to_cache(driver_cache_type::key_type protocol, driver_cache_type::value_type driver) { SYNCHRONIZED; driver_cache.put(protocol, driver); @@ -257,7 +214,7 @@ void SQL_Driver_manager::put_driver_to_c // connection cache /// @todo get rid of memory spending Stack [zeros deep inside got accumulated] -SQL_Connection* SQL_Driver_manager::get_connection_from_cache(connection_cache_type::key_type url) { +SQL_Connection* SQL_Driver_manager::get_connection_from_cache(connection_cache_type::key_type url) { SYNCHRONIZED; if(connection_cache_type::value_type connections=connection_cache.get(url)) @@ -270,9 +227,7 @@ SQL_Connection* SQL_Driver_manager::get_ return 0; } -void SQL_Driver_manager::put_connection_to_cache( - connection_cache_type::key_type url, - SQL_Connection* connection) { +void SQL_Driver_manager::put_connection_to_cache(connection_cache_type::key_type url, SQL_Connection* connection) { SYNCHRONIZED; connection_cache_type::value_type connections=connection_cache.get(url); @@ -306,11 +261,8 @@ static void add_connection_to_status_cac *table+=&row; } } -static void add_connections_to_status_cache_table( - SQL_Driver_manager::connection_cache_type::key_type /*key*/, - SQL_Driver_manager::connection_cache_type::value_type stack, Table* table) -{ - for(Array_iterator i(*stack); i.has_next(); ) +static void add_connections_to_status_cache_table(SQL_Driver_manager::connection_cache_type::key_type /*key*/, SQL_Driver_manager::connection_cache_type::value_type stack, Table* table) { + for(Array_iterator i(*stack); i; ) add_connection_to_status_cache_table(*i.next(), table); }