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

Jump to bottom

Hbase uppercase table #2019

Merged
merged 11 commits into from
Jun 26, 2024
Merged

Hbase uppercase table #2019

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4352e04
added support for uppercase tables in hbase connector
aimethed Jun 12, 2024
b970440
add/update hbase unit tests
aimethed Jun 12, 2024
252e1e1
remove extra caseInsensitiveSearches
aimethed Jun 14, 2024
a2abc51
tests updated
aimethed Jun 14, 2024
e446c8d
added feature flag for caseInsensitiveSearch
aimethed Jun 14, 2024
3871931
Merge branch 'master' into hbase-uppercase-table
aimethed Jun 18, 2024
d5bd701
removed tableExists check and added back caseInsensitiveSearches
aimethed Jun 18, 2024
78fe2c3
fix issue where getHbaseTableName was being called with uppercased at…
aimethed Jun 19, 2024
4a39a44
made getTableResponse return correctly cased table name and removed e…
aimethed Jun 19, 2024
58a5a45
Merge branch 'master' into hbase-uppercase-table
aimethed Jun 25, 2024
efebb7d
Merge branch 'master' into hbase-uppercase-table
aimethed Jun 26, 2024
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
Prev Previous commit
Next Next commit
remove extra caseInsensitiveSearches
  • Loading branch information
@aimethed
aimethed committed Jun 14, 2024
commit 252e1e1348192934149aeae779d9d4545ae2fe96
4 changes: 2 additions & 2 deletions athena-hbase/src/main/java/com/amazonaws/athena/connectors/hbase/HbaseMetadataHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ public ListTablesResponse doListTables(BlockAllocator blockAllocator, ListTables
for (int i = 0; i < tables.length; i++) {
TableName tableName = tables[i];
tableNames.add(new com.amazonaws.athena.connector.lambda.domain.TableName(request.getSchemaName(),
tableName.getNameAsString().toLowerCase(Locale.ENGLISH).replace(request.getSchemaName() + ":", "")));
tableName.getNameAsString().replace(request.getSchemaName() + ":", "")));
}
return new ListTablesResponse(request.getCatalogName(), tableNames, null);
}
Expand Down Expand Up @@ -289,7 +289,7 @@ public GetSplitsResponse doGetSplits(BlockAllocator blockAllocator, GetSplitsReq
Set<Split> splits = new HashSet<>();

//We can read each region in parallel
for (HRegionInfo info : getOrCreateConn(request).getTableRegions(HbaseTableNameUtils.getHbaseTableName(getOrCreateConn(request), request.getTableName()))) {
for (HRegionInfo info : getOrCreateConn(request).getTableRegions(HbaseTableNameUtils.getQualifiedTable(request.getTableName()))) {
Split.Builder splitBuilder = Split.newBuilder(makeSpillLocation(request), makeEncryptionKey())
.add(HBASE_CONN_STR, getConnStr(request))
.add(START_KEY_FIELD, new String(info.getStartKey()))
Expand Down
2 changes: 1 addition & 1 deletion athena-hbase/src/main/java/com/amazonaws/athena/connectors/hbase/HbaseRecordHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ protected void readWithConstraint(BlockSpiller blockSpiller, ReadRecordsRequest
addToProjection(scan, next);
}

getOrCreateConn(conStr).scanTable(HbaseTableNameUtils.getHbaseTableName(getOrCreateConn(conStr), tableNameObj),
getOrCreateConn(conStr).scanTable(HbaseTableNameUtils.getQualifiedTable(tableNameObj),
scan,
(ResultScanner scanner) -> scanFilterProject(scanner, request, blockSpiller, queryStatusChecker));
}
Expand Down