After requesting an upgrade to SSL from the server there are reports of the server not responding due to a failover - * without a timeout here, the client can wait forever. This timeout will be set before the request and reset after
- */ - SSL_RESPONSE_TIMEOUT( - "sslResponseTimeout", - "5000", - "Time in milliseconds we wait for a response from the server after requesting SSL upgrade"), - /** * File containing the root certificate when validating server ({@code sslmode} = {@code * verify-ca} or {@code verify-full}). Default will be the file {@code root.crt} in {@code diff --git a/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java b/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java index 6ef64db941..0e10796863 100644 --- a/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java +++ b/pgjdbc/src/main/java/org/postgresql/core/v3/ConnectionFactoryImpl.java @@ -532,17 +532,6 @@ private PGStream enableSSL(PGStream pgStream, SslMode sslMode, Properties info, LOGGER.log(Level.FINEST, " FE=> SSLRequest"); - int sslTimeout = PGProperty.SSL_RESPONSE_TIMEOUT.getInt(info); - int currentTimeout = pgStream.getSocket().getSoTimeout(); - - // if the current timeout is less than sslTimeout then - // use the smaller timeout. We could do something tricky - // here to not set it in that case but this is pretty readable - if (currentTimeout > 0 && currentTimeout < sslTimeout) { - sslTimeout = currentTimeout; - } - - pgStream.getSocket().setSoTimeout(sslTimeout); // Send SSL request packet pgStream.sendInteger4(8); pgStream.sendInteger2(1234); @@ -551,8 +540,6 @@ private PGStream enableSSL(PGStream pgStream, SslMode sslMode, Properties info, // Now get the response from the backend, one of N, E, S. int beresp = pgStream.receiveChar(); - pgStream.getSocket().setSoTimeout(currentTimeout); - switch (beresp) { case 'E': LOGGER.log(Level.FINEST, " <=BE SSLError"); diff --git a/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java b/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java index 4a75fdc736..8fc68cd926 100644 --- a/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java +++ b/pgjdbc/src/main/java/org/postgresql/ds/common/BaseDataSource.java @@ -354,24 +354,6 @@ public void setConnectTimeout(int connectTimeout) { PGProperty.CONNECT_TIMEOUT.set(properties, connectTimeout); } - /** - * - * @return SSL ResponseTimeout - * @see PGProperty#SSL_RESPONSE_TIMEOUT - */ - public int getSslResponseTimeout() { - return PGProperty.SSL_RESPONSE_TIMEOUT.getIntNoCheck(properties); - } - - /** - * - * @param sslResponseTimeout ssl response timeout - * @see PGProperty#SSL_RESPONSE_TIMEOUT - */ - public void setSslResponseTimeout(int sslResponseTimeout) { - PGProperty.SSL_RESPONSE_TIMEOUT.set(properties,sslResponseTimeout); - } - /** * @return protocol version * @see PGProperty#PROTOCOL_VERSION diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java index db466c864a..a4105461c4 100644 --- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java +++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgCallableStatement.java @@ -80,79 +80,79 @@ public int executeUpdate() throws SQLException { @Override public boolean executeWithFlags(int flags) throws SQLException { - synchronized (this) { - boolean hasResultSet = super.executeWithFlags(flags); - int[] functionReturnType = this.functionReturnType; - if (!isFunction || !returnTypeSet || functionReturnType == null) { - return hasResultSet; - } + boolean hasResultSet = super.executeWithFlags(flags); + int[] functionReturnType = this.functionReturnType; + if (!isFunction || !returnTypeSet || functionReturnType == null) { + return hasResultSet; + } - // If we are executing and there are out parameters - // callable statement function set the return data - if (!hasResultSet) { - throw new PSQLException(GT.tr("A CallableStatement was executed with nothing returned."), - PSQLState.NO_DATA); - } + // If we are executing and there are out parameters + // callable statement function set the return data + if (!hasResultSet) { + throw new PSQLException(GT.tr("A CallableStatement was executed with nothing returned."), + PSQLState.NO_DATA); + } - ResultSet rs = castNonNull(getResultSet()); - if (!rs.next()) { - throw new PSQLException(GT.tr("A CallableStatement was executed with nothing returned."), - PSQLState.NO_DATA); - } + ResultSet rs = castNonNull(getResultSet()); + if (!rs.next()) { + throw new PSQLException(GT.tr("A CallableStatement was executed with nothing returned."), + PSQLState.NO_DATA); + } - // figure out how many columns - int cols = rs.getMetaData().getColumnCount(); + // figure out how many columns + int cols = rs.getMetaData().getColumnCount(); - int outParameterCount = preparedParameters.getOutParameterCount(); + int outParameterCount = preparedParameters.getOutParameterCount(); - if (cols != outParameterCount) { - throw new PSQLException( - GT.tr("A CallableStatement was executed with an invalid number of parameters"), - PSQLState.SYNTAX_ERROR); + if (cols != outParameterCount) { + throw new PSQLException( + GT.tr("A CallableStatement was executed with an invalid number of parameters"), + PSQLState.SYNTAX_ERROR); + } + + // reset last result fetched (for wasNull) + lastIndex = 0; + + // allocate enough space for all possible parameters without regard to in/out + @Nullable Object[] callResult = new Object[preparedParameters.getParameterCount() + 1]; + this.callResult = callResult; + + // move them into the result set + for (int i = 0, j = 0; i < cols; i++, j++) { + // find the next out parameter, the assumption is that the functionReturnType + // array will be initialized with 0 and only out parameters will have values + // other than 0. 0 is the value for java.sql.Types.NULL, which should not + // conflict + while (j < functionReturnType.length && functionReturnType[j] == 0) { + j++; } - // reset last result fetched (for wasNull) - lastIndex = 0; - - // allocate enough space for all possible parameters without regard to in/out - @Nullable Object[] callResult = new Object[preparedParameters.getParameterCount() + 1]; - this.callResult = callResult; - - // move them into the result set - for (int i = 0, j = 0; i < cols; i++, j++) { - // find the next out parameter, the assumption is that the functionReturnType - // array will be initialized with 0 and only out parameters will have values - // other than 0. 0 is the value for java.sql.Types.NULL, which should not - // conflict - while (j < functionReturnType.length && functionReturnType[j] == 0) { - j++; - } + callResult[j] = rs.getObject(i + 1); + int columnType = rs.getMetaData().getColumnType(i + 1); - callResult[j] = rs.getObject(i + 1); - int columnType = rs.getMetaData().getColumnType(i + 1); - - if (columnType != functionReturnType[j]) { - // this is here for the sole purpose of passing the cts - if (columnType == Types.DOUBLE && functionReturnType[j] == Types.REAL) { - // return it as a float - Object result = callResult[j]; - if (result != null) { - callResult[j] = ((Double) result).floatValue(); - } - } else if (columnType == Types.REF_CURSOR && functionReturnType[j] == Types.OTHER) { - // For backwards compatibility reasons we support that ref cursors can be - // registered with both Types.OTHER and Types.REF_CURSOR so we allow - // this specific mismatch - } else { - throw new PSQLException(GT.tr( - "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.", - i + 1, "java.sql.Types=" + columnType, "java.sql.Types=" + functionReturnType[j]), - PSQLState.DATA_TYPE_MISMATCH); + if (columnType != functionReturnType[j]) { + // this is here for the sole purpose of passing the cts + if (columnType == Types.DOUBLE && functionReturnType[j] == Types.REAL) { + // return it as a float + Object result = callResult[j]; + if (result != null) { + callResult[j] = ((Double) result).floatValue(); } + } else if (columnType == Types.REF_CURSOR && functionReturnType[j] == Types.OTHER) { + // For backwards compatibility reasons we support that ref cursors can be + // registered with both Types.OTHER and Types.REF_CURSOR so we allow + // this specific mismatch + } else { + throw new PSQLException(GT.tr( + "A CallableStatement function was executed and the out parameter {0} was of type {1} however type {2} was registered.", + i + 1, "java.sql.Types=" + columnType, "java.sql.Types=" + functionReturnType[j]), + PSQLState.DATA_TYPE_MISMATCH); } - } - rs.close(); + + } + rs.close(); + synchronized (this) { result = null; } return false; diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java index 30541a8eae..e4cea2af1d 100644 --- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java +++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgConnection.java @@ -1454,13 +1454,8 @@ public boolean isValid(int timeout) throws SQLException { statement.execute("IDENTIFY_SYSTEM"); statement.close(); } else { - PreparedStatement checkConnectionQuery; - synchronized (this) { - checkConnectionQuery = this.checkConnectionQuery; - if (checkConnectionQuery == null) { - checkConnectionQuery = prepareStatement(""); - this.checkConnectionQuery = checkConnectionQuery; - } + if (checkConnectionQuery == null) { + checkConnectionQuery = prepareStatement(""); } checkConnectionQuery.executeUpdate(); } diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java index 3588f464c9..590670a9fe 100644 --- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java +++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgDatabaseMetaData.java @@ -2696,11 +2696,11 @@ public ResultSet getUDTs(@Nullable String catalog, @Nullable String schemaPatter long longTypOid = typeInfo.intOidToLong(typOid); int sqlType = typeInfo.getSQLType(typOid); - sqlwhen.append(" when base_type.oid = ").append(longTypOid).append(" then ").append(sqlType); + sqlwhen.append(" when oid = ").append(longTypOid).append(" then ").append(sqlType); } sql += sqlwhen.toString(); - sql += " else " + java.sql.Types.OTHER + " end from pg_type base_type where base_type.oid=t.typbasetype) " + sql += " else " + java.sql.Types.OTHER + " end from pg_type where oid=t.typbasetype) " + "else null end as base_type " + "from pg_catalog.pg_type t, pg_catalog.pg_namespace n where t.typnamespace = n.oid and n.nspname != 'pg_catalog' and n.nspname != 'pg_toast'"; diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java index 92e261d815..d6cb55aef1 100644 --- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java +++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgPreparedStatement.java @@ -130,13 +130,11 @@ public ResultSet executeQuery(String sql) throws SQLException { */ @Override public ResultSet executeQuery() throws SQLException { - synchronized (this) { - if (!executeWithFlags(0)) { - throw new PSQLException(GT.tr("No results were returned by the query."), PSQLState.NO_DATA); - } - - return getSingleResultSet(); + if (!executeWithFlags(0)) { + throw new PSQLException(GT.tr("No results were returned by the query."), PSQLState.NO_DATA); } + + return getSingleResultSet(); } @Override @@ -148,20 +146,16 @@ public int executeUpdate(String sql) throws SQLException { @Override public int executeUpdate() throws SQLException { - synchronized (this) { - executeWithFlags(QueryExecutor.QUERY_NO_RESULTS); - checkNoResultUpdate(); - return getUpdateCount(); - } + executeWithFlags(QueryExecutor.QUERY_NO_RESULTS); + checkNoResultUpdate(); + return getUpdateCount(); } @Override public long executeLargeUpdate() throws SQLException { - synchronized (this) { - executeWithFlags(QueryExecutor.QUERY_NO_RESULTS); - checkNoResultUpdate(); - return getLargeUpdateCount(); - } + executeWithFlags(QueryExecutor.QUERY_NO_RESULTS); + checkNoResultUpdate(); + return getLargeUpdateCount(); } @Override @@ -173,22 +167,20 @@ public boolean execute(String sql) throws SQLException { @Override public boolean execute() throws SQLException { - synchronized (this) { - return executeWithFlags(0); - } + return executeWithFlags(0); } public boolean executeWithFlags(int flags) throws SQLException { try { - synchronized (this) { - checkClosed(); + checkClosed(); - if (connection.getPreferQueryMode() == PreferQueryMode.SIMPLE) { - flags |= QueryExecutor.QUERY_EXECUTE_AS_SIMPLE; - } + if (connection.getPreferQueryMode() == PreferQueryMode.SIMPLE) { + flags |= QueryExecutor.QUERY_EXECUTE_AS_SIMPLE; + } - execute(preparedQuery, preparedParameters, flags); + execute(preparedQuery, preparedParameters, flags); + synchronized (this) { checkClosed(); return (result != null && result.getResultSet() != null); } diff --git a/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java b/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java index 19f071f77e..438ab66c89 100644 --- a/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java +++ b/pgjdbc/src/main/java/org/postgresql/jdbc/PgStatement.java @@ -240,13 +240,11 @@ public void handleWarning(SQLWarning warning) { @Override public ResultSet executeQuery(String sql) throws SQLException { - synchronized (this) { - if (!executeWithFlags(sql, 0)) { - throw new PSQLException(GT.tr("No results were returned by the query."), PSQLState.NO_DATA); - } - - return getSingleResultSet(); + if (!executeWithFlags(sql, 0)) { + throw new PSQLException(GT.tr("No results were returned by the query."), PSQLState.NO_DATA); } + + return getSingleResultSet(); } protected ResultSet getSingleResultSet() throws SQLException { @@ -264,11 +262,9 @@ protected ResultSet getSingleResultSet() throws SQLException { @Override public int executeUpdate(String sql) throws SQLException { - synchronized (this) { - executeWithFlags(sql, QueryExecutor.QUERY_NO_RESULTS); - checkNoResultUpdate(); - return getUpdateCount(); - } + executeWithFlags(sql, QueryExecutor.QUERY_NO_RESULTS); + checkNoResultUpdate(); + return getUpdateCount(); } protected final void checkNoResultUpdate() throws SQLException { @@ -408,19 +404,17 @@ protected boolean isOneShotQuery(@Nullable CachedQuery cachedQuery) { protected final void execute(CachedQuery cachedQuery, @Nullable ParameterList queryParameters, int flags) throws SQLException { - synchronized (this) { - try { - executeInternal(cachedQuery, queryParameters, flags); - } catch (SQLException e) { - // Don't retry composite queries as it might get partially executed - if (cachedQuery.query.getSubqueries() != null - || !connection.getQueryExecutor().willHealOnRetry(e)) { - throw e; - } - cachedQuery.query.close(); - // Execute the query one more time - executeInternal(cachedQuery, queryParameters, flags); + try { + executeInternal(cachedQuery, queryParameters, flags); + } catch (SQLException e) { + // Don't retry composite queries as it might get partially executed + if (cachedQuery.query.getSubqueries() != null + || !connection.getQueryExecutor().willHealOnRetry(e)) { + throw e; } + cachedQuery.query.close(); + // Execute the query one more time + executeInternal(cachedQuery, queryParameters, flags); } } @@ -520,10 +514,7 @@ public void setCursorName(String name) throws SQLException { // No-op. } - private volatile int isClosed = 0; - private static final AtomicIntegerFieldUpdater