Skip to content

Commit 865b5e2

Browse files
authored
Merge pull request #2533 from ClickHouse/jdbc_fix_logging
[JDBC-v2] Removed too verbose logs. Lowered some logs level to debug
2 parents 3e4e092 + 1f00b91 commit 865b5e2

File tree

5 files changed

+11
-13
lines changed

5 files changed

+11
-13
lines changed

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/ClickHouseDriver.java

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,7 @@ public class ClickHouseDriver implements java.sql.Driver {
2020
}
2121

2222
public ClickHouseDriver() {
23-
// log.debug("Creating a new instance of the 'proxy' ClickHouseDriver");
24-
log.info("ClickHouse JDBC driver version: {}", ClickHouseDriver.class.getPackage().getImplementationVersion());
23+
log.debug("ClickHouse JDBC driver version: {}", ClickHouseDriver.class.getPackage().getImplementationVersion());
2524
urlFlagSent = false;
2625
this.driver = getDriver(null);
2726
}
@@ -52,21 +51,21 @@ public boolean isV2(String url) {
5251
log.debug("Checking if V1 driver is requested. V2 is the default driver.");
5352
boolean v1Flag = Boolean.parseBoolean(System.getProperty("clickhouse.jdbc.v1", "false"));
5453
if (v1Flag) {
55-
log.info("V1 driver is requested through system property.");
54+
log.debug("V1 driver is requested through system property.");
5655
return false;
5756
}
5857

5958
if (url != null && url.contains("clickhouse.jdbc.v")) {
6059
urlFlagSent = true;
6160

6261
if (url.contains("clickhouse.jdbc.v1=true")) {
63-
log.info("V1 driver is requested through URL.");
62+
log.debug("V1 driver is requested through URL.");
6463
return false;
6564
} if (url.contains("clickhouse.jdbc.v2=false")) {
66-
log.info("V1 driver is requested through URL.");
65+
log.debug("V1 driver is requested through URL.");
6766
return false;
6867
} else {
69-
log.info("V2 driver is requested through URL.");
68+
log.debug("V2 driver is requested through URL.");
7069
return true;
7170
}
7271
}
@@ -81,10 +80,10 @@ private java.sql.Driver getDriver(String url) {
8180
}
8281

8382
if (isV2(url)) {
84-
log.info("v2 driver");
83+
log.debug("v2 driver");
8584
driver = new com.clickhouse.jdbc.Driver();
8685
} else {
87-
log.info("v1 driver");
86+
log.debug("v1 driver");
8887
driver = new DriverV1();
8988
}
9089

clickhouse-jdbc/src/main/java/com/clickhouse/jdbc/DriverV1.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ public static String getFrameworksDetected() {
109109

110110
public static void load() {
111111
try {
112-
log.info("Registering ClickHouse JDBC driver v1 ({})", driverVersion);
112+
log.debug("Registering ClickHouse JDBC driver v1 ({})", driverVersion);
113113
DriverManager.registerDriver(new DriverV1());
114114
} catch (SQLException e) {
115115
throw new IllegalStateException(e);
@@ -120,7 +120,7 @@ public static void load() {
120120

121121
public static void unload() {
122122
try {
123-
log.info("Unregistering ClickHouse JDBC driver v1 ({})", driverVersion);
123+
log.debug("Unregistering ClickHouse JDBC driver v1 ({})", driverVersion);
124124
DriverManager.deregisterDriver(new DriverV1());
125125
} catch (SQLException e) {
126126
throw new IllegalStateException(e);

jdbc-v2/src/main/java/com/clickhouse/jdbc/ConnectionImpl.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ public class ConnectionImpl implements Connection, JdbcV2Wrapper {
6767

6868
public ConnectionImpl(String url, Properties info) throws SQLException {
6969
try {
70-
log.debug("Creating connection to {}", url);
7170
this.url = url;//Raw URL
7271
this.config = new JdbcConfiguration(url, info);
7372
this.onCluster = false;

jdbc-v2/src/main/java/com/clickhouse/jdbc/Driver.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public static String getFrameworksDetected() {
6464
log.debug("Initializing ClickHouse JDBC driver V2");
6565

6666
driverVersion = ClickHouseClientOption.readVersionFromResource("jdbc-v2-version.properties");
67-
log.info("ClickHouse JDBC driver version: {}", driverVersion);
67+
log.debug("ClickHouse JDBC driver version: {}", driverVersion);
6868

6969
int tmpMajorVersion;
7070
int tmpMinorVersion;

jdbc-v2/src/main/java/com/clickhouse/jdbc/metadata/DatabaseMetaDataImpl.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -744,7 +744,7 @@ public ResultSet getProcedureColumns(String catalog, String schemaPattern, Strin
744744
*/
745745
@Override
746746
public ResultSet getTables(String catalog, String schemaPattern, String tableNamePattern, String[] types) throws SQLException {
747-
log.info("getTables: catalog={}, schemaPattern={}, tableNamePattern={}, types={}", catalog, schemaPattern, tableNamePattern, types);
747+
log.debug("getTables: catalog={}, schemaPattern={}, tableNamePattern={}, types={}", catalog, schemaPattern, tableNamePattern, types);
748748
// TODO: when switch between catalog and schema is implemented, then TABLE_SCHEMA and TABLE_CAT should be populated accordingly
749749
// String commentColumn = connection.getServerVersion().check("[21.6,)") ? "t.comment" : "''";
750750
// TODO: handle useCatalogs == true and return schema catalog name

0 commit comments

Comments
 (0)