Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DB2/DB2as400 glue get table api issue fix #2506

Merged
merged 3 commits into from
Jan 15, 2025
Merged

DB2/DB2as400 glue get table api issue fix #2506

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
95fb6a9
DB2/DB2as400 glue get table api issue fix
VenkatasivareddyTR Jan 7, 2025
f7e448a
review comment changes
Trianz-Akshay Jan 13, 2025
0392ca8
Merge branch 'master' into db2_phase2_tablelist_issue
AbdulR3hman Jan 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...as400/src/main/java/com/amazonaws/athena/connectors/db2as400/Db2As400MetadataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
public class Db2As400MetadataHandler extends JdbcMetadataHandler
{
private static final Logger LOGGER = LoggerFactory.getLogger(Db2As400MetadataHandler.class);
static final String PARTITION_NUMBER = "PARTITION_NUMBER";
static final String PARTITION_NUMBER = "PARTITION_NUMBER".toLowerCase();
AbdulR3hman marked this conversation as resolved.
Show resolved Hide resolved
static final String PARTITIONING_COLUMN = "PARTITIONING_COLUMN";
/**
* DB2 has max number of partition 32,000
Expand Down
2 changes: 1 addition & 1 deletion ...0/src/test/java/com/amazonaws/athena/connectors/db2as400/Db2As400MetadataHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

public class Db2As400MetadataHandlerTest extends TestBase {
private static final Logger logger = LoggerFactory.getLogger(Db2As400MetadataHandlerTest.class);
private static final Schema PARTITION_SCHEMA = SchemaBuilder.newBuilder().addField("PARTITION_NUMBER", org.apache.arrow.vector.types.Types.MinorType.VARCHAR.getType()).build();
private static final Schema PARTITION_SCHEMA = SchemaBuilder.newBuilder().addField("partition_number", org.apache.arrow.vector.types.Types.MinorType.VARCHAR.getType()).build();
private DatabaseConnectionConfig databaseConnectionConfig = new DatabaseConnectionConfig("testCatalog", Db2As400Constants.NAME,
"db2as400://jdbc:as400://testhost;user=dummy;password=dummy;");
private Db2As400MetadataHandler db2As400MetadataHandler;
Expand Down
2 changes: 1 addition & 1 deletion ...rc/test/java/com/amazonaws/athena/connectors/db2as400/Db2As400QueryStringBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void testGetPartitionWhereClauses()
{
Db2As400QueryStringBuilder builder = new Db2As400QueryStringBuilder("'");
Split split = Mockito.mock(Split.class);
Mockito.when(split.getProperty(Mockito.eq("PARTITION_NUMBER"))).thenReturn("0");
Mockito.when(split.getProperty(Mockito.eq("partition_number"))).thenReturn("0");
Mockito.when(split.getProperty(Mockito.eq("PARTITIONING_COLUMN"))).thenReturn("PC");
Assert.assertEquals(Arrays.asList(" DATAPARTITIONNUM(PC) = 0"), builder.getPartitionWhereClauses(split));
}
Expand Down
2 changes: 1 addition & 1 deletion athena-db2/src/main/java/com/amazonaws/athena/connectors/db2/Db2MetadataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@
public class Db2MetadataHandler extends JdbcMetadataHandler
{
private static final Logger LOGGER = LoggerFactory.getLogger(Db2MetadataHandler.class);
static final String PARTITION_NUMBER = "PARTITION_NUMBER";
static final String PARTITION_NUMBER = "PARTITION_NUMBER".toLowerCase();
AbdulR3hman marked this conversation as resolved.
Show resolved Hide resolved
static final String PARTITIONING_COLUMN = "PARTITIONING_COLUMN";
/**
* DB2 has max number of partition 32,000
Expand Down
2 changes: 1 addition & 1 deletion athena-db2/src/test/java/com/amazonaws/athena/connectors/db2/Db2MetadataHandlerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@

public class Db2MetadataHandlerTest extends TestBase {
private static final Logger logger = LoggerFactory.getLogger(Db2MetadataHandlerTest.class);
private static final Schema PARTITION_SCHEMA = SchemaBuilder.newBuilder().addField("PARTITION_NUMBER", org.apache.arrow.vector.types.Types.MinorType.VARCHAR.getType()).build();
private static final Schema PARTITION_SCHEMA = SchemaBuilder.newBuilder().addField("partition_number", org.apache.arrow.vector.types.Types.MinorType.VARCHAR.getType()).build();
private DatabaseConnectionConfig databaseConnectionConfig = new DatabaseConnectionConfig("testCatalog", Db2Constants.NAME,
"dbtwo://jdbc:db2://hostname:50001/dummydatabase:user=dummyuser;password=dummypwd");
private Db2MetadataHandler db2MetadataHandler;
Expand Down
2 changes: 1 addition & 1 deletion athena-db2/src/test/java/com/amazonaws/athena/connectors/db2/Db2QueryStringBuilderTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ public void testGetPartitionWhereClauses()
{
Db2QueryStringBuilder builder = new Db2QueryStringBuilder(QUOTE_CHARACTER, new Db2FederationExpressionParser(QUOTE_CHARACTER));
Split split = Mockito.mock(Split.class);
Mockito.when(split.getProperty(Mockito.eq("PARTITION_NUMBER"))).thenReturn("0");
Mockito.when(split.getProperty(Mockito.eq("partition_number"))).thenReturn("0");
Mockito.when(split.getProperty(Mockito.eq("PARTITIONING_COLUMN"))).thenReturn("PC");
Assert.assertEquals(Arrays.asList(" DATAPARTITIONNUM(PC) = 0"), builder.getPartitionWhereClauses(split));
}
Expand Down
Loading