X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-sql%2Fsql-wrap.c;h=bda1982bcdbb47de64a5eddd6716730a45eca556;hb=f8094912dca39dc65aec440daf00973792f5ba42;hp=bbc2374d0954eab1fc6645aa93823faedcacc48f;hpb=f11c6b27e7f09dc6ea476e892dbaa577cfcac843;p=openldap diff --git a/servers/slapd/back-sql/sql-wrap.c b/servers/slapd/back-sql/sql-wrap.c index bbc2374d09..bda1982bcd 100644 --- a/servers/slapd/back-sql/sql-wrap.c +++ b/servers/slapd/back-sql/sql-wrap.c @@ -1,30 +1,39 @@ -/* - * Copyright 1999, Dmitry Kovalev , All rights reserved. +/* $OpenLDAP$ */ +/* This work is part of OpenLDAP Software . * - * Redistribution and use in source and binary forms are permitted only - * as authorized by the OpenLDAP Public License. A copy of this - * license is available at http://www.OpenLDAP.org/license.html or - * in file LICENSE in the top-level directory of the distribution. + * Copyright 1999-2006 The OpenLDAP Foundation. + * Portions Copyright 1999 Dmitry Kovalev. + * Portions Copyright 2002 Pierangelo Masarati. + * Portions Copyright 2004 Mark Adamson. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . + */ +/* ACKNOWLEDGEMENTS: + * This work was initially developed by Dmitry Kovalev for inclusion + * by OpenLDAP Software. Additional significant contributors include + * Pierangelo Masarati and Mark Adamson. */ #include "portable.h" -#ifdef SLAPD_SQL - #include #include "ac/string.h" #include + #include "slap.h" -#include "ldap_pvt.h" -#include "back-sql.h" -#include "sql-types.h" -#include "sql-wrap.h" -#include "schema-map.h" +#include "proto-sql.h" #define MAX_ATTR_LEN 16384 -typedef struct backsql_conn { - int ldap_cid; +typedef struct backsql_db_conn { + unsigned long ldap_cid; SQLHDBC dbh; } backsql_db_conn; @@ -38,17 +47,12 @@ backsql_PrintErrors( SQLHENV henv, SQLHDBC hdbc, SQLHSTMT sth, int rc ) Debug( LDAP_DEBUG_TRACE, "Return code: %d\n", rc, 0, 0 ); - - rc = SQLError( henv, hdbc, sth, state, &iSqlCode, msg, - SQL_MAX_MESSAGE_LENGTH - 1, &len ); - for ( ; BACKSQL_SUCCESS( rc ); ) { - Debug( LDAP_DEBUG_TRACE, "Native error code: %d\n", - (int)iSqlCode, 0, 0 ); - Debug( LDAP_DEBUG_TRACE, "SQL engine state: %s\n", - state, 0, 0 ); - Debug( LDAP_DEBUG_TRACE, "Message: %s\n", msg, 0, 0 ); - rc = SQLError( henv, hdbc, sth, state, &iSqlCode, msg, - SQL_MAX_MESSAGE_LENGTH - 1, &len ); + for ( ; rc = SQLError( henv, hdbc, sth, state, &iSqlCode, msg, + SQL_MAX_MESSAGE_LENGTH - 1, &len ), BACKSQL_SUCCESS( rc ); ) + { + Debug( LDAP_DEBUG_TRACE, + " nativeErrCode=%d SQLengineState=%s msg=\"%s\"\n", + (int)iSqlCode, state, msg ); } } @@ -56,8 +60,6 @@ RETCODE backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout ) { RETCODE rc; - char drv_name[ 30 ]; - SWORD len; rc = SQLAllocStmt( dbh, sth ); if ( rc != SQL_SUCCESS ) { @@ -65,37 +67,46 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout ) } #ifdef BACKSQL_TRACE - Debug( LDAP_DEBUG_TRACE, "==>_SQLPrepare()\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "==>backsql_Prepare()\n", 0, 0, 0 ); #endif /* BACKSQL_TRACE */ - SQLGetInfo( dbh, SQL_DRIVER_NAME, drv_name, sizeof( drv_name ), &len ); +#ifdef BACKSQL_MSSQL_WORKAROUND + { + char drv_name[ 30 ]; + SWORD len; + + SQLGetInfo( dbh, SQL_DRIVER_NAME, drv_name, sizeof( drv_name ), &len ); #ifdef BACKSQL_TRACE - Debug( LDAP_DEBUG_TRACE, "_SQLPrepare(): driver name='%s'\n", - drv_name, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): driver name=\"%s\"\n", + drv_name, 0, 0 ); #endif /* BACKSQL_TRACE */ - ldap_pvt_str2upper( drv_name ); - if ( !strncmp( drv_name, "SQLSRV32.DLL", sizeof( drv_name ) ) ) { - /* - * stupid default result set in MS SQL Server - * does not support multiple active statements - * on the same connection -- so we are trying - * to make it not to use default result set... - */ - Debug( LDAP_DEBUG_TRACE, "_SQLprepare(): " - "enabling MS SQL Server default result " - "set workaround\n", 0, 0, 0 ); - rc = SQLSetStmtOption( *sth, SQL_CONCURRENCY, - SQL_CONCUR_ROWVER ); - if ( rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO ) { - Debug( LDAP_DEBUG_TRACE, "_SQLPrepare(): " - "SQLSetStmtOption(SQL_CONCURRENCY," - "SQL_CONCUR_ROWVER) failed:\n", - 0, 0, 0 ); - backsql_PrintErrors( SQL_NULL_HENV, dbh, *sth, rc ); + ldap_pvt_str2upper( drv_name ); + if ( !strncmp( drv_name, "SQLSRV32.DLL", STRLENOF( "SQLSRV32.DLL" ) ) ) { + /* + * stupid default result set in MS SQL Server + * does not support multiple active statements + * on the same connection -- so we are trying + * to make it not to use default result set... + */ + Debug( LDAP_DEBUG_TRACE, "_SQLprepare(): " + "enabling MS SQL Server default result " + "set workaround\n", 0, 0, 0 ); + rc = SQLSetStmtOption( *sth, SQL_CONCURRENCY, + SQL_CONCUR_ROWVER ); + if ( rc != SQL_SUCCESS && rc != SQL_SUCCESS_WITH_INFO ) { + Debug( LDAP_DEBUG_TRACE, "backsql_Prepare(): " + "SQLSetStmtOption(SQL_CONCURRENCY," + "SQL_CONCUR_ROWVER) failed:\n", + 0, 0, 0 ); + backsql_PrintErrors( SQL_NULL_HENV, dbh, *sth, rc ); + SQLFreeStmt( *sth, SQL_DROP ); + return rc; + } } } +#endif /* BACKSQL_MSSQL_WORKAROUND */ if ( timeout > 0 ) { Debug( LDAP_DEBUG_TRACE, "_SQLprepare(): " @@ -104,44 +115,21 @@ backsql_Prepare( SQLHDBC dbh, SQLHSTMT *sth, char *query, int timeout ) rc = SQLSetStmtOption( *sth, SQL_QUERY_TIMEOUT, timeout ); if ( rc != SQL_SUCCESS ) { backsql_PrintErrors( SQL_NULL_HENV, dbh, *sth, rc ); + SQLFreeStmt( *sth, SQL_DROP ); + return rc; } } #ifdef BACKSQL_TRACE - Debug( LDAP_DEBUG_TRACE, "<==_SQLPrepare() calling SQLPrepare()\n", + Debug( LDAP_DEBUG_TRACE, "<==backsql_Prepare() calling SQLPrepare()\n", 0, 0, 0 ); #endif /* BACKSQL_TRACE */ - return SQLPrepare( *sth, query, SQL_NTS ); + return SQLPrepare( *sth, (SQLCHAR *)query, SQL_NTS ); } -#if 0 -/* - * Turned into macros --- see sql-wrap.h - */ RETCODE -backsql_BindParamStr( SQLHSTMT sth, int par_ind, char *str, int maxlen ) -{ - RETCODE rc; - - rc = SQLBindParameter( sth, (SQLUSMALLINT)par_ind, SQL_PARAM_INPUT, - SQL_C_CHAR, SQL_VARCHAR, - (SQLUINTEGER)maxlen, 0, (SQLPOINTER)str, - (SQLUINTEGER)maxlen, NULL ); - return rc; -} - -RETCODE -backsql_BindParamID( SQLHSTMT sth, int par_ind, unsigned long *id ) -{ - return SQLBindParameter( sth, (SQLUSMALLINT)par_ind, - SQL_PARAM_INPUT, SQL_C_ULONG, SQL_INTEGER, - 0, 0, (SQLPOINTER)id, 0, (SQLINTEGER*)NULL ); -} -#endif - -RETCODE -backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row ) +backsql_BindRowAsStrings_x( SQLHSTMT sth, BACKSQL_ROW_NTS *row, void *ctx ) { RETCODE rc; SQLCHAR colname[ 64 ]; @@ -160,73 +148,71 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row ) rc = SQLNumResultCols( sth, &row->ncols ); if ( rc != SQL_SUCCESS ) { #ifdef BACKSQL_TRACE - Debug( LDAP_DEBUG_TRACE, "_SQLBindRowAsStrings(): " + Debug( LDAP_DEBUG_TRACE, "backsql_BindRowAsStrings(): " "SQLNumResultCols() failed:\n", 0, 0, 0 ); #endif /* BACKSQL_TRACE */ backsql_PrintErrors( SQL_NULL_HENV, SQL_NULL_HDBC, sth, rc ); + } else { #ifdef BACKSQL_TRACE Debug( LDAP_DEBUG_TRACE, "backsql_BindRowAsStrings: " "ncols=%d\n", (int)row->ncols, 0, 0 ); #endif /* BACKSQL_TRACE */ - row->col_names = (BerVarray)ch_calloc( row->ncols + 1, - sizeof( struct berval ) ); - row->cols = (char **)ch_calloc( row->ncols + 1, - sizeof( char * ) ); - row->col_prec = (UDWORD *)ch_calloc( row->ncols, - sizeof( UDWORD ) ); - row->is_null = (SQLINTEGER *)ch_calloc( row->ncols, - sizeof( SQLINTEGER ) ); + row->col_names = (BerVarray)ber_memcalloc_x( row->ncols + 1, + sizeof( struct berval ), ctx ); + if ( !row->col_names ) goto nomem3; + row->cols = (char **)ber_memcalloc_x( row->ncols + 1, + sizeof( char * ), ctx ); + if ( !row->cols ) goto nomem2; + row->col_prec = (UDWORD *)ber_memcalloc_x( row->ncols, + sizeof( UDWORD ), ctx ); + if ( !row->col_prec ) goto nomem1; + row->value_len = (SQLINTEGER *)ber_memcalloc_x( row->ncols, + sizeof( SQLINTEGER ), ctx ); + if ( !row->value_len ) { + ber_memfree_x( row->col_prec, ctx ); + row->col_prec = NULL; +nomem1: ber_memfree_x( row->cols, ctx ); + row->cols = NULL; +nomem2: ber_memfree_x( row->col_names, ctx ); + row->col_names = NULL; +nomem3: Debug( LDAP_DEBUG_ANY, "backsql_BindRowAsStrings: " + "out of memory\n", 0, 0, 0 ); + return LDAP_NO_MEMORY; + } for ( i = 1; i <= row->ncols; i++ ) { rc = SQLDescribeCol( sth, (SQLSMALLINT)i, &colname[ 0 ], (SQLUINTEGER)( sizeof( colname ) - 1 ), &name_len, &col_type, &col_prec, &col_scale, &col_null ); - ber_str2bv( colname, 0, 1, &row->col_names[ i - 1 ] ); + /* FIXME: test rc? */ + + ber_str2bv_x( (char *)colname, 0, 1, + &row->col_names[ i - 1 ], ctx ); #ifdef BACKSQL_TRACE Debug( LDAP_DEBUG_TRACE, "backsql_BindRowAsStrings: " "col_name=%s, col_prec[%d]=%d\n", colname, (int)i, (int)col_prec ); #endif /* BACKSQL_TRACE */ - if ( col_type == SQL_LONGVARCHAR - || col_type == SQL_LONGVARBINARY) { -#if 0 - row->cols[ i - 1 ] = NULL; - row->col_prec[ i - 1 ] = -1; - - /* - * such fields must be handled - * in some other way since they return 2G - * as their precision (at least it does so - * with MS SQL Server w/native driver) - * for now, we just set fixed precision - * for such fields - dirty hack, but... - * no time to deal with SQLGetData() - */ -#endif + if ( col_type != SQL_CHAR && col_type != SQL_VARCHAR ) + { col_prec = MAX_ATTR_LEN; - row->cols[ i - 1 ] = (char *)ch_calloc( col_prec + 1, sizeof( char ) ); - row->col_prec[ i - 1 ] = col_prec; - rc = SQLBindCol( sth, (SQLUSMALLINT)i, - SQL_C_CHAR, - (SQLPOINTER)row->cols[ i - 1 ], - col_prec + 1, - &row->is_null[ i - 1 ] ); - } else { - row->cols[ i - 1 ] = (char *)ch_calloc( col_prec + 1, sizeof( char ) ); - row->col_prec[ i - 1 ] = col_prec; - rc = SQLBindCol( sth, (SQLUSMALLINT)i, - SQL_C_CHAR, - (SQLPOINTER)row->cols[ i - 1 ], - col_prec + 1, - &row->is_null[ i - 1 ] ); } + + row->cols[ i - 1 ] = (char *)ber_memcalloc_x( col_prec + 1, + sizeof( char ), ctx ); + row->col_prec[ i - 1 ] = col_prec; + rc = SQLBindCol( sth, (SQLUSMALLINT)i, + SQL_C_CHAR, + (SQLPOINTER)row->cols[ i - 1 ], + col_prec + 1, + &row->value_len[ i - 1 ] ); + /* FIXME: test rc? */ } - row->col_names[ i - 1 ].bv_val = NULL; - row->col_names[ i - 1 ].bv_len = 0; + BER_BVZERO( &row->col_names[ i - 1 ] ); row->cols[ i - 1 ] = NULL; } @@ -238,23 +224,37 @@ backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row ) } RETCODE -backsql_FreeRow( BACKSQL_ROW_NTS *row ) +backsql_BindRowAsStrings( SQLHSTMT sth, BACKSQL_ROW_NTS *row ) +{ + return backsql_BindRowAsStrings_x( sth, row, NULL ); +} + +RETCODE +backsql_FreeRow_x( BACKSQL_ROW_NTS *row, void *ctx ) { if ( row->cols == NULL ) { return SQL_ERROR; } - ber_bvarray_free( row->col_names ); - charray_free( row->cols ); - free( row->col_prec ); - free( row->is_null ); + ber_bvarray_free_x( row->col_names, ctx ); + ber_memvfree_x( (void **)row->cols, ctx ); + ber_memfree_x( row->col_prec, ctx ); + ber_memfree_x( row->value_len, ctx ); return SQL_SUCCESS; } + +RETCODE +backsql_FreeRow( BACKSQL_ROW_NTS *row ) +{ + return backsql_FreeRow_x( row, NULL ); +} + static int -backsql_cmp_connid( backsql_db_conn *c1, backsql_db_conn *c2 ) +backsql_cmp_connid( const void *v_c1, const void *v_c2 ) { + const backsql_db_conn *c1 = v_c1, *c2 = v_c2; if ( c1->ldap_cid > c2->ldap_cid ) { return 1; } @@ -266,10 +266,14 @@ backsql_cmp_connid( backsql_db_conn *c1, backsql_db_conn *c2 ) return 0; } -static int -backsql_close_db_conn( backsql_db_conn *conn ) +static void +backsql_close_db_conn( void *v_conn ) { - Debug( LDAP_DEBUG_TRACE, "==>backsql_close_db_conn()\n", 0, 0, 0 ); + backsql_db_conn *conn = (backsql_db_conn *)v_conn; + unsigned long cid = conn->ldap_cid; + + Debug( LDAP_DEBUG_TRACE, "==>backsql_close_db_conn(%lu)\n", + cid, 0, 0 ); /* * Default transact is SQL_ROLLBACK; commit is required only @@ -281,36 +285,50 @@ backsql_close_db_conn( backsql_db_conn *conn ) SQLTransact( SQL_NULL_HENV, conn->dbh, SQL_ROLLBACK ); SQLDisconnect( conn->dbh ); SQLFreeConnect( conn->dbh ); - Debug( LDAP_DEBUG_TRACE, "<==backsql_close_db_conn()\n", 0, 0, 0 ); - return 1; + ch_free( conn ); + + Debug( LDAP_DEBUG_TRACE, "<==backsql_close_db_conn(%lu)\n", + cid, 0, 0 ); +} + +int +backsql_conn_destroy( + backsql_info *bi ) +{ + avl_free( bi->sql_db_conns, backsql_close_db_conn ); + + return 0; } int -backsql_init_db_env( backsql_info *si ) +backsql_init_db_env( backsql_info *bi ) { RETCODE rc; + int ret = SQL_SUCCESS; Debug( LDAP_DEBUG_TRACE, "==>backsql_init_db_env()\n", 0, 0, 0 ); - rc = SQLAllocEnv( &si->db_env ); + + rc = SQLAllocEnv( &bi->sql_db_env ); if ( rc != SQL_SUCCESS ) { Debug( LDAP_DEBUG_TRACE, "init_db_env: SQLAllocEnv failed:\n", 0, 0, 0 ); backsql_PrintErrors( SQL_NULL_HENV, SQL_NULL_HDBC, SQL_NULL_HENV, rc ); + ret = SQL_ERROR; } - Debug( LDAP_DEBUG_TRACE, "<==backsql_init_db_env()\n", 0, 0, 0 ); - return SQL_SUCCESS; + + Debug( LDAP_DEBUG_TRACE, "<==backsql_init_db_env()=%d\n", ret, 0, 0 ); + + return ret; } int -backsql_free_db_env( backsql_info *si ) +backsql_free_db_env( backsql_info *bi ) { Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_env()\n", 0, 0, 0 ); -#ifdef BACKSQL_TRACE - Debug( LDAP_DEBUG_TRACE, "free_db_env(): delete AVL tree here!!!\n", - 0, 0, 0 ); -#endif /* BACKSQL_TRACE */ + (void)SQLFreeEnv( bi->sql_db_env ); + bi->sql_db_env = SQL_NULL_HENV; /* * stop, if frontend waits for all threads to shutdown @@ -318,41 +336,46 @@ backsql_free_db_env( backsql_info *si ) * everything is already deleted... */ Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_env()\n", 0, 0, 0 ); + return SQL_SUCCESS; } static int -backsql_open_db_conn( backsql_info *si, int ldap_cid, backsql_db_conn **pdbc ) +backsql_open_db_conn( backsql_info *bi, unsigned long ldap_cid, backsql_db_conn **pdbc ) { /* TimesTen */ char DBMSName[ 32 ]; backsql_db_conn *dbc; int rc; - assert( pdbc ); + assert( pdbc != NULL ); *pdbc = NULL; - Debug( LDAP_DEBUG_TRACE, "==>backsql_open_db_conn()\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "==>backsql_open_db_conn(%lu)\n", + ldap_cid, 0, 0 ); + dbc = (backsql_db_conn *)ch_calloc( 1, sizeof( backsql_db_conn ) ); dbc->ldap_cid = ldap_cid; - rc = SQLAllocConnect( si->db_env, &dbc->dbh ); + rc = SQLAllocConnect( bi->sql_db_env, &dbc->dbh ); if ( !BACKSQL_SUCCESS( rc ) ) { - Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: " - "SQLAllocConnect() failed:\n", 0, 0, 0 ); - backsql_PrintErrors( si->db_env, SQL_NULL_HDBC, + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): " + "SQLAllocConnect() failed:\n", ldap_cid, 0, 0 ); + backsql_PrintErrors( bi->sql_db_env, SQL_NULL_HDBC, SQL_NULL_HENV, rc ); return LDAP_UNAVAILABLE; } - rc = SQLConnect( dbc->dbh, si->dbname, SQL_NTS, si->dbuser, - SQL_NTS, si->dbpasswd, SQL_NTS ); + rc = SQLConnect( dbc->dbh, + (SQLCHAR*)bi->sql_dbname, SQL_NTS, + (SQLCHAR*)bi->sql_dbuser, SQL_NTS, + (SQLCHAR*)bi->sql_dbpasswd, SQL_NTS ); if ( rc != SQL_SUCCESS ) { - Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: " - "SQLConnect() to database '%s' as user '%s' " - "%s:\n", si->dbname, si->dbuser, + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): " + "SQLConnect() to database \"%s\" %s.\n", + ldap_cid, bi->sql_dbname, rc == SQL_SUCCESS_WITH_INFO ? "succeeded with info" : "failed" ); - backsql_PrintErrors( si->db_env, dbc->dbh, SQL_NULL_HENV, rc ); + backsql_PrintErrors( bi->sql_db_env, dbc->dbh, SQL_NULL_HENV, rc ); if ( rc != SQL_SUCCESS_WITH_INFO ) { return LDAP_UNAVAILABLE; } @@ -369,30 +392,35 @@ backsql_open_db_conn( backsql_info *si, int ldap_cid, backsql_db_conn **pdbc ) * remember that fact for later use. */ /* Assume until proven otherwise */ - si->bsql_flags &= ~BSQLF_USE_REVERSE_DN; + bi->sql_flags &= ~BSQLF_USE_REVERSE_DN; DBMSName[ 0 ] = '\0'; rc = SQLGetInfo( dbc->dbh, SQL_DBMS_NAME, (PTR)&DBMSName, sizeof( DBMSName ), NULL ); if ( rc == SQL_SUCCESS ) { if ( strcmp( DBMSName, "TimesTen" ) == 0 || strcmp( DBMSName, "Front-Tier" ) == 0 ) { - Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: " - "TimesTen database!\n", 0, 0, 0 ); - si->bsql_flags |= BSQLF_USE_REVERSE_DN; + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): " + "TimesTen database!\n", ldap_cid, 0, 0 ); + bi->sql_flags |= BSQLF_USE_REVERSE_DN; } } else { - Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn: " - "SQLGetInfo() failed:\n", 0, 0, 0 ); - backsql_PrintErrors( si->db_env, dbc->dbh, SQL_NULL_HENV, rc ); + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): " + "SQLGetInfo() failed.\n", ldap_cid, 0, 0 ); + backsql_PrintErrors( bi->sql_db_env, dbc->dbh, SQL_NULL_HENV, rc ); + return rc; } /* end TimesTen */ - Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(): " - "connected, adding to tree\n", 0, 0, 0 ); - ldap_pvt_thread_mutex_lock( &si->dbconn_mutex ); - avl_insert( &si->db_conns, dbc, (AVL_CMP)backsql_cmp_connid, NULL ); - ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex ); - Debug( LDAP_DEBUG_TRACE, "<==backsql_open_db_conn()\n", 0, 0, 0 ); + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): " + "connected, adding to tree.\n", ldap_cid, 0, 0 ); + ldap_pvt_thread_mutex_lock( &bi->sql_dbconn_mutex ); + if ( avl_insert( &bi->sql_db_conns, dbc, backsql_cmp_connid, avl_dup_error ) ) { + Debug( LDAP_DEBUG_TRACE, "backsql_open_db_conn(%lu): " + "duplicate connection ID.\n", ldap_cid, 0, 0 ); + return LDAP_OTHER; + } + ldap_pvt_thread_mutex_unlock( &bi->sql_dbconn_mutex ); + Debug( LDAP_DEBUG_TRACE, "<==backsql_open_db_conn(%lu)\n", ldap_cid, 0, 0 ); *pdbc = dbc; @@ -400,17 +428,17 @@ backsql_open_db_conn( backsql_info *si, int ldap_cid, backsql_db_conn **pdbc ) } int -backsql_free_db_conn( Backend *be, Connection *ldapc ) +backsql_free_db_conn( Operation *op ) { - backsql_info *si = (backsql_info *)be->be_private; - backsql_db_conn tmp, *conn; + backsql_info *bi = (backsql_info *)op->o_bd->be_private; + backsql_db_conn tmp = { 0 }, + *conn; Debug( LDAP_DEBUG_TRACE, "==>backsql_free_db_conn()\n", 0, 0, 0 ); - tmp.ldap_cid = ldapc->c_connid; - ldap_pvt_thread_mutex_lock( &si->dbconn_mutex ); - conn = (backsql_db_conn *)avl_delete( &si->db_conns, &tmp, - (AVL_CMP)backsql_cmp_connid ); - ldap_pvt_thread_mutex_unlock( &si->dbconn_mutex ); + tmp.ldap_cid = op->o_connid; + ldap_pvt_thread_mutex_lock( &bi->sql_dbconn_mutex ); + conn = avl_delete( &bi->sql_db_conns, &tmp, backsql_cmp_connid ); + ldap_pvt_thread_mutex_unlock( &bi->sql_dbconn_mutex ); /* * we have one thread per connection, as I understand -- so we can @@ -418,36 +446,38 @@ backsql_free_db_conn( Backend *be, Connection *ldapc ) */ if ( conn != NULL ) { Debug( LDAP_DEBUG_TRACE, "backsql_free_db_conn(): " - "closing db connection\n", 0, 0, 0 ); - backsql_close_db_conn( conn ); + "closing db connection %lu (%p)\n", + op->o_connid, (void *)conn, 0 ); + backsql_close_db_conn( (void *)conn ); } + Debug( LDAP_DEBUG_TRACE, "<==backsql_free_db_conn()\n", 0, 0, 0 ); - return SQL_SUCCESS; + + return conn ? SQL_SUCCESS : SQL_ERROR; } int -backsql_get_db_conn( Backend *be, Connection *ldapc, SQLHDBC *dbh ) +backsql_get_db_conn( Operation *op, SQLHDBC *dbh ) { - backsql_info *si = (backsql_info *)be->be_private; - backsql_db_conn *dbc; - backsql_db_conn tmp; + backsql_info *bi = (backsql_info *)op->o_bd->be_private; + backsql_db_conn *dbc, + tmp = { 0 }; int rc = LDAP_SUCCESS; Debug( LDAP_DEBUG_TRACE, "==>backsql_get_db_conn()\n", 0, 0, 0 ); - assert( dbh ); + assert( dbh != NULL ); *dbh = SQL_NULL_HDBC; - tmp.ldap_cid = ldapc->c_connid; + tmp.ldap_cid = op->o_connid; /* * we have one thread per connection, as I understand -- * so we do not need locking here */ - dbc = (backsql_db_conn *)avl_find( si->db_conns, &tmp, - (AVL_CMP)backsql_cmp_connid ); + dbc = avl_find( bi->sql_db_conns, &tmp, backsql_cmp_connid ); if ( !dbc ) { - rc = backsql_open_db_conn( si, ldapc->c_connid, &dbc ); + rc = backsql_open_db_conn( bi, op->o_connid, &dbc ); if ( rc != LDAP_SUCCESS) { Debug( LDAP_DEBUG_TRACE, "backsql_get_db_conn(): " "could not get connection handle " @@ -456,18 +486,18 @@ backsql_get_db_conn( Backend *be, Connection *ldapc, SQLHDBC *dbh ) } } - ldap_pvt_thread_mutex_lock( &si->schema_mutex ); - if ( !BACKSQL_SCHEMA_LOADED( si ) ) { + ldap_pvt_thread_mutex_lock( &bi->sql_schema_mutex ); + if ( !BACKSQL_SCHEMA_LOADED( bi ) ) { Debug( LDAP_DEBUG_TRACE, "backsql_get_db_conn(): " "first call -- reading schema map\n", 0, 0, 0 ); - rc = backsql_load_schema_map( si, dbc->dbh ); + rc = backsql_load_schema_map( bi, dbc->dbh ); if ( rc != LDAP_SUCCESS ) { - ldap_pvt_thread_mutex_unlock( &si->schema_mutex ); - backsql_free_db_conn( be, ldapc ); + ldap_pvt_thread_mutex_unlock( &bi->sql_schema_mutex ); + backsql_free_db_conn( op ); return rc; } } - ldap_pvt_thread_mutex_unlock( &si->schema_mutex ); + ldap_pvt_thread_mutex_unlock( &bi->sql_schema_mutex ); *dbh = dbc->dbh; @@ -476,5 +506,3 @@ backsql_get_db_conn( Backend *be, Connection *ldapc, SQLHDBC *dbh ) return LDAP_SUCCESS; } -#endif /* SLAPD_SQL */ -