You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2018/12/21 18:37:12 UTC
[geode] branch feature/GEODE-6225 updated (a79018c -> 205308d)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch feature/GEODE-6225
in repository https://gitbox.apache.org/repos/asf/geode.git.
from a79018c WIP: started trying to figure out how to setup schemas in mysql and postgress. Test is currently broken
new d179a99 changed default catalog and schema from null to empty string
new 205308d removed unused connectionUrl parameter from TestConfigService also removed some schema experimentation code from test
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../connectors/jdbc/JdbcAsyncWriterIntegrationTest.java | 2 +-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 3 +--
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 17 ++---------------
.../connectors/jdbc/internal/TestConfigService.java | 17 +++--------------
.../connectors/jdbc/internal/TableMetaDataManager.java | 14 ++++++++++----
5 files changed, 17 insertions(+), 36 deletions(-)
[geode] 01/02: changed default catalog and schema from null to
empty string
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-6225
in repository https://gitbox.apache.org/repos/asf/geode.git
commit d179a99262dba71951769d41b5884b7ac760d07c
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Fri Dec 21 10:35:22 2018 -0800
changed default catalog and schema from null to empty string
---
.../connectors/jdbc/internal/TableMetaDataManager.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
index f5f9b16..b8971ef 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManager.java
@@ -34,6 +34,8 @@ import org.apache.geode.connectors.jdbc.JdbcConnectorException;
* remembered so that it does not need to be recomputed for the same table name.
*/
public class TableMetaDataManager {
+ private static final String DEFAULT_CATALOG = "";
+ private static final String DEFAULT_SCHEMA = "";
private final ConcurrentMap<String, TableMetaDataView> tableToMetaDataMap =
new ConcurrentHashMap<>();
@@ -48,7 +50,7 @@ public class TableMetaDataManager {
TableMetaData result;
try {
DatabaseMetaData metaData = connection.getMetaData();
- try (ResultSet tables = metaData.getTables(null, null, "%", null)) {
+ try (ResultSet tables = metaData.getTables(DEFAULT_CATALOG, DEFAULT_SCHEMA, "%", null)) {
String realTableName = getTableNameFromMetaData(tableName, tables);
List<String> keys = getPrimaryKeyColumnNamesFromMetaData(realTableName, metaData, ids);
String quoteString = metaData.getIdentifierQuoteString();
@@ -100,7 +102,9 @@ public class TableMetaDataManager {
checkColumnExistsInTable(tableName, metaData, key);
}
} else {
- try (ResultSet primaryKeys = metaData.getPrimaryKeys(null, null, tableName)) {
+ try (
+ ResultSet primaryKeys =
+ metaData.getPrimaryKeys(DEFAULT_CATALOG, DEFAULT_SCHEMA, tableName)) {
while (primaryKeys.next()) {
String key = primaryKeys.getString("COLUMN_NAME");
keys.add(key);
@@ -116,7 +120,8 @@ public class TableMetaDataManager {
private void getDataTypesFromMetaData(String tableName, DatabaseMetaData metaData,
TableMetaData result) throws SQLException {
- try (ResultSet columnData = metaData.getColumns(null, null, tableName, "%")) {
+ try (ResultSet columnData =
+ metaData.getColumns(DEFAULT_CATALOG, DEFAULT_SCHEMA, tableName, "%")) {
while (columnData.next()) {
String columnName = columnData.getString("COLUMN_NAME");
int dataType = columnData.getInt("DATA_TYPE");
@@ -128,7 +133,8 @@ public class TableMetaDataManager {
private void checkColumnExistsInTable(String tableName, DatabaseMetaData metaData,
String columnName) throws SQLException {
int caseInsensitiveMatches = 0;
- try (ResultSet columnData = metaData.getColumns(null, null, tableName, "%")) {
+ try (ResultSet columnData =
+ metaData.getColumns(DEFAULT_CATALOG, DEFAULT_SCHEMA, tableName, "%")) {
while (columnData.next()) {
String realColumnName = columnData.getString("COLUMN_NAME");
if (columnName.equals(realColumnName)) {
[geode] 02/02: removed unused connectionUrl parameter from
TestConfigService also removed some schema experimentation code from test
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-6225
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 205308d54e0278e641f089c94495c61feee1c63a
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Fri Dec 21 10:35:57 2018 -0800
removed unused connectionUrl parameter from TestConfigService
also removed some schema experimentation code from test
---
.../connectors/jdbc/JdbcAsyncWriterIntegrationTest.java | 2 +-
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 3 +--
.../connectors/jdbc/JdbcWriterIntegrationTest.java | 17 ++---------------
.../connectors/jdbc/internal/TestConfigService.java | 17 +++--------------
4 files changed, 7 insertions(+), 32 deletions(-)
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index b7d6d38..1557890 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -338,7 +338,7 @@ public abstract class JdbcAsyncWriterIntegrationTest {
private SqlHandler createSqlHandler(String ids)
throws RegionMappingExistsException {
return new SqlHandler(new TableMetaDataManager(),
- TestConfigService.getTestConfigService(getConnectionUrl(), ids),
+ TestConfigService.getTestConfigService(ids),
testDataSourceFactory);
}
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
index 241e2ee..54a4184 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
@@ -173,8 +173,7 @@ public abstract class JdbcLoaderIntegrationTest {
private SqlHandler createSqlHandler(String pdxClassName, String ids)
throws RegionMappingExistsException {
return new SqlHandler(new TableMetaDataManager(),
- TestConfigService.getTestConfigService((InternalCache) cache, pdxClassName,
- getConnectionUrl(), ids),
+ TestConfigService.getTestConfigService((InternalCache) cache, pdxClassName, ids),
testDataSourceFactory);
}
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
index 5bc70e6..f78b988 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcWriterIntegrationTest.java
@@ -65,10 +65,7 @@ public abstract class JdbcWriterIntegrationTest {
connection = getConnection();
statement = connection.createStatement();
- statement.execute("Create Schema mySchema");
- //connection.setSchema("mySchema");
- statement = connection.createStatement();
- statement.execute("Create Table " + "mySchema." + REGION_TABLE_NAME
+ statement.execute("Create Table " + REGION_TABLE_NAME
+ " (id varchar(10) primary key not null, name varchar(10), age int)");
pdx1 = cache.createPdxInstanceFactory(Employee.class.getName()).writeString("id", "1")
.writeString("name", "Emp1")
@@ -78,15 +75,6 @@ public abstract class JdbcWriterIntegrationTest {
.writeInt("age", 21).create();
employee1 = (Employee) pdx1.getObject();
employee2 = (Employee) pdx2.getObject();
-
- {
- Connection connection2 = getConnection();
- statement.execute("Create Schema mySchema2");
- //connection2.setSchema("mySchema2");
- statement = connection2.createStatement();
- statement.execute("Create Table " + "mySchema2." + REGION_TABLE_NAME
- + " (id varchar(10) primary key not null, name varchar(10), age int)");
- }
}
private void setupRegion(String ids) throws RegionMappingExistsException {
@@ -110,7 +98,6 @@ public abstract class JdbcWriterIntegrationTest {
}
}
if (statement != null) {
- statement.execute("Drop table " + REGION_TABLE_NAME);
statement.close();
}
if (connection != null) {
@@ -322,7 +309,7 @@ public abstract class JdbcWriterIntegrationTest {
private SqlHandler createSqlHandler(String ids)
throws RegionMappingExistsException {
return new SqlHandler(new TableMetaDataManager(),
- TestConfigService.getTestConfigService(getConnectionUrl(), ids),
+ TestConfigService.getTestConfigService(ids),
testDataSourceFactory);
}
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
index 8d0bde2..0366196 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
@@ -29,24 +29,13 @@ public class TestConfigService {
private static final String REGION_NAME = "employees";
private static final String CONNECTION_CONFIG_NAME = "testConnectionConfig";
- public static JdbcConnectorServiceImpl getTestConfigService(String connectionUrl)
+ public static JdbcConnectorServiceImpl getTestConfigService(String ids)
throws RegionMappingExistsException {
- return getTestConfigService(createMockCache(), null, connectionUrl);
- }
-
- public static JdbcConnectorServiceImpl getTestConfigService(String connectionUrl, String ids)
- throws RegionMappingExistsException {
- return getTestConfigService(createMockCache(), null, connectionUrl, ids);
- }
-
- public static JdbcConnectorServiceImpl getTestConfigService(InternalCache cache,
- String pdxClassName, String connectionUrl)
- throws RegionMappingExistsException {
- return getTestConfigService(cache, pdxClassName, connectionUrl, null);
+ return getTestConfigService(createMockCache(), null, ids);
}
public static JdbcConnectorServiceImpl getTestConfigService(InternalCache cache,
- String pdxClassName, String connectionUrl, String ids)
+ String pdxClassName, String ids)
throws RegionMappingExistsException {
JdbcConnectorServiceImpl service = new JdbcConnectorServiceImpl();