hcq/sysbench
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '0.4' into 0.5

Browse Source
This commit is contained in:
Alexey Kopytov
2015-09-23 17:17:17 +03:00
parent ab36a80c53 76fc3ef79e
commit e3165acb64
2 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysbench/drivers/pgsql/Makefile.am
View File

@ -17,4 +17,4 @@
noinst_LIBRARIES = libsbpgsql.a
libsbpgsql_a_SOURCES = drv_pgsql.c
libsbpgsql_a_CPPFLAGS = $(PGSQL_CFLAGS) $(AM_CPPFLAGS)
libsbpgsql_a_CPPFLAGS = -g $(PGSQL_CFLAGS) $(AM_CPPFLAGS)

23
sysbench/drivers/pgsql/drv_pgsql.c
View File

@ -511,12 +511,19 @@ int pgsql_drv_execute(db_stmt_t *stmt, db_result_set_t *rs)
status = PQresultStatus(pgres);
if (status != PGRES_TUPLES_OK && status != PGRES_COMMAND_OK)
{
log_text(LOG_FATAL, "PQexecPrepared() failed: %d %s", status,
PQerrorMessage(pgcon));
const char * const errmsg = PQerrorMessage(pgcon);
if (strstr(errmsg, "deadlock detected"))
{
PQexec(pgcon, "ROLLBACK");
return SB_DB_ERROR_RESTART_TRANSACTION;
}
log_text(LOG_FATAL, "PQexecPrepared() failed: %d %s", status, errmsg);
return SB_DB_ERROR_FAILED;
}
rs->ptr = (void *)pgres;
return SB_DB_ERROR_NONE;
}
@ -580,8 +587,16 @@ int pgsql_drv_query(db_conn_t *sb_conn, const char *query,
status = PQresultStatus(pgres);
if (status != PGRES_TUPLES_OK && status != PGRES_COMMAND_OK)
{
const char * const errmsg = PQerrorMessage(con);
if (strstr(errmsg, "deadlock detected"))
{
PQexec(con, "ROLLBACK");
return SB_DB_ERROR_RESTART_TRANSACTION;
}
log_text(LOG_ALERT, "failed to execute query: %s:", query);
log_text(LOG_ALERT, "error: %d %s", status, PQerrorMessage(con));
log_text(LOG_ALERT, "error: %d %s", status, errmsg);
return SB_DB_ERROR_FAILED;
}