[geode] branch feature/GEODE-6156 updated: SqlHandle now passes getIds from the RegionMapping to the TableMetaDataService

[dschneider]

This is an automated email from the ASF dual-hosted git repository.

dschneider pushed a commit to branch feature/GEODE-6156
in repository https://gitbox.apache.org/repos/asf/geode.git


The following commit(s) were added to refs/heads/feature/GEODE-6156 by this 
push:
     new 5c59586  SqlHandle now passes getIds from the RegionMapping to the 
TableMetaDataService
5c59586 is described below

commit 5c59586f92876b2412437069fc4927ba5fe729ea
Author: Darrel Schneider <dschnei...@pivotal.io>
AuthorDate: Thu Dec 6 16:56:45 2018 -0800

    SqlHandle now passes getIds from the RegionMapping to the 
TableMetaDataService
---
 .../java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java    | 4 ++--
 .../org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

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 0b2622c..9335d03 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
@@ -76,7 +76,7 @@ public class SqlHandler {
     PdxInstance result;
     try (Connection connection = 
getConnection(regionMapping.getDataSourceName())) {
       TableMetaDataView tableMetaData = 
this.tableMetaDataManager.getTableMetaDataView(connection,
-          regionMapping.getRegionToTableName(), null);
+          regionMapping.getRegionToTableName(), regionMapping.getIds());
       EntryColumnData entryColumnData =
           getEntryColumnData(tableMetaData, regionMapping, key, null, 
Operation.GET);
       try (PreparedStatement statement =
@@ -163,7 +163,7 @@ public class SqlHandler {
 
     try (Connection connection = 
getConnection(regionMapping.getDataSourceName())) {
       TableMetaDataView tableMetaData = 
this.tableMetaDataManager.getTableMetaDataView(connection,
-          regionMapping.getRegionToTableName(), null);
+          regionMapping.getRegionToTableName(), regionMapping.getIds());
       EntryColumnData entryColumnData =
           getEntryColumnData(tableMetaData, regionMapping, key, value, 
operation);
       int updateCount = 0;
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 0c89519..d93743f 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
@@ -91,7 +91,8 @@ public class SqlHandlerTest {
     tableMetaDataView = mock(TableMetaDataView.class);
     when(tableMetaDataView.getTableName()).thenReturn(TABLE_NAME);
     when(tableMetaDataView.getKeyColumnName()).thenReturn(KEY_COLUMN);
-    when(tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, 
null))
+    final String IDS = "ids";
+    when(tableMetaDataManager.getTableMetaDataView(connection, TABLE_NAME, 
IDS))
         .thenReturn(tableMetaDataView);
     connectorService = mock(JdbcConnectorService.class);
     dataSourceFactory = mock(DataSourceFactory.class);
@@ -105,6 +106,7 @@ public class SqlHandlerTest {
     when(regionMapping.getDataSourceName()).thenReturn(DATA_SOURCE_NAME);
     when(regionMapping.getRegionName()).thenReturn(REGION_NAME);
     when(regionMapping.getTableName()).thenReturn(TABLE_NAME);
+    when(regionMapping.getIds()).thenReturn(IDS);
     when(regionMapping.getRegionToTableName()).thenReturn(TABLE_NAME);
     
when(connectorService.getMappingForRegion(REGION_NAME)).thenReturn(regionMapping);