DonnyZone commented on a change in pull request #1792: [CALCITE-3775] Implicit
lookup methods in SimpleCalciteSchema ignore case sensitivity parameter
URL: https://github.com/apache/calcite/pull/1792#discussion_r379978508
##########
File path: core/src/main/java/org/apache/calcite/jdbc/SimpleCalciteSchema.java
##########
@@ -67,33 +69,72 @@ public CalciteSchema add(String name, Schema schema) {
return calciteSchema;
}
+ private String caseInsensitiveLookup(Set<String> candidates, String name) {
+ // Exact string lookup
+ if (candidates.contains(name)) {
+ return name;
+ }
+ // Upper case string lookup
+ final String upperCaseName = name.toUpperCase(Locale.ROOT);
+ if (candidates.contains(upperCaseName)) {
+ return upperCaseName;
+ }
+ // Lower case string lookup
+ final String lowerCaseName = name.toLowerCase(Locale.ROOT);
+ if (candidates.contains(lowerCaseName)) {
+ return lowerCaseName;
+ }
+ // Fall through: Set iteration
+ for (String candidate: candidates) {
+ if (candidate.equalsIgnoreCase(name)) {
+ return candidate;
+ }
+ }
+ return null;
+ }
+
protected CalciteSchema getImplicitSubSchema(String schemaName,
boolean caseSensitive) {
// Check implicit schemas.
- Schema s = schema.getSubSchema(schemaName);
- if (s != null) {
- return new SimpleCalciteSchema(this, s, schemaName);
+ final String schemaName2 = caseSensitive ? schemaName :
caseInsensitiveLookup(
+ schema.getSubSchemaNames(), schemaName);
+ if (schemaName2 == null) {
+ return null;
}
- return null;
+ final Schema s = schema.getSubSchema(schemaName2);
+ if (s == null) {
+ return null;
+ }
+ return new SimpleCalciteSchema(this, s, schemaName2);
}
protected TableEntry getImplicitTable(String tableName,
boolean caseSensitive) {
// Check implicit tables.
- Table table = schema.getTable(tableName);
- if (table != null) {
- return tableEntry(tableName, table);
+ final String tableName2 = caseSensitive ? tableName :
caseInsensitiveLookup(
+ schema.getTableNames(), tableName);
+ if (tableName2 == null) {
Review comment:
I ever thought about abstracting an interface. But it may bring complexity.
(1) Different with name matcher, case (in)sensitive lookup is not widely
used. Even for `CalciteSchema`, there is already a more general and efficient
interface `NamedMap`. This piece of code is just for `SimpleCalciteSchema`,
without maintaining cache.
(2) For performance, we should prevent to call
`getTableNames`/`getSubSchemas`/`getTypeNames` when case sensitive. Therefore,
if we abstract the logic, the interface arguments need to contain functions. It
may be too complex.
Do you have any suggestions?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
With regards,
Apache Git Services
