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 22:35:04 UTC
[geode] branch feature/GEODE-6225 updated: getTableMetaDataView now
takes a RegionMapping
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
The following commit(s) were added to refs/heads/feature/GEODE-6225 by this push:
new ff1973e getTableMetaDataView now takes a RegionMapping
ff1973e is described below
commit ff1973eb8eb0ea188d887c16d677220dce9c7b0a
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Fri Dec 21 14:34:31 2018 -0800
getTableMetaDataView now takes a RegionMapping
---
.../TableMetaDataManagerIntegrationTest.java | 19 ++++--
.../geode/connectors/jdbc/internal/SqlHandler.java | 8 +--
.../jdbc/internal/TableMetaDataManager.java | 17 +++---
.../connectors/jdbc/internal/SqlHandlerTest.java | 2 +-
.../jdbc/internal/TableMetaDataManagerTest.java | 68 +++++++++++++---------
5 files changed, 66 insertions(+), 48 deletions(-)
diff --git a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
index 485745e..225f0e5 100644
--- a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
+++ b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerIntegrationTest.java
@@ -30,6 +30,8 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
+import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
+
public abstract class TableMetaDataManagerIntegrationTest {
@@ -39,12 +41,15 @@ public abstract class TableMetaDataManagerIntegrationTest {
private TableMetaDataManager manager;
protected Connection connection;
protected Statement statement;
+ protected RegionMapping regionMapping;
@Before
public void setup() throws Exception {
connection = getConnection();
statement = connection.createStatement();
manager = new TableMetaDataManager();
+ regionMapping = new RegionMapping();
+ regionMapping.setTableName(REGION_TABLE_NAME);
}
@After
@@ -85,7 +90,7 @@ public abstract class TableMetaDataManagerIntegrationTest {
@Test
public void validateKeyColumnName() throws SQLException {
createTable();
- TableMetaDataView metaData = manager.getTableMetaDataView(connection, REGION_TABLE_NAME, null);
+ TableMetaDataView metaData = manager.getTableMetaDataView(connection, regionMapping);
List<String> keyColumnNames = metaData.getKeyColumnNames();
@@ -95,8 +100,9 @@ public abstract class TableMetaDataManagerIntegrationTest {
@Test
public void validateKeyColumnNameOnNonPrimaryKey() throws SQLException {
createTableWithNoPrimaryKey();
+ regionMapping.setIds("nonprimaryid");
TableMetaDataView metaData =
- manager.getTableMetaDataView(connection, REGION_TABLE_NAME, "nonprimaryid");
+ manager.getTableMetaDataView(connection, regionMapping);
List<String> keyColumnNames = metaData.getKeyColumnNames();
@@ -106,8 +112,9 @@ public abstract class TableMetaDataManagerIntegrationTest {
@Test
public void validateKeyColumnNameOnNonPrimaryKeyWithInExactMatch() throws SQLException {
createTableWithNoPrimaryKey();
+ regionMapping.setIds("NonPrimaryId");
TableMetaDataView metaData =
- manager.getTableMetaDataView(connection, REGION_TABLE_NAME, "NonPrimaryId");
+ manager.getTableMetaDataView(connection, regionMapping);
List<String> keyColumnNames = metaData.getKeyColumnNames();
@@ -117,7 +124,7 @@ public abstract class TableMetaDataManagerIntegrationTest {
@Test
public void validateColumnDataTypeForName() throws SQLException {
createTable();
- TableMetaDataView metaData = manager.getTableMetaDataView(connection, REGION_TABLE_NAME, null);
+ TableMetaDataView metaData = manager.getTableMetaDataView(connection, regionMapping);
int nameDataType = metaData.getColumnDataType("name");
@@ -127,7 +134,7 @@ public abstract class TableMetaDataManagerIntegrationTest {
@Test
public void validateColumnDataTypeForId() throws SQLException {
createTable();
- TableMetaDataView metaData = manager.getTableMetaDataView(connection, REGION_TABLE_NAME, null);
+ TableMetaDataView metaData = manager.getTableMetaDataView(connection, regionMapping);
int nameDataType = metaData.getColumnDataType("id");
@@ -137,7 +144,7 @@ public abstract class TableMetaDataManagerIntegrationTest {
@Test
public void validateColumnDataTypeForAge() throws SQLException {
createTable();
- TableMetaDataView metaData = manager.getTableMetaDataView(connection, REGION_TABLE_NAME, null);
+ TableMetaDataView metaData = manager.getTableMetaDataView(connection, regionMapping);
int nameDataType = metaData.getColumnDataType("age");
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
index a09db75..b6d12d5 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
@@ -79,8 +79,8 @@ public class SqlHandler {
RegionMapping regionMapping = getMappingForRegion(region.getName());
PdxInstance result;
try (Connection connection = getConnection(regionMapping.getDataSourceName())) {
- TableMetaDataView tableMetaData = this.tableMetaDataManager.getTableMetaDataView(connection,
- regionMapping.getRegionToTableName(), regionMapping.getIds());
+ TableMetaDataView tableMetaData =
+ this.tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
EntryColumnData entryColumnData =
getEntryColumnData(tableMetaData, regionMapping, key, null, Operation.GET);
try (PreparedStatement statement =
@@ -172,8 +172,8 @@ public class SqlHandler {
RegionMapping regionMapping = getMappingForRegion(region.getName());
try (Connection connection = getConnection(regionMapping.getDataSourceName())) {
- TableMetaDataView tableMetaData = this.tableMetaDataManager.getTableMetaDataView(connection,
- regionMapping.getRegionToTableName(), regionMapping.getIds());
+ TableMetaDataView tableMetaData =
+ this.tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
EntryColumnData entryColumnData =
getEntryColumnData(tableMetaData, regionMapping, key, value, operation);
int updateCount = 0;
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 77ab650..89e2c6b 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
@@ -25,6 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
+import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
/**
* Given a tableName this manager will determine which column should correspond to the Geode Region
@@ -39,14 +40,14 @@ public class TableMetaDataManager {
private final ConcurrentMap<String, TableMetaDataView> tableToMetaDataMap =
new ConcurrentHashMap<>();
- public TableMetaDataView getTableMetaDataView(Connection connection, String tableName,
- String ids) {
- return tableToMetaDataMap.computeIfAbsent(tableName,
- k -> computeTableMetaDataView(connection, k, ids));
+ public TableMetaDataView getTableMetaDataView(Connection connection,
+ RegionMapping regionMapping) {
+ return tableToMetaDataMap.computeIfAbsent(regionMapping.getTableName(),
+ k -> computeTableMetaDataView(connection, regionMapping));
}
- private TableMetaDataView computeTableMetaDataView(Connection connection, String tableName,
- String ids) {
+ private TableMetaDataView computeTableMetaDataView(Connection connection,
+ RegionMapping regionMapping) {
TableMetaData result;
try {
DatabaseMetaData metaData = connection.getMetaData();
@@ -56,9 +57,9 @@ public class TableMetaDataManager {
schemaFilter = "public";
}
try (ResultSet tables = metaData.getTables(catalogFilter, schemaFilter, "%", null)) {
- String realTableName = getTableNameFromMetaData(tableName, tables);
+ String realTableName = getTableNameFromMetaData(regionMapping.getTableName(), tables);
List<String> keys = getPrimaryKeyColumnNamesFromMetaData(realTableName, metaData,
- catalogFilter, schemaFilter, ids);
+ catalogFilter, schemaFilter, regionMapping.getIds());
String quoteString = metaData.getIdentifierQuoteString();
if (quoteString == null) {
quoteString = "";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index ca25888..5dd884a 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -93,7 +93,7 @@ public class SqlHandlerTest {
when(tableMetaDataView.getTableName()).thenReturn(TABLE_NAME);
when(tableMetaDataView.getKeyColumnNames()).thenReturn(Arrays.asList(KEY_COLUMN));
final String IDS = "ids";
- when(tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, IDS))
+ when(tableMetaDataManager.getTableMetaDataView(any(), any()))
.thenReturn(tableMetaDataView);
connectorService = mock(JdbcConnectorService.class);
dataSourceFactory = mock(DataSourceFactory.class);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
index a3156a4..4e0f244 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TableMetaDataManagerTest.java
@@ -35,6 +35,7 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.geode.connectors.jdbc.JdbcConnectorException;
+import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
public class TableMetaDataManagerTest {
private static final String TABLE_NAME = "testTable";
@@ -47,6 +48,7 @@ public class TableMetaDataManagerTest {
ResultSet tablesResultSet;
ResultSet primaryKeysResultSet;
ResultSet columnResultSet;
+ RegionMapping regionMapping;
@Before
public void setup() throws Exception {
@@ -62,14 +64,17 @@ public class TableMetaDataManagerTest {
columnResultSet = mock(ResultSet.class);
when(databaseMetaData.getColumns(any(), any(), eq(TABLE_NAME), any()))
.thenReturn(columnResultSet);
+ regionMapping = mock(RegionMapping.class);
+ when(regionMapping.getTableName()).thenReturn(TABLE_NAME);
}
@Test
public void returnsSinglePrimaryKeyColumnName() throws Exception {
setupPrimaryKeysMetaData();
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
+ when(regionMapping.getIds()).thenReturn("");
- TableMetaDataView data = tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "");
+ TableMetaDataView data = tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList(KEY_COLUMN));
verify(connection).getMetaData();
@@ -78,8 +83,9 @@ public class TableMetaDataManagerTest {
@Test
public void returnsCompositePrimaryKeyColumnNames() throws Exception {
setupCompositePrimaryKeysMetaData();
+ when(regionMapping.getIds()).thenReturn("");
- TableMetaDataView data = tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "");
+ TableMetaDataView data = tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList(KEY_COLUMN, KEY_COLUMN2));
verify(connection).getMetaData();
@@ -90,23 +96,23 @@ public class TableMetaDataManagerTest {
public void verifyPostgreUsesPublicSchemaByDefault() throws Exception {
setupCompositePrimaryKeysMetaData();
when(databaseMetaData.getDatabaseProductName()).thenReturn("PostgreSQL");
+ when(regionMapping.getIds()).thenReturn("");
- TableMetaDataView data = tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "");
+ TableMetaDataView data = tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList(KEY_COLUMN, KEY_COLUMN2));
verify(connection).getMetaData();
verify(databaseMetaData).getTables("", "public", "%", null);
}
-
-
@Test
public void givenNoColumnsAndNonNullIdsThenExpectException() throws Exception {
setupTableMetaData();
when(columnResultSet.next()).thenReturn(false);
+ when(regionMapping.getIds()).thenReturn("nonExistentId");
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "nonExistentId"))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class)
.hasMessageContaining("The table testTable does not have a column named nonExistentId");
}
@@ -116,9 +122,10 @@ public class TableMetaDataManagerTest {
setupTableMetaData();
when(columnResultSet.next()).thenReturn(true).thenReturn(false);
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("existingColumn");
+ when(regionMapping.getIds()).thenReturn("nonExistentId");
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "nonExistentId"))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class)
.hasMessageContaining("The table testTable does not have a column named nonExistentId");
}
@@ -130,9 +137,10 @@ public class TableMetaDataManagerTest {
when(columnResultSet.next()).thenReturn(true).thenReturn(true).thenReturn(false);
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("nonexistentid")
.thenReturn("NONEXISTENTID");
+ when(regionMapping.getIds()).thenReturn("nonExistentId");
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "nonExistentId"))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class).hasMessageContaining(
"The table testTable has more than one column that matches nonExistentId");
}
@@ -145,9 +153,10 @@ public class TableMetaDataManagerTest {
.thenReturn(false);
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("existentid").thenReturn("EXISTENTID")
.thenReturn("ExistentId");
+ when(regionMapping.getIds()).thenReturn("ExistentId");
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "ExistentId");
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList("ExistentId"));
}
@@ -161,10 +170,10 @@ public class TableMetaDataManagerTest {
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("LeadingNonKeyColumn")
.thenReturn(KEY_COLUMN).thenReturn(KEY_COLUMN2)
.thenReturn("NonKeyColumn");
+ when(regionMapping.getIds()).thenReturn(KEY_COLUMN + "," + KEY_COLUMN2);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME,
- KEY_COLUMN + "," + KEY_COLUMN2);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList(KEY_COLUMN, KEY_COLUMN2));
}
@@ -175,9 +184,10 @@ public class TableMetaDataManagerTest {
setupTableMetaData();
when(columnResultSet.next()).thenReturn(true).thenReturn(false);
when(columnResultSet.getString("COLUMN_NAME")).thenReturn("existentid");
+ when(regionMapping.getIds()).thenReturn("ExistentId");
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, "ExistentId");
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getKeyColumnNames()).isEqualTo(Arrays.asList("ExistentId"));
}
@@ -188,7 +198,7 @@ public class TableMetaDataManagerTest {
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getIdentifierQuoteString()).isEqualTo("");
verify(connection).getMetaData();
@@ -202,7 +212,7 @@ public class TableMetaDataManagerTest {
when(databaseMetaData.getIdentifierQuoteString()).thenReturn(expectedQuoteString);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getIdentifierQuoteString()).isEqualTo(expectedQuoteString);
verify(connection).getMetaData();
@@ -213,8 +223,8 @@ public class TableMetaDataManagerTest {
setupPrimaryKeysMetaData();
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
verify(connection).getMetaData();
}
@@ -224,7 +234,7 @@ public class TableMetaDataManagerTest {
when(connection.getMetaData()).thenThrow(cause);
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class).hasMessageContaining("sql message");
}
@@ -234,7 +244,7 @@ public class TableMetaDataManagerTest {
when(tablesResultSet.getString("TABLE_NAME")).thenReturn("otherTable");
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class)
.hasMessage("no table was found that matches testTable");
}
@@ -248,7 +258,7 @@ public class TableMetaDataManagerTest {
.thenReturn(TABLE_NAME);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getTableName()).isEqualTo(TABLE_NAME);
}
@@ -263,7 +273,7 @@ public class TableMetaDataManagerTest {
when(tablesResultSet.getString("TABLE_NAME")).thenReturn(TABLE_NAME.toUpperCase());
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getTableName()).isEqualTo(TABLE_NAME.toUpperCase());
}
@@ -278,7 +288,7 @@ public class TableMetaDataManagerTest {
.thenReturn(TABLE_NAME.toUpperCase());
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class)
.hasMessage("Duplicate tables that match region name");
}
@@ -292,7 +302,7 @@ public class TableMetaDataManagerTest {
when(tablesResultSet.getString("TABLE_NAME")).thenReturn(TABLE_NAME).thenReturn(TABLE_NAME);
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class)
.hasMessage("Duplicate tables that match region name");
}
@@ -303,7 +313,7 @@ public class TableMetaDataManagerTest {
when(primaryKeysResultSet.next()).thenReturn(false);
assertThatThrownBy(
- () -> tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null))
+ () -> tableMetaDataManager.getTableMetaDataView(connection, regionMapping))
.isInstanceOf(JdbcConnectorException.class)
.hasMessage("The table " + TABLE_NAME + " does not have a primary key column.");
}
@@ -314,7 +324,7 @@ public class TableMetaDataManagerTest {
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
int dataType = data.getColumnDataType("unknownColumn");
assertThat(dataType).isEqualTo(0);
@@ -334,7 +344,7 @@ public class TableMetaDataManagerTest {
.thenReturn(columnDataType2);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
int dataType1 = data.getColumnDataType(columnName1);
int dataType2 = data.getColumnDataType(columnName2);
@@ -359,7 +369,7 @@ public class TableMetaDataManagerTest {
Set<String> expectedColumnNames = new HashSet<>(Arrays.asList(columnName1, columnName2));
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
Set<String> columnNames = data.getColumnNames();
assertThat(columnNames).isEqualTo(expectedColumnNames);
@@ -372,7 +382,7 @@ public class TableMetaDataManagerTest {
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
verify(primaryKeysResultSet).close();
}
@@ -384,7 +394,7 @@ public class TableMetaDataManagerTest {
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
verify(columnResultSet).close();
}
@@ -395,7 +405,7 @@ public class TableMetaDataManagerTest {
when(primaryKeysResultSet.next()).thenReturn(true).thenReturn(false);
TableMetaDataView data =
- tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, null);
+ tableMetaDataManager.getTableMetaDataView(connection, regionMapping);
assertThat(data.getTableName()).isEqualTo(TABLE_NAME);
}