From 9264fc5bb2188043bcd19d0e549bf1e55f685d38 Mon Sep 17 00:00:00 2001 From: Hari Babu Date: Fri, 22 Feb 2019 00:09:02 +1100 Subject: [PATCH 2/4] New TargetSessionAttrsType enum This new enum is useful to compare the requested session type instead of comparing it with string always. This may not show much improvement with current code, but it will be useful with further patches --- src/interfaces/libpq/fe-connect.c | 10 ++++++---- src/interfaces/libpq/libpq-fe.h | 6 ++++++ src/interfaces/libpq/libpq-int.h | 1 + 3 files changed, 13 insertions(+), 4 deletions(-) diff --git a/src/interfaces/libpq/fe-connect.c b/src/interfaces/libpq/fe-connect.c index fa157bd2dc..e03d78d3f8 100644 --- a/src/interfaces/libpq/fe-connect.c +++ b/src/interfaces/libpq/fe-connect.c @@ -1239,8 +1239,11 @@ connectOptions2(PGconn *conn) */ if (conn->target_session_attrs) { - if (strcmp(conn->target_session_attrs, "any") != 0 - && strcmp(conn->target_session_attrs, "read-write") != 0) + if (strcmp(conn->target_session_attrs, "any") == 0) + conn->requested_session_type = SESSION_TYPE_ANY; + else if (strcmp(conn->target_session_attrs, "read-write") == 0) + conn->requested_session_type = SESSION_TYPE_READ_WRITE; + else { conn->status = CONNECTION_BAD; printfPQExpBuffer(&conn->errorMessage, @@ -3229,8 +3232,7 @@ keep_going: /* We will come back to here until there is * may just skip the test in that case. */ if (conn->sversion >= 70400 && - conn->target_session_attrs != NULL && - strcmp(conn->target_session_attrs, "read-write") == 0) + conn->requested_session_type == SESSION_TYPE_READ_WRITE) { /* * Save existing error messages across the PQsendQuery diff --git a/src/interfaces/libpq/libpq-fe.h b/src/interfaces/libpq/libpq-fe.h index 1961161b35..15bb82a885 100644 --- a/src/interfaces/libpq/libpq-fe.h +++ b/src/interfaces/libpq/libpq-fe.h @@ -71,6 +71,12 @@ typedef enum * them. */ } ConnStatusType; +typedef enum +{ + SESSION_TYPE_ANY = 0, /* Any session (default) */ + SESSION_TYPE_READ_WRITE /* Read-write session */ +} TargetSessionAttrsType; + typedef enum { PGRES_POLLING_FAILED = 0, diff --git a/src/interfaces/libpq/libpq-int.h b/src/interfaces/libpq/libpq-int.h index 4a93d8edbc..43aa6b5f30 100644 --- a/src/interfaces/libpq/libpq-int.h +++ b/src/interfaces/libpq/libpq-int.h @@ -365,6 +365,7 @@ struct pg_conn /* Type of connection to make. Possible values: any, read-write. */ char *target_session_attrs; + TargetSessionAttrsType requested_session_type; /* Optional file to write trace info to */ FILE *Pfdebug; -- 2.20.1.windows.1