IGNITE-6170: JDBC: now all drivers return "Apache Ignite" as product name. This closes #2514.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1d0d6f84 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1d0d6f84 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1d0d6f84 Branch: refs/heads/ignite-5896 Commit: 1d0d6f84a7e263bfc41716fc603d9bd263e79875 Parents: fe656eb Author: Roman Shtykh <[email protected]> Authored: Mon Sep 4 13:35:34 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Sep 4 13:35:34 2017 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java | 2 +- .../ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java | 2 +- .../org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java | 2 +- .../ignite/yardstick/cache/jdbc/JdbcAbstractBenchmark.java | 4 ++-- .../org/apache/ignite/yardstick/cache/jdbc/RdbmsBenchmark.java | 6 +++--- 5 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/1d0d6f84/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java index e2fbe05..f76c4fb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/JdbcDatabaseMetadata.java @@ -113,7 +113,7 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData { /** {@inheritDoc} */ @Override public String getDatabaseProductName() throws SQLException { - return "Ignite Cache"; + return "Apache Ignite"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1d0d6f84/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java index 32e1858..b27fee6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinDatabaseMetadata.java @@ -111,7 +111,7 @@ public class JdbcThinDatabaseMetadata implements DatabaseMetaData { /** {@inheritDoc} */ @Override public String getDatabaseProductName() throws SQLException { - return "Ignite"; + return "Apache Ignite"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1d0d6f84/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java index aad6daa..ac8d9ce 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc2/JdbcDatabaseMetadata.java @@ -112,7 +112,7 @@ public class JdbcDatabaseMetadata implements DatabaseMetaData { /** {@inheritDoc} */ @Override public String getDatabaseProductName() { - return "Ignite Cache"; + return "Apache Ignite"; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/1d0d6f84/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcAbstractBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcAbstractBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcAbstractBenchmark.java index 87c2cab..1e83b58 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcAbstractBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/JdbcAbstractBenchmark.java @@ -123,7 +123,7 @@ public abstract class JdbcAbstractBenchmark extends IgniteAbstractBenchmark { private void dropTestDatabase() throws SQLException { try (Connection conn = connection()) { try (Statement stmt = conn.createStatement()) { - if (!conn.getMetaData().getDatabaseProductName().equals("Ignite Cache")) + if (!conn.getMetaData().getDatabaseProductName().equals("Apache Ignite")) stmt.executeUpdate("drop database " + dbName); } } @@ -194,7 +194,7 @@ public abstract class JdbcAbstractBenchmark extends IgniteAbstractBenchmark { void clearTable(String tblName) throws SQLException { try (Connection conn = connection()) { try (PreparedStatement stmt = conn.prepareStatement("drop table " + tblName)) { - if (!conn.getMetaData().getDatabaseProductName().equals("Ignite Cache")) + if (!conn.getMetaData().getDatabaseProductName().equals("Apache Ignite")) stmt.executeUpdate(); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/1d0d6f84/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/RdbmsBenchmark.java ---------------------------------------------------------------------- diff --git a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/RdbmsBenchmark.java b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/RdbmsBenchmark.java index 341e5a7..5b93d04 100644 --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/RdbmsBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/jdbc/RdbmsBenchmark.java @@ -48,7 +48,7 @@ public class RdbmsBenchmark extends JdbcAbstractBenchmark { @Override public void setUp(BenchmarkConfiguration cfg) throws Exception { super.setUp(cfg); - isIgnite = conn.get().getMetaData().getDatabaseProductName().equals("Ignite Cache"); + isIgnite = conn.get().getMetaData().getDatabaseProductName().equals("Apache Ignite"); if (isIgnite) clearCaches(); @@ -124,7 +124,7 @@ public class RdbmsBenchmark extends JdbcAbstractBenchmark { case "H2": return conn.prepareStatement("merge into " + tblName + " (id, val) values(?, ?)"); - case "Ignite Cache": + case "Apache Ignite": return conn.prepareStatement("merge into " + '"' + tblName + '"' + '.' + tblName + " (_key, val) values(?, ?)"); case "MySQL": @@ -156,7 +156,7 @@ public class RdbmsBenchmark extends JdbcAbstractBenchmark { // No-op. break; - case "Ignite Cache": + case "Apache Ignite": // No-op. break;
