[
https://issues.apache.org/jira/browse/DRILL-7406?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=17004209#comment-17004209
]
ASF GitHub Bot commented on DRILL-7406:
---------------------------------------
vvysotskyi commented on pull request #1940: DRILL-7406: Update Calcite to 1.21.0
URL: https://github.com/apache/drill/pull/1940#discussion_r361644173
##########
File path:
contrib/storage-jdbc/src/main/java/org/apache/drill/exec/store/jdbc/CapitalizingJdbcSchema.java
##########
@@ -0,0 +1,130 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.drill.exec.store.jdbc;
+
+import javax.sql.DataSource;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.calcite.adapter.jdbc.JdbcConvention;
+import org.apache.calcite.adapter.jdbc.JdbcSchema;
+import org.apache.calcite.schema.Function;
+import org.apache.calcite.schema.SchemaPlus;
+import org.apache.calcite.schema.Table;
+import org.apache.calcite.sql.SqlDialect;
+import org.apache.drill.exec.store.AbstractSchema;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+class CapitalizingJdbcSchema extends AbstractSchema {
+
+ private static final Logger logger =
LoggerFactory.getLogger(CapitalizingJdbcSchema.class);
+
+ private final Map<String, CapitalizingJdbcSchema> schemaMap;
+ private final JdbcSchema inner;
+ private final boolean caseSensitive;
+
+ CapitalizingJdbcSchema(List<String> parentSchemaPath, String name,
DataSource dataSource,
+ SqlDialect dialect, JdbcConvention convention, String
catalog, String schema, boolean caseSensitive) {
+ super(parentSchemaPath, name);
+ this.schemaMap = new HashMap<>();
+ this.inner = new JdbcSchema(dataSource, dialect, convention, catalog,
schema);
+ this.caseSensitive = caseSensitive;
+ }
+
+ @Override
+ public String getTypeName() {
+ return JdbcStorageConfig.NAME;
+ }
+
+ @Override
+ public Collection<Function> getFunctions(String name) {
+ return inner.getFunctions(name);
+ }
+
+ @Override
+ public Set<String> getFunctionNames() {
+ return inner.getFunctionNames();
+ }
+
+ @Override
+ public CapitalizingJdbcSchema getSubSchema(String name) {
+ return schemaMap.get(name);
+ }
+
+ void setHolder(SchemaPlus plusOfThis) {
+ for (String s : getSubSchemaNames()) {
+ CapitalizingJdbcSchema inner = getSubSchema(s);
+ SchemaPlus holder = plusOfThis.add(s, inner);
+ inner.setHolder(holder);
+ }
+ }
+
+ @Override
+ public Set<String> getSubSchemaNames() {
+ return schemaMap.keySet();
+ }
+
+ @Override
+ public Set<String> getTableNames() {
+ if (isCatalogSchema()) {
+ return Collections.emptySet();
+ }
+ return inner.getTableNames();
+ }
+
+ @Override
+ public Table getTable(String name) {
+ if (isCatalogSchema()) {
+ logger.warn("Failed attempt to find table '{}' in catalog schema '{}'",
name, getName());
+ return null;
+ }
+ Table table = inner.getTable(name);
+ if (table == null
+ && !areTableNamesCaseSensitive()
+ && (table = inner.getTable(name.toUpperCase())) == null // Oracle and
H2 changes unquoted identifiers to uppercase.
Review comment:
Or it may be rewritten to something like this:
```suggestion
Table table = inner.getTable(name);
if (table == null
&& !areTableNamesCaseSensitive()) {
// Oracle and H2 changes unquoted identifiers to uppercase.
table = inner.getTable(name.toUpperCase());
if (table == null) {
// Postgres changes unquoted identifiers to lowercase.
return inner.getTable(name.toLowerCase());
}
}
return table;
```
----------------------------------------------------------------
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:
us...@infra.apache.org
> Update Calcite to 1.21.0
> ------------------------
>
> Key: DRILL-7406
> URL: https://issues.apache.org/jira/browse/DRILL-7406
> Project: Apache Drill
> Issue Type: Task
> Components: Query Planning & Optimization, SQL Parser
> Affects Versions: 1.17.0
> Reporter: Igor Guzenko
> Assignee: Igor Guzenko
> Priority: Major
> Fix For: 1.18.0
>
>
> DRILL-7340 should be fixed by this update.
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
