--- parser3/src/main/pa_sql_driver_manager.C 2004/02/06 11:54:11 1.81 +++ parser3/src/main/pa_sql_driver_manager.C 2009/07/06 08:47:10 1.89 @@ -1,11 +1,11 @@ /** @file Parser: sql driver manager implementation. - Copyright (c) 2001-2003 ArtLebedev Group (http://www.artlebedev.com) + Copyright (c) 2001-2009 ArtLebedev Group (http://www.artlebedev.com) Author: Alexandr Petrosian (http://paf.design.ru) */ -static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2004/02/06 11:54:11 $"; +static const char * const IDENT_SQL_DRIVER_MANAGER_C="$Date: 2009/07/06 08:47:10 $"; #include "pa_sql_driver_manager.h" #include "ltdl.h" @@ -32,8 +32,11 @@ const String& SQL_Driver_services_impl:: String& result=*new String; result << furl->mid(0, furl->pos(':')) << "://****"; - size_t at_pos=furl->pos('@'); - if(at_pos!=STRING_NOT_FOUND) + size_t at_pos=0; + size_t new_at_pos; + while( (new_at_pos=furl->pos('@', at_pos+1))!=STRING_NOT_FOUND) + at_pos=new_at_pos; + if(at_pos) result << furl->mid(at_pos, furl->length()); return result; @@ -46,9 +49,34 @@ void SQL_Driver_services_impl::transcode ) { try { + // to speed up sql transcode [lots of charsets::get-s -- twice for each cell] + // without complicating sql driver API + // we need to cache couple of name->charset pairs + // assuming pointers to names are are NOT to local vars + + struct cache_record { + const char* name; + Charset* object; + } cache[2]={{0,0}, {0,0}}; + + Charset* charset_from_object; + Charset* charset_to_object; + if(charset_from_name==cache[0].name) { + charset_from_object=cache[0].object; + } else { + cache[0].name=charset_from_name; + cache[0].object=charset_from_object=&charsets.get(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); + } + String::C result=Charset::transcode(String::C(src, src_length), - charsets.get(charset_from_name), - charsets.get(charset_to_name)); + *charset_from_object, + *charset_to_object); dst=result.str; dst_length=result.length; } catch(const Exception& e) { @@ -78,7 +106,7 @@ SQL_Driver_manager::SQL_Driver_manager() } SQL_Driver_manager::~SQL_Driver_manager() { - connection_cache.for_each(expire_connections, time(0)+(time_t)10/*=in future=expire all*/); + connection_cache.for_each(expire_connections, time(0)+(time_t)10/*=in future=expire all*/); if(is_dlinited) lt_dlexit(); @@ -87,10 +115,11 @@ SQL_Driver_manager::~SQL_Driver_manager( /// @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* arequest_charset, + const char* adocument_root) { // we have table for locating protocol's library if(!protocol2driver_and_client) - throw Exception("parser.runtime", + throw Exception(PARSER_RUNTIME, &aurl, "$"MAIN_SQL_NAME":"MAIN_SQL_DRIVERS_NAME" table must be defined"); @@ -110,7 +139,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", + throw Exception(PARSER_RUNTIME, aurl.length()?&aurl:0, "connection string must start with protocol://"); @@ -130,13 +159,13 @@ 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", + 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", + throw Exception(PARSER_RUNTIME, &aurl, "undefined protocol '%s'", protocol_cstr); @@ -150,7 +179,7 @@ SQL_Connection* SQL_Driver_manager::get_ is_dlinited=true; } - const char* filename=library->cstr(String::L_FILE_SPEC); + const char* filename=library->cstr_taint(String::L_FILE_SPEC); lt_dlhandle handle=lt_dlopen(filename); if (!handle) { const char* error=lt_dlerror(); @@ -159,8 +188,8 @@ SQL_Connection* SQL_Driver_manager::get_ error?error:"can not open the module"); } - SQL_Driver_create_func create=(SQL_Driver_create_func)lt_dlsym(handle, - SQL_DRIVER_CREATE_NAME); + SQL_Driver_create_func create=(SQL_Driver_create_func)(lt_dlsym(handle, + SQL_DRIVER_CREATE_NAME)); if(!create) throw Exception(0, library, @@ -180,7 +209,7 @@ SQL_Connection* SQL_Driver_manager::get_ // initialise by connecting to sql client dynamic link library char* dlopen_file_spec_cstr= dlopen_file_spec && dlopen_file_spec->length()? - dlopen_file_spec->cstrm(String::L_AS_IS):0; + dlopen_file_spec->cstrm_taint(String::L_AS_IS):0; if(const char* error=driver->initialize(dlopen_file_spec_cstr)) throw Exception(0, library, @@ -192,7 +221,7 @@ SQL_Connection* SQL_Driver_manager::get_ put_driver_to_cache(protocol, driver); } - connection=new SQL_Connection(aurl, *driver, arequest_charset); + connection=new SQL_Connection(aurl, *driver, arequest_charset, adocument_root); // associate with pool[request] (deassociates at close) connection->set_url(); } @@ -258,7 +287,7 @@ void SQL_Driver_manager::maybe_expire_ca time_t now=time(0); if(prev_expiration_pass_time(expire_connections, time_t(now-EXPIRE_UNUSED_CONNECTION_SECONDS)); prev_expiration_pass_time=now; } @@ -295,7 +324,7 @@ Value* SQL_Driver_manager::get_status() columns+=new String("time"); Table& table=*new Table(&columns, connection_cache.count()); - connection_cache.for_each(add_connections_to_status_cache_table, &table); + connection_cache.for_each(add_connections_to_status_cache_table, &table); result->get_hash()->put(*new String("cache"), new VTable(&table)); }