You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2017/04/07 04:38:07 UTC
ignite git commit: IGNITE-4349 Code cleanup.
Repository: ignite
Updated Branches:
refs/heads/ignite-4349 137aefbee -> 6171a26db
IGNITE-4349 Code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6171a26d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6171a26d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6171a26d
Branch: refs/heads/ignite-4349
Commit: 6171a26db1974db5df6e8c08974907aa70c325b8
Parents: 137aefb
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Apr 7 11:38:57 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Apr 7 11:38:57 2017 +0700
----------------------------------------------------------------------
.../console/agent/db/DbMetadataReader.java | 53 +++++++++-----------
.../agent/handlers/DatabaseListener.java | 10 ++--
2 files changed, 31 insertions(+), 32 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6171a26d/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
index a94d7cb..9aa0321 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/db/DbMetadataReader.java
@@ -17,13 +17,23 @@
package org.apache.ignite.console.agent.db;
-import org.apache.ignite.console.agent.db.dialect.*;
-
-import java.io.*;
-import java.net.*;
-import java.sql.*;
-import java.util.*;
-import java.util.logging.*;
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.sql.Connection;
+import java.sql.Driver;
+import java.sql.SQLException;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import org.apache.ignite.console.agent.db.dialect.DB2MetadataDialect;
+import org.apache.ignite.console.agent.db.dialect.DatabaseMetadataDialect;
+import org.apache.ignite.console.agent.db.dialect.JdbcMetadataDialect;
+import org.apache.ignite.console.agent.db.dialect.MySQLMetadataDialect;
+import org.apache.ignite.console.agent.db.dialect.OracleMetadataDialect;
+import org.apache.log4j.Logger;
/**
* Singleton to extract database metadata.
@@ -33,26 +43,9 @@ public class DbMetadataReader {
private static final Logger log = Logger.getLogger(DbMetadataReader.class.getName());
/** */
- private static final DbMetadataReader INSTANCE = new DbMetadataReader();
-
- /** */
private final Map<String, Driver> drivers = new HashMap<>();
/**
- * Default constructor.
- */
- private DbMetadataReader() {
- // No-op.
- }
-
- /**
- * @return Instance.
- */
- public static DbMetadataReader getInstance() {
- return INSTANCE;
- }
-
- /**
* Get specified dialect object for selected database.
*
* @param conn Connection to database.
@@ -64,15 +57,17 @@ public class DbMetadataReader {
if ("Oracle".equals(dbProductName))
return new OracleMetadataDialect();
- else if (dbProductName.startsWith("DB2/"))
+
+ if (dbProductName.startsWith("DB2/"))
return new DB2MetadataDialect();
- else if (dbProductName.equals("MySQL"))
+
+ if ("MySQL".equals(dbProductName))
return new MySQLMetadataDialect();
- else
- return new JdbcMetadataDialect();
+
+ return new JdbcMetadataDialect();
}
catch (SQLException e) {
- log.log(Level.SEVERE, "Failed to resolve dialect (JdbcMetaDataDialect will be used.", e);
+ log.error("Failed to resolve dialect (JdbcMetaDataDialect will be used.", e);
return new JdbcMetadataDialect();
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/6171a26d/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
----------------------------------------------------------------------
diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
index ec41f91..a0e9f8f 100644
--- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
+++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java
@@ -51,6 +51,9 @@ public class DatabaseListener {
private final File driversFolder;
/** */
+ private final DbMetadataReader dbMetaReader;
+
+ /** */
private final AbstractListener schemasLsnr = new AbstractListener() {
@Override public Object execute(Map<String, Object> args) throws Exception {
String driverPath = null;
@@ -178,6 +181,7 @@ public class DatabaseListener {
*/
public DatabaseListener(AgentConfiguration cfg) {
driversFolder = resolvePath(cfg.driversFolder() == null ? "jdbc-drivers" : cfg.driversFolder());
+ dbMetaReader = new DbMetadataReader();
}
/**
@@ -196,7 +200,7 @@ public class DatabaseListener {
if (!new File(jdbcDriverJarPath).isAbsolute() && driversFolder != null)
jdbcDriverJarPath = new File(driversFolder, jdbcDriverJarPath).getPath();
- return DbMetadataReader.getInstance().connect(jdbcDriverJarPath, jdbcDriverCls, jdbcUrl, jdbcInfo);
+ return dbMetaReader.connect(jdbcDriverJarPath, jdbcDriverCls, jdbcUrl, jdbcInfo);
}
/**
@@ -214,7 +218,7 @@ public class DatabaseListener {
", drvCls=" + jdbcDriverCls + ", jdbcUrl=" + jdbcUrl + "]");
try (Connection conn = connect(jdbcDriverJarPath, jdbcDriverCls, jdbcUrl, jdbcInfo)) {
- Collection<String> schemas = DbMetadataReader.getInstance().schemas(conn);
+ Collection<String> schemas = dbMetaReader.schemas(conn);
if (log.isDebugEnabled())
log.debug("Finished collection of schemas [jdbcUrl=" + jdbcUrl + ", count=" + schemas.size() + "]");
@@ -263,7 +267,7 @@ public class DatabaseListener {
", drvCls=" + jdbcDriverCls + ", jdbcUrl=" + jdbcUrl + "]");
try (Connection conn = connect(jdbcDriverJarPath, jdbcDriverCls, jdbcUrl, jdbcInfo)) {
- Collection<DbTable> metadata = DbMetadataReader.getInstance().metadata(conn, schemas, tblsOnly);
+ Collection<DbTable> metadata = dbMetaReader.metadata(conn, schemas, tblsOnly);
if (log.isDebugEnabled())
log.debug("Finished collection of metadata [jdbcUrl=" + jdbcUrl + ", count=" + metadata.size() + "]");