monetdb-java: src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in comparison

comparison src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in @ 172:60063c67f9e7 embedded

Merged with default

author	Pedro Ferreira <pedro.ferreira@monetdbsolutions.com>
date	Tue, 19 Sep 2017 13:49:34 +0200 (2017-09-19)
parents	477c4de0eda2 d6abd1ffffbb
children	89c285fc0a49

comparison

equal deleted inserted replaced

-:0f95fee3cf29
+:60063c67f9e7
 import nl.cwi.monetdb.mcl.connection.mapi.MapiLanguage;
 import nl.cwi.monetdb.mcl.protocol.ProtocolException;
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
+import java.net.SocketException;
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.sql.Connection;
 import java.sql.Driver;
 import java.sql.DriverManager;
 import java.sql.DriverPropertyInfo;
 import java.sql.SQLException;
 import java.sql.SQLFeatureNotSupportedException;
+import java.sql.SQLNonTransientConnectionException;
 import java.sql.Types;
 import java.util.*;
 import java.util.Map.Entry;
 import java.util.logging.Logger;
 	 * subprotocol specified in the URL and false if they do not.
 	 *
 	 * @param url the URL of the database
 	 * @return true if this driver understands the given URL; false otherwise
 	 */
+	@Override
 	public boolean acceptsURL(String url) {
 		return url != null && url.startsWith(MONETURL);
 	}
 	/**
 	 * Retrieves the driver's major version number. Initially this should be 1.
 	 *
 	 * @return this driver's major version number
 	 */
+	@Override
 	public int getMajorVersion() {
 		return DRIVERMAJOR;
 	}
 	/**
 	 * Gets the driver's minor version number. Initially this should be 0.
 	 *
 	 * @return this driver's minor version number
 	 */
+	@Override
 	public int getMinorVersion() {
 		return DRIVERMINOR;
 	}
 	/**
 	 * @param url the URL of the database to which to connect
 	 * @param info a proposed list of tag/value pairs that will be sent on connect open
 	 * @return an array of DriverPropertyInfo objects describing possible properties. This array may be an empty array
 	 * if no properties are required.
 	 */
+	@Override
 	public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) {
 		if (!acceptsURL(url))
 			return null;
 		List<DriverPropertyInfo> props = new ArrayList<>();
 	 * such as document information retrieval where a SQL implementation may not
 	 * be feasible.
 	 *
 	 * @return true if this driver is JDBC Compliant; false otherwise
 	 */
+	@Override
 	public boolean jdbcCompliant() {
 		return MONETJDBCCOMPLIANT;
 	}
 	//== end methods of interface driver
 	public static int getDriverMinorVersion() {
 		return DRIVERMINOR;
 	}
 	/**
-	 * Return the parent Logger of all the Loggers used by this data
+	 * Return the parent Logger of all the Loggers used by this data source.
-	 * source.  This should be the Logger farthest from the root Logger
+	 * This should be the Logger farthest from the root Logger that is
-	 * that is still an ancestor of all of the Loggers used by this data
+	 * still an ancestor of all of the Loggers used by this data source.
-	 * source.  Configuring this Logger will affect all of the log
+	 * Configuring this Logger will affect all of the log messages
-	 * messages generated by the data source. In the worst case, this
+	 * generated by the data source. In the worst case, this may be the root Logger.
-	 * may be the root Logger.
 	 *
 	 * @return the parent Logger for this data source
 	 * @throws SQLFeatureNotSupportedException if the data source does not use java.util.logging
-	 */
+	 * @since 1.7
+	 */
+	@Override
 	public Logger getParentLogger() throws SQLFeatureNotSupportedException {
 		throw new SQLFeatureNotSupportedException("java.util.logging not in use", "0A000");
 	}
 	/**
 	 * The java.util.Properties argument can be used to pass arbitrary string
 	 * tag/value pairs as connection arguments. Normally at least "user" and
 	 * "password" properties should be included in the Properties object.
 	 *
 	 * @param url the URL of the database to which to connect
-	 * @param info a list of arbitrary string tag/value pairs as connection
+	 * @param info a list of arbitrary string tag/value pairs as connection  arguments. Normally at least a "user" and
-	 *        arguments. Normally at least a "user" and "password" property
+	 * "password" property  should be included
-	 *        should be included
 	 * @return a Connection object that represents a connection to the URL
 	 * @throws SQLException if a database access error occurs
 	 */
 	public Connection connect(String url, Properties info) throws SQLException {
 		int tmp;
 				if (directory != null && (directory.trim().isEmpty() || directory.equals(":memory:")))
 					directory = null;
 				if(embeddedConnectionClass == null) {
 					embeddedConnectionClass = Class.forName("nl.cwi.monetdb.embedded.jdbc.EmbeddedConnection");
 					if(embeddedConnectionClass == null) { //if it is still null then there is a problem!
-						throw new SQLException("EmbeddedConnection Class not found! Please add monetdb-java-lite jar to the CLASSPATH");
+						throw new SQLNonTransientConnectionException("EmbeddedConnection Class not found! Please add monetdb-java-lite jar to the CLASSPATH");
 					}
 				}
 				res = (MonetConnection) embeddedConnectionClass
 					.getDeclaredConstructor(Properties.class, String.class, String.class, String.class)
 					.newInstance(props, hash, language, directory);
 			} catch (InvocationTargetException | InstantiationException | IllegalAccessException |
 					 NoSuchMethodException | ClassNotFoundException e) {
-				throw new SQLException(e);
+				throw new SQLNonTransientConnectionException(e);
 			}
 		} else {
 			String hostname = props.getProperty("host");
 			if (hostname == null || hostname.trim().isEmpty())
 				throw new IllegalArgumentException("hostname should not be null or empty");
 			if (sockTimeout < 0) {
 				negative2 = true;
 				sockTimeout = 0;
 				props.setProperty("so_timeout", "0");
 			}
-			try {
+			res = new MapiConnection(props, hash, language, blobIsBinary, clobIsLongChar, hostname, port, database);
-				res = new MapiConnection(props, hash, language, blobIsBinary, clobIsLongChar, hostname, port, database);
-			} catch (IOException e) {
-				throw new SQLException(e);
-			}
 			if(failedparse1) {
 				res.addWarning("Unable to parse port number from: " + port, "M1M05");
 			}
 			if(negative1) {
 				res.addWarning("Negative port not allowed. Value ignored", "M1M05");
 				res.addWarning("Unable to parse socket timeout number from: " + timeout, "M1M05");
 			}
 			if(negative2) {
 				res.addWarning("Negative socket timeout not allowed. Value ignored", "M1M05");
 			}
-			res.setSoTimeout(sockTimeout);
+			try {
+				res.setSoTimeout(sockTimeout);
+			} catch(SocketException ex) {
+			    res.addWarning("Failed to set socket timeout: " + ex.getMessage(), "M1M05");
+			}
 		}
 		try { //attempt to connect and authenticate the user
 			List<String> warnings = res.connect(username, password);
 			if(warnings != null) {
 			if(!isEmbedded) {
 				MapiConnection con = (MapiConnection) res;
 				throw new SQLException("Unable to connect (" + con.getHostname() + ":"
 						+ con.getPort() + "): " + e.getMessage(), "08006");
 			} else {
-				throw new SQLException("Unable to connect: " + e.getMessage(), "08006");
+				throw new SQLNonTransientConnectionException("Unable to connect: " + e.getMessage(), "08006");
 			}
 		} catch (ProtocolException e) {
-			throw new SQLException(e.getMessage(), "08001");
+			throw new SQLNonTransientConnectionException(e.getMessage(), "08001");
 		} catch (MCLException e) {
 			String[] connex = e.getMessage().split("\n");
-			SQLException sqle = new SQLException(connex[0], "08001", e);
+			SQLException sqle = new SQLNonTransientConnectionException(connex[0], "08001", e);
 			for (int i = 1; i < connex.length; i++) {
-				sqle.setNextException(new SQLException(connex[1], "08001"));
+				sqle.setNextException(new SQLNonTransientConnectionException(connex[1], "08001"));
 			}
 			throw sqle;
 		}
 		if (!isEmbedded && res.getLanguage() == MapiLanguage.LANG_SQL) { //set the timezone only in the MAPI connection

Mercurial > hg > monetdb-java

comparison src/main/java/nl/cwi/monetdb/jdbc/MonetDriver.java.in @ 172:60063c67f9e7 embedded