nullables;
@@ -143,6 +145,7 @@ public SFResultSetMetaData(
this.columnTypeNames = new ArrayList<>(this.columnCount);
this.columnTypes = new ArrayList<>(this.columnCount);
this.precisions = new ArrayList<>(this.columnCount);
+ this.dimensions = new ArrayList<>(this.columnCount);
this.scales = new ArrayList<>(this.columnCount);
this.nullables = new ArrayList<>(this.columnCount);
this.columnSrcDatabases = new ArrayList<>(this.columnCount);
@@ -156,6 +159,7 @@ public SFResultSetMetaData(
columnNames.add(columnMetadata.get(colIdx).getName());
columnTypeNames.add(columnMetadata.get(colIdx).getTypeName());
precisions.add(calculatePrecision(columnMetadata.get(colIdx)));
+ dimensions.add(calculateDimension(columnMetadata.get(colIdx)));
columnTypes.add(columnMetadata.get(colIdx).getType());
scales.add(columnMetadata.get(colIdx).getScale());
nullables.add(
@@ -200,6 +204,14 @@ private Integer calculatePrecision(SnowflakeColumnMetadata columnMetadata) {
}
}
+ private Integer calculateDimension(SnowflakeColumnMetadata columnMetadata) {
+ int columnType = columnMetadata.getType();
+ if (columnType == SnowflakeUtil.EXTRA_TYPES_VECTOR) {
+ return columnMetadata.getDimension();
+ }
+ return 0;
+ }
+
private Integer calculateDisplaySize(SnowflakeColumnMetadata columnMetadata) {
int columnType = columnMetadata.getType();
switch (columnType) {
@@ -403,6 +415,14 @@ public int getPrecision(int column) {
}
}
+ public int getDimension(int column) {
+ if (dimensions != null && dimensions.size() >= column && column > 0) {
+ return dimensions.get(column - 1);
+ } else {
+ return 0;
+ }
+ }
+
public boolean isSigned(int column) {
return (columnTypes.get(column - 1) == Types.INTEGER
|| columnTypes.get(column - 1) == Types.DECIMAL
diff --git a/src/main/java/net/snowflake/client/core/SFSSLConnectionSocketFactory.java b/src/main/java/net/snowflake/client/core/SFSSLConnectionSocketFactory.java
index bbd1e1c14..aca26a272 100644
--- a/src/main/java/net/snowflake/client/core/SFSSLConnectionSocketFactory.java
+++ b/src/main/java/net/snowflake/client/core/SFSSLConnectionSocketFactory.java
@@ -23,7 +23,8 @@
/** Snowflake custom SSLConnectionSocketFactory */
public class SFSSLConnectionSocketFactory extends SSLConnectionSocketFactory {
- static final SFLogger logger = SFLoggerFactory.getLogger(SFSSLConnectionSocketFactory.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SFSSLConnectionSocketFactory.class);
private static final String SSL_VERSION = "TLSv1.2";
diff --git a/src/main/java/net/snowflake/client/core/SFSession.java b/src/main/java/net/snowflake/client/core/SFSession.java
index d7ee69a07..bb0b2b2a8 100644
--- a/src/main/java/net/snowflake/client/core/SFSession.java
+++ b/src/main/java/net/snowflake/client/core/SFSession.java
@@ -21,6 +21,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Optional;
import java.util.Set;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
@@ -40,11 +41,14 @@
import net.snowflake.client.jdbc.SnowflakeSQLException;
import net.snowflake.client.jdbc.SnowflakeSQLLoggedException;
import net.snowflake.client.jdbc.SnowflakeUtil;
+import net.snowflake.client.jdbc.diagnostic.DiagnosticContext;
import net.snowflake.client.jdbc.telemetry.Telemetry;
import net.snowflake.client.jdbc.telemetry.TelemetryClient;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
+import net.snowflake.client.log.SFLoggerUtil;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.ClientAuthnDTO;
import net.snowflake.common.core.SqlState;
import org.apache.http.HttpHeaders;
@@ -58,7 +62,7 @@ public class SFSession extends SFBaseSession {
public static final String SF_HEADER_AUTHORIZATION = HttpHeaders.AUTHORIZATION;
public static final String SF_HEADER_SNOWFLAKE_AUTHTYPE = "Snowflake";
public static final String SF_HEADER_TOKEN_TAG = "Token";
- static final SFLogger logger = SFLoggerFactory.getLogger(SFSession.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SFSession.class);
private static final ObjectMapper OBJECT_MAPPER = ObjectMapperFactory.getObjectMapper();
private static final String SF_PATH_SESSION_HEARTBEAT = "/session/heartbeat";
private static final String SF_PATH_QUERY_MONITOR = "/monitoring/queries/";
@@ -94,6 +98,7 @@ public class SFSession extends SFBaseSession {
* Default:300 seconds
*/
private int loginTimeout = 300;
+
/**
* Amount of milliseconds a user is willing to tolerate for network related issues (e.g. HTTP
* 503/504) or database transient issues (e.g. GS not responding)
@@ -213,7 +218,7 @@ private JsonNode getQueryMetadata(String queryID) throws SQLException {
loginTimeout,
authTimeout,
(int) httpClientSocketTimeout.toMillis(),
- 0,
+ maxHttpRetries,
getHttpClientKey());
jsonNode = OBJECT_MAPPER.readTree(response);
} catch (Exception e) {
@@ -224,7 +229,7 @@ private JsonNode getQueryMetadata(String queryID) throws SQLException {
// Get response as JSON and parse it to get the query status
// check the success field first
if (!jsonNode.path("success").asBoolean()) {
- logger.debug("response = {}", response);
+ logger.debug("Response: {}", response);
int errorCode = jsonNode.path("code").asInt();
// If the error is due to an expired session token, try renewing the session and trying
@@ -511,21 +516,23 @@ public boolean containProperty(String key) {
* @throws SnowflakeSQLException exception raised from Snowflake components
*/
public synchronized void open() throws SFException, SnowflakeSQLException {
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
performSanityCheckOnProperties();
Map connectionPropertiesMap = getConnectionPropertiesMap();
- logger.debug(
- "input: server={}, account={}, user={}, password={}, role={}, database={}, schema={},"
- + " warehouse={}, validate_default_parameters={}, authenticator={}, ocsp_mode={},"
- + " passcode_in_password={}, passcode={}, private_key={}, disable_socks_proxy={},"
- + " application={}, app_id={}, app_version={}, login_timeout={}, retry_timeout={}, network_timeout={},"
- + " query_timeout={}, tracing={}, private_key_file={}, private_key_file_pwd={}."
- + " session_parameters: client_store_temporary_credential={}, gzip_disabled={}",
+ logger.info(
+ "Opening session with server: {}, account: {}, user: {}, password is {}, role: {}, database: {}, schema: {},"
+ + " warehouse: {}, validate default parameters: {}, authenticator: {}, ocsp mode: {},"
+ + " passcode in password: {}, passcode is {}, private key is {}, disable socks proxy: {},"
+ + " application: {}, app id: {}, app version: {}, login timeout: {}, retry timeout: {}, network timeout: {},"
+ + " query timeout: {}, tracing: {}, private key file: {}, private key file pwd is {},"
+ + " enable_diagnostics: {}, diagnostics_allowlist_path: {},"
+ + " session parameters: client store temporary credential: {}, gzip disabled: {}",
connectionPropertiesMap.get(SFSessionProperty.SERVER_URL),
connectionPropertiesMap.get(SFSessionProperty.ACCOUNT),
connectionPropertiesMap.get(SFSessionProperty.USER),
- !Strings.isNullOrEmpty((String) connectionPropertiesMap.get(SFSessionProperty.PASSWORD))
- ? "***"
- : "(empty)",
+ SFLoggerUtil.isVariableProvided(
+ (String) connectionPropertiesMap.get(SFSessionProperty.PASSWORD)),
connectionPropertiesMap.get(SFSessionProperty.ROLE),
connectionPropertiesMap.get(SFSessionProperty.DATABASE),
connectionPropertiesMap.get(SFSessionProperty.SCHEMA),
@@ -534,12 +541,9 @@ public synchronized void open() throws SFException, SnowflakeSQLException {
connectionPropertiesMap.get(SFSessionProperty.AUTHENTICATOR),
getOCSPMode().name(),
connectionPropertiesMap.get(SFSessionProperty.PASSCODE_IN_PASSWORD),
- !Strings.isNullOrEmpty((String) connectionPropertiesMap.get(SFSessionProperty.PASSCODE))
- ? "***"
- : "(empty)",
- connectionPropertiesMap.get(SFSessionProperty.PRIVATE_KEY) != null
- ? "(not null)"
- : "(null)",
+ SFLoggerUtil.isVariableProvided(
+ (String) connectionPropertiesMap.get(SFSessionProperty.PASSCODE)),
+ SFLoggerUtil.isVariableProvided(connectionPropertiesMap.get(SFSessionProperty.PRIVATE_KEY)),
connectionPropertiesMap.get(SFSessionProperty.DISABLE_SOCKS_PROXY),
connectionPropertiesMap.get(SFSessionProperty.APPLICATION),
connectionPropertiesMap.get(SFSessionProperty.APP_ID),
@@ -550,22 +554,22 @@ public synchronized void open() throws SFException, SnowflakeSQLException {
connectionPropertiesMap.get(SFSessionProperty.QUERY_TIMEOUT),
connectionPropertiesMap.get(SFSessionProperty.TRACING),
connectionPropertiesMap.get(SFSessionProperty.PRIVATE_KEY_FILE),
- !Strings.isNullOrEmpty(
- (String) connectionPropertiesMap.get(SFSessionProperty.PRIVATE_KEY_FILE_PWD))
- ? "***"
- : "(empty)",
+ SFLoggerUtil.isVariableProvided(
+ (String) connectionPropertiesMap.get(SFSessionProperty.PRIVATE_KEY_FILE_PWD)),
+ connectionPropertiesMap.get(SFSessionProperty.ENABLE_DIAGNOSTICS),
+ connectionPropertiesMap.get(SFSessionProperty.DIAGNOSTICS_ALLOWLIST_FILE),
sessionParametersMap.get(CLIENT_STORE_TEMPORARY_CREDENTIAL),
connectionPropertiesMap.get(SFSessionProperty.GZIP_DISABLED));
HttpClientSettingsKey httpClientSettingsKey = getHttpClientKey();
logger.debug(
- "connection proxy parameters: use_proxy={}, proxy_host={}, proxy_port={}, proxy_user={},"
- + " proxy_password={}, non_proxy_hosts={}, proxy_protocol={}",
+ "Connection proxy parameters: use proxy: {}, proxy host: {}, proxy port: {}, proxy user: {},"
+ + " proxy password is {}, non proxy hosts: {}, proxy protocol: {}",
httpClientSettingsKey.usesProxy(),
httpClientSettingsKey.getProxyHost(),
httpClientSettingsKey.getProxyPort(),
httpClientSettingsKey.getProxyUser(),
- !Strings.isNullOrEmpty(httpClientSettingsKey.getProxyPassword()) ? "***" : "(empty)",
+ SFLoggerUtil.isVariableProvided(httpClientSettingsKey.getProxyPassword()),
httpClientSettingsKey.getNonProxyHosts(),
httpClientSettingsKey.getProxyHttpProtocol());
@@ -608,19 +612,26 @@ public synchronized void open() throws SFException, SnowflakeSQLException {
connectionPropertiesMap.get(SFSessionProperty.DISABLE_CONSOLE_LOGIN) != null
? getBooleanValue(
connectionPropertiesMap.get(SFSessionProperty.DISABLE_CONSOLE_LOGIN))
- : true);
+ : true)
+ .setDisableSamlURLCheck(
+ connectionPropertiesMap.get(SFSessionProperty.DISABLE_SAML_URL_CHECK) != null
+ ? getBooleanValue(
+ connectionPropertiesMap.get(SFSessionProperty.DISABLE_SAML_URL_CHECK))
+ : false);
- // Enable or disable OOB telemetry based on connection parameter. Default is disabled.
- // The value may still change later when session parameters from the server are read.
- if (getBooleanValue(
- connectionPropertiesMap.get(SFSessionProperty.CLIENT_OUT_OF_BAND_TELEMETRY_ENABLED))) {
- TelemetryService.enable();
- } else {
- TelemetryService.disable();
- }
+ logger.info(
+ "Connecting to {} Snowflake domain",
+ loginInput.getHostFromServerUrl().toLowerCase().endsWith(".cn") ? "CHINA" : "GLOBAL");
+
+ // we ignore the parameters CLIENT_OUT_OF_BAND_TELEMETRY_ENABLED and htapOOBTelemetryEnabled
+ // OOB telemetry is disabled
+ TelemetryService.disableOOBTelemetry();
// propagate OCSP mode to SFTrustManager. Note OCSP setting is global on JVM.
HttpUtil.initHttpClient(httpClientSettingsKey, null);
+
+ runDiagnosticsIfEnabled();
+
SFLoginOutput loginOutput =
SessionUtil.openSession(loginInput, connectionPropertiesMap, tracingLevel.toString());
isClosed = false;
@@ -644,13 +655,7 @@ public synchronized void open() throws SFException, SnowflakeSQLException {
// Update common parameter values for this session
SessionUtil.updateSfDriverParamValues(loginOutput.getCommonParams(), this);
- // Enable or disable HTAP OOB telemetry based on connection parameter. Default is disabled.
- if (getBooleanValue(
- connectionPropertiesMap.get(SFSessionProperty.HTAP_OOB_TELEMETRY_ENABLED))) {
- TelemetryService.enableHTAP();
- } else {
- TelemetryService.disableHTAP();
- }
+
String loginDatabaseName = (String) connectionPropertiesMap.get(SFSessionProperty.DATABASE);
String loginSchemaName = (String) connectionPropertiesMap.get(SFSessionProperty.SCHEMA);
String loginRole = (String) connectionPropertiesMap.get(SFSessionProperty.ROLE);
@@ -702,6 +707,8 @@ public synchronized void open() throws SFException, SnowflakeSQLException {
// start heartbeat for this session so that the master token will not expire
startHeartbeatForThisSession();
+ stopwatch.stop();
+ logger.info("Session {} opened in {} ms.", getSessionId(), stopwatch.elapsedMillis());
}
/**
@@ -762,10 +769,14 @@ boolean isUsernamePasswordMFAAuthenticator() {
synchronized void renewSession(String prevSessionToken)
throws SFException, SnowflakeSQLException {
if (sessionToken != null && !sessionToken.equals(prevSessionToken)) {
- logger.debug("not renew session because session token has not been updated.", false);
+ logger.debug(
+ "Not renewing session {} because session token has not been updated.", getSessionId());
return;
}
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
+ logger.debug("Renewing session {}", getSessionId());
SFLoginInput loginInput = new SFLoginInput();
loginInput
.setServerUrl(getServerUrl())
@@ -786,6 +797,9 @@ synchronized void renewSession(String prevSessionToken)
sessionToken = loginOutput.getSessionToken();
masterToken = loginOutput.getMasterToken();
+ stopwatch.stop();
+ logger.debug(
+ "Session {} renewed successfully in {} ms", getSessionId(), stopwatch.elapsedMillis());
}
/**
@@ -805,14 +819,17 @@ public String getSessionToken() {
*/
@Override
public void close() throws SFException, SnowflakeSQLException {
- logger.debug(" public void close()", false);
+ logger.debug("Closing session {}", getSessionId());
// stop heartbeat for this session
stopHeartbeatForThisSession();
if (isClosed) {
+ logger.debug("Session {} is already closed", getSessionId());
return;
}
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
SFLoginInput loginInput = new SFLoginInput();
loginInput
@@ -832,6 +849,11 @@ public void close() throws SFException, SnowflakeSQLException {
qcc.clearCache();
}
+ stopwatch.stop();
+ logger.info(
+ "Session {} has been successfully closed in {} ms",
+ getSessionId(),
+ stopwatch.elapsedMillis());
isClosed = true;
}
@@ -887,23 +909,26 @@ public Void call() throws SQLException {
/** Start heartbeat for this session */
protected void startHeartbeatForThisSession() {
if (getEnableHeartbeat() && !Strings.isNullOrEmpty(masterToken)) {
- logger.debug("start heartbeat, master token validity: " + masterTokenValidityInSeconds);
+ logger.debug(
+ "Session {} start heartbeat, master token validity: {} s",
+ getSessionId(),
+ masterTokenValidityInSeconds);
HeartbeatBackground.getInstance()
.addSession(this, masterTokenValidityInSeconds, heartbeatFrequency);
} else {
- logger.debug("heartbeat not enabled for the session", false);
+ logger.debug("Heartbeat not enabled for the session {}", getSessionId());
}
}
/** Stop heartbeat for this session */
protected void stopHeartbeatForThisSession() {
if (getEnableHeartbeat() && !Strings.isNullOrEmpty(masterToken)) {
- logger.debug("stop heartbeat", false);
+ logger.debug("Session {} stop heartbeat", getSessionId());
HeartbeatBackground.getInstance().removeSession(this);
} else {
- logger.debug("heartbeat not enabled for the session", false);
+ logger.debug("Heartbeat not enabled for the session {}", getSessionId());
}
}
@@ -914,12 +939,15 @@ protected void stopHeartbeatForThisSession() {
* @throws SQLException exception raised from SQL generic layers
*/
protected void heartbeat() throws SFException, SQLException {
- logger.debug(" public void heartbeat()", false);
+ logger.debug("Session {} heartbeat", getSessionId());
if (isClosed) {
return;
}
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
+
HttpPost postRequest = null;
String requestId = UUIDUtils.getUUID().toString();
@@ -969,14 +997,14 @@ protected void heartbeat() throws SFException, SQLException {
JsonNode rootNode;
- logger.debug("connection heartbeat response: {}", theResponse);
+ logger.debug("Connection heartbeat response: {}", theResponse);
rootNode = OBJECT_MAPPER.readTree(theResponse);
// check the response to see if it is session expiration response
if (rootNode != null
&& (Constants.SESSION_EXPIRED_GS_CODE == rootNode.path("code").asInt())) {
- logger.debug("renew session and retry", false);
+ logger.debug("Renew session and retry", false);
this.renewSession(prevSessionToken);
retry = true;
continue;
@@ -992,12 +1020,15 @@ protected void heartbeat() throws SFException, SQLException {
throw (SnowflakeSQLException) ex;
}
- logger.error("unexpected exception", ex);
+ logger.error("Unexpected exception", ex);
throw new SFException(
ErrorCode.INTERNAL_ERROR, IncidentUtil.oneLiner("unexpected exception", ex));
}
} while (retry);
+ stopwatch.stop();
+ logger.debug(
+ "Session {} heartbeat successful in {} ms", getSessionId(), stopwatch.elapsedMillis());
}
void injectedDelay() {
@@ -1248,4 +1279,45 @@ public SFClientConfig getSfClientConfig() {
public void setSfClientConfig(SFClientConfig sfClientConfig) {
this.sfClientConfig = sfClientConfig;
}
+
+ /**
+ * If the JDBC driver starts in diagnostics mode then the method prints results of the
+ * connectivity tests it performs in the logs. A SQLException is thrown with a message indicating
+ * that the driver is in diagnostics mode, and that a connection was not created.
+ */
+ private void runDiagnosticsIfEnabled() throws SnowflakeSQLException {
+ Map connectionPropertiesMap = getConnectionPropertiesMap();
+ boolean isDiagnosticsEnabled =
+ Optional.ofNullable(connectionPropertiesMap.get(SFSessionProperty.ENABLE_DIAGNOSTICS))
+ .map(b -> (Boolean) b)
+ .orElse(false);
+
+ if (!isDiagnosticsEnabled) {
+ return;
+ }
+ logger.info("Running diagnostics tests");
+ String allowListFile =
+ (String) connectionPropertiesMap.get(SFSessionProperty.DIAGNOSTICS_ALLOWLIST_FILE);
+
+ if (allowListFile == null || allowListFile.isEmpty()) {
+ logger.error(
+ "Diagnostics was enabled but an allowlist file was not provided."
+ + " Please provide an allowlist JSON file using the connection parameter {}",
+ SFSessionProperty.DIAGNOSTICS_ALLOWLIST_FILE);
+ throw new SnowflakeSQLException(
+ "Diagnostics was enabled but an allowlist file was not provided. "
+ + "Please provide an allowlist JSON file using the connection parameter "
+ + SFSessionProperty.DIAGNOSTICS_ALLOWLIST_FILE);
+ } else {
+ DiagnosticContext diagnosticContext =
+ new DiagnosticContext(allowListFile, connectionPropertiesMap);
+ diagnosticContext.runDiagnostics();
+ }
+
+ throw new SnowflakeSQLException(
+ "A connection was not created because the driver is running in diagnostics mode."
+ + " If this is unintended then disable diagnostics check by removing the "
+ + SFSessionProperty.ENABLE_DIAGNOSTICS
+ + " connection parameter");
+ }
}
diff --git a/src/main/java/net/snowflake/client/core/SFSessionProperty.java b/src/main/java/net/snowflake/client/core/SFSessionProperty.java
index 0ca91809c..3dcb09602 100644
--- a/src/main/java/net/snowflake/client/core/SFSessionProperty.java
+++ b/src/main/java/net/snowflake/client/core/SFSessionProperty.java
@@ -77,12 +77,15 @@ public enum SFSessionProperty {
PUT_GET_MAX_RETRIES("putGetMaxRetries", false, Integer.class),
RETRY_TIMEOUT("retryTimeout", false, Integer.class),
+ ENABLE_DIAGNOSTICS("ENABLE_DIAGNOSTICS", false, Boolean.class),
+ DIAGNOSTICS_ALLOWLIST_FILE("DIAGNOSTICS_ALLOWLIST_FILE", false, String.class),
ENABLE_PATTERN_SEARCH("enablePatternSearch", false, Boolean.class),
DISABLE_GCS_DEFAULT_CREDENTIALS("disableGcsDefaultCredentials", false, Boolean.class),
- JDBC_ARROW_TREAT_DECIMAL_AS_INT("JDBC_ARROW_TREAT_DECIMAL_AS_INT", false, Boolean.class);
+ JDBC_ARROW_TREAT_DECIMAL_AS_INT("JDBC_ARROW_TREAT_DECIMAL_AS_INT", false, Boolean.class),
+ DISABLE_SAML_URL_CHECK("disableSamlURLCheck", false, Boolean.class);
// property key in string
private String propertyKey;
diff --git a/src/main/java/net/snowflake/client/core/SFSqlInput.java b/src/main/java/net/snowflake/client/core/SFSqlInput.java
index b3efa6893..2b3d6ba95 100644
--- a/src/main/java/net/snowflake/client/core/SFSqlInput.java
+++ b/src/main/java/net/snowflake/client/core/SFSqlInput.java
@@ -4,7 +4,6 @@
package net.snowflake.client.core;
import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
import java.sql.SQLInput;
import java.util.List;
import java.util.Map;
@@ -31,8 +30,6 @@ static SFSqlInput unwrap(SQLInput sqlInput) {
* @param tz timezone to consider.
* @return the attribute; if the value is SQL NULL, returns null
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.2
*/
java.sql.Timestamp readTimestamp(TimeZone tz) throws SQLException;
/**
@@ -43,8 +40,6 @@ static SFSqlInput unwrap(SQLInput sqlInput) {
* @return the attribute at the head of the stream as an {@code Object} in the Java programming
* language;{@code null} if the attribute is SQL {@code NULL}
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.8
*/
T readObject(Class type, TimeZone tz) throws SQLException;
/**
@@ -55,8 +50,6 @@ static SFSqlInput unwrap(SQLInput sqlInput) {
* @return the attribute at the head of the stream as an {@code List} in the Java programming
* language;{@code null} if the attribute is SQL {@code NULL}
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.8
*/
List readList(Class type) throws SQLException;
@@ -68,8 +61,6 @@ static SFSqlInput unwrap(SQLInput sqlInput) {
* @return the attribute at the head of the stream as an {@code Map} in the Java programming
* language;{@code null} if the attribute is SQL {@code NULL}
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.8
*/
Map readMap(Class type) throws SQLException;
/**
@@ -80,8 +71,6 @@ static SFSqlInput unwrap(SQLInput sqlInput) {
* @return the attribute at the head of the stream as an {@code Array} in the Java programming
* language;{@code null} if the attribute is SQL {@code NULL}
* @exception SQLException if a database access error occurs
- * @exception SQLFeatureNotSupportedException if the JDBC driver does not support this method
- * @since 1.8
*/
T[] readArray(Class type) throws SQLException;
}
diff --git a/src/main/java/net/snowflake/client/core/SFStatement.java b/src/main/java/net/snowflake/client/core/SFStatement.java
index 1dd555bb5..6142b8eb9 100644
--- a/src/main/java/net/snowflake/client/core/SFStatement.java
+++ b/src/main/java/net/snowflake/client/core/SFStatement.java
@@ -44,7 +44,7 @@
/** Snowflake statement */
public class SFStatement extends SFBaseStatement {
- static final SFLogger logger = SFLoggerFactory.getLogger(SFStatement.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SFStatement.class);
private SFSession session;
@@ -80,7 +80,7 @@ public class SFStatement extends SFBaseStatement {
private long conservativeMemoryLimit; // in bytes
public SFStatement(SFSession session) {
- logger.debug(" public SFStatement(SFSession session)", false);
+ logger.trace("SFStatement(SFSession session)", false);
this.session = session;
Integer queryTimeout = session == null ? null : session.getQueryTimeout();
@@ -91,7 +91,7 @@ public SFStatement(SFSession session) {
private void verifyArrowSupport() {
if (SnowflakeDriver.isDisableArrowResultFormat()) {
logger.debug(
- "disable arrow support: {}", SnowflakeDriver.getDisableArrowResultFormatMessage());
+ "Disable arrow support: {}", SnowflakeDriver.getDisableArrowResultFormatMessage());
statementParametersMap.put("JDBC_QUERY_RESULT_FORMAT", "JSON");
}
}
@@ -205,7 +205,7 @@ SFBaseResultSet executeQueryInternal(
throws SQLException, SFException {
resetState();
- logger.debug("executeQuery: {}", sql);
+ logger.debug("ExecuteQuery: {}", sql);
if (session == null || session.isClosed()) {
throw new SQLException("connection is closed");
@@ -771,9 +771,9 @@ public SFBaseResultSet execute(
session.injectedDelay();
if (session.getPreparedStatementLogging()) {
- logger.info("execute: {}", sql);
+ logger.info("Execute: {}", sql);
} else {
- logger.debug("execute: {}", sql);
+ logger.debug("Execute: {}", sql);
}
String trimmedSql = sql.trim();
@@ -798,7 +798,7 @@ private SFBaseResultSet executeFileTransfer(String sql) throws SQLException, SFE
try {
transferAgent.execute();
- logger.debug("setting result set", false);
+ logger.debug("Setting result set", false);
resultSet = (SFFixedViewResultSet) transferAgent.getResultSet();
childResults = Collections.emptyList();
@@ -814,7 +814,7 @@ private SFBaseResultSet executeFileTransfer(String sql) throws SQLException, SFE
@Override
public void close() {
- logger.debug("public void close()", false);
+ logger.trace("void close()", false);
if (requestId != null) {
EventUtil.triggerStateTransition(
@@ -827,7 +827,7 @@ public void close() {
isClosed = true;
if (httpRequest != null) {
- logger.debug("releasing connection for the http request", false);
+ logger.debug("Releasing connection for the http request", false);
httpRequest.releaseConnection();
httpRequest = null;
@@ -841,7 +841,7 @@ public void close() {
@Override
public void cancel() throws SFException, SQLException {
- logger.debug("public void cancel()", false);
+ logger.trace("void cancel()", false);
if (canceling.get()) {
logger.debug("Query is already cancelled", false);
diff --git a/src/main/java/net/snowflake/client/core/SFTrustManager.java b/src/main/java/net/snowflake/client/core/SFTrustManager.java
index bd05729c3..740c70fe3 100644
--- a/src/main/java/net/snowflake/client/core/SFTrustManager.java
+++ b/src/main/java/net/snowflake/client/core/SFTrustManager.java
@@ -140,7 +140,7 @@ public class SFTrustManager extends X509ExtendedTrustManager {
/** OCSP response cache file name. Should be identical to other driver's cache file name. */
static final String CACHE_FILE_NAME = "ocsp_response_cache.json";
- private static final SFLogger LOGGER = SFLoggerFactory.getLogger(SFTrustManager.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SFTrustManager.class);
private static final ASN1ObjectIdentifier OIDocsp =
new ASN1ObjectIdentifier("1.3.6.1.5.5.7.48.1").intern();
private static final ASN1ObjectIdentifier SHA1RSA =
@@ -167,8 +167,10 @@ public class SFTrustManager extends X509ExtendedTrustManager {
private static final int DEFAULT_OCSP_CACHE_SERVER_CONNECTION_TIMEOUT = 5000;
/** Default OCSP responder connection timeout */
private static final int DEFAULT_OCSP_RESPONDER_CONNECTION_TIMEOUT = 10000;
+ /** Default OCSP Cache server host name prefix */
+ private static final String DEFAULT_OCSP_CACHE_HOST_PREFIX = "http://ocsp.snowflakecomputing.";
/** Default OCSP Cache server host name */
- private static final String DEFAULT_OCSP_CACHE_HOST = "http://ocsp.snowflakecomputing.com";
+ private static final String DEFAULT_OCSP_CACHE_HOST = DEFAULT_OCSP_CACHE_HOST_PREFIX + "com";
/** OCSP response file cache directory */
private static final FileCacheManager fileCacheManager;
@@ -200,7 +202,7 @@ public class SFTrustManager extends X509ExtendedTrustManager {
/** OCSP Response Cache server Retry URL pattern */
static String SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN;
/** OCSP response cache server URL. */
- private static String SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE;
+ static String SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE;
private static JcaX509CertificateConverter CONVERTER_X509 = new JcaX509CertificateConverter();
/** RootCA cache */
@@ -283,6 +285,9 @@ public class SFTrustManager extends X509ExtendedTrustManager {
JsonNode res = fileCacheManager.readCacheFile();
readJsonStoreCache(res);
}
+
+ logger.debug(
+ "Initializing trust manager with OCSP mode: {}, cache file: {}", ocspMode, cacheFile);
}
/** Deletes OCSP response cache file from disk. */
@@ -312,7 +317,7 @@ static void resetOCSPResponseCacherServerURL(String ocspCacheServerUrl) throws I
return;
}
SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE = ocspCacheServerUrl;
- if (!SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE.startsWith(DEFAULT_OCSP_CACHE_HOST)) {
+ if (!SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE.startsWith(DEFAULT_OCSP_CACHE_HOST_PREFIX)) {
URL url = new URL(SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE);
if (url.getPort() > 0) {
SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN =
@@ -322,10 +327,13 @@ static void resetOCSPResponseCacherServerURL(String ocspCacheServerUrl) throws I
SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN =
String.format("%s://%s/retry/%s", url.getProtocol(), url.getHost(), "%s/%s");
}
+ logger.debug(
+ "Reset OCSP response cache server URL to: {}",
+ SF_OCSP_RESPONSE_CACHE_SERVER_RETRY_URL_PATTERN);
}
}
- private static void setOCSPResponseCacheServerURL() {
+ private static void setOCSPResponseCacheServerURL(String topLevelDomain) {
String ocspCacheUrl = systemGetProperty(SF_OCSP_RESPONSE_CACHE_SERVER_URL);
if (ocspCacheUrl != null) {
SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE = ocspCacheUrl;
@@ -336,30 +344,31 @@ private static void setOCSPResponseCacheServerURL() {
SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE = ocspCacheUrl;
}
} catch (Throwable ex) {
- LOGGER.debug(
+ logger.debug(
"Failed to get environment variable " + SF_OCSP_RESPONSE_CACHE_SERVER_URL + ". Ignored",
true);
}
if (SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE == null) {
SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE =
- String.format("%s/%s", DEFAULT_OCSP_CACHE_HOST, CACHE_FILE_NAME);
+ String.format("%s%s/%s", DEFAULT_OCSP_CACHE_HOST_PREFIX, topLevelDomain, CACHE_FILE_NAME);
}
+ logger.debug("Set OCSP response cache server to: {}", SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE);
}
private static boolean useOCSPResponseCacheServer() {
String ocspCacheServerEnabled = systemGetProperty(SF_OCSP_RESPONSE_CACHE_SERVER_ENABLED);
if (Boolean.FALSE.toString().equalsIgnoreCase(ocspCacheServerEnabled)) {
- LOGGER.debug("No OCSP Response Cache Server is used.", false);
+ logger.debug("No OCSP Response Cache Server is used.", false);
return false;
}
try {
ocspCacheServerEnabled = systemGetEnv(SF_OCSP_RESPONSE_CACHE_SERVER_ENABLED);
if (Boolean.FALSE.toString().equalsIgnoreCase(ocspCacheServerEnabled)) {
- LOGGER.debug("No OCSP Response Cache Server is used.", false);
+ logger.debug("No OCSP Response Cache Server is used.", false);
return false;
}
} catch (Throwable ex) {
- LOGGER.debug(
+ logger.debug(
"Failed to get environment variable "
+ SF_OCSP_RESPONSE_CACHE_SERVER_ENABLED
+ ". Ignored",
@@ -383,7 +392,7 @@ private static String encodeCacheKey(OcspResponseCacheKey ocsp_cache_key) {
CertID cid = new CertID(algo, nameHash, keyHash, snumber);
return Base64.encodeBase64String(cid.toASN1Primitive().getEncoded());
} catch (Exception ex) {
- LOGGER.debug("Failed to encode cache key to base64 encoded cert id", false);
+ logger.debug("Failed to encode cache key to base64 encoded cert id", false);
}
return null;
}
@@ -423,7 +432,7 @@ private static SFPair> decodeCacheFro
JsonNode ocspRespBase64 = elem.getValue();
if (!ocspRespBase64.isArray() || ocspRespBase64.size() != 2) {
- LOGGER.debug("Invalid cache file format. Ignored", false);
+ logger.debug("Invalid cache file format. Ignored", false);
return null;
}
long producedAt = ocspRespBase64.get(0).asLong();
@@ -465,14 +474,14 @@ private static ObjectNode encodeCacheToJSON() {
}
return out;
} catch (IOException ex) {
- LOGGER.debug("Failed to encode ASN1 object.", false);
+ logger.debug("Failed to encode ASN1 object.", false);
}
return null;
}
private static synchronized void readJsonStoreCache(JsonNode m) {
if (m == null || !m.getNodeType().equals(JsonNodeType.OBJECT)) {
- LOGGER.debug("Invalid cache file format.", false);
+ logger.debug("Invalid cache file format.", false);
return;
}
try {
@@ -489,7 +498,7 @@ private static synchronized void readJsonStoreCache(JsonNode m) {
}
}
} catch (IOException ex) {
- LOGGER.debug("Failed to decode the cache file", false);
+ logger.debug("Failed to decode the cache file", false);
}
}
@@ -669,7 +678,7 @@ private void checkNewOCSPEndpointAvailability() {
try {
new_ocsp_ept = systemGetEnv("SF_OCSP_ACTIVATE_NEW_ENDPOINT");
} catch (Throwable ex) {
- LOGGER.debug(
+ logger.debug(
"Could not get environment variable to check for New OCSP Endpoint Availability", false);
new_ocsp_ept = systemGetProperty("net.snowflake.jdbc.ocsp_activate_new_endpoint");
}
@@ -784,22 +793,23 @@ void validateRevocationStatus(X509Certificate[] chain, String peerHost)
ocspCacheServer.resetOCSPResponseCacheServer(peerHost);
}
- setOCSPResponseCacheServerURL();
+ String topLevelDomain = peerHost.substring(peerHost.lastIndexOf(".") + 1);
+ setOCSPResponseCacheServerURL(topLevelDomain);
boolean isCached = isCached(pairIssuerSubjectList);
if (useOCSPResponseCacheServer() && !isCached) {
if (!ocspCacheServer.new_endpoint_enabled) {
- LOGGER.debug(
+ logger.debug(
"Downloading OCSP response cache from the server. URL: {}",
SF_OCSP_RESPONSE_CACHE_SERVER_URL_VALUE);
} else {
- LOGGER.debug(
+ logger.debug(
"Downloading OCSP response cache from the server. URL: {}",
ocspCacheServer.SF_OCSP_RESPONSE_CACHE_SERVER);
}
try {
readOcspResponseCacheServer();
} catch (SFOCSPException ex) {
- LOGGER.debug(
+ logger.debug(
"Error downloading OCSP Response from cache server : {}."
+ "OCSP Responses will be fetched directly from the CA OCSP"
+ "Responder ",
@@ -900,7 +910,7 @@ private void executeOneRevocationStatusCheck(
telemetryData.setCacheHit(true);
}
} catch (Throwable ex) {
- LOGGER.debug(
+ logger.debug(
"Exception occurred while trying to fetch OCSP Response - {}", ex.getMessage());
throw new SFOCSPException(
OCSPErrorCode.OCSP_RESPONSE_FETCH_FAILURE,
@@ -908,8 +918,8 @@ private void executeOneRevocationStatusCheck(
ex);
}
- LOGGER.debug(
- "validating. {}", CertificateIDToString(req.getRequestList()[0].getCertID()));
+ logger.debug(
+ "Validating. {}", CertificateIDToString(req.getRequestList()[0].getCertID()));
try {
validateRevocationStatusMain(pairIssuerSubject, value0.right);
success = true;
@@ -930,12 +940,12 @@ private void executeOneRevocationStatusCheck(
} catch (CertificateException ex) {
WAS_CACHE_UPDATED.set(OCSP_RESPONSE_CACHE.remove(keyOcspResponse) != null);
if (WAS_CACHE_UPDATED.get()) {
- LOGGER.debug("deleting the invalid OCSP cache.", false);
+ logger.debug("Deleting the invalid OCSP cache.", false);
}
cause = ex;
- LOGGER.debug(
- "Retrying {}/{} after sleeping {}(ms)", retry + 1, maxRetryCounter, sleepTime);
+ logger.debug(
+ "Retrying {}/{} after sleeping {} ms", retry + 1, maxRetryCounter, sleepTime);
try {
if (retry + 1 < maxRetryCounter) {
Thread.sleep(sleepTime);
@@ -950,7 +960,7 @@ private void executeOneRevocationStatusCheck(
error = new CertificateException(ex);
ocspLog =
telemetryData.generateTelemetry(SF_OCSP_EVENT_TYPE_REVOKED_CERTIFICATE_ERROR, error);
- LOGGER.error(ocspLog, false);
+ logger.error(ocspLog, false);
throw error;
}
@@ -960,21 +970,21 @@ private void executeOneRevocationStatusCheck(
error =
new CertificateException(
"Certificate Revocation check failed. Could not retrieve OCSP Response.", cause);
- LOGGER.debug(cause.getMessage(), false);
+ logger.debug(cause.getMessage(), false);
} else {
error =
new CertificateException(
"Certificate Revocation check failed. Could not retrieve OCSP Response.");
- LOGGER.debug(error.getMessage(), false);
+ logger.debug(error.getMessage(), false);
}
ocspLog = telemetryData.generateTelemetry(SF_OCSP_EVENT_TYPE_VALIDATION_ERROR, error);
if (isOCSPFailOpen()) {
// Log includes fail-open warning.
- LOGGER.error(generateFailOpenLog(ocspLog), false);
+ logger.error(generateFailOpenLog(ocspLog), false);
} else {
// still not success, raise an error.
- LOGGER.debug(ocspLog, false);
+ logger.debug(ocspLog, false);
throw error;
}
}
@@ -993,7 +1003,7 @@ private boolean isCached(List> pairIssuerSubjec
for (SFPair pairIssuerSubject : pairIssuerSubjectList) {
OCSPReq req = createRequest(pairIssuerSubject);
CertificateID certificateId = req.getRequestList()[0].getCertID();
- LOGGER.debug(CertificateIDToString(certificateId), false);
+ logger.debug(CertificateIDToString(certificateId), false);
CertID cid = certificateId.toASN1Primitive();
OcspResponseCacheKey k =
new OcspResponseCacheKey(
@@ -1003,18 +1013,18 @@ private boolean isCached(List> pairIssuerSubjec
SFPair res = OCSP_RESPONSE_CACHE.get(k);
if (res == null) {
- LOGGER.debug("Not all OCSP responses for the certificate is in the cache.", false);
+ logger.debug("Not all OCSP responses for the certificate is in the cache.", false);
isCached = false;
break;
} else if (currentTimeSecond - CACHE_EXPIRATION_IN_SECONDS > res.left) {
- LOGGER.debug("Cache for CertID expired.", false);
+ logger.debug("Cache for CertID expired.", false);
isCached = false;
break;
} else {
try {
validateRevocationStatusMain(pairIssuerSubject, res.right);
} catch (SFOCSPException ex) {
- LOGGER.debug(
+ logger.debug(
"Cache includes invalid OCSPResponse. "
+ "Will download the OCSP cache from Snowflake OCSP server",
false);
@@ -1023,7 +1033,7 @@ private boolean isCached(List> pairIssuerSubjec
}
}
} catch (IOException ex) {
- LOGGER.debug("Failed to encode CertID.", false);
+ logger.debug("Failed to encode CertID.", false);
}
return isCached;
}
@@ -1059,14 +1069,14 @@ private void readOcspResponseCacheServer() throws SFOCSPException {
JsonNode m = OBJECT_MAPPER.readTree(out.toByteArray());
out.close();
readJsonStoreCache(m);
- LOGGER.debug("Successfully downloaded OCSP cache from the server.", false);
+ logger.debug("Successfully downloaded OCSP cache from the server.", false);
} catch (IOException ex) {
- LOGGER.debug(
+ logger.debug(
"Failed to read the OCSP response cache from the server. " + "Server: {}, Err: {}",
ocspCacheServerInUse,
ex);
} catch (URISyntaxException ex) {
- LOGGER.debug("Indicate that a string could not be parsed as a URI reference.", false);
+ logger.debug("Indicate that a string could not be parsed as a URI reference.", false);
throw new SFOCSPException(
OCSPErrorCode.INVALID_CACHE_SERVER_URL, "Invalid OCSP Cache Server URL used", ex);
} finally {
@@ -1141,11 +1151,11 @@ private OCSPResp fetchOcspResponse(
} else {
url = new URL(String.format("%s/%s", ocspUrlStr, urlEncodedOCSPReq));
}
- LOGGER.debug("not hit cache. Fetching OCSP response from CA OCSP server. {}", url);
+ logger.debug("Not hit cache. Fetching OCSP response from CA OCSP server. {}", url);
} else {
url = new URL(ocspCacheServer.SF_OCSP_RESPONSE_RETRY_URL);
- LOGGER.debug(
- "not hit cache. Fetching OCSP response from Snowflake OCSP Response Fetcher. {}", url);
+ logger.debug(
+ "Not hit cache. Fetching OCSP response from Snowflake OCSP Response Fetcher. {}", url);
}
long sleepTime = INITIAL_SLEEPING_TIME_IN_MILLISECONDS;
@@ -1180,12 +1190,12 @@ private OCSPResp fetchOcspResponse(
break;
}
} catch (IOException ex) {
- LOGGER.debug("Failed to reach out OCSP responder: {}", ex.getMessage());
+ logger.debug("Failed to reach out OCSP responder: {}", ex.getMessage());
savedEx = ex;
}
IOUtils.closeQuietly(response);
- LOGGER.debug("Retrying {}/{} after sleeping {}(ms)", retry + 1, maxRetryCounter, sleepTime);
+ logger.debug("Retrying {}/{} after sleeping {} ms", retry + 1, maxRetryCounter, sleepTime);
try {
if (retry + 1 < maxRetryCounter) {
Thread.sleep(sleepTime);
@@ -1245,8 +1255,10 @@ private int getOCSPResponderConnectionTimeout() {
private String overrideOCSPURL(String ocspURL) {
String ocspURLInput = systemGetProperty(SF_OCSP_TEST_RESPONDER_URL);
if (ocspURLInput != null) {
+ logger.debug("Overriding OCSP url to: {}", ocspURLInput);
return ocspURLInput;
}
+ logger.debug("Overriding OCSP url to: {}", ocspURL);
return ocspURL;
}
@@ -1272,7 +1284,7 @@ private void validateRevocationStatusMain(
X509CertificateHolder signVerifyCert;
checkInvalidSigningCertTestParameter();
if (attachedCerts.length > 0) {
- LOGGER.debug(
+ logger.debug(
"Certificate is attached for verification. "
+ "Verifying it by the issuer certificate.",
false);
@@ -1296,15 +1308,15 @@ private void validateRevocationStatusMain(
CONVERTER_X509.getCertificate(signVerifyCert).getTBSCertificate(),
signVerifyCert.getSignatureAlgorithm());
} catch (CertificateException ex) {
- LOGGER.debug("OCSP Signing Certificate signature verification failed", false);
+ logger.debug("OCSP Signing Certificate signature verification failed", false);
throw new SFOCSPException(
OCSPErrorCode.INVALID_CERTIFICATE_SIGNATURE,
"OCSP Signing Certificate signature verification failed",
ex);
}
- LOGGER.debug("Verifying OCSP signature by the attached certificate public key.", false);
+ logger.debug("Verifying OCSP signature by the attached certificate public key.", false);
} else {
- LOGGER.debug(
+ logger.debug(
"Certificate is NOT attached for verification. "
+ "Verifying OCSP signature by the issuer public key.",
false);
@@ -1317,7 +1329,7 @@ private void validateRevocationStatusMain(
basicOcspResp.getTBSResponseData(),
basicOcspResp.getSignatureAlgorithmID());
} catch (CertificateException ex) {
- LOGGER.debug("OCSP signature verification failed", false);
+ logger.debug("OCSP signature verification failed", false);
throw new SFOCSPException(
OCSPErrorCode.INVALID_OCSP_RESPONSE_SIGNATURE,
"OCSP signature verification failed",
@@ -1376,7 +1388,7 @@ private void validateBasicOcspResponse(Date currentTime, BasicOCSPResp basicOcsp
Date thisUpdate = singleResps.getThisUpdate();
Date nextUpdate = singleResps.getNextUpdate();
- LOGGER.debug(
+ logger.debug(
"Current Time: {}, This Update: {}, Next Update: {}",
currentTime,
thisUpdate,
@@ -1392,7 +1404,7 @@ private void validateBasicOcspResponse(Date currentTime, BasicOCSPResp basicOcsp
DATE_FORMAT_UTC.format(nextUpdate)));
}
}
- LOGGER.debug("OK. Verified the certificate revocation status.", false);
+ logger.debug("OK. Verified the certificate revocation status.", false);
}
private void checkCertUnknownTestParameter() throws SFOCSPException {
@@ -1516,7 +1528,7 @@ private String ocspResponseToB64(OCSPResp ocspResp) {
try {
return Base64.encodeBase64String(ocspResp.getEncoded());
} catch (Throwable ex) {
- LOGGER.debug("Could not convert OCSP Response to Base64", false);
+ logger.debug("Could not convert OCSP Response to Base64", false);
return null;
}
}
@@ -1525,7 +1537,7 @@ private OCSPResp b64ToOCSPResp(String ocspRespB64) {
try {
return new OCSPResp(Base64.decodeBase64(ocspRespB64));
} catch (Throwable ex) {
- LOGGER.debug("Could not cover OCSP Response from Base64 to OCSPResp object", false);
+ logger.debug("Could not cover OCSP Response from Base64 to OCSPResp object", false);
return null;
}
}
@@ -1537,14 +1549,16 @@ static class OCSPCacheServer {
void resetOCSPResponseCacheServer(String host) {
String ocspCacheServerUrl;
- if (host.indexOf(".global.snowflakecomputing.com") > 0) {
+ if (host.toLowerCase().contains(".global.snowflakecomputing.")) {
ocspCacheServerUrl =
String.format("https://ocspssd%s/%s", host.substring(host.indexOf('-')), "ocsp");
- } else if (host.indexOf(".snowflakecomputing.com") > 0) {
+ } else if (host.toLowerCase().contains(".snowflakecomputing.")) {
ocspCacheServerUrl =
String.format("https://ocspssd%s/%s", host.substring(host.indexOf('.')), "ocsp");
} else {
- ocspCacheServerUrl = "https://ocspssd.snowflakecomputing.com/ocsp";
+ String topLevelDomain = host.substring(host.lastIndexOf(".") + 1);
+ ocspCacheServerUrl =
+ String.format("https://ocspssd.snowflakecomputing.%s/ocsp", topLevelDomain);
}
SF_OCSP_RESPONSE_CACHE_SERVER = String.format("%s/%s", ocspCacheServerUrl, "fetch");
SF_OCSP_RESPONSE_RETRY_URL = String.format("%s/%s", ocspCacheServerUrl, "retry");
@@ -1624,7 +1638,7 @@ public byte[] getDigest() {
String.format(
"Failed to instantiate the algorithm: %s. err=%s",
ALGORITHM_SHA1_NAME, ex.getMessage());
- LOGGER.error(errMsg, false);
+ logger.error(errMsg, false);
throw new RuntimeException(errMsg);
}
}
diff --git a/src/main/java/net/snowflake/client/core/SecureStorageAppleManager.java b/src/main/java/net/snowflake/client/core/SecureStorageAppleManager.java
index 144caefec..5030e4603 100644
--- a/src/main/java/net/snowflake/client/core/SecureStorageAppleManager.java
+++ b/src/main/java/net/snowflake/client/core/SecureStorageAppleManager.java
@@ -22,6 +22,7 @@ private SecureStorageAppleManager() {
}
public static SecureStorageAppleManager builder() {
+ logger.info("Using Apple Keychain as a token cache storage");
return new SecureStorageAppleManager();
}
diff --git a/src/main/java/net/snowflake/client/core/SecureStorageLinuxManager.java b/src/main/java/net/snowflake/client/core/SecureStorageLinuxManager.java
index e1f352187..7663147b3 100644
--- a/src/main/java/net/snowflake/client/core/SecureStorageLinuxManager.java
+++ b/src/main/java/net/snowflake/client/core/SecureStorageLinuxManager.java
@@ -41,6 +41,8 @@ private SecureStorageLinuxManager() {
.setCacheExpirationInSeconds(CACHE_EXPIRATION_IN_SECONDS)
.setCacheFileLockExpirationInSeconds(CACHE_FILE_LOCK_EXPIRATION_IN_SECONDS)
.build();
+ logger.info(
+ "Using temporary file: {} as a token cache storage", fileCacheManager.getCacheFilePath());
}
private static class SecureStorageLinuxManagerHolder {
diff --git a/src/main/java/net/snowflake/client/core/SecureStorageWindowsManager.java b/src/main/java/net/snowflake/client/core/SecureStorageWindowsManager.java
index f43952023..f38c1570b 100644
--- a/src/main/java/net/snowflake/client/core/SecureStorageWindowsManager.java
+++ b/src/main/java/net/snowflake/client/core/SecureStorageWindowsManager.java
@@ -33,6 +33,7 @@ private SecureStorageWindowsManager() {
}
public static SecureStorageWindowsManager builder() {
+ logger.info("Using Windows Credential Manager as a token cache storage");
return new SecureStorageWindowsManager();
}
diff --git a/src/main/java/net/snowflake/client/core/SessionUtil.java b/src/main/java/net/snowflake/client/core/SessionUtil.java
index a3421e841..6a9db988f 100644
--- a/src/main/java/net/snowflake/client/core/SessionUtil.java
+++ b/src/main/java/net/snowflake/client/core/SessionUtil.java
@@ -37,6 +37,7 @@
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.SecretDetector;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.ClientAuthnDTO;
import net.snowflake.common.core.ClientAuthnParameter;
import net.snowflake.common.core.SqlState;
@@ -71,12 +72,11 @@ public class SessionUtil {
public static final String SF_QUERY_SESSION_DELETE = "delete";
// Headers
- public static final String SF_HEADER_AUTHORIZATION = HttpHeaders.AUTHORIZATION;
+ @Deprecated
+ public static final String SF_HEADER_AUTHORIZATION = SFSession.SF_HEADER_AUTHORIZATION;
// Authentication type
private static final String SF_HEADER_BASIC_AUTHTYPE = "Basic";
- private static final String SF_HEADER_SNOWFLAKE_AUTHTYPE = "Snowflake";
- private static final String SF_HEADER_TOKEN_TAG = "Token";
private static final String CLIENT_STORE_TEMPORARY_CREDENTIAL =
"CLIENT_STORE_TEMPORARY_CREDENTIAL";
private static final String CLIENT_REQUEST_MFA_TOKEN = "CLIENT_REQUEST_MFA_TOKEN";
@@ -343,6 +343,8 @@ private static SFLoginOutput newSession(
Map connectionPropertiesMap,
String tracingLevel)
throws SFException, SnowflakeSQLException {
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
// build URL for login request
URIBuilder uriBuilder;
URI loginURI;
@@ -369,6 +371,18 @@ private static SFLoginOutput newSession(
final ClientAuthnDTO.AuthenticatorType authenticatorType = getAuthenticator(loginInput);
Map commonParams;
+ String oktaUsername = loginInput.getOKTAUserName();
+ logger.debug(
+ "Authenticating user: {}, host: {} with authentication method: {}."
+ + " Login timeout: {} s, auth timeout: {} s, OCSP mode: {}{}",
+ loginInput.getUserName(),
+ loginInput.getHostFromServerUrl(),
+ authenticatorType,
+ loginInput.getLoginTimeout(),
+ loginInput.getAuthTimeout(),
+ loginInput.getOCSPMode(),
+ Strings.isNullOrEmpty(oktaUsername) ? "" : ", okta username: " + oktaUsername);
+
try {
uriBuilder = new URIBuilder(loginInput.getServerUrl());
@@ -629,7 +643,7 @@ private static SFLoginOutput newSession(
* HttpClient should take authorization header from char[] instead of
* String.
*/
- postRequest.setHeader(SF_HEADER_AUTHORIZATION, SF_HEADER_BASIC_AUTHTYPE);
+ postRequest.setHeader(SFSession.SF_HEADER_AUTHORIZATION, SF_HEADER_BASIC_AUTHTYPE);
setServiceNameHeader(loginInput, postRequest);
@@ -639,6 +653,8 @@ private static SFLoginOutput newSession(
int leftsocketTimeout = loginInput.getSocketTimeoutInMillis();
int retryCount = 0;
+ Exception lastRestException = null;
+
while (true) {
try {
theString =
@@ -650,6 +666,7 @@ private static SFLoginOutput newSession(
retryCount,
loginInput.getHttpClientSettingsKey());
} catch (SnowflakeSQLException ex) {
+ lastRestException = ex;
if (ex.getErrorCode() == ErrorCode.AUTHENTICATOR_REQUEST_TIMEOUT.getMessageCode()) {
if (authenticatorType == ClientAuthnDTO.AuthenticatorType.SNOWFLAKE_JWT
|| authenticatorType == ClientAuthnDTO.AuthenticatorType.OKTA) {
@@ -714,16 +731,42 @@ private static SFLoginOutput newSession(
} else {
throw ex;
}
+ } catch (Exception ex) {
+ lastRestException = ex;
}
break;
}
+ if (theString == null) {
+ if (lastRestException != null) {
+ logger.error(
+ "Failed to open new session for user: {}, host: {}. Error: {}",
+ loginInput.getUserName(),
+ loginInput.getHostFromServerUrl(),
+ lastRestException);
+ throw lastRestException;
+ } else {
+ SnowflakeSQLException exception =
+ new SnowflakeSQLException(
+ NO_QUERY_ID,
+ "empty authentication response",
+ SqlState.CONNECTION_EXCEPTION,
+ ErrorCode.CONNECTION_ERROR.getMessageCode());
+ logger.error(
+ "Failed to open new session for user: {}, host: {}. Error: {}",
+ loginInput.getUserName(),
+ loginInput.getHostFromServerUrl(),
+ exception);
+ throw exception;
+ }
+ }
+
// general method, same as with data binding
JsonNode jsonNode = mapper.readTree(theString);
// check the success field first
if (!jsonNode.path("success").asBoolean()) {
- logger.debug("response = {}", theString);
+ logger.debug("Response: {}", theString);
int errorCode = jsonNode.path("code").asInt();
if (errorCode == Constants.ID_TOKEN_INVALID_LOGIN_REQUEST_GS_CODE) {
@@ -741,9 +784,16 @@ private static SFLoginOutput newSession(
deleteMfaTokenCache(loginInput.getHostFromServerUrl(), loginInput.getUserName());
}
+ String errorMessage = jsonNode.path("message").asText();
+
+ logger.error(
+ "Failed to open new session for user: {}, host: {}. Error: {}",
+ loginInput.getUserName(),
+ loginInput.getHostFromServerUrl(),
+ errorMessage);
throw new SnowflakeSQLException(
NO_QUERY_ID,
- jsonNode.path("message").asText(),
+ errorMessage,
SqlState.SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,
errorCode);
}
@@ -769,7 +819,7 @@ private static SFLoginOutput newSession(
commonParams = SessionUtil.getCommonParams(jsonNode.path("data").path("parameters"));
if (serverVersion != null) {
- logger.debug("server version = {}", serverVersion);
+ logger.debug("Server version: {}", serverVersion);
if (serverVersion.indexOf(" ") > 0) {
databaseVersion = serverVersion.substring(0, serverVersion.indexOf(" "));
@@ -777,7 +827,7 @@ private static SFLoginOutput newSession(
databaseVersion = serverVersion;
}
} else {
- logger.debug("server version is null", false);
+ logger.debug("Server version is null", false);
}
if (databaseVersion != null) {
@@ -800,13 +850,13 @@ private static SFLoginOutput newSession(
if (!jsonNode.path("data").path("newClientForUpgrade").isNull()) {
newClientForUpgrade = jsonNode.path("data").path("newClientForUpgrade").asText();
- logger.debug("new client: {}", newClientForUpgrade);
+ logger.debug("New client: {}", newClientForUpgrade);
}
// get health check interval and adjust network timeouts if different
int healthCheckIntervalFromGS = jsonNode.path("data").path("healthCheckInterval").asInt();
- logger.debug("health check interval = {}", healthCheckIntervalFromGS);
+ logger.debug("Health check interval: {}", healthCheckIntervalFromGS);
if (healthCheckIntervalFromGS > 0 && healthCheckIntervalFromGS != healthCheckInterval) {
// add health check interval to socket timeout
@@ -821,9 +871,9 @@ private static SFLoginOutput newSession(
HttpUtil.setRequestConfig(requestConfig);
- logger.debug("adjusted connection timeout to = {}", loginInput.getConnectionTimeout());
+ logger.debug("Adjusted connection timeout to: {}", loginInput.getConnectionTimeout());
- logger.debug("adjusted socket timeout to = {}", httpClientSocketTimeout);
+ logger.debug("Adjusted socket timeout to: {}", httpClientSocketTimeout);
}
} catch (SnowflakeSQLException ex) {
throw ex; // must catch here to avoid Throwable to get the exception
@@ -873,6 +923,13 @@ && asBoolean(loginInput.getSessionParameters().get(CLIENT_STORE_TEMPORARY_CREDEN
CredentialManager.getInstance().writeMfaToken(loginInput, ret);
}
+ stopwatch.stop();
+ logger.debug(
+ "User: {}, host: {} with authentication method: {} authenticated successfully in {} ms",
+ loginInput.getUserName(),
+ loginInput.getHostFromServerUrl(),
+ authenticatorType,
+ stopwatch.elapsedMillis());
return ret;
}
@@ -974,13 +1031,18 @@ private static SFLoginOutput tokenRequest(SFLoginInput loginInput, TokenRequestT
postRequest.addHeader("accept", "application/json");
postRequest.setHeader(
- SF_HEADER_AUTHORIZATION,
- SF_HEADER_SNOWFLAKE_AUTHTYPE + " " + SF_HEADER_TOKEN_TAG + "=\"" + headerToken + "\"");
+ SFSession.SF_HEADER_AUTHORIZATION,
+ SFSession.SF_HEADER_SNOWFLAKE_AUTHTYPE
+ + " "
+ + SFSession.SF_HEADER_TOKEN_TAG
+ + "=\""
+ + headerToken
+ + "\"");
setServiceNameHeader(loginInput, postRequest);
logger.debug(
- "request type: {}, old session token: {}, " + "master token: {}",
+ "Request type: {}, old session token: {}, " + "master token: {}",
requestType.value,
(ArgSupplier) () -> loginInput.getSessionToken() != null ? "******" : null,
(ArgSupplier) () -> loginInput.getMasterToken() != null ? "******" : null);
@@ -999,7 +1061,7 @@ private static SFLoginOutput tokenRequest(SFLoginInput loginInput, TokenRequestT
// check the success field first
if (!jsonNode.path("success").asBoolean()) {
- logger.debug("response = {}", theString);
+ logger.debug("Response: {}", theString);
String errorCode = jsonNode.path("code").asText();
String message = jsonNode.path("message").asText();
@@ -1037,7 +1099,7 @@ private static SFLoginOutput tokenRequest(SFLoginInput loginInput, TokenRequestT
* @throws SFException if failed to close session
*/
static void closeSession(SFLoginInput loginInput) throws SFException, SnowflakeSQLException {
- logger.debug(" public void close() throws SFException");
+ logger.trace("void close() throws SFException");
// assert the following inputs are valid
AssertUtil.assertTrue(
@@ -1068,10 +1130,10 @@ static void closeSession(SFLoginInput loginInput) throws SFException, SnowflakeS
postRequest, loginInput.getAdditionalHttpHeadersForSnowsight());
postRequest.setHeader(
- SF_HEADER_AUTHORIZATION,
- SF_HEADER_SNOWFLAKE_AUTHTYPE
+ SFSession.SF_HEADER_AUTHORIZATION,
+ SFSession.SF_HEADER_SNOWFLAKE_AUTHTYPE
+ " "
- + SF_HEADER_TOKEN_TAG
+ + SFSession.SF_HEADER_TOKEN_TAG
+ "=\""
+ loginInput.getSessionToken()
+ "\"");
@@ -1089,15 +1151,15 @@ static void closeSession(SFLoginInput loginInput) throws SFException, SnowflakeS
JsonNode rootNode;
- logger.debug("connection close response: {}", theString);
+ logger.debug("Connection close response: {}", theString);
rootNode = mapper.readTree(theString);
SnowflakeUtil.checkErrorAndThrowException(rootNode);
} catch (URISyntaxException ex) {
- throw new RuntimeException("unexpected URI syntax exception", ex);
+ throw new RuntimeException("Unexpected URI syntax exception", ex);
} catch (IOException ex) {
- logger.error("unexpected IO exception for: " + postRequest, ex);
+ logger.error("Unexpected IO exception for: " + postRequest, ex);
} catch (SnowflakeSQLException ex) {
// ignore exceptions for session expiration exceptions and for
// sessions that no longer exist
@@ -1154,6 +1216,16 @@ private static String federatedFlowStep4(
loginInput.getHttpClientSettingsKey());
// step 5
+ validateSAML(responseHtml, loginInput);
+ } catch (IOException | URISyntaxException ex) {
+ handleFederatedFlowError(loginInput, ex);
+ }
+ return responseHtml;
+ }
+
+ private static void validateSAML(String responseHtml, SFLoginInput loginInput)
+ throws SnowflakeSQLException, MalformedURLException {
+ if (!loginInput.getDisableSamlURLCheck()) {
String postBackUrl = getPostBackUrlFromHTML(responseHtml);
if (!isPrefixEqual(postBackUrl, loginInput.getServerUrl())) {
URL idpDestinationUrl = new URL(postBackUrl);
@@ -1167,18 +1239,13 @@ private static String federatedFlowStep4(
clientDestinationHostName,
idpDestinationHostName);
- // Session is in process of getting created, so exception constructor takes in null session
- // value
+ // Session is in process of getting created, so exception constructor takes in null
throw new SnowflakeSQLLoggedException(
null,
ErrorCode.IDP_INCORRECT_DESTINATION.getMessageCode(),
- SqlState.SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION
- /* session = */ );
+ SqlState.SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION);
}
- } catch (IOException | URISyntaxException ex) {
- handleFederatedFlowError(loginInput, ex);
}
- return responseHtml;
}
/**
@@ -1229,7 +1296,7 @@ private static String federatedFlowStep3(SFLoginInput loginInput, String tokenUr
null,
loginInput.getHttpClientSettingsKey());
- logger.debug("user is authenticated against {}.", loginInput.getAuthenticator());
+ logger.debug("User is authenticated against {}.", loginInput.getAuthenticator());
// session token is in the data field of the returned json response
final JsonNode jsonNode = mapper.readTree(idpResponse);
@@ -1268,7 +1335,7 @@ private static void federatedFlowStep2(SFLoginInput loginInput, String tokenUrl,
null,
ErrorCode.IDP_CONNECTION_ERROR.getMessageCode(),
SqlState.SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION
- /* session = */ );
+ /* session= */ );
}
} catch (MalformedURLException ex) {
handleFederatedFlowError(loginInput, ex);
@@ -1317,12 +1384,12 @@ private static JsonNode federatedFlowStep1(SFLoginInput loginInput) throws Snowf
loginInput.getSocketTimeoutInMillis(),
0,
loginInput.getHttpClientSettingsKey());
- logger.debug("authenticator-request response: {}", gsResponse);
+ logger.debug("Authenticator-request response: {}", gsResponse);
JsonNode jsonNode = mapper.readTree(gsResponse);
// check the success field first
if (!jsonNode.path("success").asBoolean()) {
- logger.debug("response = {}", gsResponse);
+ logger.debug("Response: {}", gsResponse);
int errorCode = jsonNode.path("code").asInt();
throw new SnowflakeSQLException(
@@ -1460,7 +1527,7 @@ public static Map getCommonParams(JsonNode paramsNode) {
// What type of value is it and what's the value?
if (!child.hasNonNull("value")) {
- logger.debug("No value found for Common Parameter {}", child.path("name").asText());
+ logger.debug("No value found for Common Parameter: {}", child.path("name").asText());
continue;
}
@@ -1495,7 +1562,7 @@ static void updateSfDriverParamValues(Map parameters, SFBaseSess
session.setCommonParameters(parameters);
}
for (Map.Entry entry : parameters.entrySet()) {
- logger.debug("processing parameter {}", entry.getKey());
+ logger.debug("Processing parameter {}", entry.getKey());
if ("CLIENT_DISABLE_INCIDENTS".equalsIgnoreCase(entry.getKey())) {
SnowflakeDriver.setDisableIncidents((Boolean) entry.getValue());
@@ -1592,11 +1659,9 @@ static void updateSfDriverParamValues(Map parameters, SFBaseSess
session.setClientPrefetchThreads((int) entry.getValue());
}
} else if (CLIENT_OUT_OF_BAND_TELEMETRY_ENABLED.equalsIgnoreCase(entry.getKey())) {
- if ((boolean) entry.getValue()) {
- TelemetryService.enable();
- } else {
- TelemetryService.disable();
- }
+ // we ignore the parameter CLIENT_OUT_OF_BAND_TELEMETRY_ENABLED
+ // OOB telemetry is always disabled
+ TelemetryService.disableOOBTelemetry();
} else if (CLIENT_VALIDATE_DEFAULT_PARAMETERS.equalsIgnoreCase(entry.getKey())) {
if (session != null) {
session.setValidateDefaultParameters(SFLoginInput.getBooleanValue(entry.getValue()));
@@ -1641,7 +1706,7 @@ enum TokenRequestType {
* @param serverUrl The Snowflake URL includes protocol such as "https://"
*/
public static void resetOCSPUrlIfNecessary(String serverUrl) throws IOException {
- if (serverUrl.indexOf(".privatelink.snowflakecomputing.com") > 0) {
+ if (PrivateLinkDetector.isPrivateLink(serverUrl)) {
// Privatelink uses special OCSP Cache server
URL url = new URL(serverUrl);
String host = url.getHost();
diff --git a/src/main/java/net/snowflake/client/core/SessionUtilExternalBrowser.java b/src/main/java/net/snowflake/client/core/SessionUtilExternalBrowser.java
index da7807b69..9db2f0589 100644
--- a/src/main/java/net/snowflake/client/core/SessionUtilExternalBrowser.java
+++ b/src/main/java/net/snowflake/client/core/SessionUtilExternalBrowser.java
@@ -46,7 +46,8 @@
* user can type IdP username and password. 4. Return token and proof key to the GS to gain access.
*/
public class SessionUtilExternalBrowser {
- static final SFLogger logger = SFLoggerFactory.getLogger(SessionUtilExternalBrowser.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SessionUtilExternalBrowser.class);
public interface AuthExternalBrowserHandlers {
// build a HTTP post object
@@ -202,14 +203,14 @@ private String getSSOUrl(int port) throws SFException, SnowflakeSQLException {
0,
loginInput.getHttpClientSettingsKey());
- logger.debug("authenticator-request response: {}", theString);
+ logger.debug("Authenticator-request response: {}", theString);
// general method, same as with data binding
JsonNode jsonNode = mapper.readTree(theString);
// check the success field first
if (!jsonNode.path("success").asBoolean()) {
- logger.debug("response = {}", theString);
+ logger.debug("Response: {}", theString);
String errorCode = jsonNode.path("code").asText();
throw new SnowflakeSQLException(
SqlState.SQLCLIENT_UNABLE_TO_ESTABLISH_SQLCONNECTION,
@@ -240,7 +241,7 @@ private String getConsoleLoginUrl(int port) throws SFException {
String consoleLoginUrl = consoleLoginUriBuilder.build().toURL().toString();
- logger.debug("console login url: {}", consoleLoginUrl);
+ logger.debug("Console login url: {}", consoleLoginUrl);
return consoleLoginUrl;
} catch (Exception ex) {
@@ -266,7 +267,7 @@ void authenticate() throws SFException, SnowflakeSQLException {
try {
// main procedure
int port = this.getLocalPort(ssocket);
- logger.debug("Listening localhost:{}", port);
+ logger.debug("Listening localhost: {}", port);
if (loginInput.getDisableConsoleLogin()) {
// Access GS to get SSO URL
diff --git a/src/main/java/net/snowflake/client/core/SessionUtilKeyPair.java b/src/main/java/net/snowflake/client/core/SessionUtilKeyPair.java
index 2bef91eda..ad63ea603 100644
--- a/src/main/java/net/snowflake/client/core/SessionUtilKeyPair.java
+++ b/src/main/java/net/snowflake/client/core/SessionUtilKeyPair.java
@@ -17,6 +17,7 @@
import java.io.IOException;
import java.io.StringReader;
import java.nio.file.Files;
+import java.nio.file.Path;
import java.nio.file.Paths;
import java.security.InvalidKeyException;
import java.security.KeyFactory;
@@ -52,7 +53,7 @@
/** Class used to compute jwt token for key pair authentication Created by hyu on 1/16/18. */
class SessionUtilKeyPair {
- static final SFLogger logger = SFLoggerFactory.getLogger(SessionUtilKeyPair.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SessionUtilKeyPair.class);
// user name in upper case
private final String userName;
@@ -147,7 +148,6 @@ private SecretKeyFactory getSecretKeyFactory(String algorithm) throws NoSuchAlgo
private PrivateKey extractPrivateKeyFromFile(String privateKeyFile, String privateKeyFilePwd)
throws SFException {
-
if (isBouncyCastleProviderEnabled) {
try {
return extractPrivateKeyWithBouncyCastle(privateKeyFile, privateKeyFilePwd);
@@ -234,8 +234,11 @@ public static int getTimeout() {
private PrivateKey extractPrivateKeyWithBouncyCastle(
String privateKeyFile, String privateKeyFilePwd)
throws IOException, PKCSException, OperatorCreationException {
+ Path privKeyPath = Paths.get(privateKeyFile);
+ FileUtil.logFileUsage(
+ privKeyPath, "Extract private key from file using Bouncy Castle provider", true);
PrivateKeyInfo privateKeyInfo = null;
- PEMParser pemParser = new PEMParser(new FileReader(Paths.get(privateKeyFile).toFile()));
+ PEMParser pemParser = new PEMParser(new FileReader(privKeyPath.toFile()));
Object pemObject = pemParser.readObject();
if (pemObject instanceof PKCS8EncryptedPrivateKeyInfo) {
// Handle the case where the private key is encrypted.
@@ -263,7 +266,9 @@ private PrivateKey extractPrivateKeyWithBouncyCastle(
private PrivateKey extractPrivateKeyWithJdk(String privateKeyFile, String privateKeyFilePwd)
throws IOException, NoSuchAlgorithmException, InvalidKeySpecException, InvalidKeyException {
- String privateKeyContent = new String(Files.readAllBytes(Paths.get(privateKeyFile)));
+ Path privKeyPath = Paths.get(privateKeyFile);
+ FileUtil.logFileUsage(privKeyPath, "Extract private key from file using Jdk", true);
+ String privateKeyContent = new String(Files.readAllBytes(privKeyPath));
if (Strings.isNullOrEmpty(privateKeyFilePwd)) {
// unencrypted private key file
return generatePrivateKey(false, privateKeyContent, privateKeyFilePwd);
diff --git a/src/main/java/net/snowflake/client/core/SfSqlArray.java b/src/main/java/net/snowflake/client/core/SfSqlArray.java
index 83270796a..70682b4f4 100644
--- a/src/main/java/net/snowflake/client/core/SfSqlArray.java
+++ b/src/main/java/net/snowflake/client/core/SfSqlArray.java
@@ -1,11 +1,17 @@
package net.snowflake.client.core;
+import static net.snowflake.client.core.FieldSchemaCreator.buildBindingSchemaForType;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
import java.sql.Array;
import java.sql.JDBCType;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLFeatureNotSupportedException;
+import java.util.Arrays;
import java.util.Map;
+import net.snowflake.client.jdbc.BindingParameterMetadata;
+import net.snowflake.client.jdbc.SnowflakeUtil;
@SnowflakeJdbcInternalApi
public class SfSqlArray implements Array {
@@ -74,4 +80,19 @@ public ResultSet getResultSet(long index, int count, Map> map)
@Override
public void free() throws SQLException {}
+
+ public String getJsonString() throws SQLException {
+ try {
+ return SnowflakeUtil.mapJson(elements);
+ } catch (JsonProcessingException e) {
+ throw new SQLException("There is exception during array to json string.", e);
+ }
+ }
+
+ public BindingParameterMetadata getSchema() throws SQLException {
+ return BindingParameterMetadata.BindingParameterMetadataBuilder.bindingParameterMetadata()
+ .withType("array")
+ .withFields(Arrays.asList(buildBindingSchemaForType(getBaseType(), false)))
+ .build();
+ }
}
diff --git a/src/main/java/net/snowflake/client/core/SqlInputTimestampUtil.java b/src/main/java/net/snowflake/client/core/SfTimestampUtil.java
similarity index 76%
rename from src/main/java/net/snowflake/client/core/SqlInputTimestampUtil.java
rename to src/main/java/net/snowflake/client/core/SfTimestampUtil.java
index b95c518c6..ed58f4481 100644
--- a/src/main/java/net/snowflake/client/core/SqlInputTimestampUtil.java
+++ b/src/main/java/net/snowflake/client/core/SfTimestampUtil.java
@@ -4,6 +4,7 @@
package net.snowflake.client.core;
+import java.sql.Time;
import java.sql.Timestamp;
import java.sql.Types;
import java.util.TimeZone;
@@ -11,7 +12,9 @@
import net.snowflake.common.core.SnowflakeDateTimeFormat;
@SnowflakeJdbcInternalApi
-public class SqlInputTimestampUtil {
+public class SfTimestampUtil {
+
+ static final long MS_IN_DAY = 86400 * 1000;
public static Timestamp getTimestampFromType(
int columnSubType,
@@ -25,7 +28,7 @@ public static Timestamp getTimestampFromType(
} else if (columnSubType == SnowflakeUtil.EXTRA_TYPES_TIMESTAMP_NTZ
|| columnSubType == Types.TIMESTAMP) {
return getTimestampFromFormat(
- "TIMESTAMP_NTZ_OUTPUT_FORMAT", value, session, sessionTimeZone, tz);
+ "TIMESTAMP_NTZ_OUTPUT_FORMAT", value, session, sessionTimeZone, TimeZone.getDefault());
} else if (columnSubType == SnowflakeUtil.EXTRA_TYPES_TIMESTAMP_TZ) {
return getTimestampFromFormat(
"TIMESTAMP_TZ_OUTPUT_FORMAT", value, session, sessionTimeZone, tz);
@@ -46,4 +49,13 @@ private static Timestamp getTimestampFromFormat(
SnowflakeDateTimeFormat formatter = SnowflakeDateTimeFormat.fromSqlFormat(rawFormat);
return formatter.parse(value, tz, 0, false).getTimestamp();
}
+
+ public static long getTimeInNanoseconds(Time x) {
+ long msSinceEpoch = x.getTime();
+ // Use % + % instead of just % to get the nonnegative remainder.
+ // TODO(mkember): Change to use Math.floorMod when Client is on Java 8.
+ long msSinceMidnight = (msSinceEpoch % MS_IN_DAY + MS_IN_DAY) % MS_IN_DAY;
+ long nanosSinceMidnight = msSinceMidnight * 1000 * 1000;
+ return nanosSinceMidnight;
+ }
}
diff --git a/src/main/java/net/snowflake/client/core/StmtUtil.java b/src/main/java/net/snowflake/client/core/StmtUtil.java
index a02fb4d7b..96fefe5dc 100644
--- a/src/main/java/net/snowflake/client/core/StmtUtil.java
+++ b/src/main/java/net/snowflake/client/core/StmtUtil.java
@@ -23,7 +23,6 @@
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.SecretDetector;
import net.snowflake.common.api.QueryInProgressResponse;
-import org.apache.http.HttpHeaders;
import org.apache.http.client.methods.HttpGet;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.client.methods.HttpRequestBase;
@@ -43,25 +42,15 @@ public class StmtUtil {
private static final String SF_PATH_QUERY_RESULT = "/queries/%s/result";
- static final String SF_QUERY_REQUEST_ID = "requestId";
-
private static final String SF_QUERY_COMBINE_DESCRIBE_EXECUTE = "combinedDescribe";
- private static final String SF_QUERY_CONTEXT = "queryContext";
-
- private static final String SF_HEADER_AUTHORIZATION = HttpHeaders.AUTHORIZATION;
-
- private static final String SF_HEADER_SNOWFLAKE_AUTHTYPE = "Snowflake";
-
- private static final String SF_HEADER_TOKEN_TAG = "Token";
-
static final String SF_MEDIA_TYPE = "application/snowflake";
// we don't want to retry canceling forever so put a limit which is
// twice as much as our default socket timeout
static final int SF_CANCELING_RETRY_TIMEOUT_IN_MILLIS = 600000; // 10 min
- static final SFLogger logger = SFLoggerFactory.getLogger(StmtUtil.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(StmtUtil.class);
/** Input for executing a statement on server */
static class StmtInput {
@@ -310,12 +299,12 @@ public static StmtOutput execute(StmtInput stmtInput, ExecTimeTelemetryData exec
// don't need to execute the query again
if (stmtInput.retry && stmtInput.prevGetResultURL != null) {
logger.debug(
- "retrying statement execution with get result URL: {}", stmtInput.prevGetResultURL);
+ "Retrying statement execution with get result URL: {}", stmtInput.prevGetResultURL);
} else {
URIBuilder uriBuilder = new URIBuilder(stmtInput.serverUrl);
uriBuilder.setPath(SF_PATH_QUERY_V1);
- uriBuilder.addParameter(SF_QUERY_REQUEST_ID, stmtInput.requestId);
+ uriBuilder.addParameter(SFSession.SF_QUERY_REQUEST_ID, stmtInput.requestId);
if (stmtInput.combineDescribe) {
uriBuilder.addParameter(SF_QUERY_COMBINE_DESCRIBE_EXECUTE, Boolean.TRUE.toString());
@@ -376,10 +365,10 @@ public static StmtOutput execute(StmtInput stmtInput, ExecTimeTelemetryData exec
httpRequest.addHeader("accept", stmtInput.mediaType);
httpRequest.setHeader(
- SF_HEADER_AUTHORIZATION,
- SF_HEADER_SNOWFLAKE_AUTHTYPE
+ SFSession.SF_HEADER_AUTHORIZATION,
+ SFSession.SF_HEADER_SNOWFLAKE_AUTHTYPE
+ " "
- + SF_HEADER_TOKEN_TAG
+ + SFSession.SF_HEADER_TOKEN_TAG
+ "=\""
+ stmtInput.sessionToken
+ "\"");
@@ -522,11 +511,11 @@ else if (stmtInput.asyncExec
// simulate client pause before trying to fetch result so that
// we can test query behavior related to disconnected client
if (stmtInput.injectClientPause != 0) {
- logger.debug("inject client pause for {} seconds", stmtInput.injectClientPause);
+ logger.debug("Inject client pause for {} seconds", stmtInput.injectClientPause);
try {
Thread.sleep(stmtInput.injectClientPause * 1000);
} catch (InterruptedException ex) {
- logger.debug("exception encountered while injecting pause", false);
+ logger.debug("Exception encountered while injecting pause", false);
}
}
}
@@ -606,14 +595,14 @@ protected static String getQueryResult(
protected static String getQueryResult(String getResultPath, StmtInput stmtInput)
throws SFException, SnowflakeSQLException {
HttpGet httpRequest = null;
- logger.debug("get query result: {}", getResultPath);
+ logger.debug("Get query result: {}", getResultPath);
try {
URIBuilder uriBuilder = new URIBuilder(stmtInput.serverUrl);
uriBuilder.setPath(getResultPath);
- uriBuilder.addParameter(SF_QUERY_REQUEST_ID, UUIDUtils.getUUID().toString());
+ uriBuilder.addParameter(SFSession.SF_QUERY_REQUEST_ID, UUIDUtils.getUUID().toString());
httpRequest = new HttpGet(uriBuilder.build());
// Add custom headers before adding common headers
@@ -623,10 +612,10 @@ protected static String getQueryResult(String getResultPath, StmtInput stmtInput
httpRequest.addHeader("accept", stmtInput.mediaType);
httpRequest.setHeader(
- SF_HEADER_AUTHORIZATION,
- SF_HEADER_SNOWFLAKE_AUTHTYPE
+ SFSession.SF_HEADER_AUTHORIZATION,
+ SFSession.SF_HEADER_SNOWFLAKE_AUTHTYPE
+ " "
- + SF_HEADER_TOKEN_TAG
+ + SFSession.SF_HEADER_TOKEN_TAG
+ "=\""
+ stmtInput.sessionToken
+ "\"");
@@ -717,7 +706,7 @@ public static void cancel(StmtInput stmtInput) throws SFException, SnowflakeSQLE
uriBuilder.setPath(SF_PATH_ABORT_REQUEST_V1);
- uriBuilder.addParameter(SF_QUERY_REQUEST_ID, UUIDUtils.getUUID().toString());
+ uriBuilder.addParameter(SFSession.SF_QUERY_REQUEST_ID, UUIDUtils.getUUID().toString());
httpRequest = new HttpPost(uriBuilder.build());
// Add custom headers before adding common headers
@@ -742,10 +731,10 @@ public static void cancel(StmtInput stmtInput) throws SFException, SnowflakeSQLE
httpRequest.addHeader("accept", stmtInput.mediaType);
httpRequest.setHeader(
- SF_HEADER_AUTHORIZATION,
- SF_HEADER_SNOWFLAKE_AUTHTYPE
+ SFSession.SF_HEADER_AUTHORIZATION,
+ SFSession.SF_HEADER_SNOWFLAKE_AUTHTYPE
+ " "
- + SF_HEADER_TOKEN_TAG
+ + SFSession.SF_HEADER_TOKEN_TAG
+ "=\""
+ stmtInput.sessionToken
+ "\"");
@@ -798,7 +787,7 @@ public static SFStatementType checkStageManageCommand(String sql) {
// skip commenting prefixed with //
while (trimmedSql.startsWith("//")) {
if (logger.isDebugEnabled()) {
- logger.debug("skipping // comments in: \n{}", trimmedSql);
+ logger.debug("Skipping // comments in: \n{}", trimmedSql);
}
if (trimmedSql.indexOf('\n') > 0) {
diff --git a/src/main/java/net/snowflake/client/core/URLUtil.java b/src/main/java/net/snowflake/client/core/URLUtil.java
index cd4129e4c..56fa0f266 100644
--- a/src/main/java/net/snowflake/client/core/URLUtil.java
+++ b/src/main/java/net/snowflake/client/core/URLUtil.java
@@ -3,8 +3,11 @@
*/
package net.snowflake.client.core;
+import static net.snowflake.client.core.SFSession.SF_QUERY_REQUEST_ID;
+
import java.io.UnsupportedEncodingException;
import java.net.MalformedURLException;
+import java.net.URI;
import java.net.URISyntaxException;
import java.net.URL;
import java.net.URLEncoder;
@@ -15,10 +18,12 @@
import javax.annotation.Nullable;
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
+import org.apache.http.NameValuePair;
+import org.apache.http.client.utils.URLEncodedUtils;
public class URLUtil {
- static final SFLogger logger = SFLoggerFactory.getLogger(URLUtil.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(URLUtil.class);
static final String validURLPattern =
"^http(s?)\\:\\/\\/[0-9a-zA-Z]([-.\\w]*[0-9a-zA-Z@:])*(:(0-9)*)*(\\/?)([a-zA-Z0-9\\-\\.\\?\\,\\&\\(\\)\\/\\\\\\+&%\\$#_=@]*)?$";
static final Pattern pattern = Pattern.compile(validURLPattern);
@@ -53,4 +58,20 @@ public static String urlEncode(String target) throws UnsupportedEncodingExceptio
}
return encodedTarget;
}
+
+ @SnowflakeJdbcInternalApi
+ public static String getRequestId(URI uri) {
+ return URLEncodedUtils.parse(uri, StandardCharsets.UTF_8).stream()
+ .filter(p -> p.getName().equals(SF_QUERY_REQUEST_ID))
+ .findFirst()
+ .map(NameValuePair::getValue)
+ .orElse(null);
+ }
+
+ @SnowflakeJdbcInternalApi
+ public static String getRequestIdLogStr(URI uri) {
+ String requestId = getRequestId(uri);
+
+ return requestId == null ? "" : "[requestId=" + requestId + "] ";
+ }
}
diff --git a/src/main/java/net/snowflake/client/core/arrow/ArrowResultUtil.java b/src/main/java/net/snowflake/client/core/arrow/ArrowResultUtil.java
index 8eaaadc94..2ad5c3ef2 100644
--- a/src/main/java/net/snowflake/client/core/arrow/ArrowResultUtil.java
+++ b/src/main/java/net/snowflake/client/core/arrow/ArrowResultUtil.java
@@ -11,6 +11,7 @@
import java.util.TimeZone;
import net.snowflake.client.core.ResultUtil;
import net.snowflake.client.core.SFException;
+import net.snowflake.client.core.SnowflakeJdbcInternalApi;
import net.snowflake.client.jdbc.ErrorCode;
import net.snowflake.client.jdbc.SnowflakeTimestampWithTimezone;
import net.snowflake.client.log.ArgSupplier;
@@ -151,6 +152,19 @@ public static Timestamp moveToTimeZone(Timestamp ts, TimeZone oldTZ, TimeZone ne
* @return
*/
public static Timestamp toJavaTimestamp(long epoch, int scale) {
+ return toJavaTimestamp(epoch, scale, TimeZone.getDefault(), false);
+ }
+
+ /**
+ * generate Java Timestamp object
+ *
+ * @param epoch the value since epoch time
+ * @param scale the scale of the value
+ * @return
+ */
+ @SnowflakeJdbcInternalApi
+ public static Timestamp toJavaTimestamp(
+ long epoch, int scale, TimeZone sessionTimezone, boolean useSessionTimezone) {
long seconds = epoch / powerOfTen(scale);
int fraction = (int) ((epoch % powerOfTen(scale)) * powerOfTen(9 - scale));
if (fraction < 0) {
@@ -158,7 +172,7 @@ public static Timestamp toJavaTimestamp(long epoch, int scale) {
seconds--;
fraction += 1000000000;
}
- return createTimestamp(seconds, fraction, TimeZone.getDefault(), false);
+ return createTimestamp(seconds, fraction, sessionTimezone, useSessionTimezone);
}
/**
diff --git a/src/main/java/net/snowflake/client/core/arrow/BigIntToTimestampLTZConverter.java b/src/main/java/net/snowflake/client/core/arrow/BigIntToTimestampLTZConverter.java
index 236abe553..e2bba45ab 100644
--- a/src/main/java/net/snowflake/client/core/arrow/BigIntToTimestampLTZConverter.java
+++ b/src/main/java/net/snowflake/client/core/arrow/BigIntToTimestampLTZConverter.java
@@ -11,6 +11,7 @@
import net.snowflake.client.core.DataConversionContext;
import net.snowflake.client.core.ResultUtil;
import net.snowflake.client.core.SFException;
+import net.snowflake.client.core.SnowflakeJdbcInternalApi;
import net.snowflake.client.jdbc.ErrorCode;
import net.snowflake.client.jdbc.SnowflakeType;
import net.snowflake.client.jdbc.SnowflakeUtil;
@@ -65,7 +66,7 @@ public Timestamp toTimestamp(int index, TimeZone tz) throws SFException {
private Timestamp getTimestamp(int index, TimeZone tz) throws SFException {
long val = bigIntVector.getDataBuffer().getLong(index * BigIntVector.TYPE_WIDTH);
int scale = context.getScale(columnIndex);
- return getTimestamp(val, scale);
+ return getTimestamp(val, scale, sessionTimeZone, useSessionTimezone);
}
@Override
@@ -90,8 +91,25 @@ public boolean toBoolean(int index) throws SFException {
SnowflakeUtil.BOOLEAN_STR, val);
}
+ /**
+ * Use {@link #getTimestamp(long, int, TimeZone, boolean)}
+ *
+ * @param val epoch
+ * @param scale scale
+ * @return Timestamp value without timezone take into account
+ * @throws SFException
+ */
+ @Deprecated
public static Timestamp getTimestamp(long val, int scale) throws SFException {
Timestamp ts = ArrowResultUtil.toJavaTimestamp(val, scale);
return ResultUtil.adjustTimestamp(ts);
}
+
+ @SnowflakeJdbcInternalApi
+ public static Timestamp getTimestamp(
+ long epoch, int scale, TimeZone sessionTimeZone, boolean useSessionTimezone)
+ throws SFException {
+ return ResultUtil.adjustTimestamp(
+ ArrowResultUtil.toJavaTimestamp(epoch, scale, sessionTimeZone, useSessionTimezone));
+ }
}
diff --git a/src/main/java/net/snowflake/client/core/arrow/StructuredTypeDateTimeConverter.java b/src/main/java/net/snowflake/client/core/arrow/StructuredTypeDateTimeConverter.java
index a07e583ea..14bea858a 100644
--- a/src/main/java/net/snowflake/client/core/arrow/StructuredTypeDateTimeConverter.java
+++ b/src/main/java/net/snowflake/client/core/arrow/StructuredTypeDateTimeConverter.java
@@ -92,7 +92,8 @@ private Timestamp convertTimestampLtz(Object obj, int scale) throws SFException
false);
}
} else if (obj instanceof Long) {
- return BigIntToTimestampLTZConverter.getTimestamp((long) obj, scale);
+ return BigIntToTimestampLTZConverter.getTimestamp(
+ (long) obj, scale, sessionTimeZone, useSessionTimezone);
}
throw new SFException(
ErrorCode.INVALID_VALUE_CONVERT,
diff --git a/src/main/java/net/snowflake/client/core/arrow/VectorTypeConverter.java b/src/main/java/net/snowflake/client/core/arrow/VectorTypeConverter.java
index 2e9dbd82d..ae7a492a0 100644
--- a/src/main/java/net/snowflake/client/core/arrow/VectorTypeConverter.java
+++ b/src/main/java/net/snowflake/client/core/arrow/VectorTypeConverter.java
@@ -1,5 +1,6 @@
package net.snowflake.client.core.arrow;
+import java.util.List;
import net.snowflake.client.core.DataConversionContext;
import net.snowflake.client.core.SFException;
import net.snowflake.client.jdbc.SnowflakeType;
@@ -22,6 +23,10 @@ public Object toObject(int index) throws SFException {
@Override
public String toString(int index) throws SFException {
- return vector.getObject(index).toString();
+ List object = vector.getObject(index);
+ if (object == null) {
+ return null;
+ }
+ return object.toString();
}
}
diff --git a/src/main/java/net/snowflake/client/core/bind/BindUploader.java b/src/main/java/net/snowflake/client/core/bind/BindUploader.java
index 2332f0150..6b901da44 100644
--- a/src/main/java/net/snowflake/client/core/bind/BindUploader.java
+++ b/src/main/java/net/snowflake/client/core/bind/BindUploader.java
@@ -159,6 +159,7 @@ private synchronized String synchronizedTimestampFormat(String o, String type) {
int nano = times.right;
Timestamp v1 = new Timestamp(sec * 1000);
+ ZoneOffset offsetId;
// For timestamp_ntz, use UTC timezone. For timestamp_ltz, use the local timezone to minimise
// the gap.
if ("TIMESTAMP_LTZ".equals(type)) {
@@ -166,10 +167,11 @@ private synchronized String synchronizedTimestampFormat(String o, String type) {
cal.setTimeZone(tz);
cal.clear();
timestampFormat.setCalendar(cal);
+ offsetId = ZoneId.systemDefault().getRules().getOffset(Instant.ofEpochMilli(v1.getTime()));
+ } else {
+ offsetId = ZoneOffset.UTC;
}
- ZoneOffset offsetId = ZoneId.systemDefault().getRules().getOffset(Instant.now());
-
return timestampFormat.format(v1) + String.format("%09d", nano) + " " + offsetId;
}
diff --git a/src/main/java/net/snowflake/client/core/json/Converters.java b/src/main/java/net/snowflake/client/core/json/Converters.java
index 584e0d12e..afe663f90 100644
--- a/src/main/java/net/snowflake/client/core/json/Converters.java
+++ b/src/main/java/net/snowflake/client/core/json/Converters.java
@@ -13,8 +13,8 @@
import java.util.TimeZone;
import net.snowflake.client.core.SFBaseSession;
import net.snowflake.client.core.SFException;
+import net.snowflake.client.core.SfTimestampUtil;
import net.snowflake.client.core.SnowflakeJdbcInternalApi;
-import net.snowflake.client.core.SqlInputTimestampUtil;
import net.snowflake.client.core.arrow.StructuredTypeDateTimeConverter;
import net.snowflake.client.jdbc.ErrorCode;
import net.snowflake.client.jdbc.SnowflakeResultSetSerializableV1;
@@ -224,7 +224,7 @@ public Converter timestampFromStringConverter(
TimeZone sessionTimezone) {
return value -> {
Timestamp result =
- SqlInputTimestampUtil.getTimestampFromType(
+ SfTimestampUtil.getTimestampFromType(
columnSubType, (String) value, session, sessionTimezone, tz);
if (result != null) {
return result;
diff --git a/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java b/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java
index 103f90555..3516966e6 100644
--- a/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java
+++ b/src/main/java/net/snowflake/client/jdbc/ArrowResultChunk.java
@@ -212,7 +212,11 @@ private static List initConverters(
break;
case MAP:
- converters.add(new MapConverter((MapVector) vector, i, context));
+ if (vector instanceof MapVector) {
+ converters.add(new MapConverter((MapVector) vector, i, context));
+ } else {
+ converters.add(new VarCharConverter(vector, i, context));
+ }
break;
case VECTOR:
diff --git a/src/main/java/net/snowflake/client/jdbc/BindingParameterMetadata.java b/src/main/java/net/snowflake/client/jdbc/BindingParameterMetadata.java
new file mode 100644
index 000000000..db1c85e7b
--- /dev/null
+++ b/src/main/java/net/snowflake/client/jdbc/BindingParameterMetadata.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (c) 2012-2024 Snowflake Computing Inc. All right reserved.
+ */
+package net.snowflake.client.jdbc;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import java.util.List;
+
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class BindingParameterMetadata {
+ private String type;
+ private String name;
+ private Integer length;
+ private Integer byteLength;
+ private Integer precision;
+ private Integer scale;
+
+ private boolean nullable = true;
+ private List fields;
+
+ public BindingParameterMetadata(String type) {
+ this.type = type;
+ }
+
+ public BindingParameterMetadata(String type, String name) {
+ this.type = type;
+ this.name = name;
+ }
+
+ public BindingParameterMetadata(
+ String type,
+ String name,
+ Integer length,
+ Integer byteLength,
+ Integer precision,
+ Integer scale,
+ Boolean nullable) {
+ this.type = type;
+ this.name = name;
+ this.length = length;
+ this.byteLength = byteLength;
+ this.precision = precision;
+ this.scale = scale;
+ this.nullable = nullable;
+ }
+
+ public BindingParameterMetadata() {}
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public Integer getLength() {
+ return length;
+ }
+
+ public void setLength(Integer length) {
+ this.length = length;
+ }
+
+ public Integer getByteLength() {
+ return byteLength;
+ }
+
+ public void setByteLength(Integer byteLength) {
+ this.byteLength = byteLength;
+ }
+
+ public Integer getPrecision() {
+ return precision;
+ }
+
+ public void setPrecision(Integer precision) {
+ this.precision = precision;
+ }
+
+ public Integer getScale() {
+ return scale;
+ }
+
+ public void setScale(Integer scale) {
+ this.scale = scale;
+ }
+
+ public Boolean isNullable() {
+ return nullable;
+ }
+
+ public void setNullable(Boolean nullable) {
+ this.nullable = nullable;
+ }
+
+ public List getFields() {
+ return fields;
+ }
+
+ public void setFields(List fields) {
+ this.fields = fields;
+ }
+
+ public static class BindingParameterMetadataBuilder {
+ private BindingParameterMetadata bindingParameterMetadata;
+
+ private BindingParameterMetadataBuilder() {
+ bindingParameterMetadata = new BindingParameterMetadata();
+ }
+
+ public BindingParameterMetadataBuilder withType(String type) {
+ bindingParameterMetadata.type = type;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withName(String name) {
+ bindingParameterMetadata.name = name;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withLength(Integer length) {
+ bindingParameterMetadata.length = length;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withByteLength(Integer byteLength) {
+ bindingParameterMetadata.byteLength = byteLength;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withPrecision(Integer precision) {
+ bindingParameterMetadata.precision = precision;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withScale(Integer scale) {
+ bindingParameterMetadata.scale = scale;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withNullable(Boolean nullable) {
+ bindingParameterMetadata.nullable = nullable;
+ return this;
+ }
+
+ public BindingParameterMetadataBuilder withFields(List fields) {
+ bindingParameterMetadata.fields = fields;
+ return this;
+ }
+
+ public static BindingParameterMetadataBuilder bindingParameterMetadata() {
+ return new BindingParameterMetadataBuilder();
+ }
+
+ public BindingParameterMetadata build() {
+ return bindingParameterMetadata;
+ }
+ }
+}
diff --git a/src/main/java/net/snowflake/client/jdbc/DefaultResultStreamProvider.java b/src/main/java/net/snowflake/client/jdbc/DefaultResultStreamProvider.java
index 39f94235b..3ee556bb4 100644
--- a/src/main/java/net/snowflake/client/jdbc/DefaultResultStreamProvider.java
+++ b/src/main/java/net/snowflake/client/jdbc/DefaultResultStreamProvider.java
@@ -11,6 +11,8 @@
import net.snowflake.client.core.ExecTimeTelemetryData;
import net.snowflake.client.core.HttpUtil;
import net.snowflake.client.log.ArgSupplier;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.SecretDetector;
import net.snowflake.common.core.SqlState;
import org.apache.http.Header;
@@ -21,6 +23,8 @@
import org.apache.http.impl.client.CloseableHttpClient;
public class DefaultResultStreamProvider implements ResultStreamProvider {
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(DefaultResultStreamProvider.class);
// SSE-C algorithm header
private static final String SSE_C_ALGORITHM = "x-amz-server-side-encryption-customer-algorithm";
@@ -53,16 +57,15 @@ public InputStream getInputStream(ChunkDownloadContext context) throws Exception
* means failure.
*/
if (response == null || response.getStatusLine().getStatusCode() != 200) {
- SnowflakeResultSetSerializableV1.logger.error(
- "Error fetching chunk from: {}", context.getResultChunk().getScrubbedUrl());
+ logger.error("Error fetching chunk from: {}", context.getResultChunk().getScrubbedUrl());
- SnowflakeUtil.logResponseDetails(response, SnowflakeResultSetSerializableV1.logger);
+ SnowflakeUtil.logResponseDetails(response, logger);
throw new SnowflakeSQLException(
SqlState.IO_ERROR,
ErrorCode.NETWORK_ERROR.getMessageCode(),
"Error encountered when downloading a result chunk: HTTP "
- + "status="
+ + "status: "
+ ((response != null) ? response.getStatusLine().getStatusCode() : "null response"));
}
@@ -72,7 +75,7 @@ public InputStream getInputStream(ChunkDownloadContext context) throws Exception
// read the chunk data
inputStream = detectContentEncodingAndGetInputStream(response, entity.getContent());
} catch (Exception ex) {
- SnowflakeResultSetSerializableV1.logger.error("Failed to decompress data: {}", response);
+ logger.error("Failed to decompress data: {}", response);
throw new SnowflakeSQLLoggedException(
context.getSession(),
@@ -82,7 +85,7 @@ public InputStream getInputStream(ChunkDownloadContext context) throws Exception
}
// trace the response if requested
- SnowflakeResultSetSerializableV1.logger.debug("Json response: {}", response);
+ logger.debug("Json response: {}", response);
return inputStream;
}
@@ -94,8 +97,7 @@ private HttpResponse getResultChunk(ChunkDownloadContext context) throws Excepti
if (context.getChunkHeadersMap() != null && context.getChunkHeadersMap().size() != 0) {
for (Map.Entry entry : context.getChunkHeadersMap().entrySet()) {
- SnowflakeResultSetSerializableV1.logger.debug(
- "Adding header key={}, value={}", entry.getKey(), entry.getValue());
+ logger.debug("Adding header key: {}", entry.getKey());
httpRequest.addHeader(entry.getKey(), entry.getValue());
}
}
@@ -103,11 +105,11 @@ private HttpResponse getResultChunk(ChunkDownloadContext context) throws Excepti
else if (context.getQrmk() != null) {
httpRequest.addHeader(SSE_C_ALGORITHM, SSE_C_AES);
httpRequest.addHeader(SSE_C_KEY, context.getQrmk());
- SnowflakeResultSetSerializableV1.logger.debug("Adding SSE-C headers", false);
+ logger.debug("Adding SSE-C headers", false);
}
- SnowflakeResultSetSerializableV1.logger.debug(
- "Thread {} Fetching result #chunk{}: {}",
+ logger.debug(
+ "Thread {} Fetching result chunk#{}: {}",
Thread.currentThread().getId(),
context.getChunkIndex(),
context.getResultChunk().getScrubbedUrl());
@@ -133,8 +135,8 @@ else if (context.getQrmk() != null) {
true, // no retry on http request
new ExecTimeTelemetryData());
- SnowflakeResultSetSerializableV1.logger.debug(
- "Thread {} Call #chunk{} returned for URL: {}, response={}",
+ logger.debug(
+ "Thread {} Call chunk#{} returned for URL: {}, response: {}",
Thread.currentThread().getId(),
context.getChunkIndex(),
(ArgSupplier) () -> SecretDetector.maskSASToken(context.getResultChunk().getUrl()),
diff --git a/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java b/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java
index 7ada3a803..6bb62c82f 100644
--- a/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java
+++ b/src/main/java/net/snowflake/client/jdbc/DefaultSFConnectionHandler.java
@@ -8,15 +8,19 @@
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
+import java.nio.file.attribute.PosixFilePermission;
+import java.nio.file.attribute.PosixFilePermissions;
import java.sql.ResultSet;
import java.sql.SQLException;
import java.sql.SQLNonTransientConnectionException;
import java.sql.Statement;
import java.util.Map;
import java.util.Properties;
+import java.util.Set;
import java.util.logging.Level;
import net.snowflake.client.config.SFClientConfig;
import net.snowflake.client.config.SFClientConfigParser;
+import net.snowflake.client.core.Constants;
import net.snowflake.client.core.SFBaseResultSet;
import net.snowflake.client.core.SFBaseSession;
import net.snowflake.client.core.SFBaseStatement;
@@ -136,13 +140,16 @@ private void setClientConfig() throws SnowflakeSQLLoggedException {
String clientConfigFilePath =
(String) connectionPropertiesMap.getOrDefault(SFSessionProperty.CLIENT_CONFIG_FILE, null);
- SFClientConfig sfClientConfig;
- try {
- sfClientConfig = SFClientConfigParser.loadSFClientConfig(clientConfigFilePath);
- } catch (IOException e) {
- throw new SnowflakeSQLLoggedException(sfSession, ErrorCode.INTERNAL_ERROR, e.getMessage());
+ SFClientConfig sfClientConfig = sfSession.getSfClientConfig();
+ if (sfClientConfig == null) {
+ try {
+ sfClientConfig = SFClientConfigParser.loadSFClientConfig(clientConfigFilePath);
+ } catch (IOException e) {
+ throw new SnowflakeSQLLoggedException(
+ sfSession, ErrorCode.INTERNAL_ERROR, e.getMessage(), e.getCause());
+ }
+ sfSession.setSfClientConfig(sfClientConfig);
}
- sfSession.setSfClientConfig(sfClientConfig);
}
/**
@@ -181,6 +188,7 @@ && systemGetProperty("java.util.logging.config.file") == null) {
if (logLevel != null && logPattern != null) {
try {
+ logger.info("Setting logger with log level {} and log pattern {}", logLevel, logPattern);
JDK14Logger.instantiateLogger(logLevel, logPattern);
} catch (IOException ex) {
throw new SnowflakeSQLLoggedException(
@@ -188,13 +196,10 @@ && systemGetProperty("java.util.logging.config.file") == null) {
}
if (sfClientConfig != null) {
logger.debug(
- String.format(
- "SF Client config found at location: %s.", sfClientConfig.getConfigFilePath()));
+ "SF Client config found at location: {}.", sfClientConfig.getConfigFilePath());
}
logger.debug(
- String.format(
- "Instantiating JDK14Logger with level: %s , output path: %s",
- logLevel, logPattern));
+ "Instantiating JDK14Logger with level: {}, output path: {}", logLevel, logPattern);
}
}
}
@@ -206,25 +211,98 @@ private String constructLogPattern(String logPathFromConfig) throws SnowflakeSQL
String logPattern = "%t/snowflake_jdbc%u.log"; // java.tmpdir
+ Path logPath;
if (logPathFromConfig != null && !logPathFromConfig.isEmpty()) {
- Path path = Paths.get(logPathFromConfig, "jdbc");
- if (!Files.exists(path)) {
+ // Get log path from configuration
+ logPath = Paths.get(logPathFromConfig);
+ if (!Files.exists(logPath)) {
try {
- Files.createDirectories(path);
+ Files.createDirectories(logPath);
} catch (IOException ex) {
throw new SnowflakeSQLLoggedException(
sfSession,
ErrorCode.INTERNAL_ERROR,
String.format(
- "Un-able to create log path mentioned in configfile %s ,%s",
+ "Unable to create log path mentioned in configfile %s ,%s",
logPathFromConfig, ex.getMessage()));
}
}
- logPattern = Paths.get(path.toString(), "snowflake_jdbc%u.log").toString();
+ } else {
+ // Get log path from home directory
+ String homePath = systemGetProperty("user.home");
+ if (homePath == null || homePath.isEmpty()) {
+ throw new SnowflakeSQLLoggedException(
+ sfSession,
+ ErrorCode.INTERNAL_ERROR,
+ String.format(
+ "Log path not set in configfile %s and home directory not set.",
+ logPathFromConfig));
+ }
+ logPath = Paths.get(homePath);
}
+
+ Path path = createLogPathSubDirectory(logPath);
+
+ logPattern = Paths.get(path.toString(), "snowflake_jdbc%u.log").toString();
return logPattern;
}
+ private Path createLogPathSubDirectory(Path logPath) throws SnowflakeSQLLoggedException {
+ Path path = Paths.get(logPath.toString(), "jdbc");
+ if (!Files.exists(path)) {
+ createLogFolder(path);
+ } else {
+ checkLogFolderPermissions(path);
+ }
+ return path;
+ }
+
+ private void createLogFolder(Path path) throws SnowflakeSQLLoggedException {
+ try {
+ if (Constants.getOS() == Constants.OS.WINDOWS) {
+ Files.createDirectories(path);
+ } else {
+ Files.createDirectories(
+ path,
+ PosixFilePermissions.asFileAttribute(PosixFilePermissions.fromString("rwx------")));
+ }
+ } catch (IOException ex) {
+ throw new SnowflakeSQLLoggedException(
+ sfSession,
+ ErrorCode.INTERNAL_ERROR,
+ String.format(
+ "Unable to create jdbc subfolder in configfile %s ,%s",
+ path.toString(), ex.getMessage(), ex.getCause()));
+ }
+ }
+
+ private void checkLogFolderPermissions(Path path) throws SnowflakeSQLLoggedException {
+ if (Constants.getOS() != Constants.OS.WINDOWS) {
+ try {
+ Set folderPermissions = Files.getPosixFilePermissions(path);
+ if (folderPermissions.contains(PosixFilePermission.GROUP_WRITE)
+ || folderPermissions.contains(PosixFilePermission.GROUP_READ)
+ || folderPermissions.contains(PosixFilePermission.GROUP_EXECUTE)
+ || folderPermissions.contains(PosixFilePermission.OTHERS_WRITE)
+ || folderPermissions.contains(PosixFilePermission.OTHERS_READ)
+ || folderPermissions.contains(PosixFilePermission.OTHERS_EXECUTE)) {
+ logger.warn(
+ "Access permission for the logs directory '{}' is currently {} and is potentially "
+ + "accessible to users other than the owner of the logs directory.",
+ path.toString(),
+ folderPermissions.toString());
+ }
+ } catch (IOException ex) {
+ throw new SnowflakeSQLLoggedException(
+ sfSession,
+ ErrorCode.INTERNAL_ERROR,
+ String.format(
+ "Unable to get permissions of log directory %s ,%s",
+ path.toString(), ex.getMessage(), ex.getCause()));
+ }
+ }
+ }
+
private void initSessionProperties(SnowflakeConnectString conStr, String appID, String appVersion)
throws SFException {
Map properties = mergeProperties(conStr);
diff --git a/src/main/java/net/snowflake/client/jdbc/FieldMetadata.java b/src/main/java/net/snowflake/client/jdbc/FieldMetadata.java
index cf019d62e..d38011c0e 100644
--- a/src/main/java/net/snowflake/client/jdbc/FieldMetadata.java
+++ b/src/main/java/net/snowflake/client/jdbc/FieldMetadata.java
@@ -3,7 +3,9 @@
*/
package net.snowflake.client.jdbc;
+import java.util.ArrayList;
import java.util.List;
+import net.snowflake.client.core.SnowflakeJdbcInternalApi;
public class FieldMetadata {
@@ -43,6 +45,11 @@ public FieldMetadata(
this.fields = fields;
}
+ @SnowflakeJdbcInternalApi
+ public FieldMetadata() {
+ this.fields = new ArrayList<>();
+ }
+
public String getName() {
return name;
}
diff --git a/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java b/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java
index 2930188eb..14fb7dbdc 100644
--- a/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java
+++ b/src/main/java/net/snowflake/client/jdbc/FileBackedOutputStream.java
@@ -26,6 +26,7 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
+import net.snowflake.client.core.FileUtil;
/**
* An {@link OutputStream} that starts buffering to a byte array, but switches to file buffering
@@ -129,6 +130,7 @@ public ByteSource asByteSource() {
private synchronized InputStream openInputStream() throws IOException {
if (file != null) {
+ FileUtil.logFileUsage(file, "Data buffering stream", false);
return new FileInputStream(file);
} else {
return new ByteArrayInputStream(memory.getBuffer(), 0, memory.getCount());
diff --git a/src/main/java/net/snowflake/client/jdbc/RestRequest.java b/src/main/java/net/snowflake/client/jdbc/RestRequest.java
index fa7826664..5be46c5de 100644
--- a/src/main/java/net/snowflake/client/jdbc/RestRequest.java
+++ b/src/main/java/net/snowflake/client/jdbc/RestRequest.java
@@ -6,6 +6,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
+import java.util.UUID;
import java.util.concurrent.atomic.AtomicBoolean;
import javax.net.ssl.SSLHandshakeException;
import javax.net.ssl.SSLKeyException;
@@ -17,6 +18,7 @@
import net.snowflake.client.core.HttpUtil;
import net.snowflake.client.core.SFOCSPException;
import net.snowflake.client.core.SessionUtil;
+import net.snowflake.client.core.URLUtil;
import net.snowflake.client.core.UUIDUtils;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
import net.snowflake.client.log.ArgSupplier;
@@ -24,6 +26,7 @@
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.DecorrelatedJitterBackoff;
import net.snowflake.client.util.SecretDetector;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.SqlState;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpRequestBase;
@@ -123,9 +126,32 @@ public static CloseableHttpResponse execute(
boolean noRetry,
ExecTimeTelemetryData execTimeData)
throws SnowflakeSQLException {
- CloseableHttpResponse response = null;
+ Stopwatch stopwatch = null;
+
+ if (logger.isDebugEnabled()) {
+ stopwatch = new Stopwatch();
+ stopwatch.start();
+ }
String requestInfoScrubbed = SecretDetector.maskSASToken(httpRequest.toString());
+ String requestIdStr = URLUtil.getRequestIdLogStr(httpRequest.getURI());
+ logger.debug(
+ "{}Executing rest request: {}, retry timeout: {}, socket timeout: {}, max retries: {},"
+ + " inject socket timeout: {}, canceling: {}, without cookies: {}, include retry parameters: {},"
+ + " include request guid: {}, retry http 403: {}, no retry: {}",
+ requestIdStr,
+ requestInfoScrubbed,
+ retryTimeout,
+ socketTimeout,
+ maxRetries,
+ injectSocketTimeout,
+ canceling,
+ withoutCookies,
+ includeRetryParameters,
+ includeRequestGuid,
+ retryHTTP403,
+ noRetry);
+ CloseableHttpResponse response = null;
// time the client started attempting to submit request
final long startTime = System.currentTimeMillis();
@@ -140,6 +166,10 @@ public static CloseableHttpResponse execute(
// Used to indicate that this is a login/auth request and will be using the new retry strategy.
boolean isLoginRequest = SessionUtil.isNewRetryStrategyRequest(httpRequest);
+ if (isLoginRequest) {
+ logger.debug("{}Request is a login/auth request. Using new retry strategy", requestIdStr);
+ }
+
// total elapsed time due to transient issues.
long elapsedMilliForTransientIssues = 0;
@@ -168,9 +198,14 @@ public static CloseableHttpResponse execute(
// try request till we get a good response or retry timeout
while (true) {
- logger.debug("Retry count: {}", retryCount);
- logger.debug("Attempting request: {}", requestInfoScrubbed);
-
+ logger.debug(
+ "{}Retry count: {}, max retries: {}, retry timeout: {} s, backoff: {} ms. Attempting request: {}",
+ requestIdStr,
+ retryCount,
+ maxRetries,
+ retryTimeout,
+ backoffInMilli,
+ requestInfoScrubbed);
try {
// update start time
startTimePerRequest = System.currentTimeMillis();
@@ -184,7 +219,8 @@ public static CloseableHttpResponse execute(
if (injectSocketTimeout != 0 && retryCount == 0) {
// test code path
logger.debug(
- "Injecting socket timeout by setting " + "socket timeout to {} millisecond ",
+ "{}Injecting socket timeout by setting socket timeout to {} ms",
+ requestIdStr,
injectSocketTimeout);
httpRequest.setConfig(
HttpUtil.getDefaultRequestConfigWithSocketTimeout(
@@ -203,6 +239,7 @@ public static CloseableHttpResponse execute(
// If HTAP
if ("true".equalsIgnoreCase(System.getenv("HTAP_SIMULATION"))
&& builder.getPathSegments().contains("query-request")) {
+ logger.debug("{}Setting htap simulation", requestIdStr);
builder.setParameter("target", "htap_simulation");
}
if (includeRetryParameters && retryCount > 0) {
@@ -215,14 +252,18 @@ public static CloseableHttpResponse execute(
// so that it can be renewed in time and pass it to the http request configuration.
if (authTimeout > 0) {
int requestSocketAndConnectTimeout = (int) authTimeout * 1000;
+ logger.debug(
+ "{}Setting auth timeout as the socket timeout: {} s", requestIdStr, authTimeout);
httpRequest.setConfig(
HttpUtil.getDefaultRequestConfigWithSocketAndConnectTimeout(
requestSocketAndConnectTimeout, withoutCookies));
}
if (includeRequestGuid) {
+ UUID guid = UUIDUtils.getUUID();
+ logger.debug("{}Request {} guid: {}", requestIdStr, requestInfoScrubbed, guid.toString());
// Add request_guid for better tracing
- builder.setParameter(SF_REQUEST_GUID, UUIDUtils.getUUID().toString());
+ builder.setParameter(SF_REQUEST_GUID, guid.toString());
}
httpRequest.setURI(builder.build());
@@ -233,7 +274,7 @@ public static CloseableHttpResponse execute(
// if exception is caused by illegal state, e.g shutdown of http client
// because of closing of connection, then fail immediately and stop retrying.
throw new SnowflakeSQLLoggedException(
- null, ErrorCode.INVALID_STATE, ex, /* session = */ ex.getMessage());
+ null, ErrorCode.INVALID_STATE, ex, /* session= */ ex.getMessage());
} catch (SSLHandshakeException
| SSLKeyException
@@ -247,17 +288,20 @@ public static CloseableHttpResponse execute(
} catch (Exception ex) {
savedEx = ex;
- // if the request took more than 5 min (socket timeout) log an error
- if ((System.currentTimeMillis() - startTimePerRequest)
- > HttpUtil.getSocketTimeout().toMillis()) {
+ // if the request took more than socket timeout log an error
+ long currentMillis = System.currentTimeMillis();
+ if ((currentMillis - startTimePerRequest) > HttpUtil.getSocketTimeout().toMillis()) {
logger.warn(
- "HTTP request took longer than 5 min: {} sec",
- (System.currentTimeMillis() - startTimePerRequest) / 1000);
+ "{}HTTP request took longer than socket timeout {} ms: {} ms",
+ requestIdStr,
+ HttpUtil.getSocketTimeout().toMillis(),
+ (currentMillis - startTimePerRequest));
}
StringWriter sw = new StringWriter();
savedEx.printStackTrace(new PrintWriter(sw));
logger.debug(
- "Exception encountered for: {}, {}, {}",
+ "{}Exception encountered for: {}, {}, {}",
+ requestIdStr,
requestInfoScrubbed,
ex.getLocalizedMessage(),
(ArgSupplier) sw::toString);
@@ -281,7 +325,11 @@ public static CloseableHttpResponse execute(
|| isNonRetryableHTTPCode(response, retryHTTP403)) {
String msg = "Unknown cause";
if (response != null) {
- logger.debug("HTTP response code: {}", response.getStatusLine().getStatusCode());
+ logger.debug(
+ "{}HTTP response code for request {}: {}",
+ requestIdStr,
+ requestInfoScrubbed,
+ response.getStatusLine().getStatusCode());
msg =
"StatusCode: "
+ response.getStatusLine().getStatusCode()
@@ -295,13 +343,16 @@ public static CloseableHttpResponse execute(
if (response == null || response.getStatusLine().getStatusCode() != 200) {
logger.debug(
- "Error response not retryable, " + msg + ", request: {}", requestInfoScrubbed);
+ "{}Error response not retryable, " + msg + ", request: {}",
+ requestIdStr,
+ requestInfoScrubbed);
EventUtil.triggerBasicEvent(
- Event.EventType.NETWORK_ERROR, msg + ", Request: " + httpRequest.toString(), false);
+ Event.EventType.NETWORK_ERROR, msg + ", Request: " + httpRequest, false);
}
breakRetryReason = "status code does not need retry";
if (noRetry) {
- logger.debug("HTTP retry disabled for this request. noRetry: {}", noRetry);
+ logger.debug(
+ "{}HTTP retry disabled for this request. noRetry: {}", requestIdStr, noRetry);
breakRetryReason = "retry is disabled";
}
@@ -311,16 +362,18 @@ public static CloseableHttpResponse execute(
} else {
if (response != null) {
logger.debug(
- "HTTP response not ok: status code: {}, request: {}",
+ "{}HTTP response not ok: status code: {}, request: {}",
+ requestIdStr,
response.getStatusLine().getStatusCode(),
requestInfoScrubbed);
} else if (savedEx != null) {
logger.debug(
- "Null response for cause: {}, request: {}",
+ "{}Null response for cause: {}, request: {}",
+ requestIdStr,
getRootCause(savedEx).getMessage(),
requestInfoScrubbed);
} else {
- logger.debug("Null response for request: {}", requestInfoScrubbed);
+ logger.debug("{}Null response for request: {}", requestIdStr, requestInfoScrubbed);
}
// get the elapsed time for the last request
@@ -331,7 +384,7 @@ public static CloseableHttpResponse execute(
// check canceling flag
if (canceling != null && canceling.get()) {
- logger.debug("Stop retrying since canceling is requested", false);
+ logger.debug("{}Stop retrying since canceling is requested", requestIdStr);
breakRetryReason = "canceling is requested";
break;
}
@@ -349,9 +402,10 @@ public static CloseableHttpResponse execute(
if (elapsedMilliForTransientIssues > retryTimeoutInMilliseconds
&& retryCount >= MIN_RETRY_COUNT) {
logger.error(
- "Stop retrying since elapsed time due to network "
+ "{}Stop retrying since elapsed time due to network "
+ "issues has reached timeout. "
- + "Elapsed: {}(ms), timeout: {}(ms)",
+ + "Elapsed: {} ms, timeout: {} ms",
+ requestIdStr,
elapsedMilliForTransientIssues,
retryTimeoutInMilliseconds);
@@ -362,7 +416,10 @@ public static CloseableHttpResponse execute(
if (maxRetries > 0 && retryCount > maxRetries) {
// check for max retries.
logger.error(
- "Stop retrying as max retries have been reached! max retry count: {}", maxRetries);
+ "{}Stop retrying as max retries have been reached for request: {}! Max retry count: {}",
+ requestIdStr,
+ requestInfoScrubbed,
+ maxRetries);
breakRetryReason = "max retries reached";
breakRetryEventName = "HttpRequestRetryLimitExceeded";
}
@@ -433,30 +490,24 @@ public static CloseableHttpResponse execute(
// sleep for backoff - elapsed amount of time
if (backoffInMilli > elapsedMilliForLastCall) {
try {
- logger.debug("sleeping in {}(ms)", backoffInMilli);
+ logger.debug(
+ "{}Retry request {}: sleeping for {} ms",
+ requestIdStr,
+ requestInfoScrubbed,
+ backoffInMilli);
Thread.sleep(backoffInMilli);
- elapsedMilliForTransientIssues += backoffInMilli;
- if (isLoginRequest) {
- long jitteredBackoffInMilli = backoff.getJitterForLogin(backoffInMilli);
- backoffInMilli =
- (long)
- backoff.chooseRandom(
- jitteredBackoffInMilli + backoffInMilli,
- Math.pow(2, retryCount) + jitteredBackoffInMilli);
- } else {
- backoffInMilli = backoff.nextSleepTime(backoffInMilli);
- }
- if (retryTimeoutInMilliseconds > 0
- && (elapsedMilliForTransientIssues + backoffInMilli) > retryTimeoutInMilliseconds) {
- // If the timeout will be reached before the next backoff, just use the remaining
- // time.
- backoffInMilli =
- Math.min(
- backoffInMilli, retryTimeoutInMilliseconds - elapsedMilliForTransientIssues);
- }
} catch (InterruptedException ex1) {
- logger.debug("Backoff sleep before retrying login got interrupted", false);
+ logger.debug("{}Backoff sleep before retrying login got interrupted", requestIdStr);
}
+ elapsedMilliForTransientIssues += backoffInMilli;
+ backoffInMilli =
+ getNewBackoffInMilli(
+ backoffInMilli,
+ isLoginRequest,
+ backoff,
+ retryCount,
+ retryTimeoutInMilliseconds,
+ elapsedMilliForTransientIssues);
}
retryCount++;
@@ -504,15 +555,18 @@ public static CloseableHttpResponse execute(
if (response == null) {
if (savedEx != null) {
logger.error(
- "Returning null response: cause: {}, request: {}",
+ "{}Returning null response. Cause: {}, request: {}",
+ requestIdStr,
getRootCause(savedEx),
requestInfoScrubbed);
} else {
- logger.error("Returning null response for request: {}", requestInfoScrubbed);
+ logger.error(
+ "{}Returning null response for request: {}", requestIdStr, requestInfoScrubbed);
}
} else if (response.getStatusLine().getStatusCode() != 200) {
logger.error(
- "Error response: HTTP Response code: {}, request: {}",
+ "{}Error response: HTTP Response code: {}, request: {}",
+ requestIdStr,
response.getStatusLine().getStatusCode(),
requestInfoScrubbed);
}
@@ -554,9 +608,58 @@ public static CloseableHttpResponse execute(
}
}
+ if (logger.isDebugEnabled() && stopwatch != null) {
+ stopwatch.stop();
+ }
+ logger.debug(
+ "{}Execution of request {} took {} ms with total of {} retries",
+ requestIdStr,
+ requestInfoScrubbed,
+ stopwatch == null ? "n/a" : stopwatch.elapsedMillis(),
+ retryCount);
return response;
}
+ static long getNewBackoffInMilli(
+ long previousBackoffInMilli,
+ boolean isLoginRequest,
+ DecorrelatedJitterBackoff decorrelatedJitterBackoff,
+ int retryCount,
+ long retryTimeoutInMilliseconds,
+ long elapsedMilliForTransientIssues) {
+ long backoffInMilli;
+ if (isLoginRequest) {
+ long jitteredBackoffInMilli =
+ decorrelatedJitterBackoff.getJitterForLogin(previousBackoffInMilli);
+ backoffInMilli =
+ (long)
+ decorrelatedJitterBackoff.chooseRandom(
+ jitteredBackoffInMilli + previousBackoffInMilli,
+ Math.pow(2, retryCount) + jitteredBackoffInMilli);
+ } else {
+ backoffInMilli = decorrelatedJitterBackoff.nextSleepTime(previousBackoffInMilli);
+ }
+
+ backoffInMilli = Math.min(maxBackoffInMilli, Math.max(previousBackoffInMilli, backoffInMilli));
+
+ if (retryTimeoutInMilliseconds > 0
+ && (elapsedMilliForTransientIssues + backoffInMilli) > retryTimeoutInMilliseconds) {
+ // If the timeout will be reached before the next backoff, just use the remaining
+ // time (but cannot be negative) - this is the only place when backoff is not in range
+ // min-max.
+ backoffInMilli =
+ Math.max(
+ 0,
+ Math.min(
+ backoffInMilli, retryTimeoutInMilliseconds - elapsedMilliForTransientIssues));
+ logger.debug(
+ "We are approaching retry timeout {}ms, setting backoff to {}ms",
+ retryTimeoutInMilliseconds,
+ backoffInMilli);
+ }
+ return backoffInMilli;
+ }
+
static boolean isNonRetryableHTTPCode(CloseableHttpResponse response, boolean retryHTTP403) {
return response != null
&& (response.getStatusLine().getStatusCode() < 500
diff --git a/src/main/java/net/snowflake/client/jdbc/SFAsyncResultSet.java b/src/main/java/net/snowflake/client/jdbc/SFAsyncResultSet.java
index c50bf4900..0bafbf12d 100644
--- a/src/main/java/net/snowflake/client/jdbc/SFAsyncResultSet.java
+++ b/src/main/java/net/snowflake/client/jdbc/SFAsyncResultSet.java
@@ -21,11 +21,15 @@
import net.snowflake.client.core.SFBaseResultSet;
import net.snowflake.client.core.SFBaseSession;
import net.snowflake.client.core.SFSession;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.common.core.SqlState;
/** SFAsyncResultSet implementation. Note: For Snowflake internal use */
public class SFAsyncResultSet extends SnowflakeBaseResultSet
implements SnowflakeResultSet, ResultSet {
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SFAsyncResultSet.class);
+
private ResultSet resultSetForNext = new SnowflakeResultSetV1.EmptyResultSet();
private boolean resultSetForNextInitialized = false;
private String queryID;
@@ -367,7 +371,7 @@ public boolean isBeforeFirst() throws SQLException {
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("public boolean isWrapperFor(Class iface)", false);
+ logger.trace("boolean isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
@@ -375,7 +379,7 @@ public boolean isWrapperFor(Class iface) throws SQLException {
@SuppressWarnings("unchecked")
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug("public T unwrap(Class iface)", false);
+ logger.trace(" T unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java
index 692c7e412..d191b646c 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeBaseResultSet.java
@@ -6,6 +6,7 @@
import static net.snowflake.client.jdbc.SnowflakeUtil.mapSFExceptionToSQLException;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -38,7 +39,6 @@
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
-import net.snowflake.client.core.ArrowSqlInput;
import net.snowflake.client.core.ColumnTypeHelper;
import net.snowflake.client.core.JsonSqlInput;
import net.snowflake.client.core.ObjectMapperFactory;
@@ -52,7 +52,7 @@
/** Base class for query result set and metadata result set */
public abstract class SnowflakeBaseResultSet implements ResultSet {
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeBaseResultSet.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeBaseResultSet.class);
private final int resultSetType;
private final int resultSetConcurrency;
private final int resultSetHoldability;
@@ -150,7 +150,7 @@ public Timestamp getTimestamp(int columnIndex) throws SQLException {
@Override
public InputStream getAsciiStream(int columnIndex) throws SQLException {
- logger.debug("public InputStream getAsciiStream(int columnIndex)", false);
+ logger.trace("InputStream getAsciiStream(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -160,33 +160,33 @@ public InputStream getAsciiStream(int columnIndex) throws SQLException {
@Deprecated
@Override
public InputStream getUnicodeStream(int columnIndex) throws SQLException {
- logger.debug("public InputStream getUnicodeStream(int columnIndex)", false);
+ logger.trace("InputStream getUnicodeStream(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public InputStream getBinaryStream(int columnIndex) throws SQLException {
- logger.debug("public InputStream getBinaryStream(int columnIndex)", false);
+ logger.trace("InputStream getBinaryStream(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public String getString(String columnLabel) throws SQLException {
- logger.debug("public String getString(String columnLabel)", false);
+ logger.trace("String getString(String columnLabel)", false);
return getString(findColumn(columnLabel));
}
@Override
public boolean getBoolean(String columnLabel) throws SQLException {
- logger.debug("public boolean getBoolean(String columnLabel)", false);
+ logger.trace("boolean getBoolean(String columnLabel)", false);
return getBoolean(findColumn(columnLabel));
}
@Override
public byte getByte(String columnLabel) throws SQLException {
- logger.debug("public byte getByte(String columnLabel)", false);
+ logger.trace("byte getByte(String columnLabel)", false);
raiseSQLExceptionIfResultSetIsClosed();
return getByte(findColumn(columnLabel));
@@ -194,35 +194,35 @@ public byte getByte(String columnLabel) throws SQLException {
@Override
public short getShort(String columnLabel) throws SQLException {
- logger.debug("public short getShort(String columnLabel)", false);
+ logger.trace("short getShort(String columnLabel)", false);
return getShort(findColumn(columnLabel));
}
@Override
public int getInt(String columnLabel) throws SQLException {
- logger.debug("public int getInt(String columnLabel)", false);
+ logger.trace("int getInt(String columnLabel)", false);
return getInt(findColumn(columnLabel));
}
@Override
public long getLong(String columnLabel) throws SQLException {
- logger.debug("public long getLong(String columnLabel)", false);
+ logger.trace("long getLong(String columnLabel)", false);
return getLong(findColumn(columnLabel));
}
@Override
public float getFloat(String columnLabel) throws SQLException {
- logger.debug("public float getFloat(String columnLabel)", false);
+ logger.trace("float getFloat(String columnLabel)", false);
return getFloat(findColumn(columnLabel));
}
@Override
public double getDouble(String columnLabel) throws SQLException {
- logger.debug("public double getDouble(String columnLabel)", false);
+ logger.trace("double getDouble(String columnLabel)", false);
return getDouble(findColumn(columnLabel));
}
@@ -233,42 +233,42 @@ public double getDouble(String columnLabel) throws SQLException {
@Deprecated
@Override
public BigDecimal getBigDecimal(String columnLabel, int scale) throws SQLException {
- logger.debug("public BigDecimal getBigDecimal(String columnLabel, " + "int scale)", false);
+ logger.trace("BigDecimal getBigDecimal(String columnLabel, " + "int scale)", false);
return getBigDecimal(findColumn(columnLabel), scale);
}
@Override
public byte[] getBytes(String columnLabel) throws SQLException {
- logger.debug("public byte[] getBytes(String columnLabel)", false);
+ logger.trace("byte[] getBytes(String columnLabel)", false);
return getBytes(findColumn(columnLabel));
}
@Override
public Date getDate(String columnLabel) throws SQLException {
- logger.debug("public Date getDate(String columnLabel)", false);
+ logger.trace("Date getDate(String columnLabel)", false);
return getDate(findColumn(columnLabel));
}
@Override
public Time getTime(String columnLabel) throws SQLException {
- logger.debug("public Time getTime(String columnLabel)", false);
+ logger.trace("Time getTime(String columnLabel)", false);
return getTime(findColumn(columnLabel));
}
@Override
public Timestamp getTimestamp(String columnLabel) throws SQLException {
- logger.debug("public Timestamp getTimestamp(String columnLabel)", false);
+ logger.trace("Timestamp getTimestamp(String columnLabel)", false);
return getTimestamp(findColumn(columnLabel));
}
@Override
public InputStream getAsciiStream(String columnLabel) throws SQLException {
- logger.debug("public InputStream getAsciiStream(String columnLabel)", false);
+ logger.trace("InputStream getAsciiStream(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -278,55 +278,55 @@ public InputStream getAsciiStream(String columnLabel) throws SQLException {
@Deprecated
@Override
public InputStream getUnicodeStream(String columnLabel) throws SQLException {
- logger.debug("public InputStream getUnicodeStream(String columnLabel)", false);
+ logger.trace("InputStream getUnicodeStream(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public InputStream getBinaryStream(String columnLabel) throws SQLException {
- logger.debug("public InputStream getBinaryStream(String columnLabel)", false);
+ logger.trace("InputStream getBinaryStream(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public SQLWarning getWarnings() throws SQLException {
- logger.debug("public SQLWarning getWarnings()", false);
+ logger.trace("SQLWarning getWarnings()", false);
raiseSQLExceptionIfResultSetIsClosed();
return null;
}
@Override
public void clearWarnings() throws SQLException {
- logger.debug("public void clearWarnings()", false);
+ logger.trace("void clearWarnings()", false);
raiseSQLExceptionIfResultSetIsClosed();
}
@Override
public String getCursorName() throws SQLException {
- logger.debug("public String getCursorName()", false);
+ logger.trace("String getCursorName()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public ResultSetMetaData getMetaData() throws SQLException {
- logger.debug("public ResultSetMetaData getMetaData()", false);
+ logger.trace("ResultSetMetaData getMetaData()", false);
raiseSQLExceptionIfResultSetIsClosed();
return resultSetMetaData;
}
@Override
public Object getObject(String columnLabel) throws SQLException {
- logger.debug("public Object getObject(String columnLabel)", false);
+ logger.trace("Object getObject(String columnLabel)", false);
return getObject(findColumn(columnLabel));
}
@Override
public int findColumn(String columnLabel) throws SQLException {
- logger.debug("public int findColumn(String columnLabel)", false);
+ logger.trace("int findColumn(String columnLabel)", false);
raiseSQLExceptionIfResultSetIsClosed();
int columnIndex = resultSetMetaData.getColumnIndex(columnLabel);
@@ -340,7 +340,7 @@ public int findColumn(String columnLabel) throws SQLException {
@Override
public Reader getCharacterStream(int columnIndex) throws SQLException {
- logger.debug("public Reader getCharacterStream(int columnIndex)", false);
+ logger.trace("Reader getCharacterStream(int columnIndex)", false);
raiseSQLExceptionIfResultSetIsClosed();
String streamData = getString(columnIndex);
return (streamData == null) ? null : new StringReader(streamData);
@@ -348,76 +348,76 @@ public Reader getCharacterStream(int columnIndex) throws SQLException {
@Override
public Reader getCharacterStream(String columnLabel) throws SQLException {
- logger.debug("public Reader getCharacterStream(String columnLabel)", false);
+ logger.trace("Reader getCharacterStream(String columnLabel)", false);
return getCharacterStream(findColumn(columnLabel));
}
@Override
public BigDecimal getBigDecimal(String columnLabel) throws SQLException {
- logger.debug("public BigDecimal getBigDecimal(String columnLabel)", false);
+ logger.trace("BigDecimal getBigDecimal(String columnLabel)", false);
return getBigDecimal(findColumn(columnLabel));
}
@Override
public void beforeFirst() throws SQLException {
- logger.debug("public void beforeFirst()", false);
+ logger.trace("void beforeFirst()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void afterLast() throws SQLException {
- logger.debug("public void afterLast()", false);
+ logger.trace("void afterLast()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean first() throws SQLException {
- logger.debug("public boolean first()", false);
+ logger.trace("boolean first()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean last() throws SQLException {
- logger.debug("public boolean last()", false);
+ logger.trace("boolean last()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean absolute(int row) throws SQLException {
- logger.debug("public boolean absolute(int row)", false);
+ logger.trace("boolean absolute(int row)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean relative(int rows) throws SQLException {
- logger.debug("public boolean relative(int rows)", false);
+ logger.trace("boolean relative(int rows)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean previous() throws SQLException {
- logger.debug("public boolean previous()", false);
+ logger.trace("boolean previous()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public int getFetchDirection() throws SQLException {
- logger.debug("public int getFetchDirection()", false);
+ logger.trace("int getFetchDirection()", false);
raiseSQLExceptionIfResultSetIsClosed();
return ResultSet.FETCH_FORWARD;
}
@Override
public void setFetchDirection(int direction) throws SQLException {
- logger.debug("public void setFetchDirection(int direction)", false);
+ logger.trace("void setFetchDirection(int direction)", false);
raiseSQLExceptionIfResultSetIsClosed();
if (direction != ResultSet.FETCH_FORWARD) {
@@ -427,14 +427,14 @@ public void setFetchDirection(int direction) throws SQLException {
@Override
public int getFetchSize() throws SQLException {
- logger.debug("public int getFetchSize()", false);
+ logger.trace("int getFetchSize()", false);
raiseSQLExceptionIfResultSetIsClosed();
return this.fetchSize;
}
@Override
public void setFetchSize(int rows) throws SQLException {
- logger.debug("public void setFetchSize(int rows)", false);
+ logger.trace("void setFetchSize(int rows)", false);
raiseSQLExceptionIfResultSetIsClosed();
this.fetchSize = rows;
@@ -442,140 +442,140 @@ public void setFetchSize(int rows) throws SQLException {
@Override
public int getType() throws SQLException {
- logger.debug("public int getType()", false);
+ logger.trace("int getType()", false);
raiseSQLExceptionIfResultSetIsClosed();
return resultSetType;
}
@Override
public int getConcurrency() throws SQLException {
- logger.debug("public int getConcurrency()", false);
+ logger.trace("int getConcurrency()", false);
raiseSQLExceptionIfResultSetIsClosed();
return resultSetConcurrency;
}
@Override
public boolean rowUpdated() throws SQLException {
- logger.debug("public boolean rowUpdated()", false);
+ logger.trace("boolean rowUpdated()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean rowInserted() throws SQLException {
- logger.debug("public boolean rowInserted()", false);
+ logger.trace("boolean rowInserted()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public boolean rowDeleted() throws SQLException {
- logger.debug("public boolean rowDeleted()", false);
+ logger.trace("boolean rowDeleted()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNull(int columnIndex) throws SQLException {
- logger.debug("public void updateNull(int columnIndex)", false);
+ logger.trace("void updateNull(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBoolean(int columnIndex, boolean x) throws SQLException {
- logger.debug("public void updateBoolean(int columnIndex, boolean x)", false);
+ logger.trace("void updateBoolean(int columnIndex, boolean x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateByte(int columnIndex, byte x) throws SQLException {
- logger.debug("public void updateByte(int columnIndex, byte x)", false);
+ logger.trace("void updateByte(int columnIndex, byte x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateShort(int columnIndex, short x) throws SQLException {
- logger.debug("public void updateShort(int columnIndex, short x)", false);
+ logger.trace("void updateShort(int columnIndex, short x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateInt(int columnIndex, int x) throws SQLException {
- logger.debug("public void updateInt(int columnIndex, int x)", false);
+ logger.trace("void updateInt(int columnIndex, int x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateLong(int columnIndex, long x) throws SQLException {
- logger.debug("public void updateLong(int columnIndex, long x)", false);
+ logger.trace("void updateLong(int columnIndex, long x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateFloat(int columnIndex, float x) throws SQLException {
- logger.debug("public void updateFloat(int columnIndex, float x)", false);
+ logger.trace("void updateFloat(int columnIndex, float x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateDouble(int columnIndex, double x) throws SQLException {
- logger.debug("public void updateDouble(int columnIndex, double x)", false);
+ logger.trace("void updateDouble(int columnIndex, double x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBigDecimal(int columnIndex, BigDecimal x) throws SQLException {
- logger.debug("public void updateBigDecimal(int columnIndex, BigDecimal x)", false);
+ logger.trace("void updateBigDecimal(int columnIndex, BigDecimal x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateString(int columnIndex, String x) throws SQLException {
- logger.debug("public void updateString(int columnIndex, String x)", false);
+ logger.trace("void updateString(int columnIndex, String x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBytes(int columnIndex, byte[] x) throws SQLException {
- logger.debug("public void updateBytes(int columnIndex, byte[] x)", false);
+ logger.trace("void updateBytes(int columnIndex, byte[] x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateDate(int columnIndex, Date x) throws SQLException {
- logger.debug("public void updateDate(int columnIndex, Date x)", false);
+ logger.trace("void updateDate(int columnIndex, Date x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateTime(int columnIndex, Time x) throws SQLException {
- logger.debug("public void updateTime(int columnIndex, Time x)", false);
+ logger.trace("void updateTime(int columnIndex, Time x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateTimestamp(int columnIndex, Timestamp x) throws SQLException {
- logger.debug("public void updateTimestamp(int columnIndex, Timestamp x)", false);
+ logger.trace("void updateTimestamp(int columnIndex, Timestamp x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateAsciiStream(int columnIndex, InputStream x, int length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateAsciiStream(int columnIndex, " + "InputStream x, int length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -583,7 +583,7 @@ public void updateAsciiStream(int columnIndex, InputStream x, int length) throws
@Override
public void updateBinaryStream(int columnIndex, InputStream x, int length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateBinaryStream(int columnIndex, " + "InputStream x, int length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -591,7 +591,7 @@ public void updateBinaryStream(int columnIndex, InputStream x, int length) throw
@Override
public void updateCharacterStream(int columnIndex, Reader x, int length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateCharacterStream(int columnIndex, " + "Reader x, int length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -599,7 +599,7 @@ public void updateCharacterStream(int columnIndex, Reader x, int length) throws
@Override
public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateObject(int columnIndex, Object x, " + "int scaleOrLength)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -607,112 +607,112 @@ public void updateObject(int columnIndex, Object x, int scaleOrLength) throws SQ
@Override
public void updateObject(int columnIndex, Object x) throws SQLException {
- logger.debug("public void updateObject(int columnIndex, Object x)", false);
+ logger.trace("void updateObject(int columnIndex, Object x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNull(String columnLabel) throws SQLException {
- logger.debug("public void updateNull(String columnLabel)", false);
+ logger.trace("void updateNull(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBoolean(String columnLabel, boolean x) throws SQLException {
- logger.debug("public void updateBoolean(String columnLabel, boolean x)", false);
+ logger.trace("void updateBoolean(String columnLabel, boolean x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateByte(String columnLabel, byte x) throws SQLException {
- logger.debug("public void updateByte(String columnLabel, byte x)", false);
+ logger.trace("void updateByte(String columnLabel, byte x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateShort(String columnLabel, short x) throws SQLException {
- logger.debug("public void updateShort(String columnLabel, short x)", false);
+ logger.trace("void updateShort(String columnLabel, short x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateInt(String columnLabel, int x) throws SQLException {
- logger.debug("public void updateInt(String columnLabel, int x)", false);
+ logger.trace("void updateInt(String columnLabel, int x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateLong(String columnLabel, long x) throws SQLException {
- logger.debug("public void updateLong(String columnLabel, long x)", false);
+ logger.trace("void updateLong(String columnLabel, long x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateFloat(String columnLabel, float x) throws SQLException {
- logger.debug("public void updateFloat(String columnLabel, float x)", false);
+ logger.trace("void updateFloat(String columnLabel, float x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateDouble(String columnLabel, double x) throws SQLException {
- logger.debug("public void updateDouble(String columnLabel, double x)", false);
+ logger.trace("void updateDouble(String columnLabel, double x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBigDecimal(String columnLabel, BigDecimal x) throws SQLException {
- logger.debug("public void updateBigDecimal(String columnLabel, " + "BigDecimal x)", false);
+ logger.trace("void updateBigDecimal(String columnLabel, " + "BigDecimal x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateString(String columnLabel, String x) throws SQLException {
- logger.debug("public void updateString(String columnLabel, String x)", false);
+ logger.trace("void updateString(String columnLabel, String x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBytes(String columnLabel, byte[] x) throws SQLException {
- logger.debug("public void updateBytes(String columnLabel, byte[] x)", false);
+ logger.trace("void updateBytes(String columnLabel, byte[] x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateDate(String columnLabel, Date x) throws SQLException {
- logger.debug("public void updateDate(String columnLabel, Date x)", false);
+ logger.trace("void updateDate(String columnLabel, Date x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateTime(String columnLabel, Time x) throws SQLException {
- logger.debug("public void updateTime(String columnLabel, Time x)", false);
+ logger.trace("void updateTime(String columnLabel, Time x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateTimestamp(String columnLabel, Timestamp x) throws SQLException {
- logger.debug("public void updateTimestamp(String columnLabel, Timestamp x)", false);
+ logger.trace("void updateTimestamp(String columnLabel, Timestamp x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateAsciiStream(String columnLabel, InputStream x, int length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateAsciiStream(String columnLabel, " + "InputStream x, int length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -721,7 +721,7 @@ public void updateAsciiStream(String columnLabel, InputStream x, int length) thr
@Override
public void updateBinaryStream(String columnLabel, InputStream x, int length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateBinaryStream(String columnLabel, " + "InputStream x, int length)",
false);
@@ -731,7 +731,7 @@ public void updateBinaryStream(String columnLabel, InputStream x, int length)
@Override
public void updateCharacterStream(String columnLabel, Reader reader, int length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateCharacterStream(String columnLabel, " + "Reader reader,int length)",
false);
@@ -740,7 +740,7 @@ public void updateCharacterStream(String columnLabel, Reader reader, int length)
@Override
public void updateObject(String columnLabel, Object x, int scaleOrLength) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateObject(String columnLabel, Object x, " + "int scaleOrLength)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -748,91 +748,91 @@ public void updateObject(String columnLabel, Object x, int scaleOrLength) throws
@Override
public void updateObject(String columnLabel, Object x) throws SQLException {
- logger.debug("public void updateObject(String columnLabel, Object x)", false);
+ logger.trace("void updateObject(String columnLabel, Object x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void insertRow() throws SQLException {
- logger.debug("public void insertRow()", false);
+ logger.trace("void insertRow()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateRow() throws SQLException {
- logger.debug("public void updateRow()", false);
+ logger.trace("void updateRow()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void deleteRow() throws SQLException {
- logger.debug("public void deleteRow()", false);
+ logger.trace("void deleteRow()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void refreshRow() throws SQLException {
- logger.debug("public void refreshRow()", false);
+ logger.trace("void refreshRow()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void cancelRowUpdates() throws SQLException {
- logger.debug("public void cancelRowUpdates()", false);
+ logger.trace("void cancelRowUpdates()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void moveToInsertRow() throws SQLException {
- logger.debug("public void moveToInsertRow()", false);
+ logger.trace("void moveToInsertRow()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void moveToCurrentRow() throws SQLException {
- logger.debug("public void moveToCurrentRow()", false);
+ logger.trace("void moveToCurrentRow()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Statement getStatement() throws SQLException {
- logger.debug("public Statement getStatement()", false);
+ logger.trace("Statement getStatement()", false);
raiseSQLExceptionIfResultSetIsClosed();
return statement;
}
@Override
public Object getObject(int columnIndex, Map> map) throws SQLException {
- logger.debug("public Object getObject(int columnIndex, Map> map)", false);
+ logger.trace("Object getObject(int columnIndex, Map> map)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Ref getRef(int columnIndex) throws SQLException {
- logger.debug("public Ref getRef(int columnIndex)", false);
+ logger.trace("Ref getRef(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Blob getBlob(int columnIndex) throws SQLException {
- logger.debug("public Blob getBlob(int columnIndex)", false);
+ logger.trace("Blob getBlob(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Clob getClob(int columnIndex) throws SQLException {
- logger.debug("public Clob getClob(int columnIndex)", false);
+ logger.trace("Clob getClob(int columnIndex)", false);
String columnValue = getString(columnIndex);
return columnValue == null ? null : new SnowflakeClob(columnValue);
@@ -840,14 +840,14 @@ public Clob getClob(int columnIndex) throws SQLException {
@Override
public Array getArray(int columnIndex) throws SQLException {
- logger.debug("public Array getArray(int columnIndex)", false);
+ logger.trace("Array getArray(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Object getObject(String columnLabel, Map> map) throws SQLException {
- logger.debug(
+ logger.trace(
"public Object getObject(String columnLabel, " + "Map> map)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -855,21 +855,21 @@ public Object getObject(String columnLabel, Map> map) throws SQ
@Override
public Ref getRef(String columnLabel) throws SQLException {
- logger.debug("public Ref getRef(String columnLabel)", false);
+ logger.trace("Ref getRef(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Blob getBlob(String columnLabel) throws SQLException {
- logger.debug("public Blob getBlob(String columnLabel)", false);
+ logger.trace("Blob getBlob(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Clob getClob(String columnLabel) throws SQLException {
- logger.debug("public Clob getClob(String columnLabel)", false);
+ logger.trace("Clob getClob(String columnLabel)", false);
String columnValue = getString(columnLabel);
return columnValue == null ? null : new SnowflakeClob(columnValue);
@@ -877,258 +877,258 @@ public Clob getClob(String columnLabel) throws SQLException {
@Override
public Array getArray(String columnLabel) throws SQLException {
- logger.debug("public Array getArray(String columnLabel)", false);
+ logger.trace("Array getArray(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Date getDate(int columnIndex, Calendar cal) throws SQLException {
- logger.debug("public Date getDate(int columnIndex, Calendar cal)", false);
+ logger.trace("Date getDate(int columnIndex, Calendar cal)", false);
return getDate(columnIndex, cal.getTimeZone());
}
@Override
public Date getDate(String columnLabel, Calendar cal) throws SQLException {
- logger.debug("public Date getDate(String columnLabel, Calendar cal)", false);
+ logger.trace("Date getDate(String columnLabel, Calendar cal)", false);
return getDate(findColumn(columnLabel), cal.getTimeZone());
}
@Override
public Time getTime(int columnIndex, Calendar cal) throws SQLException {
- logger.debug("public Time getTime(int columnIndex, Calendar cal)", false);
+ logger.trace("Time getTime(int columnIndex, Calendar cal)", false);
return getTime(columnIndex);
}
@Override
public Time getTime(String columnLabel, Calendar cal) throws SQLException {
- logger.debug("public Time getTime(String columnLabel, Calendar cal)", false);
+ logger.trace("Time getTime(String columnLabel, Calendar cal)", false);
return getTime(columnLabel);
}
@Override
public Timestamp getTimestamp(int columnIndex, Calendar cal) throws SQLException {
- logger.debug("public Timestamp getTimestamp(int columnIndex, Calendar cal)", false);
+ logger.trace("Timestamp getTimestamp(int columnIndex, Calendar cal)", false);
return getTimestamp(columnIndex, cal.getTimeZone());
}
@Override
public Timestamp getTimestamp(String columnLabel, Calendar cal) throws SQLException {
- logger.debug("public Timestamp getTimestamp(String columnLabel, " + "Calendar cal)", false);
+ logger.trace("Timestamp getTimestamp(String columnLabel, " + "Calendar cal)", false);
return getTimestamp(findColumn(columnLabel), cal.getTimeZone());
}
@Override
public URL getURL(int columnIndex) throws SQLException {
- logger.debug("public URL getURL(int columnIndex)", false);
+ logger.trace("URL getURL(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public URL getURL(String columnLabel) throws SQLException {
- logger.debug("public URL getURL(String columnLabel)", false);
+ logger.trace("URL getURL(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateRef(int columnIndex, Ref x) throws SQLException {
- logger.debug("public void updateRef(int columnIndex, Ref x)", false);
+ logger.trace("void updateRef(int columnIndex, Ref x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateRef(String columnLabel, Ref x) throws SQLException {
- logger.debug("public void updateRef(String columnLabel, Ref x)", false);
+ logger.trace("void updateRef(String columnLabel, Ref x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBlob(int columnIndex, Blob x) throws SQLException {
- logger.debug("public void updateBlob(int columnIndex, Blob x)", false);
+ logger.trace("void updateBlob(int columnIndex, Blob x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBlob(String columnLabel, Blob x) throws SQLException {
- logger.debug("public void updateBlob(String columnLabel, Blob x)", false);
+ logger.trace("void updateBlob(String columnLabel, Blob x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateClob(int columnIndex, Clob x) throws SQLException {
- logger.debug("public void updateClob(int columnIndex, Clob x)", false);
+ logger.trace("void updateClob(int columnIndex, Clob x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateClob(String columnLabel, Clob x) throws SQLException {
- logger.debug("public void updateClob(String columnLabel, Clob x)", false);
+ logger.trace("void updateClob(String columnLabel, Clob x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateArray(int columnIndex, Array x) throws SQLException {
- logger.debug("public void updateArray(int columnIndex, Array x)", false);
+ logger.trace("void updateArray(int columnIndex, Array x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateArray(String columnLabel, Array x) throws SQLException {
- logger.debug("public void updateArray(String columnLabel, Array x)", false);
+ logger.trace("void updateArray(String columnLabel, Array x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public RowId getRowId(int columnIndex) throws SQLException {
- logger.debug("public RowId getRowId(int columnIndex)", false);
+ logger.trace("RowId getRowId(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public RowId getRowId(String columnLabel) throws SQLException {
- logger.debug("public RowId getRowId(String columnLabel)", false);
+ logger.trace("RowId getRowId(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateRowId(int columnIndex, RowId x) throws SQLException {
- logger.debug("public void updateRowId(int columnIndex, RowId x)", false);
+ logger.trace("void updateRowId(int columnIndex, RowId x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateRowId(String columnLabel, RowId x) throws SQLException {
- logger.debug("public void updateRowId(String columnLabel, RowId x)", false);
+ logger.trace("void updateRowId(String columnLabel, RowId x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public int getHoldability() throws SQLException {
- logger.debug("public int getHoldability()", false);
+ logger.trace("int getHoldability()", false);
raiseSQLExceptionIfResultSetIsClosed();
return resultSetHoldability;
}
@Override
public void updateNString(int columnIndex, String nString) throws SQLException {
- logger.debug("public void updateNString(int columnIndex, String nString)", false);
+ logger.trace("void updateNString(int columnIndex, String nString)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNString(String columnLabel, String nString) throws SQLException {
- logger.debug("public void updateNString(String columnLabel, String nString)", false);
+ logger.trace("void updateNString(String columnLabel, String nString)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNClob(int columnIndex, NClob nClob) throws SQLException {
- logger.debug("public void updateNClob(int columnIndex, NClob nClob)", false);
+ logger.trace("void updateNClob(int columnIndex, NClob nClob)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNClob(String columnLabel, NClob nClob) throws SQLException {
- logger.debug("public void updateNClob(String columnLabel, NClob nClob)", false);
+ logger.trace("void updateNClob(String columnLabel, NClob nClob)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public NClob getNClob(int columnIndex) throws SQLException {
- logger.debug("public NClob getNClob(int columnIndex)", false);
+ logger.trace("NClob getNClob(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public NClob getNClob(String columnLabel) throws SQLException {
- logger.debug("public NClob getNClob(String columnLabel)", false);
+ logger.trace("NClob getNClob(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public SQLXML getSQLXML(int columnIndex) throws SQLException {
- logger.debug("public SQLXML getSQLXML(int columnIndex)", false);
+ logger.trace("SQLXML getSQLXML(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public SQLXML getSQLXML(String columnLabel) throws SQLException {
- logger.debug("public SQLXML getSQLXML(String columnLabel)", false);
+ logger.trace("SQLXML getSQLXML(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateSQLXML(int columnIndex, SQLXML xmlObject) throws SQLException {
- logger.debug("public void updateSQLXML(int columnIndex, SQLXML xmlObject)", false);
+ logger.trace("void updateSQLXML(int columnIndex, SQLXML xmlObject)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateSQLXML(String columnLabel, SQLXML xmlObject) throws SQLException {
- logger.debug("public void updateSQLXML(String columnLabel, SQLXML xmlObject)", false);
+ logger.trace("void updateSQLXML(String columnLabel, SQLXML xmlObject)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public String getNString(int columnIndex) throws SQLException {
- logger.debug("public String getNString(int columnIndex)", false);
+ logger.trace("String getNString(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public String getNString(String columnLabel) throws SQLException {
- logger.debug("public String getNString(String columnLabel)", false);
+ logger.trace("String getNString(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Reader getNCharacterStream(int columnIndex) throws SQLException {
- logger.debug("public Reader getNCharacterStream(int columnIndex)", false);
+ logger.trace("Reader getNCharacterStream(int columnIndex)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public Reader getNCharacterStream(String columnLabel) throws SQLException {
- logger.debug("public Reader getNCharacterStream(String columnLabel)", false);
+ logger.trace("Reader getNCharacterStream(String columnLabel)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateNCharacterStream(int columnIndex, " + "Reader x, long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1137,7 +1137,7 @@ public void updateNCharacterStream(int columnIndex, Reader x, long length) throw
@Override
public void updateNCharacterStream(String columnLabel, Reader reader, long length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateNCharacterStream(String columnLabel, " + "Reader reader,long length)",
false);
@@ -1146,7 +1146,7 @@ public void updateNCharacterStream(String columnLabel, Reader reader, long lengt
@Override
public void updateAsciiStream(int columnIndex, InputStream x, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateAsciiStream(int columnIndex, " + "InputStream x, long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1154,7 +1154,7 @@ public void updateAsciiStream(int columnIndex, InputStream x, long length) throw
@Override
public void updateBinaryStream(int columnIndex, InputStream x, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateBinaryStream(int columnIndex, " + "InputStream x, long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1162,7 +1162,7 @@ public void updateBinaryStream(int columnIndex, InputStream x, long length) thro
@Override
public void updateCharacterStream(int columnIndex, Reader x, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateCharacterStream(int columnIndex, Reader x, " + "long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1171,7 +1171,7 @@ public void updateCharacterStream(int columnIndex, Reader x, long length) throws
@Override
public void updateAsciiStream(String columnLabel, InputStream x, long length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateAsciiStream(String columnLabel, " + "InputStream x, long length)",
false);
@@ -1181,7 +1181,7 @@ public void updateAsciiStream(String columnLabel, InputStream x, long length)
@Override
public void updateBinaryStream(String columnLabel, InputStream x, long length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateBinaryStream(String columnLabel, " + "InputStream x, long length)",
false);
@@ -1191,7 +1191,7 @@ public void updateBinaryStream(String columnLabel, InputStream x, long length)
@Override
public void updateCharacterStream(String columnLabel, Reader reader, long length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateCharacterStream(String columnLabel, " + "Reader reader,long length)",
false);
@@ -1201,7 +1201,7 @@ public void updateCharacterStream(String columnLabel, Reader reader, long length
@Override
public void updateBlob(int columnIndex, InputStream inputStream, long length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateBlob(int columnIndex, InputStream " + "inputStream, long length)",
false);
@@ -1211,7 +1211,7 @@ public void updateBlob(int columnIndex, InputStream inputStream, long length)
@Override
public void updateBlob(String columnLabel, InputStream inputStream, long length)
throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateBlob(String columnLabel, " + "InputStream inputStream,long length)",
false);
@@ -1220,14 +1220,14 @@ public void updateBlob(String columnLabel, InputStream inputStream, long length)
@Override
public void updateClob(int columnIndex, Reader reader, long length) throws SQLException {
- logger.debug("public void updateClob(int columnIndex, Reader reader, " + "long length)", false);
+ logger.trace("void updateClob(int columnIndex, Reader reader, " + "long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateClob(String columnLabel, Reader reader, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateClob(String columnLabel, Reader reader, " + "long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1235,7 +1235,7 @@ public void updateClob(String columnLabel, Reader reader, long length) throws SQ
@Override
public void updateNClob(int columnIndex, Reader reader, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateNClob(int columnIndex, Reader reader, " + "long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1243,7 +1243,7 @@ public void updateNClob(int columnIndex, Reader reader, long length) throws SQLE
@Override
public void updateNClob(String columnLabel, Reader reader, long length) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateNClob(String columnLabel, Reader reader, " + "long length)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1251,14 +1251,14 @@ public void updateNClob(String columnLabel, Reader reader, long length) throws S
@Override
public void updateNCharacterStream(int columnIndex, Reader x) throws SQLException {
- logger.debug("public void updateNCharacterStream(int columnIndex, Reader x)", false);
+ logger.trace("void updateNCharacterStream(int columnIndex, Reader x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNCharacterStream(String columnLabel, Reader reader) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateNCharacterStream(String columnLabel, " + "Reader reader)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1266,42 +1266,42 @@ public void updateNCharacterStream(String columnLabel, Reader reader) throws SQL
@Override
public void updateAsciiStream(int columnIndex, InputStream x) throws SQLException {
- logger.debug("public void updateAsciiStream(int columnIndex, InputStream x)", false);
+ logger.trace("void updateAsciiStream(int columnIndex, InputStream x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBinaryStream(int columnIndex, InputStream x) throws SQLException {
- logger.debug("public void updateBinaryStream(int columnIndex, InputStream x)", false);
+ logger.trace("void updateBinaryStream(int columnIndex, InputStream x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateCharacterStream(int columnIndex, Reader x) throws SQLException {
- logger.debug("public void updateCharacterStream(int columnIndex, Reader x)", false);
+ logger.trace("void updateCharacterStream(int columnIndex, Reader x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateAsciiStream(String columnLabel, InputStream x) throws SQLException {
- logger.debug("public void updateAsciiStream(String columnLabel, InputStream x)", false);
+ logger.trace("void updateAsciiStream(String columnLabel, InputStream x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBinaryStream(String columnLabel, InputStream x) throws SQLException {
- logger.debug("public void updateBinaryStream(String columnLabel, InputStream x)", false);
+ logger.trace("void updateBinaryStream(String columnLabel, InputStream x)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateCharacterStream(String columnLabel, Reader reader) throws SQLException {
- logger.debug(
+ logger.trace(
"public void updateCharacterStream(String columnLabel, " + "Reader reader)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
@@ -1309,52 +1309,54 @@ public void updateCharacterStream(String columnLabel, Reader reader) throws SQLE
@Override
public void updateBlob(int columnIndex, InputStream inputStream) throws SQLException {
- logger.debug("public void updateBlob(int columnIndex, InputStream inputStream)", false);
+ logger.trace("void updateBlob(int columnIndex, InputStream inputStream)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateBlob(String columnLabel, InputStream inputStream) throws SQLException {
- logger.debug("public void updateBlob(String columnLabel, InputStream " + "inputStream)", false);
+ logger.trace("void updateBlob(String columnLabel, InputStream " + "inputStream)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateClob(int columnIndex, Reader reader) throws SQLException {
- logger.debug("public void updateClob(int columnIndex, Reader reader)", false);
+ logger.trace("void updateClob(int columnIndex, Reader reader)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateClob(String columnLabel, Reader reader) throws SQLException {
- logger.debug("public void updateClob(String columnLabel, Reader reader)", false);
+ logger.trace("void updateClob(String columnLabel, Reader reader)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNClob(int columnIndex, Reader reader) throws SQLException {
- logger.debug("public void updateNClob(int columnIndex, Reader reader)", false);
+ logger.trace("void updateNClob(int columnIndex, Reader reader)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public void updateNClob(String columnLabel, Reader reader) throws SQLException {
- logger.debug("public void updateNClob(String columnLabel, Reader reader)", false);
+ logger.trace("void updateNClob(String columnLabel, Reader reader)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public T getObject(int columnIndex, Class type) throws SQLException {
- logger.debug("public T getObject(int columnIndex,Class type)", false);
+ logger.trace(" T getObject(int columnIndex,Class type)", false);
if (resultSetMetaData.isStructuredTypeColumn(columnIndex)) {
if (SQLData.class.isAssignableFrom(type)) {
- SQLInput sqlInput = (SQLInput) getObject(columnIndex);
+ SQLInput sqlInput =
+ SnowflakeUtil.mapSFExceptionToSQLException(
+ () -> (SQLInput) sfBaseResultSet.getObject(columnIndex));
if (sqlInput == null) {
return null;
} else {
@@ -1366,12 +1368,17 @@ public T getObject(int columnIndex, Class type) throws SQLException {
Object object = getObject(columnIndex);
if (object == null) {
return null;
- } else if (object instanceof JsonSqlInput) {
- JsonNode jsonNode = ((JsonSqlInput) object).getInput();
- return (T)
- OBJECT_MAPPER.convertValue(jsonNode, new TypeReference>() {});
+ } else if (object instanceof Map) {
+ throw new SQLException(
+ "Arrow native struct couldn't be converted to String. To map to SqlData the method getObject(int columnIndex, Class type) should be used");
} else {
- return (T) ((ArrowSqlInput) object).getInput();
+ try {
+ return (T)
+ OBJECT_MAPPER.readValue(
+ (String) object, new TypeReference>() {});
+ } catch (JsonProcessingException e) {
+ throw new SQLException("Value couldn't be converted to Map");
+ }
}
}
}
@@ -1409,7 +1416,7 @@ public T getObject(int columnIndex, Class type) throws SQLException {
}
public List getList(int columnIndex, Class type) throws SQLException {
- logger.debug("public List getList(int columnIndex, Class type)", false);
+ logger.trace(" List getList(int columnIndex, Class type)", false);
if (!resultSetMetaData.isStructuredTypeColumn(columnIndex)) {
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -1418,7 +1425,7 @@ public List getList(int columnIndex, Class type) throws SQLException {
}
public T[] getArray(int columnIndex, Class type) throws SQLException {
- logger.debug("public T[] getArray(int columnIndex, Class type)", false);
+ logger.trace(" T[] getArray(int columnIndex, Class type)", false);
if (!resultSetMetaData.isStructuredTypeColumn(columnIndex)) {
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -1571,7 +1578,7 @@ public T[] getArray(int columnIndex, Class type) throws SQLException {
}
public Map getMap(int columnIndex, Class type) throws SQLException {
- logger.debug("public Map getMap(int columnIndex, Class type)", false);
+ logger.trace(" Map getMap(int columnIndex, Class type)", false);
if (!resultSetMetaData.isStructuredTypeColumn(columnIndex)) {
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -1585,7 +1592,8 @@ public Map getMap(int columnIndex, Class type) throws SQLExcep
int columnType = ColumnTypeHelper.getColumnType(valueFieldMetadata.getType(), session);
int scale = valueFieldMetadata.getScale();
TimeZone tz = sfBaseResultSet.getSessionTimeZone();
- Object object = getObject(columnIndex);
+ Object object =
+ SnowflakeUtil.mapSFExceptionToSQLException(() -> sfBaseResultSet.getObject(columnIndex));
if (object == null) {
return null;
}
@@ -1734,14 +1742,14 @@ public Map getMap(int columnIndex, Class type) throws SQLExcep
@Override
public T getObject(String columnLabel, Class type) throws SQLException {
- logger.debug("public T getObject(String columnLabel,Class type)", false);
+ logger.trace(" T getObject(String columnLabel,Class type)", false);
return getObject(findColumn(columnLabel), type);
}
@SuppressWarnings("unchecked")
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug("public T unwrap(Class iface)", false);
+ logger.trace(" T unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
@@ -1752,7 +1760,7 @@ public T unwrap(Class iface) throws SQLException {
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("public boolean isWrapperFor(Class iface)", false);
+ logger.trace("boolean isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeBasicDataSource.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeBasicDataSource.java
index f1281d593..354f84c72 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeBasicDataSource.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeBasicDataSource.java
@@ -13,6 +13,7 @@
import java.util.Properties;
import java.util.logging.Logger;
import javax.sql.DataSource;
+import net.snowflake.client.core.SFSessionProperty;
import net.snowflake.client.log.ArgSupplier;
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
@@ -22,6 +23,7 @@ public class SnowflakeBasicDataSource implements DataSource, Serializable {
private static final long serialversionUID = 1L;
private static final String AUTHENTICATOR_SNOWFLAKE_JWT = "SNOWFLAKE_JWT";
private static final String AUTHENTICATOR_OAUTH = "OAUTH";
+ private static final String AUTHENTICATOR_USERNAME_PASSWORD_MFA = "USERNAME_PASSWORD_MFA";
private String url;
private String serverName;
@@ -36,7 +38,7 @@ public class SnowflakeBasicDataSource implements DataSource, Serializable {
private Properties properties = new Properties();
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeBasicDataSource.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeBasicDataSource.class);
static {
try {
@@ -88,12 +90,12 @@ public Connection getConnection() throws SQLException {
public Connection getConnection(String username, String password) throws SQLException {
if (!AUTHENTICATOR_OAUTH.equalsIgnoreCase(
authenticator)) { // For OAuth, no username is required
- properties.put("user", username);
+ properties.put(SFSessionProperty.USER.getPropertyKey(), username);
}
// The driver needs password for OAUTH as part of SNOW-533673 feature request.
if (!AUTHENTICATOR_SNOWFLAKE_JWT.equalsIgnoreCase(authenticator)) {
- properties.put("password", password);
+ properties.put(SFSessionProperty.PASSWORD.getPropertyKey(), password);
}
try {
@@ -119,7 +121,8 @@ public void setLogWriter(PrintWriter out) throws SQLException {
@Override
public int getLoginTimeout() throws SQLException {
try {
- return Integer.parseInt(properties.getProperty("loginTimeout"));
+ return Integer.parseInt(
+ properties.getProperty(SFSessionProperty.LOGIN_TIMEOUT.getPropertyKey()));
} catch (NumberFormatException e) {
return 0;
}
@@ -127,7 +130,7 @@ public int getLoginTimeout() throws SQLException {
@Override
public void setLoginTimeout(int seconds) throws SQLException {
- properties.put("loginTimeout", Integer.toString(seconds));
+ properties.put(SFSessionProperty.LOGIN_TIMEOUT.getPropertyKey(), Integer.toString(seconds));
}
@Override
@@ -150,19 +153,19 @@ public void setUrl(String url) {
}
public void setDatabaseName(String databaseName) {
- properties.put("db", databaseName);
+ properties.put(SFSessionProperty.DATABASE.getPropertyKey(), databaseName);
}
public void setSchema(String schema) {
- properties.put("schema", schema);
+ properties.put(SFSessionProperty.SCHEMA.getPropertyKey(), schema);
}
public void setWarehouse(String warehouse) {
- properties.put("warehouse", warehouse);
+ properties.put(SFSessionProperty.WAREHOUSE.getPropertyKey(), warehouse);
}
public void setRole(String role) {
- properties.put("role", role);
+ properties.put(SFSessionProperty.ROLE.getPropertyKey(), role);
}
public void setUser(String user) {
@@ -182,7 +185,7 @@ public void setPortNumber(int portNumber) {
}
public void setAccount(String account) {
- this.properties.put("account", account);
+ this.properties.put(SFSessionProperty.ACCOUNT.getPropertyKey(), account);
}
public void setSsl(boolean ssl) {
@@ -191,12 +194,12 @@ public void setSsl(boolean ssl) {
public void setAuthenticator(String authenticator) {
this.authenticator = authenticator;
- this.properties.put("authenticator", authenticator);
+ this.properties.put(SFSessionProperty.AUTHENTICATOR.getPropertyKey(), authenticator);
}
public void setOauthToken(String oauthToken) {
this.setAuthenticator(AUTHENTICATOR_OAUTH);
- this.properties.put("token", oauthToken);
+ this.properties.put(SFSessionProperty.TOKEN.getPropertyKey(), oauthToken);
}
public String getUrl() {
@@ -217,18 +220,155 @@ public String getUrl() {
public void setPrivateKey(PrivateKey privateKey) {
this.setAuthenticator(AUTHENTICATOR_SNOWFLAKE_JWT);
- this.properties.put("privateKey", privateKey);
+ this.properties.put(SFSessionProperty.PRIVATE_KEY.getPropertyKey(), privateKey);
}
public void setPrivateKeyFile(String location, String password) {
this.setAuthenticator(AUTHENTICATOR_SNOWFLAKE_JWT);
- this.properties.put("private_key_file", location);
+ this.properties.put(SFSessionProperty.PRIVATE_KEY_FILE.getPropertyKey(), location);
if (!Strings.isNullOrEmpty(password)) {
- this.properties.put("private_key_file_pwd", password);
+ this.properties.put(SFSessionProperty.PRIVATE_KEY_FILE_PWD.getPropertyKey(), password);
}
}
public void setTracing(String tracing) {
- this.properties.put("tracing", tracing);
+ this.properties.put(SFSessionProperty.TRACING.getPropertyKey(), tracing);
+ }
+
+ protected Properties getProperties() {
+ return this.properties;
+ }
+
+ public void setAllowUnderscoresInHost(boolean allowUnderscoresInHost) {
+ this.properties.put(
+ SFSessionProperty.ALLOW_UNDERSCORES_IN_HOST.getPropertyKey(),
+ String.valueOf(allowUnderscoresInHost));
+ }
+
+ public void setDisableGcsDefaultCredentials(boolean isGcsDefaultCredentialsDisabled) {
+ this.properties.put(
+ SFSessionProperty.DISABLE_GCS_DEFAULT_CREDENTIALS.getPropertyKey(),
+ String.valueOf(isGcsDefaultCredentialsDisabled));
+ }
+
+ public void setDisableSamlURLCheck(boolean disableSamlURLCheck) {
+ this.properties.put(
+ SFSessionProperty.DISABLE_SAML_URL_CHECK.getPropertyKey(),
+ String.valueOf(disableSamlURLCheck));
+ }
+
+ public void setPasscode(String passcode) {
+ this.setAuthenticator(AUTHENTICATOR_USERNAME_PASSWORD_MFA);
+ this.properties.put(SFSessionProperty.PASSCODE.getPropertyKey(), passcode);
+ }
+
+ public void setPasscodeInPassword(boolean isPasscodeInPassword) {
+ this.properties.put(
+ SFSessionProperty.PASSCODE_IN_PASSWORD.getPropertyKey(),
+ String.valueOf(isPasscodeInPassword));
+ if (isPasscodeInPassword) {
+ this.setAuthenticator(AUTHENTICATOR_USERNAME_PASSWORD_MFA);
+ }
+ }
+
+ public void setDisableSocksProxy(boolean ignoreJvmSocksProxy) {
+ this.properties.put(
+ SFSessionProperty.DISABLE_SOCKS_PROXY.getPropertyKey(),
+ String.valueOf(ignoreJvmSocksProxy));
+ }
+
+ public void setNonProxyHosts(String nonProxyHosts) {
+ this.properties.put(SFSessionProperty.NON_PROXY_HOSTS.getPropertyKey(), nonProxyHosts);
+ }
+
+ public void setProxyHost(String proxyHost) {
+ this.properties.put(SFSessionProperty.PROXY_HOST.getPropertyKey(), proxyHost);
+ }
+
+ public void setProxyPassword(String proxyPassword) {
+ this.properties.put(SFSessionProperty.PROXY_PASSWORD.getPropertyKey(), proxyPassword);
+ }
+
+ public void setProxyPort(int proxyPort) {
+ this.properties.put(SFSessionProperty.PROXY_PORT.getPropertyKey(), Integer.toString(proxyPort));
+ }
+
+ public void setProxyProtocol(String proxyProtocol) {
+ this.properties.put(SFSessionProperty.PROXY_PROTOCOL.getPropertyKey(), proxyProtocol);
+ }
+
+ public void setProxyUser(String proxyUser) {
+ this.properties.put(SFSessionProperty.PROXY_USER.getPropertyKey(), proxyUser);
+ }
+
+ public void setUseProxy(boolean useProxy) {
+ this.properties.put(SFSessionProperty.USE_PROXY.getPropertyKey(), String.valueOf(useProxy));
+ }
+
+ public void setNetworkTimeout(int networkTimeoutSeconds) {
+ this.properties.put(
+ SFSessionProperty.NETWORK_TIMEOUT.getPropertyKey(),
+ Integer.toString(networkTimeoutSeconds));
+ }
+
+ public void setQueryTimeout(int queryTimeoutSeconds) {
+ this.properties.put(
+ SFSessionProperty.QUERY_TIMEOUT.getPropertyKey(), Integer.toString(queryTimeoutSeconds));
+ }
+
+ public void setApplication(String application) {
+ this.properties.put(SFSessionProperty.APPLICATION.getPropertyKey(), application);
+ }
+
+ public void setClientConfigFile(String clientConfigFile) {
+ this.properties.put(SFSessionProperty.CLIENT_CONFIG_FILE.getPropertyKey(), clientConfigFile);
+ }
+
+ public void setEnablePatternSearch(boolean enablePatternSearch) {
+ this.properties.put(
+ SFSessionProperty.ENABLE_PATTERN_SEARCH.getPropertyKey(),
+ String.valueOf(enablePatternSearch));
+ }
+
+ public void setEnablePutGet(boolean enablePutGet) {
+ this.properties.put(
+ SFSessionProperty.ENABLE_PUT_GET.getPropertyKey(), String.valueOf(enablePutGet));
+ }
+
+ public void setArrowTreatDecimalAsInt(boolean treatDecimalAsInt) {
+ this.properties.put(
+ SFSessionProperty.JDBC_ARROW_TREAT_DECIMAL_AS_INT.getPropertyKey(),
+ String.valueOf(treatDecimalAsInt));
+ }
+
+ public void setMaxHttpRetries(int maxHttpRetries) {
+ this.properties.put(
+ SFSessionProperty.MAX_HTTP_RETRIES.getPropertyKey(), Integer.toString(maxHttpRetries));
+ }
+
+ public void setOcspFailOpen(boolean ocspFailOpen) {
+ this.properties.put(
+ SFSessionProperty.OCSP_FAIL_OPEN.getPropertyKey(), String.valueOf(ocspFailOpen));
+ }
+
+ public void setPutGetMaxRetries(int putGetMaxRetries) {
+ this.properties.put(
+ SFSessionProperty.PUT_GET_MAX_RETRIES.getPropertyKey(), Integer.toString(putGetMaxRetries));
+ }
+
+ public void setStringsQuotedForColumnDef(boolean stringsQuotedForColumnDef) {
+ this.properties.put(
+ SFSessionProperty.STRINGS_QUOTED.getPropertyKey(),
+ String.valueOf(stringsQuotedForColumnDef));
+ }
+
+ public void setEnableDiagnostics(boolean enableDiagnostics) {
+ this.properties.put(
+ SFSessionProperty.ENABLE_DIAGNOSTICS.getPropertyKey(), String.valueOf(enableDiagnostics));
+ }
+
+ public void setDiagnosticsAllowlistFile(String diagnosticsAllowlistFile) {
+ this.properties.put(
+ SFSessionProperty.DIAGNOSTICS_ALLOWLIST_FILE.getPropertyKey(), diagnosticsAllowlistFile);
}
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeCallableStatementV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeCallableStatementV1.java
index 3c2386b78..930e70039 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeCallableStatementV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeCallableStatementV1.java
@@ -18,9 +18,13 @@
import java.sql.Timestamp;
import java.util.Calendar;
import java.util.Map;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
final class SnowflakeCallableStatementV1 extends SnowflakePreparedStatementV1
implements CallableStatement, SnowflakeCallableStatement {
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakeCallableStatementV1.class);
/**
* Construct SnowflakePreparedStatementV1
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeChunkDownloader.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeChunkDownloader.java
index ff9eb9003..8f29f5702 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeChunkDownloader.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeChunkDownloader.java
@@ -124,6 +124,10 @@ public class SnowflakeChunkDownloader implements ChunkDownloader {
/** Arrow memory allocator for the current resultSet */
private RootAllocator rootAllocator;
+ private final String queryId;
+
+ private final int firstChunkRowCount;
+
static long getCurrentMemoryUsage() {
synchronized (currentMemoryUsage) {
return currentMemoryUsage.longValue();
@@ -191,7 +195,7 @@ public Thread newThread(final Runnable r) {
thread.setUncaughtExceptionHandler(
new Thread.UncaughtExceptionHandler() {
public void uncaughtException(Thread t, Throwable e) {
- logger.error("uncaughtException in thread: " + t + " {}", e);
+ logger.error("Uncaught Exception in thread {}: {}", t, e);
}
});
@@ -211,6 +215,8 @@ public void uncaughtException(Thread t, Throwable e) {
*/
public SnowflakeChunkDownloader(SnowflakeResultSetSerializableV1 resultSetSerializable)
throws SnowflakeSQLException {
+ this.queryId = resultSetSerializable.getQueryId();
+ this.firstChunkRowCount = resultSetSerializable.getFirstChunkRowCount();
this.snowflakeConnectionString = resultSetSerializable.getSnowflakeConnectString();
this.ocspMode = resultSetSerializable.getOCSPMode();
this.ocspModeAndProxyKey = resultSetSerializable.getHttpClientKey();
@@ -221,7 +227,7 @@ public SnowflakeChunkDownloader(SnowflakeResultSetSerializableV1 resultSetSerial
this.maxHttpRetries = resultSetSerializable.getMaxHttpRetries();
this.prefetchSlots = resultSetSerializable.getResultPrefetchThreads() * 2;
this.queryResultFormat = resultSetSerializable.getQueryResultFormat();
- logger.debug("qrmk = {}", this.qrmk);
+ logger.debug("qrmk: {}", this.qrmk);
this.chunkHeadersMap = resultSetSerializable.getChunkHeadersMap();
// session may be null. Its only use is for in-band telemetry in this class
this.session =
@@ -288,8 +294,7 @@ public SnowflakeChunkDownloader(SnowflakeResultSetSerializableV1 resultSetSerial
}
logger.debug(
- "add chunk, url={} rowCount={} uncompressedSize={} "
- + "neededChunkMemory={}, chunkResultFormat={}",
+ "Add chunk: url: {} rowCount: {} uncompressedSize: {} neededChunkMemory: {}, chunkResultFormat: {}",
chunk.getScrubbedUrl(),
chunk.getRowCount(),
chunk.getUncompressedSize(),
@@ -305,7 +310,7 @@ public SnowflakeChunkDownloader(SnowflakeResultSetSerializableV1 resultSetSerial
resultSetSerializable.getChunkFileCount());
logger.debug(
- "#chunks: {} #threads:{} #slots:{} -> pool:{}",
+ "#chunks: {} #threads: {} #slots: {} -> pool: {}",
resultSetSerializable.getChunkFileCount(),
resultSetSerializable.getResultPrefetchThreads(),
prefetchSlots,
@@ -396,7 +401,7 @@ private void startNextDownloaders() throws SnowflakeSQLException {
neededChunkMemory);
logger.debug(
- "submit chunk #{} for downloading, url={}",
+ "Submit chunk #{} for downloading, url: {}",
this.nextChunkToDownload,
nextChunk.getScrubbedUrl());
@@ -432,7 +437,9 @@ private void startNextDownloaders() throws SnowflakeSQLException {
authTimeout,
socketTimeout,
maxHttpRetries,
- this.session));
+ this.session,
+ chunks.size(),
+ queryId));
downloaderFutures.put(nextChunkToDownload, downloaderFuture);
// increment next chunk to download
nextChunkToDownload++;
@@ -442,7 +449,7 @@ private void startNextDownloaders() throws SnowflakeSQLException {
continue;
} else {
// cancel the reserved memory
- logger.debug("cancel the reserved memory.", false);
+ logger.debug("Cancel the reserved memory.", false);
curMem = currentMemoryUsage.addAndGet(-neededChunkMemory);
if (getPrefetchMemRetry > prefetchMaxRetry) {
logger.debug(
@@ -468,7 +475,7 @@ private void startNextDownloaders() throws SnowflakeSQLException {
getPrefetchMemRetry++;
if (logger.isDebugEnabled()) {
logger.debug(
- "Thread {} waiting for {}s: currentMemoryUsage in MB: {}, neededChunkMemory in MB:"
+ "Thread {} waiting for {} s: currentMemoryUsage in MB: {}, neededChunkMemory in MB:"
+ " {}, nextChunkToDownload: {}, nextChunkToConsume: {}, retry: {}",
(ArgSupplier) () -> Thread.currentThread().getId(),
waitingTime / 1000.0,
@@ -507,7 +514,7 @@ private void releaseCurrentMemoryUsage(int chunkId, Optional optionalRelea
// has to be before reusing the memory
long curMem = currentMemoryUsage.addAndGet(-releaseSize);
logger.debug(
- "Thread {}: currentMemoryUsage in MB: {}, released in MB: {}, "
+ "Thread {} - currentMemoryUsage in MB: {}, released in MB: {}, "
+ "chunk: {}, optionalReleaseSize: {}, JVMFreeMem: {}",
(ArgSupplier) () -> Thread.currentThread().getId(),
(ArgSupplier) () -> curMem / MB,
@@ -549,7 +556,7 @@ public SnowflakeResultChunk getNextChunkToConsume()
int prevChunk = this.nextChunkToConsume - 1;
// free the chunk data for previous chunk
- logger.debug("free chunk data for chunk #{}", prevChunk);
+ logger.debug("Free chunk data for chunk #{}", prevChunk);
long chunkMemUsage = chunks.get(prevChunk).computeNeededChunkMemory();
@@ -573,7 +580,7 @@ public SnowflakeResultChunk getNextChunkToConsume()
// if no more chunks, return null
if (this.nextChunkToConsume >= this.chunks.size()) {
- logger.debug("no more chunk", false);
+ logger.debug("No more chunk", false);
return null;
}
@@ -591,7 +598,7 @@ public SnowflakeResultChunk getNextChunkToConsume()
SnowflakeResultChunk currentChunk = this.chunks.get(nextChunkToConsume);
if (currentChunk.getDownloadState() == DownloadState.SUCCESS) {
- logger.debug("chunk #{} is ready to consume", nextChunkToConsume);
+ logger.debug("Chunk #{} is ready to consume", nextChunkToConsume);
nextChunkToConsume++;
if (nextChunkToConsume == this.chunks.size()) {
// make sure to release the last chunk
@@ -602,15 +609,15 @@ public SnowflakeResultChunk getNextChunkToConsume()
// the chunk we want to consume is not ready yet, wait for it
currentChunk.getLock().lock();
try {
- logger.debug("#chunk{} is not ready to consume", nextChunkToConsume);
- logger.debug("consumer get lock to check chunk state", false);
+ logger.debug("Chunk#{} is not ready to consume", nextChunkToConsume);
+ logger.debug("Consumer get lock to check chunk state", false);
waitForChunkReady(currentChunk);
// downloader thread encountered an error
if (currentChunk.getDownloadState() == DownloadState.FAILURE) {
releaseAllChunkMemoryUsage();
- logger.error("downloader encountered error: {}", currentChunk.getDownloadError());
+ logger.error("Downloader encountered error: {}", currentChunk.getDownloadError());
if (currentChunk
.getDownloadError()
@@ -625,14 +632,14 @@ public SnowflakeResultChunk getNextChunkToConsume()
currentChunk.getDownloadError());
}
- logger.debug("#chunk{} is ready to consume", nextChunkToConsume);
+ logger.debug("Chunk#{} is ready to consume", nextChunkToConsume);
nextChunkToConsume++;
// next chunk to consume is ready for consumption
return currentChunk;
} finally {
- logger.debug("consumer free lock", false);
+ logger.debug("Consumer free lock", false);
boolean terminateDownloader = (currentChunk.getDownloadState() == DownloadState.FAILURE);
// release the unlock always
@@ -662,7 +669,7 @@ private void waitForChunkReady(SnowflakeResultChunk currentChunk) throws Interru
long startTime = System.currentTimeMillis();
while (true) {
logger.debug(
- "Thread {} is waiting for #chunk{} to be ready, current" + "chunk state is: {}, retry={}",
+ "Thread {} is waiting for chunk#{} to be ready, current chunk state is: {}, retry: {}",
Thread.currentThread().getId(),
nextChunkToConsume,
currentChunk.getDownloadState(),
@@ -677,8 +684,8 @@ private void waitForChunkReady(SnowflakeResultChunk currentChunk) throws Interru
.await(downloadedConditionTimeoutInSeconds, TimeUnit.SECONDS)) {
// if the current chunk has not condition change over the timeout (which is rare)
logger.debug(
- "Thread {} is timeout for waiting #chunk{} to be ready, current"
- + " chunk state is: {}, retry={}, scrubbedUrl={}",
+ "Thread {} is timeout for waiting chunk#{} to be ready, current"
+ + " chunk state is: {}, retry: {}, scrubbedUrl: {}",
Thread.currentThread().getId(),
nextChunkToConsume,
currentChunk.getDownloadState(),
@@ -688,7 +695,7 @@ private void waitForChunkReady(SnowflakeResultChunk currentChunk) throws Interru
currentChunk.setDownloadState(DownloadState.FAILURE);
currentChunk.setDownloadError(
String.format(
- "Timeout waiting for the download of #chunk%d(Total chunks: %d) retry=%d scrubbedUrl=%s",
+ "Timeout waiting for the download of chunk#%d(Total chunks: %d) retry: %d scrubbedUrl: %s",
nextChunkToConsume, this.chunks.size(), retry, currentChunk.getScrubbedUrl()));
break;
}
@@ -699,7 +706,7 @@ private void waitForChunkReady(SnowflakeResultChunk currentChunk) throws Interru
retry++;
// timeout or failed
logger.debug(
- "Since downloadState is {} Thread {} decides to retry {} time(s) for #chunk{}",
+ "Since downloadState is {} Thread {} decides to retry {} time(s) for chunk#{}",
currentChunk.getDownloadState(),
Thread.currentThread().getId(),
retry,
@@ -733,7 +740,9 @@ private void waitForChunkReady(SnowflakeResultChunk currentChunk) throws Interru
authTimeout,
socketTimeout,
maxHttpRetries,
- session));
+ session,
+ chunks.size(),
+ queryId));
downloaderFutures.put(nextChunkToConsume, downloaderFuture);
// Only when prefetch fails due to internal memory limitation, nextChunkToDownload
// equals nextChunkToConsume. In that case we need to increment nextChunkToDownload
@@ -750,14 +759,14 @@ private void waitForChunkReady(SnowflakeResultChunk currentChunk) throws Interru
}
}
if (currentChunk.getDownloadState() == DownloadState.SUCCESS) {
- logger.debug("ready to consume #chunk{}, succeed retry={}", nextChunkToConsume, retry);
+ logger.debug("Ready to consume chunk#{}, succeed retry={}", nextChunkToConsume, retry);
} else if (retry >= maxHttpRetries) {
// stop retrying and report failure
currentChunk.setDownloadState(DownloadState.FAILURE);
currentChunk.setDownloadError(
String.format(
- "Max retry reached for the download of #chunk%d "
- + "(Total chunks: %d) retry=%d, error=%s",
+ "Max retry reached for the download of chunk#%d "
+ + "(Total chunks: %d) retry: %d, error: %s",
nextChunkToConsume,
this.chunks.size(),
retry,
@@ -814,9 +823,8 @@ public DownloaderMetrics terminate() throws InterruptedException {
logger.debug("Executor did not terminate in the specified time.", false);
List droppedTasks = executor.shutdownNow(); // optional **
logger.debug(
- "Executor was abruptly shut down. "
- + droppedTasks.size()
- + " tasks will not be executed."); // optional **
+ "Executor was abruptly shut down. {} tasks will not be executed.",
+ droppedTasks.size()); // optional **
}
}
// Normal flow will never hit here. This is only for testing purposes
@@ -825,15 +833,32 @@ public DownloaderMetrics terminate() throws InterruptedException {
throw (InterruptedException) SnowflakeChunkDownloader.injectedDownloaderException;
}
}
- logger.debug(
- "Total milliseconds waiting for chunks: {}, "
- + "Total memory used: {}, total download time: {} millisec, "
- + "total parsing time: {} milliseconds, total chunks: {}",
- numberMillisWaitingForChunks,
- Runtime.getRuntime().totalMemory(),
+
+ long totalUncompressedSize =
+ chunks.stream()
+ .reduce(0L, (acc, chunk) -> acc + chunk.getUncompressedSize(), Long::sum);
+ long rowsInChunks =
+ chunks.stream().reduce(0L, (acc, chunk) -> acc + chunk.getRowCount(), Long::sum);
+ long chunksSize = chunks.size();
+
+ logger.info(
+ "Completed processing {} {} chunks for query {} in {} ms. Download took {} ms (average: {} ms),"
+ + " parsing took {} ms (average: {} ms). Chunks uncompressed size: {} MB (average: {} MB),"
+ + " rows in chunks: {} (total: {}, average in chunk: {}), total memory used: {} MB",
+ chunksSize,
+ queryResultFormat == QueryResultFormat.ARROW ? "ARROW" : "JSON",
+ queryId,
+ totalMillisParsingChunks.get() + totalMillisDownloadingChunks.get(),
totalMillisDownloadingChunks.get(),
- totalMillisParsingChunks.get(),
- chunks.size());
+ totalMillisDownloadingChunks.get() / chunksSize,
+ totalMillisParsingChunks,
+ totalMillisParsingChunks.get() / chunksSize,
+ totalUncompressedSize / MB,
+ totalUncompressedSize / MB / chunksSize,
+ rowsInChunks,
+ firstChunkRowCount + rowsInChunks,
+ rowsInChunks / chunksSize,
+ Runtime.getRuntime().totalMemory() / MB);
return new DownloaderMetrics(
numberMillisWaitingForChunks,
@@ -884,6 +909,8 @@ private void addParsingTime(long parsingTime) {
* mainly for logging purpose
* @param chunkHeadersMap contains headers needed to be added when downloading from s3
* @param networkTimeoutInMilli network timeout
+ * @param totalChunks used to log the information of total chunks
+ * @param queryId used to log the queryId to which the chunk belongs to
* @return A callable responsible for downloading chunk
*/
private static Callable getDownloadChunkCallable(
@@ -896,7 +923,9 @@ private static Callable getDownloadChunkCallable(
final int authTimeout,
final int socketTimeout,
final int maxHttpRetries,
- final SFBaseSession session) {
+ final SFBaseSession session,
+ final int totalChunks,
+ final String queryId) {
ChunkDownloadContext downloadContext =
new ChunkDownloadContext(
downloader,
@@ -934,7 +963,7 @@ private void downloadAndParseChunk(InputStream inputStream) throws SnowflakeSQLE
}
} catch (Exception ex) {
logger.debug(
- "Thread {} Exception when parsing result #chunk{}: {}",
+ "Thread {} Exception when parsing result chunk#{}: {}",
Thread.currentThread().getId(),
chunkIndex,
ex.getLocalizedMessage());
@@ -948,7 +977,7 @@ private void downloadAndParseChunk(InputStream inputStream) throws SnowflakeSQLE
} finally {
// close the buffer reader will close underlying stream
logger.debug(
- "Thread {} close input stream for #chunk{}",
+ "Thread {} close input stream for chunk#{}",
Thread.currentThread().getId(),
chunkIndex);
try {
@@ -979,7 +1008,7 @@ public Void call() {
}
logger.debug(
- "Downloading #chunk{}, url={}, Thread {}",
+ "Downloading chunk#{}, url: {}, Thread {}",
chunkIndex,
resultChunk.getUrl(),
Thread.currentThread().getId());
@@ -998,51 +1027,78 @@ public Void call() {
InputStream is = downloader.getResultStreamProvider().getInputStream(downloadContext);
logger.debug(
- "Thread {} start downloading #chunk{}", Thread.currentThread().getId(), chunkIndex);
+ "Thread {} start downloading chunk#{}", Thread.currentThread().getId(), chunkIndex);
downloadAndParseChunk(is);
logger.debug(
- "Thread {} finish downloading #chunk{}", Thread.currentThread().getId(), chunkIndex);
+ "Thread {} finish downloading chunk#{}", Thread.currentThread().getId(), chunkIndex);
downloader.downloaderFutures.remove(chunkIndex);
- logger.debug(
- "Finished preparing chunk data for {}, "
- + "total download time={}ms, total parse time={}ms",
- resultChunk.getScrubbedUrl(),
- resultChunk.getDownloadTime(),
- resultChunk.getParseTime());
+ if (chunkIndex % 5 == 0) {
+ logger.info(
+ "Processed {} chunk#{} in {} ms ({} out of {}) for query {}. Download took {} ms, "
+ + "parsing took {} ms. Chunk uncompressed size: {} kB, cols: {}, rows: {}, scrubbed URL: {}",
+ downloader.queryResultFormat == QueryResultFormat.ARROW ? "ARROW" : "JSON",
+ chunkIndex,
+ resultChunk.getTotalTime(),
+ chunkIndex + 1,
+ totalChunks,
+ queryId,
+ resultChunk.getDownloadTime(),
+ resultChunk.getParseTime(),
+ resultChunk.getUncompressedSize() / 1024,
+ resultChunk.colCount,
+ resultChunk.rowCount,
+ resultChunk.getScrubbedUrl());
+ } else {
+ logger.debug(
+ "Processed {} chunk#{} in {} ms ({} out of {}) for query {}. Download took {} ms, "
+ + "parsing took {} ms. Chunk uncompressed size: {} kB, cols: {}, rows: {}, scrubbed URL: {}",
+ downloader.queryResultFormat == QueryResultFormat.ARROW ? "ARROW" : "JSON",
+ chunkIndex,
+ resultChunk.getTotalTime(),
+ chunkIndex + 1,
+ totalChunks,
+ queryId,
+ resultChunk.getDownloadTime(),
+ resultChunk.getParseTime(),
+ resultChunk.getUncompressedSize() / 1024,
+ resultChunk.colCount,
+ resultChunk.rowCount,
+ resultChunk.getScrubbedUrl());
+ }
resultChunk.getLock().lock();
try {
- logger.debug("get lock to change the chunk to be ready to consume", false);
+ logger.debug("Get lock to change the chunk to be ready to consume", false);
- logger.debug("wake up consumer if it is waiting for a chunk to be " + "ready", false);
+ logger.debug("Wake up consumer if it is waiting for a chunk to be ready", false);
resultChunk.setDownloadState(DownloadState.SUCCESS);
resultChunk.getDownloadCondition().signal();
} finally {
- logger.debug("Downloaded #chunk{}, free lock", chunkIndex);
+ logger.debug("Downloaded chunk#{}, free lock", chunkIndex);
resultChunk.getLock().unlock();
}
} catch (Throwable th) {
resultChunk.getLock().lock();
try {
- logger.debug("get lock to set chunk download error", false);
+ logger.debug("Get lock to set chunk download error", false);
resultChunk.setDownloadState(DownloadState.FAILURE);
downloader.releaseCurrentMemoryUsage(chunkIndex, Optional.empty());
StringWriter errors = new StringWriter();
th.printStackTrace(new PrintWriter(errors));
resultChunk.setDownloadError(errors.toString());
- logger.debug("wake up consumer if it is waiting for a chunk to be ready", false);
+ logger.debug("Wake up consumer if it is waiting for a chunk to be ready", false);
resultChunk.getDownloadCondition().signal();
} finally {
- logger.debug("Failed to download #chunk{}, free lock", chunkIndex);
+ logger.debug("Failed to download chunk#{}, free lock", chunkIndex);
resultChunk.getLock().unlock();
}
logger.debug(
- "Thread {} Exception encountered ({}:{}) fetching #chunk{} from: {}, Error {}",
+ "Thread {} Exception encountered ({}:{}) fetching chunk#{} from: {}, Error {}",
Thread.currentThread().getId(),
th.getClass().getName(),
th.getLocalizedMessage(),
@@ -1078,7 +1134,7 @@ private void parseJsonToChunkV2(InputStream jsonInputStream, SnowflakeResultChun
ByteBuffer bBuf = null;
int len;
logger.debug(
- "Thread {} start to read inputstream for #chunk{}",
+ "Thread {} start to read inputstream for chunk#{}",
Thread.currentThread().getId(),
chunkIndex);
while ((len = jsonInputStream.read(buf)) != -1) {
@@ -1103,7 +1159,7 @@ private void parseJsonToChunkV2(InputStream jsonInputStream, SnowflakeResultChun
}
}
logger.debug(
- "Thread {} finish reading inputstream for #chunk{}",
+ "Thread {} finish reading inputstream for chunk#{}",
Thread.currentThread().getId(),
chunkIndex);
if (prevBuffer != null) {
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeColumn.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeColumn.java
new file mode 100644
index 000000000..10f06dafa
--- /dev/null
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeColumn.java
@@ -0,0 +1,74 @@
+package net.snowflake.client.jdbc;
+
+import static java.lang.annotation.ElementType.FIELD;
+
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({FIELD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface SnowflakeColumn {
+
+ /**
+ * (Optional) The name for a column in database,
+ *
+ * The default value is empty string. Provided name can override SqlData field name
+ */
+ String name() default "";
+
+ /**
+ * (Optional) The snowflake type for a column
+ *
+ *
The default value is empty string Provided type can override default type
+ */
+ String type() default "";
+
+ /**
+ * (Optional) The snowflake nullable flag for a column
+ *
+ *
The default value is true Provided value can override default nullable value
+ */
+ boolean nullable() default true;
+
+ /**
+ * (Optional) The length for a column of SQL type {@code varchar} or {@code binary}, or of similar
+ * database-native type.
+ *
+ *
Applies only to columns of exact varchar and binary type.
+ *
+ *
The default value {@code -1} indicates that a provider-determined length should be inferred.
+ */
+ int length() default -1;
+ /**
+ * (Optional) The length for a column of SQL type {@code binary}, or of similar database-native
+ * type.
+ *
+ *
Applies only to columns of exact varchar and binary type.
+ *
+ *
The default value {@code -1} indicates that a provider-determined byteLength should be
+ * inferred.
+ */
+ int byteLength() default -1;
+
+ /**
+ * (Optional) The precision for a column of SQL type {@code decimal} or {@code numeric}, or of
+ * similar database-native type.
+ *
+ *
Applies only to columns of exact numeric type.
+ *
+ *
The default value {@code -1} indicates that a provider-determined precision should be
+ * inferred.
+ */
+ int precision() default -1;
+
+ /**
+ * (Optional) The scale for a column of SQL type {@code decimal} or {@code numeric}, or of similar
+ * database-native type.
+ *
+ *
Applies only to columns of exact numeric type.
+ *
+ *
The default value {@code 0} indicates that a provider-determined scale should be inferred.
+ */
+ int scale() default -1;
+}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java
index 9f182772e..9f1cd272e 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeColumnMetadata.java
@@ -28,6 +28,7 @@ public class SnowflakeColumnMetadata implements Serializable {
private String columnSrcDatabase;
private boolean isAutoIncrement;
+ private int dimension; // vector type contains dimension
@SnowflakeJdbcInternalApi
public SnowflakeColumnMetadata(
@@ -44,7 +45,8 @@ public SnowflakeColumnMetadata(
String columnSrcDatabase,
String columnSrcSchema,
String columnSrcTable,
- boolean isAutoIncrement) {
+ boolean isAutoIncrement,
+ int dimension) {
this.name = name;
this.type = type;
this.nullable = nullable;
@@ -59,11 +61,12 @@ public SnowflakeColumnMetadata(
this.columnSrcSchema = columnSrcSchema;
this.columnSrcTable = columnSrcTable;
this.isAutoIncrement = isAutoIncrement;
+ this.dimension = dimension;
}
/**
* @deprecated Use {@link SnowflakeColumnMetadata#SnowflakeColumnMetadata(String, int, boolean,
- * int, int, int, String, boolean, SnowflakeType, List, String, String, String, boolean)}
+ * int, int, int, String, boolean, SnowflakeType, List, String, String, String, boolean, int)}
* instead
*/
@Deprecated
@@ -194,6 +197,11 @@ public void setAutoIncrement(boolean autoIncrement) {
isAutoIncrement = autoIncrement;
}
+ @SnowflakeJdbcInternalApi
+ public int getDimension() {
+ return dimension;
+ }
+
public String toString() {
StringBuilder sBuilder = new StringBuilder();
@@ -209,6 +217,7 @@ public String toString() {
sBuilder.append(",schema=").append(columnSrcSchema);
sBuilder.append(",table=").append(columnSrcTable);
sBuilder.append((",isAutoIncrement=")).append(isAutoIncrement);
+ sBuilder.append((",dimension=")).append(dimension);
return sBuilder.toString();
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java
index 9d7da8071..ea456be6c 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectString.java
@@ -21,14 +21,13 @@
public class SnowflakeConnectString implements Serializable {
private static final long serialVersionUID = 1L;
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeConnectString.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeConnectString.class);
private final String scheme;
private final String host;
private final int port;
private final Map parameters;
private final String account;
-
private static SnowflakeConnectString INVALID_CONNECT_STRING =
new SnowflakeConnectString("", "", -1, Collections.emptyMap(), "");
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectionV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectionV1.java
index 0da7d44c8..473aa2041 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectionV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeConnectionV1.java
@@ -18,6 +18,7 @@
import java.sql.Connection;
import java.sql.DatabaseMetaData;
import java.sql.DriverPropertyInfo;
+import java.sql.JDBCType;
import java.sql.NClob;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
@@ -43,9 +44,11 @@
import net.snowflake.client.core.SFBaseSession;
import net.snowflake.client.core.SFException;
import net.snowflake.client.core.SFSession;
+import net.snowflake.client.core.SfSqlArray;
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.log.SFLoggerUtil;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.SqlState;
/** Snowflake connection implementation */
@@ -136,11 +139,19 @@ public SnowflakeConnectionV1(String url, Properties info, boolean fakeConnection
private void initConnectionWithImpl(
SFConnectionHandler sfConnectionHandler, String url, Properties info) throws SQLException {
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
+ logger.info("Initializing new connection");
this.sfConnectionHandler = sfConnectionHandler;
sfConnectionHandler.initializeConnection(url, info);
this.sfSession = sfConnectionHandler.getSFSession();
missingProperties = sfSession.checkProperties();
this.showStatementParameters = sfSession.getPreparedStatementLogging();
+ stopwatch.stop();
+ logger.info(
+ "Connection initialized successfully in {} ms. Session id: {}",
+ stopwatch.elapsedMillis(),
+ sfSession.getSessionId());
}
public List returnMissingProperties() {
@@ -219,9 +230,19 @@ public String[] getChildQueryIds(String queryID) throws SQLException {
*/
@Override
public void close() throws SQLException {
- logger.debug(" public void close()", false);
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
+ String sessionId = null;
+
+ if (sfSession != null) {
+ sessionId = sfSession.getSessionId();
+ logger.info("Closing connection with session id: {}", sessionId);
+ } else {
+ logger.debug("Closing connection without associated session");
+ }
if (isClosed) {
+ logger.debug("Connection is already closed");
// No exception is raised even if the connection is closed.
return;
}
@@ -233,6 +254,9 @@ public void close() throws SQLException {
sfSession = null;
}
// make sure to close all created statements
+ if (!openStatements.isEmpty()) {
+ logger.debug("Closing {} opened statements", openStatements.size());
+ }
for (Statement stmt : openStatements) {
if (stmt != null && !stmt.isClosed()) {
if (stmt.isWrapperFor(SnowflakeStatementV1.class)) {
@@ -242,12 +266,20 @@ public void close() throws SQLException {
}
}
}
+ if (!openStatements.isEmpty()) {
+ logger.debug("Statements closed successfully");
+ }
openStatements.clear();
} catch (SFException ex) {
throw new SnowflakeSQLLoggedException(
sfSession, ex.getSqlState(), ex.getVendorCode(), ex.getCause(), ex.getParams());
}
+ stopwatch.stop();
+ logger.info(
+ "Connection with session id: {} closed successfully in {} ms",
+ sessionId,
+ stopwatch.elapsedMillis());
}
public String getSessionID() throws SQLException {
@@ -259,7 +291,7 @@ public String getSessionID() throws SQLException {
@Override
public boolean isClosed() throws SQLException {
- logger.debug(" public boolean isClosed()", false);
+ logger.trace("boolean isClosed()", false);
return isClosed;
}
@@ -272,14 +304,14 @@ public boolean isClosed() throws SQLException {
*/
@Override
public DatabaseMetaData getMetaData() throws SQLException {
- logger.debug(" public DatabaseMetaData getMetaData()", false);
+ logger.trace("DatabaseMetaData getMetaData()", false);
raiseSQLExceptionIfConnectionIsClosed();
return new SnowflakeDatabaseMetaData(this);
}
@Override
public CallableStatement prepareCall(String sql) throws SQLException {
- logger.debug(" public CallableStatement prepareCall(String sql)", false);
+ logger.trace("CallableStatement prepareCall(String sql)", false);
raiseSQLExceptionIfConnectionIsClosed();
CallableStatement stmt = prepareCall(sql, false);
openStatements.add(stmt);
@@ -287,7 +319,7 @@ public CallableStatement prepareCall(String sql) throws SQLException {
}
public CallableStatement prepareCall(String sql, boolean skipParsing) throws SQLException {
- logger.debug(" public CallableStatement prepareCall(String sql, boolean skipParsing)", false);
+ logger.trace("CallableStatement prepareCall(String sql, boolean skipParsing)", false);
raiseSQLExceptionIfConnectionIsClosed();
CallableStatement stmt =
new SnowflakeCallableStatementV1(
@@ -304,9 +336,8 @@ public CallableStatement prepareCall(String sql, boolean skipParsing) throws SQL
@Override
public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
throws SQLException {
- logger.debug(
- " public CallableStatement prepareCall(String sql,"
- + " int resultSetType,int resultSetConcurrency",
+ logger.trace(
+ "CallableStatement prepareCall(String sql," + " int resultSetType,int resultSetConcurrency",
false);
CallableStatement stmt =
prepareCall(sql, resultSetType, resultSetConcurrency, ResultSet.CLOSE_CURSORS_AT_COMMIT);
@@ -318,8 +349,7 @@ public CallableStatement prepareCall(String sql, int resultSetType, int resultSe
public CallableStatement prepareCall(
String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
throws SQLException {
- logger.debug(
- " public CallableStatement prepareCall(String sql, int " + "resultSetType,", false);
+ logger.trace("CallableStatement prepareCall(String sql, int " + "resultSetType,", false);
CallableStatement stmt =
new SnowflakeCallableStatementV1(
this, sql, false, resultSetType, resultSetConcurrency, resultSetHoldability);
@@ -329,21 +359,21 @@ public CallableStatement prepareCall(
@Override
public String nativeSQL(String sql) throws SQLException {
- logger.debug("public String nativeSQL(String sql)", false);
+ logger.trace("String nativeSQL(String sql)", false);
raiseSQLExceptionIfConnectionIsClosed();
return sql;
}
@Override
public boolean getAutoCommit() throws SQLException {
- logger.debug("boolean getAutoCommit()", false);
+ logger.trace("boolean getAutoCommit()", false);
raiseSQLExceptionIfConnectionIsClosed();
return sfSession.getAutoCommit();
}
@Override
public void setAutoCommit(boolean isAutoCommit) throws SQLException {
- logger.debug("void setAutoCommit(boolean isAutoCommit)", false);
+ logger.trace("void setAutoCommit(boolean isAutoCommit)", false);
boolean currentAutoCommit = this.getAutoCommit();
if (isAutoCommit != currentAutoCommit) {
sfSession.setAutoCommit(isAutoCommit);
@@ -355,33 +385,33 @@ public void setAutoCommit(boolean isAutoCommit) throws SQLException {
@Override
public void commit() throws SQLException {
- logger.debug("void commit()", false);
+ logger.trace("void commit()", false);
this.executeImmediate("commit");
}
@Override
public void rollback() throws SQLException {
- logger.debug("void rollback()", false);
+ logger.trace("void rollback()", false);
this.executeImmediate("rollback");
}
@Override
public void rollback(Savepoint savepoint) throws SQLException {
- logger.debug("void rollback(Savepoint savepoint)", false);
+ logger.trace("void rollback(Savepoint savepoint)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(sfSession);
}
@Override
public boolean isReadOnly() throws SQLException {
- logger.debug("boolean isReadOnly()", false);
+ logger.trace("boolean isReadOnly()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public void setReadOnly(boolean readOnly) throws SQLException {
- logger.debug("void setReadOnly(boolean readOnly)", false);
+ logger.trace("void setReadOnly(boolean readOnly)", false);
raiseSQLExceptionIfConnectionIsClosed();
if (readOnly) {
logger.debug("setReadOnly not supported.", false);
@@ -396,7 +426,7 @@ public String getCatalog() throws SQLException {
@Override
public void setCatalog(String catalog) throws SQLException {
- logger.debug("void setCatalog(String catalog)", false);
+ logger.trace("void setCatalog(String catalog)", false);
// switch db by running "use db"
this.executeImmediate("use database \"" + catalog + "\"");
@@ -404,7 +434,7 @@ public void setCatalog(String catalog) throws SQLException {
@Override
public int getTransactionIsolation() throws SQLException {
- logger.debug("int getTransactionIsolation()", false);
+ logger.trace("int getTransactionIsolation()", false);
raiseSQLExceptionIfConnectionIsClosed();
return this.transactionIsolation;
}
@@ -417,7 +447,7 @@ public int getTransactionIsolation() throws SQLException {
*/
@Override
public void setTransactionIsolation(int level) throws SQLException {
- logger.debug("void setTransactionIsolation(int level), level = {}", level);
+ logger.trace("void setTransactionIsolation(int level), level = {}", level);
raiseSQLExceptionIfConnectionIsClosed();
if (level == Connection.TRANSACTION_NONE || level == Connection.TRANSACTION_READ_COMMITTED) {
this.transactionIsolation = level;
@@ -431,14 +461,14 @@ public void setTransactionIsolation(int level) throws SQLException {
@Override
public SQLWarning getWarnings() throws SQLException {
- logger.debug("SQLWarning getWarnings()", false);
+ logger.trace("SQLWarning getWarnings()", false);
raiseSQLExceptionIfConnectionIsClosed();
return sqlWarnings;
}
@Override
public void clearWarnings() throws SQLException {
- logger.debug("void clearWarnings()", false);
+ logger.trace("void clearWarnings()", false);
raiseSQLExceptionIfConnectionIsClosed();
sfSession.clearSqlWarnings();
sqlWarnings = null;
@@ -447,7 +477,7 @@ public void clearWarnings() throws SQLException {
@Override
public Statement createStatement(int resultSetType, int resultSetConcurrency)
throws SQLException {
- logger.debug(
+ logger.trace(
"Statement createStatement(int resultSetType, " + "int resultSetConcurrency)", false);
Statement stmt =
@@ -459,7 +489,7 @@ public Statement createStatement(int resultSetType, int resultSetConcurrency)
@Override
public Statement createStatement(
int resultSetType, int resultSetConcurrency, int resultSetHoldability) throws SQLException {
- logger.debug(
+ logger.trace(
"Statement createStatement(int resultSetType, "
+ "int resultSetConcurrency, int resultSetHoldability",
false);
@@ -472,7 +502,7 @@ public Statement createStatement(
@Override
public PreparedStatement prepareStatement(String sql) throws SQLException {
- logger.debug("PreparedStatement prepareStatement(String sql)", false);
+ logger.trace("PreparedStatement prepareStatement(String sql)", false);
raiseSQLExceptionIfConnectionIsClosed();
PreparedStatement stmt = prepareStatement(sql, false);
openStatements.add(stmt);
@@ -481,7 +511,7 @@ public PreparedStatement prepareStatement(String sql) throws SQLException {
@Override
public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) throws SQLException {
- logger.debug(
+ logger.trace(
"PreparedStatement prepareStatement(String sql, " + "int autoGeneratedKeys)", false);
if (autoGeneratedKeys == Statement.NO_GENERATED_KEYS) {
@@ -493,14 +523,14 @@ public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys) thr
@Override
public PreparedStatement prepareStatement(String sql, int[] columnIndexes) throws SQLException {
- logger.debug("PreparedStatement prepareStatement(String sql, " + "int[] columnIndexes)", false);
+ logger.trace("PreparedStatement prepareStatement(String sql, " + "int[] columnIndexes)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(sfSession);
}
@Override
public PreparedStatement prepareStatement(String sql, String[] columnNames) throws SQLException {
- logger.debug(
+ logger.trace(
"PreparedStatement prepareStatement(String sql, " + "String[] columnNames)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(sfSession);
@@ -509,7 +539,7 @@ public PreparedStatement prepareStatement(String sql, String[] columnNames) thro
@Override
public PreparedStatement prepareStatement(String sql, int resultSetType, int resultSetConcurrency)
throws SQLException {
- logger.debug("PreparedStatement prepareStatement(String sql, " + "int resultSetType,", false);
+ logger.trace("PreparedStatement prepareStatement(String sql, " + "int resultSetType,", false);
PreparedStatement stmt =
prepareStatement(
@@ -522,7 +552,7 @@ public PreparedStatement prepareStatement(String sql, int resultSetType, int res
public PreparedStatement prepareStatement(
String sql, int resultSetType, int resultSetConcurrency, int resultSetHoldability)
throws SQLException {
- logger.debug("PreparedStatement prepareStatement(String sql, " + "int resultSetType,", false);
+ logger.trace("PreparedStatement prepareStatement(String sql, " + "int resultSetType,", false);
PreparedStatement stmt =
new SnowflakePreparedStatementV1(
@@ -532,7 +562,7 @@ public PreparedStatement prepareStatement(
}
public PreparedStatement prepareStatement(String sql, boolean skipParsing) throws SQLException {
- logger.debug("PreparedStatement prepareStatement(String sql, boolean skipParsing)", false);
+ logger.trace("PreparedStatement prepareStatement(String sql, boolean skipParsing)", false);
raiseSQLExceptionIfConnectionIsClosed();
PreparedStatement stmt =
new SnowflakePreparedStatementV1(
@@ -654,7 +684,7 @@ private void raiseSetClientInfoException(Map failedPro
@Override
public Properties getClientInfo() throws SQLException {
- logger.debug("Properties getClientInfo()", false);
+ logger.trace("Properties getClientInfo()", false);
raiseSQLExceptionIfConnectionIsClosed();
// sfSession must not be null if the connection is not closed.
return sfSession.getClientInfo();
@@ -673,7 +703,7 @@ public void setClientInfo(Properties properties) throws SQLClientInfoException {
@Override
public String getClientInfo(String name) throws SQLException {
- logger.debug("String getClientInfo(String name)", false);
+ logger.trace("String getClientInfo(String name)", false);
raiseSQLExceptionIfConnectionIsClosed();
// sfSession must not be null if the connection is not closed.
@@ -682,14 +712,13 @@ public String getClientInfo(String name) throws SQLException {
@Override
public Array createArrayOf(String typeName, Object[] elements) throws SQLException {
- logger.debug("Array createArrayOf(String typeName, Object[] " + "elements)", false);
-
- throw new SnowflakeLoggedFeatureNotSupportedException(sfSession);
+ logger.trace("Array createArrayOf(String typeName, Object[] " + "elements)", false);
+ return new SfSqlArray(JDBCType.valueOf(typeName).getVendorTypeNumber(), elements);
}
@Override
public Struct createStruct(String typeName, Object[] attributes) throws SQLException {
- logger.debug("Struct createStruct(String typeName, Object[] " + "attributes)", false);
+ logger.trace("Struct createStruct(String typeName, Object[] " + "attributes)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(sfSession);
}
@@ -702,7 +731,7 @@ public String getSchema() throws SQLException {
@Override
public void setSchema(String schema) throws SQLException {
- logger.debug("void setSchema(String schema)", false);
+ logger.trace("void setSchema(String schema)", false);
String databaseName = getCatalog();
@@ -716,14 +745,14 @@ public void setSchema(String schema) throws SQLException {
@Override
public void abort(Executor executor) throws SQLException {
- logger.debug("void abort(Executor executor)", false);
+ logger.trace("void abort(Executor executor)", false);
close();
}
@Override
public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLException {
- logger.debug("void setNetworkTimeout(Executor executor, int " + "milliseconds)", false);
+ logger.trace("void setNetworkTimeout(Executor executor, int " + "milliseconds)", false);
raiseSQLExceptionIfConnectionIsClosed();
networkTimeoutInMilli = milliseconds;
@@ -731,14 +760,14 @@ public void setNetworkTimeout(Executor executor, int milliseconds) throws SQLExc
@Override
public int getNetworkTimeout() throws SQLException {
- logger.debug("int getNetworkTimeout()", false);
+ logger.trace("int getNetworkTimeout()", false);
raiseSQLExceptionIfConnectionIsClosed();
return networkTimeoutInMilli;
}
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("boolean isWrapperFor(Class iface)", false);
+ logger.trace("boolean isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
@@ -746,7 +775,7 @@ public boolean isWrapperFor(Class iface) throws SQLException {
@SuppressWarnings("unchecked")
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug(" T unwrap(Class iface)", false);
+ logger.trace(" T unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
@@ -872,7 +901,7 @@ private void uploadStreamInternal(
boolean compressData)
throws SQLException {
logger.debug(
- "upload data from stream: stageName={}" + ", destPrefix={}, destFileName={}",
+ "Upload data from stream: stageName={}" + ", destPrefix={}, destFileName={}",
stageName,
destPrefix,
destFileName);
@@ -941,7 +970,7 @@ public InputStream downloadStream(String stageName, String sourceFileName, boole
throws SQLException {
logger.debug(
- "download data to stream: stageName={}" + ", sourceFileName={}", stageName, sourceFileName);
+ "Download data to stream: stageName={}" + ", sourceFileName={}", stageName, sourceFileName);
if (Strings.isNullOrEmpty(stageName)) {
throw new SnowflakeSQLLoggedException(
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java
index 34df34067..acfb3e4f7 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaData.java
@@ -35,6 +35,7 @@
import java.util.Collections;
import java.util.HashSet;
import java.util.List;
+import java.util.Optional;
import java.util.Set;
import java.util.regex.Pattern;
import net.snowflake.client.core.ObjectMapperFactory;
@@ -52,7 +53,7 @@
public class SnowflakeDatabaseMetaData implements DatabaseMetaData {
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeDatabaseMetaData.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeDatabaseMetaData.class);
private static final ObjectMapper mapper = ObjectMapperFactory.getObjectMapper();
@@ -94,27 +95,57 @@ public class SnowflakeDatabaseMetaData implements DatabaseMetaData {
// These are keywords not in SQL2003 standard
private static final String notSQL2003Keywords =
- "ACCOUNT,DATABASE,SCHEMA,VIEW,ISSUE,DATE_PART,EXTRACT,"
- + "POSITION,TRY_CAST,BIT,DATETIME,NUMBERC,OBJECT,BYTEINT,STRING,TEXT,"
- + "TIMESTAMPLTZ,TIMESTAMPNTZ,TIMESTAMPTZ,TIMESTAMP_LTZ,TIMESTAMP_NTZ,TIMESTAMP_TZ,TINYINT,"
- + "VARBINARY,VARIANT,ACCOUNTS,ACTION,ACTIVATE,ASC,AUTOINCREMENT,BEFORE,"
- + "BUILTIN,BYTE,CACHE,CHANGE,CLEAREPCACHE,CLONE,CLUSTER,CLUSTERS,COLUMNS,COMMENT,"
- + "COMPRESSION,CONSTRAINTS,COPY,CP,CREDENTIALS,D,DATA,DATABASES,DEFERRABLE,"
- + "DEFERRED,DELIMITED,DESC,DIRECTORY,DISABLE,DUAL,ENABLE,ENFORCED,"
- + "EXCLUSIVE,EXPLAIN,EXPORTED,FAIL,FIELDS,FILE,FILES,FIRST,FN,FORCE,FORMAT,"
- + "FORMATS,FUNCTIONS,GRANTS,GSINSTANCE,GSINSTANCES,HELP,HIBERNATE,HINTS,"
- + "HISTORY,IDENTIFIED,IMMUTABLE,IMPORTED,INCIDENT,INCIDENTS,INFO,INITIALLY,"
- + "ISSUES,KEEP,KEY,KEYS,LAST,LIMIT,LIST,LOAD,LOCATION,LOCK,LOCKS,LS,MANAGE,MAP,MATCHED,"
- + "MATERIALIZED,MODIFY,MONITOR,MONITORS,NAME,NETWORK,NEXT,NORELY,NOTIFY,NOVALIDATE,NULLS,OBJECTS,"
- + "OFFSET,OJ,OPERATE,OPERATION,OPTION,OWNERSHIP,PARAMETERS,PARTIAL,"
- + "PERCENT,PLAN,PLUS,POLICIES,POLICY,POOL,PRESERVE,PRIVILEGES,PUBLIC,PURGE,PUT,QUIESCE,"
- + "READ,RECLUSTER,REFERENCE,RELY,REMOVE,RENAME,REPLACE,REPLACE_FAIL,RESOURCE,"
- + "RESTART,RESTORE,RESTRICT,RESUME,REWRITE,RM,ROLE,ROLES,RULE,SAMPLE,SCHEMAS,SEMI,"
- + "SEQUENCE,SEQUENCES,SERVER,SERVERS,SESSION,SETLOGLEVEL,SETS,SFC,SHARE,SHARED,SHARES,SHOW,SHUTDOWN,SIMPLE,SORT,"
- + "STAGE,STAGES,STATEMENT,STATISTICS,STOP,STORED,STRICT,STRUCT,SUSPEND,SUSPEND_IMMEDIATE,SWAP,SWITCH,T,"
- + "TABLES,TEMP,TEMPORARY,TRANSACTION,TRANSACTIONS,TRANSIENT,TRIGGERS,TRUNCATE,TS,TYPE,UNDROP,UNLOCK,UNSET,"
- + "UPGRADE,USAGE,USE,USERS,UTC,UTCTIMESTAMP,VALIDATE,VARIABLES,VERSION,VIEWS,VOLATILE,VOLUME,"
- + "VOLUMES,WAREHOUSE,WAREHOUSES,WARN,WORK,WRITE,ZONE,INCREMENT,MINUS,REGEXP,RLIKE";
+ String.join(
+ ",",
+ "ACCOUNT",
+ "ASOF",
+ "BIT",
+ "BYTEINT",
+ "CONNECTION",
+ "DATABASE",
+ "DATETIME",
+ "DATE_PART",
+ "FIXED",
+ "FOLLOWING",
+ "GSCLUSTER",
+ "GSPACKAGE",
+ "IDENTIFIER",
+ "ILIKE",
+ "INCREMENT",
+ "ISSUE",
+ "LONG",
+ "MAP",
+ "MATCH_CONDITION",
+ "MINUS",
+ "NUMBER",
+ "OBJECT",
+ "ORGANIZATION",
+ "QUALIFY",
+ "REFERENCE",
+ "REGEXP",
+ "RLIKE",
+ "SAMPLE",
+ "SCHEMA",
+ "STRING",
+ "TEXT",
+ "TIMESTAMPLTZ",
+ "TIMESTAMPNTZ",
+ "TIMESTAMPTZ",
+ "TIMESTAMP_LTZ",
+ "TIMESTAMP_NTZ",
+ "TIMESTAMP_TZ",
+ "TINYINT",
+ "TRANSIT",
+ "TRY_CAST",
+ "VARIANT",
+ "VECTOR",
+ "VIEW");
+
+ private static final String MAX_VARCHAR_BINARY_SIZE_PARAM_NAME =
+ "VARCHAR_AND_BINARY_MAX_SIZE_IN_RESULT";
+
+ // Defaults to 16MB
+ private static final int DEFAULT_MAX_LOB_SIZE = 16777216;
private final Connection connection;
@@ -138,7 +169,7 @@ public class SnowflakeDatabaseMetaData implements DatabaseMetaData {
private boolean isPatternMatchingEnabled = true;
SnowflakeDatabaseMetaData(Connection connection) throws SQLException {
- logger.debug("public SnowflakeDatabaseMetaData(SnowflakeConnection connection)", false);
+ logger.trace("SnowflakeDatabaseMetaData(SnowflakeConnection connection)", false);
this.connection = connection;
this.session = connection.unwrap(SnowflakeConnectionV1.class).getSFBaseSession();
@@ -249,21 +280,21 @@ private boolean isSchemaNameWildcardPattern(String inputString) {
@Override
public boolean allProceduresAreCallable() throws SQLException {
- logger.debug("public boolean allProceduresAreCallable()", false);
+ logger.trace("boolean allProceduresAreCallable()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean allTablesAreSelectable() throws SQLException {
- logger.debug("public boolean allTablesAreSelectable()", false);
+ logger.trace("boolean allTablesAreSelectable()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public String getURL() throws SQLException {
- logger.debug("public String getURL()", false);
+ logger.trace("String getURL()", false);
raiseSQLExceptionIfConnectionIsClosed();
String url = session.getUrl();
return url.startsWith("http://")
@@ -273,14 +304,14 @@ public String getURL() throws SQLException {
@Override
public String getUserName() throws SQLException {
- logger.debug("public String getUserName()", false);
+ logger.trace("String getUserName()", false);
raiseSQLExceptionIfConnectionIsClosed();
return session.getUser();
}
@Override
public boolean isReadOnly() throws SQLException {
- logger.debug("public boolean isReadOnly()", false);
+ logger.trace("boolean isReadOnly()", false);
raiseSQLExceptionIfConnectionIsClosed();
// no read only mode is supported.
return false;
@@ -288,56 +319,56 @@ public boolean isReadOnly() throws SQLException {
@Override
public boolean nullsAreSortedHigh() throws SQLException {
- logger.debug("public boolean nullsAreSortedHigh()", false);
+ logger.trace("boolean nullsAreSortedHigh()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean nullsAreSortedLow() throws SQLException {
- logger.debug("public boolean nullsAreSortedLow()", false);
+ logger.trace("boolean nullsAreSortedLow()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean nullsAreSortedAtStart() throws SQLException {
- logger.debug("public boolean nullsAreSortedAtStart()", false);
+ logger.trace("boolean nullsAreSortedAtStart()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean nullsAreSortedAtEnd() throws SQLException {
- logger.debug("public boolean nullsAreSortedAtEnd()", false);
+ logger.trace("boolean nullsAreSortedAtEnd()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public String getDatabaseProductName() throws SQLException {
- logger.debug("public String getDatabaseProductName()", false);
+ logger.trace("String getDatabaseProductName()", false);
raiseSQLExceptionIfConnectionIsClosed();
return DatabaseProductName;
}
@Override
public String getDatabaseProductVersion() throws SQLException {
- logger.debug("public String getDatabaseProductVersion()", false);
+ logger.trace("String getDatabaseProductVersion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return connection.unwrap(SnowflakeConnectionV1.class).getDatabaseVersion();
}
@Override
public String getDriverName() throws SQLException {
- logger.debug("public String getDriverName()", false);
+ logger.trace("String getDriverName()", false);
raiseSQLExceptionIfConnectionIsClosed();
return DriverName;
}
@Override
public String getDriverVersion() throws SQLException {
- logger.debug("public String getDriverVersion()", false);
+ logger.trace("String getDriverVersion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return SnowflakeDriver.majorVersion
+ "."
@@ -348,705 +379,708 @@ public String getDriverVersion() throws SQLException {
@Override
public int getDriverMajorVersion() {
- logger.debug("public int getDriverMajorVersion()", false);
+ logger.trace("int getDriverMajorVersion()", false);
return SnowflakeDriver.majorVersion;
}
@Override
public int getDriverMinorVersion() {
- logger.debug("public int getDriverMinorVersion()", false);
+ logger.trace("int getDriverMinorVersion()", false);
return SnowflakeDriver.minorVersion;
}
@Override
public boolean usesLocalFiles() throws SQLException {
- logger.debug("public boolean usesLocalFiles()", false);
+ logger.trace("boolean usesLocalFiles()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean usesLocalFilePerTable() throws SQLException {
- logger.debug("public boolean usesLocalFilePerTable()", false);
+ logger.trace("boolean usesLocalFilePerTable()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsMixedCaseIdentifiers() throws SQLException {
- logger.debug("public boolean supportsMixedCaseIdentifiers()", false);
+ logger.trace("boolean supportsMixedCaseIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean storesUpperCaseIdentifiers() throws SQLException {
- logger.debug("public boolean storesUpperCaseIdentifiers()", false);
+ logger.trace("boolean storesUpperCaseIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean storesLowerCaseIdentifiers() throws SQLException {
- logger.debug("public boolean storesLowerCaseIdentifiers()", false);
+ logger.trace("boolean storesLowerCaseIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean storesMixedCaseIdentifiers() throws SQLException {
- logger.debug("public boolean storesMixedCaseIdentifiers()", false);
+ logger.trace("boolean storesMixedCaseIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsMixedCaseQuotedIdentifiers() throws SQLException {
- logger.debug("public boolean supportsMixedCaseQuotedIdentifiers()", false);
+ logger.trace("boolean supportsMixedCaseQuotedIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean storesUpperCaseQuotedIdentifiers() throws SQLException {
- logger.debug("public boolean storesUpperCaseQuotedIdentifiers()", false);
+ logger.trace("boolean storesUpperCaseQuotedIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean storesLowerCaseQuotedIdentifiers() throws SQLException {
- logger.debug("public boolean storesLowerCaseQuotedIdentifiers()", false);
+ logger.trace("boolean storesLowerCaseQuotedIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean storesMixedCaseQuotedIdentifiers() throws SQLException {
- logger.debug("public boolean storesMixedCaseQuotedIdentifiers()", false);
+ logger.trace("boolean storesMixedCaseQuotedIdentifiers()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public String getIdentifierQuoteString() throws SQLException {
- logger.debug("public String getIdentifierQuoteString()", false);
+ logger.trace("String getIdentifierQuoteString()", false);
raiseSQLExceptionIfConnectionIsClosed();
return "\"";
}
@Override
public String getSQLKeywords() throws SQLException {
- logger.debug("public String getSQLKeywords()", false);
+ logger.trace("String getSQLKeywords()", false);
raiseSQLExceptionIfConnectionIsClosed();
return notSQL2003Keywords;
}
@Override
public String getNumericFunctions() throws SQLException {
- logger.debug("public String getNumericFunctions()", false);
+ logger.trace("String getNumericFunctions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return NumericFunctionsSupported;
}
@Override
public String getStringFunctions() throws SQLException {
- logger.debug("public String getStringFunctions()", false);
+ logger.trace("String getStringFunctions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return StringFunctionsSupported;
}
@Override
public String getSystemFunctions() throws SQLException {
- logger.debug("public String getSystemFunctions()", false);
+ logger.trace("String getSystemFunctions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return SystemFunctionsSupported;
}
@Override
public String getTimeDateFunctions() throws SQLException {
- logger.debug("public String getTimeDateFunctions()", false);
+ logger.trace("String getTimeDateFunctions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return DateAndTimeFunctionsSupported;
}
@Override
public String getSearchStringEscape() throws SQLException {
- logger.debug("public String getSearchStringEscape()", false);
+ logger.trace("String getSearchStringEscape()", false);
raiseSQLExceptionIfConnectionIsClosed();
return Character.toString(SEARCH_STRING_ESCAPE);
}
@Override
public String getExtraNameCharacters() throws SQLException {
- logger.debug("public String getExtraNameCharacters()", false);
+ logger.trace("String getExtraNameCharacters()", false);
raiseSQLExceptionIfConnectionIsClosed();
return "$";
}
@Override
public boolean supportsAlterTableWithAddColumn() throws SQLException {
- logger.debug("public boolean supportsAlterTableWithAddColumn()", false);
+ logger.trace("boolean supportsAlterTableWithAddColumn()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsAlterTableWithDropColumn() throws SQLException {
- logger.debug("public boolean supportsAlterTableWithDropColumn()", false);
+ logger.trace("boolean supportsAlterTableWithDropColumn()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsColumnAliasing() throws SQLException {
- logger.debug("public boolean supportsColumnAliasing()", false);
+ logger.trace("boolean supportsColumnAliasing()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean nullPlusNonNullIsNull() throws SQLException {
- logger.debug("public boolean nullPlusNonNullIsNull()", false);
+ logger.trace("boolean nullPlusNonNullIsNull()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsConvert() throws SQLException {
- logger.debug("public boolean supportsConvert()", false);
+ logger.trace("boolean supportsConvert()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsConvert(int fromType, int toType) throws SQLException {
- logger.debug("public boolean supportsConvert(int fromType, int toType)", false);
+ logger.trace("boolean supportsConvert(int fromType, int toType)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsTableCorrelationNames() throws SQLException {
- logger.debug("public boolean supportsTableCorrelationNames()", false);
+ logger.trace("boolean supportsTableCorrelationNames()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsDifferentTableCorrelationNames() throws SQLException {
- logger.debug("public boolean supportsDifferentTableCorrelationNames()", false);
+ logger.trace("boolean supportsDifferentTableCorrelationNames()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsExpressionsInOrderBy() throws SQLException {
- logger.debug("public boolean supportsExpressionsInOrderBy()", false);
+ logger.trace("boolean supportsExpressionsInOrderBy()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsOrderByUnrelated() throws SQLException {
- logger.debug("public boolean supportsOrderByUnrelated()", false);
+ logger.trace("boolean supportsOrderByUnrelated()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsGroupBy() throws SQLException {
- logger.debug("public boolean supportsGroupBy()", false);
+ logger.trace("boolean supportsGroupBy()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsGroupByUnrelated() throws SQLException {
- logger.debug("public boolean supportsGroupByUnrelated()", false);
+ logger.trace("boolean supportsGroupByUnrelated()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsGroupByBeyondSelect() throws SQLException {
- logger.debug("public boolean supportsGroupByBeyondSelect()", false);
+ logger.trace("boolean supportsGroupByBeyondSelect()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsLikeEscapeClause() throws SQLException {
- logger.debug("public boolean supportsLikeEscapeClause()", false);
+ logger.trace("boolean supportsLikeEscapeClause()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsMultipleResultSets() throws SQLException {
- logger.debug("public boolean supportsMultipleResultSets()", false);
+ logger.trace("boolean supportsMultipleResultSets()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsMultipleTransactions() throws SQLException {
- logger.debug("public boolean supportsMultipleTransactions()", false);
+ logger.trace("boolean supportsMultipleTransactions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsNonNullableColumns() throws SQLException {
- logger.debug("public boolean supportsNonNullableColumns()", false);
+ logger.trace("boolean supportsNonNullableColumns()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsMinimumSQLGrammar() throws SQLException {
- logger.debug("public boolean supportsMinimumSQLGrammar()", false);
+ logger.trace("boolean supportsMinimumSQLGrammar()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsCoreSQLGrammar() throws SQLException {
- logger.debug("public boolean supportsCoreSQLGrammar()", false);
+ logger.trace("boolean supportsCoreSQLGrammar()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsExtendedSQLGrammar() throws SQLException {
- logger.debug("public boolean supportsExtendedSQLGrammar()", false);
+ logger.trace("boolean supportsExtendedSQLGrammar()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsANSI92EntryLevelSQL() throws SQLException {
- logger.debug("public boolean supportsANSI92EntryLevelSQL()", false);
+ logger.trace("boolean supportsANSI92EntryLevelSQL()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsANSI92IntermediateSQL() throws SQLException {
- logger.debug("public boolean supportsANSI92IntermediateSQL()", false);
+ logger.trace("boolean supportsANSI92IntermediateSQL()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsANSI92FullSQL() throws SQLException {
- logger.debug("public boolean supportsANSI92FullSQL()", false);
+ logger.trace("boolean supportsANSI92FullSQL()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsIntegrityEnhancementFacility() throws SQLException {
- logger.debug("public boolean supportsIntegrityEnhancementFacility()", false);
+ logger.trace("boolean supportsIntegrityEnhancementFacility()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsOuterJoins() throws SQLException {
- logger.debug("public boolean supportsOuterJoins()", false);
+ logger.trace("boolean supportsOuterJoins()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsFullOuterJoins() throws SQLException {
- logger.debug("public boolean supportsFullOuterJoins()", false);
+ logger.trace("boolean supportsFullOuterJoins()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsLimitedOuterJoins() throws SQLException {
- logger.debug("public boolean supportsLimitedOuterJoins()", false);
+ logger.trace("boolean supportsLimitedOuterJoins()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public String getSchemaTerm() throws SQLException {
- logger.debug("public String getSchemaTerm()", false);
+ logger.trace("String getSchemaTerm()", false);
raiseSQLExceptionIfConnectionIsClosed();
return "schema";
}
@Override
public String getProcedureTerm() throws SQLException {
- logger.debug("public String getProcedureTerm()", false);
+ logger.trace("String getProcedureTerm()", false);
raiseSQLExceptionIfConnectionIsClosed();
return "procedure";
}
@Override
public String getCatalogTerm() throws SQLException {
- logger.debug("public String getCatalogTerm()", false);
+ logger.trace("String getCatalogTerm()", false);
raiseSQLExceptionIfConnectionIsClosed();
return "database";
}
@Override
public boolean isCatalogAtStart() throws SQLException {
- logger.debug("public boolean isCatalogAtStart()", false);
+ logger.trace("boolean isCatalogAtStart()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public String getCatalogSeparator() throws SQLException {
- logger.debug("public String getCatalogSeparator()", false);
+ logger.trace("String getCatalogSeparator()", false);
raiseSQLExceptionIfConnectionIsClosed();
return ".";
}
@Override
public boolean supportsSchemasInDataManipulation() throws SQLException {
- logger.debug("public boolean supportsSchemasInDataManipulation()", false);
+ logger.trace("boolean supportsSchemasInDataManipulation()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsSchemasInProcedureCalls() throws SQLException {
- logger.debug("public boolean supportsSchemasInProcedureCalls()", false);
+ logger.trace("boolean supportsSchemasInProcedureCalls()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsSchemasInTableDefinitions() throws SQLException {
- logger.debug("public boolean supportsSchemasInTableDefinitions()", false);
+ logger.trace("boolean supportsSchemasInTableDefinitions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsSchemasInIndexDefinitions() throws SQLException {
- logger.debug("public boolean supportsSchemasInIndexDefinitions()", false);
+ logger.trace("boolean supportsSchemasInIndexDefinitions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsSchemasInPrivilegeDefinitions() throws SQLException {
- logger.debug("public boolean supportsSchemasInPrivilegeDefinitions()", false);
+ logger.trace("boolean supportsSchemasInPrivilegeDefinitions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsCatalogsInDataManipulation() throws SQLException {
- logger.debug("public boolean supportsCatalogsInDataManipulation()", false);
+ logger.trace("boolean supportsCatalogsInDataManipulation()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsCatalogsInProcedureCalls() throws SQLException {
- logger.debug("public boolean supportsCatalogsInProcedureCalls()", false);
+ logger.trace("boolean supportsCatalogsInProcedureCalls()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsCatalogsInTableDefinitions() throws SQLException {
- logger.debug("public boolean supportsCatalogsInTableDefinitions()", false);
+ logger.trace("boolean supportsCatalogsInTableDefinitions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsCatalogsInIndexDefinitions() throws SQLException {
- logger.debug("public boolean supportsCatalogsInIndexDefinitions()", false);
+ logger.trace("boolean supportsCatalogsInIndexDefinitions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsCatalogsInPrivilegeDefinitions() throws SQLException {
- logger.debug("public boolean supportsCatalogsInPrivilegeDefinitions()", false);
+ logger.trace("boolean supportsCatalogsInPrivilegeDefinitions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsPositionedDelete() throws SQLException {
- logger.debug("public boolean supportsPositionedDelete()", false);
+ logger.trace("boolean supportsPositionedDelete()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsPositionedUpdate() throws SQLException {
- logger.debug("public boolean supportsPositionedUpdate()", false);
+ logger.trace("boolean supportsPositionedUpdate()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsSelectForUpdate() throws SQLException {
- logger.debug("public boolean supportsSelectForUpdate()", false);
+ logger.trace("boolean supportsSelectForUpdate()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsStoredProcedures() throws SQLException {
- logger.debug("public boolean supportsStoredProcedures()", false);
+ logger.trace("boolean supportsStoredProcedures()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsSubqueriesInComparisons() throws SQLException {
- logger.debug("public boolean supportsSubqueriesInComparisons()", false);
+ logger.trace("boolean supportsSubqueriesInComparisons()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsSubqueriesInExists() throws SQLException {
- logger.debug("public boolean supportsSubqueriesInExists()", false);
+ logger.trace("boolean supportsSubqueriesInExists()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsSubqueriesInIns() throws SQLException {
- logger.debug("public boolean supportsSubqueriesInIns()", false);
+ logger.trace("boolean supportsSubqueriesInIns()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsSubqueriesInQuantifieds() throws SQLException {
- logger.debug("public boolean supportsSubqueriesInQuantifieds()", false);
+ logger.trace("boolean supportsSubqueriesInQuantifieds()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsCorrelatedSubqueries() throws SQLException {
- logger.debug("public boolean supportsCorrelatedSubqueries()", false);
+ logger.trace("boolean supportsCorrelatedSubqueries()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsUnion() throws SQLException {
- logger.debug("public boolean supportsUnion()", false);
+ logger.trace("boolean supportsUnion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsUnionAll() throws SQLException {
- logger.debug("public boolean supportsUnionAll()", false);
+ logger.trace("boolean supportsUnionAll()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsOpenCursorsAcrossCommit() throws SQLException {
- logger.debug("public boolean supportsOpenCursorsAcrossCommit()", false);
+ logger.trace("boolean supportsOpenCursorsAcrossCommit()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsOpenCursorsAcrossRollback() throws SQLException {
- logger.debug("public boolean supportsOpenCursorsAcrossRollback()", false);
+ logger.trace("boolean supportsOpenCursorsAcrossRollback()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsOpenStatementsAcrossCommit() throws SQLException {
- logger.debug("public boolean supportsOpenStatementsAcrossCommit()", false);
+ logger.trace("boolean supportsOpenStatementsAcrossCommit()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsOpenStatementsAcrossRollback() throws SQLException {
- logger.debug("public boolean supportsOpenStatementsAcrossRollback()", false);
+ logger.trace("boolean supportsOpenStatementsAcrossRollback()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public int getMaxBinaryLiteralLength() throws SQLException {
- logger.debug("public int getMaxBinaryLiteralLength()", false);
+ logger.trace("int getMaxBinaryLiteralLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
- return 8388608;
+ return getMaxCharLiteralLength() / 2; // hex instead of octal, thus divided by 2
}
@Override
public int getMaxCharLiteralLength() throws SQLException {
- logger.debug("public int getMaxCharLiteralLength()", false);
+ logger.trace("int getMaxCharLiteralLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
- return 16777216;
+ Optional maxLiteralLengthFromSession =
+ Optional.ofNullable(
+ (Integer) session.getOtherParameter(MAX_VARCHAR_BINARY_SIZE_PARAM_NAME));
+ return maxLiteralLengthFromSession.orElse(DEFAULT_MAX_LOB_SIZE);
}
@Override
public int getMaxColumnNameLength() throws SQLException {
- logger.debug("public int getMaxColumnNameLength()", false);
+ logger.trace("int getMaxColumnNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 255;
}
@Override
public int getMaxColumnsInGroupBy() throws SQLException {
- logger.debug("public int getMaxColumnsInGroupBy()", false);
+ logger.trace("int getMaxColumnsInGroupBy()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxColumnsInIndex() throws SQLException {
- logger.debug("public int getMaxColumnsInIndex()", false);
+ logger.trace("int getMaxColumnsInIndex()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxColumnsInOrderBy() throws SQLException {
- logger.debug("public int getMaxColumnsInOrderBy()", false);
+ logger.trace("int getMaxColumnsInOrderBy()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxColumnsInSelect() throws SQLException {
- logger.debug("public int getMaxColumnsInSelect()", false);
+ logger.trace("int getMaxColumnsInSelect()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxColumnsInTable() throws SQLException {
- logger.debug("public int getMaxColumnsInTable()", false);
+ logger.trace("int getMaxColumnsInTable()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxConnections() throws SQLException {
- logger.debug("public int getMaxConnections()", false);
+ logger.trace("int getMaxConnections()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxCursorNameLength() throws SQLException {
- logger.debug("public int getMaxCursorNameLength()", false);
+ logger.trace("int getMaxCursorNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxIndexLength() throws SQLException {
- logger.debug("public int getMaxIndexLength()", false);
+ logger.trace("int getMaxIndexLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxSchemaNameLength() throws SQLException {
- logger.debug("public int getMaxSchemaNameLength()", false);
+ logger.trace("int getMaxSchemaNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 255;
}
@Override
public int getMaxProcedureNameLength() throws SQLException {
- logger.debug("public int getMaxProcedureNameLength()", false);
+ logger.trace("int getMaxProcedureNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxCatalogNameLength() throws SQLException {
- logger.debug("public int getMaxCatalogNameLength()", false);
+ logger.trace("int getMaxCatalogNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 255;
}
@Override
public int getMaxRowSize() throws SQLException {
- logger.debug("public int getMaxRowSize()", false);
+ logger.trace("int getMaxRowSize()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public boolean doesMaxRowSizeIncludeBlobs() throws SQLException {
- logger.debug("public boolean doesMaxRowSizeIncludeBlobs()", false);
+ logger.trace("boolean doesMaxRowSizeIncludeBlobs()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public int getMaxStatementLength() throws SQLException {
- logger.debug("public int getMaxStatementLength()", false);
+ logger.trace("int getMaxStatementLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxStatements() throws SQLException {
- logger.debug("public int getMaxStatements()", false);
+ logger.trace("int getMaxStatements()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxTableNameLength() throws SQLException {
- logger.debug("public int getMaxTableNameLength()", false);
+ logger.trace("int getMaxTableNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 255;
}
@Override
public int getMaxTablesInSelect() throws SQLException {
- logger.debug("public int getMaxTablesInSelect()", false);
+ logger.trace("int getMaxTablesInSelect()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 0;
}
@Override
public int getMaxUserNameLength() throws SQLException {
- logger.debug("public int getMaxUserNameLength()", false);
+ logger.trace("int getMaxUserNameLength()", false);
raiseSQLExceptionIfConnectionIsClosed();
return 255;
}
@Override
public int getDefaultTransactionIsolation() throws SQLException {
- logger.debug("public int getDefaultTransactionIsolation()", false);
+ logger.trace("int getDefaultTransactionIsolation()", false);
raiseSQLExceptionIfConnectionIsClosed();
return Connection.TRANSACTION_READ_COMMITTED;
}
@Override
public boolean supportsTransactions() throws SQLException {
- logger.debug("public boolean supportsTransactions()", false);
+ logger.trace("boolean supportsTransactions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsTransactionIsolationLevel(int level) throws SQLException {
- logger.debug("public boolean supportsTransactionIsolationLevel(int level)", false);
+ logger.trace("boolean supportsTransactionIsolationLevel(int level)", false);
raiseSQLExceptionIfConnectionIsClosed();
return (level == Connection.TRANSACTION_NONE)
|| (level == Connection.TRANSACTION_READ_COMMITTED);
@@ -1054,29 +1088,28 @@ public boolean supportsTransactionIsolationLevel(int level) throws SQLException
@Override
public boolean supportsDataDefinitionAndDataManipulationTransactions() throws SQLException {
- logger.debug(
- "public boolean " + "supportsDataDefinitionAndDataManipulationTransactions()", false);
+ logger.trace("boolean supportsDataDefinitionAndDataManipulationTransactions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean supportsDataManipulationTransactionsOnly() throws SQLException {
- logger.debug("public boolean supportsDataManipulationTransactionsOnly()", false);
+ logger.trace("boolean supportsDataManipulationTransactionsOnly()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean dataDefinitionCausesTransactionCommit() throws SQLException {
- logger.debug("public boolean dataDefinitionCausesTransactionCommit()", false);
+ logger.trace("boolean dataDefinitionCausesTransactionCommit()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean dataDefinitionIgnoredInTransactions() throws SQLException {
- logger.debug("public boolean dataDefinitionIgnoredInTransactions()", false);
+ logger.trace("boolean dataDefinitionIgnoredInTransactions()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@@ -1087,7 +1120,7 @@ public ResultSet getProcedures(
throws SQLException {
raiseSQLExceptionIfConnectionIsClosed();
Statement statement = connection.createStatement();
- logger.debug(
+ logger.trace(
"public ResultSet getProcedures(String catalog, "
+ "String schemaPattern,String procedureNamePattern)",
false);
@@ -1109,7 +1142,7 @@ public ResultSet getProcedures(
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_PROCEDURES, resultSet, statement) {
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// iterate throw the show table result until we find an entry
@@ -1125,7 +1158,7 @@ public boolean next() throws SQLException {
|| compiledProcedurePattern.matcher(procedureName).matches())
&& (compiledSchemaPattern == null
|| compiledSchemaPattern.matcher(schemaName).matches())) {
- logger.debug("Found a matched function:" + schemaName + "." + procedureName);
+ logger.trace("Found a matched function:" + schemaName + "." + procedureName);
nextRow[0] = catalogName;
nextRow[1] = schemaName;
@@ -1149,7 +1182,7 @@ public ResultSet getProcedureColumns(
final String procedureNamePattern,
final String columnNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getProcedureColumns(String catalog, "
+ "String schemaPattern,String procedureNamePattern,"
+ "String columnNamePattern)",
@@ -1325,9 +1358,9 @@ else if (i == 0) {
typeName.substring(typeName.indexOf('(') + 1, typeName.indexOf(')')));
nextRow[16] = char_octet_len;
} else if (type == Types.CHAR || type == Types.VARCHAR) {
- nextRow[16] = 16777216;
+ nextRow[16] = getMaxCharLiteralLength();
} else if (type == Types.BINARY || type == Types.VARBINARY) {
- nextRow[16] = 8388608;
+ nextRow[16] = getMaxBinaryLiteralLength();
}
} else {
nextRow[16] = null;
@@ -1407,7 +1440,7 @@ private String getFirstResultSetCommand(
showProcedureCommand += " in schema \"" + catalogEscaped + "\".\"" + schemaPattern + "\"";
}
}
- logger.debug("sql command to get column metadata: {}", showProcedureCommand);
+ logger.debug("Sql command to get column metadata: {}", showProcedureCommand);
return showProcedureCommand;
}
@@ -1441,7 +1474,7 @@ public ResultSet getTables(
final String tableNamePattern,
final String[] types)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getTables(String catalog={}, String "
+ "schemaPattern={}, String tableNamePattern={}, String[] types={})",
originalCatalog,
@@ -1525,7 +1558,7 @@ public ResultSet getTables(
}
}
- logger.debug("sql command to get table metadata: {}", showTablesCommand);
+ logger.debug("Sql command to get table metadata: {}", showTablesCommand);
resultSet = executeAndReturnEmptyResultIfNotFound(statement, showTablesCommand, GET_TABLES);
sendInBandTelemetryMetadataMetrics(
@@ -1539,7 +1572,7 @@ public ResultSet getTables(
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_TABLES, resultSet, statement) {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// iterate throw the show table result until we find an entry
@@ -1589,14 +1622,14 @@ public boolean next() throws SQLException {
@Override
public ResultSet getSchemas() throws SQLException {
- logger.debug("public ResultSet getSchemas()", false);
+ logger.trace("ResultSet getSchemas()", false);
return getSchemas(null, null);
}
@Override
public ResultSet getCatalogs() throws SQLException {
- logger.debug("public ResultSet getCatalogs()", false);
+ logger.trace("ResultSet getCatalogs()", false);
raiseSQLExceptionIfConnectionIsClosed();
String showDB = "show /* JDBC:DatabaseMetaData.getCatalogs() */ databases in account";
@@ -1606,7 +1639,7 @@ public ResultSet getCatalogs() throws SQLException {
GET_CATALOGS, statement.executeQuery(showDB), statement) {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// iterate throw the show databases result
@@ -1624,7 +1657,7 @@ public boolean next() throws SQLException {
@Override
public ResultSet getTableTypes() throws SQLException {
- logger.debug("public ResultSet getTableTypes()", false);
+ logger.trace("ResultSet getTableTypes()", false);
raiseSQLExceptionIfConnectionIsClosed();
Statement statement = connection.createStatement();
@@ -1654,7 +1687,7 @@ public ResultSet getColumns(
final String columnNamePattern,
final boolean extendedSet)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getColumns(String catalog={}, String schemaPattern={}, "
+ "String tableNamePattern={}, String columnNamePattern={}, boolean extendedSet={}",
originalCatalog,
@@ -1716,7 +1749,7 @@ public ResultSet getColumns(
}
}
- logger.debug("sql command to get column metadata: {}", showColumnsCommand);
+ logger.debug("Sql command to get column metadata: {}", showColumnsCommand);
ResultSet resultSet =
executeAndReturnEmptyResultIfNotFound(
@@ -1736,7 +1769,7 @@ public ResultSet getColumns(
String currentTableName = null;
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// iterate throw the show table result until we find an entry
@@ -1789,13 +1822,13 @@ public boolean next() throws SQLException {
"error parsing data type: " + dataTypeStr);
}
- logger.debug("data type string: {}", dataTypeStr);
+ logger.debug("Data type string: {}", dataTypeStr);
SnowflakeColumnMetadata columnMetadata =
SnowflakeUtil.extractColumnMetadata(
jsonNode, session.isJdbcTreatDecimalAsInt(), session);
- logger.debug("nullable: {}", columnMetadata.isNullable());
+ logger.debug("Nullable: {}", columnMetadata.isNullable());
// SNOW-16881: add catalog name
nextRow[0] = catalogName;
@@ -1842,6 +1875,9 @@ public boolean next() throws SQLException {
|| columnMetadata.getType() == Types.TIME
|| columnMetadata.getType() == Types.TIMESTAMP) {
columnSize = columnMetadata.getPrecision();
+ } else if (columnMetadata.getType() == SnowflakeUtil.EXTRA_TYPES_VECTOR) {
+ // For VECTOR Snowflake type we consider dimension as the column size
+ columnSize = columnMetadata.getDimension();
}
nextRow[6] = columnSize;
@@ -1850,7 +1886,7 @@ public boolean next() throws SQLException {
nextRow[9] = null;
nextRow[10] = (columnMetadata.isNullable() ? columnNullable : columnNoNulls);
- logger.debug("returning nullable: {}", nextRow[10]);
+ logger.debug("Returning nullable: {}", nextRow[10]);
nextRow[11] = comment;
nextRow[12] = defaultValue;
@@ -1886,7 +1922,7 @@ public boolean next() throws SQLException {
@Override
public ResultSet getColumnPrivileges(
String catalog, String schema, String table, String columnNamePattern) throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getColumnPrivileges(String catalog, "
+ "String schema,String table, String columnNamePattern)",
false);
@@ -1921,7 +1957,7 @@ public ResultSet getColumnPrivileges(
public ResultSet getTablePrivileges(
String originalCatalog, String originalSchemaPattern, final String tableNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getTablePrivileges(String catalog, "
+ "String schemaPattern,String tableNamePattern)",
false);
@@ -1982,7 +2018,7 @@ public ResultSet getTablePrivileges(
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_TABLE_PRIVILEGES, resultSet, statement) {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
while (showObjectResultSet.next()) {
@@ -2021,7 +2057,7 @@ public boolean next() throws SQLException {
public ResultSet getBestRowIdentifier(
String catalog, String schema, String table, int scope, boolean nullable)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getBestRowIdentifier(String catalog, "
+ "String schema,String table, int scope,boolean nullable)",
false);
@@ -2031,7 +2067,7 @@ public ResultSet getBestRowIdentifier(
@Override
public ResultSet getVersionColumns(String catalog, String schema, String table)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getVersionColumns(String catalog, " + "String schema, String table)",
false);
@@ -2041,7 +2077,7 @@ public ResultSet getVersionColumns(String catalog, String schema, String table)
@Override
public ResultSet getPrimaryKeys(String originalCatalog, String originalSchema, final String table)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getPrimaryKeys(String catalog={}, "
+ "String schema={}, String table={})",
originalCatalog,
@@ -2097,7 +2133,7 @@ public ResultSet getPrimaryKeys(String originalCatalog, String originalSchema, f
final String schemaIn = schema;
final String tableIn = table;
- logger.debug("sql command to get primary key metadata: {}", showPKCommand);
+ logger.debug("Sql command to get primary key metadata: {}", showPKCommand);
ResultSet resultSet =
executeAndReturnEmptyResultIfNotFound(statement, showPKCommand, GET_PRIMARY_KEYS);
sendInBandTelemetryMetadataMetrics(
@@ -2106,7 +2142,7 @@ public ResultSet getPrimaryKeys(String originalCatalog, String originalSchema, f
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_PRIMARY_KEYS, resultSet, statement) {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
while (showObjectResultSet.next()) {
@@ -2292,7 +2328,7 @@ private ResultSet getForeignKeys(
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_FOREIGN_KEYS, resultSet, statement) {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
while (showObjectResultSet.next()) {
@@ -2538,7 +2574,7 @@ private short getForeignKeyConstraintProperty(String property_name, String prope
@Override
public ResultSet getImportedKeys(String originalCatalog, String originalSchema, String table)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getImportedKeys(String catalog={}, "
+ "String schema={}, String table={})",
originalCatalog,
@@ -2556,7 +2592,7 @@ public ResultSet getImportedKeys(String originalCatalog, String originalSchema,
@Override
public ResultSet getExportedKeys(String catalog, String schema, String table)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getExportedKeys(String catalog={}, "
+ "String schema={}, String table={})",
catalog,
@@ -2579,7 +2615,7 @@ public ResultSet getCrossReference(
String foreignSchema,
String foreignTable)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getCrossReference(String parentCatalog={}, "
+ "String parentSchema={}, String parentTable={}, "
+ "String foreignCatalog={}, String foreignSchema={}, "
@@ -2607,7 +2643,7 @@ public ResultSet getCrossReference(
@Override
public ResultSet getTypeInfo() throws SQLException {
- logger.debug("public ResultSet getTypeInfo()", false);
+ logger.trace("ResultSet getTypeInfo()", false);
raiseSQLExceptionIfConnectionIsClosed();
Statement statement = connection.createStatement();
@@ -2832,7 +2868,7 @@ public ResultSet getTypeInfo() throws SQLException {
*/
public ResultSet getStreams(
String originalCatalog, String originalSchemaPattern, String streamName) throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getStreams(String catalog={}, String schemaPattern={}"
+ "String streamName={}",
originalCatalog,
@@ -2876,7 +2912,7 @@ public ResultSet getStreams(
}
}
- logger.debug("sql command to get stream metadata: {}", showStreamsCommand);
+ logger.debug("Sql command to get stream metadata: {}", showStreamsCommand);
ResultSet resultSet =
executeAndReturnEmptyResultIfNotFound(statement, showStreamsCommand, GET_STREAMS);
@@ -2886,7 +2922,7 @@ public ResultSet getStreams(
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_STREAMS, resultSet, statement) {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()");
+ logger.trace("boolean next()");
incrementRow();
// iterate throw the show streams result until we find an entry
@@ -2935,7 +2971,7 @@ public boolean next() throws SQLException {
public ResultSet getIndexInfo(
String catalog, String schema, String table, boolean unique, boolean approximate)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getIndexInfo(String catalog, String schema, "
+ "String table,boolean unique, boolean approximate)",
false);
@@ -2982,14 +3018,14 @@ public ResultSet getIndexInfo(
@Override
public boolean supportsResultSetType(int type) throws SQLException {
- logger.debug("public boolean supportsResultSetType(int type)", false);
+ logger.trace("boolean supportsResultSetType(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return (type == ResultSet.TYPE_FORWARD_ONLY);
}
@Override
public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQLException {
- logger.debug(
+ logger.trace(
"public boolean supportsResultSetConcurrency(int type, " + "int concurrency)", false);
raiseSQLExceptionIfConnectionIsClosed();
return (type == ResultSet.TYPE_FORWARD_ONLY && concurrency == ResultSet.CONCUR_READ_ONLY);
@@ -2997,70 +3033,70 @@ public boolean supportsResultSetConcurrency(int type, int concurrency) throws SQ
@Override
public boolean ownUpdatesAreVisible(int type) throws SQLException {
- logger.debug("public boolean ownUpdatesAreVisible(int type)", false);
+ logger.trace("boolean ownUpdatesAreVisible(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean ownDeletesAreVisible(int type) throws SQLException {
- logger.debug("public boolean ownDeletesAreVisible(int type)", false);
+ logger.trace("boolean ownDeletesAreVisible(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean ownInsertsAreVisible(int type) throws SQLException {
- logger.debug("public boolean ownInsertsAreVisible(int type)", false);
+ logger.trace("boolean ownInsertsAreVisible(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean othersUpdatesAreVisible(int type) throws SQLException {
- logger.debug("public boolean othersUpdatesAreVisible(int type)", false);
+ logger.trace("boolean othersUpdatesAreVisible(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean othersDeletesAreVisible(int type) throws SQLException {
- logger.debug("public boolean othersDeletesAreVisible(int type)", false);
+ logger.trace("boolean othersDeletesAreVisible(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean othersInsertsAreVisible(int type) throws SQLException {
- logger.debug("public boolean othersInsertsAreVisible(int type)", false);
+ logger.trace("boolean othersInsertsAreVisible(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean updatesAreDetected(int type) throws SQLException {
- logger.debug("public boolean updatesAreDetected(int type)", false);
+ logger.trace("boolean updatesAreDetected(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean deletesAreDetected(int type) throws SQLException {
- logger.debug("public boolean deletesAreDetected(int type)", false);
+ logger.trace("boolean deletesAreDetected(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean insertsAreDetected(int type) throws SQLException {
- logger.debug("public boolean insertsAreDetected(int type)", false);
+ logger.trace("boolean insertsAreDetected(int type)", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsBatchUpdates() throws SQLException {
- logger.debug("public boolean supportsBatchUpdates()", false);
+ logger.trace("boolean supportsBatchUpdates()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@@ -3069,7 +3105,7 @@ public boolean supportsBatchUpdates() throws SQLException {
public ResultSet getUDTs(
String catalog, String schemaPattern, String typeNamePattern, int[] types)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getUDTs(String catalog, "
+ "String schemaPattern,String typeNamePattern, int[] types)",
false);
@@ -3100,35 +3136,35 @@ public ResultSet getUDTs(
@Override
public Connection getConnection() throws SQLException {
- logger.debug("public Connection getConnection()", false);
+ logger.trace("Connection getConnection()", false);
raiseSQLExceptionIfConnectionIsClosed();
return connection;
}
@Override
public boolean supportsSavepoints() throws SQLException {
- logger.debug("public boolean supportsSavepoints()", false);
+ logger.trace("boolean supportsSavepoints()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsNamedParameters() throws SQLException {
- logger.debug("public boolean supportsNamedParameters()", false);
+ logger.trace("boolean supportsNamedParameters()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsMultipleOpenResults() throws SQLException {
- logger.debug("public boolean supportsMultipleOpenResults()", false);
+ logger.trace("boolean supportsMultipleOpenResults()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public boolean supportsGetGeneratedKeys() throws SQLException {
- logger.debug("public boolean supportsGetGeneratedKeys()", false);
+ logger.trace("boolean supportsGetGeneratedKeys()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@@ -3136,7 +3172,7 @@ public boolean supportsGetGeneratedKeys() throws SQLException {
@Override
public ResultSet getSuperTypes(String catalog, String schemaPattern, String typeNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getSuperTypes(String catalog, "
+ "String schemaPattern,String typeNamePattern)",
false);
@@ -3147,7 +3183,7 @@ public ResultSet getSuperTypes(String catalog, String schemaPattern, String type
@Override
public ResultSet getSuperTables(String catalog, String schemaPattern, String tableNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getSuperTables(String catalog, "
+ "String schemaPattern,String tableNamePattern)",
false);
@@ -3159,7 +3195,7 @@ public ResultSet getSuperTables(String catalog, String schemaPattern, String tab
public ResultSet getAttributes(
String catalog, String schemaPattern, String typeNamePattern, String attributeNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getAttributes(String catalog, String "
+ "schemaPattern,"
+ "String typeNamePattern,String attributeNamePattern)",
@@ -3170,75 +3206,75 @@ public ResultSet getAttributes(
@Override
public boolean supportsResultSetHoldability(int holdability) throws SQLException {
- logger.debug("public boolean supportsResultSetHoldability(int holdability)", false);
+ logger.trace("boolean supportsResultSetHoldability(int holdability)", false);
raiseSQLExceptionIfConnectionIsClosed();
return holdability == ResultSet.CLOSE_CURSORS_AT_COMMIT;
}
@Override
public int getResultSetHoldability() throws SQLException {
- logger.debug("public int getResultSetHoldability()", false);
+ logger.trace("int getResultSetHoldability()", false);
return ResultSet.CLOSE_CURSORS_AT_COMMIT;
}
@Override
public int getDatabaseMajorVersion() throws SQLException {
- logger.debug("public int getDatabaseMajorVersion()", false);
+ logger.trace("int getDatabaseMajorVersion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return connection.unwrap(SnowflakeConnectionV1.class).getDatabaseMajorVersion();
}
@Override
public int getDatabaseMinorVersion() throws SQLException {
- logger.debug("public int getDatabaseMinorVersion()", false);
+ logger.trace("int getDatabaseMinorVersion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return connection.unwrap(SnowflakeConnectionV1.class).getDatabaseMinorVersion();
}
@Override
public int getJDBCMajorVersion() throws SQLException {
- logger.debug("public int getJDBCMajorVersion()", false);
+ logger.trace("int getJDBCMajorVersion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return Integer.parseInt(JDBCVersion.split("\\.", 2)[0]);
}
@Override
public int getJDBCMinorVersion() throws SQLException {
- logger.debug("public int getJDBCMinorVersion()", false);
+ logger.trace("int getJDBCMinorVersion()", false);
raiseSQLExceptionIfConnectionIsClosed();
return Integer.parseInt(JDBCVersion.split("\\.", 2)[1]);
}
@Override
public int getSQLStateType() throws SQLException {
- logger.debug("public int getSQLStateType()", false);
+ logger.trace("int getSQLStateType()", false);
return sqlStateSQL;
}
@Override
public boolean locatorsUpdateCopy() {
- logger.debug("public boolean locatorsUpdateCopy()", false);
+ logger.trace("boolean locatorsUpdateCopy()", false);
return false;
}
@Override
public boolean supportsStatementPooling() throws SQLException {
- logger.debug("public boolean supportsStatementPooling()", false);
+ logger.trace("boolean supportsStatementPooling()", false);
raiseSQLExceptionIfConnectionIsClosed();
return false;
}
@Override
public RowIdLifetime getRowIdLifetime() throws SQLException {
- logger.debug("public RowIdLifetime getRowIdLifetime()", false);
+ logger.trace("RowIdLifetime getRowIdLifetime()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public ResultSet getSchemas(String originalCatalog, String originalSchema) throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getSchemas(String catalog={}, String " + "schemaPattern={})",
originalCatalog,
originalSchema);
@@ -3270,7 +3306,7 @@ public ResultSet getSchemas(String originalCatalog, String originalSchema) throw
showSchemas += " in database \"" + escapeSqlQuotes(catalog) + "\"";
}
- logger.debug("sql command to get schemas metadata: {}", showSchemas);
+ logger.debug("Sql command to get schemas metadata: {}", showSchemas);
ResultSet resultSet =
executeAndReturnEmptyResultIfNotFound(statement, showSchemas, GET_SCHEMAS);
@@ -3278,7 +3314,7 @@ public ResultSet getSchemas(String originalCatalog, String originalSchema) throw
resultSet, "getSchemas", originalCatalog, originalSchema, "none", "none");
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_SCHEMAS, resultSet, statement) {
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// iterate throw the show table result until we find an entry
@@ -3302,21 +3338,21 @@ public boolean next() throws SQLException {
@Override
public boolean supportsStoredFunctionsUsingCallSyntax() throws SQLException {
- logger.debug("public boolean supportsStoredFunctionsUsingCallSyntax()", false);
+ logger.trace("boolean supportsStoredFunctionsUsingCallSyntax()", false);
raiseSQLExceptionIfConnectionIsClosed();
return true;
}
@Override
public boolean autoCommitFailureClosesAllResultSets() throws SQLException {
- logger.debug("public boolean autoCommitFailureClosesAllResultSets()", false);
+ logger.trace("boolean autoCommitFailureClosesAllResultSets()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@Override
public ResultSet getClientInfoProperties() throws SQLException {
- logger.debug("public ResultSet getClientInfoProperties()", false);
+ logger.trace("ResultSet getClientInfoProperties()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -3327,7 +3363,7 @@ public ResultSet getFunctions(
throws SQLException {
raiseSQLExceptionIfConnectionIsClosed();
Statement statement = connection.createStatement();
- logger.debug(
+ logger.trace(
"public ResultSet getFunctions(String catalog={}, String schemaPattern={}, "
+ "String functionNamePattern={}",
catalog,
@@ -3349,7 +3385,7 @@ public ResultSet getFunctions(
return new SnowflakeDatabaseMetaDataQueryResultSet(GET_FUNCTIONS, resultSet, statement) {
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// iterate throw the show table result until we find an entry
@@ -3422,7 +3458,7 @@ private List parseColumns(String retType, String args) {
public ResultSet getFunctionColumns(
String catalog, String schemaPattern, String functionNamePattern, String columnNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getFunctionColumns(String catalog, "
+ "String schemaPattern,String functionNamePattern,"
+ "String columnNamePattern)",
@@ -3544,9 +3580,9 @@ public ResultSet getFunctionColumns(
typeName.substring(typeName.indexOf('(') + 1, typeName.indexOf(')')));
nextRow[13] = char_octet_len;
} else if (type == Types.CHAR || type == Types.VARCHAR) {
- nextRow[13] = 16777216;
+ nextRow[13] = getMaxCharLiteralLength();
} else if (type == Types.BINARY || type == Types.VARBINARY) {
- nextRow[13] = 8388608;
+ nextRow[13] = getMaxBinaryLiteralLength();
}
} else {
nextRow[13] = null;
@@ -3580,7 +3616,7 @@ public ResultSet getFunctionColumns(
public ResultSet getPseudoColumns(
String catalog, String schemaPattern, String tableNamePattern, String columnNamePattern)
throws SQLException {
- logger.debug(
+ logger.trace(
"public ResultSet getPseudoColumns(String catalog, "
+ "String schemaPattern,String tableNamePattern,"
+ "String columnNamePattern)",
@@ -3591,7 +3627,7 @@ public ResultSet getPseudoColumns(
// @Override
public boolean generatedKeyAlwaysReturned() throws SQLException {
- logger.debug("public boolean generatedKeyAlwaysReturned()", false);
+ logger.trace("boolean generatedKeyAlwaysReturned()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
@@ -3599,7 +3635,7 @@ public boolean generatedKeyAlwaysReturned() throws SQLException {
// unchecked
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug(" T unwrap(Class iface)", false);
+ logger.trace(" T unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
@@ -3610,7 +3646,7 @@ public T unwrap(Class iface) throws SQLException {
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("public boolean isWrapperFor(Class iface)", false);
+ logger.trace("boolean isWrapperFor(Class iface)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(session);
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java
index 456eed7d7..ce93e49e8 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDatabaseMetaDataResultSet.java
@@ -31,7 +31,7 @@ class SnowflakeDatabaseMetaDataResultSet extends SnowflakeBaseResultSet {
private String queryId;
- static final SFLogger logger =
+ private static final SFLogger logger =
SFLoggerFactory.getLogger(SnowflakeDatabaseMetaDataResultSet.class);
/**
@@ -132,7 +132,7 @@ public boolean isClosed() throws SQLException {
@Override
public boolean next() throws SQLException {
- logger.debug("public boolean next()", false);
+ logger.trace("boolean next()", false);
incrementRow();
// no exception is raised even after the result set is closed.
@@ -158,41 +158,41 @@ public void close() throws SQLException {
try {
getStatement().close(); // should close both result set and statement.
} catch (SQLException ex) {
- logger.debug("failed to close", ex);
+ logger.debug("Failed to close", ex);
}
}
@Override
public boolean isFirst() throws SQLException {
- logger.debug("public boolean isFirst()", false);
+ logger.trace("boolean isFirst()", false);
raiseSQLExceptionIfResultSetIsClosed();
return row == 0;
}
@Override
public boolean isBeforeFirst() throws SQLException {
- logger.debug("public boolean isBeforeFirst()", false);
+ logger.trace("boolean isBeforeFirst()", false);
raiseSQLExceptionIfResultSetIsClosed();
return row == -1;
}
@Override
public boolean isLast() throws SQLException {
- logger.debug("public boolean isLast()", false);
+ logger.trace("boolean isLast()", false);
raiseSQLExceptionIfResultSetIsClosed();
return !isBeforeFirst() && row == rows.length - 1;
}
@Override
public boolean isAfterLast() throws SQLException {
- logger.debug("public boolean isAfterLast()", false);
+ logger.trace("boolean isAfterLast()", false);
raiseSQLExceptionIfResultSetIsClosed();
return row == rows.length;
}
@Override
public int getRow() throws SQLException {
- logger.debug("public int getRow()", false);
+ logger.trace("int getRow()", false);
raiseSQLExceptionIfResultSetIsClosed();
return row;
}
@@ -260,7 +260,7 @@ static ResultSet getEmptyResultSet(DBMetadataResultSetMetadata metadataType, Sta
}
Object getObjectInternal(int columnIndex) throws SQLException {
- logger.debug("public Object getObjectInternal(int columnIndex)", false);
+ logger.trace("Object getObjectInternal(int columnIndex)", false);
raiseSQLExceptionIfResultSetIsClosed();
if (nextRow == null) {
@@ -280,14 +280,14 @@ Object getObjectInternal(int columnIndex) throws SQLException {
@Override
public boolean wasNull() throws SQLException {
- logger.debug("public boolean wasNull() returning {}", wasNull);
+ logger.trace("boolean wasNull() returning {}", wasNull);
raiseSQLExceptionIfResultSetIsClosed();
return wasNull;
}
@Override
public String getString(int columnIndex) throws SQLException {
- logger.debug("public String getString(int columnIndex)", false);
+ logger.trace("String getString(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -297,7 +297,7 @@ public String getString(int columnIndex) throws SQLException {
@Override
public boolean getBoolean(int columnIndex) throws SQLException {
- logger.debug("public boolean getBoolean(int columnIndex)", false);
+ logger.trace("boolean getBoolean(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -324,7 +324,7 @@ public boolean getBoolean(int columnIndex) throws SQLException {
@Override
public byte getByte(int columnIndex) throws SQLException {
- logger.debug("public byte getByte(int columnIndex)", false);
+ logger.trace("byte getByte(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -341,7 +341,7 @@ public byte getByte(int columnIndex) throws SQLException {
@Override
public short getShort(int columnIndex) throws SQLException {
- logger.debug("public short getShort(int columnIndex)", false);
+ logger.trace("short getShort(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -359,7 +359,7 @@ public short getShort(int columnIndex) throws SQLException {
@Override
public int getInt(int columnIndex) throws SQLException {
- logger.debug("public int getInt(int columnIndex)", false);
+ logger.trace("int getInt(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -377,7 +377,7 @@ public int getInt(int columnIndex) throws SQLException {
@Override
public long getLong(int columnIndex) throws SQLException {
- logger.debug("public long getLong(int columnIndex)", false);
+ logger.trace("long getLong(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -402,7 +402,7 @@ public long getLong(int columnIndex) throws SQLException {
@Override
public float getFloat(int columnIndex) throws SQLException {
- logger.debug("public float getFloat(int columnIndex)", false);
+ logger.trace("float getFloat(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -420,7 +420,7 @@ public float getFloat(int columnIndex) throws SQLException {
@Override
public double getDouble(int columnIndex) throws SQLException {
- logger.debug("public double getDouble(int columnIndex)", false);
+ logger.trace("double getDouble(int columnIndex)", false);
// Column index starts from 1, not 0.
Object obj = getObjectInternal(columnIndex);
@@ -447,7 +447,7 @@ public String getQueryID() {
@Deprecated
@Override
public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException {
- logger.debug("public BigDecimal getBigDecimal(int columnIndex, int scale)", false);
+ logger.trace("BigDecimal getBigDecimal(int columnIndex, int scale)", false);
BigDecimal value;
@@ -471,7 +471,7 @@ public BigDecimal getBigDecimal(int columnIndex, int scale) throws SQLException
@Override
public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
- logger.debug("public BigDecimal getBigDecimal(int columnIndex)", false);
+ logger.trace("BigDecimal getBigDecimal(int columnIndex)", false);
BigDecimal value = null;
@@ -493,7 +493,7 @@ public BigDecimal getBigDecimal(int columnIndex) throws SQLException {
@Override
public Object getObject(int columnIndex) throws SQLException {
- logger.debug("public Object getObject(int columnIndex)", false);
+ logger.trace("Object getObject(int columnIndex)", false);
int type = resultSetMetaData.getColumnType(columnIndex);
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
index 4aaf6013e..6d02f333d 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeDriver.java
@@ -14,7 +14,13 @@
import java.sql.SQLFeatureNotSupportedException;
import java.util.List;
import java.util.Properties;
+import net.snowflake.client.config.ConnectionParameters;
+import net.snowflake.client.config.SFConnectionConfigParser;
import net.snowflake.client.core.SecurityUtil;
+import net.snowflake.client.core.SnowflakeJdbcInternalApi;
+import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.common.core.ResourceBundleManager;
import net.snowflake.common.core.SqlState;
@@ -26,10 +32,12 @@
* loading
*/
public class SnowflakeDriver implements Driver {
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeDriver.class);
+ public static final String AUTO_CONNECTION_STRING_PREFIX = "jdbc:snowflake:auto";
static SnowflakeDriver INSTANCE;
public static final Properties EMPTY_PROPERTIES = new Properties();
- public static String implementVersion = "3.15.2";
+ public static String implementVersion = "3.17.1";
static int majorVersion = 0;
static int minorVersion = 0;
@@ -57,6 +65,9 @@ public class SnowflakeDriver implements Driver {
initializeClientVersionFromManifest();
SecurityUtil.addBouncyCastleProvider();
+
+ // Telemetry OOB is disabled
+ TelemetryService.disableOOBTelemetry();
}
/** try to initialize Arrow support if fails, JDBC is going to use the legacy format */
@@ -200,18 +211,52 @@ public boolean acceptsURL(String url) {
*/
@Override
public Connection connect(String url, Properties info) throws SQLException {
- if (url == null) {
+ ConnectionParameters connectionParameters =
+ overrideByFileConnectionParametersIfAutoConfiguration(url, info);
+
+ if (connectionParameters.getUrl() == null) {
// expected return format per the JDBC spec for java.sql.Driver#connect()
throw new SnowflakeSQLException("Unable to connect to url of 'null'.");
}
- if (!SnowflakeConnectString.hasSupportedPrefix(url)) {
+ if (!SnowflakeConnectString.hasSupportedPrefix(connectionParameters.getUrl())) {
return null; // expected return format per the JDBC spec for java.sql.Driver#connect()
}
- SnowflakeConnectString conStr = SnowflakeConnectString.parse(url, info);
+ SnowflakeConnectString conStr =
+ SnowflakeConnectString.parse(
+ connectionParameters.getUrl(), connectionParameters.getParams());
if (!conStr.isValid()) {
throw new SnowflakeSQLException("Connection string is invalid. Unable to parse.");
}
- return new SnowflakeConnectionV1(url, info);
+ return new SnowflakeConnectionV1(
+ connectionParameters.getUrl(), connectionParameters.getParams());
+ }
+
+ private static ConnectionParameters overrideByFileConnectionParametersIfAutoConfiguration(
+ String url, Properties info) throws SnowflakeSQLException {
+ if (url != null && url.contains(AUTO_CONNECTION_STRING_PREFIX)) {
+ // Connect using connection configuration file
+ ConnectionParameters connectionParameters =
+ SFConnectionConfigParser.buildConnectionParameters();
+ if (connectionParameters == null) {
+ throw new SnowflakeSQLException(
+ "Unavailable connection configuration parameters expected for auto configuration using file");
+ }
+ return connectionParameters;
+ } else {
+ return new ConnectionParameters(url, info);
+ }
+ }
+
+ /**
+ * Connect method using connection configuration file
+ *
+ * @return connection
+ * @throws SQLException if failed to create a snowflake connection
+ */
+ @SnowflakeJdbcInternalApi
+ public Connection connect() throws SQLException {
+ logger.debug("Execute internal method connect() without parameters");
+ return connect(AUTO_CONNECTION_STRING_PREFIX, null);
}
@Override
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
index 9a0f874bb..751b47d19 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeFileTransferAgent.java
@@ -15,6 +15,7 @@
import com.google.common.io.ByteStreams;
import com.google.common.io.CountingOutputStream;
import java.io.File;
+import java.io.FileFilter;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
@@ -47,6 +48,7 @@
import java.util.concurrent.TimeUnit;
import java.util.zip.GZIPOutputStream;
import net.snowflake.client.core.ExecTimeTelemetryData;
+import net.snowflake.client.core.FileUtil;
import net.snowflake.client.core.HttpClientSettingsKey;
import net.snowflake.client.core.OCSPMode;
import net.snowflake.client.core.ObjectMapperFactory;
@@ -73,6 +75,8 @@
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.IOUtils;
import org.apache.commons.io.filefilter.WildcardFileFilter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* Class for uploading/downloading files
@@ -80,7 +84,8 @@
* @author jhuang
*/
public class SnowflakeFileTransferAgent extends SFBaseFileTransferAgent {
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeFileTransferAgent.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakeFileTransferAgent.class);
static final StorageClientFactory storageFactory = StorageClientFactory.getFactory();
@@ -95,6 +100,7 @@ public class SnowflakeFileTransferAgent extends SFBaseFileTransferAgent {
private static final String localFSFileSep = systemGetProperty("file.separator");
private static final int DEFAULT_PARALLEL = 10;
+ private static final Logger log = LoggerFactory.getLogger(SnowflakeFileTransferAgent.class);
private final String command;
@@ -202,7 +208,7 @@ static List getEncryptionMaterial(
List encryptionMaterial = new ArrayList<>();
JsonNode rootNode = jsonNode.path("data").path("encryptionMaterial");
if (commandType == CommandType.UPLOAD) {
- logger.debug("initEncryptionMaterial: UPLOAD", false);
+ logger.debug("InitEncryptionMaterial: UPLOAD", false);
RemoteStoreFileEncryptionMaterial encMat = null;
if (!rootNode.isMissingNode() && !rootNode.isNull()) {
@@ -211,7 +217,7 @@ static List getEncryptionMaterial(
encryptionMaterial.add(encMat);
} else {
- logger.debug("initEncryptionMaterial: DOWNLOAD", false);
+ logger.debug("InitEncryptionMaterial: DOWNLOAD", false);
if (!rootNode.isMissingNode() && !rootNode.isNull()) {
encryptionMaterial =
@@ -231,7 +237,7 @@ private static List getPresignedUrls(CommandType commandType, JsonNode j
List presignedUrls = new ArrayList<>();
JsonNode rootNode = jsonNode.path("data").path("presignedUrls");
if (commandType == CommandType.DOWNLOAD) {
- logger.debug("initEncryptionMaterial: DOWNLOAD", false);
+ logger.debug("InitEncryptionMaterial: DOWNLOAD", false);
if (!rootNode.isMissingNode() && !rootNode.isNull()) {
presignedUrls = Arrays.asList(mapper.readValue(rootNode.toString(), String[].class));
@@ -541,7 +547,7 @@ public static Callable getUploadFileCallable(
return new Callable() {
public Void call() throws Exception {
- logger.debug("Entering getUploadFileCallable...", false);
+ logger.trace("Entering getUploadFileCallable...", false);
// make sure initialize context for the telemetry service for this thread
TelemetryService.getInstance().updateContext(session.getSnowflakeConnectionString());
@@ -561,6 +567,7 @@ public Void call() throws Exception {
SnowflakeFileTransferAgent.injectedFileTransferException;
}
+ FileUtil.logFileUsage(srcFilePath, "Get file to upload", false);
uploadStream = new FileInputStream(srcFilePath);
} catch (FileNotFoundException ex) {
metadata.resultStatus = ResultStatus.ERROR;
@@ -585,7 +592,7 @@ public Void call() throws Exception {
String digest = null;
- logger.debug("Dest file name={}", false);
+ logger.debug("Dest file name: {}", false);
// Temp file that needs to be cleaned up when upload was successful
FileBackedOutputStream fileBackedOutputStream = null;
@@ -637,7 +644,7 @@ public Void call() throws Exception {
logger.debug(
"Started copying file from: {} to {}:{} destName: {} "
- + "auto compressed? {} size={}",
+ + "auto compressed? {} size: {}",
srcFilePath,
stage.getStageType().name(),
stage.getLocation(),
@@ -705,7 +712,7 @@ public Void call() throws Exception {
try {
fileBackedOutputStream.reset();
} catch (IOException ex) {
- logger.debug("failed to clean up temp file: {}", ex);
+ logger.debug("Failed to clean up temp file: {}", ex);
}
}
if (inputStream == null) {
@@ -713,7 +720,7 @@ public Void call() throws Exception {
}
}
- logger.debug("filePath: {}", srcFilePath);
+ logger.debug("FilePath: {}", srcFilePath);
// set dest size
metadata.destFileSize = uploadSize;
@@ -863,7 +870,7 @@ public Void call() throws Exception {
throw ex;
}
- logger.debug("filePath: {}", srcFilePath);
+ logger.debug("FilePath: {}", srcFilePath);
File destFile = new File(localLocation + localFSFileSep + destFileName);
long downloadSize = destFile.length();
@@ -1053,9 +1060,9 @@ private void parseCommand() throws SnowflakeSQLException {
logger.debug("Command type: {}", commandType);
if (commandType == CommandType.UPLOAD) {
- logger.debug("autoCompress: {}, source compression: {}", autoCompress, sourceCompression);
+ logger.debug("Auto compress: {}, source compression: {}", autoCompress, sourceCompression);
} else {
- logger.debug("local download location: {}", localLocation);
+ logger.debug("Local download location: {}", localLocation);
}
logger.debug("Source files: {}", String.join(",", sourceFiles));
@@ -1215,7 +1222,7 @@ private void verifyLocalFilePath(String localFilePathFromGS) throws SnowflakeSQL
+ ", expected: "
+ localFilePath);
} else if (localFilePath.isEmpty()) {
- logger.debug("fail to parse local file path from command: {}", command);
+ logger.debug("Fail to parse local file path from command: {}", command);
} else {
logger.trace("local file path from GS matches local parsing: {}", localFilePath);
}
@@ -1306,7 +1313,7 @@ private static JsonNode parseCommandInGS(SFStatement statement, String command)
}
JsonNode jsonNode = (JsonNode) result;
- logger.debug("response: {}", jsonNode.toString());
+ logger.debug("Response: {}", jsonNode.toString());
SnowflakeUtil.checkErrorAndThrowException(jsonNode);
return jsonNode;
@@ -1513,7 +1520,7 @@ public boolean execute() throws SQLException {
filterExistingFiles();
- logger.debug("filtering done");
+ logger.debug("Filtering done");
}
synchronized (canceled) {
@@ -1531,9 +1538,9 @@ public boolean execute() throws SQLException {
boolean created = dir.mkdirs();
if (created) {
- logger.debug("directory created: {}", localLocation);
+ logger.debug("Directory created: {}", localLocation);
} else {
- logger.debug("directory not created {}", localLocation);
+ logger.debug("Directory not created {}", localLocation);
}
}
@@ -1544,19 +1551,19 @@ public boolean execute() throws SQLException {
// separate files to big files list and small files list
// big files will be uploaded in serial, while small files will be
// uploaded concurrently.
- logger.debug("start segregate files by size");
+ logger.debug("Start segregate files by size");
segregateFilesBySize();
if (bigSourceFiles != null) {
- logger.debug("start uploading big files");
+ logger.debug("Start uploading big files");
uploadFiles(bigSourceFiles, 1);
- logger.debug("end uploading big files");
+ logger.debug("End uploading big files");
}
if (smallSourceFiles != null) {
- logger.debug("start uploading small files");
+ logger.debug("Start uploading small files");
uploadFiles(smallSourceFiles, parallel);
- logger.debug("end uploading small files");
+ logger.debug("End uploading small files");
}
}
@@ -1717,7 +1724,7 @@ private void downloadFiles() throws SnowflakeSQLException {
presignedUrl,
queryID));
- logger.debug("submitted download job for: {}", srcFile);
+ logger.debug("Submitted download job for: {}", srcFile);
}
threadExecutor.shutdown();
@@ -1813,7 +1820,7 @@ private void uploadFiles(Set fileList, int parallel) throws SnowflakeSQL
encryptionMaterial.get(0),
queryID));
- logger.debug("submitted copy job for: {}", srcFile);
+ logger.debug("Submitted copy job for: {}", srcFile);
}
// shut down the thread executor
@@ -1935,7 +1942,7 @@ static Set expandFileNames(String[] filePathList, String queryId)
// For each location, list files and match against the patterns
for (Map.Entry> entry : locationToFilePatterns.entrySet()) {
try {
- java.io.File dir = new java.io.File(entry.getKey());
+ File dir = new File(entry.getKey());
logger.debug(
"Listing files under: {} with patterns: {}",
@@ -1947,11 +1954,15 @@ static Set expandFileNames(String[] filePathList, String queryId)
&& injectedFileTransferException instanceof Exception) {
throw (Exception) SnowflakeFileTransferAgent.injectedFileTransferException;
}
-
// The following currently ignore sub directories
- for (Object file :
- FileUtils.listFiles(dir, new WildcardFileFilter(entry.getValue()), null)) {
- result.add(((java.io.File) file).getCanonicalPath());
+ File[] filesMatchingPattern =
+ dir.listFiles((FileFilter) new WildcardFileFilter(entry.getValue()));
+ if (filesMatchingPattern != null) {
+ for (File file : filesMatchingPattern) {
+ result.add(file.getCanonicalPath());
+ }
+ } else {
+ logger.debug("No files under {} matching pattern {}", entry.getKey(), entry.getValue());
}
} catch (Exception ex) {
throw new SnowflakeSQLException(
@@ -1971,7 +1982,7 @@ static Set expandFileNames(String[] filePathList, String queryId)
logger.debug("Expanded file paths: ");
for (String filePath : result) {
- logger.debug("file: {}", filePath);
+ logger.debug("File: {}", filePath);
}
return result;
@@ -1991,7 +2002,7 @@ private static boolean pushFileToLocal(
stageLocation = stageLocation.replace("~", systemGetProperty("user.home"));
try {
logger.debug(
- "Copy file. srcFile={}, destination={}, destFileName={}",
+ "Copy file. srcFile: {}, destination: {}, destFileName: {}",
filePath,
stageLocation,
destFileName);
@@ -2026,7 +2037,7 @@ private static boolean pullFileFromLocal(
throws SQLException {
try {
logger.debug(
- "Copy file. srcFile={}, destination={}, destFileName={}",
+ "Copy file. srcFile: {}, destination: {}, destFileName: {}",
sourceLocation + localFSFileSep + filePath,
destLocation,
destFileName);
@@ -2076,7 +2087,7 @@ private static void pushFileToRemoteStore(
}
logger.debug(
- "upload object. location={}, key={}, srcFile={}, encryption={}",
+ "Upload object. Location: {}, key: {}, srcFile: {}, encryption: {}",
remoteLocation.location,
destFileName,
srcFile,
@@ -2142,7 +2153,7 @@ private static void pushFileToRemoteStore(
* @throws Exception if error occurs while data upload.
*/
public static void uploadWithoutConnection(SnowflakeFileTransferConfig config) throws Exception {
- logger.debug("Entering uploadWithoutConnection...");
+ logger.trace("Entering uploadWithoutConnection...");
SnowflakeFileTransferMetadataV1 metadata =
(SnowflakeFileTransferMetadataV1) config.getSnowflakeFileTransferMetadata();
@@ -2287,7 +2298,7 @@ public static void uploadWithoutConnection(SnowflakeFileTransferConfig config) t
try {
fileBackedOutputStream.reset();
} catch (IOException ex) {
- logger.debug("failed to clean up temp file: {}", ex);
+ logger.debug("Failed to clean up temp file: {}", ex);
}
}
}
@@ -2327,7 +2338,7 @@ private static void pushFileToRemoteStoreWithPresignedUrl(
}
logger.debug(
- "upload object. location={}, key={}, srcFile={}, encryption={}",
+ "Upload object. Location: {}, key: {}, srcFile: {}, encryption: {}",
remoteLocation.location,
destFileName,
srcFile,
@@ -2416,7 +2427,7 @@ private static void pullFileFromRemoteStore(
}
logger.debug(
- "Download object. location={}, key={}, srcFile={}, encryption={}",
+ "Download object. Location: {}, key: {}, srcFile: {}, encryption: {}",
remoteLocation.location,
stageFilePath,
filePath,
@@ -2503,7 +2514,7 @@ private void filterExistingFiles() throws SnowflakeSQLException {
if (stageInfo.getStageType() == StageInfo.StageType.S3
|| stageInfo.getStageType() == StageInfo.StageType.AZURE
|| stageInfo.getStageType() == StageInfo.StageType.GCS) {
- logger.debug("check existing files on remote storage for the common prefix");
+ logger.debug("Check existing files on remote storage for the common prefix");
remoteLocation storeLocation = extractLocationAndPath(stageInfo.getLocation());
@@ -2511,7 +2522,7 @@ private void filterExistingFiles() throws SnowflakeSQLException {
int retryCount = 0;
- logger.debug("start dragging object summaries from remote storage");
+ logger.debug("Start dragging object summaries from remote storage");
do {
try {
// Normal flow will never hit here. This is only for testing purposes
@@ -2525,7 +2536,7 @@ private void filterExistingFiles() throws SnowflakeSQLException {
storageClient.listObjects(
storeLocation.location,
SnowflakeUtil.concatFilePathNames(storeLocation.path, greatestCommonPrefix, "/"));
- logger.debug("received object summaries from remote storage");
+ logger.debug("Received object summaries from remote storage");
} catch (Exception ex) {
logger.debug("Listing objects for filtering encountered exception: {}", ex.getMessage());
@@ -2639,7 +2650,7 @@ private void filterExistingFiles() throws SnowflakeSQLException {
try {
stream.reset();
} catch (IOException ex) {
- logger.debug("failed to clean up temp file: {}", ex);
+ logger.debug("Failed to clean up temp file: {}", ex);
}
}
}
@@ -2670,7 +2681,7 @@ private void filterExistingFiles() throws SnowflakeSQLException {
fileBackedOutputStream.reset();
}
} catch (IOException ex) {
- logger.debug("failed to clean up temp file: {}", ex);
+ logger.debug("Failed to clean up temp file: {}", ex);
}
IOUtils.closeQuietly(stageFileStream);
}
@@ -2678,12 +2689,12 @@ private void filterExistingFiles() throws SnowflakeSQLException {
// continue if digest is different so that we will process the file
if (!stageFileHashText.equals(localFileHashText)) {
logger.debug(
- "digest diff between local and stage, will {} {}",
+ "Digest diff between local and stage, will {} {}",
commandType.name().toLowerCase(),
mappedSrcFile);
continue;
} else {
- logger.debug("digest matches between local and stage, will skip {}", mappedSrcFile);
+ logger.debug("Digest matches between local and stage, will skip {}", mappedSrcFile);
// skip the file given that the check sum is the same b/w source
// and destination
@@ -2706,7 +2717,7 @@ private void compareAndSkipRemoteFiles(
throws SnowflakeSQLException {
for (StorageObjectSummary obj : objectSummaries) {
logger.debug(
- "Existing object: key={} size={} md5={}", obj.getKey(), obj.getSize(), obj.getMD5());
+ "Existing object: key: {} size: {} md5: {}", obj.getKey(), obj.getSize(), obj.getMD5());
int idxOfLastFileSep = obj.getKey().lastIndexOf("/");
String objFileName = obj.getKey().substring(idxOfLastFileSep + 1);
@@ -2770,7 +2781,7 @@ private void compareAndSkipRemoteFiles(
// log it
logger.debug(
"File returned from listing but found missing {} when getting its"
- + " metadata. Location={}, key={}",
+ + " metadata. Location: {}, key: {}",
obj.getLocation(),
obj.getKey());
@@ -2831,7 +2842,7 @@ private void compareAndSkipRemoteFiles(
try {
stream.reset();
} catch (IOException ex) {
- logger.debug("failed to clean up temp file: {}", ex);
+ logger.debug("Failed to clean up temp file: {}", ex);
}
}
}
@@ -2845,7 +2856,7 @@ private void compareAndSkipRemoteFiles(
(objDigest == null && !hashText.equals(obj.getMD5()))) // ETag/MD5 mismatch
{
logger.debug(
- "digest diff between remote store and local, will {} {}, "
+ "Digest diff between remote store and local, will {} {}, "
+ "local digest: {}, remote store md5: {}",
commandType.name().toLowerCase(),
mappedSrcFile,
@@ -2864,7 +2875,7 @@ private void compareAndSkipRemoteFiles(
}
logger.debug(
- "digest same between remote store and local, will not upload {} {}",
+ "Digest same between remote store and local, will not upload {} {}",
commandType.name().toLowerCase(),
mappedSrcFile);
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java b/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java
index e4535ad32..ee3dc3ec8 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatement.java
@@ -3,6 +3,7 @@
import java.math.BigInteger;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.Map;
public interface SnowflakePreparedStatement {
/**
@@ -26,4 +27,13 @@ public interface SnowflakePreparedStatement {
* @throws SQLException
*/
void setBigInteger(int parameterIndex, BigInteger x) throws SQLException;
+
+ /**
+ * Sets the designated parameter to the given Map instance.
+ *
+ * @param parameterIndex
+ * @param map
+ * @throws SQLException
+ */
+ void setMap(int parameterIndex, Map map, int type) throws SQLException;
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatementV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatementV1.java
index 2c01f0d04..000d4634d 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatementV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakePreparedStatementV1.java
@@ -4,6 +4,7 @@
package net.snowflake.client.jdbc;
+import com.fasterxml.jackson.core.JsonProcessingException;
import java.io.InputStream;
import java.io.Reader;
import java.math.BigDecimal;
@@ -20,6 +21,7 @@
import java.sql.ResultSet;
import java.sql.ResultSetMetaData;
import java.sql.RowId;
+import java.sql.SQLData;
import java.sql.SQLException;
import java.sql.SQLXML;
import java.sql.Time;
@@ -36,11 +38,15 @@
import java.util.Set;
import java.util.TimeZone;
import net.snowflake.client.core.ExecTimeTelemetryData;
+import net.snowflake.client.core.FieldSchemaCreator;
+import net.snowflake.client.core.JsonSqlOutput;
import net.snowflake.client.core.ParameterBindingDTO;
import net.snowflake.client.core.ResultUtil;
import net.snowflake.client.core.SFBaseResultSet;
import net.snowflake.client.core.SFException;
import net.snowflake.client.core.SFPreparedStatementMetaData;
+import net.snowflake.client.core.SfSqlArray;
+import net.snowflake.client.core.SfTimestampUtil;
import net.snowflake.client.core.StmtUtil;
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
@@ -50,7 +56,8 @@
class SnowflakePreparedStatementV1 extends SnowflakeStatementV1
implements PreparedStatement, SnowflakePreparedStatement {
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakePreparedStatementV1.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakePreparedStatementV1.class);
/** Error code returned when describing a statement that is binding table name */
private static final Integer ERROR_CODE_TABLE_BIND_VARIABLE_NOT_SET = 2128;
/** Error code when preparing statement with binding object names */
@@ -146,11 +153,12 @@ public ResultSet executeQuery() throws SQLException {
if (showStatementParameters) {
logger.info("executeQuery()", false);
} else {
- logger.debug("executeQuery()", false);
+ logger.trace("executeQuery()", false);
}
ResultSet rs = executeQueryInternal(sql, false, parameterBindings, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", execTimeData.getLogString());
return rs;
}
@@ -167,11 +175,12 @@ public ResultSet executeAsyncQuery() throws SQLException {
if (showStatementParameters) {
logger.info("executeAsyncQuery()", false);
} else {
- logger.debug("executeAsyncQuery()", false);
+ logger.trace("executeAsyncQuery()", false);
}
ResultSet rs = executeQueryInternal(sql, true, parameterBindings, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", execTimeData.getLogString());
return rs;
}
@@ -179,20 +188,20 @@ public ResultSet executeAsyncQuery() throws SQLException {
public long executeLargeUpdate() throws SQLException {
ExecTimeTelemetryData execTimeTelemetryData =
new ExecTimeTelemetryData("long PreparedStatement.executeLargeUpdate()", this.batchID);
- logger.debug("executeLargeUpdate()", false);
+ logger.trace("executeLargeUpdate()", false);
long updates = executeUpdateInternal(sql, parameterBindings, true, execTimeTelemetryData);
return updates;
}
@Override
public int executeUpdate() throws SQLException {
- logger.debug("executeUpdate()", false);
+ logger.trace("executeUpdate()", false);
return (int) executeLargeUpdate();
}
@Override
public void setNull(int parameterIndex, int sqlType) throws SQLException {
- logger.debug(
+ logger.trace(
"setNull(parameterIndex: {}, sqlType: {})",
parameterIndex,
SnowflakeType.JavaSQLType.find(sqlType));
@@ -204,7 +213,7 @@ public void setNull(int parameterIndex, int sqlType) throws SQLException {
@Override
public void setBoolean(int parameterIndex, boolean x) throws SQLException {
- logger.debug("setBoolean(parameterIndex: {}, boolean x)", parameterIndex);
+ logger.trace("setBoolean(parameterIndex: {}, boolean x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
SnowflakeUtil.javaTypeToSFTypeString(Types.BOOLEAN, connection.getSFBaseSession()),
@@ -214,7 +223,7 @@ public void setBoolean(int parameterIndex, boolean x) throws SQLException {
@Override
public void setByte(int parameterIndex, byte x) throws SQLException {
- logger.debug("setByte(parameterIndex: {}, byte x)", parameterIndex);
+ logger.trace("setByte(parameterIndex: {}, byte x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
SnowflakeUtil.javaTypeToSFTypeString(Types.TINYINT, connection.getSFBaseSession()),
@@ -224,7 +233,7 @@ public void setByte(int parameterIndex, byte x) throws SQLException {
@Override
public void setShort(int parameterIndex, short x) throws SQLException {
- logger.debug("setShort(parameterIndex: {}, short x)", parameterIndex);
+ logger.trace("setShort(parameterIndex: {}, short x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -235,7 +244,7 @@ public void setShort(int parameterIndex, short x) throws SQLException {
@Override
public void setInt(int parameterIndex, int x) throws SQLException {
- logger.debug("setInt(parameterIndex: {}, int x)", parameterIndex);
+ logger.trace("setInt(parameterIndex: {}, int x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -246,7 +255,7 @@ public void setInt(int parameterIndex, int x) throws SQLException {
@Override
public void setLong(int parameterIndex, long x) throws SQLException {
- logger.debug("setLong(parameterIndex: {}, long x)", parameterIndex);
+ logger.trace("setLong(parameterIndex: {}, long x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -257,7 +266,7 @@ public void setLong(int parameterIndex, long x) throws SQLException {
@Override
public void setBigInteger(int parameterIndex, BigInteger x) throws SQLException {
- logger.debug("setBigInteger(parameterIndex: {}, BigInteger x)", parameterIndex);
+ logger.trace("setBigInteger(parameterIndex: {}, BigInteger x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -268,7 +277,7 @@ public void setBigInteger(int parameterIndex, BigInteger x) throws SQLException
@Override
public void setFloat(int parameterIndex, float x) throws SQLException {
- logger.debug("setFloat(parameterIndex: {}, float x)", parameterIndex);
+ logger.trace("setFloat(parameterIndex: {}, float x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -279,7 +288,7 @@ public void setFloat(int parameterIndex, float x) throws SQLException {
@Override
public void setDouble(int parameterIndex, double x) throws SQLException {
- logger.debug("setDouble(parameterIndex: {}, double x)", parameterIndex);
+ logger.trace("setDouble(parameterIndex: {}, double x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -290,7 +299,7 @@ public void setDouble(int parameterIndex, double x) throws SQLException {
@Override
public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException {
- logger.debug("setBigDecimal(parameterIndex: {}, BigDecimal x)", parameterIndex);
+ logger.trace("setBigDecimal(parameterIndex: {}, BigDecimal x)", parameterIndex);
if (x == null) {
setNull(parameterIndex, Types.DECIMAL);
@@ -305,7 +314,7 @@ public void setBigDecimal(int parameterIndex, BigDecimal x) throws SQLException
@Override
public void setString(int parameterIndex, String x) throws SQLException {
- logger.debug("setString(parameterIndex: {}, String x)", parameterIndex);
+ logger.trace("setString(parameterIndex: {}, String x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -315,7 +324,7 @@ public void setString(int parameterIndex, String x) throws SQLException {
@Override
public void setBytes(int parameterIndex, byte[] x) throws SQLException {
- logger.debug("setBytes(parameterIndex: {}, byte[] x)", parameterIndex);
+ logger.trace("setBytes(parameterIndex: {}, byte[] x)", parameterIndex);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -324,9 +333,23 @@ public void setBytes(int parameterIndex, byte[] x) throws SQLException {
parameterBindings.put(String.valueOf(parameterIndex), binding);
}
+ private void setObjectInternal(int parameterIndex, SQLData sqlData) throws SQLException {
+ logger.debug("setObjectInternal(parameterIndex: {}, SqlData sqlData)", parameterIndex);
+
+ JsonSqlOutput stream = new JsonSqlOutput(sqlData, connection.getSFBaseSession());
+ sqlData.writeSQL(stream);
+ ParameterBindingDTO binding =
+ new ParameterBindingDTO(
+ "json",
+ SnowflakeUtil.javaTypeToSFTypeString(Types.STRUCT, connection.getSFBaseSession()),
+ stream.getJsonString(),
+ stream.getSchema());
+ parameterBindings.put(String.valueOf(parameterIndex), binding);
+ }
+
@Override
public void setDate(int parameterIndex, Date x) throws SQLException {
- logger.debug("setDate(parameterIndex: {}, Date x)", parameterIndex);
+ logger.trace("setDate(parameterIndex: {}, Date x)", parameterIndex);
if (x == null) {
setNull(parameterIndex, Types.DATE);
@@ -345,18 +368,13 @@ public void setDate(int parameterIndex, Date x) throws SQLException {
@Override
public void setTime(int parameterIndex, Time x) throws SQLException {
- logger.debug("setTime(parameterIndex: {}, Time x)", parameterIndex);
+ logger.trace("setTime(parameterIndex: {}, Time x)", parameterIndex);
if (x == null) {
setNull(parameterIndex, Types.TIME);
} else {
// Convert to nanoseconds since midnight using the input time mod 24 hours.
- final long MS_IN_DAY = 86400 * 1000;
- long msSinceEpoch = x.getTime();
- // Use % + % instead of just % to get the nonnegative remainder.
- // TODO(mkember): Change to use Math.floorMod when Client is on Java 8.
- long msSinceMidnight = (msSinceEpoch % MS_IN_DAY + MS_IN_DAY) % MS_IN_DAY;
- long nanosSinceMidnight = msSinceMidnight * 1000 * 1000;
+ long nanosSinceMidnight = SfTimestampUtil.getTimeInNanoseconds(x);
ParameterBindingDTO binding =
new ParameterBindingDTO(
@@ -369,7 +387,7 @@ public void setTime(int parameterIndex, Time x) throws SQLException {
@Override
public void setTimestamp(int parameterIndex, Timestamp x) throws SQLException {
- logger.debug("setTimestamp(parameterIndex: {}, Timestamp x)", parameterIndex);
+ logger.trace("setTimestamp(parameterIndex: {}, Timestamp x)", parameterIndex);
setTimestampWithType(parameterIndex, x, Types.TIMESTAMP);
}
@@ -436,7 +454,7 @@ public void setObject(int parameterIndex, Object x, int targetSqlType) throws SQ
|| targetSqlType == SnowflakeUtil.EXTRA_TYPES_TIMESTAMP_NTZ) {
setTimestampWithType(parameterIndex, (Timestamp) x, targetSqlType);
} else {
- logger.debug(
+ logger.trace(
"setObject(parameterIndex: {}, Object x, sqlType: {})",
parameterIndex,
SnowflakeType.JavaSQLType.find(targetSqlType));
@@ -479,6 +497,8 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
setBoolean(parameterIndex, (Boolean) x);
} else if (x instanceof byte[]) {
setBytes(parameterIndex, (byte[]) x);
+ } else if (x instanceof SQLData) {
+ setObjectInternal(parameterIndex, (SQLData) x);
} else {
throw new SnowflakeSQLLoggedException(
connection.getSFBaseSession(),
@@ -492,17 +512,18 @@ public void setObject(int parameterIndex, Object x) throws SQLException {
public boolean execute() throws SQLException {
ExecTimeTelemetryData execTimeData =
new ExecTimeTelemetryData("boolean PreparedStatement.execute(String)", this.batchID);
- logger.debug("execute: {}", sql);
+ logger.debug("Execute: {}", sql);
boolean success = executeInternal(sql, parameterBindings, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", execTimeData.getLogString());
return success;
}
@Override
public void addBatch() throws SQLException {
- logger.debug("addBatch()", false);
+ logger.trace("addBatch()", false);
raiseSQLExceptionIfStatementIsClosed();
@@ -600,13 +621,65 @@ public void setClob(int parameterIndex, Clob x) throws SQLException {
}
@Override
- public void setArray(int parameterIndex, Array x) throws SQLException {
- throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
+ public void setArray(int parameterIndex, Array array) throws SQLException {
+ if (array instanceof SfSqlArray) {
+ SfSqlArray sfArray = (SfSqlArray) array;
+ ParameterBindingDTO binding =
+ new ParameterBindingDTO(
+ "json",
+ SnowflakeUtil.javaTypeToSFTypeString(Types.ARRAY, connection.getSFBaseSession()),
+ sfArray.getJsonString(),
+ sfArray.getSchema());
+ parameterBindings.put(String.valueOf(parameterIndex), binding);
+ } else {
+ SfSqlArray sfArray = new SfSqlArray(Types.INTEGER, array);
+ ParameterBindingDTO binding =
+ new ParameterBindingDTO(
+ "json",
+ SnowflakeUtil.javaTypeToSFTypeString(Types.ARRAY, connection.getSFBaseSession()),
+ sfArray.getJsonString(),
+ sfArray.getSchema());
+ parameterBindings.put(String.valueOf(parameterIndex), binding);
+ }
+ }
+
+ @Override
+ public void setMap(int parameterIndex, Map map, int type) throws SQLException {
+ BindingParameterMetadata valueTypeSchema;
+ if (Types.STRUCT == type) {
+ SQLData sqlData = (SQLData) map.values().stream().findFirst().orElse(null);
+ JsonSqlOutput stream = new JsonSqlOutput(sqlData, connection.getSFBaseSession());
+ sqlData.writeSQL(stream);
+ valueTypeSchema = stream.getSchema();
+ } else {
+ valueTypeSchema = FieldSchemaCreator.buildBindingSchemaForType(type, false);
+ }
+
+ BindingParameterMetadata schema =
+ BindingParameterMetadata.BindingParameterMetadataBuilder.bindingParameterMetadata()
+ .withType("map")
+ .withFields(
+ Arrays.asList(
+ FieldSchemaCreator.buildBindingSchemaForType(Types.VARCHAR, false),
+ valueTypeSchema))
+ .build();
+ ParameterBindingDTO binding = null;
+ try {
+ binding =
+ new ParameterBindingDTO(
+ "json",
+ SnowflakeUtil.javaTypeToSFTypeString(Types.STRUCT, connection.getSFBaseSession()),
+ SnowflakeUtil.mapJson(map),
+ schema);
+ } catch (JsonProcessingException e) {
+ throw new RuntimeException(e);
+ }
+ parameterBindings.put(String.valueOf(parameterIndex), binding);
}
@Override
public ResultSetMetaData getMetaData() throws SQLException {
- logger.debug("getMetaData()", false);
+ logger.trace("getMetaData()", false);
raiseSQLExceptionIfStatementIsClosed();
@@ -616,7 +689,7 @@ public ResultSetMetaData getMetaData() throws SQLException {
@Override
public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLException {
- logger.debug("setDate(int parameterIndex, Date x, Calendar cal)", false);
+ logger.trace("setDate(int parameterIndex, Date x, Calendar cal)", false);
raiseSQLExceptionIfStatementIsClosed();
if (x == null) {
@@ -639,14 +712,14 @@ public void setDate(int parameterIndex, Date x, Calendar cal) throws SQLExceptio
@Override
public void setTime(int parameterIndex, Time x, Calendar cal) throws SQLException {
- logger.debug("setTime(int parameterIndex, Time x, Calendar cal)", false);
+ logger.trace("setTime(int parameterIndex, Time x, Calendar cal)", false);
raiseSQLExceptionIfStatementIsClosed();
setTime(parameterIndex, x);
}
@Override
public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws SQLException {
- logger.debug("setTimestamp(int parameterIndex, Timestamp x, Calendar cal)", false);
+ logger.trace("setTimestamp(int parameterIndex, Timestamp x, Calendar cal)", false);
raiseSQLExceptionIfStatementIsClosed();
// convert the time from being in UTC to be in local time zone
@@ -687,7 +760,7 @@ public void setTimestamp(int parameterIndex, Timestamp x, Calendar cal) throws S
@Override
public void setNull(int parameterIndex, int sqlType, String typeName) throws SQLException {
- logger.debug("setNull(int parameterIndex, int sqlType, String typeName)", false);
+ logger.trace("setNull(int parameterIndex, int sqlType, String typeName)", false);
setNull(parameterIndex, sqlType);
}
@@ -748,7 +821,7 @@ public void setSQLXML(int parameterIndex, SQLXML xmlObject) throws SQLException
@Override
public void setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength)
throws SQLException {
- logger.debug(
+ logger.trace(
"setObject(int parameterIndex, Object x, int targetSqlType, int scaleOrLength)", false);
raiseSQLExceptionIfStatementIsClosed();
@@ -847,13 +920,13 @@ public void clearBatch() throws SQLException {
@Override
public int[] executeBatch() throws SQLException {
- logger.debug("executeBatch()", false);
+ logger.trace("executeBatch()", false);
return executeBatchInternalWithArrayBind(false).intArr;
}
@Override
public long[] executeLargeBatch() throws SQLException {
- logger.debug("executeLargeBatch()", false);
+ logger.trace("executeLargeBatch()", false);
return executeBatchInternalWithArrayBind(true).longArr;
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultChunk.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultChunk.java
index 5cf9e1c40..7e91d9bab 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultChunk.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultChunk.java
@@ -144,4 +144,8 @@ public DownloadState getDownloadState() {
public void setDownloadState(DownloadState downloadState) {
this.downloadState = downloadState;
}
+
+ long getTotalTime() {
+ return downloadTime + parseTime;
+ }
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaData.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaData.java
index dcc5250b5..7de89e6f5 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaData.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaData.java
@@ -13,4 +13,22 @@ public interface SnowflakeResultSetMetaData {
int getInternalColumnType(int column) throws SQLException;
List getColumnFields(int column) throws SQLException;
+
+ /**
+ * Get vector dimension
+ *
+ * @param column column index
+ * @return vector dimension when the column is vector type or 0 when it is not vector type
+ * @throws SQLException when cannot get column dimension
+ */
+ int getDimension(int column) throws SQLException;
+
+ /**
+ * Get vector dimension
+ *
+ * @param columnName column name
+ * @return vector dimension when the column is vector type or 0 when it is not vector type
+ * @throws SQLException when cannot get column dimension
+ */
+ int getDimension(String columnName) throws SQLException;
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java
index 5c67cde9a..b8cdb236b 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetMetaDataV1.java
@@ -22,7 +22,8 @@ public enum QueryType {
SYNC
};
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeResultSetMetaDataV1.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakeResultSetMetaDataV1.class);
private SFResultSetMetaData resultSetMetaData;
private String queryId;
@@ -84,9 +85,19 @@ public List getColumnFields(int column) throws SQLException {
() -> resultSetMetaData.getColumnFields(column));
}
+ @Override
+ public int getDimension(int column) throws SQLException {
+ return resultSetMetaData.getDimension(column);
+ }
+
+ @Override
+ public int getDimension(String columnName) throws SQLException {
+ return resultSetMetaData.getDimension(getColumnIndex(columnName) + 1);
+ }
+
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug("public T unwrap(Class iface)", false);
+ logger.trace(" T unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
@@ -97,7 +108,7 @@ public T unwrap(Class iface) throws SQLException {
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("public boolean isWrapperFor(Class iface)", false);
+ logger.trace("boolean isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
@@ -161,7 +172,7 @@ public boolean isDefinitelyWritable(int column) throws SQLException {
@Override
public String getColumnClassName(int column) throws SQLException {
- logger.debug("public String getColumnClassName(int column)", false);
+ logger.trace("String getColumnClassName(int column)", false);
int type = this.getColumnType(column);
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableV1.java
index 5a7821e0b..f82505665 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetSerializableV1.java
@@ -74,7 +74,8 @@ public class SnowflakeResultSetSerializableV1
implements SnowflakeResultSetSerializable, Serializable {
private static final long serialVersionUID = 1L;
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeResultSetSerializableV1.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakeResultSetSerializableV1.class);
static final ObjectMapper mapper = ObjectMapperFactory.getObjectMapper();
private static final long LOW_MAX_MEMORY = GB;
@@ -544,7 +545,7 @@ public static SnowflakeResultSetSerializableV1 create(
ResultStreamProvider resultStreamProvider)
throws SnowflakeSQLException {
SnowflakeResultSetSerializableV1 resultSetSerializable = new SnowflakeResultSetSerializableV1();
- logger.debug("Entering create()", false);
+ logger.trace("Entering create()", false);
SnowflakeUtil.checkErrorAndThrowException(rootNode);
@@ -581,7 +582,7 @@ public static SnowflakeResultSetSerializableV1 create(
resultSetSerializable.possibleSession = Optional.ofNullable(sfSession);
- logger.debug("query id: {}", resultSetSerializable.queryId);
+ logger.debug("Query id: {}", resultSetSerializable.queryId);
Optional queryResultFormat =
QueryResultFormat.lookupByName(rootNode.path("data").path("queryResultFormat").asText());
@@ -670,7 +671,7 @@ public static SnowflakeResultSetSerializableV1 create(
resultSetSerializable.sendResultTime = sendResultTimeNode.longValue();
}
- logger.debug("result version={}", resultSetSerializable.resultVersion);
+ logger.debug("Result version: {}", resultSetSerializable.resultVersion);
// Bind parameter metadata
JsonNode bindData = rootNode.path("data").path("metaDataOfBinds");
@@ -756,7 +757,7 @@ private void setupFieldsFromParameters() {
this.dateFormatter = SnowflakeDateTimeFormat.fromSqlFormat(sqlDateFormat);
logger.debug(
- "sql date format: {}, java date format: {}",
+ "Sql date format: {}, java date format: {}",
sqlDateFormat,
(ArgSupplier) () -> this.dateFormatter.toSimpleDateTimePattern());
@@ -766,7 +767,7 @@ private void setupFieldsFromParameters() {
this.timeFormatter = SnowflakeDateTimeFormat.fromSqlFormat(sqlTimeFormat);
logger.debug(
- "sql time format: {}, java time format: {}",
+ "Sql time format: {}, java time format: {}",
sqlTimeFormat,
(ArgSupplier) () -> this.timeFormatter.toSimpleDateTimePattern());
@@ -803,7 +804,7 @@ private void parseChunkFiles(JsonNode rootNode, SFBaseStatement sfStatement) {
// Determine the prefetch thread count and memoryLimit
if (this.chunkFileCount > 0) {
- logger.debug("#chunks={}, initialize chunk downloader", this.chunkFileCount);
+ logger.debug("#chunks: {}, initialize chunk downloader", this.chunkFileCount);
adjustMemorySettings(sfStatement);
@@ -816,7 +817,7 @@ private void parseChunkFiles(JsonNode rootNode, SFBaseStatement sfStatement) {
Map.Entry chunkHeader = chunkHeadersIter.next();
logger.debug(
- "add header key={}, value={}",
+ "Add header key: {}, value: {}",
chunkHeader.getKey(),
chunkHeader.getValue().asText());
this.chunkHeadersMap.put(chunkHeader.getKey(), chunkHeader.getValue().asText());
@@ -835,7 +836,7 @@ private void parseChunkFiles(JsonNode rootNode, SFBaseStatement sfStatement) {
new ChunkFileMetadata(url, rowCount, compressedSize, uncompressedSize));
logger.debug(
- "add chunk, url={} rowCount={} " + "compressedSize={} uncompressedSize={}",
+ "Add chunk, url: {} rowCount: {} " + "compressedSize: {} uncompressedSize: {}",
url,
rowCount,
compressedSize,
@@ -855,8 +856,8 @@ private void adjustMemorySettings(SFBaseStatement sfStatement) {
this.memoryLimit = sfStatement.getConservativeMemoryLimit();
int chunkSize = (int) this.parameters.get(CLIENT_RESULT_CHUNK_SIZE);
logger.debug(
- "enable conservative memory usage with prefetchThreads = {} and memoryLimit = {} and "
- + "resultChunkSize = {}",
+ "Enable conservative memory usage with prefetchThreads: {} and memoryLimit: {} and "
+ + "resultChunkSize: {}",
this.resultPrefetchThreads,
this.memoryLimit,
chunkSize);
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetV1.java
index 5135e3ca5..49c8c8546 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeResultSetV1.java
@@ -28,13 +28,18 @@
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
+import net.snowflake.client.core.ArrowSqlInput;
+import net.snowflake.client.core.JsonSqlInput;
import net.snowflake.client.core.QueryStatus;
import net.snowflake.client.core.SFBaseResultSet;
import net.snowflake.client.core.SFException;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
/** Snowflake ResultSet implementation */
public class SnowflakeResultSetV1 extends SnowflakeBaseResultSet
implements SnowflakeResultSet, ResultSet {
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeResultSetV1.class);
/**
* Constructor takes an inputstream from the API response that we get from executing a SQL
@@ -263,11 +268,17 @@ public ResultSetMetaData getMetaData() throws SQLException {
public Object getObject(int columnIndex) throws SQLException {
raiseSQLExceptionIfResultSetIsClosed();
- try {
- return sfBaseResultSet.getObject(columnIndex);
- } catch (SFException ex) {
- throw new SnowflakeSQLException(
- ex.getCause(), ex.getSqlState(), ex.getVendorCode(), ex.getParams());
+ Object object =
+ SnowflakeUtil.mapSFExceptionToSQLException(() -> sfBaseResultSet.getObject(columnIndex));
+ if (object == null) {
+ return null;
+ } else if (object instanceof JsonSqlInput) {
+ return ((JsonSqlInput) object).getText();
+ } else if (object instanceof ArrowSqlInput) {
+ throw new SQLException(
+ "Arrow native struct couldn't be converted to String. To map to SqlData the method getObject(int columnIndex, Class type) should be used");
+ } else {
+ return object;
}
}
@@ -351,7 +362,7 @@ public boolean isBeforeFirst() throws SQLException {
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("public boolean isWrapperFor(Class iface)", false);
+ logger.trace("boolean isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
@@ -359,7 +370,7 @@ public boolean isWrapperFor(Class iface) throws SQLException {
@SuppressWarnings("unchecked")
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug("public T unwrap(Class iface)", false);
+ logger.trace(" T unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java
index 00e8a3b64..a88829ec6 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLException.java
@@ -14,7 +14,7 @@
* @author jhuang
*/
public class SnowflakeSQLException extends SQLException {
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeSQLException.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeSQLException.class);
private static final long serialVersionUID = 1L;
@@ -44,7 +44,7 @@ public SnowflakeSQLException(String queryId, String reason, String sqlState, int
// log user error from GS at fine level
logger.debug(
- "Snowflake exception: {}, sqlState:{}, vendorCode:{}, queryId:{}",
+ "Snowflake exception: {}, sqlState: {}, vendorCode: {}, queryId: {}",
reason,
sqlState,
vendorCode,
@@ -54,7 +54,7 @@ public SnowflakeSQLException(String queryId, String reason, String sqlState, int
public SnowflakeSQLException(String reason, String sqlState) {
super(reason, sqlState);
// log user error from GS at fine level
- logger.debug("Snowflake exception: {}, sqlState:{}", reason, sqlState);
+ logger.debug("Snowflake exception: {}, sqlState: {}", reason, sqlState);
}
/** use {@link SnowflakeSQLException#SnowflakeSQLException(String, String, int)} */
@@ -70,7 +70,7 @@ public SnowflakeSQLException(String queryId, String sqlState, int vendorCode) {
vendorCode);
this.queryId = queryId;
logger.debug(
- "Snowflake exception: {}, sqlState:{}, vendorCode:{}",
+ "Snowflake exception: {}, sqlState: {}, vendorCode: {}",
errorResourceBundleManager.getLocalizedMessage(String.valueOf(vendorCode)),
sqlState,
vendorCode);
@@ -89,7 +89,7 @@ public SnowflakeSQLException(String queryId, String sqlState, int vendorCode, Ob
vendorCode);
this.queryId = queryId;
logger.debug(
- "Snowflake exception: {}, sqlState:{}, vendorCode:{}",
+ "Snowflake exception: {}, sqlState: {}, vendorCode: {}",
errorResourceBundleManager.getLocalizedMessage(String.valueOf(vendorCode), params),
sqlState,
vendorCode);
@@ -172,6 +172,10 @@ public SnowflakeSQLException(String reason) {
super(reason);
}
+ public SnowflakeSQLException(Throwable ex, String message) {
+ super(message, ex);
+ }
+
public String getQueryId() {
return queryId;
}
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLLoggedException.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLLoggedException.java
index d9d741a8c..cdc33322d 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLLoggedException.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeSQLLoggedException.java
@@ -25,6 +25,8 @@
import net.snowflake.client.jdbc.telemetry.TelemetryUtil;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryEvent;
import net.snowflake.client.jdbc.telemetryOOB.TelemetryService;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.common.core.LoginInfoDTO;
import net.snowflake.common.core.SqlState;
@@ -36,7 +38,8 @@
* exception with OOB telemetry.
*/
public class SnowflakeSQLLoggedException extends SnowflakeSQLException {
-
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakeSQLLoggedException.class);
private static final ObjectMapper mapper = ObjectMapperFactory.getObjectMapper();
/**
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeSimulatedUploadFailure.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeSimulatedUploadFailure.java
index 992cf123d..ede179a9c 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeSimulatedUploadFailure.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeSimulatedUploadFailure.java
@@ -11,7 +11,8 @@
public class SnowflakeSimulatedUploadFailure extends RuntimeException {
private static final long serialVersionUID = 1L;
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeSimulatedUploadFailure.class);
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(SnowflakeSimulatedUploadFailure.class);
public SnowflakeSimulatedUploadFailure() {
super();
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java
index a4c9100c3..5016c175b 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeStatementV1.java
@@ -35,7 +35,7 @@
/** Snowflake statement */
class SnowflakeStatementV1 implements Statement, SnowflakeStatement {
- static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeStatementV1.class);
+ private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeStatementV1.class);
private static final String NOOP_MESSAGE =
"This is a dummy SnowflakeStatement, " + "no member function should be called for it.";
@@ -68,9 +68,6 @@ class SnowflakeStatementV1 implements Statement, SnowflakeStatement {
// timeout in seconds
private int queryTimeout = 0;
- // max field size limited to 16MB
- private final int maxFieldSize = 16777216;
-
SFBaseStatement sfBaseStatement;
private boolean poolable;
@@ -101,7 +98,7 @@ class SnowflakeStatementV1 implements Statement, SnowflakeStatement {
int resultSetConcurrency,
int resultSetHoldability)
throws SQLException {
- logger.debug(" public SnowflakeStatement(SnowflakeConnectionV1 conn)", false);
+ logger.trace("SnowflakeStatement(SnowflakeConnectionV1 conn)", false);
this.connection = connection;
@@ -155,6 +152,7 @@ public ResultSet executeQuery(String sql) throws SQLException {
ResultSet rs = executeQueryInternal(sql, false, null, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", execTimeData.getLogString());
return rs;
}
@@ -172,6 +170,7 @@ public ResultSet executeAsyncQuery(String sql) throws SQLException {
ResultSet rs = executeQueryInternal(sql, true, null, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", queryID, execTimeData.getLogString());
return rs;
}
@@ -206,6 +205,7 @@ public long executeLargeUpdate(String sql) throws SQLException {
long res = executeUpdateInternal(sql, null, true, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", queryID, execTimeData.getLogString());
return res;
}
@@ -337,7 +337,7 @@ boolean executeInternal(
raiseSQLExceptionIfStatementIsClosed();
connection.injectedDelay();
- logger.debug("execute: {}", sql);
+ logger.debug("Execute: {}", sql);
String trimmedSql = sql.trim();
@@ -428,12 +428,13 @@ public boolean execute(String sql) throws SQLException {
boolean res = executeInternal(sql, null, execTimeData);
execTimeData.setQueryEnd();
execTimeData.generateTelemetry();
+ logger.debug("Query completed. {}", queryID, execTimeData.getLogString());
return res;
}
@Override
public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
- logger.debug("execute(String sql, int autoGeneratedKeys)", false);
+ logger.trace("execute(String sql, int autoGeneratedKeys)", false);
if (autoGeneratedKeys == Statement.NO_GENERATED_KEYS) {
return execute(sql);
@@ -444,14 +445,14 @@ public boolean execute(String sql, int autoGeneratedKeys) throws SQLException {
@Override
public boolean execute(String sql, int[] columnIndexes) throws SQLException {
- logger.debug("execute(String sql, int[] columnIndexes)", false);
+ logger.trace("execute(String sql, int[] columnIndexes)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public boolean execute(String sql, String[] columnNames) throws SQLException {
- logger.debug("execute(String sql, String[] columnNames)", false);
+ logger.trace("execute(String sql, String[] columnNames)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@@ -465,7 +466,7 @@ public boolean execute(String sql, String[] columnNames) throws SQLException {
*/
@Override
public int[] executeBatch() throws SQLException {
- logger.debug("int[] executeBatch()", false);
+ logger.trace("int[] executeBatch()", false);
return executeBatchInternal(false).intArr;
}
@@ -478,7 +479,7 @@ public int[] executeBatch() throws SQLException {
*/
@Override
public long[] executeLargeBatch() throws SQLException {
- logger.debug("executeBatch()", false);
+ logger.trace("executeBatch()", false);
return executeBatchInternal(true).longArr;
}
@@ -560,14 +561,14 @@ VariableTypeArray executeBatchInternal(boolean isLong) throws SQLException {
@Override
public int executeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
- logger.debug("executeUpdate(String sql, int autoGeneratedKeys)", false);
+ logger.trace("executeUpdate(String sql, int autoGeneratedKeys)", false);
return (int) this.executeLargeUpdate(sql, autoGeneratedKeys);
}
@Override
public long executeLargeUpdate(String sql, int autoGeneratedKeys) throws SQLException {
- logger.debug("executeUpdate(String sql, int autoGeneratedKeys)", false);
+ logger.trace("executeUpdate(String sql, int autoGeneratedKeys)", false);
if (autoGeneratedKeys == Statement.NO_GENERATED_KEYS) {
return executeLargeUpdate(sql);
@@ -578,84 +579,84 @@ public long executeLargeUpdate(String sql, int autoGeneratedKeys) throws SQLExce
@Override
public int executeUpdate(String sql, int[] columnIndexes) throws SQLException {
- logger.debug("executeUpdate(String sql, int[] columnIndexes)", false);
+ logger.trace("executeUpdate(String sql, int[] columnIndexes)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public long executeLargeUpdate(String sql, int[] columnIndexes) throws SQLException {
- logger.debug("executeLargeUpdate(String sql, int[] columnIndexes)", false);
+ logger.trace("executeLargeUpdate(String sql, int[] columnIndexes)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public int executeUpdate(String sql, String[] columnNames) throws SQLException {
- logger.debug("executeUpdate(String sql, String[] columnNames)", false);
+ logger.trace("executeUpdate(String sql, String[] columnNames)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public long executeLargeUpdate(String sql, String[] columnNames) throws SQLException {
- logger.debug("executeUpdate(String sql, String[] columnNames)", false);
+ logger.trace("executeUpdate(String sql, String[] columnNames)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public Connection getConnection() throws SQLException {
- logger.debug("getConnection()", false);
+ logger.trace("getConnection()", false);
raiseSQLExceptionIfStatementIsClosed();
return connection;
}
@Override
public int getFetchDirection() throws SQLException {
- logger.debug("getFetchDirection()", false);
+ logger.trace("getFetchDirection()", false);
raiseSQLExceptionIfStatementIsClosed();
return ResultSet.FETCH_FORWARD;
}
@Override
public int getFetchSize() throws SQLException {
- logger.debug("getFetchSize()", false);
+ logger.trace("getFetchSize()", false);
raiseSQLExceptionIfStatementIsClosed();
return fetchSize;
}
@Override
public ResultSet getGeneratedKeys() throws SQLException {
- logger.debug("getGeneratedKeys()", false);
+ logger.trace("getGeneratedKeys()", false);
raiseSQLExceptionIfStatementIsClosed();
return new SnowflakeResultSetV1.EmptyResultSet();
}
@Override
public int getMaxFieldSize() throws SQLException {
- logger.debug("getMaxFieldSize()", false);
+ logger.trace("getMaxFieldSize()", false);
raiseSQLExceptionIfStatementIsClosed();
- return maxFieldSize;
+ return connection.getMetaData().getMaxCharLiteralLength();
}
@Override
public int getMaxRows() throws SQLException {
- logger.debug("getMaxRows()", false);
+ logger.trace("getMaxRows()", false);
raiseSQLExceptionIfStatementIsClosed();
return maxRows;
}
@Override
public boolean getMoreResults() throws SQLException {
- logger.debug("getMoreResults()", false);
+ logger.trace("getMoreResults()", false);
return getMoreResults(Statement.CLOSE_CURRENT_RESULT);
}
@Override
public boolean getMoreResults(int current) throws SQLException {
- logger.debug("getMoreResults(int current)", false);
+ logger.trace("getMoreResults(int current)", false);
raiseSQLExceptionIfStatementIsClosed();
// clean up the current result set, if it exists
@@ -704,48 +705,48 @@ public boolean getMoreResults(int current) throws SQLException {
@Override
public int getQueryTimeout() throws SQLException {
- logger.debug("getQueryTimeout()", false);
+ logger.trace("getQueryTimeout()", false);
raiseSQLExceptionIfStatementIsClosed();
return this.queryTimeout;
}
@Override
public ResultSet getResultSet() throws SQLException {
- logger.debug("getResultSet()", false);
+ logger.trace("getResultSet()", false);
raiseSQLExceptionIfStatementIsClosed();
return resultSet;
}
@Override
public int getResultSetConcurrency() throws SQLException {
- logger.debug("getResultSetConcurrency()", false);
+ logger.trace("getResultSetConcurrency()", false);
raiseSQLExceptionIfStatementIsClosed();
return resultSetConcurrency;
}
@Override
public int getResultSetHoldability() throws SQLException {
- logger.debug("getResultSetHoldability()", false);
+ logger.trace("getResultSetHoldability()", false);
raiseSQLExceptionIfStatementIsClosed();
return resultSetHoldability;
}
@Override
public int getResultSetType() throws SQLException {
- logger.debug("getResultSetType()", false);
+ logger.trace("getResultSetType()", false);
raiseSQLExceptionIfStatementIsClosed();
return this.resultSetType;
}
@Override
public int getUpdateCount() throws SQLException {
- logger.debug("getUpdateCount()", false);
+ logger.trace("getUpdateCount()", false);
return (int) getUpdateCountIfDML();
}
@Override
public long getLargeUpdateCount() throws SQLException {
- logger.debug("getLargeUpdateCount()", false);
+ logger.trace("getLargeUpdateCount()", false);
return getUpdateCountIfDML();
}
@@ -756,34 +757,34 @@ private long getUpdateCountIfDML() throws SQLException {
@Override
public SQLWarning getWarnings() throws SQLException {
- logger.debug("getWarnings()", false);
+ logger.trace("getWarnings()", false);
raiseSQLExceptionIfStatementIsClosed();
return sqlWarnings;
}
@Override
public boolean isClosed() throws SQLException {
- logger.debug("isClosed()", false);
+ logger.trace("isClosed()", false);
return isClosed; // no exception
}
@Override
public boolean isPoolable() throws SQLException {
- logger.debug("isPoolable()", false);
+ logger.trace("isPoolable()", false);
raiseSQLExceptionIfStatementIsClosed();
return poolable;
}
@Override
public void setCursorName(String name) throws SQLException {
- logger.debug("setCursorName(String name)", false);
+ logger.trace("setCursorName(String name)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public void setEscapeProcessing(boolean enable) throws SQLException {
- logger.debug("setEscapeProcessing(boolean enable)", false);
+ logger.trace("setEscapeProcessing(boolean enable)", false);
// NOTE: We could raise an exception here, because not implemented
// but it may break the existing applications. For now returning nothing.
// we should revisit.
@@ -792,7 +793,7 @@ public void setEscapeProcessing(boolean enable) throws SQLException {
@Override
public void setFetchDirection(int direction) throws SQLException {
- logger.debug("setFetchDirection(int direction)", false);
+ logger.trace("setFetchDirection(int direction)", false);
raiseSQLExceptionIfStatementIsClosed();
if (direction != ResultSet.FETCH_FORWARD) {
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
@@ -801,21 +802,21 @@ public void setFetchDirection(int direction) throws SQLException {
@Override
public void setFetchSize(int rows) throws SQLException {
- logger.debug("setFetchSize(int rows), rows={}", rows);
+ logger.trace("setFetchSize(int rows), rows={}", rows);
raiseSQLExceptionIfStatementIsClosed();
fetchSize = rows;
}
@Override
public void setMaxFieldSize(int max) throws SQLException {
- logger.debug("setMaxFieldSize(int max)", false);
+ logger.trace("setMaxFieldSize(int max)", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public void setMaxRows(int max) throws SQLException {
- logger.debug("setMaxRows(int max)", false);
+ logger.trace("setMaxRows(int max)", false);
raiseSQLExceptionIfStatementIsClosed();
@@ -832,7 +833,7 @@ public void setMaxRows(int max) throws SQLException {
@Override
public void setPoolable(boolean poolable) throws SQLException {
- logger.debug("setPoolable(boolean poolable)", false);
+ logger.trace("setPoolable(boolean poolable)", false);
raiseSQLExceptionIfStatementIsClosed();
if (poolable) {
@@ -849,7 +850,7 @@ public void setPoolable(boolean poolable) throws SQLException {
* @throws SQLException if any SQL error occurs.
*/
public void setParameter(String name, Object value) throws SQLException {
- logger.debug("setParameter", false);
+ logger.trace("setParameter", false);
try {
if (this.sfBaseStatement != null) {
@@ -867,7 +868,7 @@ public void setBatchID(String batchID) {
@Override
public void setQueryTimeout(int seconds) throws SQLException {
- logger.debug("setQueryTimeout(int seconds)", false);
+ logger.trace("setQueryTimeout(int seconds)", false);
raiseSQLExceptionIfStatementIsClosed();
this.queryTimeout = seconds;
@@ -883,7 +884,7 @@ public void setQueryTimeout(int seconds) throws SQLException {
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("isWrapperFor(Class iface)", false);
+ logger.trace("isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
@@ -891,7 +892,7 @@ public boolean isWrapperFor(Class iface) throws SQLException {
@SuppressWarnings("unchecked")
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug("unwrap(Class iface)", false);
+ logger.trace("unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
@@ -902,13 +903,13 @@ public T unwrap(Class iface) throws SQLException {
@Override
public void closeOnCompletion() throws SQLException {
- logger.debug("closeOnCompletion()", false);
+ logger.trace("closeOnCompletion()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@Override
public boolean isCloseOnCompletion() throws SQLException {
- logger.debug("isCloseOnCompletion()", false);
+ logger.trace("isCloseOnCompletion()", false);
throw new SnowflakeLoggedFeatureNotSupportedException(connection.getSFBaseSession());
}
@@ -918,7 +919,7 @@ public void close() throws SQLException {
}
public void close(boolean removeClosedStatementFromConnection) throws SQLException {
- logger.debug("close()", false);
+ logger.trace("close()", false);
// No exception is raised even if the statement is closed.
if (resultSet != null) {
@@ -947,7 +948,7 @@ public void close(boolean removeClosedStatementFromConnection) throws SQLExcepti
@Override
public void cancel() throws SQLException {
- logger.debug("cancel()", false);
+ logger.trace("cancel()", false);
raiseSQLExceptionIfStatementIsClosed();
try {
@@ -959,14 +960,14 @@ public void cancel() throws SQLException {
@Override
public void clearWarnings() throws SQLException {
- logger.debug("clearWarnings()", false);
+ logger.trace("clearWarnings()", false);
raiseSQLExceptionIfStatementIsClosed();
sqlWarnings = null;
}
@Override
public void addBatch(String sql) throws SQLException {
- logger.debug("addBatch(String sql)", false);
+ logger.trace("addBatch(String sql)", false);
raiseSQLExceptionIfStatementIsClosed();
@@ -975,7 +976,7 @@ public void addBatch(String sql) throws SQLException {
@Override
public void clearBatch() throws SQLException {
- logger.debug("clearBatch()", false);
+ logger.trace("clearBatch()", false);
raiseSQLExceptionIfStatementIsClosed();
@@ -983,7 +984,7 @@ public void clearBatch() throws SQLException {
}
private void executeSetProperty(final String sql) {
- logger.debug("setting property", false);
+ logger.trace("setting property", false);
// tokenize the sql
String[] tokens = sql.split("\\s+");
@@ -1260,7 +1261,7 @@ public void setQueryTimeout(int seconds) throws SQLException {}
@Override
public boolean isWrapperFor(Class iface) throws SQLException {
- logger.debug("isWrapperFor(Class iface)", false);
+ logger.trace("isWrapperFor(Class iface)", false);
return iface.isInstance(this);
}
@@ -1268,7 +1269,7 @@ public boolean isWrapperFor(Class iface) throws SQLException {
@SuppressWarnings("unchecked")
@Override
public T unwrap(Class iface) throws SQLException {
- logger.debug("unwrap(Class iface)", false);
+ logger.trace("unwrap(Class iface)", false);
if (!iface.isInstance(this)) {
throw new SQLException(
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java
index beccc79b2..ea958c551 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeType.java
@@ -447,6 +447,9 @@ public static SnowflakeType javaTypeToSFType(int javaType, SFBaseSession session
case Types.STRUCT:
return OBJECT;
+ case Types.ARRAY:
+ return ARRAY;
+
case Types.NULL:
return ANY;
diff --git a/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java b/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java
index fecba4bba..efe8ffbf8 100644
--- a/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java
+++ b/src/main/java/net/snowflake/client/jdbc/SnowflakeUtil.java
@@ -6,7 +6,9 @@
import static net.snowflake.client.jdbc.SnowflakeType.GEOGRAPHY;
+import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.google.common.base.Strings;
import java.io.BufferedReader;
@@ -15,6 +17,7 @@
import java.io.PrintWriter;
import java.io.StringWriter;
import java.lang.reflect.Field;
+import java.lang.reflect.Method;
import java.sql.SQLException;
import java.sql.Time;
import java.sql.Types;
@@ -33,8 +36,10 @@
import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import net.snowflake.client.core.Constants;
import net.snowflake.client.core.HttpClientSettingsKey;
import net.snowflake.client.core.OCSPMode;
+import net.snowflake.client.core.ObjectMapperFactory;
import net.snowflake.client.core.SFBaseSession;
import net.snowflake.client.core.SFException;
import net.snowflake.client.core.SFSessionProperty;
@@ -55,6 +60,7 @@
public class SnowflakeUtil {
private static final SFLogger logger = SFLoggerFactory.getLogger(SnowflakeUtil.class);
+ private static final ObjectMapper OBJECT_MAPPER = ObjectMapperFactory.getObjectMapper();
/** Additional data types not covered by standard JDBC */
public static final int EXTRA_TYPES_TIMESTAMP_LTZ = 50000;
@@ -86,6 +92,10 @@ public class SnowflakeUtil {
public static final String BYTE_STR = "byte";
public static final String BYTES_STR = "byte array";
+ public static String mapJson(Object ob) throws JsonProcessingException {
+ return OBJECT_MAPPER.writeValueAsString(ob);
+ }
+
public static void checkErrorAndThrowExceptionIncludingReauth(JsonNode rootNode)
throws SnowflakeSQLException {
checkErrorAndThrowExceptionSub(rootNode, true);
@@ -171,6 +181,15 @@ public static SnowflakeColumnMetadata extractColumnMetadata(
int precision = colNode.path("precision").asInt();
int scale = colNode.path("scale").asInt();
int length = colNode.path("length").asInt();
+ int dimension =
+ colNode
+ .path("dimension")
+ .asInt(); // vector dimension when checking columns via connection.getMetadata
+ int vectorDimension =
+ colNode
+ .path("vectorDimension")
+ .asInt(); // dimension when checking columns via resultSet.getMetadata
+ int finalVectorDimension = dimension > 0 ? dimension : vectorDimension;
boolean fixed = colNode.path("fixed").asBoolean();
JsonNode udtOutputType = colNode.path("outputType");
JsonNode extColTypeNameNode = colNode.path("extTypeName");
@@ -213,7 +232,8 @@ public static SnowflakeColumnMetadata extractColumnMetadata(
colSrcDatabase,
colSrcSchema,
colSrcTable,
- isAutoIncrement);
+ isAutoIncrement,
+ finalVectorDimension);
}
static ColumnTypeInfo getSnowflakeType(
@@ -303,8 +323,9 @@ static ColumnTypeInfo getSnowflakeType(
break;
case ARRAY:
+ int columnType = isStructuredType ? Types.ARRAY : Types.VARCHAR;
columnTypeInfo =
- new ColumnTypeInfo(Types.ARRAY, defaultIfNull(extColTypeName, "ARRAY"), baseType);
+ new ColumnTypeInfo(columnType, defaultIfNull(extColTypeName, "ARRAY"), baseType);
break;
case MAP:
@@ -374,7 +395,13 @@ static List createFieldsMetadata(
throws SnowflakeSQLLoggedException {
List fields = new ArrayList<>();
for (JsonNode node : fieldsJson) {
- String colName = node.path("name").asText();
+ String colName;
+ if (!node.path("fieldType").isEmpty()) {
+ colName = node.path("fieldName").asText();
+ node = node.path("fieldType");
+ } else {
+ colName = node.path("name").asText();
+ }
int scale = node.path("scale").asInt();
int precision = node.path("precision").asInt();
String internalColTypeName = node.path("type").asText();
@@ -437,7 +464,8 @@ static String javaTypeToSFTypeString(int javaType, SFBaseSession session)
return SnowflakeType.javaTypeToSFType(javaType, session).name();
}
- static SnowflakeType javaTypeToSFType(int javaType, SFBaseSession session)
+ @SnowflakeJdbcInternalApi
+ public static SnowflakeType javaTypeToSFType(int javaType, SFBaseSession session)
throws SnowflakeSQLException {
return SnowflakeType.javaTypeToSFType(javaType, session);
}
@@ -548,7 +576,9 @@ static List describeFixedViewColumns(
"", // database
"", // schema
"",
- false)); // isAutoincrement
+ false, // isAutoincrement
+ 0 // dimension
+ ));
}
return rowType;
@@ -696,6 +726,18 @@ public static void systemSetEnv(String key, String value) {
field.setAccessible(true);
Map writableEnv = (Map) field.get(env);
writableEnv.put(key, value);
+
+ // To an environment variable is set on Windows, it uses a different map to store the values
+ // when the system.getenv(VAR_NAME) is used its required to update in this additional place.
+ if (Constants.getOS() == Constants.OS.WINDOWS) {
+ Class pe = Class.forName("java.lang.ProcessEnvironment");
+ Method getenv = pe.getDeclaredMethod("getenv", String.class);
+ getenv.setAccessible(true);
+ Field props = pe.getDeclaredField("theCaseInsensitiveEnvironment");
+ props.setAccessible(true);
+ Map writableEnvForGet = (Map) props.get(null);
+ writableEnvForGet.put(key, value);
+ }
} catch (Exception e) {
System.out.println("Failed to set value");
logger.error(
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3HttpUtil.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3HttpUtil.java
index ec7f0c7ca..49b3542fd 100644
--- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3HttpUtil.java
+++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/S3HttpUtil.java
@@ -10,13 +10,19 @@
import java.util.Properties;
import net.snowflake.client.core.HttpClientSettingsKey;
import net.snowflake.client.core.HttpProtocol;
+import net.snowflake.client.core.HttpUtil;
import net.snowflake.client.core.SFSessionProperty;
import net.snowflake.client.core.SnowflakeJdbcInternalApi;
import net.snowflake.client.jdbc.ErrorCode;
import net.snowflake.client.jdbc.SnowflakeSQLException;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
+import net.snowflake.client.log.SFLoggerUtil;
@SnowflakeJdbcInternalApi
public class S3HttpUtil {
+ private static final SFLogger logger = SFLoggerFactory.getLogger(HttpUtil.class);
+
/**
* A static function to set S3 proxy params when there is a valid session
*
@@ -30,11 +36,28 @@ public static void setProxyForS3(HttpClientSettingsKey key, ClientConfiguration
clientConfig.setProxyHost(key.getProxyHost());
clientConfig.setProxyPort(key.getProxyPort());
clientConfig.setNonProxyHosts(key.getNonProxyHosts());
+ String logMessage =
+ "Setting S3 proxy. Host: "
+ + key.getProxyHost()
+ + ", port: "
+ + key.getProxyPort()
+ + ", protocol: "
+ + key.getProxyHttpProtocol()
+ + ", non-proxy hosts: "
+ + key.getNonProxyHosts();
if (!Strings.isNullOrEmpty(key.getProxyUser())
&& !Strings.isNullOrEmpty(key.getProxyPassword())) {
+ logMessage +=
+ ", user: "
+ + key.getProxyUser()
+ + ", password is "
+ + SFLoggerUtil.isVariableProvided(key.getProxyPassword());
clientConfig.setProxyUsername(key.getProxyUser());
clientConfig.setProxyPassword(key.getProxyPassword());
}
+ logger.debug(logMessage);
+ } else {
+ logger.debug("Omitting S3 proxy setup");
}
}
@@ -84,11 +107,26 @@ public static void setSessionlessProxyForS3(
clientConfig.setProxyPort(proxyPort);
clientConfig.setNonProxyHosts(nonProxyHosts);
clientConfig.setProxyProtocol(protocolEnum);
+ String logMessage =
+ "Setting sessionless S3 proxy. Host: "
+ + proxyHost
+ + ", port: "
+ + proxyPort
+ + ", non-proxy hosts: "
+ + nonProxyHosts
+ + ", protocol: "
+ + proxyProtocol;
if (!Strings.isNullOrEmpty(proxyUser) && !Strings.isNullOrEmpty(proxyPassword)) {
+ logMessage += ", user: " + proxyUser + " with password provided";
clientConfig.setProxyUsername(proxyUser);
clientConfig.setProxyPassword(proxyPassword);
}
+ logger.debug(logMessage);
+ } else {
+ logger.debug("Omitting sessionless S3 proxy setup as proxy is disabled");
}
+ } else {
+ logger.debug("Omitting sessionless S3 proxy setup");
}
}
}
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java
index 8977d154b..889a1d9e0 100644
--- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java
+++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeAzureClient.java
@@ -56,6 +56,7 @@
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.SFPair;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.RemoteStoreFileEncryptionMaterial;
import net.snowflake.common.core.SqlState;
import org.apache.commons.io.IOUtils;
@@ -92,6 +93,9 @@ private SnowflakeAzureClient() {}
public static SnowflakeAzureClient createSnowflakeAzureClient(
StageInfo stage, RemoteStoreFileEncryptionMaterial encMat, SFBaseSession sfSession)
throws SnowflakeSQLException {
+ logger.info(
+ "Initializing Snowflake Azure client with encryption: {}",
+ encMat != null ? "true" : "false");
SnowflakeAzureClient azureClient = new SnowflakeAzureClient();
azureClient.setupAzureClient(stage, encMat, sfSession);
@@ -208,6 +212,7 @@ public int getEncryptionKeySize() {
*/
@Override
public void renew(Map stageCredentials) throws SnowflakeSQLException {
+ logger.debug("Renewing the Azure client");
stageInfo.setCredentials(stageCredentials);
setupAzureClient(stageInfo, encMat, session);
}
@@ -320,10 +325,14 @@ public void download(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
+ String localFilePath = localLocation + localFileSep + destFileName;
+ logger.info(
+ "Staring download of file from Azure stage path: {} to {}", stageFilePath, localFilePath);
int retryCount = 0;
do {
try {
- String localFilePath = localLocation + localFileSep + destFileName;
File localFile = new File(localFilePath);
CloudBlobContainer container = azStorageClient.getContainerReference(remoteStorageLocation);
CloudBlob blob = container.getBlockBlobReference(stageFilePath);
@@ -332,6 +341,8 @@ public void download(
transferOptions.setConcurrentRequestCount(parallelism);
blob.downloadToFile(localFilePath, null, transferOptions, opContext);
+ stopwatch.stop();
+ long downloadMillis = stopwatch.elapsedMillis();
// Pull object metadata from Azure
blob.downloadAttributes(null, transferOptions, opContext);
@@ -345,6 +356,7 @@ public void download(
String iv = encryptionData.getValue();
if (this.isEncrypting() && this.getEncryptionKeySize() <= 256) {
+ stopwatch.restart();
if (key == null || iv == null) {
throw new SnowflakeSQLLoggedException(
queryId,
@@ -357,10 +369,27 @@ public void download(
// Decrypt file
try {
EncryptionProvider.decrypt(localFile, key, iv, this.encMat);
+ stopwatch.stop();
+ long decryptMillis = stopwatch.elapsedMillis();
+ logger.info(
+ "Azure file {} downloaded to {}. It took {} ms (download: {} ms, decryption: {} ms) with {} retries",
+ remoteStorageLocation,
+ localFile.getAbsolutePath(),
+ downloadMillis + decryptMillis,
+ downloadMillis,
+ decryptMillis,
+ retryCount);
} catch (Exception ex) {
logger.error("Error decrypting file", ex);
throw ex;
}
+ } else {
+ logger.info(
+ "Azure file {} downloaded to {}. It took {} ms with {} retries",
+ remoteStorageLocation,
+ localFile.getAbsolutePath(),
+ downloadMillis,
+ retryCount);
}
return;
@@ -403,6 +432,10 @@ public InputStream downloadToStream(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info(
+ "Staring download of file from Azure stage path: {} to input stream", stageFilePath);
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
int retryCount = 0;
do {
@@ -412,7 +445,8 @@ public InputStream downloadToStream(
CloudBlob blob = container.getBlockBlobReference(stageFilePath);
InputStream stream = blob.openInputStream(null, null, opContext);
-
+ stopwatch.stop();
+ long downloadMillis = stopwatch.elapsedMillis();
Map userDefinedMetadata = blob.getMetadata();
AbstractMap.SimpleEntry encryptionData =
@@ -423,6 +457,7 @@ public InputStream downloadToStream(
String iv = encryptionData.getValue();
if (this.isEncrypting() && this.getEncryptionKeySize() <= 256) {
+ stopwatch.restart();
if (key == null || iv == null) {
throw new SnowflakeSQLLoggedException(
queryId,
@@ -433,8 +468,18 @@ public InputStream downloadToStream(
}
try {
-
- return EncryptionProvider.decryptStream(stream, key, iv, encMat);
+ InputStream is = EncryptionProvider.decryptStream(stream, key, iv, encMat);
+ stopwatch.stop();
+ long decryptMillis = stopwatch.elapsedMillis();
+ logger.info(
+ "Azure file {} downloaded to input stream. It took {} ms "
+ + "(download: {} ms, decryption: {} ms) with {} retries",
+ stageFilePath,
+ downloadMillis + decryptMillis,
+ downloadMillis,
+ decryptMillis,
+ retryCount);
+ return is;
} catch (Exception ex) {
logger.error("Error in decrypting file", ex);
@@ -442,6 +487,11 @@ public InputStream downloadToStream(
}
} else {
+ logger.info(
+ "Azure file {} downloaded to input stream. Download took {} ms with {} retries",
+ stageFilePath,
+ downloadMillis,
+ retryCount);
return stream;
}
@@ -493,6 +543,9 @@ public void upload(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info(
+ StorageHelper.getStartUploadLog(
+ "Azure", uploadFromStream, inputStream, fileBackedOutputStream, srcFile, destFileName));
final List toClose = new ArrayList<>();
long originalContentLength = meta.getContentLength();
@@ -512,9 +565,10 @@ public void upload(
}
int retryCount = 0;
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
do {
try {
- logger.debug("Starting upload", false);
InputStream fileInputStream = uploadStreamInfo.left;
CloudBlobContainer container = azStorageClient.getContainerReference(remoteStorageLocation);
CloudBlockBlob blob = container.getBlockBlobReference(destFileName);
@@ -531,7 +585,22 @@ public void upload(
null,
transferOptions,
opContext);
- logger.debug("Upload successful", false);
+ stopwatch.stop();
+
+ if (uploadFromStream) {
+ logger.info(
+ "Uploaded data from input stream to Azure location: {}. It took {} ms with {} retries",
+ remoteStorageLocation,
+ stopwatch.elapsedMillis(),
+ retryCount);
+ } else {
+ logger.info(
+ "Uploaded file {} to Azure location: {}. It took {} ms with {} retries",
+ srcFile.getAbsolutePath(),
+ remoteStorageLocation,
+ stopwatch.elapsedMillis(),
+ retryCount);
+ }
blob.uploadMetadata(null, transferOptions, opContext);
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java
index 61c31b3ab..506293023 100644
--- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java
+++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeGCSClient.java
@@ -58,6 +58,7 @@
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.SFPair;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.RemoteStoreFileEncryptionMaterial;
import net.snowflake.common.core.SqlState;
import org.apache.commons.io.IOUtils;
@@ -106,6 +107,8 @@ private SnowflakeGCSClient() {}
public static SnowflakeGCSClient createSnowflakeGCSClient(
StageInfo stage, RemoteStoreFileEncryptionMaterial encMat, SFSession session)
throws SnowflakeSQLException {
+ logger.debug(
+ "Initializing Snowflake GCS client with encryption: {}", encMat != null ? "true" : "false");
SnowflakeGCSClient sfGcsClient = new SnowflakeGCSClient();
sfGcsClient.setupGCSClient(stage, encMat, session);
@@ -165,6 +168,7 @@ public boolean requirePresignedUrl() {
@Override
public void renew(Map stageCredentials) throws SnowflakeSQLException {
+ logger.debug("Renewing the Snowflake GCS client");
stageInfo.setCredentials(stageCredentials);
setupGCSClient(stageInfo, encMat, session);
}
@@ -249,14 +253,18 @@ public void download(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
- int retryCount = 0;
String localFilePath = localLocation + localFileSep + destFileName;
+ logger.info(
+ "Staring download of file from GCS stage path: {} to {}", stageFilePath, localFilePath);
+ int retryCount = 0;
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
File localFile = new File(localFilePath);
-
do {
try {
String key = null;
String iv = null;
+ long downloadMillis = 0;
if (!Strings.isNullOrEmpty(presignedUrl)) {
logger.debug("Starting download with presigned URL", false);
URIBuilder uriBuilder = new URIBuilder(presignedUrl);
@@ -269,7 +277,7 @@ public void download(
CloseableHttpClient httpClient =
HttpUtil.getHttpClientWithoutDecompression(session.getHttpClientKey());
- // Put the file on storage using the presigned url
+ // Get the file on storage using the presigned url
HttpResponse response =
RestRequest.execute(
httpClient,
@@ -315,6 +323,8 @@ public void download(
}
}
}
+ stopwatch.stop();
+ downloadMillis = stopwatch.elapsedMillis();
logger.debug("Download successful", false);
} catch (IOException ex) {
logger.debug("Download unsuccessful {}", ex);
@@ -340,6 +350,8 @@ public void download(
logger.debug("Starting download without presigned URL", false);
blob.downloadTo(
localFile.toPath(), Blob.BlobSourceOption.shouldReturnRawInputStream(true));
+ stopwatch.stop();
+ downloadMillis = stopwatch.elapsedMillis();
logger.debug("Download successful", false);
// Get the user-defined BLOB metadata
@@ -370,7 +382,18 @@ public void download(
// Decrypt file
try {
+ stopwatch.start();
EncryptionProvider.decrypt(localFile, key, iv, this.encMat);
+ stopwatch.stop();
+ long decryptMillis = stopwatch.elapsedMillis();
+ logger.info(
+ "GCS file {} downloaded to {}. It took {} ms (download: {} ms, decryption: {} ms) with {} retries",
+ stageFilePath,
+ localFile.getAbsolutePath(),
+ downloadMillis + decryptMillis,
+ downloadMillis,
+ decryptMillis,
+ retryCount);
} catch (Exception ex) {
logger.error("Error decrypting file", ex);
throw new SnowflakeSQLLoggedException(
@@ -380,6 +403,13 @@ public void download(
SqlState.INTERNAL_ERROR,
"Cannot decrypt file");
}
+ } else {
+ logger.info(
+ "GCS file {} downloaded to {}. It took {} ms with {} retries",
+ stageFilePath,
+ localFile.getAbsolutePath(),
+ downloadMillis,
+ retryCount);
}
return;
} catch (Exception ex) {
@@ -421,8 +451,12 @@ public InputStream downloadToStream(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info("Staring download of file from GCS stage path: {} to input stream", stageFilePath);
int retryCount = 0;
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
InputStream inputStream = null;
+ long downloadMillis = 0;
do {
try {
String key = null;
@@ -478,6 +512,8 @@ public InputStream downloadToStream(
}
}
}
+ stopwatch.stop();
+ downloadMillis = stopwatch.elapsedMillis();
logger.debug("Download successful", false);
} catch (IOException ex) {
logger.debug("Download unsuccessful {}", ex);
@@ -509,9 +545,12 @@ public InputStream downloadToStream(
key = encryptionData.getKey();
iv = encryptionData.getValue();
}
+ stopwatch.stop();
+ downloadMillis = stopwatch.elapsedMillis();
}
if (this.isEncrypting() && this.getEncryptionKeySize() <= 256) {
+ stopwatch.restart();
if (key == null || iv == null) {
throw new SnowflakeSQLException(
queryId,
@@ -523,7 +562,17 @@ public InputStream downloadToStream(
// Decrypt file
try {
if (inputStream != null) {
+
inputStream = EncryptionProvider.decryptStream(inputStream, key, iv, this.encMat);
+ stopwatch.stop();
+ long decryptMillis = stopwatch.elapsedMillis();
+ logger.info(
+ "GCS file {} downloaded to stream. It took {} ms (download: {} ms, decryption: {} ms) with {} retries",
+ stageFilePath,
+ downloadMillis + decryptMillis,
+ downloadMillis,
+ decryptMillis,
+ retryCount);
return inputStream;
}
} catch (Exception ex) {
@@ -535,7 +584,15 @@ public InputStream downloadToStream(
SqlState.INTERNAL_ERROR,
"Cannot decrypt file");
}
+ } else {
+ logger.info(
+ "GCS file {} downloaded to stream. Download took {} ms with {} retries",
+ stageFilePath,
+ downloadMillis,
+ retryCount);
}
+
+ return inputStream;
} catch (Exception ex) {
logger.debug("Download unsuccessful {}", ex);
handleStorageException(ex, ++retryCount, "download", session, command, queryId);
@@ -584,6 +641,9 @@ public void uploadWithPresignedUrlWithoutConnection(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info(
+ StorageHelper.getStartUploadLog(
+ "GCS", uploadFromStream, inputStream, fileBackedOutputStream, srcFile, destFileName));
final List toClose = new ArrayList<>();
long originalContentLength = meta.getContentLength();
@@ -601,7 +661,8 @@ public void uploadWithPresignedUrlWithoutConnection(
if (!(meta instanceof CommonObjectMetadata)) {
throw new IllegalArgumentException("Unexpected metadata object type");
}
-
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
if (Strings.isNullOrEmpty(presignedUrl) || "null".equalsIgnoreCase(presignedUrl)) {
logger.debug("Starting upload with downscoped token");
uploadWithDownScopedToken(
@@ -611,7 +672,7 @@ public void uploadWithPresignedUrlWithoutConnection(
meta.getUserMetadata(),
uploadStreamInfo.left,
queryId);
- logger.debug("Upload successfully with downscoped token");
+ logger.debug("Upload successful with downscoped token");
} else {
logger.debug("Starting upload with presigned url");
@@ -627,6 +688,20 @@ public void uploadWithPresignedUrlWithoutConnection(
queryId);
logger.debug("Upload successfully with presigned url");
}
+ stopwatch.stop();
+
+ if (uploadFromStream) {
+ logger.info(
+ "Uploaded data from input stream to GCS location: {}. It took {} ms",
+ remoteStorageLocation,
+ stopwatch.elapsedMillis());
+ } else {
+ logger.info(
+ "Uploaded file {} to GCS location: {}. It took {} ms",
+ srcFile.getAbsolutePath(),
+ remoteStorageLocation,
+ stopwatch.elapsedMillis());
+ }
// close any open streams in the "toClose" list and return
for (FileInputStream is : toClose) {
@@ -668,6 +743,9 @@ public void upload(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info(
+ StorageHelper.getStartUploadLog(
+ "GCS", uploadFromStream, inputStream, fileBackedOutputStream, srcFile, destFileName));
final List toClose = new ArrayList<>();
long originalContentLength = meta.getContentLength();
@@ -686,6 +764,8 @@ public void upload(
throw new IllegalArgumentException("Unexpected metadata object type");
}
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
if (!Strings.isNullOrEmpty(presignedUrl)) {
logger.debug("Starting upload with downscope token", false);
uploadWithPresignedUrl(
@@ -698,7 +778,20 @@ public void upload(
presignedUrl,
session.getHttpClientKey(),
queryId);
+ stopwatch.stop();
logger.debug("Upload successful", false);
+ if (uploadFromStream) {
+ logger.info(
+ "Uploaded data from input stream to GCS location: {}. It took {} ms",
+ remoteStorageLocation,
+ stopwatch.elapsedMillis());
+ } else {
+ logger.info(
+ "Uploaded file {} to GCS location: {}. It took {} ms",
+ srcFile.getAbsolutePath(),
+ remoteStorageLocation,
+ stopwatch.elapsedMillis());
+ }
// close any open streams in the "toClose" list and return
for (FileInputStream is : toClose) {
@@ -722,7 +815,20 @@ public void upload(
uploadStreamInfo.left,
queryId);
+ stopwatch.stop();
logger.debug("Upload successful", false);
+ if (uploadFromStream) {
+ logger.info(
+ "Uploaded data from input stream to GCS location: {}. It took {} ms",
+ remoteStorageLocation,
+ stopwatch.elapsedMillis());
+ } else {
+ logger.info(
+ "Uploaded file {} to GCS location: {}. It took {} ms",
+ srcFile.getAbsolutePath(),
+ remoteStorageLocation,
+ stopwatch.elapsedMillis());
+ }
// close any open streams in the "toClose" list and return
for (FileInputStream is : toClose) {
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeS3Client.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeS3Client.java
index 190493b69..5b405a15f 100644
--- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeS3Client.java
+++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/SnowflakeS3Client.java
@@ -67,6 +67,7 @@
import net.snowflake.client.log.SFLogger;
import net.snowflake.client.log.SFLoggerFactory;
import net.snowflake.client.util.SFPair;
+import net.snowflake.client.util.Stopwatch;
import net.snowflake.common.core.RemoteStoreFileEncryptionMaterial;
import net.snowflake.common.core.SqlState;
import org.apache.commons.io.IOUtils;
@@ -116,6 +117,10 @@ public SnowflakeS3Client(
SFBaseSession session,
boolean useS3RegionalUrl)
throws SnowflakeSQLException {
+ logger.debug(
+ "Initializing Snowflake S3 client with encryption: {}, client side encrypted: {}",
+ encMat != null,
+ isClientSideEncrypted);
this.session = session;
this.isUseS3RegionalUrl = useS3RegionalUrl;
setupSnowflakeS3Client(
@@ -217,9 +222,10 @@ private void setupSnowflakeS3Client(
} else {
if (region != null) {
if (this.isUseS3RegionalUrl) {
+ String domainSuffixForRegionalUrl = getDomainSuffixForRegionalUrl(region.getName());
amazonS3Builder.withEndpointConfiguration(
new AwsClientBuilder.EndpointConfiguration(
- "s3." + region.getName() + ".amazonaws.com", region.getName()));
+ "s3." + region.getName() + "." + domainSuffixForRegionalUrl, region.getName()));
} else {
amazonS3Builder.withRegion(region.getName());
}
@@ -230,6 +236,10 @@ private void setupSnowflakeS3Client(
amazonClient = (AmazonS3) amazonS3Builder.build();
}
+ static String getDomainSuffixForRegionalUrl(String regionName) {
+ return regionName.toLowerCase().startsWith("cn-") ? "amazonaws.com.cn" : "amazonaws.com";
+ }
+
// Returns the Max number of retry attempts
@Override
public int getMaxRetries() {
@@ -274,6 +284,7 @@ public int getEncryptionKeySize() {
*/
@Override
public void renew(Map stageCredentials) throws SnowflakeSQLException {
+ logger.debug("Renewing the Snowflake S3 client");
// We renew the client with fresh credentials and with its original parameters
setupSnowflakeS3Client(
stageCredentials,
@@ -288,6 +299,7 @@ public void renew(Map stageCredentials) throws SnowflakeSQLException {
@Override
public void shutdown() {
+ logger.debug("Shutting down the Snowflake S3 client");
amazonClient.shutdown();
}
@@ -335,14 +347,18 @@ public void download(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
+ String localFilePath = localLocation + localFileSep + destFileName;
+ logger.info(
+ "Staring download of file from S3 stage path: {} to {}", stageFilePath, localFilePath);
TransferManager tx = null;
int retryCount = 0;
do {
try {
- File localFile = new File(localLocation + localFileSep + destFileName);
+ File localFile = new File(localFilePath);
- logger.debug(
- "Creating executor service for transfer" + "manager with {} threads", parallelism);
+ logger.debug("Creating executor service for transfer manager with {} threads", parallelism);
// download files from s3
tx =
@@ -369,7 +385,11 @@ public ExecutorService newExecutor() {
myDownload.waitForCompletion();
+ stopwatch.stop();
+ long downloadMillis = stopwatch.elapsedMillis();
+
if (this.isEncrypting() && this.getEncryptionKeySize() < 256) {
+ stopwatch.restart();
if (key == null || iv == null) {
throw new SnowflakeSQLLoggedException(
queryId,
@@ -382,10 +402,27 @@ public ExecutorService newExecutor() {
// Decrypt file
try {
EncryptionProvider.decrypt(localFile, key, iv, this.encMat);
+ stopwatch.stop();
+ long decryptMillis = stopwatch.elapsedMillis();
+ logger.info(
+ "S3 file {} downloaded to {}. It took {} ms (download: {} ms, decryption: {} ms) with {} retries",
+ stageFilePath,
+ localFile.getAbsolutePath(),
+ downloadMillis + decryptMillis,
+ downloadMillis,
+ decryptMillis,
+ retryCount);
} catch (Exception ex) {
logger.error("Error decrypting file", ex);
throw ex;
}
+ } else {
+ logger.info(
+ "S3 file {} downloaded to {}. It took {} ms with {} retries",
+ stageFilePath,
+ localFile.getAbsolutePath(),
+ downloadMillis,
+ retryCount);
}
return;
@@ -433,21 +470,24 @@ public InputStream downloadToStream(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info("Staring download of file from S3 stage path: {} to input stream", stageFilePath);
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
int retryCount = 0;
do {
try {
S3Object file = amazonClient.getObject(remoteStorageLocation, stageFilePath);
-
ObjectMetadata meta = amazonClient.getObjectMetadata(remoteStorageLocation, stageFilePath);
-
InputStream stream = file.getObjectContent();
-
+ stopwatch.stop();
+ long downloadMillis = stopwatch.elapsedMillis();
Map metaMap = meta.getUserMetadata();
String key = metaMap.get(AMZ_KEY);
String iv = metaMap.get(AMZ_IV);
if (this.isEncrypting() && this.getEncryptionKeySize() < 256) {
+ stopwatch.restart();
if (key == null || iv == null) {
throw new SnowflakeSQLLoggedException(
queryId,
@@ -458,16 +498,31 @@ public InputStream downloadToStream(
}
try {
-
- return EncryptionProvider.decryptStream(stream, key, iv, encMat);
+ InputStream is = EncryptionProvider.decryptStream(stream, key, iv, encMat);
+ stopwatch.stop();
+ long decryptMillis = stopwatch.elapsedMillis();
+ logger.info(
+ "S3 file {} downloaded to input stream. It took {} ms "
+ + "(download: {} ms, decryption: {} ms) with {} retries",
+ stageFilePath,
+ downloadMillis + decryptMillis,
+ downloadMillis,
+ decryptMillis,
+ retryCount);
+ return is;
} catch (Exception ex) {
logger.error("Error in decrypting file", ex);
throw ex;
}
} else {
- return stream;
+ logger.info(
+ "S3 file {} downloaded to input stream. Download took {} ms with {} retries",
+ stageFilePath,
+ downloadMillis,
+ retryCount);
}
+ return stream;
} catch (Exception ex) {
handleS3Exception(ex, ++retryCount, "download", session, command, this, queryId);
}
@@ -515,6 +570,10 @@ public void upload(
String presignedUrl,
String queryId)
throws SnowflakeSQLException {
+ logger.info(
+ StorageHelper.getStartUploadLog(
+ "S3", uploadFromStream, inputStream, fileBackedOutputStream, srcFile, destFileName));
+
final long originalContentLength = meta.getContentLength();
final List toClose = new ArrayList<>();
SFPair uploadStreamInfo =
@@ -537,9 +596,10 @@ public void upload(
TransferManager tx = null;
int retryCount = 0;
+ Stopwatch stopwatch = new Stopwatch();
+ stopwatch.start();
do {
try {
-
logger.debug(
"Creating executor service for transfer" + "manager with {} threads", parallelism);
@@ -576,11 +636,28 @@ public ExecutorService newExecutor() {
}
myUpload.waitForCompletion();
+ stopwatch.stop();
+ long uploadMillis = stopwatch.elapsedMillis();
// get out
for (FileInputStream is : toClose) {
IOUtils.closeQuietly(is);
}
+
+ if (uploadFromStream) {
+ logger.info(
+ "Uploaded data from input stream to S3 location: {}. It took {} ms with {} retries",
+ destFileName,
+ uploadMillis,
+ retryCount);
+ } else {
+ logger.info(
+ "Uploaded file {} to S3 location: {}. It took {} ms with {} retries",
+ srcFile.getAbsolutePath(),
+ destFileName,
+ uploadMillis,
+ retryCount);
+ }
return;
} catch (Exception ex) {
@@ -635,7 +712,7 @@ private SFPair createUploadStream(
String queryId)
throws SnowflakeSQLException {
logger.debug(
- "createUploadStream({}, {}, {}, {}, {}, {}, {}) " + "keySize={}",
+ "createUploadStream({}, {}, {}, {}, {}, {}, {}) " + "keySize: {}",
this,
srcFile,
uploadFromStream,
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageClientFactory.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageClientFactory.java
index ef97c9508..ac7de73a6 100644
--- a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageClientFactory.java
+++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageClientFactory.java
@@ -53,7 +53,7 @@ public static StorageClientFactory getFactory() {
public SnowflakeStorageClient createClient(
StageInfo stage, int parallel, RemoteStoreFileEncryptionMaterial encMat, SFSession session)
throws SnowflakeSQLException {
- logger.debug("createClient client type={}", stage.getStageType().name());
+ logger.debug("Creating storage client. Client type: {}", stage.getStageType().name());
switch (stage.getStageType()) {
case S3:
@@ -113,7 +113,7 @@ private SnowflakeS3Client createS3Client(
throws SnowflakeSQLException {
final int S3_TRANSFER_MAX_RETRIES = 3;
- logger.debug("createS3Client encryption={}", (encMat == null ? "no" : "yes"));
+ logger.debug("Creating S3 client with encryption: {}", (encMat == null ? "no" : "yes"));
SnowflakeS3Client s3Client;
@@ -130,8 +130,8 @@ private SnowflakeS3Client createS3Client(
clientConfig.setProxyPassword("");
logger.debug(
- "s3 client configuration: maxConnection={}, connectionTimeout={}, "
- + "socketTimeout={}, maxErrorRetry={}",
+ "S3 client configuration: maxConnection: {}, connectionTimeout: {}, "
+ + "socketTimeout: {}, maxErrorRetry: {}",
clientConfig.getMaxConnections(),
clientConfig.getConnectionTimeout(),
clientConfig.getSocketTimeout(),
@@ -153,7 +153,7 @@ private SnowflakeS3Client createS3Client(
logger.debug("Exception creating s3 client", ex);
throw ex;
}
- logger.debug("s3 client created", false);
+ logger.debug("S3 Storage client created", false);
return s3Client;
}
@@ -195,7 +195,7 @@ public StorageObjectMetadata createStorageMetadataObj(StageInfo.StageType stageT
private SnowflakeAzureClient createAzureClient(
StageInfo stage, RemoteStoreFileEncryptionMaterial encMat, SFBaseSession session)
throws SnowflakeSQLException {
- logger.debug("createAzureClient encryption={}", (encMat == null ? "no" : "yes"));
+ logger.debug("Creating Azure client with encryption: {}", (encMat == null ? "no" : "yes"));
SnowflakeAzureClient azureClient;
@@ -220,7 +220,7 @@ private SnowflakeAzureClient createAzureClient(
private SnowflakeGCSClient createGCSClient(
StageInfo stage, RemoteStoreFileEncryptionMaterial encMat, SFSession session)
throws SnowflakeSQLException {
- logger.debug("createGCSClient encryption={}", (encMat == null ? "no" : "yes"));
+ logger.debug("Creating GCS client with encryption: {}", (encMat == null ? "no" : "yes"));
SnowflakeGCSClient gcsClient;
diff --git a/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageHelper.java b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageHelper.java
new file mode 100644
index 000000000..34098d9d0
--- /dev/null
+++ b/src/main/java/net/snowflake/client/jdbc/cloud/storage/StorageHelper.java
@@ -0,0 +1,36 @@
+package net.snowflake.client.jdbc.cloud.storage;
+
+import java.io.File;
+import java.io.InputStream;
+import net.snowflake.client.jdbc.FileBackedOutputStream;
+
+class StorageHelper {
+ static String getStartUploadLog(
+ String serviceName,
+ boolean uploadFromStream,
+ InputStream inputStream,
+ FileBackedOutputStream fileBackedOutputStream,
+ File srcFile,
+ String destFileName) {
+ if (uploadFromStream && fileBackedOutputStream != null) {
+ File file = fileBackedOutputStream.getFile();
+ String fileBackedOutputStreamType =
+ file == null ? "byte stream" : ("file: " + file.getAbsolutePath());
+ return "Starting upload from stream ("
+ + fileBackedOutputStreamType
+ + ") to "
+ + serviceName
+ + " location: "
+ + destFileName;
+ } else if (uploadFromStream && inputStream != null) {
+ return "Starting upload from input stream to " + serviceName + " location: " + destFileName;
+ } else {
+ return "Starting upload from file "
+ + srcFile.getAbsolutePath()
+ + " to "
+ + serviceName
+ + " location: "
+ + destFileName;
+ }
+ }
+}
diff --git a/src/main/java/net/snowflake/client/jdbc/diagnostic/CertificateDiagnosticCheck.java b/src/main/java/net/snowflake/client/jdbc/diagnostic/CertificateDiagnosticCheck.java
new file mode 100644
index 000000000..1fcbb1fb2
--- /dev/null
+++ b/src/main/java/net/snowflake/client/jdbc/diagnostic/CertificateDiagnosticCheck.java
@@ -0,0 +1,61 @@
+package net.snowflake.client.jdbc.diagnostic;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.Proxy;
+import java.net.URL;
+import java.security.KeyManagementException;
+import java.security.NoSuchAlgorithmException;
+import javax.net.ssl.HttpsURLConnection;
+import javax.net.ssl.SSLContext;
+import javax.net.ssl.SSLSocketFactory;
+import javax.net.ssl.TrustManager;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
+
+class CertificateDiagnosticCheck extends DiagnosticCheck {
+
+ private static final String SECURE_SOCKET_PROTOCOL = "TLS";
+
+ private static final SFLogger logger =
+ SFLoggerFactory.getLogger(CertificateDiagnosticCheck.class);
+
+ public CertificateDiagnosticCheck(ProxyConfig proxyConfig) {
+ super("SSL/TLS Certificate Test", proxyConfig);
+ }
+
+ @Override
+ protected void doCheck(SnowflakeEndpoint snowflakeEndpoint) {
+ String hostname = snowflakeEndpoint.getHost();
+ String port = Integer.toString(snowflakeEndpoint.getPort());
+ if (snowflakeEndpoint.isSslEnabled()) {
+ String urlString = "https://" + hostname + ":" + port;
+ try {
+ SSLContext sslContext = SSLContext.getInstance(SECURE_SOCKET_PROTOCOL);
+ sslContext.init(null, new TrustManager[] {new DiagnosticTrustManager()}, null);
+ HttpsURLConnection.setDefaultSSLSocketFactory(sslContext.getSocketFactory());
+ Proxy proxy = this.proxyConf.getProxy(snowflakeEndpoint);
+ new URL(urlString).openConnection(proxy).connect();
+ } catch (NoSuchAlgorithmException e) {
+ logger.error(
+ "None of the security provider's implementation of SSLContextSpi supports "
+ + SECURE_SOCKET_PROTOCOL,
+ e);
+ } catch (KeyManagementException e) {
+ logger.error("Failed to initialize SSLContext", e);
+ } catch (MalformedURLException e) {
+ logger.error("Failed to create new URL object: " + urlString, e);
+ } catch (IOException e) {
+ logger.error("Failed to open a connection to: " + urlString, e);
+ } catch (Exception e) {
+ logger.error(
+ "Unexpected error occurred when trying to retrieve certificate from: " + hostname, e);
+ } finally {
+ HttpsURLConnection.setDefaultSSLSocketFactory(
+ (SSLSocketFactory) SSLSocketFactory.getDefault());
+ }
+ } else {
+ logger.info("Host " + hostname + ":" + port + " is not secure. Skipping certificate check.");
+ }
+ }
+}
diff --git a/src/main/java/net/snowflake/client/jdbc/diagnostic/DiagnosticCheck.java b/src/main/java/net/snowflake/client/jdbc/diagnostic/DiagnosticCheck.java
new file mode 100644
index 000000000..14aa2ff0a
--- /dev/null
+++ b/src/main/java/net/snowflake/client/jdbc/diagnostic/DiagnosticCheck.java
@@ -0,0 +1,22 @@
+package net.snowflake.client.jdbc.diagnostic;
+
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
+
+abstract class DiagnosticCheck {
+ protected final String name;
+ protected final ProxyConfig proxyConf;
+ private static final SFLogger logger = SFLoggerFactory.getLogger(DiagnosticCheck.class);
+
+ abstract void doCheck(SnowflakeEndpoint snowflakeEndpoint);
+
+ final void run(SnowflakeEndpoint snowflakeEndpoint) {
+ logger.info("JDBC Diagnostics - {}: hostname: {}", this.name, snowflakeEndpoint.getHost());
+ doCheck(snowflakeEndpoint);
+ }
+
+ protected DiagnosticCheck(String name, ProxyConfig proxyConf) {
+ this.name = name;
+ this.proxyConf = proxyConf;
+ }
+}
diff --git a/src/main/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContext.java b/src/main/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContext.java
new file mode 100644
index 000000000..7f146ac1b
--- /dev/null
+++ b/src/main/java/net/snowflake/client/jdbc/diagnostic/DiagnosticContext.java
@@ -0,0 +1,190 @@
+package net.snowflake.client.jdbc.diagnostic;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.io.IOException;
+import java.net.Proxy;
+import java.nio.file.FileSystems;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import net.snowflake.client.core.SFSessionProperty;
+import net.snowflake.client.core.SnowflakeJdbcInternalApi;
+import net.snowflake.client.log.SFLogger;
+import net.snowflake.client.log.SFLoggerFactory;
+
+@SnowflakeJdbcInternalApi
+public class DiagnosticContext {
+
+ private static final SFLogger logger = SFLoggerFactory.getLogger(DiagnosticContext.class);
+ private static final String JAVAX_NET_DEBUG = "javax.net.debug";
+
+ private static final String JAVAX_TRUSTSTORE = "javax.net.ssl.trustStore";
+ private ProxyConfig proxyConf;
+
+ private List endpoints = new ArrayList<>();
+
+ private final DiagnosticCheck[] tests;
+
+ public DiagnosticContext(
+ String allowListFile, Map connectionPropertiesMap) {
+
+ createProxyConfiguration(connectionPropertiesMap);
+
+ try {
+ JsonNode jsonNode = readAllowListJsonFile(allowListFile);
+ for (JsonNode objectNode : jsonNode) {
+ String type = objectNode.get("type").asText();
+ String host = objectNode.get("host").asText();
+ int port = objectNode.get("port").asInt();
+ SnowflakeEndpoint e = new SnowflakeEndpoint(type, host, port);
+ endpoints.add(e);
+ }
+
+ } catch (IOException e) {
+ logger.error("Failed to read allowlist file: ", e);
+ } catch (Exception e) {
+ logger.error("Failed to parse data in allowlist file: " + allowListFile, e);
+ }
+
+ tests =
+ new DiagnosticCheck[] {
+ new DnsDiagnosticCheck(proxyConf),
+ new TcpDiagnosticCheck(proxyConf),
+ new CertificateDiagnosticCheck(proxyConf),
+ new HttpAndHttpsDiagnosticCheck(proxyConf)
+ };
+ }
+
+ /** This constructor is only used for testing */
+ DiagnosticContext(Map connectionPropertiesMap) {
+ createProxyConfiguration(connectionPropertiesMap);
+ tests = null;
+ }
+
+ private void createProxyConfiguration(Map connectionPropertiesMap) {
+ String proxyHost = (String) connectionPropertiesMap.get(SFSessionProperty.PROXY_HOST);
+ int proxyPort =
+ (connectionPropertiesMap.get(SFSessionProperty.PROXY_PORT) == null)
+ ? -1
+ : Integer.parseInt((String) connectionPropertiesMap.get(SFSessionProperty.PROXY_PORT));
+ String nonProxyHosts = (String) connectionPropertiesMap.get(SFSessionProperty.NON_PROXY_HOSTS);
+ proxyConf = new ProxyConfig(proxyHost, proxyPort, nonProxyHosts);
+ }
+
+ public void runDiagnostics() {
+
+ logEnvironmentInfo();
+
+ // Loop through endpoints and run diagnostic test on each one of them
+ for (DiagnosticCheck test : tests) {
+ for (SnowflakeEndpoint endpoint : endpoints) {
+ test.run(endpoint);
+ }
+ }
+ }
+
+ private JsonNode readAllowListJsonFile(String jsonFilePath) throws IOException {
+ ObjectMapper objectMapper = new ObjectMapper();
+ File allowListFile = new File(jsonFilePath);
+
+ return objectMapper.readTree(allowListFile);
+ }
+
+ public void logEnvironmentInfo() {
+ logger.info("Getting environment information");
+ logger.info("Current truststore used: " + getTrustStoreLocation());
+ logger.info("-Dnetworkaddress.cache.ttl: " + System.getProperty("networkaddress.cache.ttl"));
+ logger.info(
+ "-Dnetworkaddress.cache.negative.ttl: "
+ + System.getProperty("networkaddress.cache.negative.ttl"));
+ logger.info("-Djavax.net.debug: " + System.getProperty(JAVAX_NET_DEBUG));
+ }
+
+ private boolean isNullOrEmpty(String a) {
+ return a == null || a.isEmpty();
+ }
+
+ /**
+ * We determine the truststore in use based on the JSSE documentation:
+ *
+ *